Skip to content

Make sure both CI and develoment environments don't include conda MPI #902

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Sep 25, 2022
Merged

Make sure both CI and develoment environments don't include conda MPI #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e119956
Add ESMF without MPI to dev spec and conda recipe
xylar Sep 25, 2022
d68bdc5
Remove parallel executable from test suite
xylar Sep 25, 2022
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 ci/recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ requirements:
- cartopy_offlinedata
- cmocean
- dask
- esmf=*=nompi_*
- f90nml
- geometric_features >=0.5.0
- gsw
Expand Down
1 change: 1 addition & 0 deletions dev-spec.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ cartopy >=0.18.0
cartopy_offlinedata
cmocean
dask
esmf=*=nompi_*
f90nml
geometric_features>=0.5.0
gsw
Expand Down
10 changes: 5 additions & 5 deletions suite/job_script.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ echo env: {{ conda_env }}
echo configs: {{ flags }} {{ config }}


{{ parallel_exec }} mpas_analysis --list
{{ parallel_exec }} mpas_analysis --plot_colormaps
{{ parallel_exec }} mpas_analysis --setup_only {{ flags }} {{ config }}
{{ parallel_exec }} mpas_analysis --purge {{ flags }} {{ config }} --verbose
{{ parallel_exec }} mpas_analysis --html_only {{ flags }} {{ config }}
mpas_analysis --list
mpas_analysis --plot_colormaps
mpas_analysis --setup_only {{ flags }} {{ config }}
mpas_analysis --purge {{ flags }} {{ config }} --verbose
mpas_analysis --html_only {{ flags }} {{ config }}

chmod ugo+rx {{ html_base }}/{{ out_common_dir }}
chmod -R ugo+rX {{ html_base }}/{{ out_subdir }}
9 changes: 2 additions & 7 deletions suite/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,6 @@ def main():
else:
flags = ''

if machine == 'cori-haswell':
parallel_exec = ''
else:
parallel_exec = 'srun -N 1 -n 1'

with open(os.path.join('suite', 'job_script.bash')) as template_file:
template_data = template_file.read()
template = Template(template_data)
Expand All @@ -182,8 +177,8 @@ def main():
use_e3sm_unified=use_e3sm_unified,
e3sm_unified_script=e3sm_unified_script, conda_env=conda_env,
machine=machine, flags=flags, config=config_from_job,
parallel_exec=parallel_exec, html_base=html_base,
out_subdir=out_subdir, out_common_dir=out_common_dir)
html_base=html_base, out_subdir=out_subdir,
out_common_dir=out_common_dir)
with open(job, 'w') as job_file:
job_file.write(job_text)

Expand Down