Skip to content

Update to 1.12.0 #137

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

Draft
wants to merge 32 commits into
base: main
Choose a base branch
from
+263 −145
Draft

Update to 1.12.0 #137

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
739d2a6
Update to v1.12.0rc1
andrewdnolan Jul 17, 2025
e398e69
Update deployment for mache 1.31.0
andrewdnolan Jul 21, 2025
5c017d4
Update to v1.12.0rc2
andrewdnolan Jul 23, 2025
1c6a9f3
Clean up `meta.yaml`
andrewdnolan Jul 23, 2025
c5deaec
Update TempestExtremes to v2.3.1
andrewdnolan Aug 1, 2025
64eb787
Move conda installation to versioned directory
andrewdnolan Sep 18, 2025
72dce2d
Put compiler and mpi in spack directory name
andrewdnolan Sep 30, 2025
188973e
Apply suggestions from code review
andrewdnolan Oct 6, 2025
4b5dc34
Manually apply more suggestions from code review
andrewdnolan Oct 6, 2025
a4303a1
Explicitly add notebook as dependecy
andrewdnolan Oct 13, 2025
6c4ef8d
Add zppy-interfaces dev label
andrewdnolan Oct 10, 2025
e8696ac
Remove testing command for nb_conda
andrewdnolan Oct 14, 2025
c31915c
Sync meta.yaml with confluence page
andrewdnolan Oct 14, 2025
7113180
Add "Verify compute-node activation" step to deployment docs
xylar Oct 16, 2025
047c730
If depolying a RC add the dev label to channels
andrewdnolan Oct 14, 2025
c0f810e
fix return variables name
andrewdnolan Oct 15, 2025
4f314d9
Bump mpi4py version
andrewdnolan Oct 15, 2025
2cc66fa
uncomment file permsission updates
andrewdnolan Oct 20, 2025
1f21059
Update to v1.12.0rc2
andrewdnolan Oct 20, 2025
f5ffbad
Shorten e3sm-unified deployment path
xylar Oct 23, 2025
d6fdb3a
Clean up get_conda_base()
xylar Oct 23, 2025
5f9abfe
Update paths the need permission changes
andrewdnolan Oct 23, 2025
14d1df4
Start user restricted perms at machine dir level
andrewdnolan Oct 23, 2025
ced1fb5
Add `pre_conda_script` to load scripts
xylar Oct 24, 2025
24ebabe
Update symlinks created for NCO
andrewdnolan Oct 27, 2025
c0ae19f
Update to v1.12.0rc3
andrewdnolan Oct 29, 2025
fef77bf
Update version number in meta.yaml
andrewdnolan Oct 29, 2025
cfc804c
Add check for ${PBS_JOBID} to templates
andrewdnolan Oct 30, 2025
40b30ac
Update recipes/e3sm-unified/meta.yaml
andrewdnolan Nov 5, 2025
fec404f
Update to 1.12.0rc4
andrewdnolan Nov 5, 2025
851c1d9
Ensure prebuilt wheel for mpi4py is not installed
andrewdnolan Nov 3, 2025
577f929
Update base path permission non recursively
andrewdnolan Nov 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
6 changes: 4 additions & 2 deletions e3sm_supported_machines/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,9 @@ def build_sys_ilamb_esmpy(config, machine, compiler, mpi, template_path,
def build_spack_env(config, machine, compiler, mpi, env_name, tmpdir):

base_path = config.get('e3sm_unified', 'base_path')
spack_base = f'{base_path}/{env_name}/{machine}/'
spack_base_path = (
f'{base_path}/{env_name}/{machine}/spack/spack_for_{compiler}_{mpi}'
Copy link
Collaborator Author

@andrewdnolan andrewdnolan Sep 30, 2025

Choose a reason for hiding this comment

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

With this addition the directory layout(on chrysalis) would look like:

$ tree -L 4 /lcrc/soft/climate/e3sm-unified/
/lcrc/soft/climate/e3sm-unified/
├── e3sm_unified_x_x_x
│   └── chrysalis
│       ├── base
│       ├── spack
│       │   └── spack_for_gnu_openmpi

for e3sm-unified where there's only ever on compiler and mpi combination, maybe the intermidate spack folder is unneeded. Happy to defer to you about that @xylar.

Copy link
Contributor

@xylar xylar Sep 30, 2025

Choose a reason for hiding this comment

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

Yeah, the spack folder is redundant for now but consistent with future plans, right? Let's keep it for consistency.

)

if config.has_option('e3sm_unified', 'use_e3sm_hdf5_netcdf'):
use_e3sm_hdf5_netcdf = config.getboolean('e3sm_unified',
Expand All @@ -270,7 +272,7 @@ def build_spack_env(config, machine, compiler, mpi, env_name, tmpdir):
if value != '':
specs.append(f'{value}')

make_spack_env(base_path=spack_base, env_name='e3sm_spack_env',
make_spack_env(spack_path=spack_base_path, env_name='e3sm_spack_env',
spack_specs=specs, compiler=compiler, mpi=mpi,
machine=machine, tmpdir=tmpdir, include_e3sm_lapack=True,
include_e3sm_hdf5_netcdf=use_e3sm_hdf5_netcdf,
Expand Down