Load cudatoolkit last

Also, fix gcc module definitions
E3SM-Project · Oct 23, 2024 · 3ceae78 · 3ceae78
1 parent f20f030
commit 3ceae78
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/mache/spack/pm-gpu_gnugpu_mpich.yaml b/mache/spack/pm-gpu_gnugpu_mpich.yaml
@@ -101,23 +101,23 @@ spack:
         modules:
         - PrgEnv-gnu/8.5.0
         - gcc-native/12.3
-        - cudatoolkit/12.2
         - craype-accel-nvidia80
         - cray-libsci/23.12.5
         - libfabric/1.20.1
         - craype/2.7.30
+        - cudatoolkit/12.2
       buildable: false
     cuda:
       externals:
       - spec: [email protected]
         modules:
         - PrgEnv-gnu/8.5.0
         - gcc-native/12.3
-        - cudatoolkit/12.2
         - craype-accel-nvidia80
         - cray-libsci/23.12.5
         - libfabric/1.20.1
         - craype/2.7.30
+        - cudatoolkit/12.2
       buildable: false
     cray-mpich:
       externals:
@@ -166,12 +166,13 @@ spack:
       operating_system: sles15
       target: any
       modules:
-      - PrgEnv-gnu/8.3.3
-      - gcc/12.3
-      - cudatoolkit/11.7
+      - PrgEnv-gnu/8.5.0
+      - gcc-native/12.3
       - craype-accel-nvidia80
-      - craype/2.7.20
+      - cray-libsci/23.12.5
       - libfabric/1.20.1
+      - craype/2.7.30
+      - cudatoolkit/12.2
       environment:
         prepend_path:
           PKG_CONFIG_PATH: "/opt/cray/xpmem/2.6.2-2.5_2.33__gd067c3f.shasta/lib64/pkgconfig"
diff --git a/mache/spack/pm-gpu_nvidiagpu_mpich.yaml b/mache/spack/pm-gpu_nvidiagpu_mpich.yaml
@@ -100,11 +100,11 @@ spack:
         modules:
         - PrgEnv-nvidia
         - nvidia/24.5
-        - cudatoolkit/12.2
         - craype-accel-nvidia80
         - cray-libsci/23.12.5
         - libfabric/1.20.1
         - craype/2.7.30
+        - cudatoolkit/12.2
       buildable: false
     cray-mpich:
       externals:
@@ -157,11 +157,11 @@ spack:
       modules:
       - PrgEnv-nvidia
       - nvidia/24.5
-      - cudatoolkit/12.2
       - craype-accel-nvidia80
       - cray-libsci/23.12.5
       - libfabric/1.20.1
       - craype/2.7.30
+      - cudatoolkit/12.2
       environment:
         prepend_path:
           PKG_CONFIG_PATH: "/opt/cray/xpmem/2.6.2-2.5_2.33__gd067c3f.shasta/lib64/pkgconfig"