From dcfbcc3c5b9c2e55481982f278f0d1411d453543 Mon Sep 17 00:00:00 2001 From: climbfuji Date: Mon, 24 Aug 2026 08:08:48 -0600 Subject: [PATCH 01/10] Update configs/sites/tier1/derecho/* --- ...c-13.3.1.yaml => packages_gcc-14.3.0.yaml} | 28 +++----- .../derecho/packages_oneapi-2025.3.1.yaml | 68 ------------------- .../derecho/packages_oneapi-2025.3.2.yaml | 57 ++++++++++++++++ configs/sites/tier1/derecho/setup.sh | 4 +- 4 files changed, 68 insertions(+), 89 deletions(-) rename configs/sites/tier1/derecho/{packages_gcc-13.3.1.yaml => packages_gcc-14.3.0.yaml} (51%) delete mode 100644 configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml create mode 100644 configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml diff --git a/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml b/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml similarity index 51% rename from configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml rename to configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml index d7494c60b..fdc360b96 100644 --- a/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml +++ b/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml @@ -1,7 +1,7 @@ packages: all: require: - - any_of: ['%gcc@=13.3.1'] + - any_of: ['%gcc@=14.3.0'] when: '%gcc' mpi: buildable: false @@ -10,20 +10,19 @@ packages: gcc: buildable: false externals: - - spec: gcc@13.3.1 languages:='c,c++,fortran' - prefix: /opt/cray/pe/gcc-native/13 + - spec: gcc@14.3.0 languages:='c,c++,fortran' + prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m modules: - - crayenv/25.03 - - PrgEnv-gnu/8.6.0 - - gcc-native/13.2 + - gcc/14.3.0 + - cray-mpich/8.1.32 + - libfabric/1.22.0 extra_attributes: compilers: - c: /opt/cray/pe/gcc-native/13/bin/gcc - cxx: /opt/cray/pe/gcc-native/13/bin/g++ - fortran: /opt/cray/pe/gcc-native/13/bin/gfortran + c: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/gcc + cxx: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/g++ + fortran: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/gfortran environment: set: - PE_GCC_EXTERNAL: native # https://github.com/JCSDA/spack-stack/issues/957 FI_CXI_RX_MATCH_MODE: hybrid cray-mpich: @@ -31,12 +30,3 @@ packages: externals: - spec: cray-mpich@8.1.32 +wrappers prefix: /opt/cray/pe/mpich/8.1.32/ofi/gnu/12.3 - modules: - - crayenv/25.03 - - PrgEnv-gnu/8.6.0 - - gcc-native/13.2 - - craype-network-ofi - - cray-mpich/8.1.32 - - libfabric/1.22.0 - - cray-pals/1.6.1 - diff --git a/configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml deleted file mode 100644 index 3d4ba7636..000000000 --- a/configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml +++ /dev/null @@ -1,68 +0,0 @@ -packages: - all: - require: - - any_of: ['%intel-oneapi-compilers@=2025.3.1'] - when: '%intel-oneapi-compilers' - - any_of: ['%gcc@=13.3.1'] - when: '%gcc' - mpi: - buildable: false - require: - - cray-mpich@8.1.32 - intel-oneapi-compilers: - buildable: false - externals: - - spec: intel-oneapi-compilers@2025.3.1 - prefix: /glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1 - modules: - - crayenv/25.03 - - PrgEnv-intel/8.6.0 - - intel/2025.3.1 - extra_attributes: - compilers: - c: /glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1/compiler/2025.3/bin/icx - cxx: /glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1/compiler/2025.3/bin/icpx - fortran: /glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1/compiler/2025.3/bin/ifx - environment: - set: - # https://github.com/JCSDA/spack-stack/issues/957 - FI_CXI_RX_MATCH_MODE: hybrid - # https://github.com/JCSDA/spack-stack/issues/1012 - I_MPI_EXTRA_FILESYSTEM: ON - gcc: - buildable: false - externals: - - spec: gcc@13.3.1 languages:='c,c++' - prefix: /opt/cray/pe/gcc-native/13 - modules: - - crayenv/25.03 - - PrgEnv-gnu/8.6.0 - - gcc-native/13.2 - extra_attributes: - compilers: - c: /opt/cray/pe/gcc-native/13/bin/gcc - cxx: /opt/cray/pe/gcc-native/13/bin/g++ - fortran: /opt/cray/pe/gcc-native/13/bin/gfortran - environment: - set: - PE_GCC_EXTERNAL: native - # https://github.com/JCSDA/spack-stack/issues/957 - FI_CXI_RX_MATCH_MODE: hybrid - cray-mpich: - buildable: false - externals: - - spec: cray-mpich@8.1.32 +wrappers - prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1 - modules: - - crayenv/25.03 - - PrgEnv-intel/8.6.0 - - intel/2025.3.1 - - craype-network-ofi - - cray-mpich/8.1.32 - - libfabric/1.22.0 - - cray-pals/1.6.1 - intel-oneapi-mkl: - buildable: false - externals: - - spec: intel-oneapi-mkl@2025.3 - prefix: /glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1 diff --git a/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml new file mode 100644 index 000000000..4558b9fc7 --- /dev/null +++ b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml @@ -0,0 +1,57 @@ +packages: + all: + require: + - any_of: ['%intel-oneapi-compilers@=2025.3.2'] + when: '%intel-oneapi-compilers' + - any_of: ['%gcc@=14.3.0'] + when: '%gcc' + mpi: + buildable: false + require: + - cray-mpich@8.1.32 + intel-oneapi-compilers: + buildable: false + externals: + - spec: intel-oneapi-compilers@2025.3.2 + prefix: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.3.2/snvt + modules: + - intel/2025.3.2 + - cray-mpich/8.1.32 + - libfabric/1.22.0 + extra_attributes: + compilers: + c: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.3.2/snvt/compiler/2025.3/bin/icx + cxx: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.3.2/snvt/compiler/2025.3/bin/icpx + fortran: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.3.2/snvt/compiler/2025.3/bin/ifx + environment: + set: + # https://github.com/JCSDA/spack-stack/issues/957 + FI_CXI_RX_MATCH_MODE: hybrid + # https://github.com/JCSDA/spack-stack/issues/1012 + I_MPI_EXTRA_FILESYSTEM: ON + gcc: + buildable: false + externals: + - spec: gcc@14.3.0 languages:='c,c++' + prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m + modules: + - gcc/14.3.0 + extra_attributes: + compilers: + c: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/gcc + cxx: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/g++ + fortran: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/gfortran + environment: + set: + # https://github.com/JCSDA/spack-stack/issues/957 + FI_CXI_RX_MATCH_MODE: hybrid + cray-mpich: + buildable: false + externals: + - spec: cray-mpich@8.1.32 +wrappers + prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1 + intel-oneapi-mkl: + buildable: false + externals: + - spec: intel-oneapi-mkl@2025.3.1 + prefix: /glade/u/apps/derecho/25.10/spack/opt/spack/intel-oneapi-mkl/2025.3.1/intel-oneapi-compilers/2025.3.2/ydfo diff --git a/configs/sites/tier1/derecho/setup.sh b/configs/sites/tier1/derecho/setup.sh index 0d307e730..9cf9d49db 100644 --- a/configs/sites/tier1/derecho/setup.sh +++ b/configs/sites/tier1/derecho/setup.sh @@ -1,3 +1,3 @@ module --force purge -module use /opt/cray/pe/modulefiles -module use /glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1/modulefiles +#module use /opt/cray/pe/modulefiles +module load ncarenv/25.10 From 020f5abdffa187e904b666de00d9256ae233de76 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 24 Aug 2026 08:17:05 -0600 Subject: [PATCH 02/10] Update configs/sites/tier1/* --- configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml | 6 ++++-- configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml | 7 +++++-- configs/sites/tier1/derecho/setup.sh | 2 -- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml b/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml index fdc360b96..333986c89 100644 --- a/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml +++ b/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml @@ -13,9 +13,8 @@ packages: - spec: gcc@14.3.0 languages:='c,c++,fortran' prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m modules: + - ncarenv/25.10 - gcc/14.3.0 - - cray-mpich/8.1.32 - - libfabric/1.22.0 extra_attributes: compilers: c: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/gcc @@ -30,3 +29,6 @@ packages: externals: - spec: cray-mpich@8.1.32 +wrappers prefix: /opt/cray/pe/mpich/8.1.32/ofi/gnu/12.3 + modules: + - cray-mpich/8.1.32 + - libfabric/1.22.0 diff --git a/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml index 4558b9fc7..b0c8e8c35 100644 --- a/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml +++ b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml @@ -15,9 +15,8 @@ packages: - spec: intel-oneapi-compilers@2025.3.2 prefix: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.3.2/snvt modules: + - ncarenv/25.10 - intel/2025.3.2 - - cray-mpich/8.1.32 - - libfabric/1.22.0 extra_attributes: compilers: c: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.3.2/snvt/compiler/2025.3/bin/icx @@ -35,6 +34,7 @@ packages: - spec: gcc@14.3.0 languages:='c,c++' prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m modules: + - ncarenv/25.10 - gcc/14.3.0 extra_attributes: compilers: @@ -50,6 +50,9 @@ packages: externals: - spec: cray-mpich@8.1.32 +wrappers prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1 + modules: + - cray-mpich/8.1.32 + - libfabric/1.22.0 intel-oneapi-mkl: buildable: false externals: diff --git a/configs/sites/tier1/derecho/setup.sh b/configs/sites/tier1/derecho/setup.sh index 9cf9d49db..dfe4de712 100644 --- a/configs/sites/tier1/derecho/setup.sh +++ b/configs/sites/tier1/derecho/setup.sh @@ -1,3 +1 @@ module --force purge -#module use /opt/cray/pe/modulefiles -module load ncarenv/25.10 From 83e8c3dcbe4fe678bfec180ce97e2aeac250b527 Mon Sep 17 00:00:00 2001 From: climbfuji Date: Thu, 27 Aug 2026 11:11:06 -0600 Subject: [PATCH 03/10] Update configs/sites/tier1/derecho/packages.yaml --- configs/sites/tier1/derecho/packages.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/sites/tier1/derecho/packages.yaml b/configs/sites/tier1/derecho/packages.yaml index 2de33fab5..915ac86f0 100644 --- a/configs/sites/tier1/derecho/packages.yaml +++ b/configs/sites/tier1/derecho/packages.yaml @@ -1,6 +1,7 @@ packages: # Modification of common packages all: + target: [zen3] providers: zlib-api:: [zlib] # Tell esmf that this is not a 'normal' Cray ... From fcdc8183a0ec70c462a81708db7f293b4a7769d0 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 27 Aug 2026 11:17:19 -0600 Subject: [PATCH 04/10] Yet another iteration on Derecho --- configs/sites/tier1/derecho/modules.yaml | 3 +++ ...ges_gcc-14.3.0.yaml => packages_gcc-13.3.1.yaml} | 13 ++++++------- .../tier1/derecho/packages_oneapi-2025.3.2.yaml | 13 ++++++------- 3 files changed, 15 insertions(+), 14 deletions(-) rename configs/sites/tier1/derecho/{packages_gcc-14.3.0.yaml => packages_gcc-13.3.1.yaml} (57%) diff --git a/configs/sites/tier1/derecho/modules.yaml b/configs/sites/tier1/derecho/modules.yaml index 4e9771f38..d03c7589a 100644 --- a/configs/sites/tier1/derecho/modules.yaml +++ b/configs/sites/tier1/derecho/modules.yaml @@ -2,3 +2,6 @@ modules: default: enable:: - lmod + lmod: + include: + - gcc diff --git a/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml b/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml similarity index 57% rename from configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml rename to configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml index 333986c89..6ec953819 100644 --- a/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml +++ b/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml @@ -1,7 +1,7 @@ packages: all: require: - - any_of: ['%gcc@=14.3.0'] + - any_of: ['%gcc@=13.3.1'] when: '%gcc' mpi: buildable: false @@ -10,16 +10,15 @@ packages: gcc: buildable: false externals: - - spec: gcc@14.3.0 languages:='c,c++,fortran' - prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m + - spec: gcc@13.3.1 languages:='c,c++,fortran' + prefix: /usr modules: - ncarenv/25.10 - - gcc/14.3.0 extra_attributes: compilers: - c: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/gcc - cxx: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/g++ - fortran: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/gfortran + c: /usr/bin/gcc-13 + cxx: /usr/bin/g++-13 + fortran: /usr/bin/gfortran-13 environment: set: # https://github.com/JCSDA/spack-stack/issues/957 diff --git a/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml index b0c8e8c35..2d3e39cbc 100644 --- a/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml +++ b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml @@ -3,7 +3,7 @@ packages: require: - any_of: ['%intel-oneapi-compilers@=2025.3.2'] when: '%intel-oneapi-compilers' - - any_of: ['%gcc@=14.3.0'] + - any_of: ['%gcc@=13.3.1'] when: '%gcc' mpi: buildable: false @@ -31,16 +31,15 @@ packages: gcc: buildable: false externals: - - spec: gcc@14.3.0 languages:='c,c++' - prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m + - spec: gcc@13.3.1 languages:='c,c++' + prefix: /usr modules: - ncarenv/25.10 - - gcc/14.3.0 extra_attributes: compilers: - c: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/gcc - cxx: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/g++ - fortran: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/gfortran + c: /usr/bin/gcc-13 + cxx: /usr/bin/g++-13 + fortran: /usr/bin/gfortran-13 environment: set: # https://github.com/JCSDA/spack-stack/issues/957 From 9f397f13c2736a45c91407e0f8e631adc86d4322 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 27 Aug 2026 19:14:16 -0600 Subject: [PATCH 05/10] configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml again --- .../tier1/derecho/packages_gcc-14.3.0.yaml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml diff --git a/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml b/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml new file mode 100644 index 000000000..35687e298 --- /dev/null +++ b/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml @@ -0,0 +1,34 @@ +packages: + all: + require: + - any_of: ['%gcc@=14.3.0'] + when: '%gcc' + mpi: + buildable: false + require: + - cray-mpich@8.1.32 + gcc: + buildable: false + externals: + - spec: gcc@14.3.0 languages:='c,c++,fortran' + prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m + modules: + - ncarenv-basic/25.10 + - gcc/14.3.0 + extra_attributes: + compilers: + c: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/gcc + cxx: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/g++ + fortran: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/gfortran + environment: + set: + # https://github.com/JCSDA/spack-stack/issues/957 + FI_CXI_RX_MATCH_MODE: hybrid + cray-mpich: + buildable: false + externals: + - spec: cray-mpich@8.1.32 +wrappers + prefix: /opt/cray/pe/mpich/8.1.32/ofi/gnu/12.3 + modules: + - cray-mpich/8.1.32 + - libfabric/1.22.0 From e60950583e6800468510a4427e231d3c2ea7a19f Mon Sep 17 00:00:00 2001 From: climbfuji Date: Fri, 28 Aug 2026 13:44:34 -0600 Subject: [PATCH 06/10] Update configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml --- .../tier1/derecho/packages_gcc-13.3.1.yaml | 33 ------------------- .../tier1/derecho/packages_gcc-14.3.0.yaml | 11 +++++++ 2 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml diff --git a/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml b/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml deleted file mode 100644 index 6ec953819..000000000 --- a/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml +++ /dev/null @@ -1,33 +0,0 @@ -packages: - all: - require: - - any_of: ['%gcc@=13.3.1'] - when: '%gcc' - mpi: - buildable: false - require: - - cray-mpich@8.1.32 - gcc: - buildable: false - externals: - - spec: gcc@13.3.1 languages:='c,c++,fortran' - prefix: /usr - modules: - - ncarenv/25.10 - extra_attributes: - compilers: - c: /usr/bin/gcc-13 - cxx: /usr/bin/g++-13 - fortran: /usr/bin/gfortran-13 - environment: - set: - # https://github.com/JCSDA/spack-stack/issues/957 - FI_CXI_RX_MATCH_MODE: hybrid - cray-mpich: - buildable: false - externals: - - spec: cray-mpich@8.1.32 +wrappers - prefix: /opt/cray/pe/mpich/8.1.32/ofi/gnu/12.3 - modules: - - cray-mpich/8.1.32 - - libfabric/1.22.0 diff --git a/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml b/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml index 35687e298..7ccd54f68 100644 --- a/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml +++ b/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml @@ -24,11 +24,22 @@ packages: set: # https://github.com/JCSDA/spack-stack/issues/957 FI_CXI_RX_MATCH_MODE: hybrid + remove_path: + LIBRARY_PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/lib64 + PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin + cray-mpich: buildable: false externals: - spec: cray-mpich@8.1.32 +wrappers prefix: /opt/cray/pe/mpich/8.1.32/ofi/gnu/12.3 modules: + - ncarenv-basic/25.10 + - gcc/14.3.0 - cray-mpich/8.1.32 - libfabric/1.22.0 + extra_attributes: + environment: + remove_path: + LIBRARY_PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/lib64 + PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin From b8dba4a7cb16d2717e3264fbe428fee987b4be14 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 28 Aug 2026 13:48:12 -0600 Subject: [PATCH 07/10] Update configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml --- .../tier1/derecho/packages_gcc-14.3.0.yaml | 1 - .../derecho/packages_oneapi-2025.3.2.yaml | 34 +++++++++++++------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml b/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml index 7ccd54f68..194855140 100644 --- a/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml +++ b/configs/sites/tier1/derecho/packages_gcc-14.3.0.yaml @@ -27,7 +27,6 @@ packages: remove_path: LIBRARY_PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/lib64 PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin - cray-mpich: buildable: false externals: diff --git a/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml index 2d3e39cbc..baa07914c 100644 --- a/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml +++ b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml @@ -3,7 +3,7 @@ packages: require: - any_of: ['%intel-oneapi-compilers@=2025.3.2'] when: '%intel-oneapi-compilers' - - any_of: ['%gcc@=13.3.1'] + - any_of: ['%gcc@=14.3.0'] when: '%gcc' mpi: buildable: false @@ -15,7 +15,7 @@ packages: - spec: intel-oneapi-compilers@2025.3.2 prefix: /glade/u/apps/common/25.10/spack/opt/spack/intel-oneapi-compilers/2025.3.2/snvt modules: - - ncarenv/25.10 + - ncarenv-basic/25.10 - intel/2025.3.2 extra_attributes: compilers: @@ -28,30 +28,42 @@ packages: FI_CXI_RX_MATCH_MODE: hybrid # https://github.com/JCSDA/spack-stack/issues/1012 I_MPI_EXTRA_FILESYSTEM: ON + environment: + remove_path: + LIBRARY_PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/lib64 + PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin gcc: buildable: false externals: - - spec: gcc@13.3.1 languages:='c,c++' - prefix: /usr + - spec: gcc@14.3.0 languages:='c,c++' + prefix: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m modules: - - ncarenv/25.10 + - ncarenv-basic/25.10 + - gcc/14.3.0 extra_attributes: compilers: - c: /usr/bin/gcc-13 - cxx: /usr/bin/g++-13 - fortran: /usr/bin/gfortran-13 + c: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/gcc + cxx: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/g++ + fortran: /glade/u/apps/common/25.10/spack/opt/spack/gcc/14.3.0/nw2m/bin/gfortran environment: - set: - # https://github.com/JCSDA/spack-stack/issues/957 - FI_CXI_RX_MATCH_MODE: hybrid + remove_path: + LIBRARY_PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/lib64 + PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin cray-mpich: buildable: false externals: - spec: cray-mpich@8.1.32 +wrappers prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1 modules: + - ncarenv-basic/25.10 + - intel/2025.3.2 - cray-mpich/8.1.32 - libfabric/1.22.0 + extra_attributes: + environment: + remove_path: + LIBRARY_PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/lib64 + PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin intel-oneapi-mkl: buildable: false externals: From 45e32804765c3a62527c0bb4c3498e9975bcdfc0 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 28 Aug 2026 13:48:44 -0600 Subject: [PATCH 08/10] Update and fix spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py: remove_path in module files, correct syntax for unsetenv; test in spack-ext/lib/jcsda-emc/spack-stack/tests/test_setup_meta_modules.py --- .../spack-stack/stack/meta_modules.py | 41 +++++++++++-------- .../tests/test_setup_meta_modules.py | 3 ++ 2 files changed, 28 insertions(+), 16 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 843a35bce..0757f59f7 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 @@ -95,19 +95,26 @@ def envmod_command(module_choice, action, env_name, env_values): elif action == "unset": module_action = "unsetenv" elif action == "append_path": - if module_choice == "lmod": - module_action = "append_path" - else: - module_action = "append-path" + module_action = "append_path" if module_choice == "lmod" else "append-path" elif action == "prepend_path": - if module_choice == "lmod": - module_action = "prepend_path" - else: - module_action = "prepend-path" + module_action = "prepend_path" if module_choice == "lmod" else "prepend-path" + elif action == "remove_path": + module_action = "remove_path" if module_choice == "lmod" else "remove-path" + else: + raise ValueError( + "Unsupported environment modification action '{}' " + "in extra_attributes:environment".format(action) + ) if module_choice == "lmod": - return f'{module_action}("{env_name}", "{env_values}")\n'#.format(module_action, env_name, env_values) + if action == "unset": + return f'{module_action}("{env_name}")\n' + else: + return f'{module_action}("{env_name}", "{env_values}")\n' else: - return f"{module_action} {{{env_name}}} {{{env_values}}}\n"#.format(module_action, env_name, env_values) + if action == "unset": + return f"{module_action} {{{env_name}}}\n" + else: + return f"{module_action} {{{env_name}}} {{{env_values}}}\n" def module_load_command(module_choice, module): @@ -123,10 +130,6 @@ def module_load_command(module_choice, module): def modulepath_prepend_command(module_choice, modulepath): return envmod_command(module_choice, "prepend_path", "MODULEPATH", modulepath) - #if module_choice == "lmod": - # return 'prepend_path("MODULEPATH", "{}")\n'.format(modulepath) - #else: - # return "prepend-path {{MODULEPATH}} {{{}}}\n".format(modulepath) def substitute_config_vars(config_str): @@ -425,7 +428,10 @@ def setup_meta_modules(): if "environment" in compiler.extra_attributes.keys(): for action in compiler.extra_attributes["environment"].keys(): for env_name in compiler.extra_attributes["environment"][action]: - env_values = compiler.extra_attributes["environment"][action][env_name] + if action == "unset": + env_values = None + else: + env_values = compiler.extra_attributes["environment"][action][env_name] compiler_subs["ENVVARS"] += envmod_command( module_choice, action, @@ -623,7 +629,10 @@ def setup_meta_modules(): if "environment" in mpi_provider.extra_attributes.keys(): for action in mpi_provider.extra_attributes["environment"].keys(): for env_name in mpi_provider.extra_attributes["environment"][action]: - env_values = mpi_provider.extra_attributes["environment"][action][env_name] + if action == "unset": + env_values = None + else: + env_values = mpi_provider.extra_attributes["environment"][action][env_name] substitutes["ENVVARS"] += envmod_command( module_choice, action, 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 960dbbcb6..f62cf95da 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 @@ -56,6 +56,9 @@ def test_setup_meta_modules(): c: /usr/bin/gcc cxx: /usr/bin/g++ fortran: /usr/bin/gfortran + environment: + unset: + - DUMMYVAR mpi: buildable: false openmpi: From a046c7605b71d5b5ba158daaa2e21a779890ee75 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 28 Aug 2026 13:50:56 -0600 Subject: [PATCH 09/10] Bug fix --- configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml index baa07914c..eda8e9de2 100644 --- a/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml +++ b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml @@ -28,7 +28,6 @@ packages: FI_CXI_RX_MATCH_MODE: hybrid # https://github.com/JCSDA/spack-stack/issues/1012 I_MPI_EXTRA_FILESYSTEM: ON - environment: remove_path: LIBRARY_PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/lib64 PATH: /glade/u/apps/common/25.10/spack/opt/spack/gcc/12.5.0/hsbg/bin From 23d8ce52770f22e67507f6cd2c3d28c0998d65a0 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 31 Aug 2026 07:13:37 -0600 Subject: [PATCH 10/10] [skip ci] Bug fix in configs/sites/tier1/derecho/modules.yaml --- configs/sites/tier1/derecho/modules.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/configs/sites/tier1/derecho/modules.yaml b/configs/sites/tier1/derecho/modules.yaml index d03c7589a..4e9771f38 100644 --- a/configs/sites/tier1/derecho/modules.yaml +++ b/configs/sites/tier1/derecho/modules.yaml @@ -2,6 +2,3 @@ modules: default: enable:: - lmod - lmod: - include: - - gcc