Update to newer nvidia modules

E3SM-Project · Oct 22, 2024 · d55aa3d · d55aa3d
1 parent 168138c
commit d55aa3d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 26 deletions.
diff --git a/mache/spack/chicoma-cpu_nvidia_mpich.csh b/mache/spack/chicoma-cpu_nvidia_mpich.csh
@@ -13,6 +13,8 @@ module rm cray-hdf5-parallel \
           cray-parallel-netcdf \
           cray-netcdf \
           cray-hdf5 \
+          gcc \
+          gcc-native \
           intel \
           intel-oneapi \
           nvidia \
@@ -34,15 +36,15 @@ module rm cray-hdf5-parallel \
 
 module load PrgEnv-nvidia/8.5.0 \
             nvidia/24.7 \
-            cray-libsci/23.05.1.4 \
+            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

diff --git a/mache/spack/chicoma-cpu_nvidia_mpich.sh b/mache/spack/chicoma-cpu_nvidia_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,15 +35,15 @@ module rm cray-hdf5-parallel \
 
 module load PrgEnv-nvidia/8.5.0 \
             nvidia/24.7 \
-            cray-libsci/23.05.1.4 \
+            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

diff --git a/mache/spack/chicoma-cpu_nvidia_mpich.yaml b/mache/spack/chicoma-cpu_nvidia_mpich.yaml
@@ -15,8 +15,8 @@ spack:
     all:
       compiler: [[email protected]]
       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]
@@ -91,37 +91,40 @@ spack:
       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].3~cxx+fortran+hl~java+mpi+shared
+      - spec: [email protected].9~cxx+fortran+hl~java+mpi+shared
         modules:
-        - cray-hdf5-parallel/1.12.2.3
+        - 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/nvidia/20.7
+      - 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/nvidia/20.7
+      - spec: [email protected]+mpi~parallel-netcdf
+        modules:
+        - cray-netcdf-hdf5parallel/4.9.0.9
       buildable: false
     netcdf-fortran:
       externals:
       - spec: [email protected]
-        prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.3/nvidia/20.7
+        modules:
+        - cray-netcdf-hdf5parallel/4.9.0.9
       buildable: false
 {% endif %}
   config:
@@ -141,7 +144,7 @@ spack:
       - PrgEnv-nvidia/8.5.0
       - nvidia/24.7
       - libfabric/1.15.2.0
-      - cray-libsci/23.05.1.4
+      - cray-libsci/23.12.5
       - craype
       - craype-accel-host
       - craype-x86-rome