Skip to content

Commit 239a66a

Browse files
xylarxylar
authored
Merge pull request #312 from xylar/revert-update-pm
Revert "Merge pull request #306 from xylar/update-pm"
2 parents 592aaa9 + b1ea6c0 commit 239a66a

File tree

75 files changed

+2032
-153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+2032
-153
lines changed

‎docs/users_guide/spack/build.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ spack_script = get_spack_script(
116116
config_file=machine_config,
117117
include_e3sm_lapack=include_e3sm_lapack,
118118
include_e3sm_hdf5_netcdf=e3sm_hdf5_netcdf,
119+
yaml_template=yaml_template
119120
)
120121
```
121122

@@ -160,6 +161,7 @@ mpicc, mpicxx, mpifc, mod_env_commands = get_modules_env_vars_and_mpi_compilers(
160161
shell='sh', # or 'csh'
161162
include_e3sm_lapack=include_e3sm_lapack,
162163
include_e3sm_hdf5_netcdf=e3sm_hdf5_netcdf,
164+
yaml_template=yaml_template
163165
)
164166
```
165167

‎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/13.2</command>
223-
<command name="load">cray-libsci/24.07.0</command>
222+
<command name="load">gcc-native/12.3</command>
223+
<command name="load">cray-libsci/23.12.5</command>
224224
</modules>
225225

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

231231
<modules compiler="nvidia">
232232
<command name="load">PrgEnv-nvidia</command>
233-
<command name="load">nvidia/25.5</command>
234-
<command name="load">cray-libsci/24.07.0</command>
233+
<command name="load">nvidia/24.5</command>
234+
<command name="load">cray-libsci/23.12.5</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/24.07.0</command>
240+
<command name="load">cray-libsci/23.12.5</command>
241241
</modules>
242242

243243
<modules>
244244
<command name="load">craype-accel-host</command>
245-
<command name="load">craype/2.7.32</command>
246-
<command name="load">cray-mpich/8.1.30</command>
245+
<command name="load">craype/2.7.30</command>
246+
<command name="load">cray-mpich/8.1.28</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.13</command>
250-
<command name="load">cmake/3.30.2</command>
249+
<command name="load">cray-parallel-netcdf/1.12.3.9</command>
250+
<command name="load">cmake/3.24.3</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/13.2</command>
409+
<command name="load">gcc-native/12.3</command>
410410
</modules>
411411

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

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

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

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

436436
<modules>
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>
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>
444444
</modules>
445445
</module_system>
446446

‎mache/machines/anvil.cfg‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,18 @@ partitions = acme-small, acme-medium, acme-large
6363
qos = regular, acme_high
6464

6565

66+
# Config options related to spack environments
67+
[spack]
68+
69+
# whether to load modules from the spack yaml file before loading the spack
70+
# environment
71+
modules_before = False
72+
73+
# whether to load modules from the spack yaml file after loading the spack
74+
# environment
75+
modules_after = False
76+
77+
6678
# config options related to synchronizing files
6779
[sync]
6880

‎mache/machines/aurora.cfg‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,18 @@ account = E3SM_Dec
4949
# queues (default is the first)
5050
queues = prod, debug
5151

52+
# Config options related to spack environments
53+
[spack]
54+
55+
# whether to load modules from the spack yaml file before loading the spack
56+
# environment
57+
modules_before = False
58+
59+
# whether to load modules from the spack yaml file after loading the spack
60+
# environment
61+
modules_after = False
62+
63+
5264
# config options related to synchronizing files
5365
[sync]
5466

‎mache/machines/chicoma-cpu.cfg‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@ partitions = standard, gpu
4040
qos = standard, debug
4141

4242

43+
# Config options related to spack environments
44+
[spack]
45+
46+
# whether to load modules from the spack yaml file before loading the spack
47+
# environment
48+
modules_before = False
49+
50+
# whether to load modules from the spack yaml file after loading the spack
51+
# environment
52+
modules_after = False
53+
54+
4355
# config options related to synchronizing files
4456
[sync]
4557

‎mache/machines/chrysalis.cfg‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,19 @@ cores_per_node = 128
5656
# available partition(s) (default is the first)
5757
partitions = compute, debug, Shigh
5858

59+
60+
# Config options related to spack environments
61+
[spack]
62+
63+
# whether to load modules from the spack yaml file before loading the spack
64+
# environment
65+
modules_before = False
66+
67+
# whether to load modules from the spack yaml file after loading the spack
68+
# environment
69+
modules_after = True
70+
71+
5972
# config options related to synchronizing files
6073
[sync]
6174

‎mache/machines/compy.cfg‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,18 @@ partitions = slurm
6363
qos = regular
6464

6565

66+
# Config options related to spack environments
67+
[spack]
68+
69+
# whether to load modules from the spack yaml file before loading the spack
70+
# environment
71+
modules_before = True
72+
73+
# whether to load modules from the spack yaml file after loading the spack
74+
# environment
75+
modules_after = False
76+
77+
6678
# config options related to synchronizing files
6779
[sync]
6880

‎mache/machines/dane.cfg‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,18 @@ cores_per_node = 112
5353
partitions = pbatch, pdebug
5454

5555

56+
# Config options related to spack environments
57+
[spack]
58+
59+
# whether to load modules from the spack yaml file before loading the spack
60+
# environment
61+
modules_before = True
62+
63+
# whether to load modules from the spack yaml file after loading the spack
64+
# environment
65+
modules_after = False
66+
67+
5668
# config options related to synchronizing files
5769
[sync]
5870

‎mache/machines/frontier.cfg‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ partitions = batch
5656
# Config options related to spack environments
5757
[spack]
5858

59+
# whether to load modules from the spack yaml file before loading the spack
60+
# environment
61+
modules_before = False
62+
63+
# whether to load modules from the spack yaml file after loading the spack
64+
# environment
65+
modules_after = False
66+
5967
# whether the machine uses cray compilers
6068
cray_compilers = True
6169

‎mache/machines/pm-cpu.cfg‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,17 @@ constraints = cpu
6262
# quality of service (default is the first)
6363
qos = regular, debug, premium
6464

65-
6665
# Config options related to spack environments
6766
[spack]
6867

68+
# whether to load modules from the spack yaml file before loading the spack
69+
# environment
70+
modules_before = False
71+
72+
# whether to load modules from the spack yaml file after loading the spack
73+
# environment
74+
modules_after = False
75+
6976
# whether the machine uses cray compilers
7077
cray_compilers = True
7178

0 commit comments

Comments
 (0)