From 00b6fbf67af809734d216cd392a5e291ba10162b Mon Sep 17 00:00:00 2001 From: climbfuji Date: Fri, 17 Jul 2026 19:41:03 -0600 Subject: [PATCH 1/3] Attempt to fix module setup on Derecho for release/2.1 --- configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml | 6 +++--- configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml | 8 ++++---- configs/sites/tier1/derecho/setup.sh | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml b/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml index d7494c60b..855fa9e49 100644 --- a/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml +++ b/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml @@ -13,7 +13,7 @@ packages: - spec: gcc@13.3.1 languages:='c,c++,fortran' prefix: /opt/cray/pe/gcc-native/13 modules: - - crayenv/25.03 + #- crayenv/25.03 - PrgEnv-gnu/8.6.0 - gcc-native/13.2 extra_attributes: @@ -32,10 +32,10 @@ packages: - spec: cray-mpich@8.1.32 +wrappers prefix: /opt/cray/pe/mpich/8.1.32/ofi/gnu/12.3 modules: - - crayenv/25.03 + #- crayenv/25.03 - PrgEnv-gnu/8.6.0 - gcc-native/13.2 - - craype-network-ofi + #- 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 index 3d4ba7636..7e9422962 100644 --- a/configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml +++ b/configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml @@ -15,7 +15,7 @@ packages: - spec: intel-oneapi-compilers@2025.3.1 prefix: /glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1 modules: - - crayenv/25.03 + #- crayenv/25.03 - PrgEnv-intel/8.6.0 - intel/2025.3.1 extra_attributes: @@ -35,7 +35,7 @@ packages: - spec: gcc@13.3.1 languages:='c,c++' prefix: /opt/cray/pe/gcc-native/13 modules: - - crayenv/25.03 + #- crayenv/25.03 - PrgEnv-gnu/8.6.0 - gcc-native/13.2 extra_attributes: @@ -54,10 +54,10 @@ packages: - spec: cray-mpich@8.1.32 +wrappers prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1 modules: - - crayenv/25.03 + #- crayenv/25.03 - PrgEnv-intel/8.6.0 - intel/2025.3.1 - - craype-network-ofi + #- craype-network-ofi - cray-mpich/8.1.32 - libfabric/1.22.0 - cray-pals/1.6.1 diff --git a/configs/sites/tier1/derecho/setup.sh b/configs/sites/tier1/derecho/setup.sh index 0d307e730..c77cdeea8 100644 --- a/configs/sites/tier1/derecho/setup.sh +++ b/configs/sites/tier1/derecho/setup.sh @@ -1,3 +1,4 @@ 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 load crayenv/25.03 + From 0f6e47f19d29a2c271c9885785530e79377a84b0 Mon Sep 17 00:00:00 2001 From: climbfuji Date: Wed, 22 Jul 2026 12:52:27 -0600 Subject: [PATCH 2/3] Update configs/sites/tier1/derecho/packages_*.yaml for release/2.1 --- .../tier1/derecho/packages_gcc-13.3.1.yaml | 8 +++---- ...3.1.yaml => packages_oneapi-2025.3.2.yaml} | 24 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) rename configs/sites/tier1/derecho/{packages_oneapi-2025.3.1.yaml => packages_oneapi-2025.3.2.yaml} (67%) diff --git a/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml b/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml index 855fa9e49..68fabf629 100644 --- a/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml +++ b/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml @@ -6,7 +6,7 @@ packages: mpi: buildable: false require: - - cray-mpich@8.1.32 + - cray-mpich@8.1.29 gcc: buildable: false externals: @@ -29,14 +29,14 @@ packages: cray-mpich: buildable: false externals: - - spec: cray-mpich@8.1.32 +wrappers - prefix: /opt/cray/pe/mpich/8.1.32/ofi/gnu/12.3 + - spec: cray-mpich@8.1.29 +wrappers + prefix: /opt/cray/pe/mpich/8.1.29/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 + - cray-mpich/8.1.29 - 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.2.yaml similarity index 67% rename from configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml rename to configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml index 7e9422962..04f2c3584 100644 --- a/configs/sites/tier1/derecho/packages_oneapi-2025.3.1.yaml +++ b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml @@ -1,28 +1,28 @@ packages: all: require: - - any_of: ['%intel-oneapi-compilers@=2025.3.1'] + - any_of: ['%intel-oneapi-compilers@=2025.3.2'] when: '%intel-oneapi-compilers' - any_of: ['%gcc@=13.3.1'] when: '%gcc' mpi: buildable: false require: - - cray-mpich@8.1.32 + - cray-mpich@8.1.29 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 + - 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: #- crayenv/25.03 - PrgEnv-intel/8.6.0 - - intel/2025.3.1 + - intel/2025.3.2 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 + 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 @@ -51,14 +51,14 @@ packages: cray-mpich: buildable: false externals: - - spec: cray-mpich@8.1.32 +wrappers - prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1 + - spec: cray-mpich@8.1.29 +wrappers + prefix: /opt/cray/pe/mpich/8.1.29/ofi/intel/2022.1 modules: #- crayenv/25.03 - PrgEnv-intel/8.6.0 - - intel/2025.3.1 + - intel/2025.3.2 #- craype-network-ofi - - cray-mpich/8.1.32 + - cray-mpich/8.1.29 - libfabric/1.22.0 - cray-pals/1.6.1 intel-oneapi-mkl: From a4469a28d3c22e704875a84e63d1797f1ff22493 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sun, 26 Jul 2026 09:58:16 +0200 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Dom Heinzeller --- configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml | 3 --- configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml | 4 ---- 2 files changed, 7 deletions(-) diff --git a/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml b/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml index 68fabf629..74b9da866 100644 --- a/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml +++ b/configs/sites/tier1/derecho/packages_gcc-13.3.1.yaml @@ -13,7 +13,6 @@ packages: - spec: gcc@13.3.1 languages:='c,c++,fortran' prefix: /opt/cray/pe/gcc-native/13 modules: - #- crayenv/25.03 - PrgEnv-gnu/8.6.0 - gcc-native/13.2 extra_attributes: @@ -32,10 +31,8 @@ packages: - spec: cray-mpich@8.1.29 +wrappers prefix: /opt/cray/pe/mpich/8.1.29/ofi/gnu/12.3 modules: - #- crayenv/25.03 - PrgEnv-gnu/8.6.0 - gcc-native/13.2 - #- craype-network-ofi - cray-mpich/8.1.29 - libfabric/1.22.0 - cray-pals/1.6.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 index 04f2c3584..09a726734 100644 --- a/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml +++ b/configs/sites/tier1/derecho/packages_oneapi-2025.3.2.yaml @@ -15,7 +15,6 @@ 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: - #- crayenv/25.03 - PrgEnv-intel/8.6.0 - intel/2025.3.2 extra_attributes: @@ -35,7 +34,6 @@ packages: - 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: @@ -54,10 +52,8 @@ packages: - spec: cray-mpich@8.1.29 +wrappers prefix: /opt/cray/pe/mpich/8.1.29/ofi/intel/2022.1 modules: - #- crayenv/25.03 - PrgEnv-intel/8.6.0 - intel/2025.3.2 - #- craype-network-ofi - cray-mpich/8.1.29 - libfabric/1.22.0 - cray-pals/1.6.1