Skip to content

Commit

Permalink
Merge pull request #1418 from pyiron/dependabot/pip/pympipool-0.8.1
Browse files Browse the repository at this point in the history
Bump pympipool from 0.8.0 to 0.8.1
  • Loading branch information
jan-janssen committed Apr 29, 2024
2 parents 02216b0 + 62384d1 commit 274a669
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .ci_support/environment-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/environment-old.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyiron_base/jobs/datamining.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
7 changes: 5 additions & 2 deletions pyiron_base/jobs/job/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -1552,13 +1552,16 @@ 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
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:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 274a669

Please sign in to comment.