From 8631d7d5907b0146072bce59686b51af452f2bc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 04:29:31 +0000 Subject: [PATCH 1/5] Bump pympipool from 0.8.0 to 0.8.1 Bumps [pympipool](https://github.com/pyiron/pympipool) from 0.8.0 to 0.8.1. - [Release notes](https://github.com/pyiron/pympipool/releases) - [Commits](https://github.com/pyiron/pympipool/compare/pympipool-0.8.0...pympipool-0.8.1) --- updated-dependencies: - dependency-name: pympipool dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 19fc5991f..be72fa1a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ dependencies = [ "pint==0.23", "psutil==5.9.8", "pyfileindex==0.0.24", - "pympipool==0.8.0", + "pympipool==0.8.1", "pysqa==0.1.19", "sqlalchemy==2.0.29", "tables==3.9.2", From a08b538922657b4ccf8515ce4752316aabc73585 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 04:29:46 +0000 Subject: [PATCH 2/5] [dependabot skip] Update environment --- .ci_support/environment-docs.yml | 2 +- .ci_support/environment.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci_support/environment-docs.yml b/.ci_support/environment-docs.yml index c01055820..485a682b5 100644 --- a/.ci_support/environment-docs.yml +++ b/.ci_support/environment-docs.yml @@ -17,7 +17,7 @@ dependencies: - pint =0.23 - psutil =5.9.8 - pyfileindex =0.0.24 -- pympipool =0.8.0 +- pympipool =0.8.1 - pysqa =0.1.19 - pytables =3.9.2 - sqlalchemy =2.0.29 diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml index cf210a7f3..f1738627b 100644 --- a/.ci_support/environment.yml +++ b/.ci_support/environment.yml @@ -16,7 +16,7 @@ dependencies: - pint =0.23 - psutil =5.9.8 - pyfileindex =0.0.24 -- pympipool =0.8.0 +- pympipool =0.8.1 - pysqa =0.1.19 - pytables =3.9.2 - sqlalchemy =2.0.29 From 66cacdabd7efe917b0a8251dd40f91904650b2b7 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 29 Apr 2024 06:21:59 -0600 Subject: [PATCH 3/5] Change Executor Name --- pyiron_base/jobs/datamining.py | 2 +- pyiron_base/jobs/job/generic.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyiron_base/jobs/datamining.py b/pyiron_base/jobs/datamining.py index b3f98963e..e2f916064 100644 --- a/pyiron_base/jobs/datamining.py +++ b/pyiron_base/jobs/datamining.py @@ -786,7 +786,7 @@ def update_table(self, job_status_list=None): self.project.db.item_update({"timestart": datetime.now()}, self.job_id) with self.project_hdf5.open("input") as hdf5_input: if self._executor_type is None and self.server.cores > 1: - self._executor_type = "pympipool.mpi.executor.PyMPIExecutor" + self._executor_type = "pympipool.Executor" if self._executor_type is not None: with self._get_executor(max_workers=self.server.cores) as exe: self._pyiron_table.create_table( diff --git a/pyiron_base/jobs/job/generic.py b/pyiron_base/jobs/job/generic.py index 4bf6f2d7c..babee8b4e 100644 --- a/pyiron_base/jobs/job/generic.py +++ b/pyiron_base/jobs/job/generic.py @@ -1552,7 +1552,7 @@ def _get_executor(self, max_workers=None): "No executor type defined - Please set self.executor_type." ) elif ( - self._executor_type == "pympipool.mpi.executor.PyMPIExecutor" + self._executor_type == "pympipool.Executor" and platform.system() == "Darwin" ): # The Mac firewall might prevent connections based on the network address - especially Github CI From 4928439ce2d850d11b545071096bbc3aba72d28c Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 29 Apr 2024 06:32:58 -0600 Subject: [PATCH 4/5] fixes --- pyiron_base/jobs/job/generic.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyiron_base/jobs/job/generic.py b/pyiron_base/jobs/job/generic.py index babee8b4e..2fe04e878 100644 --- a/pyiron_base/jobs/job/generic.py +++ b/pyiron_base/jobs/job/generic.py @@ -1557,8 +1557,11 @@ def _get_executor(self, max_workers=None): ): # The Mac firewall might prevent connections based on the network address - especially Github CI return import_class(self._executor_type)( - max_workers=max_workers, hostname_localhost=True + max_cores=max_workers, hostname_localhost=True ) + elif self._executor_type == "pympipool.Executor": + # The pympipool Executor defines max_cores rather than max_workers + return import_class(self._executor_type)(max_cores=max_workers) elif isinstance(self._executor_type, str): return import_class(self._executor_type)(max_workers=max_workers) else: From 62384d145c83e3b0e03ca5c2628066411c594517 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 29 Apr 2024 06:34:45 -0600 Subject: [PATCH 5/5] require pympipool 0.8.0 or later --- .ci_support/environment-old.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/environment-old.yml b/.ci_support/environment-old.yml index 45e284011..7c052422f 100644 --- a/.ci_support/environment-old.yml +++ b/.ci_support/environment-old.yml @@ -12,7 +12,7 @@ dependencies: - pint =0.18 - psutil =5.8.0 - pyfileindex =0.0.16 -- pympipool =0.7.11 +- pympipool =0.8.0 - pysqa =0.1.12 - pytables =3.6.1 - sqlalchemy =2.0.22