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.

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

Version updates for spack-stack-1.6.0: [email protected], [email protected], [email protected], [email protected] #897

Merged
merged 72 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from 70 commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
073f814
Set up submodule for testing
AlexanderRichert-NOAA Nov 16, 2023
963460b
try removing openssl default version
AlexanderRichert-NOAA Nov 16, 2023
9a6c6bf
Remove some defaults to clear up duplicates
AlexanderRichert-NOAA Nov 17, 2023
4cc3cf3
update default prod-util
AlexanderRichert-NOAA Nov 17, 2023
662cb3e
use new deprecated_io variant name for fms
AlexanderRichert-NOAA Nov 17, 2023
0b8f076
submodule update
AlexanderRichert-NOAA Nov 20, 2023
e29b15f
submodule pointer (libdap4 update)
AlexanderRichert-NOAA Nov 21, 2023
6408d4a
submodule pointer (libxpm update)
AlexanderRichert-NOAA Nov 21, 2023
377881d
submodule pointer
AlexanderRichert-NOAA Nov 21, 2023
7cc9b16
add _8 precision variants for w3emc, sp, ip
AlexanderRichert-NOAA Nov 21, 2023
1fbc677
submodule pointer
AlexanderRichert-NOAA Nov 21, 2023
a7aabe7
submodule pointer
AlexanderRichert-NOAA Nov 21, 2023
68da01f
submodule pointer (gmake fix)
AlexanderRichert-NOAA Nov 21, 2023
c3e7d5c
mysql: set download_boost as default
AlexanderRichert-NOAA Nov 21, 2023
8d33659
submodule pointer (mysql update)
AlexanderRichert-NOAA Nov 21, 2023
4525443
submodule pointer (merge jcsda_emc_spack_stack)
AlexanderRichert-NOAA Nov 21, 2023
458572a
fiddling with submodule
AlexanderRichert-NOAA Nov 21, 2023
f0640ad
Merge remote-tracking branch 'jcsda/develop' into nov2023_spackmerge
AlexanderRichert-NOAA Nov 21, 2023
f146a26
point submodule back to test repo
AlexanderRichert-NOAA Nov 21, 2023
b04cdf0
submodule pointer (lmod.py fix)
AlexanderRichert-NOAA Nov 21, 2023
d496370
submodule pointer (containers __init__.py fix)
AlexanderRichert-NOAA Nov 21, 2023
aef9bbb
pin gettext version because of intel (ubuntu CI) issue (one-arg stati…
AlexanderRichert-NOAA Nov 21, 2023
ee7a96a
fix macos-ci-aarch64.yaml (buildcache build-env call)
AlexanderRichert-NOAA Nov 22, 2023
d8e18a1
fix ci (buildcache calls)
AlexanderRichert-NOAA Nov 22, 2023
ea55f96
Update submodule pointer for spack
climbfuji Nov 22, 2023
db71994
Update submodule pointer for spack
climbfuji Nov 22, 2023
3a4c991
Trigger CI
climbfuji Nov 23, 2023
63a608c
submodule pointer (revert prebuilt aws; add rust-bootstrap for py-cry…
AlexanderRichert-NOAA Nov 29, 2023
c3cce38
set py-cryptography+rust_bootstrap by default
AlexanderRichert-NOAA Nov 29, 2023
88a181f
remove openssl version setting
AlexanderRichert-NOAA Nov 29, 2023
e087963
submodule pointer
AlexanderRichert-NOAA Nov 29, 2023
df51b66
remove py-crypto version setting
AlexanderRichert-NOAA Nov 29, 2023
e2e3b1d
use rust-bootstrap for py-setuptools-rust
AlexanderRichert-NOAA Nov 29, 2023
ab7b0cf
submodule pointer
AlexanderRichert-NOAA Nov 30, 2023
cedf950
pin py-numpy version
AlexanderRichert-NOAA Nov 30, 2023
199a93b
test numpy build (revert this commit)
AlexanderRichert-NOAA Nov 30, 2023
2f9b718
Revert "test numpy build (revert this commit)"
AlexanderRichert-NOAA Nov 30, 2023
e1cfc21
re-pin py-setuptools version
AlexanderRichert-NOAA Nov 30, 2023
9963f47
debug (revert this commit)
AlexanderRichert-NOAA Nov 30, 2023
a57f031
submodule pointer (hdf-eos2/apple-clang)
AlexanderRichert-NOAA Nov 30, 2023
e5588b4
Revert "debug (revert this commit)"
AlexanderRichert-NOAA Nov 30, 2023
d901856
submodule pointer (test hdf-eos2 tweak)
AlexanderRichert-NOAA Nov 30, 2023
793bad4
revert me
AlexanderRichert-NOAA Nov 30, 2023
65f8cce
Revert "revert me"
AlexanderRichert-NOAA Nov 30, 2023
c3d0116
Merge branch 'develop' into nov2023_spackmerge
AlexanderRichert-NOAA Dec 1, 2023
2ab5589
Merge branch 'develop' of https://github.com/jcsda/spack-stack into n…
climbfuji Dec 4, 2023
c8d7167
update rhel-emc packages.yaml (remove bison,python,llvm)
AlexanderRichert-NOAA Dec 5, 2023
96c85aa
Update variant ectrans for ecmwf-atlas to just trans
climbfuji Dec 5, 2023
88edf67
set zlib to be the provider of zlib-api in common/packages.yaml
AlexanderRichert-NOAA Dec 5, 2023
305414d
Bump sp to 2.5.0
climbfuji Dec 5, 2023
4c2b758
Merge branch 'nov2023_spackmerge' of https://github.com/AlexanderRich…
climbfuji Dec 5, 2023
bad3b9b
S4 site config update: remove external perl
climbfuji Dec 5, 2023
ba2743b
update submodule pointer (met fix)
AlexanderRichert-NOAA Dec 5, 2023
f8c3ad5
Update configs/sites/nautilus/packages.yaml
climbfuji Dec 5, 2023
6b78fc5
Update doc/source/KnownIssues.rst
climbfuji Dec 5, 2023
390cced
Update doc/source/KnownIssues.rst for Discover
climbfuji Dec 6, 2023
2362336
Pin patchelf version on Derecho to avoid build errors with Intel
climbfuji Dec 6, 2023
953ec46
Don't use external perl for Linux
climbfuji Dec 6, 2023
7a92ab7
Revert .gitmodules and update submodule pointer for spack
climbfuji Dec 7, 2023
ccf7069
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Dec 7, 2023
0c56756
Update configs/common/modules_* for [email protected]
climbfuji Dec 7, 2023
eb4f06e
Update fms versions in unified-dev and skylab-dev templates to just r…
climbfuji Dec 7, 2023
ca7aeca
Update submodule pointer for spack
climbfuji Dec 7, 2023
19e4064
Update configs/common/packages: [email protected], [email protected], ecmwf-atlas@…
climbfuji Dec 7, 2023
fb5e97a
First round of updating configs/containers/specs/jedi-ci.yaml for ver…
climbfuji Dec 7, 2023
4fd8690
Merge branch 'nov2023_spackmerge' of https://github.com/alexanderrich…
climbfuji Dec 7, 2023
b6f97f5
Round two of updating configs/containers/specs/jedi-ci.yaml for versi…
climbfuji Dec 8, 2023
86b5d94
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 8, 2023
a6b36fa
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 8, 2023
6b038a3
Update submodule pointer for spack
climbfuji Dec 8, 2023
80c7904
Update [email protected] to 2.4.0.1 in skylab-dev and unified-dev templates,…
climbfuji Dec 9, 2023
c21b8b8
Revert .gitmodules
climbfuji Dec 9, 2023
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
10 changes: 6 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
[submodule "spack"]
path = spack
#url = https://github.com/spack/spack
#branch = develop
url = https://github.com/jcsda/spack
branch = jcsda_emc_spack_stack
##url = https://github.com/spack/spack
##branch = develop
#url = https://github.com/jcsda/spack
#branch = jcsda_emc_spack_stack
url = https://github.com/climbfuji/spack
branch = feature/rel160_vupdates
[submodule "doc/CMakeModules"]
path = doc/CMakeModules
url = https://github.com/noaa-emc/cmakemodules
Expand Down
15 changes: 5 additions & 10 deletions configs/common/modules_lmod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,20 +129,15 @@ modules:
'MADIS_ROOT': '{prefix}'
mapl:
suffixes:
^[email protected]~debug snapshot=none: 'esmf-8.2.0'
^[email protected]+debug snapshot=none: 'esmf-8.2.0-debug'
^[email protected]~debug snapshot=b09: 'esmf-8.3.0b09'
^[email protected]+debug snapshot=b09: 'esmf-8.3.0b09-debug'
^[email protected]~debug snapshot=none: 'esmf-8.3.0'
^[email protected]+debug snapshot=none: 'esmf-8.3.0-debug'
^[email protected]~debug snapshot=none: 'esmf-8.4.0'
^[email protected]+debug snapshot=none: 'esmf-8.4.0-debug'
^[email protected]~debug snapshot=none: 'esmf-8.4.1'
^[email protected]+debug snapshot=none: 'esmf-8.4.1-debug'
# Keeping this as a reminder how to do snapshots
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

A bit of house keeping, we don't need to install those old versions anymore

#^[email protected]~debug snapshot=b09: 'esmf-8.3.0b09'
#^[email protected]+debug snapshot=b09: 'esmf-8.3.0b09-debug'
^[email protected]~debug snapshot=none: 'esmf-8.4.2'
^[email protected]+debug snapshot=none: 'esmf-8.4.2-debug'
^[email protected]~debug snapshot=none: 'esmf-8.5.0'
^[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'
openmpi:
environment:
set:
Expand Down
15 changes: 5 additions & 10 deletions configs/common/modules_tcl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,20 +131,15 @@ modules:
'MADIS_ROOT': '{prefix}'
mapl:
suffixes:
^[email protected]~debug snapshot=none: 'esmf-8.2.0'
^[email protected]+debug snapshot=none: 'esmf-8.2.0-debug'
^[email protected]~debug snapshot=b09: 'esmf-8.3.0b09'
^[email protected]+debug snapshot=b09: 'esmf-8.3.0b09-debug'
^[email protected]~debug snapshot=none: 'esmf-8.3.0'
^[email protected]+debug snapshot=none: 'esmf-8.3.0-debug'
^[email protected]~debug snapshot=none: 'esmf-8.4.0'
^[email protected]+debug snapshot=none: 'esmf-8.4.0-debug'
^[email protected]~debug snapshot=none: 'esmf-8.4.1'
^[email protected]+debug snapshot=none: 'esmf-8.4.1-debug'
# Keeping this as a reminder how to do snapshots
#^[email protected]~debug snapshot=b09: 'esmf-8.3.0b09'
#^[email protected]+debug snapshot=b09: 'esmf-8.3.0b09-debug'
^[email protected]~debug snapshot=none: 'esmf-8.4.2'
^[email protected]+debug snapshot=none: 'esmf-8.4.2-debug'
^[email protected]~debug snapshot=none: 'esmf-8.5.0'
^[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'
openmpi:
environment:
set:
Expand Down
18 changes: 6 additions & 12 deletions configs/common/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@
variants: +python
cairo:
variants: +pic
# Newer versions of CDO require the C++-17 standard, which doesn't
# work with all compilers that are currently in use in spack-stack
# When making changes here, also check Hercules/Casper site configs
cdo:
version: ['2.0.5']
version: ['2.2.0']
variants: ~openmp
cmake:
version: ['3.23.1']
Expand All @@ -49,10 +46,10 @@
version: ['5.11.4']
variants: +ui
eckit:
version: ['1.24.4']
version: ['1.24.5']
variants: linalg=eigen,lapack compression=lz4,bzip2
ecmwf-atlas:
version: ['0.35.0']
version: ['0.35.1']
variants: +fckit +trans +tesselation +fftw
ectrans:
version: ['1.2.0']
Expand Down Expand Up @@ -80,9 +77,7 @@
fiat:
version: ['1.2.0']
fms:
#version: ['2023.01']
#variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release
version: ['2023.02.01']
version: ['2023.04']
variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release +deprecated_io
fontconfig:
variants: +pic
Expand Down Expand Up @@ -178,9 +173,8 @@
netcdf-cxx4:
version: ['4.3.1']
netcdf-fortran:
version: ['4.6.0']
# ninja - when adding information here, also check Cheyenne
# and Discover site configs
version: ['4.6.1']
# ninja - when adding information here, also check Discover site config
nlohmann-json:
version: ['3.10.5']
nlohmann-json-schema-validator:
Expand Down
9 changes: 4 additions & 5 deletions configs/containers/specs/jedi-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
### spack-stack-1.5.1 / skylab-6.1.0 containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
### spack-stack-1.6.0 / skylab-7.0.0 containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
specs: [[email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected], [email protected], [email protected], ecflow@5,
[email protected].4, [email protected].0 +fckit +trans +tesselation +fftw, [email protected], [email protected] +fftw,
[email protected].5, [email protected].1 +fckit +trans +tesselation +fftw, [email protected], [email protected] +fftw,
[email protected], [email protected], fms@release-jcsda, [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected],
[email protected].0, [email protected], [email protected],
[email protected].1, [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected],
[email protected], py-pip, py-pyyaml@5.4.1, [email protected], [email protected], py-xarray@2022.3.0,
[email protected], py-pip, py-pyyaml@6.0, [email protected], [email protected], py-xarray@2023.7.0,
[email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], shumlib@macos_clang_linux_intel_port,
[email protected], [email protected]]
Expand All @@ -17,4 +17,3 @@
# 2. Comment out for now until build problems are solved
# https://github.com/jcsda/spack-stack/issues/522
# [email protected]
# 3. Need to update [email protected] to 12.0.1!
3 changes: 0 additions & 3 deletions configs/sites/casper/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ packages:
- cuda/12.2.1

### Modifications of common packages
# Version 2.0.5 doesn't compile on Casper with gcc
cdo:
version:: ['2.2.0']

### All other external packages listed alphabetically
autoconf:
Expand Down
9 changes: 3 additions & 6 deletions configs/sites/hercules/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@ packages:
- mvapich2/2.3.7

### Modifications of common packages
# Version 2.0.5 doesn't compile on Hercules with gcc
cdo:
version:: ['2.2.0']
# Version 2.0.8 doesn't compile on Hercules
wgrib2:
version:: ['3.1.1']
# DH* TRY IF THIS IS STILL TRUE # Version 2.0.8 doesn't compile on Hercules
Copy link
Collaborator Author

@climbfuji climbfuji Dec 8, 2023

Choose a reason for hiding this comment

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

Note to self. Try and remove or re-enable. If remove, also update readthedocs

# DH* TRY IF THIS IS STILL TRUE wgrib2:
# DH* TRY IF THIS IS STILL TRUE version:: ['3.1.1']

### All other external packages listed alphabetically
autoconf:
Expand Down
4 changes: 1 addition & 3 deletions configs/templates/skylab-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ spack:

# Various fms tags (list all to avoid duplicate packages)
- fms@release-jcsda
- [email protected]
- [email protected]
- [email protected]
- [email protected]

# Various crtm tags (list all to avoid duplicate packages)
- [email protected]
Expand Down
4 changes: 1 addition & 3 deletions configs/templates/unified-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ spack:

# Various fms tags (list all to avoid duplicate packages)
- fms@release-jcsda
- [email protected]
- [email protected]
- [email protected]
- [email protected]

# Various crtm tags (list all to avoid duplicate packages)
- [email protected]
Expand Down
Loading