Update to newer gnu modules

E3SM-Project · Oct 21, 2024 · 1f27e13 · 1f27e13
1 parent 2359a2c
commit 1f27e13
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 37 deletions.
diff --git a/mache/spack/chicoma-cpu_gnu_mpich.csh b/mache/spack/chicoma-cpu_gnu_mpich.csh
@@ -12,6 +12,8 @@ module rm cray-hdf5-parallel \
           cray-parallel-netcdf \
           cray-netcdf \
           cray-hdf5 \
+          gcc \
+          gcc-native \
           intel \
           intel-oneapi \
           nvidia \
@@ -33,16 +35,16 @@ module rm cray-hdf5-parallel \
 
 # we must load cray-libsci for gcc to work
 module load PrgEnv-gnu/8.5.0 \
-            gcc/12.2.0 \
-            cray-libsci/23.05.1.4 \
+            gcc-native/12.3 \
+            cray-libsci/23.12.5 \
             craype-accel-host \
-            cray-mpich/8.1.26 \
-            craype \
+            craype/2.7.30 \
+            cray-mpich/8.1.28 \
             cmake/3.27.7
 {% if e3sm_hdf5_netcdf %}
-module load cray-hdf5-parallel/1.12.2.3 \
-            cray-netcdf-hdf5parallel/4.9.0.3 \
-            cray-parallel-netcdf/1.12.3.3
+module load cray-hdf5-parallel/1.12.2.9 \
+            cray-netcdf-hdf5parallel/4.9.0.9 \
+            cray-parallel-netcdf/1.12.3.9
 {% endif %}
 
 setenv MPICH_ENV_DISPLAY 1
@@ -60,4 +62,4 @@ setenv MPICH_COLL_SYNC MPI_Bcast
 # for standalone MPAS builds
 setenv GNU_CRAY_LDFLAGS "-Wl,--enable-new-dtags"
 
-setenv LD_LIBRARY_PATH="/opt/cray/pe/gcc/12.2.0/snos/lib64:${CRAY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}"
+setenv LD_LIBRARY_PATH="/usr/lib64/gcc/x86_64-suse-linux/12:${CRAY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}"
diff --git a/mache/spack/chicoma-cpu_gnu_mpich.sh b/mache/spack/chicoma-cpu_gnu_mpich.sh
@@ -12,6 +12,8 @@ module rm cray-hdf5-parallel \
           cray-parallel-netcdf \
           cray-netcdf \
           cray-hdf5 \
+          gcc \
+          gcc-native \
           intel \
           intel-oneapi \
           nvidia \
@@ -33,16 +35,16 @@ module rm cray-hdf5-parallel \
 
 # we must load cray-libsci for gcc to work
 module load PrgEnv-gnu/8.5.0 \
-            gcc/12.2.0 \
-            cray-libsci/23.05.1.4 \
+            gcc-native/12.3 \
+            cray-libsci/23.12.5 \
             craype-accel-host \
-            cray-mpich/8.1.26 \
-            craype \
+            craype/2.7.30 \
+            cray-mpich/8.1.28 \
             cmake/3.27.7
 {% if e3sm_hdf5_netcdf %}
-module load cray-hdf5-parallel/1.12.2.3 \
-            cray-netcdf-hdf5parallel/4.9.0.3 \
-            cray-parallel-netcdf/1.12.3.3
+module load cray-hdf5-parallel/1.12.2.9 \
+            cray-netcdf-hdf5parallel/4.9.0.9 \
+            cray-parallel-netcdf/1.12.3.9
 {% endif %}
 
 export MPICH_ENV_DISPLAY=1
@@ -57,7 +59,7 @@ export PNETCDF_HINTS="romio_ds_write=disable;romio_ds_read=disable;romio_cb_writ
 export FI_CXI_RX_MATCH_MODE=software
 export MPICH_COLL_SYNC=MPI_Bcast
 
-export LD_LIBRARY_PATH="/opt/cray/pe/gcc/12.2.0/snos/lib64:${CRAY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="/usr/lib64/gcc/x86_64-suse-linux/12:${CRAY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}"
 
 # for standalone MPAS builds
 export GNU_CRAY_LDFLAGS="-Wl,--enable-new-dtags"
diff --git a/mache/spack/chicoma-cpu_gnu_mpich.yaml b/mache/spack/chicoma-cpu_gnu_mpich.yaml
@@ -14,10 +14,10 @@ spack:
     unify: true
   packages:
     all:
-      compiler: [gcc@12.2.0]
+      compiler: [gcc@12.3]
       providers:
-        mpi: [[email protected].26]
-        lapack: [cray-libsci@23.05.1.4]
+        mpi: [[email protected].28]
+        lapack: [cray-libsci@23.12.5]
     bzip2:
       externals:
       - spec: [email protected]
@@ -92,43 +92,46 @@ spack:
       buildable: false
     gcc:
       externals:
-      - spec: gcc@12.2.0
+      - spec: gcc@12.3
         modules:
         - PrgEnv-gnu/8.5.0
-        - gcc/12.2.0
+        - gcc-native/12.3
         - libfabric/1.15.2.0
-        - cray-libsci/23.05.1.4
-        - craype
+        - cray-libsci/23.12.5
+        - craype/2.7.30
         - craype-accel-host
         - craype-x86-rome
       buildable: false
     cray-mpich:
       externals:
-      - spec: [email protected].26
+      - spec: [email protected].28
         modules:
-        - cray-mpich/8.1.26
+        - cray-mpich/8.1.28
       buildable: false
     cray-libsci:
       externals:
-      - spec: cray-libsci@23.05.1.4
+      - spec: cray-libsci@23.12.5
         modules:
-        - cray-libsci/23.05.1.4
+        - cray-libsci/23.12.5
       buildable: false
 {% if e3sm_hdf5_netcdf %}
     hdf5:
       externals:
-      - spec: [email protected]~cxx+fortran+hl~java+mpi+shared
-        prefix: /opt/cray/pe/hdf5-parallel/1.12.2.3/gnu/9.1
+      - spec: [email protected]~cxx+fortran+hl~java+mpi+shared
+        modules:
+        - cray-hdf5-parallel/1.12.2.9
       buildable: false
     parallel-netcdf:
       externals:
-      - spec: [email protected]+cxx+fortran+pic+shared
-        prefix: /opt/cray/pe/parallel-netcdf/1.12.3.3/GNU/9.1/
+      - spec: [email protected]+cxx+fortran+pic+shared
+        modules:
+        - cray-parallel-netcdf/1.12.3.9
       buildable: false
     netcdf-c:
       externals:
-      - spec: [email protected]+mpi~parallel-netcdf
-        prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.3/GNU/9.1
+      - spec: [email protected]+mpi~parallel-netcdf
+        modules:
+        - cray-netcdf-hdf5parallel/4.9.0.9
       buildable: false
     netcdf-fortran:
       externals:
@@ -140,7 +143,7 @@ spack:
     install_missing_compilers: false
   compilers:
   - compiler:
-      spec: gcc@12.2.0
+      spec: gcc@12.3
       paths:
         cc: cc
         cxx: CC
@@ -151,10 +154,10 @@ spack:
       target: x86_64
       modules:
       - PrgEnv-gnu/8.5.0
-      - gcc/12.2.0
+      - gcc-native/12.3
       - libfabric/1.15.2.0
-      - cray-libsci/23.05.1.4
-      - craype
+      - cray-libsci/23.12.5
+      - craype/2.7.30
       - craype-accel-host
       - craype-x86-rome
       environment: