Skip to content

Commit 3e1fb81

Browse files
xylarxylar
authored
Merge pull request #313 from xylar/update-pm
Update pm-cpu and pm-gpu spack templates with latest modules
2 parents 6aa1cd0 + 76d1b03 commit 3e1fb81

File tree

6 files changed

+103
-103
lines changed

6 files changed

+103
-103
lines changed

‎mache/cime_machine_config/config_machines.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -219,35 +219,35 @@
219219

220220
<modules compiler="gnu">
221221
<command name="load">PrgEnv-gnu/8.5.0</command>
222-
<command name="load">gcc-native/12.3</command>
223-
<command name="load">cray-libsci/23.12.5</command>
222+
<command name="load">gcc-native/13.2</command>
223+
<command name="load">cray-libsci/24.07.0</command>
224224
</modules>
225225

226226
<modules compiler="intel">
227227
<command name="load">PrgEnv-intel/8.5.0</command>
228-
<command name="load">intel/2023.2.0</command>
228+
<command name="load">intel/2024.1.0</command>
229229
</modules>
230230

231231
<modules compiler="nvidia">
232232
<command name="load">PrgEnv-nvidia</command>
233-
<command name="load">nvidia/24.5</command>
234-
<command name="load">cray-libsci/23.12.5</command>
233+
<command name="load">nvidia/25.5</command>
234+
<command name="load">cray-libsci/24.07.0</command>
235235
</modules>
236236

237237
<modules compiler="amdclang">
238238
<command name="load">PrgEnv-aocc</command>
239239
<command name="load">aocc/4.1.0</command>
240-
<command name="load">cray-libsci/23.12.5</command>
240+
<command name="load">cray-libsci/24.07.0</command>
241241
</modules>
242242

243243
<modules>
244244
<command name="load">craype-accel-host</command>
245-
<command name="load">craype/2.7.30</command>
246-
<command name="load">cray-mpich/8.1.28</command>
245+
<command name="load">craype/2.7.32</command>
246+
<command name="load">cray-mpich/8.1.30</command>
247247
<command name="load">cray-hdf5-parallel/1.12.2.9</command>
248248
<command name="load">cray-netcdf-hdf5parallel/4.9.0.9</command>
249-
<command name="load">cray-parallel-netcdf/1.12.3.9</command>
250-
<command name="load">cmake/3.24.3</command>
249+
<command name="load">cray-parallel-netcdf/1.12.3.13</command>
250+
<command name="load">cmake/3.30.2</command>
251251
</modules>
252252
</module_system>
253253

@@ -406,23 +406,23 @@
406406

407407
<modules compiler="gnu.*">
408408
<command name="load">PrgEnv-gnu/8.5.0</command>
409-
<command name="load">gcc-native/12.3</command>
409+
<command name="load">gcc-native/13.2</command>
410410
</modules>
411411

412412
<modules compiler="nvidia.*">
413413
<command name="load">PrgEnv-nvidia</command>
414-
<command name="load">nvidia/24.5</command>
414+
<command name="load">nvidia/25.5</command>
415415
</modules>
416416

417417
<modules compiler="gnugpu">
418-
<command name="load">cudatoolkit/12.4</command>
418+
<command name="load">cudatoolkit/12.9</command>
419419
<command name="load">craype-accel-nvidia80</command>
420420
</modules>
421421

422422
<modules compiler="nvidiagpu">
423-
<command name="load">cudatoolkit/12.4</command>
423+
<command name="load">cudatoolkit/12.9</command>
424424
<command name="load">craype-accel-nvidia80</command>
425-
<command name="load">gcc-native-mixed/12.3</command>
425+
<command name="load">gcc-native-mixed/13.2</command>
426426
</modules>
427427

428428
<modules compiler="gnu">
@@ -434,13 +434,13 @@
434434
</modules>
435435

436436
<modules>
437-
<command name="load">cray-libsci/23.12.5</command>
438-
<command name="load">craype/2.7.30</command>
439-
<command name="load">cray-mpich/8.1.28</command>
440-
<command name="load">cray-hdf5-parallel/1.12.2.9</command>
441-
<command name="load">cray-netcdf-hdf5parallel/4.9.0.9</command>
442-
<command name="load">cray-parallel-netcdf/1.12.3.9</command>
443-
<command name="load">cmake/3.24.3</command>
437+
<command name="load">cray-libsci/24.07.0</command>
438+
<command name="load">craype/2.7.32</command>
439+
<command name="load">cray-mpich/8.1.30</command>
440+
<command name="load">cray-hdf5-parallel/1.14.3.1</command>
441+
<command name="load">cray-netcdf-hdf5parallel/4.9.0.13</command>
442+
<command name="load">cray-parallel-netcdf/1.12.3.13</command>
443+
<command name="load">cmake/3.30.2</command>
444444
</modules>
445445
</module_system>
446446

‎mache/spack/templates/pm-cpu_gnu_mpich.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{%- set compiler = "gcc@12.3" %}
2-
{%- set mpi = "[email protected].28" %}
1+
{%- set compiler = "gcc@13.2" %}
2+
{%- set mpi = "[email protected].30" %}
33
spack:
44
specs:
55
- {{ compiler }}
@@ -35,8 +35,8 @@ spack:
3535
buildable: false
3636
cmake:
3737
externals:
38-
- spec: cmake@3.24.3
39-
prefix: /global/common/software/nersc9/cmake/3.24.3
38+
- spec: cmake@3.30.2
39+
prefix: /global/common/software/nersc9/cmake/3.30.2
4040
buildable: false
4141
findutils:
4242
externals:
@@ -110,10 +110,10 @@ spack:
110110
- spec: {{ compiler }}
111111
modules:
112112
- PrgEnv-gnu/8.5.0
113-
- gcc-native/12.3
114-
- cray-libsci/23.12.5
113+
- gcc-native/13.2
114+
- cray-libsci/24.07.0
115115
- craype-accel-host
116-
- craype/2.7.30
116+
- craype/2.7.32
117117
- libfabric/1.22.0
118118
extra_attributes:
119119
compilers:
@@ -126,13 +126,13 @@ spack:
126126
- spec: {{ mpi }}%{{ compiler }}
127127
modules:
128128
- libfabric/1.22.0
129-
- cray-mpich/8.1.28
129+
- cray-mpich/8.1.30
130130
buildable: false
131131
cray-libsci:
132132
externals:
133-
- spec: cray-libsci@23.12.5
133+
- spec: cray-libsci@24.07.0
134134
modules:
135-
- cray-libsci/23.12.5
135+
- cray-libsci/24.07.0
136136
buildable: false
137137
{%- if e3sm_hdf5_netcdf %}
138138
hdf5:
@@ -142,8 +142,8 @@ spack:
142142
buildable: false
143143
parallel-netcdf:
144144
externals:
145-
- spec: [email protected].9+cxx+fortran+pic+shared
146-
prefix: /opt/cray/pe/parallel-netcdf/1.12.3.9/gnu/12.3
145+
- spec: [email protected].13+cxx+fortran+pic+shared
146+
prefix: /opt/cray/pe/parallel-netcdf/1.12.3.13/gnu/12.3
147147
buildable: false
148148
netcdf-c:
149149
externals:
@@ -169,10 +169,10 @@ spack:
169169
target: x86_64
170170
modules:
171171
- PrgEnv-gnu/8.5.0
172-
- gcc-native/12.3
173-
- cray-libsci/23.12.5
172+
- gcc-native/13.2
173+
- cray-libsci/24.07.0
174174
- craype-accel-host
175-
- craype/2.7.30
175+
- craype/2.7.32
176176
- libfabric/1.22.0
177177
environment:
178178
prepend_path:

‎mache/spack/templates/pm-cpu_intel_mpich.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{%- set compiler = "intel@2023.2.0" %}
2-
{%- set mpi = "[email protected].28" %}
1+
{%- set compiler = "intel@2024.1.0" %}
2+
{%- set mpi = "[email protected].30" %}
33
spack:
44
specs:
55
- {{ compiler }}
@@ -35,8 +35,8 @@ spack:
3535
buildable: false
3636
cmake:
3737
externals:
38-
- spec: cmake@3.24.3
39-
prefix: /global/common/software/nersc9/cmake/3.24.3
38+
- spec: cmake@3.30.2
39+
prefix: /global/common/software/nersc9/cmake/3.30.2
4040
buildable: false
4141
findutils:
4242
externals:
@@ -110,17 +110,17 @@ spack:
110110
- spec: {{ compiler }}
111111
modules:
112112
- PrgEnv-intel/8.5.0
113-
- intel/2023.2.0
113+
- intel/2024.1.0
114114
- cray-libsci/23.12.5
115115
- craype-accel-host
116-
- craype/2.7.30
116+
- craype/2.7.32
117117
- libfabric/1.22.0
118118
buildable: false
119119
cray-mpich:
120120
externals:
121121
- spec: {{ mpi }}%{{ compiler }}
122122
modules:
123-
- cray-mpich/8.1.28
123+
- cray-mpich/8.1.30
124124
- libfabric/1.22.0
125125
buildable: false
126126
cray-libsci:
@@ -137,8 +137,8 @@ spack:
137137
buildable: false
138138
parallel-netcdf:
139139
externals:
140-
- spec: [email protected].9+cxx+fortran+pic+shared
141-
prefix: /opt/cray/pe/parallel-netcdf/1.12.3.9/intel/2023.2
140+
- spec: [email protected].13+cxx+fortran+pic+shared
141+
prefix: /opt/cray/pe/parallel-netcdf/1.12.3.13/intel/2023.2
142142
buildable: false
143143
netcdf-c:
144144
externals:
@@ -164,10 +164,10 @@ spack:
164164
target: x86_64
165165
modules:
166166
- PrgEnv-intel/8.5.0
167-
- intel/2023.2.0
167+
- intel/2024.1.0
168168
- cray-libsci/23.12.5
169169
- craype-accel-host
170-
- craype/2.7.30
170+
- craype/2.7.32
171171
- libfabric/1.22.0
172172
environment:
173173
prepend_path:

‎mache/spack/templates/pm-cpu_nvidia_mpich.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{%- set compiler = "nvhpc@24.5" %}
2-
{%- set mpi = "[email protected].28" %}
1+
{%- set compiler = "nvhpc@25.5" %}
2+
{%- set mpi = "[email protected].30" %}
33
spack:
44
specs:
55
- {{ mpi }}%{{ compiler }}
@@ -34,8 +34,8 @@ spack:
3434
buildable: false
3535
cmake:
3636
externals:
37-
- spec: cmake@3.24.3
38-
prefix: /global/common/software/nersc9/cmake/3.24.3
37+
- spec: cmake@3.30.2
38+
prefix: /global/common/software/nersc9/cmake/3.30.2
3939
buildable: false
4040
findutils:
4141
externals:
@@ -109,7 +109,7 @@ spack:
109109
- spec: {{ mpi }}%{{ compiler }}
110110
modules:
111111
- libfabric/1.22.0
112-
- cray-mpich/8.1.28
112+
- cray-mpich/8.1.30
113113
buildable: false
114114
cray-libsci:
115115
externals:
@@ -125,8 +125,8 @@ spack:
125125
buildable: false
126126
parallel-netcdf:
127127
externals:
128-
- spec: [email protected].9+cxx+fortran+pic+shared
129-
prefix: /opt/cray/pe/parallel-netcdf/1.12.3.9/nvidia/23.3
128+
- spec: [email protected].13+cxx+fortran+pic+shared
129+
prefix: /opt/cray/pe/parallel-netcdf/1.12.3.13/nvidia/23.3
130130
buildable: false
131131
netcdf-c:
132132
externals:
@@ -143,19 +143,19 @@ spack:
143143
- compiler:
144144
spec: {{ compiler }}
145145
paths:
146-
cc: /opt/nvidia/hpc_sdk/Linux_x86_64/24.5/compilers/bin/nvc
147-
cxx: /opt/nvidia/hpc_sdk/Linux_x86_64/24.5/compilers/bin/nvc++
148-
f77: /opt/nvidia/hpc_sdk/Linux_x86_64/24.5/compilers/bin/nvfortran
149-
fc: /opt/nvidia/hpc_sdk/Linux_x86_64/24.5/compilers/bin/nvfortran
146+
cc: /opt/nvidia/hpc_sdk/Linux_x86_64/25.5/compilers/bin/nvc
147+
cxx: /opt/nvidia/hpc_sdk/Linux_x86_64/25.5/compilers/bin/nvc++
148+
f77: /opt/nvidia/hpc_sdk/Linux_x86_64/25.5/compilers/bin/nvfortran
149+
fc: /opt/nvidia/hpc_sdk/Linux_x86_64/25.5/compilers/bin/nvfortran
150150
flags: {}
151151
operating_system: sles15
152152
target: any
153153
modules:
154154
- PrgEnv-nvidia
155-
- nvidia/24.5
155+
- nvidia/25.5
156156
- cray-libsci/23.12.5
157157
- craype-accel-host
158-
- craype/2.7.30
158+
- craype/2.7.32
159159
- libfabric/1.20
160160
environment:
161161
prepend_path:

0 commit comments

Comments
 (0)