diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml index 8fe637fb6..72349aa6c 100644 --- a/configs/common/modules_lmod.yaml +++ b/configs/common/modules_lmod.yaml @@ -128,16 +128,12 @@ modules: ^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' - ^esmf@8.6.1b04~debug snapshot=b04: 'esmf-8.6.1b04' - ^esmf@8.6.1b04+debug snapshot=b04: 'esmf-8.6.1b04-debug' ^esmf@8.6.1~debug snapshot=none: 'esmf-8.6.1' ^esmf@8.6.1+debug snapshot=none: 'esmf-8.6.1-debug' - ^esmf@8.7.0b04~debug snapshot=b04: 'esmf-8.7.0b04' - ^esmf@8.7.0b04+debug snapshot=b04: 'esmf-8.7.0b04-debug' - ^esmf@8.7.0b11~debug snapshot=b11: 'esmf-8.7.0b11' - ^esmf@8.7.0b11+debug snapshot=b11: 'esmf-8.7.0b11-debug' ^esmf@8.7.0~debug snapshot=none: 'esmf-8.7.0' ^esmf@8.7.0+debug snapshot=none: 'esmf-8.7.0-debug' + ^esmf@8.8.0b06~debug snapshot=b06: 'esmf-8.8.0b06' + ^esmf@8.8.0b06+debug snapshot=b06: 'esmf-8.8.0b06-debug' openmpi: environment: set: diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml index 3275aee44..77b0817e8 100644 --- a/configs/common/modules_tcl.yaml +++ b/configs/common/modules_tcl.yaml @@ -130,16 +130,12 @@ modules: ^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' - ^esmf@8.6.1b04~debug snapshot=b04: 'esmf-8.6.1b04' - ^esmf@8.6.1b04+debug snapshot=b04: 'esmf-8.6.1b04-debug' ^esmf@8.6.1~debug snapshot=none: 'esmf-8.6.1' ^esmf@8.6.1+debug snapshot=none: 'esmf-8.6.1-debug' - ^esmf@8.7.0b04~debug snapshot=b04: 'esmf-8.7.0b04' - ^esmf@8.7.0b04+debug snapshot=b04: 'esmf-8.7.0b04-debug' - ^esmf@8.7.0b11~debug snapshot=b11: 'esmf-8.7.0b11' - ^esmf@8.7.0b11+debug snapshot=b11: 'esmf-8.7.0b11-debug' ^esmf@8.7.0~debug snapshot=none: 'esmf-8.7.0' ^esmf@8.7.0+debug snapshot=none: 'esmf-8.7.0-debug' + ^esmf@8.8.0b06~debug snapshot=b06: 'esmf-8.8.0b06' + ^esmf@8.8.0b06+debug snapshot=b06: 'esmf-8.8.0b06-debug' openmpi: environment: set: diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 1c40bd5e8..321067cef 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -55,7 +55,7 @@ packages: esmf: require: - '~xerces ~pnetcdf +shared +external-parallelio' - - any_of: ['@=8.6.1 snapshot=none', '@=8.7.0 snapshot=none'] + - any_of: ['@=8.6.1 snapshot=none', '@=8.8.0b06 snapshot=b06'] - any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"'] when: "%intel" message: "Extra ESMF compile options for Intel" diff --git a/configs/templates/neptune-dev/spack.yaml b/configs/templates/neptune-dev/spack.yaml index 9a9e3dfec..0f5ae6907 100644 --- a/configs/templates/neptune-dev/spack.yaml +++ b/configs/templates/neptune-dev/spack.yaml @@ -8,8 +8,8 @@ spack: definitions: - compilers: ['%aocc', '%apple-clang', '%gcc', '%intel', '%oneapi'] - packages: - - neptune-env +espc ^esmf@8.7.0 - - neptune-python-env +xnrl ^esmf@8.7.0 + - neptune-env +espc ^esmf@=8.8.0b06 + - neptune-python-env +xnrl ^neptune-env +espc ^esmf@=8.8.0b06 specs: - matrix: diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml index be901ec7e..a58b63201 100644 --- a/configs/templates/skylab-dev/spack.yaml +++ b/configs/templates/skylab-dev/spack.yaml @@ -14,11 +14,11 @@ spack: - jedi-fv3-env - jedi-geos-env ^esmf@=8.6.1 - jedi-mpas-env - - jedi-neptune-env ^esmf@=8.7.0 + - jedi-neptune-env ^esmf@=8.8.0b06 - jedi-ufs-env ^esmf@=8.6.1 - jedi-um-env - - neptune-env ^esmf@=8.7.0 - - neptune-python-env ^esmf@=8.7.0 + - neptune-env ^esmf@=8.8.0b06 + - neptune-python-env ^esmf@=8.8.0b06 - soca-env # Various crtm tags (list all to avoid duplicate packages) @@ -27,7 +27,7 @@ spack: # Various esmf tags (list all to avoid duplicate packages) - esmf@=8.6.1 snapshot=none - - esmf@=8.7.0 snapshot=none + - esmf@=8.8.0b06 snapshot=b06 specs: - matrix: diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index 744789778..06985043e 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -17,12 +17,12 @@ spack: - jedi-fv3-env - jedi-geos-env ^esmf@=8.6.1 - jedi-mpas-env - - jedi-neptune-env ^esmf@=8.7.0 + - jedi-neptune-env ^esmf@=8.8.0b06 - jedi-tools-env - jedi-ufs-env ^esmf@=8.6.1 - jedi-um-env - - neptune-env ^esmf@=8.7.0 - - neptune-python-env ^esmf@=8.7.0 + - neptune-env ^esmf@=8.8.0b06 + - neptune-python-env ^esmf@=8.8.0b06 - soca-env - ufs-srw-app-env ^esmf@=8.6.1 - ufs-weather-model-env ^esmf@=8.6.1 @@ -33,7 +33,7 @@ spack: # Various esmf tags (list all to avoid duplicate packages) - esmf@=8.6.1 snapshot=none - - esmf@=8.7.0 snapshot=none + - esmf@=8.8.0b06 snapshot=b06 # MADIS for WCOSS2 decoders. - madis@4.5 diff --git a/doc/source/PreConfiguredSites.rst b/doc/source/PreConfiguredSites.rst index c4962ecbc..6db15656a 100644 --- a/doc/source/PreConfiguredSites.rst +++ b/doc/source/PreConfiguredSites.rst @@ -154,7 +154,7 @@ The following is required for building new spack environments with Intel on this umask 0022 module unload PrgEnv-cray - module load PrgEnv-intel/8.3.3 + module load PrgEnv-intel/8.4.0 module unload intel module load intel-classic/2023.2.0 module unload cray-mpich @@ -202,7 +202,7 @@ The following is required for building new spack environments with GNU on this p umask 0022 module unload PrgEnv-cray - module load PrgEnv-gnu/8.3.3 + module load PrgEnv-gnu/8.4.0 module unload gcc module load gcc/10.3.0 module unload cray-mpich diff --git a/spack b/spack index b274d591f..5f691eefb 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit b274d591fc82d38609124e3fe6f8ef1753357947 +Subproject commit 5f691eefb8e8935b1ffd589b70718ed433889b39 diff --git a/spack-ext/repos/spack-stack/packages/py-xnrl/package.py b/spack-ext/repos/spack-stack/packages/py-xnrl/package.py index add77b186..b66c5ec6c 100644 --- a/spack-ext/repos/spack-stack/packages/py-xnrl/package.py +++ b/spack-ext/repos/spack-stack/packages/py-xnrl/package.py @@ -34,7 +34,8 @@ class PyXnrl(PythonPackage): depends_on("py-netcdf4", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) depends_on("py-tqdm", type=("build", "run")) - depends_on("py-xarray", type=("build", "run")) + # py-xnrl@2024.05.23 does not work with py-xarray@2024.7.0 + depends_on("py-xarray@:2023", type=("build", "run")) depends_on("py-ecmwflibs", type=("build", "run")) depends_on("eccodes", type=("build", "run")) depends_on("py-cfgrib", type=("build", "run"))