Skip to content

Commit 4f0b8ee

Browse files
xylarxylar
authored
Merge pull request #201 from altheaden/update-chicoma-cpu
Update `chicoma-cpu` modules
2 parents 353766f + 6abd81b commit 4f0b8ee

File tree

6 files changed

+216
-176
lines changed

6 files changed

+216
-176
lines changed

‎mache/spack/chicoma-cpu_gnu_mpich.csh‎

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,46 @@ setenv HTTP_PROXY http://proxyout.lanl.gov:8080
55
setenv HTTPS_PROXY http://proxyout.lanl.gov:8080
66
setenv FTP_PROXY http://proxyout.lanl.gov:8080
77

8-
source /usr/share/lmod/8.3.1/init/csh
8+
source /usr/share/lmod/lmod/init/csh
99

10-
module rm PrgEnv-gnu
11-
module rm PrgEnv-nvidia
12-
module rm PrgEnv-cray
13-
module rm PrgEnv-aocc
14-
module rm craype-accel-nvidia80
15-
module rm craype-accel-host
10+
module rm cray-hdf5-parallel \
11+
cray-netcdf-hdf5parallel \
12+
cray-parallel-netcdf \
13+
cray-netcdf \
14+
cray-hdf5 \
15+
gcc \
16+
gcc-native \
17+
intel \
18+
intel-oneapi \
19+
nvidia \
20+
aocc \
21+
cudatoolkit \
22+
climate-utils \
23+
cray-libsci \
24+
craype \
25+
craype-accel-nvidia80 \
26+
craype-accel-host \
27+
perftools-base \
28+
perftools \
29+
darshan \
30+
PrgEnv-gnu \
31+
PrgEnv-intel \
32+
PrgEnv-nvidia \
33+
PrgEnv-cray \
34+
PrgEnv-aocc
1635

17-
module load PrgEnv-gnu/8.4.0
18-
module load gcc/12.2.0
19-
module load craype-accel-host
20-
{% if e3sm_lapack %}
21-
module load cray-libsci
22-
{% endif %}
23-
module load craype
24-
module load libfabric/1.15.2.0
25-
module load cray-mpich/8.1.26
36+
# we must load cray-libsci for gcc to work
37+
module load PrgEnv-gnu/8.5.0 \
38+
gcc-native/12.3 \
39+
cray-libsci/23.12.5 \
40+
craype-accel-host \
41+
craype/2.7.30 \
42+
cray-mpich/8.1.28 \
43+
cmake/3.27.7
2644
{% if e3sm_hdf5_netcdf %}
27-
module rm cray-hdf5-parallel
28-
module rm cray-netcdf-hdf5parallel
29-
module rm cray-parallel-netcdf
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
45+
module load cray-hdf5-parallel/1.12.2.9 \
46+
cray-netcdf-hdf5parallel/4.9.0.9 \
47+
cray-parallel-netcdf/1.12.3.9
3348
{% endif %}
3449

3550
setenv MPICH_ENV_DISPLAY 1
@@ -44,4 +59,7 @@ setenv PNETCDF_HINTS "romio_ds_write=disable;romio_ds_read=disable;romio_cb_writ
4459
setenv FI_CXI_RX_MATCH_MODE software
4560
setenv MPICH_COLL_SYNC MPI_Bcast
4661

47-
setenv LD_LIBRARY_PATH $CRAY_LD_LIBRARY_PATH:$LD_LIBRARY_PATH
62+
# for standalone MPAS builds
63+
setenv GNU_CRAY_LDFLAGS "-Wl,--enable-new-dtags"
64+
65+
setenv LD_LIBRARY_PATH="/usr/lib64/gcc/x86_64-suse-linux/12:${CRAY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}"

‎mache/spack/chicoma-cpu_gnu_mpich.sh‎

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,46 @@ export HTTP_PROXY=http://proxyout.lanl.gov:8080
55
export HTTPS_PROXY=http://proxyout.lanl.gov:8080
66
export FTP_PROXY=http://proxyout.lanl.gov:8080
77

8-
source /usr/share/lmod/8.3.1/init/sh
8+
source /usr/share/lmod/lmod/init/sh
99

10-
module rm PrgEnv-gnu
11-
module rm PrgEnv-nvidia
12-
module rm PrgEnv-cray
13-
module rm PrgEnv-aocc
14-
module rm craype-accel-nvidia80
15-
module rm craype-accel-host
10+
module rm cray-hdf5-parallel \
11+
cray-netcdf-hdf5parallel \
12+
cray-parallel-netcdf \
13+
cray-netcdf \
14+
cray-hdf5 \
15+
gcc \
16+
gcc-native \
17+
intel \
18+
intel-oneapi \
19+
nvidia \
20+
aocc \
21+
cudatoolkit \
22+
climate-utils \
23+
cray-libsci \
24+
craype \
25+
craype-accel-nvidia80 \
26+
craype-accel-host \
27+
perftools-base \
28+
perftools \
29+
darshan \
30+
PrgEnv-gnu \
31+
PrgEnv-intel \
32+
PrgEnv-nvidia \
33+
PrgEnv-cray \
34+
PrgEnv-aocc
1635

17-
module load PrgEnv-gnu/8.4.0
18-
module load gcc/12.2.0
19-
module load craype-accel-host
20-
{% if e3sm_lapack %}
21-
module load cray-libsci
22-
{% endif %}
23-
module load craype
24-
module load libfabric/1.15.2.0
25-
module load cray-mpich/8.1.26
36+
# we must load cray-libsci for gcc to work
37+
module load PrgEnv-gnu/8.5.0 \
38+
gcc-native/12.3 \
39+
cray-libsci/23.12.5 \
40+
craype-accel-host \
41+
craype/2.7.30 \
42+
cray-mpich/8.1.28 \
43+
cmake/3.27.7
2644
{% if e3sm_hdf5_netcdf %}
27-
module rm cray-hdf5-parallel
28-
module rm cray-netcdf-hdf5parallel
29-
module rm cray-parallel-netcdf
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
45+
module load cray-hdf5-parallel/1.12.2.9 \
46+
cray-netcdf-hdf5parallel/4.9.0.9 \
47+
cray-parallel-netcdf/1.12.3.9
3348
{% endif %}
3449

3550
export MPICH_ENV_DISPLAY=1
@@ -44,4 +59,7 @@ export PNETCDF_HINTS="romio_ds_write=disable;romio_ds_read=disable;romio_cb_writ
4459
export FI_CXI_RX_MATCH_MODE=software
4560
export MPICH_COLL_SYNC=MPI_Bcast
4661

47-
export LD_LIBRARY_PATH=$CRAY_LD_LIBRARY_PATH:$LD_LIBRARY_PATH
62+
export LD_LIBRARY_PATH="/usr/lib64/gcc/x86_64-suse-linux/12:${CRAY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}"
63+
64+
# for standalone MPAS builds
65+
export GNU_CRAY_LDFLAGS="-Wl,--enable-new-dtags"

‎mache/spack/chicoma-cpu_gnu_mpich.yaml‎

Lines changed: 33 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ spack:
22
specs:
33
- gcc
44
- cray-mpich
5-
{% if e3sm_lapack %}
65
- cray-libsci
7-
{% endif %}
86
{% if e3sm_hdf5_netcdf %}
97
- hdf5
108
- netcdf-c
@@ -16,17 +14,20 @@ spack:
1614
unify: true
1715
packages:
1816
all:
19-
compiler: [gcc@12.2.0]
17+
compiler: [gcc@12.3]
2018
providers:
21-
mpi: [[email protected]]
22-
{% if e3sm_lapack %}
23-
lapack: [[email protected]]
24-
{% endif %}
19+
mpi: [[email protected]]
20+
lapack: [[email protected]]
2521
bzip2:
2622
externals:
2723
- spec: [email protected]
2824
prefix: /usr
2925
buildable: false
26+
cmake:
27+
externals:
28+
- spec: [email protected]
29+
prefix: /usr/projects/hpcsoft/tce/23-05/cos2-x86_64-cc80/packages/cmake/cmake-3.27.7/
30+
buildable: false
3031
curl:
3132
externals:
3233
- spec: [email protected]
@@ -91,67 +92,55 @@ spack:
9192
buildable: false
9293
gcc:
9394
externals:
94-
- spec: gcc@12.2.0
95+
- spec: gcc@12.3
9596
modules:
96-
- PrgEnv-gnu/8.4.0
97-
- gcc/12.2.0
98-
- craype-accel-host
99-
- craype
97+
- PrgEnv-gnu/8.5.0
98+
- gcc-native/12.3
10099
- libfabric/1.15.2.0
100+
- cray-libsci/23.12.5
101+
- craype/2.7.30
102+
- craype-accel-host
103+
- craype-x86-rome
101104
buildable: false
102105
cray-mpich:
103106
externals:
104-
- spec: [email protected]
105-
prefix: /opt/cray/pe/mpich/8.1.26/ofi/gnu/9.1
107+
- spec: [email protected]
106108
modules:
107-
- libfabric/1.15.2.0
108-
- cray-mpich/8.1.26
109+
- cray-mpich/8.1.28
109110
buildable: false
110-
libfabric:
111-
externals:
112-
- spec: [email protected]
113-
prefix: /opt/cray/libfabric/1.15.2.0
114-
modules:
115-
- libfabric/1.15.2.0
116-
buildable: false
117-
{% if e3sm_lapack %}
118111
cray-libsci:
119112
externals:
120-
- spec: [email protected]
121-
prefix: /opt/cray/pe/libsci/23.05.1.4/GNU/9.1/x86_64
113+
- spec: [email protected]
122114
modules:
123-
- cray-libsci/23.05.1.4
115+
- cray-libsci/23.12.5
124116
buildable: false
125-
{% endif %}
126117
{% if e3sm_hdf5_netcdf %}
127118
hdf5:
128119
externals:
129-
- spec: [email protected]~cxx+fortran+hl~java+mpi+shared
130-
prefix: /opt/cray/pe/hdf5-parallel/1.12.2.3/GNU/9.1
131-
modules:
132-
- cray-hdf5-parallel/1.12.2.3
120+
- spec: [email protected]~cxx+fortran+hl~java+mpi+shared
121+
prefix: /opt/cray/pe/hdf5-parallel/1.12.2.9/gnu/12.3
133122
buildable: false
134123
parallel-netcdf:
135124
externals:
136-
- spec: [email protected].3+cxx+fortran+pic+shared
137-
prefix: /opt/cray/pe/parallel-netcdf/1.12.3.3/GNU/9.1/
125+
- spec: [email protected].9+cxx+fortran+pic+shared
126+
prefix: /opt/cray/pe/parallel-netcdf/1.12.3.9/gnu/12.3
138127
buildable: false
139128
netcdf-c:
140129
externals:
141-
- spec: [email protected].3+mpi~parallel-netcdf
142-
prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.3/GNU/9.1
130+
- spec: [email protected].9+mpi~parallel-netcdf
131+
prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.9/gnu/12.3
143132
buildable: false
144133
netcdf-fortran:
145134
externals:
146135
- spec: [email protected]
147-
prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.3/GNU/9.1
136+
prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.9/gnu/12.3
148137
buildable: false
149138
{% endif %}
150139
config:
151140
install_missing_compilers: false
152141
compilers:
153142
- compiler:
154-
spec: gcc@12.2.0
143+
spec: gcc@12.3
155144
paths:
156145
cc: cc
157146
cxx: CC
@@ -161,11 +150,13 @@ spack:
161150
operating_system: sles15
162151
target: x86_64
163152
modules:
164-
- PrgEnv-gnu/8.4.0
165-
- gcc/12.2.0
166-
- craype-accel-host
167-
- craype
153+
- PrgEnv-gnu/8.5.0
154+
- gcc-native/12.3
168155
- libfabric/1.15.2.0
156+
- cray-libsci/23.12.5
157+
- craype/2.7.30
158+
- craype-accel-host
159+
- craype-x86-rome
169160
environment:
170161
prepend_path:
171162
PKG_CONFIG_PATH: "/opt/cray/xpmem/2.5.2-2.4_3.45__gd0f7936.shasta/lib64/pkgconfig"

‎mache/spack/chicoma-cpu_nvidia_mpich.csh‎

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,46 @@ setenv HTTP_PROXY http://proxyout.lanl.gov:8080
55
setenv HTTPS_PROXY http://proxyout.lanl.gov:8080
66
setenv FTP_PROXY http://proxyout.lanl.gov:8080
77

8-
source /usr/share/lmod/8.3.1/init/csh
8+
source /usr/share/lmod/lmod/init/csh
99

10-
module rm PrgEnv-gnu
11-
module rm PrgEnv-nvidia
12-
module rm PrgEnv-cray
13-
module rm PrgEnv-aocc
14-
module rm craype-accel-nvidia80
15-
module rm craype-accel-host
1610

17-
module load PrgEnv-nvidia/8.4.0
18-
module load nvidia/22.7
19-
module load craype-x86-milan
20-
module load libfabric/1.15.2.0
21-
module load craype-accel-host
22-
module load craype
23-
module load cray-mpich/8.1.26
24-
{% if e3sm_lapack %}
25-
module load cray-libsci/23.05.1.4
26-
{% endif %}
11+
module rm cray-hdf5-parallel \
12+
cray-netcdf-hdf5parallel \
13+
cray-parallel-netcdf \
14+
cray-netcdf \
15+
cray-hdf5 \
16+
gcc \
17+
gcc-native \
18+
intel \
19+
intel-oneapi \
20+
nvidia \
21+
aocc \
22+
cudatoolkit \
23+
climate-utils \
24+
cray-libsci \
25+
craype \
26+
craype-accel-nvidia80 \
27+
craype-accel-host \
28+
perftools-base \
29+
perftools \
30+
darshan \
31+
PrgEnv-gnu \
32+
PrgEnv-intel \
33+
PrgEnv-nvidia \
34+
PrgEnv-cray \
35+
PrgEnv-aocc
36+
37+
module load PrgEnv-nvidia/8.5.0 \
38+
nvidia/24.7 \
39+
cray-libsci/23.12.5 \
40+
craype-accel-host \
41+
craype/2.7.30 \
42+
cray-mpich/8.1.28 \
43+
cmake/3.27.7
2744
{% if e3sm_hdf5_netcdf %}
28-
module rm cray-hdf5-parallel
29-
module rm cray-netcdf-hdf5parallel
30-
module rm cray-parallel-netcdf
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
45+
module load cray-hdf5-parallel/1.12.2.9 \
46+
cray-netcdf-hdf5parallel/4.9.0.9 \
47+
cray-parallel-netcdf/1.12.3.9
3448
{% endif %}
3549

3650
setenv MPICH_ENV_DISPLAY 1

0 commit comments

Comments
 (0)