Skip to content

Commit 999b5c7

Browse files
eapeap
authored
Merge branch 'feature/update_to_spack_v1' into feature/docs-and-ubuntu
2 parents 187285c + 293bbad commit 999b5c7

Some content is hidden

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

60 files changed

+1337
-720
lines changed

‎.github/workflows/ubuntu-ci-x86_64-gnu.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
113113
# Concretize and check for duplicates
114114
spack concretize --force --fresh 2>&1 | tee log.concretize.${ENVNAME}
115-
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env
115+
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
116116
117117
# Add and update source cache
118118
spack mirror add local-source file://${SOURCE_CACHE_PATH}/
@@ -190,7 +190,7 @@ jobs:
190190
191191
# Concretize and check for duplicates
192192
spack concretize --force 2>&1 | tee log.concretize.${ENVNAME}
193-
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env
193+
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
194194
195195
# Add binary cache back in
196196
spack mirror add local-binary file://${BUILD_CACHE_PATH}/

‎.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
129129
# Concretize and check for duplicates
130130
spack concretize --force --fresh 2>&1 | tee log.concretize.${ENVNAME}
131-
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env
131+
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
132132
133133
# Add and update source cache
134134
spack mirror add local-source file://${SOURCE_CACHE_PATH}/
@@ -209,7 +209,7 @@ jobs:
209209
210210
# Concretize and check for duplicates
211211
spack concretize --force 2>&1 | tee log.concretize.${ENVNAME}
212-
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env
212+
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
213213
214214
# Add binary cache back in
215215
spack mirror add local-binary file://${BUILD_CACHE_PATH}/

‎.github/workflows/ubuntu-ci-x86_64-oneapi.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
129129
# Concretize and check for duplicates
130130
spack concretize --force --fresh 2>&1 | tee log.concretize.${ENVNAME}
131-
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env
131+
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
132132
133133
# Add and update source cache
134134
spack mirror add local-source file://${SOURCE_CACHE_PATH}/
@@ -209,7 +209,7 @@ jobs:
209209
210210
# Concretize and check for duplicates
211211
spack concretize --force 2>&1 | tee log.concretize.${ENVNAME}
212-
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env
212+
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
213213
214214
# Add binary cache back in
215215
spack mirror add local-binary file://${BUILD_CACHE_PATH}/

‎.gitmodules‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
[submodule "spack"]
22
path = spack
33
url = https://github.com/jcsda/spack
4-
# Temporary, for transition to spack v1 code
5-
#branch = spack-stack-dev
6-
branch = feature/update_to_spack_v1
4+
branch = spack-stack-dev
75
[submodule "doc/CMakeModules"]
86
path = doc/CMakeModules
97
url = https://github.com/noaa-emc/cmakemodules

‎configs/common/modules_lmod.yaml‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ modules:
2323
- berkeley-db
2424
- bison
2525
- bzip2
26+
- compiler-wrapper
2627
- diffutils
2728
- expat
2829
- findutils
@@ -93,6 +94,7 @@ modules:
9394
- apple-clang
9495
- gcc
9596
- intel-oneapi-compilers
97+
- intel-oneapi-compilers-classic
9698
- llvm
9799
# By default, do not create MPI modules
98100
- cray-mpich
@@ -118,6 +120,14 @@ modules:
118120
environment:
119121
set:
120122
'ESMFMKFILE': '{prefix}/lib/esmf.mk'
123+
suffixes:
124+
~openmp: 'noopenmp'
125+
ip:
126+
suffixes:
127+
~openmp: 'noopenmp'
128+
neptune-env:
129+
suffixes:
130+
~openmp: 'noopenmp'
121131
libpng:
122132
environment:
123133
set:
@@ -128,20 +138,22 @@ modules:
128138
'MADIS_ROOT': '{prefix}'
129139
mapl:
130140
suffixes:
131-
^[email protected]~debug snapshot=none: 'esmf-8.4.2'
132-
^[email protected]+debug snapshot=none: 'esmf-8.4.2-debug'
133-
^[email protected]~debug snapshot=none: 'esmf-8.5.0'
134-
^[email protected]+debug snapshot=none: 'esmf-8.5.0-debug'
135-
^[email protected]~debug snapshot=none: 'esmf-8.6.0'
136-
^[email protected]+debug snapshot=none: 'esmf-8.6.0-debug'
137-
^[email protected]~debug snapshot=none: 'esmf-8.6.1'
138-
^[email protected]+debug snapshot=none: 'esmf-8.6.1-debug'
139-
^[email protected]~debug snapshot=none: 'esmf-8.7.0'
140-
^[email protected]+debug snapshot=none: 'esmf-8.7.0-debug'
141-
^[email protected]~debug snapshot=none: 'esmf-8.8.0'
142-
^[email protected]+debug snapshot=none: 'esmf-8.8.0-debug'
143-
^[email protected]~debug snapshot=none: 'esmf-8.9.0'
144-
^[email protected]+debug snapshot=none: 'esmf-8.9.0-debug'
141+
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.6.1-noopenmp'
142+
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.6.1-debug-noopenmp'
143+
^[email protected]~debug +openmp snapshot=none: 'esmf-8.6.1'
144+
^[email protected]+debug +openmp snapshot=none: 'esmf-8.6.1-debug'
145+
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.8.0-noopenmp'
146+
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.8.0-debug-noopenmp'
147+
^[email protected]~debug +openmp snapshot=none: 'esmf-8.8.0'
148+
^[email protected]+debug +openmp snapshot=none: 'esmf-8.8.0-debug'
149+
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.9.1-noopenmp'
150+
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.9.1-debug-noopenmp'
151+
^[email protected]~debug +openmp snapshot=none: 'esmf-8.9.1'
152+
^[email protected]+debug +openmp snapshot=none: 'esmf-8.9.1-debug'
153+
fms:
154+
suffixes:
155+
constants=GFS: 'gfs-constants'
156+
constants=GEOS: 'geos-constants'
145157
openmpi:
146158
environment:
147159
set:

‎configs/common/modules_tcl.yaml‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ modules:
4242
- berkeley-db
4343
- bison
4444
- bzip2
45+
- compiler-wrapper
4546
- diffutils
4647
- expat
4748
- findutils
@@ -112,6 +113,7 @@ modules:
112113
- apple-clang
113114
- gcc
114115
- intel-oneapi-compilers
116+
- intel-oneapi-compilers-classic
115117
- llvm
116118
# By default, do not create MPI modules
117119
- cray-mpich
@@ -137,6 +139,14 @@ modules:
137139
environment:
138140
set:
139141
'ESMFMKFILE': '{prefix}/lib/esmf.mk'
142+
suffixes:
143+
~openmp: 'noopenmp'
144+
ip:
145+
suffixes:
146+
~openmp: 'noopenmp'
147+
neptune-env:
148+
suffixes:
149+
~openmp: 'noopenmp'
140150
libpng:
141151
environment:
142152
set:
@@ -147,20 +157,22 @@ modules:
147157
'MADIS_ROOT': '{prefix}'
148158
mapl:
149159
suffixes:
150-
^[email protected]~debug snapshot=none: 'esmf-8.4.2'
151-
^[email protected]+debug snapshot=none: 'esmf-8.4.2-debug'
152-
^[email protected]~debug snapshot=none: 'esmf-8.5.0'
153-
^[email protected]+debug snapshot=none: 'esmf-8.5.0-debug'
154-
^[email protected]~debug snapshot=none: 'esmf-8.6.0'
155-
^[email protected]+debug snapshot=none: 'esmf-8.6.0-debug'
156-
^[email protected]~debug snapshot=none: 'esmf-8.6.1'
157-
^[email protected]+debug snapshot=none: 'esmf-8.6.1-debug'
158-
^[email protected]~debug snapshot=none: 'esmf-8.7.0'
159-
^[email protected]+debug snapshot=none: 'esmf-8.7.0-debug'
160-
^[email protected]~debug snapshot=none: 'esmf-8.8.0'
161-
^[email protected]+debug snapshot=none: 'esmf-8.8.0-debug'
162-
^[email protected]~debug snapshot=none: 'esmf-8.9.0'
163-
^[email protected]+debug snapshot=none: 'esmf-8.9.0-debug'
160+
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.6.1-noopenmp'
161+
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.6.1-debug-noopenmp'
162+
^[email protected]~debug +openmp snapshot=none: 'esmf-8.6.1'
163+
^[email protected]+debug +openmp snapshot=none: 'esmf-8.6.1-debug'
164+
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.8.0-noopenmp'
165+
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.8.0-debug-noopenmp'
166+
^[email protected]~debug +openmp snapshot=none: 'esmf-8.8.0'
167+
^[email protected]+debug +openmp snapshot=none: 'esmf-8.8.0-debug'
168+
^[email protected]~debug ~openmp snapshot=none: 'esmf-8.9.1-noopenmp'
169+
^[email protected]+debug ~openmp snapshot=none: 'esmf-8.9.1-debug-noopenmp'
170+
^[email protected]~debug +openmp snapshot=none: 'esmf-8.9.1'
171+
^[email protected]+debug +openmp snapshot=none: 'esmf-8.9.1-debug'
172+
fms:
173+
suffixes:
174+
constants=GFS: 'gfs-constants'
175+
constants=GEOS: 'geos-constants'
164176
openmpi:
165177
environment:
166178
set:

‎configs/common/packages.yaml‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
packages:
2-
all:
3-
providers:
4-
jpeg: [libjpeg-turbo]
5-
pkgconfig: [pkg-config]
6-
yacc: [bison]
7-
zlib-api: [zlib]
2+
# Virtual provider settings
3+
jpeg:
4+
require: [libjpeg-turbo]
5+
pkgconfig:
6+
require: [pkg-config]
7+
yacc:
8+
require: [bison]
9+
zlib-api:
10+
require: [zlib]
11+
# Individual package settings
812
awscli-v2:
913
require:
1014
- ~examples
@@ -55,7 +59,7 @@ packages:
5559
- +fix
5660
ecbuild:
5761
require:
58-
- '@3.7.2'
62+
- '@3.12.0'
5963
eccodes:
6064
require:
6165
- '@2.33.0'
@@ -66,15 +70,15 @@ packages:
6670
- +ui
6771
eckit:
6872
require:
69-
- '@1.28.3'
73+
- '@1.32.3'
7074
- linalg=eigen,lapack compression=lz4,bzip2
7175
ecmwf-atlas:
7276
require:
73-
- '@0.40.0'
77+
- '@0.44.1'
7478
- +fckit +trans +tesselation +fftw
7579
ectrans:
7680
require:
77-
- '@1.5.0'
81+
- '@1.7.0'
7882
eigen:
7983
require:
8084
- '@3.4.0'
@@ -84,7 +88,7 @@ packages:
8488
esmf:
8589
require:
8690
- ~xerces ~pnetcdf +shared +external-parallelio
87-
- any_of: ['@=8.6.1 snapshot=none', '@=8.8.0 snapshot=none', '@=8.9.0 snapshot=none']
91+
- any_of: ['@=8.6.1 snapshot=none', '@=8.8.0 snapshot=none', '@=8.9.0 snapshot=none', '@=8.9.1 snapshot=none']
8892
- any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"']
8993
when: '%intel'
9094
message: Extra ESMF compile options for Intel
@@ -93,21 +97,24 @@ packages:
9397
- ~libbsd
9498
fckit:
9599
require:
96-
- '@0.13.2'
100+
- '@0.14.1'
97101
- +eckit
98102
fftw:
99103
require:
100104
- '@3.3.10'
101105
fiat:
102106
require:
103-
- '@1.4.1'
107+
- '@1.6.1'
104108
flex:
105109
require:
106110
- '@2.6.4'
107111
fms:
108112
require:
109113
- '@2024.02'
110-
- precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release +deprecated_io
114+
- precision=32,64 +quad_precision +openmp +pic build_type=Release +deprecated_io
115+
- any_of:
116+
- +gfs_phys constants=GFS
117+
- ~gfs_phys constants=GEOS
111118
fontconfig:
112119
require:
113120
- +pic
@@ -136,6 +143,8 @@ packages:
136143
#glib:
137144
# require:
138145
# - '@:2.78.3'
146+
global-workflow-env:
147+
require: ['+uwtools']
139148
## To avoid duplicate packages being built
140149
#gmake:
141150
# require:
@@ -206,8 +215,6 @@ packages:
206215
require:
207216
- '@2.53'
208217
- ~shared ~f2py +pflogger
209-
# Note: Please check the sites/tier1/nas/packages_gcc.yaml if
210-
# this is changed, as it has a custom variant combination
211218
met:
212219
require:
213220
- '@12.0.1'
@@ -304,6 +311,10 @@ packages:
304311
py-cartopy:
305312
require:
306313
- +plotting
314+
# Pin py-colorama to avoid duplicate packages, hopefully can be removed soon
315+
py-colorama:
316+
require:
317+
- '@0.4.6'
307318
# Pin to version 42 to avoid maturin dependency that breaks Intel oneAPI builds
308319
py-cryptography:
309320
require:

‎configs/common/packages_clang.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ packages:
22
all:
33
prefer:
44
- '%clang'
5-
providers:
6-
blas: [openblas]
7-
fftw-api: [fftw]
8-
lapack: [openblas]
5+
# Virtual provider settings
6+
blas:
7+
require: [openblas]
8+
fftw-api:
9+
require: [fftw]
10+
lapack:
11+
require: [openblas]
12+
# Individual package settings
913
ectrans:
1014
require:
11-
- ~mkl +fftw
15+
- +fftw
1216
ip:
1317
require:
14-
- '^openblas'
1518
- '~openmp'
16-
py-numpy:
17-
require:
18-
- '^openblas'

‎configs/common/packages_gcc.yaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@ packages:
22
all:
33
prefer:
44
- '%gcc'
5-
providers:
6-
blas: [openblas]
7-
fftw-api: [fftw]
8-
lapack: [openblas]
5+
# Virtual provider settings
6+
blas:
7+
require: [openblas]
8+
fftw-api:
9+
require: [fftw]
10+
lapack:
11+
require: [openblas]
12+
# Individual package settings
913
ectrans:
1014
require:
11-
- ~mkl +fftw
12-
ip:
13-
require:
14-
- '^openblas'
15-
py-numpy:
16-
require:
17-
- '^openblas'
15+
- +fftw

0 commit comments

Comments
 (0)