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

Add support for geos-gcm to spack-stack (add mepo, geos-gcm-env; update esmf/mapl variants) #953

Merged
merged 84 commits into from
Jan 18, 2024
Merged

Add support for geos-gcm to spack-stack (add mepo, geos-gcm-env; update esmf/mapl variants) #953

Show file tree
Hide file tree
Changes from 76 commits
Commits
Show all changes
84 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
ebea1bb
Update submodule pointer for spack
climbfuji Dec 4, 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
de4b080
Update .gitmodules for code review and testing
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
e062fa7
Enable variant extdata2g for mapl, required by geos-gcm
climbfuji Dec 5, 2023
7a92ab7
Revert .gitmodules and update submodule pointer for spack
climbfuji Dec 7, 2023
2f7b468
Merge branch 'nov2023_spackmerge' of https://github.com/alexanderrich…
climbfuji Dec 7, 2023
1669493
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 7, 2023
c6c7581
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 13, 2023
006e67f
Fix variants for mapl in configs/common/packages.yaml
climbfuji Dec 14, 2023
a66f168
Update submodule pointer for spack
climbfuji Dec 14, 2023
34fb7af
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 14, 2023
6e05262
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 18, 2023
b680e01
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 19, 2023
f4b164a
Update submodule pointer for spack
climbfuji Dec 28, 2023
c195d4c
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Jan 11, 2024
cedd354
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Jan 16, 2024
560b9e2
Re-enable shared build of ESMF, needed for GEOS
climbfuji Jan 16, 2024
debc291
Add geos-gcm-env to the unified-dev and skylab-dev templates
climbfuji Jan 16, 2024
99d06be
Also build shared mapl
climbfuji Jan 16, 2024
3e2c44f
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Jan 16, 2024
3f2529c
Revert .gitmodules and update submodule pointer for spack
climbfuji Jan 17, 2024
9c2ddd3
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Jan 17, 2024
1b0a363
Again update .gitmodules and submodule pointer for spack for code rev…
climbfuji Jan 18, 2024
5e26435
Enable mpi variant for pflogger as a workaround for the pflogger buil…
climbfuji Jan 18, 2024
95077b1
Revert .gitmodules and update submodule pointer for spack
climbfuji Jan 18, 2024
502d37c
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Jan 18, 2024
816322d
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Jan 18, 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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
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/jcsda/spack
#branch = jcsda_emc_spack_stack
url = https://github.com/climbfuji/spack
branch = feature/geos_gcm_dependencies
[submodule "doc/CMakeModules"]
path = doc/CMakeModules
url = https://github.com/noaa-emc/cmakemodules
Expand Down
4 changes: 2 additions & 2 deletions configs/common/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
# Also, check the acorn and derecho site configs which have esmf modifications.
esmf:
version: ['8.5.0']
variants: ~xerces ~pnetcdf snapshot=none ~shared +external-parallelio
variants: ~xerces ~pnetcdf snapshot=none +shared +external-parallelio
require:
- any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"']
when: "%intel"
Expand Down Expand Up @@ -142,7 +142,7 @@
# https://github.com/JCSDA/spack-stack/issues/769
# also: ... extdata2g segfault UFS?
version: ['2.40.3']
variants: ~shared ~extdata2g ~pflogger
variants: +shared +pflogger ~f2py
Copy link
Collaborator

Choose a reason for hiding this comment

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

Just a note that I think these are all the defaults of mapl. But probably good to keep them explicit until people get used to it. :)

# If making changes here, also check the Discover site config and the CI workflows
met:
version: ['11.1.0']
Expand Down
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 @@ -9,6 +9,7 @@ spack:
- compilers: ['%aocc', '%apple-clang', '%gcc', '%intel']
- packages:
- ewok-env +ecflow +cylc
- geos-gcm-env
- jedi-fv3-env
- jedi-mpas-env
- jedi-neptune-env
Expand Down
3 changes: 2 additions & 1 deletion configs/templates/unified-dev/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ spack:
definitions:
- compilers: ['%aocc', '%apple-clang', '%gcc', '%intel']
- packages:
- ewok-env +ecflow +cylc
- geos-gcm-env
- global-workflow-env
- gmao-swell-env
- gsi-env
- ewok-env +ecflow +cylc
- jedi-fv3-env
- jedi-mpas-env
- jedi-neptune-env
Expand Down
2 changes: 1 addition & 1 deletion spack
Open in desktop
Submodule spack updated 3 files
+26 −0 var/spack/repos/builtin/packages/mepo/package.py
+33 −0 var/spack/repos/jcsda-emc-bundles/packages/geos-gcm-env/package.py
+4 −0 var/spack/repos/jcsda-emc-bundles/packages/jedi-neptune-env/package.py
Loading