Merge pull request #248 from xylar/update-config-machines

xylar · web-flow · commit 63448d5d022d · 2025-04-08T21:48:49.000-06:00
Update `config_machines.xml` and frontier spack
diff --git a/mache/cime_machine_config/config_machines.xml b/mache/cime_machine_config/config_machines.xml
diff --git a/mache/spack/frontier_crayamd-mphipcc_mpich.csh b/mache/spack/frontier_crayamd-mphipcc_mpich.csh
@@ -5,6 +5,7 @@ module reset
 module switch Core Core/24.00
 module switch PrgEnv-cray PrgEnv-amd/8.3.3
 module switch amd amd/5.4.0
+module load cray-libsci/22.12.1.1
 
 module load \
     craype-accel-amd-gfx90a \
@@ -26,9 +27,6 @@ module load \
     cray-parallel-netcdf/1.12.3.1
 {% endif %}
 
-# needed to prevent incompatible default version
-module load cray-libsci/22.12.1.1
-
 setenv HDF5_ROOT ""
 setenv MPICH_GPU_SUPPORT_ENABLED "0"
 setenv MPICH_VERSION_DISPLAY "1"
diff --git a/mache/spack/frontier_crayamd-mphipcc_mpich.sh b/mache/spack/frontier_crayamd-mphipcc_mpich.sh
@@ -5,6 +5,7 @@ module reset
 module switch Core Core/24.00
 module switch PrgEnv-cray PrgEnv-amd/8.3.3
 module switch amd amd/5.4.0
+module load cray-libsci/22.12.1.1
 
 module load \
     craype-accel-amd-gfx90a \
@@ -26,9 +27,6 @@ module load \
     cray-parallel-netcdf/1.12.3.1
 {% endif %}
 
-# needed to prevent incompatible default version
-module load cray-libsci/22.12.1.1
-
 export HDF5_ROOT=""
 export MPICH_GPU_SUPPORT_ENABLED="0"
 export MPICH_VERSION_DISPLAY="1"
diff --git a/mache/spack/frontier_crayamd-mphipcc_mpich.yaml b/mache/spack/frontier_crayamd-mphipcc_mpich.yaml
@@ -165,12 +165,11 @@ spack:
       - Core/24.00
       - PrgEnv-amd/8.3.3
       - amd/5.4.0
+      - cray-libsci/22.12.1.1
       - craype-accel-amd-gfx90a
       - rocm/5.4.0
       - libunwind/1.5.0
       - libfabric/1.20.1
-      # needed to prevent incompatible default version
-      - cray-libsci/22.12.1.1
       # we need to include mpich because an incompatible version of
       # libmpi_gtl_hsa.so.0 is loaded otherwise and we need to use the mpich
       # verison (see below)
diff --git a/mache/spack/frontier_crayamd_mpich.csh b/mache/spack/frontier_crayamd_mpich.csh
@@ -5,6 +5,7 @@ module reset
 module switch Core Core/24.00
 module switch PrgEnv-cray PrgEnv-amd/8.3.3
 module switch amd amd/5.4.0
+module load cray-libsci/22.12.1.1
 
 module load \
     libunwind/1.5.0 \
@@ -24,9 +25,6 @@ module load \
     cray-parallel-netcdf/1.12.3.1
 {% endif %}
 
-# needed to prevent incompatible default version
-module load cray-libsci/22.12.1.1
-
 setenv HDF5_ROOT ""
 setenv MPICH_GPU_SUPPORT_ENABLED "0"
 setenv MPICH_VERSION_DISPLAY "1"
diff --git a/mache/spack/frontier_crayamd_mpich.sh b/mache/spack/frontier_crayamd_mpich.sh
@@ -5,6 +5,7 @@ module reset
 module switch Core Core/24.00
 module switch PrgEnv-cray PrgEnv-amd/8.3.3
 module switch amd amd/5.4.0
+module load cray-libsci/22.12.1.1
 
 module load \
     libunwind/1.5.0 \
@@ -24,9 +25,6 @@ module load \
     cray-parallel-netcdf/1.12.3.1
 {% endif %}
 
-# needed to prevent incompatible default version
-module load cray-libsci/22.12.1.1
-
 export HDF5_ROOT=""
 export MPICH_GPU_SUPPORT_ENABLED="0"
 export MPICH_VERSION_DISPLAY="1"
diff --git a/mache/spack/frontier_crayamd_mpich.yaml b/mache/spack/frontier_crayamd_mpich.yaml
@@ -165,7 +165,6 @@ spack:
       - Core/24.00
       - PrgEnv-amd/8.3.3
       - amd/5.4.0
+      - cray-libsci/22.12.1.1
       - libfabric/1.20.1
       - libunwind/1.5.0
-      # needed to prevent incompatible default version
-      - cray-libsci/22.12.1.1
diff --git a/mache/spack/frontier_craygnu-hipcc_mpich.csh b/mache/spack/frontier_craygnu-hipcc_mpich.csh
@@ -3,12 +3,13 @@ source /opt/cray/pe/lmod/lmod/init/csh
 module reset
 
 module load \
+    Core/25.03 \
     PrgEnv-gnu \
     cpe/24.11 \
     libunwind/1.8.1 \
-    subversion/1.14.2 \
-    git/2.45.1 \
-    cmake/3.27.9 \
+    subversion \
+    git \
+    cmake \
     craype-accel-amd-gfx90a \
     rocm/6.2.4
 
diff --git a/mache/spack/frontier_craygnu-hipcc_mpich.sh b/mache/spack/frontier_craygnu-hipcc_mpich.sh
@@ -3,12 +3,13 @@ source /opt/cray/pe/lmod/lmod/init/sh
 module reset
 
 module load \
+    Core/25.03 \
     PrgEnv-gnu \
     cpe/24.11 \
     libunwind/1.8.1 \
-    subversion/1.14.2 \
-    git/2.45.1 \
-    cmake/3.27.9 \
+    subversion \
+    git \
+    cmake \
     craype-accel-amd-gfx90a \
     rocm/6.2.4
 
diff --git a/mache/spack/frontier_craygnu-hipcc_mpich.yaml b/mache/spack/frontier_craygnu-hipcc_mpich.yaml
@@ -117,13 +117,13 @@ spack:
       externals:
       - spec: gcc@13.2
         modules:
-        - Core/24.07
-        - PrgEnv-gnu/8.6.0
+        - Core/25.03
+        - PrgEnv-gnu
         - cpe/24.11
+        - libunwind/1.8.1
         - gcc-native/13.2
-        - craype/2.7.19
+        - craype/2.7.33
         - libfabric/1.22.0
-        - libunwind/1.8.1
         - craype-accel-amd-gfx90a
         - rocm/6.2.4
         extra_attributes:
@@ -191,12 +191,12 @@ spack:
       operating_system: sles15
       target: x86_64
       modules:
-      - Core/24.07
-      - PrgEnv-gnu/8.6.0
+      - Core/25.03
+      - PrgEnv-gnu
       - cpe/24.11
+      - libunwind/1.8.1
       - gcc-native/13.2
-      - craype/2.7.19
+      - craype/2.7.33
       - libfabric/1.22.0
-      - libunwind/1.8.1
       - craype-accel-amd-gfx90a
       - rocm/6.2.4
diff --git a/mache/spack/frontier_craygnu-mphipcc_mpich.csh b/mache/spack/frontier_craygnu-mphipcc_mpich.csh
@@ -3,12 +3,13 @@ source /opt/cray/pe/lmod/lmod/init/csh
 module reset
 
 module load \
+    Core/25.03 \
     PrgEnv-gnu \
     cpe/24.11 \
     libunwind/1.8.1 \
-    subversion/1.14.2 \
-    git/2.45.1 \
-    cmake/3.23.2 \
+    subversion \
+    git \
+    cmake \
     craype-accel-amd-gfx90a \
     rocm/6.2.4
 
diff --git a/mache/spack/frontier_craygnu-mphipcc_mpich.sh b/mache/spack/frontier_craygnu-mphipcc_mpich.sh
@@ -3,12 +3,13 @@ source /opt/cray/pe/lmod/lmod/init/sh
 module reset
 
 module load \
+    Core/25.03 \
     PrgEnv-gnu \
     cpe/24.11 \
     libunwind/1.8.1 \
-    subversion/1.14.2 \
-    git/2.45.1 \
-    cmake/3.27.9 \
+    subversion \
+    git \
+    cmake \
     craype-accel-amd-gfx90a \
     rocm/6.2.4
 
diff --git a/mache/spack/frontier_craygnu-mphipcc_mpich.yaml b/mache/spack/frontier_craygnu-mphipcc_mpich.yaml
@@ -117,13 +117,15 @@ spack:
       externals:
       - spec: gcc@13.2
         modules:
-        - Core/24.07
-        - PrgEnv-gnu/8.6.0
+        - Core/25.03
+        - PrgEnv-gnu
         - cpe/24.11
+        - libunwind/1.8.1
         - gcc-native/13.2
         - craype/2.7.33
         - libfabric/1.22.0
-        - libunwind/1.8.1
+        - craype-accel-amd-gfx90a
+        - rocm/6.2.4
         extra_attributes:
           # this needs to be here for gcc because the gcc pacakge looks here
           # rather than below in the compilers section
@@ -189,12 +191,12 @@ spack:
       operating_system: sles15
       target: x86_64
       modules:
-      - Core/24.07
-      - PrgEnv-gnu/8.6.0
+      - Core/25.03
+      - PrgEnv-gnu
       - cpe/24.11
+      - libunwind/1.8.1
       - gcc-native/13.2
-      - craype/2.7.19
+      - craype/2.7.33
       - libfabric/1.22.0
-      - libunwind/1.8.1
       - craype-accel-amd-gfx90a
       - rocm/6.2.4
diff --git a/mache/spack/frontier_craygnu_mpich.csh b/mache/spack/frontier_craygnu_mpich.csh
@@ -3,12 +3,13 @@ source /opt/cray/pe/lmod/lmod/init/csh
 module reset
 
 module load \
+    Core/25.03 \
     PrgEnv-gnu \
     cpe/24.11 \
     libunwind/1.8.1 \
-    subversion/1.14.2 \
-    git/2.45.1 \
-    cmake/3.27.9
+    subversion \
+    git \
+    cmake
 
 module rm \
     darshan-runtime &> /dev/null
diff --git a/mache/spack/frontier_craygnu_mpich.sh b/mache/spack/frontier_craygnu_mpich.sh
@@ -3,12 +3,13 @@ source /opt/cray/pe/lmod/lmod/init/sh
 module reset
 
 module load \
+    Core/25.03 \
     PrgEnv-gnu \
     cpe/24.11 \
     libunwind/1.8.1 \
-    subversion/1.14.2 \
-    git/2.45.1 \
-    cmake/3.27.9
+    subversion \
+    git \
+    cmake
 
 module rm \
     darshan-runtime &> /dev/null
diff --git a/mache/spack/frontier_craygnu_mpich.yaml b/mache/spack/frontier_craygnu_mpich.yaml
@@ -117,13 +117,13 @@ spack:
       externals:
       - spec: gcc@13.2
         modules:
-        - Core/24.07
-        - PrgEnv-gnu/8.6.0
+        - Core/25.03
+        - PrgEnv-gnu
         - cpe/24.11
+        - libunwind/1.8.1
         - gcc-native/13.2
         - craype/2.7.33
         - libfabric/1.22.0
-        - libunwind/1.8.1
         extra_attributes:
           # this needs to be here for gcc because the gcc pacakge looks here
           # rather than below in the compilers section
@@ -188,10 +188,10 @@ spack:
       operating_system: sles15
       target: x86_64
       modules:
-      - Core/24.07
-      - PrgEnv-gnu/8.6.0
+      - Core/25.03
+      - PrgEnv-gnu
       - cpe/24.11
+      - libunwind/1.8.1
       - gcc-native/13.2
       - craype/2.7.33
       - libfabric/1.22.0
-      - libunwind/1.8.1
