Skip to content

Commit

Permalink
Merge pull request #177 from xylar/update-to-0.3.0-alpha.1
Browse files Browse the repository at this point in the history
Update to 0.3.0-alpha.1
  • Loading branch information
xylar authored Feb 1, 2024
2 parents 546a0cb + 7044b55 commit 13b5f1c
Show file tree
Hide file tree
Showing 38 changed files with 665 additions and 221 deletions.
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 "[email protected]:"
./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 "[email protected]:"
./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 = [email protected]:E3SM-Project/Omega.git
[submodule "jigsaw-python"]
path = jigsaw-python
url = [email protected]: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'[email protected]:{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

0 comments on commit 13b5f1c

Please sign in to comment.