Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into executorlib
Browse files Browse the repository at this point in the history
# Conflicts:
#	pylammpsmpi/wrapper/concurrent.py
  • Loading branch information
jan-janssen committed Nov 2, 2024
2 parents ab221ce + 641c141 commit 6353379
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .ci_support/environment-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ channels:
dependencies:
- coverage
- lammps =2024.06.27=*_mpi_mpich_*
- mpich =4.2.2
- mpich =4.2.3
- numpy =1.26.4
- mpi4py =4.0.0
- executorlib =0.0.2
- mpi4py =4.0.1
- executorlib =0.0.4
- ase =3.23.0
- scipy =1.14.1
2 changes: 1 addition & 1 deletion .ci_support/environment-old.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ dependencies:
- openmpi
- numpy =1.23.5
- mpi4py =3.1.4
- executorlib =0.0.1
- executorlib =0.0.3
- ase =3.23.0
- scipy =1.9.3
4 changes: 2 additions & 2 deletions .ci_support/environment-openmpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
- lammps =2024.06.27=*_mpi_openmpi_*
- openmpi =5.0.5
- numpy =1.26.4
- mpi4py =4.0.0
- executorlib =0.0.2
- mpi4py =4.0.1
- executorlib =0.0.4
- ase =3.23.0
- scipy =1.14.1
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.2
rev: v0.7.1
hooks:
- id: ruff
name: ruff lint
Expand Down
4 changes: 2 additions & 2 deletions binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies:
- openmpi
- numpy =1.26.4
- lammps =2024.06.27
- mpi4py =4.0.0
- executorlib =0.0.2
- mpi4py =4.0.1
- executorlib =0.0.4
- ase =3.23.0
- scipy =1.14.1
6 changes: 3 additions & 3 deletions pylammpsmpi/wrapper/concurrent.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

from executorlib.standalone.thread import RaisingThread
from exeuctorlib.standalone.queue import cancel_items_in_queue
from executorlib.standalone.interactive.spawner import MpiExecInterface
from executorlib.standalone.interactive.spawner import MpiExecSpawner
from executorlib.standalone.interactive.communication import interface_bootup

__author__ = "Sarath Menon, Jan Janssen"
Expand Down Expand Up @@ -53,10 +53,10 @@ def execute_async(
cmds.extend(cmdargs)
interface = interface_bootup(
command_lst=cmds,
connections=MpiExecInterface(
connections=MpiExecSpawner(
cwd=cwd,
cores=cores,
oversubscribe=oversubscribe,
openmpi_oversubscribe=oversubscribe,
),
)
while True:
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ classifiers = [
"Programming Language :: Python :: 3.12",
]
dependencies = [
"mpi4py==4.0.0",
"executorlib==0.0.2",
"mpi4py==4.0.1",
"executorlib==0.0.4",
"numpy==1.26.4",
]
dynamic = ["version"]
Expand Down

0 comments on commit 6353379

Please sign in to comment.