From 429203ff49c599494581298470975dcf40ee738f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 12 Jan 2026 08:28:09 -0700 Subject: [PATCH 01/16] Pin py-numpy to version 1 to avoid duplicate packages; update .gitmodules and submodule pointer for spack for code review and testing --- .gitmodules | 6 ++- configs/common/packages.yaml | 10 ++--- .../blackpearl/packages_oneapi-2025.1.0.yaml | 44 ------------------- spack | 2 +- 4 files changed, 9 insertions(+), 53 deletions(-) delete mode 100644 configs/sites/tier2/blackpearl/packages_oneapi-2025.1.0.yaml diff --git a/.gitmodules b/.gitmodules index 2f6cb0566..9be4ae217 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = spack-stack-dev + #url = https://github.com/jcsda/spack + #branch = spack-stack-dev + url = https://github.com/climbfuji/spack + branch = feature/update_spack-stack-dev_from_develop [submodule "repos/builtin"] path = repos/builtin url = https://github.com/jcsda/spack-packages diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 56e1b04d5..a4e5cb58e 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -358,16 +358,14 @@ packages: require: - '@1.7.2' - ~mpi - ## To avoid duplicate packages - #py-numpy: - # require: - # - '@1.26' - # DH* 20250813 + # To avoid duplicate packages + py-numpy: + require: + - '@1' # To avoid duplicate packages py-poetry-core: require: - '@1.7' - # *DH 20250813 # This version builds with Intel oneAPI compilers, newer versions don't py-pyogrio: require: diff --git a/configs/sites/tier2/blackpearl/packages_oneapi-2025.1.0.yaml b/configs/sites/tier2/blackpearl/packages_oneapi-2025.1.0.yaml deleted file mode 100644 index b692e2239..000000000 --- a/configs/sites/tier2/blackpearl/packages_oneapi-2025.1.0.yaml +++ /dev/null @@ -1,44 +0,0 @@ -packages: - mpi: - buildable: False - require: - - intel-oneapi-mpi@2021.15 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2025.1.0 - prefix: /opt/intel/oneapi - intel-oneapi-compilers: - externals: - - spec: intel-oneapi-compilers@2025.1.0 - prefix: /opt/intel/oneapi - extra_attributes: - compilers: - c: /opt/intel/oneapi/2025.1/bin/icx - cxx: /opt/intel/oneapi/2025.1/bin/icpx - fortran: /opt/intel/oneapi/2025.1/bin/ifx - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@11.4.1 - prefix: /usr - gcc: - buildable: false - externals: - - spec: gcc@11.4.1 languages:='c,c++' - prefix: /usr - extra_attributes: - compilers: - c: /usr/bin/gcc - cxx: /usr/bin/g++ - fortran: /usr/bin/gfortran - intel-oneapi-mpi: - buildable: false - externals: - - spec: intel-oneapi-mpi@2021.15 - prefix: /opt/intel/oneapi - intel-oneapi-mkl: - buildable: false - externals: - - spec: intel-oneapi-mkl@2025.1 - prefix: /opt/intel/oneapi diff --git a/spack b/spack index 553caf208..014088166 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 553caf208c8d5983bf86d6eb7c63fcb546095b7d +Subproject commit 014088166de4846ff528b3d0bb38a6416d7e9614 From 53ce67f6260c633dbdc7f91a642b7ca94aac896e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 12 Jan 2026 08:30:33 -0700 Subject: [PATCH 02/16] Update syntax for preferred compiler in configs/common/packages_{clang,gcc,oneapi}.yaml; remove outdated packages yaamls for aocc, apple-clang, intel classic --- .../common/packages_aocc.yaml.NOTYETUPDATED | 20 -------- .../packages_apple-clang.yaml.NOTYETUPDATED | 19 ------- configs/common/packages_clang.yaml | 2 +- configs/common/packages_gcc.yaml | 2 +- .../common/packages_intel.yaml.NOTYETUPDATED | 50 ------------------- configs/common/packages_oneapi.yaml | 2 +- 6 files changed, 3 insertions(+), 92 deletions(-) delete mode 100644 configs/common/packages_aocc.yaml.NOTYETUPDATED delete mode 100644 configs/common/packages_apple-clang.yaml.NOTYETUPDATED delete mode 100644 configs/common/packages_intel.yaml.NOTYETUPDATED diff --git a/configs/common/packages_aocc.yaml.NOTYETUPDATED b/configs/common/packages_aocc.yaml.NOTYETUPDATED deleted file mode 100644 index 0b09e12d2..000000000 --- a/configs/common/packages_aocc.yaml.NOTYETUPDATED +++ /dev/null @@ -1,20 +0,0 @@ -packages: - all: - providers: - blas: [openblas] - fftw-api: [fftw] - lapack: [openblas] - ectrans: - require: - - '~mkl +fftw' - gsibec: - require: - - '~mkl' - py-numpy: - require: - - '^openblas' - # ip@5 doesn't build with aocc@4 compilers - ip: - require: - - '%gcc' - - '^openblas' \ No newline at end of file diff --git a/configs/common/packages_apple-clang.yaml.NOTYETUPDATED b/configs/common/packages_apple-clang.yaml.NOTYETUPDATED deleted file mode 100644 index 7c1a45400..000000000 --- a/configs/common/packages_apple-clang.yaml.NOTYETUPDATED +++ /dev/null @@ -1,19 +0,0 @@ -packages: - all: - providers: - blas: [openblas] - fftw-api: [fftw] - lapack: [openblas] - ectrans: - require: - - '~mkl +fftw' - gsibec: - require: - - '~mkl' - ip: - require: - - '^openblas' - - '~openmp' - py-numpy: - require: - - '^openblas' diff --git a/configs/common/packages_clang.yaml b/configs/common/packages_clang.yaml index 0d350dcc4..a0fca0722 100644 --- a/configs/common/packages_clang.yaml +++ b/configs/common/packages_clang.yaml @@ -1,7 +1,7 @@ packages: all: prefer: - - '%clang' + - "%[when=%c]c=llvm %[when=%cxx]cxx=llvm %[when=%fortran]fortran=llvm" # Virtual provider settings blas: require: [openblas] diff --git a/configs/common/packages_gcc.yaml b/configs/common/packages_gcc.yaml index 89f87e8e2..9ec58ff73 100644 --- a/configs/common/packages_gcc.yaml +++ b/configs/common/packages_gcc.yaml @@ -1,7 +1,7 @@ packages: all: prefer: - - '%gcc' + - "%[when=%c]c=gcc %[when=%cxx]cxx=gcc %[when=%fortran]fortran=gcc" # Virtual provider settings blas: require: [openblas] diff --git a/configs/common/packages_intel.yaml.NOTYETUPDATED b/configs/common/packages_intel.yaml.NOTYETUPDATED deleted file mode 100644 index 851c3fd64..000000000 --- a/configs/common/packages_intel.yaml.NOTYETUPDATED +++ /dev/null @@ -1,50 +0,0 @@ -packages: - all: - providers: - blas: [intel-oneapi-mkl] - fftw-api: [intel-oneapi-mkl] - lapack: [intel-oneapi-mkl] - antlr: - require: - - '%gcc' - cmake: - require: - - '%gcc' - ectrans: - require: - - '+mkl ~fftw' - # gettext 0.22.5 does not compile with Intel Classic compilers: - # malloca.c(49): error #3895: expected a comma (the one-argument version of static_assert is not enabled in this mode) - gettext: - require: - - '@:0.21' - go: - require: - - '%gcc' - go-bootstrap: - require: - - '%gcc' - gh: - require: - - '%gcc' - gsibec: - require: - - '+mkl' - py-numpy: - require: - - '^intel-oneapi-mkl' - boost: - require: - - '%gcc' - qt: - require: - - '%gcc' - ecflow: - require: - - '%gcc' - pixman: - require: - - '%gcc' - nco: - require: - - '%gcc' \ No newline at end of file diff --git a/configs/common/packages_oneapi.yaml b/configs/common/packages_oneapi.yaml index f620a636e..87706ed18 100644 --- a/configs/common/packages_oneapi.yaml +++ b/configs/common/packages_oneapi.yaml @@ -1,7 +1,7 @@ packages: all: prefer: - - '%oneapi' + - "%[when=%c]c=intel-oneapi-compilers %[when=%cxx]cxx=intel-oneapi-compilers %[when=%fortran]fortran=intel-oneapi-compilers" # Virtual package settings blas: require: ['intel-oneapi-mkl'] From c2d22f5ab851aabbe4f6299a549130e02801ea25 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 12 Jan 2026 08:34:15 -0700 Subject: [PATCH 03/16] Remove external compiler runtime packages for tier 2 sites bounty and blackpearl --- .../sites/tier2/blackpearl/packages_gcc-13.2.1.yaml | 5 ----- .../tier2/blackpearl/packages_oneapi-2024.2.1.yaml | 10 ---------- configs/sites/tier2/bounty/packages_gcc-13.3.1.yaml | 5 ----- .../sites/tier2/bounty/packages_oneapi-2025.3.0.yaml | 10 ---------- 4 files changed, 30 deletions(-) diff --git a/configs/sites/tier2/blackpearl/packages_gcc-13.2.1.yaml b/configs/sites/tier2/blackpearl/packages_gcc-13.2.1.yaml index 2e8392fa2..695941343 100644 --- a/configs/sites/tier2/blackpearl/packages_gcc-13.2.1.yaml +++ b/configs/sites/tier2/blackpearl/packages_gcc-13.2.1.yaml @@ -2,11 +2,6 @@ packages: mpi: require: - "openmpi@=5.0.8" - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@13.2.1 - prefix: /opt/rh/gcc-toolset-13/root/usr gcc: buildable: False externals: diff --git a/configs/sites/tier2/blackpearl/packages_oneapi-2024.2.1.yaml b/configs/sites/tier2/blackpearl/packages_oneapi-2024.2.1.yaml index 6adf1a7fa..ff2b795b0 100644 --- a/configs/sites/tier2/blackpearl/packages_oneapi-2024.2.1.yaml +++ b/configs/sites/tier2/blackpearl/packages_oneapi-2024.2.1.yaml @@ -3,11 +3,6 @@ packages: buildable: False require: - intel-oneapi-mpi@2021.13 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2024.2.1 - prefix: /opt/intel/oneapi intel-oneapi-compilers: externals: - spec: intel-oneapi-compilers@2024.2.1 @@ -17,11 +12,6 @@ packages: c: /opt/intel/oneapi/2024.2/bin/icx cxx: /opt/intel/oneapi/2024.2/bin/icpx fortran: /opt/intel/oneapi/2024.2/bin/ifort - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@11.4.1 - prefix: /usr gcc: buildable: false externals: diff --git a/configs/sites/tier2/bounty/packages_gcc-13.3.1.yaml b/configs/sites/tier2/bounty/packages_gcc-13.3.1.yaml index 052062dda..f7e40520c 100644 --- a/configs/sites/tier2/bounty/packages_gcc-13.3.1.yaml +++ b/configs/sites/tier2/bounty/packages_gcc-13.3.1.yaml @@ -2,11 +2,6 @@ packages: mpi: require: - "openmpi@=5.0.8" - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@13.3.1 - prefix: /opt/rh/gcc-toolset-13/root/usr gcc: buildable: False externals: diff --git a/configs/sites/tier2/bounty/packages_oneapi-2025.3.0.yaml b/configs/sites/tier2/bounty/packages_oneapi-2025.3.0.yaml index 30e89e340..398fa1c5a 100644 --- a/configs/sites/tier2/bounty/packages_oneapi-2025.3.0.yaml +++ b/configs/sites/tier2/bounty/packages_oneapi-2025.3.0.yaml @@ -3,11 +3,6 @@ packages: buildable: False require: - "intel-oneapi-mpi@2021.17" - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2025.3.0 - prefix: /opt/intel/oneapi intel-oneapi-compilers: buildable: false externals: @@ -18,11 +13,6 @@ packages: c: /opt/intel/oneapi/2025.3/bin/icx cxx: /opt/intel/oneapi/2025.3/bin/icpx fortran: /opt/intel/oneapi/2025.3/bin/ifx - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@11.5.0 %gcc@11.5.0 - prefix: /usr gcc: buildable: false externals: From 05d4c75540e668c309402d750181a8711035571e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 12 Jan 2026 08:36:39 -0700 Subject: [PATCH 04/16] Update submodule pointer for spack --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 014088166..459bb8abc 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 014088166de4846ff528b3d0bb38a6416d7e9614 +Subproject commit 459bb8abcfbfd33b5b9f097f88ca594b92232d2f From 1d0ef401186f815a2480169599e71ecb95a868f3 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 12 Jan 2026 13:10:53 -0700 Subject: [PATCH 05/16] Remove external/non-buildable runtime packages from .github/workflows/ubuntu-ci-x86_64-oneapi.cfg and .github/workflows/ubuntu-ci-x86_64-oneapi-ifx.cfg --- .github/workflows/ubuntu-ci-x86_64-oneapi-ifx.cfg | 5 ----- .github/workflows/ubuntu-ci-x86_64-oneapi.cfg | 5 ----- 2 files changed, 10 deletions(-) diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.cfg b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.cfg index 5650fdf74..714e30d1f 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.cfg +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.cfg @@ -7,11 +7,6 @@ c: /opt/intel/oneapi/compiler/2024.2/bin/icx cxx: /opt/intel/oneapi/compiler/2024.2/bin/icpx fortran: /opt/intel/oneapi/compiler/2024.2/bin/ifx - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2024.2.0 - prefix: /opt/intel/oneapi intel-oneapi-mkl: buildable: false externals: diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi.cfg b/.github/workflows/ubuntu-ci-x86_64-oneapi.cfg index e5dc3782e..26eb5420f 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi.cfg +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi.cfg @@ -7,11 +7,6 @@ c: /opt/intel/oneapi/compiler/2024.2/bin/icx cxx: /opt/intel/oneapi/compiler/2024.2/bin/icpx fortran: /opt/intel/oneapi/compiler/2024.2/bin/ifort - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2024.2.0 - prefix: /opt/intel/oneapi intel-oneapi-mkl: buildable: false externals: From fd687ef80e5fe9078c1c0a4ca3842b7d2c706aab Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 12 Jan 2026 16:54:53 -0700 Subject: [PATCH 06/16] Set variants/versions for snappy and py-lxml in configs/common/packages.yaml to avoid duplicate packages --- configs/common/packages.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 375fadb32..8f1f1d98b 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -347,6 +347,10 @@ packages: py-hatchling: require: - '@1.27:' + # To avoid duplicate packages + py-lxml: + require: + - '@5.2.2' # https://github.com/JCSDA/spack-stack/issues/1276 py-matplotlib: require: @@ -415,6 +419,10 @@ packages: sigio: require: - '@2.3.3' + # To avoid duplicate packages + snappy: + require: + - +shared sp: require: - '@2.5.0' From a22ae76534390dab0fe57e869aec282dd4c9774e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 12 Jan 2026 16:55:08 -0700 Subject: [PATCH 07/16] Attempt to fix spack-ext/lib/jcsda-emc/spack-stack/tests/test_setup_meta_modules.py --- .../jcsda-emc/spack-stack/tests/test_setup_meta_modules.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/spack-ext/lib/jcsda-emc/spack-stack/tests/test_setup_meta_modules.py b/spack-ext/lib/jcsda-emc/spack-stack/tests/test_setup_meta_modules.py index f4abf6135..af43f4714 100644 --- a/spack-ext/lib/jcsda-emc/spack-stack/tests/test_setup_meta_modules.py +++ b/spack-ext/lib/jcsda-emc/spack-stack/tests/test_setup_meta_modules.py @@ -49,7 +49,7 @@ def test_setup_meta_modules(): packages: all: prefer: - - '%gcc' + - "%[when=%c]c=gcc %[when=%cxx]cxx=gcc %[when=%fortran]fortran=gcc" gcc: externals: - spec: gcc@11.5.0 languages:='c,c++,fortran' @@ -59,10 +59,6 @@ def test_setup_meta_modules(): c: /usr/bin/gcc cxx: /usr/bin/g++ fortran: /usr/bin/gfortran - gcc-runtime: - externals: - - spec: gcc-runtime@11.5.0 %gcc@11.5.0 - prefix: /usr mpi: buildable: false openmpi: From 523380e91033f9a535145c964c2c652ade5c93cc Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 13 Jan 2026 06:01:37 -0700 Subject: [PATCH 08/16] Update .github/workflows/ubuntu-ci-x86_64-*.yaml: remove old prefer syntax --- .github/workflows/ubuntu-ci-x86_64-gnu.yaml | 2 +- .github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml | 2 +- .github/workflows/ubuntu-ci-x86_64-oneapi.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ubuntu-ci-x86_64-gnu.yaml b/.github/workflows/ubuntu-ci-x86_64-gnu.yaml index ea51c0e56..954fd7f4c 100644 --- a/.github/workflows/ubuntu-ci-x86_64-gnu.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-gnu.yaml @@ -113,7 +113,7 @@ jobs: # Set compiler and MPI specs spack config add "packages:mpi:require:['openmpi@5.0.8']" - spack config add "packages:all:prefer:['%gcc']" + #spack config add "packages:all:prefer:['%gcc']" # Add additional variants for MET packages, different from config/common/packages.yaml spack config add "packages:met:variants:+python +grib2 +graphics +lidar2nc +modis" diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml index d1fe87a0d..3c34a7dd6 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml @@ -120,7 +120,7 @@ jobs: # Set compiler and MPI specs spack config add "packages:mpi:buildable:False" spack config add "packages:mpi:require:['intel-oneapi-mpi@2021.13']" - spack config add "packages:all:prefer:['%oneapi']" + #spack config add "packages:all:prefer:['%oneapi']" # Add additional variants for MET packages, different from config/common/packages.yaml spack config add "packages:met:variants:+python +grib2 +graphics +lidar2nc +modis" diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml index 384a62214..18bbe6e11 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml @@ -120,7 +120,7 @@ jobs: # Set compiler and MPI specs spack config add "packages:mpi:buildable:False" spack config add "packages:mpi:require:['intel-oneapi-mpi@2021.13']" - spack config add "packages:all:prefer:['%oneapi']" + #spack config add "packages:all:prefer:['%oneapi']" # Add additional variants for MET packages, different from config/common/packages.yaml spack config add "packages:met:variants:+python +grib2 +graphics +lidar2nc +modis" From afda902c814dcb50d7ec191b8c1e43748b805d4f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 13 Jan 2026 09:53:26 -0700 Subject: [PATCH 09/16] configs/common/packages.yaml: set variant generator=make for libaec to prevent build errors with gcc when generator=ninja --- configs/common/packages.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 8f1f1d98b..beb5910c0 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -199,6 +199,10 @@ packages: landsfcutil: require: - '@2.4.2' + # https://github.com/JCSDA/spack-stack/actions/runs/20957699537/job/60226338267 + libaec: + prefer: + - build_system=cmake generator=make #libjpeg-turbo: # require: # - '@2.1.0' From c9c5fab171a63e21918c84ca607c32aac4e0f2b4 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 13 Jan 2026 09:56:33 -0700 Subject: [PATCH 10/16] configs/common/packages_*.yaml: Upde syntax for preferred compilers --- configs/common/packages_clang.yaml | 11 +++++++++-- configs/common/packages_gcc.yaml | 11 +++++++++-- configs/common/packages_oneapi.yaml | 11 +++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/configs/common/packages_clang.yaml b/configs/common/packages_clang.yaml index a0fca0722..7c1dd38e1 100644 --- a/configs/common/packages_clang.yaml +++ b/configs/common/packages_clang.yaml @@ -1,7 +1,14 @@ packages: - all: + # Compiler preferences + c: prefer: - - "%[when=%c]c=llvm %[when=%cxx]cxx=llvm %[when=%fortran]fortran=llvm" + - llvm + cxx: + prefer: + - llvm + fortran: + prefer: + - llvm # Virtual provider settings blas: require: [openblas] diff --git a/configs/common/packages_gcc.yaml b/configs/common/packages_gcc.yaml index 9ec58ff73..1f3925485 100644 --- a/configs/common/packages_gcc.yaml +++ b/configs/common/packages_gcc.yaml @@ -1,7 +1,14 @@ packages: - all: + # Compiler preferences + c: prefer: - - "%[when=%c]c=gcc %[when=%cxx]cxx=gcc %[when=%fortran]fortran=gcc" + - gcc + cxx: + prefer: + - gcc + fortran: + prefer: + - gcc # Virtual provider settings blas: require: [openblas] diff --git a/configs/common/packages_oneapi.yaml b/configs/common/packages_oneapi.yaml index 87706ed18..30db8f8c7 100644 --- a/configs/common/packages_oneapi.yaml +++ b/configs/common/packages_oneapi.yaml @@ -1,7 +1,14 @@ packages: - all: + # Compiler preferences + c: prefer: - - "%[when=%c]c=intel-oneapi-compilers %[when=%cxx]cxx=intel-oneapi-compilers %[when=%fortran]fortran=intel-oneapi-compilers" + - intel-oneapi-compilers + cxx: + prefer: + - intel-oneapi-compilers + fortran: + prefer: + - intel-oneapi-compilers # Virtual package settings blas: require: ['intel-oneapi-mkl'] From ce21e1676de4689d059ace73003b74eaf6517a06 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 13 Jan 2026 09:56:57 -0700 Subject: [PATCH 11/16] spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py: Update method to determine preferred compiler --- .../spack-stack/stack/meta_modules.py | 57 ++++--------------- 1 file changed, 10 insertions(+), 47 deletions(-) diff --git a/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py b/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py index d0a5dfdfe..0411dec69 100755 --- a/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py +++ b/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py @@ -173,59 +173,22 @@ def substitute_config_vars(config_str): def get_preferred_compiler(): - """DH* 20250730 - DO WE NEED BOTH WAYS TO DETERMINE THE PREFERRED COMPILER? - # MAYBE KEEP FOR NOW UNTIL WE KNOW BETTER WHAT IS NEEDED AND WHAT NOT. TODO: - UPDATE DOCSTRING""" - ## Method 1 - #try: - # preferred_compilers = spack.config.get("packages")["all"]["require"] - #except: - # raise Exception( - # """Unable to detect preferred compiler from environment. - # Does the environment have the config entry 'packages:all:require?'""" - # ) - #if len(preferred_compilers)>1: - # raise Exception(f"Invalid value for packages:all:require is {preferred_compilers}") - #match = re.search(r'%\[when=%fortran\](\S+)', preferred_compilers[0]) - ## Translate legacy names (intel, oneapi, ...) to new names (intel-oneapi-compilers-classic, ...) - #if match and match.group(1) in spack.aliases.LEGACY_COMPILER_TO_BUILTIN.keys(): - # preferred_compiler_v1 = spack.aliases.LEGACY_COMPILER_TO_BUILTIN[match.group(1)] - #else: - # preferred_compiler_v1 = match.group(1) - ## Method 2 - #try: - # preferred_compilers = spack.config.get("packages")["fortran"]["require"] - #except: - # raise Exception( - # """Unable to detect preferred compiler from environment. - # Does the environment have the config entry 'packages:fortran:require?'""" - # ) - #if len(preferred_compilers)>1: - # raise Exception(f"Invalid value for packages:fortran:require is {preferred_compilers}") - #preferred_compiler_v2 = preferred_compilers[0] - #if preferred_compiler_v1 == preferred_compiler_v2: - # preferred_compiler = preferred_compiler_v1 - # del preferred_compilers - # del preferred_compiler_v1 - # del preferred_compiler_v2 - #else: - # raise Exception(f"Multiple preferred compilers in spack config: {preferred_compiler_v1} vs {preferred_compiler_v2}") - #return preferred_compiler - # Determine preferred compiler + """Determine the preferred compiler by looking at + packages: + fortran: + prefer: + - COMPILER_NAME (gcc, intel-oneapi-compilers, llvm, ..) + """ try: - preferred_compilers = spack.config.get("packages")["all"]["prefer"] + preferred_compilers = spack.config.get("packages")["fortran"]["prefer"] except: raise Exception( """Unable to detect preferred compiler from environment. - Does the environment have the config entry 'packages:all:prefer?'""" + Does the environment have the config entry 'packages:fortran:prefer?'""" ) if len(preferred_compilers)>1: - raise Exception(f"Invalid value for packages:all:prefer is {preferred_compilers}") - preferred_compiler_legacy_name = preferred_compilers[0].replace('%','') - if preferred_compiler_legacy_name in spack.aliases.LEGACY_COMPILER_TO_BUILTIN.keys(): - preferred_compiler = spack.aliases.LEGACY_COMPILER_TO_BUILTIN[preferred_compiler_legacy_name] - else: - preferred_compiler = preferred_compiler_legacy_name + raise Exception(f"Invalid value for packages:fortran:prefer is {preferred_compilers}") + preferred_compiler = preferred_compilers[0] return preferred_compiler From 44bce8498a239050aef5208cfa63c74172df10d8 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 13 Jan 2026 09:57:32 -0700 Subject: [PATCH 12/16] Update spack-ext unit tests --- .../tests/test_setup_meta_modules.py | 24 ++++++++++--------- .../spack-stack/tests/test_stack_create.py | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/spack-ext/lib/jcsda-emc/spack-stack/tests/test_setup_meta_modules.py b/spack-ext/lib/jcsda-emc/spack-stack/tests/test_setup_meta_modules.py index af43f4714..3f3360b8e 100644 --- a/spack-ext/lib/jcsda-emc/spack-stack/tests/test_setup_meta_modules.py +++ b/spack-ext/lib/jcsda-emc/spack-stack/tests/test_setup_meta_modules.py @@ -47,9 +47,6 @@ def test_setup_meta_modules(): packages_definition = """ packages: - all: - prefer: - - "%[when=%c]c=gcc %[when=%cxx]cxx=gcc %[when=%fortran]fortran=gcc" gcc: externals: - spec: gcc@11.5.0 languages:='c,c++,fortran' @@ -63,12 +60,7 @@ def test_setup_meta_modules(): buildable: false openmpi: externals: - - spec: openmpi@4.1.8 %gcc@11.5.0 - prefix: /usr - python: - buildable: false - externals: - - spec: python@3.11.11 + - spec: openmpi@5.0.8 ~internal-hwloc +two_level_namespace prefix: /usr """ site_packages_yaml = os.path.join(env_dir, "site", "packages.yaml") @@ -77,8 +69,14 @@ def test_setup_meta_modules(): with open(site_packages_yaml, 'w') as f: f.write(packages_definition) + cmd = spack.main.SpackCommand("concretize") + cmd("--force", "--fresh") + cmd = spack.main.SpackCommand("install") - cmd("--add", "--no-cache", "gcc", "openmpi", "python") + cmd("--add", "--no-cache", "gcc", "openmpi") + + cmd = spack.main.SpackCommand("module") + cmd("tcl", "refresh", "--yes") spack_stack_cmd("setup-meta-modules") @@ -88,4 +86,8 @@ def test_setup_meta_modules(): f"Expected module {expected_comp_meta_module} not found" ) - expected_mpi_meta_module = os.path.join(module_dir, "gcc", "13.2.1", "stack-openmpi", "4.1.8") + expected_mpi_meta_module = os.path.join(module_dir, "gcc", "11.5.0", "stack-openmpi", "5.0.8") + assert( + os.path.exists(expected_mpi_meta_module), + f"Expected module {expected_mpi_meta_module} not found" + ) diff --git a/spack-ext/lib/jcsda-emc/spack-stack/tests/test_stack_create.py b/spack-ext/lib/jcsda-emc/spack-stack/tests/test_stack_create.py index 4fd890ec2..1db9bed87 100644 --- a/spack-ext/lib/jcsda-emc/spack-stack/tests/test_stack_create.py +++ b/spack-ext/lib/jcsda-emc/spack-stack/tests/test_stack_create.py @@ -165,7 +165,7 @@ def test_modules(): @pytest.mark.extension("stack") @pytest.mark.filterwarnings("ignore::UserWarning") def test_compilers(): - for compiler in ["gcc-13.2.1", "oneapi-2025.1.0"]: + for compiler in ["gcc-13.2.1", "oneapi-2024.2.1"]: if os.path.exists(test_dir): shutil.rmtree(test_dir) stack_create( From 5b1f3adb8e6a45202fea6f815ecee4ecaf6e9cfc Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 13 Jan 2026 15:02:08 -0700 Subject: [PATCH 13/16] Update .gitmodules and submodule pointer for repos/builtin for code review and testing --- .gitmodules | 6 ++++-- repos/builtin | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9be4ae217..e30a47a3f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,5 +6,7 @@ branch = feature/update_spack-stack-dev_from_develop [submodule "repos/builtin"] path = repos/builtin - url = https://github.com/jcsda/spack-packages - branch = spack-stack-dev + #url = https://github.com/jcsda/spack-packages + #branch = spack-stack-dev + url = https://github.com/climbfuji/spack-packages + branch = feature/cherry_pick_bufrquery_spack_develop \ No newline at end of file diff --git a/repos/builtin b/repos/builtin index 16dbff2ac..2c6ef0de2 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 16dbff2ac83a0f9d7cece082b180106aa4d7014f +Subproject commit 2c6ef0de28698d786961c494c51ffcabfe04f6c2 From e0ce0fad042bb01195da4cce8be7f70fbea603db Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 13 Jan 2026 15:02:40 -0700 Subject: [PATCH 14/16] Bump bufr-query to 0.0.5 --- configs/common/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index beb5910c0..6e9b15e4c 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -30,7 +30,7 @@ packages: - +python bufr-query: require: - - '@0.0.4' + - '@0.0.5' - +python cairo: require: From 7169e1eb78aaf27273e1ac9b136119e8c8e917b6 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 14 Jan 2026 07:18:55 -0700 Subject: [PATCH 15/16] Revert .gitmodules and update submodule pointer for repos/builtin --- .gitmodules | 2 +- repos/builtin | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index e30a47a3f..b5bf898fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,4 @@ #url = https://github.com/jcsda/spack-packages #branch = spack-stack-dev url = https://github.com/climbfuji/spack-packages - branch = feature/cherry_pick_bufrquery_spack_develop \ No newline at end of file + branch = bugfix/pixman_meson_libpng diff --git a/repos/builtin b/repos/builtin index 2c6ef0de2..065ea7250 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 2c6ef0de28698d786961c494c51ffcabfe04f6c2 +Subproject commit 065ea7250f9a4d6aa53d9a2a105f2ff4c2258caf From 75a0d1ff3083a4ef4dbd52397d6d9cc9b6ad736c Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 14 Jan 2026 10:57:36 -0700 Subject: [PATCH 16/16] Remove all external compiler runtime packages from all site configs --- .../containers/docker-ubuntu-gcc-openmpi.yaml | 5 -- .../docker-ubuntu-gcc11-openmpi.yaml | 5 -- .../containers/docker-ubuntu-oneapi-impi.yaml | 7 -- .../tier1/atlantis/packages_gcc-13.4.0.yaml | 5 -- .../atlantis/packages_oneapi-2024.2.1.yaml | 10 --- .../atlantis/packages_oneapi-2025.3.0.yaml | 10 --- .../tier1/blueback/packages_gcc-13.3.0.yaml | 5 -- .../blueback/packages_oneapi-2025.0.4.yaml | 16 ----- .../packages_oneapi-2025.2.1.yaml.donotuse | 72 ------------------- .../tier1/derecho/packages_gcc-12.4.0.yaml | 5 -- .../tier1/derecho/packages_gcc-12.5.0.yaml | 5 -- .../derecho/packages_oneapi-2025.2.1.yaml | 10 --- .../tier1/discover-scu17/packages_oneapi.yaml | 5 -- .../tier1/gaea-c6/packages_gcc-12.3.0.yaml | 5 -- .../tier1/gaea-c6/packages_gcc-13.3.1.yaml | 5 -- .../gaea-c6/packages_oneapi-2025.2.1.yaml | 10 --- .../tier1/hercules/packages_gcc-12.2.0.yaml | 5 -- .../hercules/packages_oneapi-2025.3.1.yaml | 10 --- .../tier1/narwhal/packages_gcc-12.2.0.yaml | 5 -- .../narwhal/packages_oneapi-2024.2.0.yaml | 10 --- .../sites/tier1/nas/packages_gcc-13.2.0.yaml | 5 -- .../tier1/nas/packages_oneapi-2024.2.0.yaml | 12 ---- .../tier1/nautilus/packages_gcc-13.3.1.yaml | 5 -- .../nautilus/packages_oneapi-2025.3.0.yaml | 10 --- .../tier1/navy-aws/packages_gcc-13.4.0.yaml | 4 -- .../navy-aws/packages_oneapi-2025.3.0.yaml | 14 ---- .../tier1/orion/packages_gcc-12.2.0.yaml | 5 -- .../tier1/orion/packages_oneapi-2025.3.1.yaml | 10 --- .../sites/tier1/ursa/packages_gcc-12.4.0.yaml | 5 -- .../ursa/packages_oneapi-2025.2.1-hpcx.yaml | 10 --- .../tier1/ursa/packages_oneapi-2025.2.1.yaml | 10 --- configs/sites/tier2/aws-ubuntu2404/README.md | 18 ----- .../sites/tier2/aws-ubuntu2404/packages.yaml | 5 -- .../tier2/aws-ubuntu2404/packages_oneapi.yaml | 7 -- configs/sites/tier2/cole/packages_oneapi.yaml | 4 -- .../sites/tier2/endeavor/packages_oneapi.yaml | 4 -- configs/sites/tier2/jean/packages_oneapi.yaml | 4 -- configs/sites/tier2/tusk/packages_oneapi.yaml | 4 -- .../sites/tier2/wheat/packages_oneapi.yaml | 4 -- 39 files changed, 350 deletions(-) delete mode 100644 configs/sites/tier1/blueback/packages_oneapi-2025.2.1.yaml.donotuse diff --git a/configs/containers/docker-ubuntu-gcc-openmpi.yaml b/configs/containers/docker-ubuntu-gcc-openmpi.yaml index 982c20974..a8120c55e 100644 --- a/configs/containers/docker-ubuntu-gcc-openmpi.yaml +++ b/configs/containers/docker-ubuntu-gcc-openmpi.yaml @@ -28,11 +28,6 @@ spack: c: /usr/bin/gcc cxx: /usr/bin/g++ fortran: /usr/bin/gfortran - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@13.3.0 - prefix: /usr mpi: require: [openmpi@5.0.8] diff --git a/configs/containers/docker-ubuntu-gcc11-openmpi.yaml b/configs/containers/docker-ubuntu-gcc11-openmpi.yaml index d9013e051..0c43fddb9 100644 --- a/configs/containers/docker-ubuntu-gcc11-openmpi.yaml +++ b/configs/containers/docker-ubuntu-gcc11-openmpi.yaml @@ -42,11 +42,6 @@ spack: c: /usr/bin/gcc cxx: /usr/bin/g++ fortran: /usr/bin/gfortran - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@11.4.0 - prefix: /usr mpi: require: [openmpi@5.0.8] diff --git a/configs/containers/docker-ubuntu-oneapi-impi.yaml b/configs/containers/docker-ubuntu-oneapi-impi.yaml index 4df2a9792..1f08a2e5a 100644 --- a/configs/containers/docker-ubuntu-oneapi-impi.yaml +++ b/configs/containers/docker-ubuntu-oneapi-impi.yaml @@ -64,13 +64,6 @@ spack: prefix: /opt/intel/oneapi modules: - tbb/2022.3 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2025.3.0 - prefix: /opt/intel/oneapi - modules: - - compiler-rt/2025.3.0 mpi: require: [intel-oneapi-mpi@2021.17] mpich: diff --git a/configs/sites/tier1/atlantis/packages_gcc-13.4.0.yaml b/configs/sites/tier1/atlantis/packages_gcc-13.4.0.yaml index 1de501a42..d71f50b97 100644 --- a/configs/sites/tier1/atlantis/packages_gcc-13.4.0.yaml +++ b/configs/sites/tier1/atlantis/packages_gcc-13.4.0.yaml @@ -3,11 +3,6 @@ packages: buildable: False require: - openmpi@4.1.8 - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@13.4.0%gcc@13.4.0 - prefix: /gpfs/neptune/spack-stack/gcc-13.4.0 gcc: buildable: False externals: diff --git a/configs/sites/tier1/atlantis/packages_oneapi-2024.2.1.yaml b/configs/sites/tier1/atlantis/packages_oneapi-2024.2.1.yaml index 8a643cd53..25e83ccf6 100644 --- a/configs/sites/tier1/atlantis/packages_oneapi-2024.2.1.yaml +++ b/configs/sites/tier1/atlantis/packages_oneapi-2024.2.1.yaml @@ -3,11 +3,6 @@ packages: buildable: false require: - intel-oneapi-mpi@2021.13 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2024.2.1 - prefix: /cm/shared/apps/intel/oneapi-2024.2.1 intel-oneapi-compilers: buildable: false externals: @@ -30,11 +25,6 @@ packages: extra_rpaths: - /cm/local/apps/gcc/11.2.0/lib64 - /cm/local/apps/gcc/11.2.0/lib - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@11.2.0 - prefix: /cm/local/apps/gcc/11.2.0 gcc: buildable: false externals: diff --git a/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml b/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml index bbd36f451..ca673fce0 100644 --- a/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml +++ b/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml @@ -3,11 +3,6 @@ packages: buildable: false require: - intel-oneapi-mpi@2021.17 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2025.3.0 - prefix: /gpfs/neptune/spack-stack/oneapi-2025.3.0 intel-oneapi-compilers: buildable: false externals: @@ -30,11 +25,6 @@ packages: extra_rpaths: - /cm/local/apps/gcc/11.2.0/lib64 - /cm/local/apps/gcc/11.2.0/lib - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@11.2.0 - prefix: /cm/local/apps/gcc/11.2.0 gcc: buildable: false externals: diff --git a/configs/sites/tier1/blueback/packages_gcc-13.3.0.yaml b/configs/sites/tier1/blueback/packages_gcc-13.3.0.yaml index 582f42c0f..78fb81ee6 100644 --- a/configs/sites/tier1/blueback/packages_gcc-13.3.0.yaml +++ b/configs/sites/tier1/blueback/packages_gcc-13.3.0.yaml @@ -3,11 +3,6 @@ packages: buildable: false require: - cray-mpich@8.1.32 - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@13.3.0 - prefix: /usr gcc: buildable: false externals: diff --git a/configs/sites/tier1/blueback/packages_oneapi-2025.0.4.yaml b/configs/sites/tier1/blueback/packages_oneapi-2025.0.4.yaml index 136ed85d8..0924a7055 100644 --- a/configs/sites/tier1/blueback/packages_oneapi-2025.0.4.yaml +++ b/configs/sites/tier1/blueback/packages_oneapi-2025.0.4.yaml @@ -3,14 +3,6 @@ packages: buildable: false require: - cray-mpich@8.1.32 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2025.0.4 - prefix: /p/app/intel/oneapi-combined - modules: - - PrgEnv-intel/8.6.0 - - intel-oneapi/2025.0 intel-oneapi-compilers: buildable: false externals: @@ -27,14 +19,6 @@ packages: environment: set: CONFIG_SITE: '' - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@13.3.0 - prefix: /usr - modules: - - PrgEnv-gnu/8.6.0 - - gcc-native/13.2 gcc: buildable: false externals: diff --git a/configs/sites/tier1/blueback/packages_oneapi-2025.2.1.yaml.donotuse b/configs/sites/tier1/blueback/packages_oneapi-2025.2.1.yaml.donotuse deleted file mode 100644 index f75d8ea2d..000000000 --- a/configs/sites/tier1/blueback/packages_oneapi-2025.2.1.yaml.donotuse +++ /dev/null @@ -1,72 +0,0 @@ -packages: - mpi: - buildable: false - require: - - cray-mpich@8.1.32 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2025.2.1 - prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.2.1 - modules: - - PrgEnv-intel/8.6.0 - - intel-oneapi/2025.2.1 - intel-oneapi-compilers: - buildable: false - externals: - - spec: intel-oneapi-compilers@2025.2.1 - prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.2.1 - modules: - - PrgEnv-intel/8.6.0 - - intel-oneapi/2025.2.1 - extra_attributes: - compilers: - c: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.2.1/compiler/2025.2/bin/icx - cxx: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.2.1/compiler/2025.2/bin/icpx - fortran: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.2.1/compiler/2025.2/bin/ifx - environment: - set: - CONFIG_SITE: '' - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@13.3.0 - prefix: /usr - modules: - - PrgEnv-gnu/8.6.0 - - gcc-native/13.2 - gcc: - buildable: false - externals: - - spec: gcc@13.3.0 languages:='c,c++' - prefix: /usr - modules: - - PrgEnv-gnu/8.6.0 - - gcc-native/13.2 - extra_attributes: - compilers: - c: /usr/bin/gcc - cxx: /usr/bin/g++ - fortran: /usr/bin/gfortran - environment: - set: - CONFIG_SITE: '' - PE_GCC_EXTERNAL: native - cray-mpich: - buildable: false - externals: - - spec: cray-mpich@8.1.32 - prefix: /opt/cray/pe/mpich/8.1.32/ofi/INTEL/2022.1 - modules: - - libfabric/1.22.0 - - craype-network-ofi - - cray-mpich/8.1.32 - extra_attributes: - environment: - prepend_path: - CMAKE_PREFIX_PATH: /p/app/projects/NEPTUNE/spack-stack/cmake-findmpi - intel-oneapi-mkl: - buildable: false - externals: - - spec: intel-oneapi-mkl@2025.2 - prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.2.1 diff --git a/configs/sites/tier1/derecho/packages_gcc-12.4.0.yaml b/configs/sites/tier1/derecho/packages_gcc-12.4.0.yaml index b33163c33..5f81689ca 100644 --- a/configs/sites/tier1/derecho/packages_gcc-12.4.0.yaml +++ b/configs/sites/tier1/derecho/packages_gcc-12.4.0.yaml @@ -13,11 +13,6 @@ packages: - cray-mpich/8.1.29 - libfabric/1.15.2.0 - cray-pals/1.2.11 - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@12.4.0 - prefix: /glade/u/apps/casper/24.12/spack/opt/spack/gcc/12.4.0/5b5c gcc: buildable: False externals: diff --git a/configs/sites/tier1/derecho/packages_gcc-12.5.0.yaml b/configs/sites/tier1/derecho/packages_gcc-12.5.0.yaml index f05ac4fb0..0124c8698 100644 --- a/configs/sites/tier1/derecho/packages_gcc-12.5.0.yaml +++ b/configs/sites/tier1/derecho/packages_gcc-12.5.0.yaml @@ -13,11 +13,6 @@ packages: - cray-mpich/8.1.32 - libfabric/1.22.0 #- cray-pals/1.2.11 - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@12.5.0 - prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg gcc: buildable: False externals: diff --git a/configs/sites/tier1/derecho/packages_oneapi-2025.2.1.yaml b/configs/sites/tier1/derecho/packages_oneapi-2025.2.1.yaml index 54b386e70..cd094c017 100644 --- a/configs/sites/tier1/derecho/packages_oneapi-2025.2.1.yaml +++ b/configs/sites/tier1/derecho/packages_oneapi-2025.2.1.yaml @@ -11,11 +11,6 @@ packages: - craype/2.7.34 - cray-mpich/8.1.32 - libfabric/1.22.0 - intel-oneapi-runtime: - buildable: False - externals: - - spec: intel-oneapi-runtime@2025.2.1 - prefix: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.2.1/s4f2 intel-oneapi-compilers: buildable: False externals: @@ -47,11 +42,6 @@ packages: prefix: /glade/u/apps/derecho/25.10/spack/opt/spack/intel-oneapi-mkl/2025.2.0/intel-oneapi-compilers/2025.2.1/fj2q modules: - intel-oneapi-mkl/2025.2.0 - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@12.5.0 - prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg gcc: buildable: False externals: diff --git a/configs/sites/tier1/discover-scu17/packages_oneapi.yaml b/configs/sites/tier1/discover-scu17/packages_oneapi.yaml index b1b2a3ab7..a0db0bcb2 100644 --- a/configs/sites/tier1/discover-scu17/packages_oneapi.yaml +++ b/configs/sites/tier1/discover-scu17/packages_oneapi.yaml @@ -38,11 +38,6 @@ packages: externals: - spec: intel-oneapi-mkl@2024.2.0%oneapi@2024.2.0 prefix: /usr/local/intel/oneapi/2024 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2024.2.0%oneapi@2024.2.0 - prefix: /usr/local/intel/oneapi/2024 gcc: externals: - spec: gcc@12.3.0 languages:='c,c++,fortran' diff --git a/configs/sites/tier1/gaea-c6/packages_gcc-12.3.0.yaml b/configs/sites/tier1/gaea-c6/packages_gcc-12.3.0.yaml index 5430b7a63..aca695ce5 100644 --- a/configs/sites/tier1/gaea-c6/packages_gcc-12.3.0.yaml +++ b/configs/sites/tier1/gaea-c6/packages_gcc-12.3.0.yaml @@ -9,11 +9,6 @@ packages: modules: - cray-mpich/8.1.32 - craype-network-ofi - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@12.3.0 - prefix: /opt/cray/pe/gcc-native/12/bin gcc: buildable: False externals: diff --git a/configs/sites/tier1/gaea-c6/packages_gcc-13.3.1.yaml b/configs/sites/tier1/gaea-c6/packages_gcc-13.3.1.yaml index 354f6e75a..ba2f6a6df 100644 --- a/configs/sites/tier1/gaea-c6/packages_gcc-13.3.1.yaml +++ b/configs/sites/tier1/gaea-c6/packages_gcc-13.3.1.yaml @@ -9,11 +9,6 @@ packages: modules: - cray-mpich/8.1.32 - craype-network-ofi - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@13.3.1 - prefix: /opt/cray/pe/gcc-native/13/bin gcc: buildable: False externals: diff --git a/configs/sites/tier1/gaea-c6/packages_oneapi-2025.2.1.yaml b/configs/sites/tier1/gaea-c6/packages_oneapi-2025.2.1.yaml index 7f783a912..5f6ceab36 100644 --- a/configs/sites/tier1/gaea-c6/packages_oneapi-2025.2.1.yaml +++ b/configs/sites/tier1/gaea-c6/packages_oneapi-2025.2.1.yaml @@ -11,11 +11,6 @@ packages: - cray-mpich/8.1.32 - libfabric/1.22.0 - craype-network-ofi - intel-oneapi-runtime: - buildable: False - externals: - - spec: intel-oneapi-runtime@2025.2.1 - prefix: /opt/intel/oneapi intel-oneapi-compilers: buildable: False externals: @@ -48,11 +43,6 @@ packages: externals: - spec: intel-oneapi-mkl@2025.2 prefix: /opt/intel/oneapi - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@12.3.0 - prefix: /opt/cray/pe/gcc-native/12/bin gcc: buildable: False externals: diff --git a/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml b/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml index ccdc36b1a..7c0ba5253 100644 --- a/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml +++ b/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml @@ -10,11 +10,6 @@ packages: prefix: /apps/spack-managed/gcc-11.3.1/openmpi-4.1.4-zabolhazla2ahsroedlyt2pu4mkp7o3q modules: - openmpi/4.1.4 - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@12.2.0 - prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo gcc: buildable: False externals: diff --git a/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml index 4cd6218c9..8c0ee42a1 100644 --- a/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml +++ b/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml @@ -10,11 +10,6 @@ packages: prefix: /apps/spack-managed-x86_64_v3-v1.0/intel-oneapi-compilers-2025.3.1/intel-oneapi-mpi-2021.17.1-yin2cansthgf7jsldji6psbjkxqmrz3n modules: - intel-oneapi-mpi/2021.17.1 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2025.3.1 - prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj intel-oneapi-compilers: buildable: false externals: @@ -49,11 +44,6 @@ packages: prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-tbb-2022.3.0-npcdu7tjriihmbm4cbi4fepycg34d2fd modules: - intel-oneapi-tbb/2022.3.0 - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@12.2.0 - prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo gcc: buildable: false externals: diff --git a/configs/sites/tier1/narwhal/packages_gcc-12.2.0.yaml b/configs/sites/tier1/narwhal/packages_gcc-12.2.0.yaml index 8b0c60b1b..eddc18aff 100644 --- a/configs/sites/tier1/narwhal/packages_gcc-12.2.0.yaml +++ b/configs/sites/tier1/narwhal/packages_gcc-12.2.0.yaml @@ -3,11 +3,6 @@ packages: buildable: false require: - cray-mpich@8.1.26 - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@12.2.0 - prefix: /opt/cray/pe/gcc/12.2.0/snos gcc: buildable: false externals: diff --git a/configs/sites/tier1/narwhal/packages_oneapi-2024.2.0.yaml b/configs/sites/tier1/narwhal/packages_oneapi-2024.2.0.yaml index b3e6896f8..f4484548c 100644 --- a/configs/sites/tier1/narwhal/packages_oneapi-2024.2.0.yaml +++ b/configs/sites/tier1/narwhal/packages_oneapi-2024.2.0.yaml @@ -3,11 +3,6 @@ packages: buildable: false require: - cray-mpich@8.1.26 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2024.2.0 - prefix: /opt/intel/oneapi_2024.2.0.634 intel-oneapi-compilers: buildable: false externals: @@ -33,11 +28,6 @@ packages: - /opt/cray/libfabric/1.22.0/lib64 - /opt/cray/pe/gcc/12.2.0/snos/lib64 - /opt/cray/pe/gcc/12.2.0/snos/lib - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@12.2.0 - prefix: /opt/cray/pe/gcc/12.2.0/snos gcc: buildable: false externals: diff --git a/configs/sites/tier1/nas/packages_gcc-13.2.0.yaml b/configs/sites/tier1/nas/packages_gcc-13.2.0.yaml index 58a198650..083c2039a 100644 --- a/configs/sites/tier1/nas/packages_gcc-13.2.0.yaml +++ b/configs/sites/tier1/nas/packages_gcc-13.2.0.yaml @@ -3,11 +3,6 @@ packages: buildable: false require: - "openmpi@4.1.8" - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@13.2.0%gcc@13.2.0 - prefix: /nobackup/gmao_SIteam/gcc/gcc-13.2.0 gcc: buildable: false externals: diff --git a/configs/sites/tier1/nas/packages_oneapi-2024.2.0.yaml b/configs/sites/tier1/nas/packages_oneapi-2024.2.0.yaml index a37f2788e..a3ffa6371 100644 --- a/configs/sites/tier1/nas/packages_oneapi-2024.2.0.yaml +++ b/configs/sites/tier1/nas/packages_oneapi-2024.2.0.yaml @@ -3,13 +3,6 @@ packages: buildable: false require: - "mpt@2.30" - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2024.2.1 - prefix: /nobackup/gmao_SIteam/intel/oneapi/compiler/2024.2/bin/ifort - modules: - - comp-intel/2024.2.0-ifort intel-oneapi-compilers: externals: - spec: intel-oneapi-compilers@2024.2.0 @@ -29,11 +22,6 @@ packages: extra_rpaths: - /nobackup/gmao_SIteam/gcc/gcc-12.3.0-TOSS4/lib64 - /nobackup/gmao_SIteam/gcc/gcc-12.3.0-TOSS4/lib - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@12.3.0%gcc@12.3.0 - prefix: /nobackup/gmao_SIteam/gcc/gcc-12.3.0-TOSS4 gcc: externals: - spec: gcc@12.3.0 languages:='c,c++' diff --git a/configs/sites/tier1/nautilus/packages_gcc-13.3.1.yaml b/configs/sites/tier1/nautilus/packages_gcc-13.3.1.yaml index 552589cce..3a4a8adee 100644 --- a/configs/sites/tier1/nautilus/packages_gcc-13.3.1.yaml +++ b/configs/sites/tier1/nautilus/packages_gcc-13.3.1.yaml @@ -3,11 +3,6 @@ packages: buildable: False require: - openmpi@5.0.8 - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@13.3.1 - prefix: /opt/rh/gcc-toolset-13/root/usr gcc: buildable: False externals: diff --git a/configs/sites/tier1/nautilus/packages_oneapi-2025.3.0.yaml b/configs/sites/tier1/nautilus/packages_oneapi-2025.3.0.yaml index 166b318a0..3cc64c1ac 100644 --- a/configs/sites/tier1/nautilus/packages_oneapi-2025.3.0.yaml +++ b/configs/sites/tier1/nautilus/packages_oneapi-2025.3.0.yaml @@ -3,11 +3,6 @@ packages: buildable: false require: - intel-oneapi-mpi@2021.17 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2025.3.0 - prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.3.0 intel-oneapi-compilers: buildable: false externals: @@ -30,11 +25,6 @@ packages: extra_rpaths: - /opt/rh/gcc-toolset-11/root/usr/lib64 - /opt/rh/gcc-toolset-11/root/usr/lib - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@11.2.1 - prefix: /opt/rh/gcc-toolset-11/root/usr gcc: buildable: false externals: diff --git a/configs/sites/tier1/navy-aws/packages_gcc-13.4.0.yaml b/configs/sites/tier1/navy-aws/packages_gcc-13.4.0.yaml index af6fe093a..b58bd1b1c 100644 --- a/configs/sites/tier1/navy-aws/packages_gcc-13.4.0.yaml +++ b/configs/sites/tier1/navy-aws/packages_gcc-13.4.0.yaml @@ -21,10 +21,6 @@ packages: # c: /usr/bin/gcc # cxx: /usr/bin/g++ # fortran: /usr/bin/gfortran - gcc-runtime: - externals: - - spec: gcc-runtime@13.4.0%gcc@13.4.0 - prefix: /project/spack-stack/gcc-13.4.0 openmpi: externals: - spec: openmpi@4.1.8 diff --git a/configs/sites/tier1/navy-aws/packages_oneapi-2025.3.0.yaml b/configs/sites/tier1/navy-aws/packages_oneapi-2025.3.0.yaml index 26c5bd899..a16d15cc5 100644 --- a/configs/sites/tier1/navy-aws/packages_oneapi-2025.3.0.yaml +++ b/configs/sites/tier1/navy-aws/packages_oneapi-2025.3.0.yaml @@ -38,15 +38,6 @@ packages: prefix: /project/spack-stack/oneapi-2025.3.0 modules: - tbb/2022.3 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2025.3.0 - prefix: /project/spack-stack/oneapi-2025.3.0 - modules: - - umf/1.0 - - tbb/2022.3 - - compiler-rt/2025.3.0 gcc: buildable: false externals: @@ -57,8 +48,3 @@ packages: c: /usr/bin/gcc cxx: /usr/bin/g++ fortran: /usr/bin/gfortran - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@11.5.0 - prefix: /usr diff --git a/configs/sites/tier1/orion/packages_gcc-12.2.0.yaml b/configs/sites/tier1/orion/packages_gcc-12.2.0.yaml index fe5305df0..5ef11e177 100644 --- a/configs/sites/tier1/orion/packages_gcc-12.2.0.yaml +++ b/configs/sites/tier1/orion/packages_gcc-12.2.0.yaml @@ -10,11 +10,6 @@ packages: prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/openmpi-4.1.6-awzgueipsaecmty57kpycopknhad3xbe modules: - openmpi/4.1.6 - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@12.2.0 - prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3 gcc: buildable: False externals: diff --git a/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml index 1a0cefc1f..4d7713b32 100644 --- a/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml +++ b/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml @@ -10,11 +10,6 @@ packages: prefix: /apps/spack-managed-x86_64_v3-v1.0/intel-oneapi-compilers-2025.3.1/intel-oneapi-mpi-2021.17.1-yin2cansthgf7jsldji6psbjkxqmrz3n modules: - intel-oneapi-mpi/2021.17.1 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2025.3.1 - prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj intel-oneapi-compilers: buildable: false externals: @@ -49,11 +44,6 @@ packages: prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-tbb-2022.3.0-npcdu7tjriihmbm4cbi4fepycg34d2fd modules: - intel-oneapi-tbb/2022.3.0 - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@12.2.0 - prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3 gcc: buildable: false externals: diff --git a/configs/sites/tier1/ursa/packages_gcc-12.4.0.yaml b/configs/sites/tier1/ursa/packages_gcc-12.4.0.yaml index be934552c..0c370d962 100644 --- a/configs/sites/tier1/ursa/packages_gcc-12.4.0.yaml +++ b/configs/sites/tier1/ursa/packages_gcc-12.4.0.yaml @@ -3,11 +3,6 @@ packages: buildable: False require: - openmpi@4.1.6 - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@12.4.0 - prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrh gcc: buildable: False externals: diff --git a/configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml index 8c3777f6b..c6a237d32 100644 --- a/configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml +++ b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml @@ -10,11 +10,6 @@ packages: prefix: /apps/hpcx-v2.18.1-gcc-mlnx_ofed-redhat9-cuda12-x86_64/ompi-mt-oneapi2025 modules: - hpc-x/2.18.1-mt-oneapi2025 - intel-oneapi-runtime: - buildable: False - externals: - - spec: intel-oneapi-runtime@2025.2.1 - prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.2.1-5nijquf65qj5mmbn3k2gxkjkrjkpjtw7 intel-oneapi-compilers: buildable: False externals: @@ -42,11 +37,6 @@ packages: prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-mkl-2024.2.1-srqwrbzwo2k7hxuuhlrxttburs5jvlat modules: - intel-oneapi-mkl/2024.2.1 - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@12.4.0 - prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj gcc: buildable: False externals: diff --git a/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml index 6fa652297..2b2ea531c 100644 --- a/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml +++ b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml @@ -3,11 +3,6 @@ packages: buildable: False require: - intel-oneapi-mpi@2021.13 - intel-oneapi-runtime: - buildable: False - externals: - - spec: intel-oneapi-runtime@2025.2.1 - prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.2.1-5nijquf65qj5mmbn3k2gxkjkrjkpjtw7 intel-oneapi-compilers: buildable: False externals: @@ -47,11 +42,6 @@ packages: externals: - spec: intel-oneapi-tbb@2021.12 prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-tbb-2021.12.0-grcsmccjpm3trn6rgtyq76kdxks6ygzm - gcc-runtime: - buildable: False - externals: - - spec: gcc-runtime@12.4.0 - prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj gcc: buildable: False externals: diff --git a/configs/sites/tier2/aws-ubuntu2404/README.md b/configs/sites/tier2/aws-ubuntu2404/README.md index 46c7a046a..db95db5bd 100644 --- a/configs/sites/tier2/aws-ubuntu2404/README.md +++ b/configs/sites/tier2/aws-ubuntu2404/README.md @@ -161,11 +161,6 @@ cat << 'EOF' >> $PWD/site/packages.yaml externals: - spec: gcc@11.4.0 prefix: /usr - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@11.4.0 - prefix: /usr qt: buildable: false externals: @@ -288,14 +283,8 @@ spack external find --scope system grep # following tricky situations # - External find doesn't work well for pre-installed intel-oneapi-mpi # and we are using an external module load for this. -# - Specify correct gcc runtime. # - Disable "buildable" on all intel modules. cat << 'EOF' >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@13.3.0 - prefix: /usr intel-oneapi-mkl: buildable: false externals: @@ -317,13 +306,6 @@ cat << 'EOF' >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml prefix: /opt/intel/oneapi modules: - tbb/2022.3 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2025.3.0 - prefix: /opt/intel/oneapi - modules: - - compiler-rt/2025.3.0 EOF spack compiler find --scope system diff --git a/configs/sites/tier2/aws-ubuntu2404/packages.yaml b/configs/sites/tier2/aws-ubuntu2404/packages.yaml index 1b22e06af..3b8a5ec72 100644 --- a/configs/sites/tier2/aws-ubuntu2404/packages.yaml +++ b/configs/sites/tier2/aws-ubuntu2404/packages.yaml @@ -4,11 +4,6 @@ packages: externals: - spec: gmake@4.3 prefix: /usr - gcc-runtime: - buildable: false - externals: - - spec: gcc-runtime@13.3.0 - prefix: /usr grep: externals: - spec: grep@3.11 diff --git a/configs/sites/tier2/aws-ubuntu2404/packages_oneapi.yaml b/configs/sites/tier2/aws-ubuntu2404/packages_oneapi.yaml index 63eec2fc2..c70f6a2eb 100644 --- a/configs/sites/tier2/aws-ubuntu2404/packages_oneapi.yaml +++ b/configs/sites/tier2/aws-ubuntu2404/packages_oneapi.yaml @@ -49,10 +49,3 @@ packages: prefix: /opt/intel/oneapi modules: - tbb/2022.3 - intel-oneapi-runtime: - buildable: false - externals: - - spec: intel-oneapi-runtime@2025.3.0 - prefix: /opt/intel/oneapi - modules: - - compiler-rt/2025.3.0 diff --git a/configs/sites/tier2/cole/packages_oneapi.yaml b/configs/sites/tier2/cole/packages_oneapi.yaml index 510e007b8..6c49473f0 100644 --- a/configs/sites/tier2/cole/packages_oneapi.yaml +++ b/configs/sites/tier2/cole/packages_oneapi.yaml @@ -19,7 +19,3 @@ packages: externals: - spec: intel-oneapi-tbb@2021.13%oneapi@2024.2.1 prefix: /p/work1/heinzell/spack-stack/oneapi-2024.2.1 - intel-oneapi-runtime: - externals: - - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1 - prefix: /p/work1/heinzell/spack-stack/oneapi-2024.2.1 diff --git a/configs/sites/tier2/endeavor/packages_oneapi.yaml b/configs/sites/tier2/endeavor/packages_oneapi.yaml index a063f5d80..4cfde4463 100644 --- a/configs/sites/tier2/endeavor/packages_oneapi.yaml +++ b/configs/sites/tier2/endeavor/packages_oneapi.yaml @@ -17,7 +17,3 @@ packages: externals: - spec: intel-oneapi-tbb@2022.1%oneapi@2025.1.3 prefix: /global/panfs05/admin5/opt/intel/oneAPI/2025.1.3 - intel-oneapi-runtime: - externals: - - spec: intel-oneapi-runtime@2025.1.3%oneapi@2025.1.3 - prefix: /global/panfs05/admin5/opt/intel/oneAPI/2025.1.3 diff --git a/configs/sites/tier2/jean/packages_oneapi.yaml b/configs/sites/tier2/jean/packages_oneapi.yaml index f5fdb63b6..c0bd3e9b4 100644 --- a/configs/sites/tier2/jean/packages_oneapi.yaml +++ b/configs/sites/tier2/jean/packages_oneapi.yaml @@ -19,7 +19,3 @@ packages: externals: - spec: intel-oneapi-tbb@2021.13%oneapi@2024.2.1 prefix: /p/work1/heinzell/oneapi-2024.2.1 - intel-oneapi-runtime: - externals: - - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1 - prefix: /p/work1/heinzell/oneapi-2024.2.1 diff --git a/configs/sites/tier2/tusk/packages_oneapi.yaml b/configs/sites/tier2/tusk/packages_oneapi.yaml index 3bcf99f38..ff2b902bc 100644 --- a/configs/sites/tier2/tusk/packages_oneapi.yaml +++ b/configs/sites/tier2/tusk/packages_oneapi.yaml @@ -21,7 +21,3 @@ packages: prefix: /opt/intel/oneapi_2024.2.0.634 modules: - tbb/2021.13 - intel-oneapi-runtime: - externals: - - spec: intel-oneapi-runtime@2024.2.0%oneapi@2024.2.0 - prefix: /opt/intel/oneapi_2024.2.0.634 diff --git a/configs/sites/tier2/wheat/packages_oneapi.yaml b/configs/sites/tier2/wheat/packages_oneapi.yaml index 80c56dfd6..1594c3e8a 100644 --- a/configs/sites/tier2/wheat/packages_oneapi.yaml +++ b/configs/sites/tier2/wheat/packages_oneapi.yaml @@ -19,7 +19,3 @@ packages: externals: - spec: intel-oneapi-tbb@2021.13%oneapi@2024.2.1 prefix: /p/global/Projects/NEPTUNE/spack-stack/oneapi-2024.2.1 - intel-oneapi-runtime: - externals: - - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1 - prefix: /p/global/Projects/NEPTUNE/spack-stack/oneapi-2024.2.1