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

esmf@8.8.0b06 -> 8.8.0b10, configure LLVM 19.1.4 for Bounty, update customization of common packages for Derecho #1409

Merged
merged 13 commits into from
Dec 18, 2024
Merged

esmf@8.8.0b06 -> 8.8.0b10, configure LLVM 19.1.4 for Bounty, update customization of common packages for Derecho #1409

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
02c9b4c
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Dec 11, 2024
8be68da
Replace esmf 8.8.0b06 with 8.8.0b09 in configs/templates/*
climbfuji Dec 11, 2024
19c2171
Comment out customizations of common package settings in configs/site…
climbfuji Dec 11, 2024
3d593ca
Configure LLVM 19.1.4 (clang@19.1.4) for tier 2 site bounty
climbfuji Dec 11, 2024
bbaaab0
In configs/common/packages.yaml: prefer openblas 0.3.28 so that it bu…
climbfuji Dec 11, 2024
edbb705
Yet another attempt: overwrite openblas@0.3.24 from configs/common/pa…
climbfuji Dec 11, 2024
ba5187f
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 12, 2024
763fde0
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 12, 2024
79352bc
Fix/revert site config changes for Derecho
climbfuji Dec 13, 2024
812f1cb
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 13, 2024
797e4a2
Remove esmf 8.8.0 b06 and b09, add b10
climbfuji Dec 16, 2024
c355e67
Revert .gitmodules and update submodule pointer for spack
climbfuji Dec 16, 2024
50f0604
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 16, 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
Prev Previous commit
Next Next commit
Remove esmf 8.8.0 b06 and b09, add b10
  • Loading branch information
@climbfuji
climbfuji committed Dec 16, 2024
commit 797e4a2ff47cb80b3d35cf3e2472401ddec09f33
6 changes: 2 additions & 4 deletions configs/common/modules_lmod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,8 @@ modules:
^esmf@8.6.1+debug snapshot=none: 'esmf-8.6.1-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'
^esmf@8.8.0b09~debug snapshot=b09: esmf-8.8.0b09
^esmf@8.8.0b09+debug snapshot=b09: esmf-8.8.0b09-debug
^esmf@8.8.0b10~debug snapshot=b10: esmf-8.8.0b10
^esmf@8.8.0b10+debug snapshot=b10: esmf-8.8.0b10-debug
openmpi:
environment:
set:
Expand Down
6 changes: 2 additions & 4 deletions configs/common/modules_tcl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,8 @@ modules:
^esmf@8.6.1+debug snapshot=none: 'esmf-8.6.1-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'
^esmf@8.8.0b09~debug snapshot=b09: esmf-8.8.0b09
^esmf@8.8.0b09+debug snapshot=b09: esmf-8.8.0b09-debug
^esmf@8.8.0b10~debug snapshot=b10: esmf-8.8.0b10
^esmf@8.8.0b10+debug snapshot=b10: esmf-8.8.0b10-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.8.0b09 snapshot=b09']
- any_of: ['@=8.6.1 snapshot=none', '@=8.8.0b10 snapshot=b10']
- 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.0b09
- neptune-python-env +xnrl ^neptune-env +espc ^esmf@=8.8.0b09
- neptune-env +espc ^esmf@=8.8.0b10
- neptune-python-env +xnrl ^neptune-env +espc ^esmf@=8.8.0b10

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.0b09
- jedi-neptune-env ^esmf@=8.8.0b10
- jedi-ufs-env ^esmf@=8.6.1
- jedi-um-env
- neptune-env ^esmf@=8.8.0b09
- neptune-python-env ^esmf@=8.8.0b09
- neptune-env ^esmf@=8.8.0b10
- neptune-python-env ^esmf@=8.8.0b10
- 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.0b09 snapshot=b09
- esmf@=8.8.0b10 snapshot=b10

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.0b09
- jedi-neptune-env ^esmf@=8.8.0b10
- jedi-tools-env
- jedi-ufs-env ^esmf@=8.6.1
- jedi-um-env
- neptune-env ^esmf@=8.8.0b09
- neptune-python-env ^esmf@=8.8.0b09
- neptune-env ^esmf@=8.8.0b10
- neptune-python-env ^esmf@=8.8.0b10
- 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.0b09 snapshot=b09
- esmf@=8.8.0b10 snapshot=b10

# MADIS for WCOSS2 decoders.
- madis@4.5
Expand Down
2 changes: 1 addition & 1 deletion spack
Open in desktop
Submodule spack updated 1 files
+1 −2 var/spack/repos/builtin/packages/esmf/package.py
Loading