diff --git a/.github/workflows/macos-ci-aarch64.yaml b/.github/workflows/macos-ci-aarch64.yaml index 514b01d0d..f1b3bc864 100644 --- a/.github/workflows/macos-ci-aarch64.yaml +++ b/.github/workflows/macos-ci-aarch64.yaml @@ -168,7 +168,7 @@ jobs: module use ${ENVDIR}/install/modulefiles/Core module load stack-apple-clang/14.0.3 module load stack-openmpi/5.0.3 - module load stack-python/3.10.13 + module load stack-python/3.11.7 module available module load jedi-ufs-env diff --git a/.github/workflows/ubuntu-ci-x86_64-gnu.yaml b/.github/workflows/ubuntu-ci-x86_64-gnu.yaml index 8a60dc15c..15ecfef74 100644 --- a/.github/workflows/ubuntu-ci-x86_64-gnu.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-gnu.yaml @@ -199,7 +199,7 @@ jobs: module use ${ENVDIR}/install/modulefiles/Core module load stack-gcc/11.4.0 module load stack-openmpi/5.0.3 - module load stack-python/3.10.13 + module load stack-python/3.11.7 module available module load jedi-ufs-env diff --git a/.github/workflows/ubuntu-ci-x86_64-intel.yaml b/.github/workflows/ubuntu-ci-x86_64-intel.yaml index cb44dafaf..febca1f4b 100644 --- a/.github/workflows/ubuntu-ci-x86_64-intel.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-intel.yaml @@ -232,7 +232,7 @@ jobs: module use ${ENVDIR}/install/modulefiles/Core module load stack-intel/2021.10.0 module load stack-intel-oneapi-mpi/2021.10.0 - module load stack-python/3.10.13 + module load stack-python/3.11.7 module available module load jedi-ufs-env diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml index 44eeec3aa..712dc9557 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml @@ -239,7 +239,7 @@ jobs: module use ${ENVDIR}/install/modulefiles/Core module load stack-oneapi/2024.2.0 module load stack-intel-oneapi-mpi/2021.13 - module load stack-python/3.10.13 + module load stack-python/3.11.7 module available module load jedi-ufs-env diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 9ccb16589..f107160a2 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -19,7 +19,9 @@ packages: boost: require: '@1.84 ~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: - require: '@12.0.1 +python' + require: + - '+python' + - '@=12.1.0' cairo: require: '+pic' cdo: @@ -132,9 +134,12 @@ packages: variants: '+pflogger' # If making changes here, also check the Discover site configs and the CI workflows met: - require: '@11.1.1 +python +grib2' + require: + - any_of: ['@=11.1.1', '@=9.1.3'] + - '+python +grib2' metplus: - require: '@5.1.0' + require: + - any_of: ['@=5.1.0', '@=3.1.1'] metis: require: '+int64 +real64' mpich: @@ -182,7 +187,7 @@ packages: proj: require: '~tiff' python: - require: '@3.10.13' + require: '@3.11.7' py-attrs: # https://github.com/JCSDA/spack-stack/issues/740 require: '@21.4.0' diff --git a/configs/containers/specs/jedi-ci.yaml b/configs/containers/specs/jedi-ci.yaml index b3e47123f..a0a9f1a4e 100644 --- a/configs/containers/specs/jedi-ci.yaml +++ b/configs/containers/specs/jedi-ci.yaml @@ -1,6 +1,6 @@ ### spack-stack-1.6.0 / skylab-7.x.y 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.33.0, ecflow@5, + jedi-mpas-env@1.0.0, bacio@2.4.1, bison@3.8.2, bufr@12.1.0, ecbuild@3.7.2, eccodes@2.33.0, ecflow@5, eckit@1.24.5, ecmwf-atlas@0.38.1 +fckit +trans +tesselation +fftw, fiat@1.2.0, ectrans@1.2.0 +fftw, eigen@3.4.0, fckit@0.11.0, fms@2024.02, g2@3.4.9, g2tmpl@1.10.2, gsibec@1.2.1, hdf@4.2.15, hdf5@1.14.3, ip@5.0.0, jasper@2.0.32, jedi-cmake@1.4.0, diff --git a/configs/templates/gsi-addon-dev/spack.yaml b/configs/templates/gsi-addon-dev/spack.yaml index 0a8aedf6d..f4b1f9384 100644 --- a/configs/templates/gsi-addon-dev/spack.yaml +++ b/configs/templates/gsi-addon-dev/spack.yaml @@ -12,20 +12,14 @@ spack: - site - common definitions: - # Note: Set 'compilers' manually; must match upstream list - - compilers: [] + - compilers: ['%aocc', '%apple-clang', '%gcc', '%intel', '%oneapi'] - packages: - global-workflow-env ^bufr@11.7.0 ^metplus@3.1.1 ^met@9.1.3 - ufs-weather-model-env + - emc-verif-global-env - gsi-env specs: - matrix: - [$packages] - [$compilers] - - packages: - python:: - require: ['@3.11.6'] - py-numpy:: - require: ['@1.23.4'] diff --git a/configs/templates/ufs-srw-dev/spack.yaml b/configs/templates/ufs-srw-dev/spack.yaml index d2d5b4aaa..79aacf061 100644 --- a/configs/templates/ufs-srw-dev/spack.yaml +++ b/configs/templates/ufs-srw-dev/spack.yaml @@ -35,7 +35,7 @@ spack: - parallelio@2.5.10 - esmf@8.4.2 - fms@2023.01 - - bufr@12.0.0 + - bufr@12.1.0 - bacio@2.4.1 - crtm@2.4.0 - g2@3.4.5 @@ -54,5 +54,5 @@ spack: - wrf-io@1.2.0 - ncio@1.1.2 - gsi-ncdiag@1.1.2 - - met@11.1.0 + - met@11.1.1 - metplus@5.1.0 diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index 46a6f3037..38374580a 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -23,7 +23,7 @@ spack: - jedi-um-env - neptune-env ~python ^esmf@=8.7.0b11 snapshot=b11 - soca-env - - ufs-srw-app-env ^esmf@=8.6.1 + - ufs-srw-app-env ^esmf@=8.6.1 ^metplus@5.1.0 ^met@11.1.1 - ufs-weather-model-env ^esmf@=8.6.1 # Various crtm tags (list all to avoid duplicate packages) diff --git a/spack-ext/repos/spack-stack/packages/emc-verif-global-env/package.py b/spack-ext/repos/spack-stack/packages/emc-verif-global-env/package.py index e06c15e82..92327a480 100644 --- a/spack-ext/repos/spack-stack/packages/emc-verif-global-env/package.py +++ b/spack-ext/repos/spack-stack/packages/emc-verif-global-env/package.py @@ -22,6 +22,11 @@ class EmcVerifGlobalEnv(BundlePackage): depends_on("nco") depends_on("prod-util") depends_on("grib-util") + depends_on("py-cartopy") + depends_on("py-numpy") + depends_on("py-netcdf4") + depends_on("py-matplotlib") + depends_on("py-pandas") # Test grads # depends_on('grads') # Currently, wgrib2 doesn't build with oneapi, @@ -31,7 +36,9 @@ class EmcVerifGlobalEnv(BundlePackage): depends_on("wgrib2", when="%intel") depends_on("python") depends_on("prod-util") - depends_on("met") - depends_on("metplus") + depends_on("met@9.1.3", when="%gcc") + depends_on("met@9.1.3", when="%intel") + depends_on("metplus@3.1.1", when="%gcc") + depends_on("metplus@3.1.1", when="%intel") # There is no need for install() since there is no code. diff --git a/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py b/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py index c80be09a0..3879d4767 100644 --- a/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py +++ b/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py @@ -43,8 +43,10 @@ class GlobalWorkflowEnv(BundlePackage): depends_on("wgrib2", when="%apple-clang") depends_on("wgrib2", when="%gcc") depends_on("wgrib2", when="%intel") - depends_on("met") - depends_on("metplus") + depends_on("met@9.1.3", when="%gcc") + depends_on("met@9.1.3", when="%intel") + depends_on("metplus@3.1.1", when="%gcc") + depends_on("metplus@3.1.1", when="%intel") depends_on("gsi-ncdiag") depends_on("crtm@2.4.0.1") depends_on("py-wxflow", when="+python")