From bc9ecd40cc158c9ae8ab10e2972883f1debb2af7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 11 Dec 2023 07:35:28 -0700 Subject: [PATCH] Version updates for spack-stack-1.6.0: eckit@1.24.5, ecmwf-atlas@0.35.1, esmf@8.6.0, fms@2023.04 (#897) * Update configs/common/modules_* for esmf@8.6.0 * 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: cdo@2.2.0, eckit@1.24.5, ecmwf-atlas@0.35.1, fms@2023.04, netcdf-fortran@4.6.1 * Update configs/containers/specs/jedi-ci.yaml for version updates --------- Co-authored-by: Alex Richert Co-authored-by: Alex Richert <82525672+AlexanderRichert-NOAA@users.noreply.github.com> --- configs/common/modules_lmod.yaml | 15 +++++---------- configs/common/modules_tcl.yaml | 15 +++++---------- configs/common/packages.yaml | 18 ++++++------------ configs/containers/specs/jedi-ci.yaml | 9 ++++----- configs/sites/casper/packages.yaml | 3 --- configs/sites/hercules/packages.yaml | 9 +++------ configs/templates/skylab-dev/spack.yaml | 6 ++---- configs/templates/unified-dev/spack.yaml | 6 ++---- spack | 2 +- 9 files changed, 28 insertions(+), 55 deletions(-) diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml index ef895fb34..d8b853121 100644 --- a/configs/common/modules_lmod.yaml +++ b/configs/common/modules_lmod.yaml @@ -129,20 +129,15 @@ modules: 'MADIS_ROOT': '{prefix}' mapl: suffixes: - ^esmf@8.2.0~debug snapshot=none: 'esmf-8.2.0' - ^esmf@8.2.0+debug snapshot=none: 'esmf-8.2.0-debug' - ^esmf@8.3.0b09~debug snapshot=b09: 'esmf-8.3.0b09' - ^esmf@8.3.0b09+debug snapshot=b09: 'esmf-8.3.0b09-debug' - ^esmf@8.3.0~debug snapshot=none: 'esmf-8.3.0' - ^esmf@8.3.0+debug snapshot=none: 'esmf-8.3.0-debug' - ^esmf@8.4.0~debug snapshot=none: 'esmf-8.4.0' - ^esmf@8.4.0+debug snapshot=none: 'esmf-8.4.0-debug' - ^esmf@8.4.1~debug snapshot=none: 'esmf-8.4.1' - ^esmf@8.4.1+debug snapshot=none: 'esmf-8.4.1-debug' + # Keeping this as a reminder how to do snapshots + #^esmf@8.3.0b09~debug snapshot=b09: 'esmf-8.3.0b09' + #^esmf@8.3.0b09+debug snapshot=b09: 'esmf-8.3.0b09-debug' ^esmf@8.4.2~debug snapshot=none: 'esmf-8.4.2' ^esmf@8.4.2+debug snapshot=none: 'esmf-8.4.2-debug' ^esmf@8.5.0~debug snapshot=none: 'esmf-8.5.0' ^esmf@8.5.0+debug snapshot=none: 'esmf-8.5.0-debug' + ^esmf@8.6.0~debug snapshot=none: 'esmf-8.6.0' + ^esmf@8.6.0+debug snapshot=none: 'esmf-8.6.0-debug' openmpi: environment: set: diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml index b9f43301d..9a8affb11 100644 --- a/configs/common/modules_tcl.yaml +++ b/configs/common/modules_tcl.yaml @@ -131,20 +131,15 @@ modules: 'MADIS_ROOT': '{prefix}' mapl: suffixes: - ^esmf@8.2.0~debug snapshot=none: 'esmf-8.2.0' - ^esmf@8.2.0+debug snapshot=none: 'esmf-8.2.0-debug' - ^esmf@8.3.0b09~debug snapshot=b09: 'esmf-8.3.0b09' - ^esmf@8.3.0b09+debug snapshot=b09: 'esmf-8.3.0b09-debug' - ^esmf@8.3.0~debug snapshot=none: 'esmf-8.3.0' - ^esmf@8.3.0+debug snapshot=none: 'esmf-8.3.0-debug' - ^esmf@8.4.0~debug snapshot=none: 'esmf-8.4.0' - ^esmf@8.4.0+debug snapshot=none: 'esmf-8.4.0-debug' - ^esmf@8.4.1~debug snapshot=none: 'esmf-8.4.1' - ^esmf@8.4.1+debug snapshot=none: 'esmf-8.4.1-debug' + # Keeping this as a reminder how to do snapshots + #^esmf@8.3.0b09~debug snapshot=b09: 'esmf-8.3.0b09' + #^esmf@8.3.0b09+debug snapshot=b09: 'esmf-8.3.0b09-debug' ^esmf@8.4.2~debug snapshot=none: 'esmf-8.4.2' ^esmf@8.4.2+debug snapshot=none: 'esmf-8.4.2-debug' ^esmf@8.5.0~debug snapshot=none: 'esmf-8.5.0' ^esmf@8.5.0+debug snapshot=none: 'esmf-8.5.0-debug' + ^esmf@8.6.0~debug snapshot=none: 'esmf-8.6.0' + ^esmf@8.6.0+debug snapshot=none: 'esmf-8.6.0-debug' openmpi: environment: set: diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 16aca97a8..693bfcf2d 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -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'] @@ -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'] @@ -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 @@ -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: diff --git a/configs/containers/specs/jedi-ci.yaml b/configs/containers/specs/jedi-ci.yaml index c97f23e5e..2483b8a2f 100644 --- a/configs/containers/specs/jedi-ci.yaml +++ b/configs/containers/specs/jedi-ci.yaml @@ -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: [base-env@1.0.0, jedi-base-env@1.0.0, ewok-env@1.0.0, jedi-fv3-env@1.0.0, jedi-mpas-env@1.0.0, bacio@2.4.1, bison@3.8.2, bufr@12.0.1, ecbuild@3.7.2, eccodes@2.27.0, ecflow@5, - eckit@1.24.4, ecmwf-atlas@0.35.0 +fckit +trans +tesselation +fftw, fiat@1.2.0, ectrans@1.2.0 +fftw, + eckit@1.24.5, ecmwf-atlas@0.35.1 +fckit +trans +tesselation +fftw, fiat@1.2.0, ectrans@1.2.0 +fftw, eigen@3.4.0, fckit@0.11.0, fms@release-jcsda, g2@3.4.5, g2tmpl@1.10.2, gftl-shared@1.6.1, 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, libpng@1.6.37, nccmp@1.9.0.1, netcdf-c@4.9.2, netcdf-cxx4@4.3.1, - netcdf-fortran@4.6.0, nlohmann-json@3.10.5, nlohmann-json-schema-validator@2.1.0, + netcdf-fortran@4.6.1, nlohmann-json@3.10.5, nlohmann-json-schema-validator@2.1.0, parallelio@2.5.10, parallel-netcdf@1.12.2, py-eccodes@1.4.2, py-f90nml@1.4.3, py-gitpython@3.1.27, py-h5py@3.7.0, py-numpy@1.22.3, - 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, + py-pandas@1.5.3, py-pip, py-pyyaml@6.0, py-scipy@1.9.3, py-shapely@1.8.0, py-xarray@2023.7.0, sp@2.5.0, udunits@2.2.28, w3nco@2.4.1, w3emc@2.10.0, nco@5.0.6, esmf@8.5.0, mapl@2.40.3, zlib@1.2.13, zstd@1.5.2, odc@1.4.6, shumlib@macos_clang_linux_intel_port, awscli-v2@2.13.22, py-globus-cli@3.16.0] @@ -17,4 +17,3 @@ # 2. Comment out for now until build problems are solved # https://github.com/jcsda/spack-stack/issues/522 # py-mysql-connector-python@8.0.32 - # 3. Need to update bufr@12.0.0 to 12.0.1! diff --git a/configs/sites/casper/packages.yaml b/configs/sites/casper/packages.yaml index af221309e..6468964f4 100644 --- a/configs/sites/casper/packages.yaml +++ b/configs/sites/casper/packages.yaml @@ -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: diff --git a/configs/sites/hercules/packages.yaml b/configs/sites/hercules/packages.yaml index 4322b61e5..c71b30cf1 100644 --- a/configs/sites/hercules/packages.yaml +++ b/configs/sites/hercules/packages.yaml @@ -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: diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml index 49a9e93e5..0a8314cbb 100644 --- a/configs/templates/skylab-dev/spack.yaml +++ b/configs/templates/skylab-dev/spack.yaml @@ -18,12 +18,10 @@ spack: # Various fms tags (list all to avoid duplicate packages) - fms@release-jcsda - - fms@2023.01 - - fms@2023.02.01 - - fms@2023.03 + - fms@2023.04 # Various crtm tags (list all to avoid duplicate packages) - - crtm@2.4.0 + - crtm@2.4.0.1 - crtm@v2.4.1-jedi specs: diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index 53f74d2e8..bc339f192 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -28,12 +28,10 @@ spack: # Various fms tags (list all to avoid duplicate packages) - fms@release-jcsda - - fms@2023.01 - - fms@2023.02.01 - - fms@2023.03 + - fms@2023.04 # Various crtm tags (list all to avoid duplicate packages) - - crtm@2.4.0 + - crtm@2.4.0.1 - crtm@v2.4.1-jedi # MADIS for WCOSS2 decoders. diff --git a/spack b/spack index a6c3d15e4..a89cc6125 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit a6c3d15e4d9e8174a5e901cc2d50909c38d5d2cd +Subproject commit a89cc61253aab39f818fea75837f0c0498ac3757