Skip to content

Commit

Permalink
Version updates for spack-stack-1.6.0: [email protected], [email protected]
Browse files Browse the repository at this point in the history
….1, [email protected], [email protected] (#897)

* Update configs/common/modules_* for [email protected]
* Update fms versions in unified-dev and skylab-dev templates to just release-jcsda and 2023.04
* Update submodule pointer for spack
* Update configs/common/packages: [email protected], [email protected], [email protected], [email protected], [email protected]
* Update configs/containers/specs/jedi-ci.yaml for version updates

---------

Co-authored-by: Alex Richert <[email protected]>
Co-authored-by: Alex Richert <[email protected]>
  • Loading branch information
3 people authored Dec 11, 2023
1 parent f5212c7 commit bc9ecd4
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 55 deletions.
15 changes: 5 additions & 10 deletions configs/common/modules_lmod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,20 +129,15 @@ modules:
'MADIS_ROOT': '{prefix}'
mapl:
suffixes:
^[email protected]~debug snapshot=none: 'esmf-8.2.0'
^[email protected]+debug snapshot=none: 'esmf-8.2.0-debug'
^[email protected]~debug snapshot=b09: 'esmf-8.3.0b09'
^[email protected]+debug snapshot=b09: 'esmf-8.3.0b09-debug'
^[email protected]~debug snapshot=none: 'esmf-8.3.0'
^[email protected]+debug snapshot=none: 'esmf-8.3.0-debug'
^[email protected]~debug snapshot=none: 'esmf-8.4.0'
^[email protected]+debug snapshot=none: 'esmf-8.4.0-debug'
^[email protected]~debug snapshot=none: 'esmf-8.4.1'
^[email protected]+debug snapshot=none: 'esmf-8.4.1-debug'
# Keeping this as a reminder how to do snapshots
#^[email protected]~debug snapshot=b09: 'esmf-8.3.0b09'
#^[email protected]+debug snapshot=b09: 'esmf-8.3.0b09-debug'
^[email protected]~debug snapshot=none: 'esmf-8.4.2'
^[email protected]+debug snapshot=none: 'esmf-8.4.2-debug'
^[email protected]~debug snapshot=none: 'esmf-8.5.0'
^[email protected]+debug snapshot=none: 'esmf-8.5.0-debug'
^[email protected]~debug snapshot=none: 'esmf-8.6.0'
^[email protected]+debug snapshot=none: 'esmf-8.6.0-debug'
openmpi:
environment:
set:
Expand Down
15 changes: 5 additions & 10 deletions configs/common/modules_tcl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,20 +131,15 @@ modules:
'MADIS_ROOT': '{prefix}'
mapl:
suffixes:
^[email protected]~debug snapshot=none: 'esmf-8.2.0'
^[email protected]+debug snapshot=none: 'esmf-8.2.0-debug'
^[email protected]~debug snapshot=b09: 'esmf-8.3.0b09'
^[email protected]+debug snapshot=b09: 'esmf-8.3.0b09-debug'
^[email protected]~debug snapshot=none: 'esmf-8.3.0'
^[email protected]+debug snapshot=none: 'esmf-8.3.0-debug'
^[email protected]~debug snapshot=none: 'esmf-8.4.0'
^[email protected]+debug snapshot=none: 'esmf-8.4.0-debug'
^[email protected]~debug snapshot=none: 'esmf-8.4.1'
^[email protected]+debug snapshot=none: 'esmf-8.4.1-debug'
# Keeping this as a reminder how to do snapshots
#^[email protected]~debug snapshot=b09: 'esmf-8.3.0b09'
#^[email protected]+debug snapshot=b09: 'esmf-8.3.0b09-debug'
^[email protected]~debug snapshot=none: 'esmf-8.4.2'
^[email protected]+debug snapshot=none: 'esmf-8.4.2-debug'
^[email protected]~debug snapshot=none: 'esmf-8.5.0'
^[email protected]+debug snapshot=none: 'esmf-8.5.0-debug'
^[email protected]~debug snapshot=none: 'esmf-8.6.0'
^[email protected]+debug snapshot=none: 'esmf-8.6.0-debug'
openmpi:
environment:
set:
Expand Down
18 changes: 6 additions & 12 deletions configs/common/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@
variants: +python
cairo:
variants: +pic
# Newer versions of CDO require the C++-17 standard, which doesn't
# work with all compilers that are currently in use in spack-stack
# When making changes here, also check Hercules/Casper site configs
cdo:
version: ['2.0.5']
version: ['2.2.0']
variants: ~openmp
cmake:
version: ['3.23.1']
Expand All @@ -49,10 +46,10 @@
version: ['5.11.4']
variants: +ui
eckit:
version: ['1.24.4']
version: ['1.24.5']
variants: linalg=eigen,lapack compression=lz4,bzip2
ecmwf-atlas:
version: ['0.35.0']
version: ['0.35.1']
variants: +fckit +trans +tesselation +fftw
ectrans:
version: ['1.2.0']
Expand Down Expand Up @@ -80,9 +77,7 @@
fiat:
version: ['1.2.0']
fms:
#version: ['2023.01']
#variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release
version: ['2023.02.01']
version: ['2023.04']
variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release +deprecated_io
fontconfig:
variants: +pic
Expand Down Expand Up @@ -178,9 +173,8 @@
netcdf-cxx4:
version: ['4.3.1']
netcdf-fortran:
version: ['4.6.0']
# ninja - when adding information here, also check Cheyenne
# and Discover site configs
version: ['4.6.1']
# ninja - when adding information here, also check Discover site config
nlohmann-json:
version: ['3.10.5']
nlohmann-json-schema-validator:
Expand Down
9 changes: 4 additions & 5 deletions configs/containers/specs/jedi-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
### spack-stack-1.5.1 / skylab-6.1.0 containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
### spack-stack-1.6.0 / skylab-7.0.0 containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
specs: [[email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected], [email protected], [email protected], ecflow@5,
[email protected].4, [email protected].0 +fckit +trans +tesselation +fftw, [email protected], [email protected] +fftw,
[email protected].5, [email protected].1 +fckit +trans +tesselation +fftw, [email protected], [email protected] +fftw,
[email protected], [email protected], 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].0, [email protected], [email protected],
[email protected].1, [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected],
[email protected], py-pip, py-pyyaml@5.4.1, [email protected], [email protected], py-xarray@2022.3.0,
[email protected], py-pip, py-pyyaml@6.0, [email protected], [email protected], py-xarray@2023.7.0,
[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,
[email protected], [email protected]]
Expand All @@ -17,4 +17,3 @@
# 2. Comment out for now until build problems are solved
# https://github.com/jcsda/spack-stack/issues/522
# [email protected]
# 3. Need to update [email protected] to 12.0.1!
3 changes: 0 additions & 3 deletions configs/sites/casper/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ packages:
- cuda/12.2.1

### Modifications of common packages
# Version 2.0.5 doesn't compile on Casper with gcc
cdo:
version:: ['2.2.0']

### All other external packages listed alphabetically
autoconf:
Expand Down
9 changes: 3 additions & 6 deletions configs/sites/hercules/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@ packages:
- mvapich2/2.3.7

### Modifications of common packages
# Version 2.0.5 doesn't compile on Hercules with gcc
cdo:
version:: ['2.2.0']
# Version 2.0.8 doesn't compile on Hercules
wgrib2:
version:: ['3.1.1']
# DH* TRY IF THIS IS STILL TRUE # Version 2.0.8 doesn't compile on Hercules
# DH* TRY IF THIS IS STILL TRUE wgrib2:
# DH* TRY IF THIS IS STILL TRUE version:: ['3.1.1']

### All other external packages listed alphabetically
autoconf:
Expand Down
6 changes: 2 additions & 4 deletions configs/templates/skylab-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ spack:

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

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

specs:
Expand Down
6 changes: 2 additions & 4 deletions configs/templates/unified-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ spack:

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

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

# MADIS for WCOSS2 decoders.
Expand Down

0 comments on commit bc9ecd4

Please sign in to comment.