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

Update to 0.3.0-alpha.1 #177

Merged
merged 47 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d317c06
Add jigsaw-python submodule
xylar Mar 6, 2023
cfdb2b6
Install jigsaw and jigsawpy from submodule
xylar Mar 6, 2023
432e15b
Use https instead of SSH to get git submodules
xylar Mar 6, 2023
5c03af3
Add --update_jigsaw flag
xylar Mar 15, 2023
fcaaf1d
remove jigsaw(py) from spec-file, default.cfg and setup.cfg
xylar Jan 17, 2024
6d8863b
Leave alpha version in conda dev envs
xylar Jan 19, 2024
14546f2
A few fixes to deployment
xylar Jan 24, 2024
a27ecb1
Fix dependencies and install for local mache build
xylar Jan 24, 2024
e4f398f
Fix Jigsaw build
xylar Jan 26, 2024
ae4e716
Split spack environments into soft and lib
xylar Jan 18, 2024
75e45a1
Add software compilers to supported machines
xylar Jan 18, 2024
277dfd5
Update the spack deployment docs
xylar Jan 18, 2024
c15401e
Update docs with jigsaw install
xylar Jan 30, 2024
18b46ca
Update to v0.3.0-alpha.1
xylar Jan 18, 2024
8c978c4
Merge pull request #165 from xylar/split-spack-software-and-libs
xylar Jan 31, 2024
19ee276
Merge pull request #166 from xylar/add-jigsaw-as-submodule
xylar Jan 31, 2024
ceab18a
Add metis to spack build
xylar Jan 10, 2024
32479bd
Add parmetis to spack build
xylar Jan 10, 2024
1a92f82
Build metis and parmetis as static libs
xylar Jan 10, 2024
bdeab9f
Merge pull request #162 from xylar/add-metis
xylar Jan 31, 2024
29bb69d
Update to mache 1.19.0
xylar Jan 15, 2024
fa5d8ed
Add nvidia as supported compiler on pm-cpu
xylar Jan 15, 2024
01ac3ce
Add pm-gpu with nvidiagpu compiler
xylar Jan 16, 2024
bac1054
Add intel support on pm-cpu
xylar Jan 18, 2024
deb7c09
Add software compiler config option to pm-gpu
xylar Jan 19, 2024
3454ac9
Add support for more compilers on pm-gpu
xylar Jan 20, 2024
02a0318
Add pm-cpu with intel to the developer's guide
xylar Jan 30, 2024
28f6c86
Add moab to spack environment
xylar Jan 25, 2024
6ec40a1
Update scorpio to v1.4.2
xylar Jan 26, 2024
ae783f7
Merge pull request #176 from xylar/add-moab
xylar Jan 31, 2024
9862a02
Merge pull request #167 from xylar/add-pm-gpu
xylar Jan 31, 2024
00d64de
Add support for frontier
xylar Jan 23, 2024
8174937
Remove shared paths from User's Guide
xylar Jan 31, 2024
3aa19b3
Add Frontier to the docs
xylar Jan 31, 2024
b910de8
Merge pull request #178 from xylar/update-scorpio
xylar Jan 31, 2024
a46277c
Merge pull request #168 from xylar/add-frontier
xylar Jan 31, 2024
cd3e71d
Fix cores_per_node for Frontier
xylar Jan 31, 2024
9c0bb0e
Fix slurm handling of allocatable cores
xylar Jan 31, 2024
e3b4dd8
Merge pull request #181 from xylar/fix-slurm-allocatable-cores
xylar Jan 31, 2024
c69e0be
Merge pull request #180 from xylar/fix-frontier-cores-per-node
xylar Jan 31, 2024
43ff3e5
Update machine, compilar and MPI combos in matrix
xylar Feb 1, 2024
7b6c232
Remove gnu with mvapich from supported on Anvil
xylar Feb 1, 2024
46d07f4
Merge pull request #182 from xylar/remove-mvapich-on-anvil
xylar Feb 1, 2024
3e35a7b
Fix libnetcdf in jigsaw build
xylar Feb 1, 2024
aeff4eb
Merge pull request #184 from xylar/fix-jigsaw-netcdf
xylar Feb 1, 2024
7d6387d
Fix `cores_per_node` calculation on Compy
xylar Feb 1, 2024
7044b55
Merge pull request #185 from xylar/fix-compy-cores-per-node
xylar Feb 1, 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
1 change: 1 addition & 0 deletions .github/workflows/build_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ jobs:
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
name: Install polaris
run: |
git config --global url."https://github.com/".insteadOf "git@github.com:"
./configure_polaris_envs.py \
--conda_env_only \
--env_name polaris_test \
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docs_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
name: Install polaris
run: |
git config --global url."https://github.com/".insteadOf "git@github.com:"
./configure_polaris_envs.py \
--conda_env_only \
--env_name polaris_test \
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "e3sm_submodules/Omega"]
path = e3sm_submodules/Omega
url = git@github.com:E3SM-Project/Omega.git
[submodule "jigsaw-python"]
path = jigsaw-python
url = git@github.com:dengwirda/jigsaw-python.git
10 changes: 8 additions & 2 deletions configure_polaris_envs.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@ def setup_install_env(env_name, activate_base, use_local, logger, recreate,
channels = '--use-local'
else:
channels = ''
packages = f'jinja2 {mache} packaging progressbar2'
if mache == '':
# development mache so include dependencies
packages = 'importlib_resources jinja2 lxml packaging progressbar2 ' \
'pyyaml'
else:
packages = f'jinja2 {mache} packaging progressbar2'
if recreate or not os.path.exists(env_path):
print('Setting up a conda environment for installing polaris\n')
commands = f'{activate_base} && ' \
Expand Down Expand Up @@ -114,7 +119,8 @@ def main():
f'git clone -b {args.mache_branch} ' \
f'git@github.com:{args.mache_fork}.git mache && ' \
f'cd mache && ' \
f'python -m pip install .'
f'conda install -y --file spec-file.txt && ' \
f'python -m pip install --no-deps .'

check_call(commands, logger=logger)

Expand Down
4 changes: 4 additions & 0 deletions deploy/albany_supported.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,9 @@ anvil, gnu, openmpi
chicoma-cpu, gnu, mpich
chrysalis, gnu, openmpi
compy, gnu, openmpi
frontier, gnu, mpich
frontier, gnugpu, mpich
frontier, crayclang, mpich
frontier, crayclanggpu, mpich
pm-cpu, gnu, mpich
morpheus, gnu, openmpi
Loading
Loading