Skip to content

Update ESMF for NRL applications from 8.7.0 to 8.8.0b06, fix py-xarrray dependency in py-xnrl, update PrgEnv on Narwhal #1385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
climbfuji merged 17 commits into from
Dec 2, 2024
Merged

Update ESMF for NRL applications from 8.7.0 to 8.8.0b06, fix py-xarrray dependency in py-xnrl, update PrgEnv on Narwhal #1385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c14cf10
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Nov 15, 2024
e0f131c
Add commented-out configuration for [email protected] for Nautilus
climbfuji Nov 15, 2024
8343279
Revert .gitmodules and update submodule pointer for spack
climbfuji Nov 15, 2024
e722b14
Add missing prerequisite module load for [email protected] in configs/s…
climbfuji Nov 15, 2024
2def154
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Nov 19, 2024
77c65f7
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Nov 19, 2024
2ff5dd8
Bump esmf for NRL from 8.7.0 to 8.8.0b06
climbfuji Nov 19, 2024
af7e070
Update PrgEnv for Narwhal and fix occasional duplicates in neptune-de…
climbfuji Nov 19, 2024
d933d73
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Nov 20, 2024
29b85d3
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Nov 20, 2024
0babf63
Update submodule pointer for spack
climbfuji Nov 22, 2024
7d71831
py-xnrl@2024 requires py-xarray@2023
climbfuji Nov 22, 2024
ccc2866
Update submodule pointer for spack
climbfuji Nov 22, 2024
4af667e
Remove unused beta snapshots of ESMF from configs/common/modules_*.yaml
climbfuji Nov 23, 2024
edd5b50
Revert .gitmodules and submodule pointer for spack
climbfuji Nov 27, 2024
8bd3297
Merge branch 'develop' into feature/esmf880b06
climbfuji Dec 2, 2024
21bd294
Remove mapl module suffices for unreleased [email protected]
climbfuji Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions configs/common/modules_lmod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,12 @@ modules:
^[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'
^[email protected]~debug snapshot=b04: 'esmf-8.6.1b04'
^[email protected]+debug snapshot=b04: 'esmf-8.6.1b04-debug'
^[email protected]~debug snapshot=none: 'esmf-8.6.1'
^[email protected]+debug snapshot=none: 'esmf-8.6.1-debug'
^[email protected]~debug snapshot=b04: 'esmf-8.7.0b04'
^[email protected]+debug snapshot=b04: 'esmf-8.7.0b04-debug'
^[email protected]~debug snapshot=b11: 'esmf-8.7.0b11'
^[email protected]+debug snapshot=b11: 'esmf-8.7.0b11-debug'
^[email protected]~debug snapshot=none: 'esmf-8.7.0'
^[email protected]+debug snapshot=none: 'esmf-8.7.0-debug'
^[email protected]~debug snapshot=b06: 'esmf-8.8.0b06'
^[email protected]+debug snapshot=b06: 'esmf-8.8.0b06-debug'
openmpi:
environment:
set:
Expand Down
8 changes: 2 additions & 6 deletions configs/common/modules_tcl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,12 @@ modules:
^[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'
^[email protected]~debug snapshot=b04: 'esmf-8.6.1b04'
^[email protected]+debug snapshot=b04: 'esmf-8.6.1b04-debug'
^[email protected]~debug snapshot=none: 'esmf-8.6.1'
^[email protected]+debug snapshot=none: 'esmf-8.6.1-debug'
^[email protected]~debug snapshot=b04: 'esmf-8.7.0b04'
^[email protected]+debug snapshot=b04: 'esmf-8.7.0b04-debug'
^[email protected]~debug snapshot=b11: 'esmf-8.7.0b11'
^[email protected]+debug snapshot=b11: 'esmf-8.7.0b11-debug'
^[email protected]~debug snapshot=none: 'esmf-8.7.0'
^[email protected]+debug snapshot=none: 'esmf-8.7.0-debug'
^[email protected]~debug snapshot=b06: 'esmf-8.8.0b06'
^[email protected]+debug snapshot=b06: 'esmf-8.8.0b06-debug'
openmpi:
environment:
set:
Expand Down
2 changes: 1 addition & 1 deletion configs/common/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions configs/templates/neptune-dev/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions configs/templates/skylab-dev/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions configs/templates/unified-dev/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
- [email protected]
Expand Down
4 changes: 2 additions & 2 deletions doc/source/PreConfiguredSites.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spack
Open in desktop
Submodule spack updated 3 files
+12 −0 .github/workflows/valid-style.yml
+4 −8 var/spack/repos/builtin/packages/esmf/package.py
+3 −0 var/spack/repos/builtin/packages/py-pyhdf/package.py
3 changes: 2 additions & 1 deletion spack-ext/repos/spack-stack/packages/py-xnrl/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
# [email protected] does not work with [email protected]
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"))
Expand Down
Loading