From af9db65bc57db7617fb55a7edc96965eef938651 Mon Sep 17 00:00:00 2001 From: David Beckingsale Date: Tue, 14 Sep 2021 13:58:06 -0700 Subject: [PATCH 1/6] Try using config submodule --- .gitmodules | 3 + spack-configs/radiuss | 1 + .../blueos_3_ppc64le_ib_p9/compilers.yaml | 216 ------------------ .../blueos_3_ppc64le_ib_p9/config.yaml | 3 - .../blueos_3_ppc64le_ib_p9/packages.yaml | 136 ----------- spack-environments/raja-suite/spack.yaml | 4 +- .../toss_3_x86_64_ib/compilers.yaml | 52 ----- .../raja-suite/toss_3_x86_64_ib/config.yaml | 4 - .../raja-suite/toss_3_x86_64_ib/packages.yaml | 149 ------------ 9 files changed, 6 insertions(+), 562 deletions(-) create mode 100644 .gitmodules create mode 160000 spack-configs/radiuss delete mode 100644 spack-environments/raja-suite/blueos_3_ppc64le_ib_p9/compilers.yaml delete mode 100644 spack-environments/raja-suite/blueos_3_ppc64le_ib_p9/config.yaml delete mode 100644 spack-environments/raja-suite/blueos_3_ppc64le_ib_p9/packages.yaml delete mode 100644 spack-environments/raja-suite/toss_3_x86_64_ib/compilers.yaml delete mode 100644 spack-environments/raja-suite/toss_3_x86_64_ib/config.yaml delete mode 100644 spack-environments/raja-suite/toss_3_x86_64_ib/packages.yaml diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..cfc649d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "spack-configs/radiuss"] + path = spack-configs/radiuss + url = https://github.com/LLNL/radiuss-spack-configs.git diff --git a/spack-configs/radiuss b/spack-configs/radiuss new file mode 160000 index 0000000..c3639fe --- /dev/null +++ b/spack-configs/radiuss @@ -0,0 +1 @@ +Subproject commit c3639fe5b5a922fa601e335f37ec9f7924796b5b diff --git a/spack-environments/raja-suite/blueos_3_ppc64le_ib_p9/compilers.yaml b/spack-environments/raja-suite/blueos_3_ppc64le_ib_p9/compilers.yaml deleted file mode 100644 index 6703f55..0000000 --- a/spack-environments/raja-suite/blueos_3_ppc64le_ib_p9/compilers.yaml +++ /dev/null @@ -1,216 +0,0 @@ -############################################################################## -# Copyright (c) 2020-2021, Lawrence Livermore National Security, LLC and -# RADIUSS Stack project contributors. See the LICENSE file for details. -# -# SPDX-License-Identifier: MIT -############################################################################## - -compilers:: -- compiler: - spec: clang@3.9.1 - paths: - cc: /usr/tcetmp/packages/clang/clang-3.9.1/bin/clang - cxx: /usr/tcetmp/packages/clang/clang-3.9.1/bin/clang++ - f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r - fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: clang@4.0.0 - paths: - cc: /usr/tcetmp/packages/clang/clang-4.0.0/bin/clang - cxx: /usr/tcetmp/packages/clang/clang-4.0.0/bin/clang++ - f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r - fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: clang@9.0.0 - paths: - cc: /usr/tce/packages/clang/clang-9.0.0/bin/clang - cxx: /usr/tce/packages/clang/clang-9.0.0/bin/clang++ - f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r - fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: clang@9.0.0ibm - paths: - cc: /usr/tce/packages/clang/clang-ibm-2019.10.03/bin/clang - cxx: /usr/tce/packages/clang/clang-ibm-2019.10.03/bin/clang++ - fc: /usr/tce/packages/xl/xl-2020.03.18/bin/xlf2003_r - f77: /usr/tce/packages/xl/xl-2020.03.18/bin/xlf_r - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: clang@10.0.1ibm - paths: - cc: /usr/tce/packages/clang/clang-ibm-10.0.1/bin/clang - cxx: /usr/tce/packages/clang/clang-ibm-10.0.1/bin/clang++ - fc: /usr/tce/packages/xl/xl-2020.09.17/bin/xlf2003_r - f77: /usr/tce/packages/xl/xl-2020.09.17/bin/xlf_r - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: clang@coral2018.08.08 - paths: - cc: /usr/tce/packages/clang/clang-coral-2018.08.08/bin/clang - cxx: /usr/tce/packages/clang/clang-coral-2018.08.08/bin/clang++ - f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r - fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: clang@default - paths: - cc: clang - cxx: clang++ - f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r - fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: gcc@8.3.1 - paths: - cc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gcc - cxx: /usr/tce/packages/gcc/gcc-8.3.1/bin/g++ - f77: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran - fc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: gcc@4.9.3 - paths: - cc: /usr/tce/packages/gcc/gcc-4.9.3/bin/gcc - cxx: /usr/tce/packages/gcc/gcc-4.9.3/bin/g++ - f77: /usr/tce/packages/gcc/gcc-4.9.3/bin/gfortran - fc: /usr/tce/packages/gcc/gcc-4.9.3/bin/gfortran - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: gcc@default - paths: - cc: gcc - cxx: g++ - f77: gfortran - fc: gfortran - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: xl@default - paths: - cc: xlc - cxx: xlc++ - f77: xlf2003 - fc: xlf2003 - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: xl@beta2019.06.20 - paths: - cc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlc - cxx: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlc++ - f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r - fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: xl@16.1.1.7 - paths: - cc: /usr/tce/packages/xl/xl-2020.03.18/bin/xlc_r - cxx: /usr/tce/packages/xl/xl-2020.03.18/bin/xlC_r - fc: /usr/tce/packages/xl/xl-2020.03.18/bin/xlf2003_r - f77: /usr/tce/packages/xl/xl-2020.03.18/bin/xlf_r - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: pgi@default - paths: - cc: pgcc - cxx: pgc++ - f77: pgfortran - fc: pgfortran - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: pgi@19.10 - paths: - cc: /usr/tce/packages/pgi/pgi-19.10/bin/pgcc - cxx: /usr/tce/packages/pgi/pgi-19.10/bin/pgc++ - f77: /usr/tce/packages/pgi/pgi-19.10/bin/pgfortran - fc: /usr/tce/packages/pgi/pgi-19.10/bin/pgfortran - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] -- compiler: - spec: pgi@20.4 - paths: - cc: /usr/tce/packages/pgi/pgi-20.4/bin/pgcc - cxx: /usr/tce/packages/pgi/pgi-20.4/bin/pgc++ - f77: /usr/tce/packages/pgi/pgi-20.4/bin/pgfortran - fc: /usr/tce/packages/pgi/pgi-20.4/bin/pgf90 - flags: {} - operating_system: rhel7 - target: ppc64le - modules: [] - environment: {} - extra_rpaths: [] diff --git a/spack-environments/raja-suite/blueos_3_ppc64le_ib_p9/config.yaml b/spack-environments/raja-suite/blueos_3_ppc64le_ib_p9/config.yaml deleted file mode 100644 index 60bcc77..0000000 --- a/spack-environments/raja-suite/blueos_3_ppc64le_ib_p9/config.yaml +++ /dev/null @@ -1,3 +0,0 @@ -config: - build_jobs: 32 - concretizer: clingo diff --git a/spack-environments/raja-suite/blueos_3_ppc64le_ib_p9/packages.yaml b/spack-environments/raja-suite/blueos_3_ppc64le_ib_p9/packages.yaml deleted file mode 100644 index 9877f2b..0000000 --- a/spack-environments/raja-suite/blueos_3_ppc64le_ib_p9/packages.yaml +++ /dev/null @@ -1,136 +0,0 @@ -packages:: - all: - permissions: - read: world - write: group - group: radiuss - providers: - blas: - - netlib-lapack - lapack: - - netlib-lapack - mpi: - - spectrum-mpi - unwind: - - libunwind - # This defaults us to machine specific flags of ivybridge which allows - # us to run on broadwell as well - target: [ppc64le] - compiler: [gcc, pgi, clang, xl] - - cuda: - version: [11.0.2, 10.1.243, 10.1.168, 9.2.148, 8.0] - buildable: false - externals: - - spec: cuda@11.0.2 - prefix: /usr/tce/packages/cuda/cuda-11.0.2 - - spec: cuda@10.1.243 - prefix: /usr/tce/packages/cuda/cuda-10.1.243 - - spec: cuda@10.1.168 - prefix: /usr/tce/packages/cuda/cuda-10.1.168 - - spec: cuda@9.2.148 - prefix: /usr/tce/packages/cuda/cuda-9.2.148 - - spec: cuda@8.0 - prefix: /usr/tce/packages/cuda/cuda-8.0 - spectrum-mpi: - externals: - - spec: spectrum-mpi@10.3.1.03rtm0%pgi@19.10 - prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-19.10 - - spec: spectrum-mpi@10.3.1.03rtm0%pgi@20.4 - prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-20.4 - - spec: spectrum-mpi@10.3.1.03rtm0%gcc@8.3.1 - prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1 - - spec: spectrum-mpi@10.3.1.03rtm0%gcc@4.9.3 - prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-4.9.3 - - spec: spectrum-mpi@10.3.1.03rtm0%clang@9.0.0 - prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-9.0.0 - - spec: spectrum-mpi@10.3.1.03rtm0%clang@9.0.0ibm - prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-2019.10.03 - - spec: spectrum-mpi@10.3.1.03rtm0%clang@10.0.1ibm - prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-10.0.1 - - spec: spectrum-mpi@10.3.1.03rtm0%xl@16.1.1.7 - prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2020.03.18 - - spec: spectrum-mpi@10.3.1.03rtm0%xl@beta2019.06.20 - prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-beta-2019.06.20 - buildable: false - - cmake: - version: [3.18.0] - buildable: false - externals: - - spec: cmake@3.18.0 - prefix: /usr/tce/packages/cmake/cmake-3.18.0 - - python: - buildable: false - version: [3.8.2] - externals: - - spec: python@3.8.2 - prefix: /usr/tce/packages/python/python-3.8.2 - - # Blas/Lapack virtual package provider - netlib-lapack: - buildable: false - version: [3.9.0] - externals: - - spec: netlib-lapack@3.9.0 - prefix: /usr/tcetmp/packages/lapack/lapack-3.9.0-P9-xl-2020.03.18 - -# # Blas/Lapack virtual package provider -# netlib-lapack: -# buildable: false -# externals: -# - spec: netlib-lapack@3.6.1 -# prefix: /usr - - #ncurses has a bug in their 6.2 that says that getopt is not present - # see: https://github.com/spack/spack/issues/16269 - ncurses: - version: [6.1] - - # System level packages to not build - autoconf: - buildable: false - externals: - - spec: autoconf@2.69 - prefix: /usr - automake: - buildable: false - externals: - - spec: automake@1.13.4 - prefix: /usr - bzip2: - buildable: false - externals: - - spec: bzip2@1.0.6 - prefix: /usr - gettext: - buildable: false - externals: - - spec: gettext@0.19.8.1 - prefix: /usr - libtool: - buildable: false - externals: - - spec: libtool@2.4.2 - prefix: /usr - m4: - buildable: false - externals: - - spec: m4@1.4.16 - prefix: /usr - perl: - buildable: false - externals: - - spec: perl@5.16.3 - prefix: /usr - pkg-config: - buildable: false - externals: - - spec: pkg-config@0.27.1 - prefix: /usr - tar: - buildable: false - externals: - - spec: tar@1.26 - prefix: /usr diff --git a/spack-environments/raja-suite/spack.yaml b/spack-environments/raja-suite/spack.yaml index 797de17..6faa846 100644 --- a/spack-environments/raja-suite/spack.yaml +++ b/spack-environments/raja-suite/spack.yaml @@ -6,7 +6,7 @@ ############################################################################## spack: - include: [$SYS_TYPE] + include: ../../spack-configs/radiuss/[$SYS_TYPE] concretization: separately view: false config: @@ -26,7 +26,7 @@ spack: - '%gcc@8.3.1' when: env.get("SYS_TYPE", "") == "toss_3_x86_64_ib" - compilers: - - '%clang@10.0.1' + - '%clang@10.0.1-ibm' when: env.get("SYS_TYPE", "") == "blueos_3_ppc64le_ib_p9" - projects: - chai@develop diff --git a/spack-environments/raja-suite/toss_3_x86_64_ib/compilers.yaml b/spack-environments/raja-suite/toss_3_x86_64_ib/compilers.yaml deleted file mode 100644 index 984c8ae..0000000 --- a/spack-environments/raja-suite/toss_3_x86_64_ib/compilers.yaml +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################## -# Copyright (c) 2021, Lawrence Livermore National Security, LLC and -# RADIUSS Stack project contributors. See the LICENSE file for details. -# -# SPDX-License-Identifier: MIT -############################################################################## - -compilers:: -- compiler: - environment: {} - extra_rpaths: [] - flags: - cflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 - cxxflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 - modules: - - clang/10.0.0 - operating_system: rhel7 - paths: - cc: /usr/tce/packages/clang/clang-10.0.0/bin/clang - cxx: /usr/tce/packages/clang/clang-10.0.0/bin/clang++ - f77: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran - fc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran - spec: clang@10.0.0 - target: x86_64 -- compiler: - environment: {} - extra_rpaths: [] - flags: {} - modules: - - gcc/8.3.1 - operating_system: rhel7 - paths: - cc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gcc - cxx: /usr/tce/packages/gcc/gcc-8.3.1/bin/g++ - f77: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran - fc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran - spec: gcc@8.3.1 - target: x86_64 -- compiler: - environment: {} - extra_rpaths: [] - flags: {} - modules: - - gcc/8.1.0 - operating_system: rhel7 - paths: - cc: /usr/tce/packages/gcc/gcc-8.1.0/bin/gcc - cxx: /usr/tce/packages/gcc/gcc-8.1.0/bin/g++ - f77: /usr/tce/packages/gcc/gcc-8.1.0/bin/gfortran - fc: /usr/tce/packages/gcc/gcc-8.1.0/bin/gfortran - spec: gcc@8.1.0 - target: x86_64 diff --git a/spack-environments/raja-suite/toss_3_x86_64_ib/config.yaml b/spack-environments/raja-suite/toss_3_x86_64_ib/config.yaml deleted file mode 100644 index 2936d5a..0000000 --- a/spack-environments/raja-suite/toss_3_x86_64_ib/config.yaml +++ /dev/null @@ -1,4 +0,0 @@ -config: - build_jobs: 36 - - concretizer: clingo diff --git a/spack-environments/raja-suite/toss_3_x86_64_ib/packages.yaml b/spack-environments/raja-suite/toss_3_x86_64_ib/packages.yaml deleted file mode 100644 index 3641f37..0000000 --- a/spack-environments/raja-suite/toss_3_x86_64_ib/packages.yaml +++ /dev/null @@ -1,149 +0,0 @@ -############################################################################## -# Copyright (c) 2020-2021, Lawrence Livermore National Security, LLC and -# RADIUSS Stack project contributors. See the LICENSE file for details. -# -# SPDX-License-Identifier: MIT -############################################################################## - -packages:: - all: - permissions: - read: world - write: group - group: radiuss - providers: - blas: - - netlib-lapack - lapack: - - netlib-lapack - mpi: - - mvapich2 - - openmpi - unwind: - - libunwind - - mpi: - buildable: false - mvapich2: - buildable: false - externals: - - spec: mvapich2@2.2%gcc@8.1.0 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/mvapich2/mvapich2-2.2-gcc-8.1.0 - - spec: mvapich2@2.3%gcc@8.1.0 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.1.0 - - spec: mvapich2@2.2%gcc@8.3.1 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/mvapich2/mvapich2-2.2-gcc-8.3.1 - - spec: mvapich2@2.3%gcc@8.3.1 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.3.1 - - spec: mvapich2@2.2%clang@10.0.0 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/mvapich2/mvapich2-2.2-clang-10.0.0 - - spec: mvapich2@2.3%clang@10.0.0 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/mvapich2/mvapich2-2.3-clang-10.0.0 - openmpi: - buildable: false - externals: - - spec: openmpi@2.0.0%gcc@8.1.0 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/openmpi/openmpi-2.0.0-gcc-8.1.0 - - spec: openmpi@2.1.0%gcc@8.1.0 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/openmpi/openmpi-2.1.0-gcc-8.1.0 - - spec: openmpi@3.0.1%gcc@8.1.0 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/openmpi/openmpi-3.0.1-gcc-8.1.0 - - spec: openmpi@2.0.0%gcc@8.3.1 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/openmpi/openmpi-2.0.0-gcc-8.3.1 - - spec: openmpi@2.1.0%gcc@8.3.1 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/openmpi/openmpi-2.1.0-gcc-8.3.1 - - spec: openmpi@3.0.1%gcc@8.3.1 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/openmpi/openmpi-3.0.1-gcc-8.3.1 - - spec: openmpi@2.0.0%clang@10.0.0 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/openmpi/openmpi-2.0.0-clang-10.0.0 - - spec: openmpi@2.1.0%clang@10.0.0 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/openmpi/openmpi-2.1.0-clang-10.0.0 - - spec: openmpi@3.0.1%clang@10.0.0 arch=linux-rhel7-broadwell - prefix: /usr/tce/packages/openmpi/openmpi-3.0.1-clang-10.0.0 - cmake: - version: - - 3.18.0 - buildable: false - externals: - - spec: cmake@3.18.0 - prefix: /usr/tce/packages/cmake/cmake-3.18.0 - python: - buildable: false - externals: - - spec: python@3.8.2 - prefix: /usr/tce/packages/python/python-3.8.2 - netlib-lapack: - buildable: false - externals: - - spec: netlib-lapack@3.6.1 - prefix: /usr - autoconf: - buildable: false - externals: - - spec: autoconf@2.69 - prefix: /usr - automake: - buildable: false - externals: - - spec: automake@1.13.4 - prefix: /usr - bzip2: - buildable: false - externals: - - spec: bzip2@1.0.6 - prefix: /usr - gettext: - buildable: false - externals: - - spec: gettext@0.19.8.1 - prefix: /usr - graphviz: - buildable: false - externals: - - spec: graphviz@2.30.1 - prefix: /usr - libtool: - buildable: false - externals: - - spec: libtool@2.4.2 - prefix: /usr - libx11: - buildable: false - externals: - - spec: libx11@1.20.4 - prefix: /usr - m4: - buildable: false - externals: - - spec: m4@1.4.16 - prefix: /usr - perl: - buildable: false - externals: - - spec: perl@5.16.3 - prefix: /usr - pkg-config: - buildable: false - externals: - - spec: pkg-config@0.27.1 - prefix: /usr - tar: - buildable: false - externals: - - spec: tar@1.26 - prefix: /usr - unzip: - buildable: false - externals: - - spec: readline@6.2 - prefix: /usr - unzip: - buildable: false - externals: - - spec: unzip@6.0 - prefix: /usr - zlib: - buildable: false - externals: - - spec: zlib@1.2.7 - prefix: /usr From 1ac98121110d17ab29b6e2d1672efa7b49f4711a Mon Sep 17 00:00:00 2001 From: David Beckingsale Date: Tue, 14 Sep 2021 14:01:56 -0700 Subject: [PATCH 2/6] Correct env (hopefully) --- spack-environments/raja-suite/spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environments/raja-suite/spack.yaml b/spack-environments/raja-suite/spack.yaml index 6faa846..a985981 100644 --- a/spack-environments/raja-suite/spack.yaml +++ b/spack-environments/raja-suite/spack.yaml @@ -6,7 +6,7 @@ ############################################################################## spack: - include: ../../spack-configs/radiuss/[$SYS_TYPE] + include: [../../spack-configs/radiuss/$SYS_TYPE] concretization: separately view: false config: From 37d8eed2d819ee6419a829ced6120e421c0470c3 Mon Sep 17 00:00:00 2001 From: David Beckingsale Date: Tue, 14 Sep 2021 15:01:48 -0700 Subject: [PATCH 3/6] Test against all compilers --- spack-environments/raja-suite/spack.yaml | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/spack-environments/raja-suite/spack.yaml b/spack-environments/raja-suite/spack.yaml index a985981..4f98d7b 100644 --- a/spack-environments/raja-suite/spack.yaml +++ b/spack-environments/raja-suite/spack.yaml @@ -23,10 +23,36 @@ spack: mirror: file:///usr/workspace/radiuss/mirrors/raja-suite definitions: - compilers: + - '%clang@9.0.0' + - '%clang@10.0.1' + - '%clang@11.0.1' + - '%intel@17.0.2' + - '%intel@18.0.2' + - '%intel@19.0.4' + - '%intel@19.1.0' + - '%intel@19.1.2' + - '%intel@2021.2' + - '%intel-oneapi@2021.2-ifort' + - '%intel-oneapi@2021.2-ifx' + - '%pgi@19.7' + - '%pgi@20.1' + - '%pgi@21.1' + - '%gcc@4.9.3' + - '%gcc@8.1.0' - '%gcc@8.3.1' + - '%gcc@10.2.1' when: env.get("SYS_TYPE", "") == "toss_3_x86_64_ib" - compilers: + - '%clang@9.0.0-ibm' - '%clang@10.0.1-ibm' + - '%clang@11.0.1-ibm' + - '%gcc@8.3.1' + - '%gcc@4.9.3' + - '%xl@16.1.1.7' + - '%xl@16.1.1.10' + - '%pgi@19.10' + - '%pgi@20.4' + - '%pgi@21.3' when: env.get("SYS_TYPE", "") == "blueos_3_ppc64le_ib_p9" - projects: - chai@develop From 570bd389e28304a8ce8559ab9656a8e0c9b97d76 Mon Sep 17 00:00:00 2001 From: "Adrien M. Bernede" Date: Thu, 16 Sep 2021 10:43:32 -0700 Subject: [PATCH 4/6] Use symlinks to have environment pointing to config in same directory --- spack-environments/raja-suite/blueos_3_ppc64le_ib_p9 | 1 + spack-environments/raja-suite/spack.yaml | 2 +- spack-environments/raja-suite/toss_3_x86_64_ib | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 120000 spack-environments/raja-suite/blueos_3_ppc64le_ib_p9 create mode 120000 spack-environments/raja-suite/toss_3_x86_64_ib diff --git a/spack-environments/raja-suite/blueos_3_ppc64le_ib_p9 b/spack-environments/raja-suite/blueos_3_ppc64le_ib_p9 new file mode 120000 index 0000000..f90c8f7 --- /dev/null +++ b/spack-environments/raja-suite/blueos_3_ppc64le_ib_p9 @@ -0,0 +1 @@ +../../spack-configs/radiuss/blueos_3_ppc64le_ib_p9 \ No newline at end of file diff --git a/spack-environments/raja-suite/spack.yaml b/spack-environments/raja-suite/spack.yaml index 4f98d7b..5718f3a 100644 --- a/spack-environments/raja-suite/spack.yaml +++ b/spack-environments/raja-suite/spack.yaml @@ -6,7 +6,7 @@ ############################################################################## spack: - include: [../../spack-configs/radiuss/$SYS_TYPE] + include: [$SYS_TYPE] concretization: separately view: false config: diff --git a/spack-environments/raja-suite/toss_3_x86_64_ib b/spack-environments/raja-suite/toss_3_x86_64_ib new file mode 120000 index 0000000..a03204d --- /dev/null +++ b/spack-environments/raja-suite/toss_3_x86_64_ib @@ -0,0 +1 @@ +../../spack-configs/radiuss/toss_3_x86_64_ib \ No newline at end of file From 82e7f689b0812b57a3b5638706b9a3a57a27195a Mon Sep 17 00:00:00 2001 From: "Adrien M. Bernede" Date: Thu, 16 Sep 2021 10:50:23 -0700 Subject: [PATCH 5/6] Allow submodules --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3969dd..b8128f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ #[create-unique-path--] variables: + GIT_SUBMODULE_STRATEGY: normal SPACK_PARENT_DIR: ${CI_BUILDS_DIR}/llnl-stack-${CI_COMMIT_SHORT_SHA} SPACK_PATH: ${CI_BUILDS_DIR}/llnl-stack-${CI_COMMIT_SHORT_SHA}/spack #[--create-unique-path] From 05c5e42e6f07155f1023de2f2f72fba2ee08c7b9 Mon Sep 17 00:00:00 2001 From: "Adrien M. Bernede" Date: Thu, 16 Sep 2021 17:00:51 -0700 Subject: [PATCH 6/6] Update radiuss spack config --- spack-configs/radiuss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-configs/radiuss b/spack-configs/radiuss index c3639fe..66b1b16 160000 --- a/spack-configs/radiuss +++ b/spack-configs/radiuss @@ -1 +1 @@ -Subproject commit c3639fe5b5a922fa601e335f37ec9f7924796b5b +Subproject commit 66b1b164ab8157a0fd9b001e138247daf22ce82b