Skip to content

Commit c3fa78c

Browse files
xylarxylar
authored
Merge pull request #132 from xylar/fix-chicoma
Many updates for Chicoma support
2 parents d4658f1 + d8704d6 commit c3fa78c

File tree

4 files changed

+51
-48
lines changed

4 files changed

+51
-48
lines changed

‎mache/machines/chicoma-cpu.cfg‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ base_path = /usr/projects/e3sm/e3sm-unified
1919
# (spack modules are used otherwise)
2020
use_system_hdf5_netcdf = True
2121

22+
# location of a spack mirror for E3SM-Unified to use
23+
spack_mirror = /usr/projects/e3sm/e3sm-unified/spack/spack_mirror
24+
2225

2326
# config options related to data needed by diagnostics software such as
2427
# e3sm_diags and MPAS-Analysis

‎mache/spack/chicoma-cpu_gnu_mpich.csh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ module rm PrgEnv-aocc
1414
module rm craype-accel-nvidia80
1515
module rm craype-accel-host
1616

17-
module load PrgEnv-gnu/8.3.3
18-
module load gcc/12.1.0
17+
module load PrgEnv-gnu/8.4.0
18+
module load gcc/12.2.0
1919
module load craype-accel-host
2020
{% if e3sm_lapack %}
2121
module load cray-libsci
2222
{% endif %}
2323
module load craype
24-
module load libfabric/1.15.0.0
25-
module load cray-mpich/8.1.21
24+
module load libfabric/1.15.2.0
25+
module load cray-mpich/8.1.26
2626
{% if e3sm_hdf5_netcdf %}
2727
module rm cray-hdf5-parallel
2828
module rm cray-netcdf-hdf5parallel
2929
module rm cray-parallel-netcdf
30-
module load cray-hdf5-parallel/1.12.2.1
31-
module load cray-netcdf-hdf5parallel/4.9.0.1
32-
module load cray-parallel-netcdf/1.12.3.1
30+
module load cray-hdf5-parallel/1.12.2.3
31+
module load cray-netcdf-hdf5parallel/4.9.0.3
32+
module load cray-parallel-netcdf/1.12.3.3
3333
{% endif %}
3434

3535
setenv MPICH_ENV_DISPLAY 1

‎mache/spack/chicoma-cpu_gnu_mpich.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ module rm PrgEnv-aocc
1414
module rm craype-accel-nvidia80
1515
module rm craype-accel-host
1616

17-
module load PrgEnv-gnu/8.3.3
18-
module load gcc/12.1.0
17+
module load PrgEnv-gnu/8.4.0
18+
module load gcc/12.2.0
1919
module load craype-accel-host
2020
{% if e3sm_lapack %}
2121
module load cray-libsci
2222
{% endif %}
2323
module load craype
24-
module load libfabric/1.15.0.0
25-
module load cray-mpich/8.1.21
24+
module load libfabric/1.15.2.0
25+
module load cray-mpich/8.1.26
2626
{% if e3sm_hdf5_netcdf %}
2727
module rm cray-hdf5-parallel
2828
module rm cray-netcdf-hdf5parallel
2929
module rm cray-parallel-netcdf
30-
module load cray-hdf5-parallel/1.12.2.1
31-
module load cray-netcdf-hdf5parallel/4.9.0.1
32-
module load cray-parallel-netcdf/1.12.3.1
30+
module load cray-hdf5-parallel/1.12.2.3
31+
module load cray-netcdf-hdf5parallel/4.9.0.3
32+
module load cray-parallel-netcdf/1.12.3.3
3333
{% endif %}
3434

3535
export MPICH_ENV_DISPLAY=1

‎mache/spack/chicoma-cpu_gnu_mpich.yaml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ spack:
1616
unify: true
1717
packages:
1818
all:
19-
compiler: [gcc@12.1.0]
19+
compiler: [gcc@12.2.0]
2020
providers:
21-
mpi: [[email protected].21]
21+
mpi: [[email protected].26]
2222
{% if e3sm_lapack %}
23-
lapack: [cray-libsci@22.11.1.2]
23+
lapack: [cray-libsci@23.05.1.4]
2424
{% endif %}
2525
bzip2:
2626
externals:
@@ -84,74 +84,74 @@ spack:
8484
buildable: false
8585
python:
8686
externals:
87-
- spec: python@3.9.7
88-
prefix: /usr/projects/hpcsoft/common/x86_64/anaconda/2021.11-python-3.9
87+
- spec: python@3.10.9
88+
prefix: /usr/projects/hpcsoft/common/x86_64/anaconda/2023.03-python-3.10
8989
modules:
90-
- python/3.9-anaconda-2021.11
90+
- python/3.10-anaconda-2023.03
9191
buildable: false
9292
gcc:
9393
externals:
94-
- spec: gcc@12.1.0
94+
- spec: gcc@12.2.0
9595
modules:
96-
- PrgEnv-gnu/8.3.3
97-
- gcc/12.1.0
96+
- PrgEnv-gnu/8.4.0
97+
- gcc/12.2.0
9898
- craype-accel-host
9999
- craype
100-
- libfabric/1.15.0.0
100+
- libfabric/1.15.2.0
101101
buildable: false
102102
cray-mpich:
103103
externals:
104-
- spec: [email protected].21
105-
prefix: /opt/cray/pe/mpich/8.1.21/ofi/gnu/9.1
104+
- spec: [email protected].26
105+
prefix: /opt/cray/pe/mpich/8.1.26/ofi/gnu/9.1
106106
modules:
107-
- libfabric/1.15.0.0
108-
- cray-mpich/8.1.21
107+
- libfabric/1.15.2.0
108+
- cray-mpich/8.1.26
109109
buildable: false
110110
libfabric:
111111
externals:
112-
- spec: [email protected].0.0
113-
prefix: /opt/cray/libfabric/1.15.0.0
112+
- spec: [email protected].2.0
113+
prefix: /opt/cray/libfabric/1.15.2.0
114114
modules:
115-
- libfabric/1.15.0.0
115+
- libfabric/1.15.2.0
116116
buildable: false
117117
{% if e3sm_lapack %}
118118
cray-libsci:
119119
externals:
120-
- spec: cray-libsci@22.11.1.2
121-
prefix: /opt/cray/pe/libsci/22.11.1.2/GNU/9.1/x86_64
120+
- spec: cray-libsci@23.05.1.4
121+
prefix: /opt/cray/pe/libsci/23.05.1.4/GNU/9.1/x86_64
122122
modules:
123-
- cray-libsci/22.11.1.2
123+
- cray-libsci/23.05.1.4
124124
buildable: false
125125
{% endif %}
126-
{% if e3sm_hdf5_netcdf %}
126+
{% if e3sm_hdf5_netcdf or system_hdf5_netcdf %}
127127
hdf5:
128128
externals:
129-
- spec: [email protected].1~cxx+fortran+hl~java+mpi+shared
130-
prefix: /opt/cray/pe/hdf5-parallel/1.12.2.1/GNU/9.1
129+
- spec: [email protected].3~cxx+fortran+hl~java+mpi+shared
130+
prefix: /opt/cray/pe/hdf5-parallel/1.12.2.3/GNU/9.1
131131
modules:
132-
- cray-hdf5-parallel/1.12.2.1
132+
- cray-hdf5-parallel/1.12.2.3
133133
buildable: false
134134
parallel-netcdf:
135135
externals:
136-
- spec: [email protected].1+cxx+fortran+pic+shared
137-
prefix: /opt/cray/pe/parallel-netcdf/1.12.3.1/GNU/9.1/
136+
- spec: [email protected].3+cxx+fortran+pic+shared
137+
prefix: /opt/cray/pe/parallel-netcdf/1.12.3.3/GNU/9.1/
138138
buildable: false
139139
netcdf-c:
140140
externals:
141-
- spec: [email protected].1+mpi~parallel-netcdf
142-
prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.1/GNU/9.1
141+
- spec: [email protected].3+mpi~parallel-netcdf
142+
prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.3/GNU/9.1
143143
buildable: false
144144
netcdf-fortran:
145145
externals:
146146
- spec: [email protected]
147-
prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.1/GNU/9.1
147+
prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.3/GNU/9.1
148148
buildable: false
149149
{% endif %}
150150
config:
151151
install_missing_compilers: false
152152
compilers:
153153
- compiler:
154-
spec: gcc@12.1.0
154+
spec: gcc@12.2.0
155155
paths:
156156
cc: cc
157157
cxx: CC
@@ -161,11 +161,11 @@ spack:
161161
operating_system: sles15
162162
target: x86_64
163163
modules:
164-
- PrgEnv-gnu/8.3.3
165-
- gcc/12.1.0
164+
- PrgEnv-gnu/8.4.0
165+
- gcc/12.2.0
166166
- craype-accel-host
167167
- craype
168-
- libfabric/1.15.0.0
168+
- libfabric/1.15.2.0
169169
environment:
170170
prepend_path:
171-
PKG_CONFIG_PATH: "/opt/cray/xpmem/2.4.4-2.3_13.8__gff0e1d9.shasta/lib64/pkgconfig"
171+
PKG_CONFIG_PATH: "/opt/cray/xpmem/2.5.2-2.4_3.45__gd0f7936.shasta/lib64/pkgconfig"

0 commit comments

Comments
 (0)