Skip to content
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

Update selected packages from spack develop 2025/01/13 (add [email protected]) #1450

Merged
merged 3 commits into from
Jan 14, 2025
+16 −16
Merged

Update selected packages from spack develop 2025/01/13 (add [email protected]) #1450

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d208ab
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Jan 13, 2025
447bf38
Bump esmf from 8.8.0b10 to 8.8.0 in configs/**
climbfuji Jan 13, 2025
67cbd72
Revert .gitmodules and update submodule pointer for spack
climbfuji Jan 14, 2025
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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this change will be reverted once JCSDA/spack#500 is merged?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, required for CI testing only

Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "spack"]
path = spack
url = https://github.com/jcsda/spack
branch = spack-stack-dev
#url = https://github.com/jcsda/spack
#branch = spack-stack-dev
url = https://github.com/climbfuji/spack
branch = feature/update_selected_pks_from_spack_develop_20250113
[submodule "doc/CMakeModules"]
path = doc/CMakeModules
url = https://github.com/noaa-emc/cmakemodules
Expand Down
4 changes: 2 additions & 2 deletions configs/common/modules_lmod.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
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.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
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.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
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.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
2 changes: 1 addition & 1 deletion spack
Open in desktop
Submodule spack updated 7 files
+3 −0 var/spack/repos/builtin/packages/ectrans/package.py
+1 −1 var/spack/repos/builtin/packages/esmf/package.py
+1 −0 var/spack/repos/builtin/packages/grep/package.py
+6 −3 var/spack/repos/builtin/packages/py-arrow/package.py
+2 −1 var/spack/repos/builtin/packages/py-cylc-flow/package.py
+2 −1 var/spack/repos/builtin/packages/py-cylc-rose/package.py
+2 −1 var/spack/repos/builtin/packages/py-cylc-uiserver/package.py
Loading