From 7d825eeb8b20087ece6afc743a83873cef31c3c8 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 26 Mar 2020 11:31:43 +0100 Subject: [PATCH 1/2] Specify full path to mpi_run in conda envs. This should allow things to work as expected even when a different (system) verison of `mpirun` has been loaded after the conda env. --- pyremap/remapper.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pyremap/remapper.py b/pyremap/remapper.py index 8e0d110..1f4a31c 100644 --- a/pyremap/remapper.py +++ b/pyremap/remapper.py @@ -181,7 +181,12 @@ def build_mapping_file(self, method='bilinear', additionalArgs=None, '--no_log'] if mpiTasks > 1: - args = ['mpirun', '-np', '{}'.format(mpiTasks)] + args + if 'CONDA_PREFIX' in os.environ: + mpirun_path = '{}/bin/mpirun'.format(os.environ['CONDA_PREFIX']) + else: + mpirun_path = 'mpirun' + + args = [mpirun_path, '-np', '{}'.format(mpiTasks)] + args if self.sourceDescriptor.regional: args.append('--src_regional') From 9e86c8ee27a0333eb6388bd7359b0ad2ff0a8646 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 26 Mar 2020 11:34:20 +0100 Subject: [PATCH 2/2] Bump version to v0.0.6 --- pyremap/__init__.py | 2 +- recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyremap/__init__.py b/pyremap/__init__.py index ad41cc9..12aa682 100644 --- a/pyremap/__init__.py +++ b/pyremap/__init__.py @@ -6,5 +6,5 @@ from pyremap.polar import get_polar_descriptor_from_file, get_polar_descriptor -__version_info__ = (0, 0, 5) +__version_info__ = (0, 0, 6) __version__ = '.'.join(str(vi) for vi in __version_info__) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 82e6929..68bf5b3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pyremap" %} -{% set version = "0.0.5" %} +{% set version = "0.0.6" %} package: name: {{ name|lower }}