Skip to content

Commit

Permalink
Update selected packages from spack develop 2025/01/13 (add [email protected].…
Browse files Browse the repository at this point in the history
…0) (#1450)

This PR updates the submodule pointer for the changes described in #1450, most notably the addition of the new release [email protected]. Corresponding changes are made in all files referencing the previous beta snapshot [email protected] in configs/**.
  • Loading branch information
climbfuji authored Jan 14, 2025
1 parent 2470fb4 commit 25fc9c8
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions configs/common/modules_lmod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ modules:
^[email protected]+debug snapshot=none: 'esmf-8.6.1-debug'
^[email protected]~debug snapshot=none: 'esmf-8.7.0'
^[email protected]+debug snapshot=none: 'esmf-8.7.0-debug'
^[email protected].0b10~debug snapshot=b10: esmf-8.8.0b10
^[email protected].0b10+debug snapshot=b10: esmf-8.8.0b10-debug
^[email protected].0~debug snapshot=none: 'esmf-8.8.0'
^[email protected].0+debug snapshot=none: 'esmf-8.8.0-debug'
openmpi:
environment:
set:
Expand Down
4 changes: 2 additions & 2 deletions configs/common/modules_tcl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ modules:
^[email protected]+debug snapshot=none: 'esmf-8.6.1-debug'
^[email protected]~debug snapshot=none: 'esmf-8.7.0'
^[email protected]+debug snapshot=none: 'esmf-8.7.0-debug'
^[email protected].0b10~debug snapshot=b10: esmf-8.8.0b10
^[email protected].0b10+debug snapshot=b10: esmf-8.8.0b10-debug
^[email protected].0~debug snapshot=none: 'esmf-8.8.0'
^[email protected].0+debug snapshot=none: 'esmf-8.8.0-debug'
openmpi:
environment:
set:
Expand Down
2 changes: 1 addition & 1 deletion configs/common/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ packages:
esmf:
require:
- '~xerces ~pnetcdf +shared +external-parallelio'
- any_of: ['@=8.6.1 snapshot=none', '@=8.8.0b10 snapshot=b10']
- any_of: ['@=8.6.1 snapshot=none', '@=8.8.0 snapshot=none']
- 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
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.8.0b10
- neptune-python-env +xnrl ^neptune-env +espc ^esmf@=8.8.0b10
- neptune-env +espc ^esmf@=8.8.0
- neptune-python-env +xnrl ^neptune-env +espc ^esmf@=8.8.0

specs:
- matrix:
Expand Down
8 changes: 4 additions & 4 deletions configs/templates/skylab-dev/spack.yaml
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.8.0b10
- jedi-neptune-env ^esmf@=8.8.0
- jedi-ufs-env ^esmf@=8.6.1
- jedi-um-env
- neptune-env ^esmf@=8.8.0b10
- neptune-python-env ^esmf@=8.8.0b10
- neptune-env ^esmf@=8.8.0
- neptune-python-env ^esmf@=8.8.0
- 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.8.0b10 snapshot=b10
- esmf@=8.8.0 snapshot=none

specs:
- matrix:
Expand Down
8 changes: 4 additions & 4 deletions configs/templates/unified-dev/spack.yaml
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.8.0b10
- jedi-neptune-env ^esmf@=8.8.0
- jedi-tools-env
- jedi-ufs-env ^esmf@=8.6.1
- jedi-um-env
- neptune-env ^esmf@=8.8.0b10
- neptune-python-env ^esmf@=8.8.0b10
- neptune-env ^esmf@=8.8.0
- neptune-python-env ^esmf@=8.8.0
- 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.8.0b10 snapshot=b10
- esmf@=8.8.0 snapshot=none

# MADIS for WCOSS2 decoders.
- [email protected]
Expand Down

0 comments on commit 25fc9c8

Please sign in to comment.