Skip to content

Commit 883ebcb

Browse files
authored
release/1.5.1: add fms@2023.03, site config updates round 3 (#855)
* Update site configs for NOAA Parallel Works * Update casper site config and build documentation * Update container specs in configs/containers/README.md * Update Hercules site config (gnu@12, mvapich2@2.3.7) * Update doc/source/PreConfiguredSites.rst for casper, hera, gaea-c4, jet * Add fms@2023.03 in spack submodule, add to unified-dev and skylab-dev templates * Update configs/containers after tagging spack submodule as spack-stack-1.5.1 * Update documentation for AWS AMI release 1.5.1 * Update macOS section in doc/source/NewSiteConfigs.rst to match Linux section
1 parent d1e55f7 commit 883ebcb

File tree

19 files changed

+175
-242
lines changed

19 files changed

+175
-242
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#url = https://github.com/spack/spack
44
#branch = develop
55
url = https://github.com/jcsda/spack
6-
branch = release/1.5.1
6+
branch = spack-stack-1.5.1
77
[submodule "doc/CMakeModules"]
88
path = doc/CMakeModules
99
url = https://github.com/noaa-emc/cmakemodules

configs/common/packages.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
variants: +pic
2929
# Newer versions of CDO require the C++-17 standard, which doesn't
3030
# work with all compilers that are currently in use in spack-stack
31+
# When making changes here, also check Hercules/Casper site configs
3132
cdo:
3233
version: ['2.0.5']
3334
variants: ~openmp

configs/containers/README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,24 @@
22

33
To avoid hardcoding specs in the generic container recipes, we keep the specs list empty (`specs: []`) and manually add the specs for the particular spack-stack release and application as listed below, *after* running `spack stack create ctr`.
44

5-
### spack-stack-1.5.0 / skylab-6.0.0 containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
5+
### spack-stack-1.5.1 / skylab-6.1.0 containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
66
```
77
specs: [base-env@1.0.0, jedi-base-env@1.0.0, ewok-env@1.0.0, jedi-fv3-env@1.0.0,
88
jedi-mpas-env@1.0.0, bacio@2.4.1, bison@3.8.2, bufr@12.0.0, ecbuild@3.7.2, eccodes@2.27.0, ecflow@5,
99
eckit@1.24.4, ecmwf-atlas@0.35.0 +fckit +ectrans +tesselation +fftw, fiat@1.2.0, ectrans@1.2.0 +fftw,
10-
eigen@3.4.0, fckit@0.11.0, fms@release-jcsda, g2@3.4.5, g2tmpl@1.10.0, gftl-shared@1.5.0,
10+
eigen@3.4.0, fckit@0.11.0, fms@release-jcsda, g2@3.4.5, g2tmpl@1.10.0, gftl-shared@1.6.1,
1111
gsibec@1.1.3, hdf@4.2.15, hdf5@1.14.0, ip@4.3.0, jasper@2.0.32, jedi-cmake@1.4.0,
1212
libpng@1.6.37, nccmp@1.9.0.1, netcdf-c@4.9.2, netcdf-cxx4@4.3.1,
1313
netcdf-fortran@4.6.0, nlohmann-json@3.10.5, nlohmann-json-schema-validator@2.1.0,
1414
parallelio@2.5.10, parallel-netcdf@1.12.2, py-eccodes@1.4.2, py-f90nml@1.4.3,
1515
py-gitpython@3.1.27, py-h5py@3.7.0, py-numpy@1.22.3,
1616
py-pandas@1.5.3, py-pip, py-pyyaml@5.4.1, py-scipy@1.9.3, py-shapely@1.8.0, py-xarray@2022.3.0,
17-
sp@2.3.3, udunits@2.2.28, w3nco@2.4.1, w3emc@2.10.0, nco@5.0.6, esmf@8.4.2, mapl@2.35.2,
18-
yafyaml@0.5.1, zlib@1.2.13, zstd@1.5.2, odc@1.4.6, shumlib@macos_clang_linux_intel_port,
17+
sp@2.3.3, udunits@2.2.28, w3nco@2.4.1, w3emc@2.10.0, nco@5.0.6, esmf@8.5.0, mapl@2.40.3,
18+
zlib@1.2.13, zstd@1.5.2, odc@1.4.6, shumlib@macos_clang_linux_intel_port,
1919
awscli@1.27.84, py-globus-cli@3.16.0]
2020
# Notes:
21-
# 1. Remove mapl@2.35.2 from clang/mpich container, because mapl doesn't work with mpich@4
22-
# 2. Don't build CRTM by default so that it gets built in the JEDI bundles
23-
# 3. Comment out for now until build problems are solved
21+
# 1. Don't build CRTM by default so that it gets built in the JEDI bundles
22+
# 2. Comment out for now until build problems are solved
2423
# https://github.com/jcsda/spack-stack/issues/522
2524
# py-mysql-connector-python@8.0.32
2625
```

configs/containers/docker-ubuntu-clang-mpich.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ spack:
110110
os: ubuntu:20.04
111111
spack:
112112
url: https://github.com/jcsda/spack
113-
ref: release/1.5.1
113+
ref: spack-stack-1.5.1
114114
resolve_sha: false
115115

116116
# Whether or not to strip binaries

configs/containers/docker-ubuntu-gcc-openmpi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ spack:
9898
os: ubuntu:20.04
9999
spack:
100100
url: https://github.com/jcsda/spack
101-
ref: release/1.5.1
101+
ref: spack-stack-1.5.1
102102
resolve_sha: false
103103

104104
# Whether or not to strip binaries

configs/containers/docker-ubuntu-intel-impi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ spack:
116116
os: ubuntu:20.04
117117
spack:
118118
url: https://github.com/jcsda/spack
119-
ref: release/1.5.1
119+
ref: spack-stack-1.5.1
120120
resolve_sha: false
121121

122122
# Whether or not to strip binaries
Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
11
compilers::
22
- compiler:
3-
spec: intel@2022.0.2
3+
spec: gcc@12.2.0
44
paths:
5-
cc: /glade/u/apps/opt/intel/2022.1/compiler/2022.0.2/linux/bin/intel64/icc
6-
cxx: /glade/u/apps/opt/intel/2022.1/compiler/2022.0.2/linux/bin/intel64/icpc
7-
f77: /glade/u/apps/opt/intel/2022.1/compiler/2022.0.2/linux/bin/intel64/ifort
8-
fc: /glade/u/apps/opt/intel/2022.1/compiler/2022.0.2/linux/bin/intel64/ifort
5+
cc: /glade/u/apps/casper/23.10/spack/opt/spack/gcc/12.2.0/pucl/bin/gcc
6+
cxx: /glade/u/apps/casper/23.10/spack/opt/spack/gcc/12.2.0/pucl/bin/g++
7+
f77: /glade/u/apps/casper/23.10/spack/opt/spack/gcc/12.2.0/pucl/bin/gfortran
8+
fc: /glade/u/apps/casper/23.10/spack/opt/spack/gcc/12.2.0/pucl/bin/gfortran
99
flags: {}
10-
operating_system: centos7
10+
operating_system: opensuse15
1111
target: x86_64
1212
modules:
13-
- intel/2022.1
14-
environment:
15-
prepend_path:
16-
PATH: '/glade/work/epicufsrt/contrib/spack-stack/casper/gcc-10.1.0/bin'
17-
CPATH: '/glade/work/epicufsrt/contrib/spack-stack/casper/gcc-10.1.0/include'
18-
LD_LIBRARY_PATH: '/glade/u/apps/opt/intel/2022.1/compiler/latest/linux/compiler/lib/intel64_lin:/glade/u/apps/opt/intel/2022.1/mpi/2021.5.1/libfabric/lib:/glade/work/epicufsrt/contrib/spack-stack/casper/gcc-10.1.0/lib64'
19-
set:
20-
INTEL_LICENSE_FILE: '28518@128.117.177.41'
21-
LM_LICENSE_FILE: '28518@128.117.177.41'
22-
I_MPI_ROOT: '/glade/u/apps/opt/intel/2022.1/mpi/2021.5.1'
23-
13+
- gcc/12.2.0
14+
environment: {}
2415
extra_rpaths: []

configs/sites/casper/packages.yaml

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,53 @@
11
packages:
22
all:
3-
compiler:: [intel@2022.0.2]
3+
compiler:: [gcc@12.2.0]
44
providers:
5-
mpi:: [intel-oneapi-mpi@2021.5.1]
5+
mpi:: [openmpi@4.1.6]
66

77
### MPI, Python, MKL
88
mpi:
99
buildable: False
10-
intel-oneapi-mpi:
10+
openmpi:
1111
externals:
12-
- spec: intel-oneapi-mpi@2021.5.1%intel@2022.0.2
13-
prefix: /glade/u/apps/opt/intel/2022.1
12+
- spec: openmpi@4.1.6%gcc@12.2.0+cuda~cxx~cxx_exceptions~java+lustre~memchecker+pmi+static~wrapper-rpath fabrics=ucx schedulers=tm
13+
prefix: /glade/u/apps/casper/23.10/spack/opt/spack/openmpi/4.1.6/gcc/12.2.0/yia4
1414
modules:
15-
- intel-oneapi-mpi/2021.5.1.lua
15+
- openmpi/4.1.6
16+
- ucx/1.14.1
17+
- cuda/12.2.1
1618

17-
### Modification of common packages
18-
# Default gdal (3.7.0) doesn't build on Casper with intel@2022.0.2
19-
gdal:
20-
version:: ['3.6.3']
19+
### Modifications of common packages
20+
# Version 2.0.5 doesn't compile on Hercules with gcc
21+
cdo
22+
version:: ['2.2.0']
2123

2224
### All other external packages listed alphabetically
2325
autoconf:
2426
externals:
25-
- spec: autoconf@2.69
26-
prefix: /usr
27+
- spec: autoconf@2.71
28+
prefix: /glade/u/apps/casper/23.10/opt/view
2729
automake:
2830
externals:
29-
- spec: automake@1.13.4
31+
- spec: automake@1.16.5
32+
prefix: /glade/u/apps/casper/23.10/opt/view
33+
- spec: automake@1.15.1
3034
prefix: /usr
3135
berkeley-db:
3236
externals:
3337
- spec: berkeley-db@4.7.25
3438
prefix: /usr
3539
binutils:
3640
externals:
37-
- spec: binutils@2.27.43
41+
- spec: binutils@2.41.0
3842
prefix: /usr
3943
bzip2:
4044
externals:
4145
- spec: bzip2@1.0.6
4246
prefix: /usr
47+
coreutils:
48+
externals:
49+
- spec: coreutils@8.32
50+
prefix: /usr
4351
cmake:
4452
externals:
4553
- spec: cmake@3.16.8
@@ -53,19 +61,21 @@ packages:
5361
prefix: /usr
5462
cvs:
5563
externals:
56-
- spec: cvs@1.11.23
64+
- spec: cvs@1.12.13
5765
prefix: /usr
5866
curl:
5967
externals:
60-
- spec: curl@7.29.0+gssapi+ldap+nghttp2
68+
- spec: curl@8.1.2+nghttp2
69+
prefix: /glade/u/apps/casper/23.10/opt/view
70+
- spec: curl@8.0.1+gssapi+ldap+nghttp2
6171
prefix: /usr
6272
diffutils:
6373
externals:
6474
- spec: diffutils@3.3
6575
prefix: /usr
6676
doxygen:
6777
externals:
68-
- spec: doxygen@1.8.5+graphviz~mscgen
78+
- spec: diffutils@3.6
6979
prefix: /usr
7080
ecflow:
7181
buildable: False
@@ -74,23 +84,19 @@ packages:
7484
prefix: /glade/work/epicufsrt/contrib/spack-stack/casper/ecflow-5.8.4
7585
modules:
7686
- ecflow/5.8.4
77-
file:
78-
externals:
79-
- spec: file@5.11
80-
prefix: /usr
8187
findutils:
8288
externals:
83-
- spec: findutils@4.5.11
89+
- spec: findutils@4.8.0
8490
prefix: /usr
8591
flex:
8692
# Must set buildable: false to avoid duplicate packages
87-
buildable: false
93+
#buildable: false
8894
externals:
89-
- spec: flex@2.5.37+lex
90-
prefix: /usr
95+
- spec: flex@2.6.4+lex
96+
prefix: /glade/u/apps/casper/23.10/opt/view
9197
gawk:
9298
externals:
93-
- spec: gawk@4.0.2
99+
- spec: gawk@4.2.1
94100
prefix: /usr
95101
gettext:
96102
externals:
@@ -102,21 +108,21 @@ packages:
102108
prefix: /usr
103109
git:
104110
externals:
105-
- spec: git@2.33.1
106-
modules:
107-
- git/2.33.1
111+
- spec: git@2.41.0~tcltk
112+
prefix: /glade/u/apps/casper/23.10/opt/view
113+
- spec: git@2.35.3+tcltk
114+
prefix: /usr
108115
git-lfs:
109116
externals:
110-
- spec: git-lfs@3.0.2
111-
modules:
112-
- git/2.33.1
117+
- spec: git-lfs@3.3.0
118+
prefix: /glade/u/apps/casper/23.10/opt/view
113119
gmake:
114120
externals:
115-
- spec: gmake@3.82
121+
- spec: gmake@4.2.1
116122
prefix: /usr
117123
groff:
118124
externals:
119-
- spec: groff@1.22.2
125+
- spec: groff@1.22.4
120126
prefix: /usr
121127
krb5:
122128
buildable: False
@@ -131,15 +137,13 @@ packages:
131137
variants: ~gssapi
132138
libtool:
133139
externals:
134-
- spec: libtool@2.4.2
135-
prefix: /usr
136-
libxpm:
137-
externals:
138-
- spec: libxpm@4.11.0
140+
- spec: libtool@2.4.7
141+
prefix: /glade/u/apps/casper/23.10/opt/view
142+
- spec: libtool@2.4.6
139143
prefix: /usr
140144
m4:
141145
externals:
142-
- spec: m4@1.4.16
146+
- spec: m4@1.4.18
143147
prefix: /usr
144148
mysql:
145149
buildable: False
@@ -150,34 +154,31 @@ packages:
150154
- mysql/8.0.31
151155
ncurses:
152156
externals:
153-
- spec: ncurses@5.9.20130511+termlib abi=5
154-
prefix: /usr
157+
- spec: ncurses@6.4.20221231+termlib abi=6
158+
prefix: /glade/u/apps/casper/23.10/opt/view
155159
# Old re2c on Casper unable to build newer versions of ninja
156160
ninja:
157161
version:: ['1.10.2']
158162
openssh:
159163
externals:
160-
- spec: openssh@7.4p1
164+
- spec: openssh@8.4p1
161165
prefix: /usr
162166
openssl:
163167
externals:
164-
- spec: openssl@1.0.2k-fips
168+
- spec: openssl@1.1.1l
165169
prefix: /usr
166-
# Pin patchelf to 0.15.0 for Intel compiler (no C++-17 features)
167-
#patchelf:
168-
# version:: ['0.15.0']
169170
perl:
170171
externals:
171172
- spec: perl@5.16.3~cpanm+shared+threads
172173
prefix: /usr
173174
pkg-config:
174175
externals:
175-
- spec: pkg-config@0.27.1
176+
- spec: pkg-config@0.29.2
176177
prefix: /usr
177178
qt:
178179
externals:
179-
- spec: qt@5.15.2
180-
prefix: /glade/work/epicufsrt/contrib/spack-stack/casper/qt-5.15.2
180+
- spec: qt@5.14.2
181+
prefix: /glade/u/apps/casper/23.10/opt/view
181182
rsync:
182183
externals:
183184
- spec: rsync@3.1.2
@@ -192,19 +193,17 @@ packages:
192193
prefix: /usr
193194
subversion:
194195
externals:
195-
- spec: subversion@1.7.14
196-
prefix: /usr
197-
swig:
198-
externals:
199-
- spec: swig@2.0.10
196+
- spec: subversion@1.14.1
200197
prefix: /usr
201198
tar:
202199
externals:
203-
- spec: tar@1.26
200+
- spec: tar@1.34
204201
prefix: /usr
205202
texinfo:
206203
externals:
207-
- spec: texinfo@5.1
204+
- spec: texinfo@7.0.3
205+
prefix: /glade/u/apps/casper/23.10/opt/view
206+
- spec: texinfo@6.5
208207
prefix: /usr
209208
texlive:
210209
externals:

configs/sites/hercules/compilers.yaml

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,17 @@ compilers:
1313
- intel-oneapi-compilers/2023.1.0
1414
environment: {}
1515
extra_rpaths: []
16-
# Spack gets confused if both intel and oneapi are present
17-
#- compiler:
18-
# spec: oneapi@2022.2.1
19-
# paths:
20-
# cc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/icx
21-
# cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/icpx
22-
# # For now ...
23-
# f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/ifort
24-
# fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/ifort
25-
# #f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/ifx
26-
# #fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/ifx
27-
# flags: {}
28-
# operating_system: rocky9
29-
# target: x86_64
30-
# modules:
31-
# - intel-oneapi-compilers/2022.2.1
32-
# environment: {}
33-
# extra_rpaths: []
3416
- compiler:
35-
spec: gcc@11.3.1
17+
spec: gcc@12.2.0
3618
paths:
37-
cc: /usr/bin/gcc
38-
cxx: /usr/bin/g++
39-
f77: /usr/bin/gfortran
40-
fc: /usr/bin/gfortran
19+
cc: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/gcc
20+
cxx: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/g++
21+
f77: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/gfortran
22+
fc: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/gfortran
4123
flags: {}
4224
operating_system: rocky9
4325
target: x86_64
44-
modules: []
26+
modules:
27+
- gcc/12.2.0
4528
environment: {}
4629
extra_rpaths: []

0 commit comments

Comments
 (0)