diff --git a/.ci_support/environment-mpich.yml b/.ci_support/environment-mpich.yml index e8c61cb..e2a9e16 100644 --- a/.ci_support/environment-mpich.yml +++ b/.ci_support/environment-mpich.yml @@ -6,6 +6,6 @@ dependencies: - mpich =4.2.3 - numpy =1.26.4 - mpi4py =4.0.1 -- executorlib =0.0.4 +- executorlib =0.0.5 - ase =3.23.0 - scipy =1.14.1 diff --git a/.ci_support/environment-old.yml b/.ci_support/environment-old.yml index 11ab944..2b7037a 100644 --- a/.ci_support/environment-old.yml +++ b/.ci_support/environment-old.yml @@ -5,6 +5,6 @@ dependencies: - openmpi - numpy =1.23.5 - mpi4py =3.1.4 -- executorlib =0.0.3 +- executorlib =0.0.5 - ase =3.23.0 - scipy =1.9.3 diff --git a/.ci_support/environment-openmpi.yml b/.ci_support/environment-openmpi.yml index ef1990e..5c88525 100644 --- a/.ci_support/environment-openmpi.yml +++ b/.ci_support/environment-openmpi.yml @@ -6,6 +6,6 @@ dependencies: - openmpi =5.0.5 - numpy =1.26.4 - mpi4py =4.0.1 -- executorlib =0.0.4 +- executorlib =0.0.5 - ase =3.23.0 - scipy =1.14.1 diff --git a/pylammpsmpi/mpi/lmpmpi.py b/pylammpsmpi/mpi/lmpmpi.py index 50902ac..64f068d 100644 --- a/pylammpsmpi/mpi/lmpmpi.py +++ b/pylammpsmpi/mpi/lmpmpi.py @@ -6,7 +6,7 @@ from ctypes import c_double, c_int import numpy as np -from executorlib.shared import ( +from executorlib.standalone.interactive.communication import ( interface_connect, interface_receive, interface_send, diff --git a/pylammpsmpi/wrapper/concurrent.py b/pylammpsmpi/wrapper/concurrent.py index 7cecb2e..27b4de8 100644 --- a/pylammpsmpi/wrapper/concurrent.py +++ b/pylammpsmpi/wrapper/concurrent.py @@ -8,12 +8,10 @@ from queue import Queue from typing import Any, List, Optional -from executorlib.shared import ( - MpiExecSpawner, - RaisingThread, - cancel_items_in_queue, - interface_bootup, -) +from executorlib.standalone.interactive.communication import interface_bootup +from executorlib.standalone.interactive.spawner import MpiExecSpawner +from executorlib.standalone.queue import cancel_items_in_queue +from executorlib.standalone.thread import RaisingThread __author__ = "Sarath Menon, Jan Janssen" __copyright__ = ( diff --git a/pyproject.toml b/pyproject.toml index 5c4f6ba..376c799 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ classifiers = [ ] dependencies = [ "mpi4py==4.0.1", - "executorlib==0.0.4", + "executorlib==0.0.5", "numpy==1.26.4", ] dynamic = ["version"] diff --git a/tests/test_executor.py b/tests/test_executor.py index 5a80a13..0ff657f 100644 --- a/tests/test_executor.py +++ b/tests/test_executor.py @@ -1,7 +1,7 @@ import unittest from ase.build import bulk from executorlib import Executor -from executorlib.shared.executor import cloudpickle_register +from executorlib.standalone.serialize import cloudpickle_register from pylammpsmpi import LammpsASELibrary