Skip to content

Commit

Permalink
Merge pull request JCSDA#722 from climbfuji/feature/version_updates_2…
Browse files Browse the repository at this point in the history
…0230817

Various version updates for spack-stack-1.5.0 (parallelio, fms, met, metplus, eckit, fckit, fiat, ecmwf-atlas, scotch), set boost C++ std to C++-17
  • Loading branch information
climbfuji authored Aug 23, 2023
2 parents 4f6838d + b638636 commit 1947628
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 34 deletions.
1 change: 1 addition & 0 deletions .github/workflows/macos-ci-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ jobs:
spack config add "packages:all:compiler:[[email protected]]"
sed -i '' "s/\['\%aocc', '\%apple-clang', '\%gcc', '\%intel'\]/\['\%apple-clang'\]/g" $ENVDIR/spack.yaml
# Concretize and check for duplicates
spack concretize 2>&1 | tee log.concretize.apple-clang-14.0.0
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.apple-clang-14.0.0 -i fms -i crtm
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/macos-ci-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ jobs:
spack config add "packages:all:compiler:[[email protected]]"
sed -i '' "s/\['\%aocc', '\%apple-clang', '\%gcc', '\%intel'\]/\['\%apple-clang'\]/g" $ENVDIR/spack.yaml
# Concretize and check for duplicates
spack concretize 2>&1 | tee log.concretize.apple-clang-14.0.0
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.apple-clang-14.0.0 -i fms -i crtm
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ubuntu-ci-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ jobs:
# Switch from default tcl to lmod modules
sed -i "s/tcl/lmod/g" $ENVDIR/site/modules.yaml
# Concretize and check for duplicates
spack concretize 2>&1 | tee log.concretize.intel-2022.1.0
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.intel-2022.1.0 -i fms -i crtm
Expand Down
27 changes: 14 additions & 13 deletions configs/common/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Attention - when updating also check orion site config
boost:
version: ['1.78.0']
variants: ~atomic +chrono +date_time +exception +filesystem ~graph ~iostreams ~locale ~log ~math ~mpi ~numpy +pic +program_options +python ~random +regex +serialization ~signals +system +test +thread +timer ~wave cxxstd=14 visibility=hidden
variants: ~atomic +chrono +date_time +exception +filesystem ~graph ~iostreams ~locale ~log ~math ~mpi ~numpy +pic +program_options +python ~random +regex +serialization ~signals +system +test +thread +timer ~wave cxxstd=17 visibility=hidden
bufr:
version: ['12.0.0']
variants: +python
Expand All @@ -42,10 +42,10 @@
version: ['5.8.4']
variants: +ui
eckit:
version: ['1.23.1']
version: ['1.24.4']
variants: linalg=eigen,lapack compression=lz4,bzip2
ecmwf-atlas:
version: ['0.33.0']
version: ['0.34.0']
variants: +fckit +trans
ectrans:
version: ['1.2.0']
Expand All @@ -62,16 +62,17 @@
version: ['8.4.2']
variants: ~xerces ~pnetcdf snapshot=none ~shared +external-parallelio
fckit:
version: ['0.10.1']
version: ['0.11.0']
variants: +eckit
fftw:
version: ['3.3.10']
fiat:
version: ['1.1.0']
version: ['1.2.0']
fms:
version: ['2023.01']
# when switching to 2023.02, need to add "+use_fmsio" to variants
variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release
#version: ['2023.01']
#variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release
version: ['2023.02']
variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release +use_fmsio
g2:
version: ['3.4.5']
g2c:
Expand Down Expand Up @@ -121,14 +122,14 @@
libyaml:
version: ['0.2.5']
mapl:
# 2.35.2 goes with [email protected].1
# 2.35.2 goes with [email protected].2
version: ['2.35.2']
variants: ~shared
met:
version: ['11.0.2']
version: ['11.1.0']
variants: +python +grib2
metplus:
version: ['5.0.1']
version: ['5.1.0']
mpich:
variants: ~hwloc +two_level_namespace
nco:
Expand Down Expand Up @@ -171,7 +172,7 @@
p4est:
version: ['2.8']
parallelio:
version: ['2.5.9']
version: ['2.5.10']
variants: +pnetcdf
parallel-netcdf:
version: ['1.12.2']
Expand Down Expand Up @@ -249,7 +250,7 @@
qt:
version: ['5.15.3']
scotch:
version: ['7.0.3']
version: ['7.0.4']
variants: +mpi+metis~shared~threads~mpi_thread+noarch
sfcio:
version: ['1.4.1']
Expand Down
22 changes: 9 additions & 13 deletions configs/containers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,40 @@

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`.

### spack-stack-1.4.1 / skylab-5.0.0 containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
### spack-stack-1.5.0 / skylab-6.0.0 containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
```
specs: [[email protected], [email protected] ~fftw, [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected], [email protected], [email protected], ecflow@5,
eckit@1.23.1, ecmwf-atlas@0.33.0 +trans ~fftw, [email protected] ~fftw, [email protected],
fckit@0.10.1, fms@release-jcsda, [email protected], [email protected], [email protected],
eckit@1.24.4, ecmwf-atlas@0.34.0 +trans ~fftw, [email protected], [email protected] ~fftw, [email protected],
fckit@0.11.0, fms@release-jcsda, [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected],
[email protected].9, [email protected], [email protected], [email protected],
[email protected].10, [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected],
[email protected], py-pip, [email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], shumlib@macos_clang_linux_intel_port]
# Don't build CRTM by default so that it gets built in the JEDI bundles:
# [email protected]
# Don't build ESMF and MAPL for now:
# https://github.com/JCSDA-internal/MPAS-Model/issues/38
# https://github.com/jcsda/spack-stack/issues/326
# [email protected], [email protected], [email protected]
# Comment out for now until build problems are solved
# https://github.com/jcsda/spack-stack/issues/522
# [email protected]
```

### spack-stack-1.4.1 / ufs-weather-model-x.y.z containers for ufs-weather-model as of July 5, 2023
### spack-stack-1.5.0 / ufs-weather-model-x.y.z containers for ufs-weather-model as of July 5, 2023

**Note. This is not yet working correctly, some libraries are missing. Please do not use yet! Also, if using the clang-mpich container, need to disable openmp for fms, not clear how to do this cleanly.**

```
specs: [[email protected],
[email protected], [email protected], [email protected], [email protected], [email protected], ecflow@5,
eckit@1.23.1, ecmwf-atlas@0.33.0 +trans ~fftw, [email protected] ~fftw, [email protected],
fckit@0.10.1, [email protected], [email protected], [email protected], [email protected],
eckit@1.24.4, ecmwf-atlas@0.34.0 +trans ~fftw, [email protected], [email protected] ~fftw, [email protected],
fckit@0.11.0, [email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected],
[email protected].9, [email protected], [email protected], [email protected],
[email protected].10, [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected],
py-pip, [email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected],
Expand Down
2 changes: 1 addition & 1 deletion configs/sites/aws-pcluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ echo " prefix: /usr" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " boost:" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " buildable: False" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " externals:" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " - spec: [email protected] +atomic +chrono +date_time +exception +filesystem +graph +iostreams +locale +log +math +mpi +numpy +pic +program_options +python +random +regex +serialization +signals +system +test +thread +timer ~wave cxxstd=14 visibility=hidden" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " - spec: [email protected] +atomic +chrono +date_time +exception +filesystem +graph +iostreams +locale +log +math +mpi +numpy +pic +program_options +python +random +regex +serialization +signals +system +test +thread +timer ~wave cxxstd=17 visibility=hidden" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " prefix: /usr" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
# Add external ecflow
Expand Down
2 changes: 1 addition & 1 deletion configs/sites/aws-pcluster/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ packages:
boost:
buildable: False
externals:
- spec: [email protected] +atomic +chrono +date_time +exception +filesystem +graph +iostreams +locale +log +math +mpi +numpy +pic +program_options +python +random +regex +serialization +signals +system +test +thread +timer +wave cxxstd=14 visibility=hidden
- spec: [email protected] +atomic +chrono +date_time +exception +filesystem +graph +iostreams +locale +log +math +mpi +numpy +pic +program_options +python +random +regex +serialization +signals +system +test +thread +timer +wave cxxstd=17 visibility=hidden
prefix: /usr
# Don't use external cmake, this confuses the spack concretizer
# leading to duplicate packages being installed.
Expand Down
8 changes: 7 additions & 1 deletion configs/templates/skylab-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ spack:
- jedi-um-env
- soca-env

# Additional crtm tags
# Various fms tags (list all to avoid duplicate packages)
- fms@release-jcsda
- [email protected]
- [email protected]

# Various crtm tags (list all to avoid duplicate packages)
- [email protected]
- [email protected]
- [email protected]

Expand Down
10 changes: 6 additions & 4 deletions configs/templates/unified-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ spack:
#- upp-env
#- ww3-env

# Additional esmf/mapl tags
#- [email protected]~debug+external-parallelio
#- [email protected]~debug ^[email protected]~debug+external-parallelio
# Various fms tags (list all to avoid duplicate packages)
- fms@release-jcsda
- [email protected]
- [email protected]

# Additional crtm tags
# Various crtm tags (list all to avoid duplicate packages)
- [email protected]
- [email protected]
- [email protected]

Expand Down

0 comments on commit 1947628

Please sign in to comment.