Skip to content

Commit eef533f

Browse files
xylarxylar
authored
Merge pull request #193 from altheaden/update-config-machines
Update `config_machines.xml`
2 parents f24de1f + 2f1d2f9 commit eef533f

13 files changed

+241
-178
lines changed

‎mache/cime_machine_config/config_machines.xml‎

Lines changed: 174 additions & 123 deletions
Large diffs are not rendered by default.

‎mache/spack/compy_intel_impi.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,21 +130,21 @@ spack:
130130
netcdf-c:
131131
externals:
132132
- spec: [email protected]
133-
prefix: /share/apps/netcdf/4.6.3/intel/19.0.5
133+
prefix: /share/apps/netcdf/4.6.3/intel/20.0.0
134134
modules:
135135
- netcdf/4.6.3
136136
buildable: false
137137
netcdf-fortran:
138138
externals:
139139
- spec: [email protected]
140-
prefix: /share/apps/netcdf/4.6.3/intel/19.0.5
140+
prefix: /share/apps/netcdf/4.6.3/intel/20.0.0
141141
modules:
142142
- netcdf/4.6.3
143143
buildable: false
144144
parallel-netcdf:
145145
externals:
146146
- spec: [email protected]
147-
prefix: /share/apps/pnetcdf/1.9.0/intel/19.0.5/intelmpi/2019u4/
147+
prefix: /share/apps/pnetcdf/1.9.0/intel/20.0.0/intelmpi/2020/
148148
modules:
149149
- pnetcdf/1.9.0
150150
buildable: false

‎mache/spack/frontier_gnu_mpich.csh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module reset >& /dev/null
22
module switch PrgEnv-cray PrgEnv-gnu/8.3.3 >& /dev/null
3-
module switch gcc gcc/11.2.0 >& /dev/null
3+
module switch gcc gcc/12.2.0 >& /dev/null
44

55
{% if e3sm_lapack %}
66
module load cray-libsci/22.12.1.1

‎mache/spack/frontier_gnu_mpich.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module reset >& /dev/null
22
module switch PrgEnv-cray PrgEnv-gnu/8.3.3 >& /dev/null
3-
module switch gcc gcc/11.2.0 >& /dev/null
3+
module switch gcc gcc/12.2.0 >& /dev/null
44

55
{% if e3sm_lapack %}
66
module load cray-libsci/22.12.1.1

‎mache/spack/frontier_gnu_mpich.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spack:
1616
unify: when_possible
1717
packages:
1818
all:
19-
compiler: [gcc@11.2.0]
19+
compiler: [gcc@12.2.0]
2020
providers:
2121
mpi: [[email protected]]
2222
{% if e3sm_lapack %}
@@ -101,10 +101,10 @@ spack:
101101
buildable: false
102102
gcc:
103103
externals:
104-
- spec: gcc@11.2.0
104+
- spec: gcc@12.2.0
105105
modules:
106106
- PrgEnv-gnu/8.3.3
107-
- gcc/11.2.0
107+
- gcc/12.2.0
108108
- craype/2.7.19
109109
- libfabric/1.15.2.0
110110
buildable: false
@@ -158,7 +158,7 @@ spack:
158158
install_missing_compilers: false
159159
compilers:
160160
- compiler:
161-
spec: gcc@11.2.0
161+
spec: gcc@12.2.0
162162
paths:
163163
cc: cc
164164
cxx: CC
@@ -169,7 +169,7 @@ spack:
169169
target: x86_64
170170
modules:
171171
- PrgEnv-gnu/8.3.3
172-
- gcc/11.2.0
172+
- gcc/12.2.0
173173
- craype/2.7.19
174174
- libfabric/1.15.2.0
175175
environment:

‎mache/spack/pm-cpu_gnu_mpich.csh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@ module rm PrgEnv-intel &> /dev/null
66
module rm PrgEnv-nvidia &> /dev/null
77
module rm PrgEnv-cray &> /dev/null
88
module rm PrgEnv-aocc &> /dev/null
9+
module rm gcc-native &> /dev/null
910
module rm intel &> /dev/null
1011
module rm intel-oneapi &> /dev/null
1112
module rm cudatoolkit &> /dev/null
1213
module rm climate-utils &> /dev/null
14+
module rm cray-libsci &> /dev/null
1315
module rm matlab &> /dev/null
1416
module rm craype-accel-nvidia80 &> /dev/null
1517
module rm craype-accel-host &> /dev/null
1618
module rm perftools-base &> /dev/null
1719
module rm perftools &> /dev/null
1820
module rm darshan &> /dev/null
1921

20-
module load PrgEnv-gnu/8.3.3
21-
module load gcc/11.2.0
22+
module load PrgEnv-gnu/8.5.0
23+
module load gcc/12.2.0
2224
module load craype-accel-host
2325
{% if e3sm_lapack %}
2426
module load cray-libsci/23.02.1.1

‎mache/spack/pm-cpu_gnu_mpich.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@ module rm PrgEnv-intel &> /dev/null
66
module rm PrgEnv-nvidia &> /dev/null
77
module rm PrgEnv-cray &> /dev/null
88
module rm PrgEnv-aocc &> /dev/null
9+
module rm gcc-native &> /dev/null
910
module rm intel &> /dev/null
1011
module rm intel-oneapi &> /dev/null
1112
module rm cudatoolkit &> /dev/null
1213
module rm climate-utils &> /dev/null
14+
module rm cray-libsci &> /dev/null
1315
module rm matlab &> /dev/null
1416
module rm craype-accel-nvidia80 &> /dev/null
1517
module rm craype-accel-host &> /dev/null
1618
module rm perftools-base &> /dev/null
1719
module rm perftools &> /dev/null
1820
module rm darshan &> /dev/null
1921

20-
module load PrgEnv-gnu/8.3.3
21-
module load gcc/11.2.0
22+
module load PrgEnv-gnu/8.5.0
23+
module load gcc/12.2.0
2224
module load craype-accel-host
2325
{% if e3sm_lapack %}
2426
module load cray-libsci/23.02.1.1

‎mache/spack/pm-cpu_gnu_mpich.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spack:
1616
unify: when_possible
1717
packages:
1818
all:
19-
compiler: [gcc@11.2.0]
19+
compiler: [gcc@12.2.0]
2020
providers:
2121
mpi: [[email protected]]
2222
{% if e3sm_lapack %}
@@ -101,10 +101,10 @@ spack:
101101
buildable: false
102102
gcc:
103103
externals:
104-
- spec: gcc@11.2.0
104+
- spec: gcc@12.2.0
105105
modules:
106-
- PrgEnv-gnu/8.3.3
107-
- gcc/11.2.0
106+
- PrgEnv-gnu/8.5.0
107+
- gcc/12.2.0
108108
- craype-accel-host
109109
- craype/2.7.20
110110
- libfabric/1.15.2.0
@@ -159,7 +159,7 @@ spack:
159159
install_missing_compilers: false
160160
compilers:
161161
- compiler:
162-
spec: gcc@11.2.0
162+
spec: gcc@12.2.0
163163
paths:
164164
cc: cc
165165
cxx: CC
@@ -169,8 +169,8 @@ spack:
169169
operating_system: sles15
170170
target: x86_64
171171
modules:
172-
- PrgEnv-gnu/8.3.3
173-
- gcc/11.2.0
172+
- PrgEnv-gnu/8.5.0
173+
- gcc/12.2.0
174174
- craype-accel-host
175175
- craype/2.7.20
176176
- libfabric/1.15.2.0

‎mache/spack/pm-cpu_intel_mpich.csh‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,33 @@ module rm PrgEnv-intel &> /dev/null
66
module rm PrgEnv-nvidia &> /dev/null
77
module rm PrgEnv-cray &> /dev/null
88
module rm PrgEnv-aocc &> /dev/null
9+
module rm gcc-native &> /dev/null
910
module rm intel &> /dev/null
1011
module rm intel-oneapi &> /dev/null
1112
module rm cudatoolkit &> /dev/null
1213
module rm climate-utils &> /dev/null
14+
module rm cray-libsci &> /dev/null
1315
module rm matlab &> /dev/null
1416
module rm craype-accel-nvidia80 &> /dev/null
1517
module rm craype-accel-host &> /dev/null
1618
module rm perftools-base &> /dev/null
1719
module rm perftools &> /dev/null
1820
module rm darshan &> /dev/null
1921

20-
module load PrgEnv-intel/8.3.3
21-
module load intel/2023.1.0
22+
module load PrgEnv-intel/8.5.0
23+
module load intel/2023.2.0
2224
module load craype-accel-host
23-
module load craype/2.7.20
25+
module load craype/2.7.30
2426
module load libfabric/1.15.2.0
2527
module rm cray-mpich &> /dev/null
26-
module load cray-mpich/8.1.25
28+
module load cray-mpich/8.1.28
2729
{% if e3sm_hdf5_netcdf %}
2830
module rm cray-hdf5-parallel &> /dev/null
2931
module rm cray-netcdf-hdf5parallel &> /dev/null
3032
module rm cray-parallel-netcdf &> /dev/null
31-
module load cray-hdf5-parallel/1.12.2.3
32-
module load cray-netcdf-hdf5parallel/4.9.0.3
33-
module load cray-parallel-netcdf/1.12.3.3
33+
module load cray-hdf5-parallel/1.12.2.9
34+
module load cray-netcdf-hdf5parallel/4.9.0.9
35+
module load cray-parallel-netcdf/1.12.3.9
3436
{% endif %}
3537

3638
{% if e3sm_hdf5_netcdf %}

‎mache/spack/pm-cpu_intel_mpich.sh‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,33 @@ module rm PrgEnv-intel &> /dev/null
66
module rm PrgEnv-nvidia &> /dev/null
77
module rm PrgEnv-cray &> /dev/null
88
module rm PrgEnv-aocc &> /dev/null
9+
module rm gcc-native &> /dev/null
910
module rm intel &> /dev/null
1011
module rm intel-oneapi &> /dev/null
1112
module rm cudatoolkit &> /dev/null
1213
module rm climate-utils &> /dev/null
14+
module rm cray-libsci &> /dev/null
1315
module rm matlab &> /dev/null
1416
module rm craype-accel-nvidia80 &> /dev/null
1517
module rm craype-accel-host &> /dev/null
1618
module rm perftools-base &> /dev/null
1719
module rm perftools &> /dev/null
1820
module rm darshan &> /dev/null
1921

20-
module load PrgEnv-intel/8.3.3
21-
module load intel/2023.1.0
22+
module load PrgEnv-intel/8.5.0
23+
module load intel/2023.2.0
2224
module load craype-accel-host
23-
module load craype/2.7.20
25+
module load craype/2.7.30
2426
module load libfabric/1.15.2.0
2527
module rm cray-mpich &> /dev/null
26-
module load cray-mpich/8.1.25
28+
module load cray-mpich/8.1.28
2729
{% if e3sm_hdf5_netcdf %}
2830
module rm cray-hdf5-parallel &> /dev/null
2931
module rm cray-netcdf-hdf5parallel &> /dev/null
3032
module rm cray-parallel-netcdf &> /dev/null
31-
module load cray-hdf5-parallel/1.12.2.3
32-
module load cray-netcdf-hdf5parallel/4.9.0.3
33-
module load cray-parallel-netcdf/1.12.3.3
33+
module load cray-hdf5-parallel/1.12.2.9
34+
module load cray-netcdf-hdf5parallel/4.9.0.9
35+
module load cray-parallel-netcdf/1.12.3.9
3436
{% endif %}
3537

3638
{% if e3sm_hdf5_netcdf %}

0 commit comments

Comments
 (0)