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

release/1.9.0: Add [email protected] to unified-dev and skylab-dev templates, bug fix in depencies for awscli-v2, bump wgrib2 to 3.5.0 and re-enable for all compilers #1486

Merged
merged 21 commits into from
Feb 3, 2025
Merged

release/1.9.0: Add [email protected] to unified-dev and skylab-dev templates, bug fix in depencies for awscli-v2, bump wgrib2 to 3.5.0 and re-enable for all compilers #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2cca3da
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Jan 31, 2025
3b6e18d
Add [email protected] to templates skylab-dev and unified-dev
climbfuji Jan 31, 2025
99b95b9
In configs/common/packages.yaml, bump wgrib2 from 3.1.1 to 3.5.0
climbfuji Jan 31, 2025
e40dbda
In spack-ext/repos/spack-stack/packages/*, re-enable wgrib2 for all c…
climbfuji Jan 31, 2025
735563c
Merge branch 'release/1.9.0' of https://github.com/jcsda/spack-stack …
climbfuji Jan 31, 2025
d07a817
crtm & wgrib2 version updates
AlexanderRichert-NOAA Jan 31, 2025
cb561dd
update unified-dev template
AlexanderRichert-NOAA Jan 31, 2025
05f1830
For testing only: remove ~openmp requirement for wgrib2 from configs/…
climbfuji Jan 31, 2025
3af2c8d
Revert .gitmodules and update submodule pointer for spack
climbfuji Jan 31, 2025
1a38d2c
Use [email protected] on macOS, but 3.5.0 everywhere else
climbfuji Jan 31, 2025
ddc90ab
Merge remote-tracking branch 'ajwr/crtm_wgrib2' into bugfix/awscliv2_…
AlexanderRichert-NOAA Jan 31, 2025
2e022f5
Update submodule pointer for spack
climbfuji Jan 31, 2025
32247e9
Merge branch 'bugfix/awscliv2_crytography_PLUS_crtm_updates' of https…
climbfuji Jan 31, 2025
c69978b
Update submodule pointer for spack
climbfuji Jan 31, 2025
4437966
Fix configs/templates/unified-dev/spack.yaml: crtm@=v3.1.1-build1 ins…
climbfuji Jan 31, 2025
f7a59fb
Merge branch 'release/1.9.0' of https://github.com/jcsda/spack-stack …
climbfuji Jan 31, 2025
2f18b5d
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Jan 31, 2025
9343ae7
Rename crtm version from v3.1.1-build1 to 3.1.1-build1
climbfuji Jan 31, 2025
9430415
In .github/workflows/*.yaml, add crtm-fix to list of allowed duplicat…
climbfuji Feb 3, 2025
1c1e983
On macOS, use [email protected]~openmp
climbfuji Feb 3, 2025
7616fff
Revert .gitmodules and update submodule pointer for spack
climbfuji Feb 3, 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
4 changes: 2 additions & 2 deletions .github/workflows/macos-ci-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:

# Concretize and check for duplicates
spack concretize 2>&1 | tee log.concretize.apple-clang-14.0.3-buildcache
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.apple-clang-14.0.3-buildcache -i fms -i crtm -i esmf -i mapl
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.apple-clang-14.0.3-buildcache -i fms -i crtm -i crtm-fix -i esmf -i mapl

# Add and update source cache
spack mirror add local-source file:///Users/ec2-user/spack-stack/source-cache/
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:

# Concretize and check for duplicates
spack concretize --force 2>&1 | tee log.concretize.apple-clang-14.0.3
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.apple-clang-14.0.3 -i fms -i crtm -i esmf -i mapl
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.apple-clang-14.0.3 -i fms -i crtm -i crtm-fix -i esmf -i mapl

# Add binary cache back in
spack mirror add local-binary file:///Users/ec2-user/spack-stack/build-cache/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-ci-x86_64-gnu.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:

# Concretize and check for duplicates
spack concretize 2>&1 | tee log.concretize.gnu-11.4.0-buildcache
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.gnu-11.4.0-buildcache -i fms -i crtm -i esmf -i mapl
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.gnu-11.4.0-buildcache -i fms -i crtm -i crtm-fix -i esmf -i mapl

# Add and update source cache
spack mirror add local-source file:///home/ubuntu/spack-stack/source-cache/
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:

# Concretize and check for duplicates
spack concretize --force 2>&1 | tee log.concretize.gnu-11.4.0
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.gnu-11.4.0 -i fms -i crtm -i esmf -i mapl
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.gnu-11.4.0 -i fms -i crtm -i crtm-fix -i esmf -i mapl

# Add binary cache back in
spack mirror add local-binary file:///home/ubuntu/spack-stack/build-cache/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-ci-x86_64-intel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ jobs:

# Concretize and check for duplicates
spack concretize 2>&1 | tee log.concretize.intel-2021.10.0-buildcache
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.intel-2021.10.0-buildcache -i fms -i crtm -i esmf -i mapl
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.intel-2021.10.0-buildcache -i fms -i crtm -i crtm-fix -i esmf -i mapl

# Add and update source cache
spack mirror add local-source file:///home/ubuntu/spack-stack/source-cache/
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:

# Concretize and check for duplicates
spack concretize --force 2>&1 | tee log.concretize.intel-2021.10.0
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.intel-2021.10.0 -i fms -i crtm -i esmf -i mapl
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.intel-2021.10.0 -i fms -i crtm -i crtm-fix -i esmf -i mapl

# Add binary cache back in
spack mirror add local-binary file:///home/ubuntu/spack-stack/build-cache/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:

# Concretize and check for duplicates
spack concretize 2>&1 | tee log.concretize.oneifx-2024.2.0-buildcache
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.oneifx-2024.2.0-buildcache -i fms -i crtm -i esmf -i mapl
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.oneifx-2024.2.0-buildcache -i fms -i crtm -i crtm-fix -i esmf -i mapl

# Add and update source cache
spack mirror add local-source file:///home/ubuntu/spack-stack/source-cache/
Expand Down Expand Up @@ -206,7 +206,7 @@ jobs:

# Concretize and check for duplicates
spack concretize --force 2>&1 | tee log.concretize.oneifx-2024.2.0
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.oneifx-2024.2.0 -i fms -i crtm -i esmf -i mapl
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.oneifx-2024.2.0 -i fms -i crtm -i crtm-fix -i esmf -i mapl

# Add binary cache back in
spack mirror add local-binary file:///home/ubuntu/spack-stack/build-cache/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-ci-x86_64-oneapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:

# Concretize and check for duplicates
spack concretize 2>&1 | tee log.concretize.oneapi-2024.2.0-buildcache
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.oneapi-2024.2.0-buildcache -i fms -i crtm -i esmf -i mapl
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.oneapi-2024.2.0-buildcache -i fms -i crtm -i crtm-fix -i esmf -i mapl

# Add and update source cache
spack mirror add local-source file:///home/ubuntu/spack-stack/source-cache/
Expand Down Expand Up @@ -206,7 +206,7 @@ jobs:

# Concretize and check for duplicates
spack concretize --force 2>&1 | tee log.concretize.oneapi-2024.2.0
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.oneapi-2024.2.0 -i fms -i crtm -i esmf -i mapl
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -d log.concretize.oneapi-2024.2.0 -i fms -i crtm -i crtm-fix -i esmf -i mapl

# Add binary cache back in
spack mirror add local-binary file:///home/ubuntu/spack-stack/build-cache/
Expand Down
3 changes: 2 additions & 1 deletion configs/common/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,10 @@ packages:
require: '@2.10.0 precision=4,d,8 +extradeps'
w3nco:
require: '@2.4.1'
# See macOS site config for wgrib2 version/variant overrides
wgrib2:
require:
- '@3.1.1'
- '@3.5.0'
wrf-io:
require: '@1.2.0'
zstd:
Expand Down
3 changes: 2 additions & 1 deletion configs/sites/tier2/macos.default/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ packages:
libiconv:
buildable: false
wgrib2:
require:
require::
- '@3.4.0'
- '~openmp'
1 change: 1 addition & 0 deletions configs/templates/skylab-dev/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ spack:
# Various crtm tags (list all to avoid duplicate packages)
- [email protected]
- [email protected]
- [email protected]

# Various esmf tags (list all to avoid duplicate packages)
- esmf@=8.6.1 snapshot=none
Expand Down
9 changes: 5 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 @@ -11,9 +11,9 @@ spack:
- ewok-env +ecflow ~cylc
- ai-env
- geos-gcm-env ^esmf@=8.6.1
- global-workflow-env ^esmf@=8.6.1
- global-workflow-env ^esmf@=8.6.1 ^crtm@=3.1.1-build1
- gmao-swell-env
- gsi-env
- gsi-env ^crtm@=3.1.1-build1
- jedi-fv3-env
- jedi-geos-env ^esmf@=8.6.1
- jedi-mpas-env
Expand All @@ -24,12 +24,13 @@ spack:
- 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
- ufs-srw-app-env ^esmf@=8.6.1 ^crtm@=3.1.1-build1
- ufs-weather-model-env ^esmf@=8.6.1 ^crtm@=3.1.1-build1

# Various crtm tags (list all to avoid duplicate packages)
- [email protected]
climbfuji marked this conversation as resolved.
Show resolved Hide resolved
- [email protected]
- [email protected]

# Various esmf tags (list all to avoid duplicate packages)
- esmf@=8.6.1 snapshot=none
Expand Down
2 changes: 1 addition & 1 deletion spack
Open in desktop
Submodule spack updated 9 files
+5 −0 etc/spack/defaults/packages.yaml
+1 −3 var/spack/repos/builtin/packages/awscli-v2/package.py
+8 −3 var/spack/repos/builtin/packages/crtm-fix/package.py
+7 −2 var/spack/repos/builtin/packages/crtm/package.py
+3 −0 var/spack/repos/builtin/packages/esmf/package.py
+3 −0 var/spack/repos/builtin/packages/hdf5/package.py
+3 −0 var/spack/repos/builtin/packages/netcdf-c/package.py
+3 −0 var/spack/repos/builtin/packages/python/package.py
+143 −68 var/spack/repos/builtin/packages/wgrib2/package.py
6 changes: 1 addition & 5 deletions spack-ext/repos/spack-stack/packages/emc-verif-global-env/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ class EmcVerifGlobalEnv(BundlePackage):
depends_on("py-pandas")
# Test grads
# depends_on('grads')
# Currently, wgrib2 doesn't build with oneapi,
# but there isn't a "when not" option in spack yet
depends_on("wgrib2", when="%apple-clang")
depends_on("wgrib2", when="%gcc")
depends_on("wgrib2", when="%intel")
depends_on("wgrib2")
depends_on("python")
depends_on("prod-util")
depends_on("met")
Expand Down
8 changes: 2 additions & 6 deletions spack-ext/repos/spack-stack/packages/global-workflow-env/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,11 @@ class GlobalWorkflowEnv(BundlePackage):
depends_on("landsfcutil")
depends_on("sigio")
depends_on("bufr")
# Currently, wgrib2 doesn't build with oneapi,
# but there isn't a "when not" option in spack yet
depends_on("wgrib2", when="%apple-clang")
depends_on("wgrib2", when="%gcc")
depends_on("wgrib2", when="%intel")
depends_on("wgrib2")
depends_on("met")
depends_on("metplus")
depends_on("gsi-ncdiag")
depends_on("crtm@2.4.0.1")
depends_on("crtm")
depends_on("py-wxflow", when="+python")

# There is no need for install() since there is no code.
2 changes: 1 addition & 1 deletion spack-ext/repos/spack-stack/packages/gsi-env/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class GsiEnv(BundlePackage):
depends_on("sfcio")
depends_on("nemsio")
depends_on("wrf-io")
depends_on("crtm@2.4.0.1")
depends_on("crtm")
depends_on("ncio")
depends_on("gsi-ncdiag")

Expand Down
6 changes: 1 addition & 5 deletions spack-ext/repos/spack-stack/packages/nceplibs-env/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ class NceplibsEnv(BundlePackage):
depends_on("w3emc")
depends_on("w3nco")
depends_on("wrf-io")
# Currently, wgrib2 doesn't build with oneapi,
# but there isn't a "when not" option in spack yet
depends_on("wgrib2", when="%apple-clang")
depends_on("wgrib2", when="%gcc")
depends_on("wgrib2", when="%intel")
depends_on("wgrib2")

# There is no need for install() since there is no code.
8 changes: 2 additions & 6 deletions spack-ext/repos/spack-stack/packages/ufs-srw-app-env/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class UfsSrwAppEnv(BundlePackage):
depends_on("esmf")
depends_on("fms")
depends_on("bacio")
depends_on("crtm@2.4.0.1")
depends_on("crtm")
depends_on("g2")
depends_on("g2tmpl")
depends_on("ip")
Expand All @@ -41,11 +41,7 @@ class UfsSrwAppEnv(BundlePackage):
depends_on("sigio")
depends_on("wrf-io")
depends_on("w3emc")
# Currently, wgrib2 doesn't build with oneapi,
# but there isn't a "when not" option in spack yet
depends_on("wgrib2", when="%apple-clang")
depends_on("wgrib2", when="%gcc")
depends_on("wgrib2", when="%intel")
depends_on("wgrib2")
depends_on("gsi-ncdiag")
depends_on("met")
depends_on("metplus")
Expand Down
6 changes: 1 addition & 5 deletions spack-ext/repos/spack-stack/packages/ufs-utils-env/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ class UfsUtilsEnv(BundlePackage):
depends_on("wrf-io")
depends_on("ncio")
depends_on("landsfcutil")
# Currently, wgrib2 doesn't build with oneapi,
# but there isn't a "when not" option in spack yet
depends_on("wgrib2", when="%apple-clang")
depends_on("wgrib2", when="%gcc")
depends_on("wgrib2", when="%intel")
depends_on("wgrib2")

# There is no need for install() since there is no code.
2 changes: 1 addition & 1 deletion spack-ext/repos/spack-stack/packages/ufs-weather-model-env/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class UfsWeatherModelEnv(BundlePackage):

depends_on("fms", type="run")
depends_on("bacio", type="run")
depends_on("crtm@2.4.0.1", type="run")
depends_on("crtm", type="run")
depends_on("g2", type="run")
depends_on("g2tmpl", type="run")
depends_on("ip", type="run")
Expand Down
7 changes: 1 addition & 6 deletions spack-ext/repos/spack-stack/packages/upp-env/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,7 @@ class UppEnv(BundlePackage):
depends_on("w3emc")
depends_on("wrf-io")
depends_on("prod-util")
# For testing:
# Currently, wgrib2 doesn't build with oneapi,
# but there isn't a "when not" option in spack yet
depends_on("wgrib2", when="%apple-clang")
depends_on("wgrib2", when="%gcc")
depends_on("wgrib2", when="%intel")
depends_on("wgrib2")
depends_on("grib-util")

# There is no need for install() since there is no code.