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

Update to 1.6.0 alpha.1 #865

Merged
merged 4 commits into from
Oct 30, 2024
Merged

Update to 1.6.0 alpha.1 #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
752320f
Update Compass to v1.6.0-alpha.1
xylar Oct 18, 2024
7ae778a
Update to latest mpas_tools
xylar Oct 20, 2024
746d85f
Update to mache 1.26.0
xylar Oct 20, 2024
88de99f
Update trilinos and albany variants on pm-gpu
xylar Oct 26, 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
4 changes: 4 additions & 0 deletions compass/machines/pm-gpu.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ spack = /global/cfs/cdirs/e3sm/software/compass/pm-gpu/spack
# pnetcdf as E3SM (spack modules are used otherwise)
use_e3sm_hdf5_netcdf = True

# spack variants for Albany and Trilinos
albany_variants = +mpas~py+unit_tests+cuda+uvm+sfad sfadsize=12
trilinos_variants = +cuda+uvm+ampere80+zen3
Comment on lines +35 to +36
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@mcarlson801, can you double check that these are what I should be using?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yep, this looks right to me. We could probably remove the uvm flag now though, what do you think @jewatkins?

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like there might be some lingering issues with no-uvm. The configuration you have here is good for now.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks @mcarlson801! I appreciate it!


# The parallel section describes options related to running jobs in parallel.
# Most options in this section come from mache so here we just add or override
# some defaults
Expand Down
2 changes: 1 addition & 1 deletion compass/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.5.0-alpha.1'
__version__ = '1.6.0-alpha.1'
15 changes: 4 additions & 11 deletions conda/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,8 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, # noqa: C901
tmpdir, logger):

albany = config.get('deploy', 'albany')
albany_variants = config.get('deploy', 'albany_variants')
trilinos_variants = config.get('deploy', 'trilinos_variants')
cmake = config.get('deploy', 'cmake')
esmf = config.get('deploy', 'esmf')
lapack = config.get('deploy', 'lapack')
Expand All @@ -479,9 +481,6 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, # noqa: C901
scorpio = config.get('deploy', 'scorpio')
parallelio = config.get('deploy', 'parallelio')

# for now, we'll assume Cuda is needed anytime GPUs are present
with_cuda = config.has_option('parallel', 'gpus_per_node')

if config.has_option('deploy', 'spack_mirror'):
spack_mirror = config.get('deploy', 'spack_mirror')
else:
Expand Down Expand Up @@ -543,14 +542,8 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, # noqa: C901
f'@{parallelio}+pnetcdf~timing"')

if albany != 'None':
if with_cuda:
albany_cuda = '+cuda+uvm+sfad sfadsize=12'
trilinos_cuda = '+cuda+uvm'
else:
albany_cuda = ''
trilinos_cuda = ''
specs.append(f'"trilinos-for-albany@{albany}{trilinos_cuda}"')
specs.append(f'"albany@{albany}+mpas~py+unit_tests{albany_cuda}"')
specs.append(f'"trilinos-for-albany@{albany}{trilinos_variants}"')
specs.append(f'"albany@{albany}{albany_variants}"')

yaml_template = f'{spack_template_path}/{machine}_{compiler}_{mpi}.yaml'
if not os.path.exists(yaml_template):
Expand Down
4 changes: 2 additions & 2 deletions conda/compass_env/spec-file.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ ipython
jupyter
lxml
{% if include_mache %}
mache=1.25.0
mache=1.26.0
{% endif %}
matplotlib-base >=3.9.1
metis
moab >=5.5.1
moab=*={{ mpi_prefix }}_tempest_*
mpas_tools=0.34.1
mpas_tools=0.35.0
nco
netcdf4=*=nompi_*
numpy >=2.0,<3.0
Expand Down
2 changes: 1 addition & 1 deletion conda/configure_compass_env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def main():
if local_mache:
mache = ''
else:
mache = '"mache=1.25.0"'
mache = '"mache=1.26.0"'

setup_install_env(env_name, activate_base, args.use_local, logger,
args.recreate, conda_base, mache)
Expand Down
3 changes: 3 additions & 0 deletions conda/default.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ mpi = nompi

# the version of various packages to include if using spack
albany = compass-2024-03-13
# spack variants for Albany and Trilinos
albany_variants = +mpas~py+unit_tests
trilinos_variants =
# cmake newer than 3.23.0 needed for Trilinos
cmake = 3.23.0:
esmf = 8.6.1
Expand Down
Loading