Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ci_support/environment-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- numpy
- openmpi
- cloudpickle =3.0.0
- executorlib-core =0.0.1
- mpi4py =3.1.6
- tqdm =4.66.2
- pyzmq =26.0.2
Expand Down
1 change: 1 addition & 0 deletions .ci_support/environment-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
- numpy
- mpich
- cloudpickle =3.0.0
- executorlib-core =0.0.1
- mpi4py =3.1.6
- tqdm =4.66.2
- pyzmq =26.0.2
1 change: 1 addition & 0 deletions .ci_support/environment-old.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
- numpy
- openmpi =4.1.4
- cloudpickle =2.0.0
- executorlib-core =0.0.1
- mpi4py =3.1.4
- tqdm =4.44.0
- pyzmq =25.0.0
1 change: 1 addition & 0 deletions .ci_support/environment-openmpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
- numpy
- openmpi
- cloudpickle =3.0.0
- executorlib-core =0.0.1
- mpi4py =3.1.6
- tqdm =4.66.2
- pyzmq =26.0.2
1 change: 1 addition & 0 deletions .ci_support/environment-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
- numpy
- msmpi
- cloudpickle =3.0.0
- executorlib-core =0.0.1
- mpi4py =3.1.6
- tqdm =4.66.2
- pyzmq =26.0.2
1 change: 1 addition & 0 deletions binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
- numpy
- openmpi
- cloudpickle =3.0.0
- executorlib-core =0.0.1
- mpi4py =3.1.6
- tqdm =4.66.2
- pyzmq =26.0.0
Expand Down
2 changes: 0 additions & 2 deletions pympipool/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from typing import Optional
from ._version import get_versions
from pympipool.scheduler import create_executor
from pympipool.shell.executor import SubprocessExecutor
from pympipool.shell.interactive import ShellExecutor
from pympipool.shared.dependencies import ExecutorWithDependencies
from pympipool.shared.inputcheck import check_refresh_rate as _check_refresh_rate

Expand Down
2 changes: 1 addition & 1 deletion pympipool/backend/mpiexec.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import cloudpickle

from pympipool.shared.communication import (
from executorlib_core.communication import (
interface_connect,
interface_send,
interface_shutdown,
Expand Down
2 changes: 1 addition & 1 deletion pympipool/backend/serial.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import sys
from typing import Optional

from pympipool.shared.communication import (
from executorlib_core.communication import (
interface_connect,
interface_send,
interface_shutdown,
Expand Down
4 changes: 2 additions & 2 deletions pympipool/scheduler/flux.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import os
from typing import Optional

from executorlib_core.base import ExecutorBroker
from executorlib_core.thread import RaisingThread
import flux.job

from pympipool.shared.executorbase import (
execute_parallel_tasks,
execute_separate_tasks,
ExecutorBroker,
ExecutorSteps,
)
from pympipool.shared.interface import BaseInterface
from pympipool.shared.thread import RaisingThread


class PyFluxExecutor(ExecutorBroker):
Expand Down
4 changes: 2 additions & 2 deletions pympipool/scheduler/mpi.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from typing import Optional
from executorlib_core.base import ExecutorBroker
from executorlib_core.thread import RaisingThread

from pympipool.shared.executorbase import (
execute_parallel_tasks,
execute_separate_tasks,
ExecutorBroker,
ExecutorSteps,
)
from pympipool.shared.interface import MpiExecInterface
from pympipool.shared.thread import RaisingThread


class PyMPIExecutor(ExecutorBroker):
Expand Down
6 changes: 4 additions & 2 deletions pympipool/scheduler/slurm.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
from typing import Optional

from executorlib_core.base import ExecutorBroker
from executorlib_core.thread import RaisingThread

from pympipool.shared.executorbase import (
execute_parallel_tasks,
execute_separate_tasks,
ExecutorBroker,
ExecutorSteps,
)
from pympipool.shared.interface import SrunInterface
from pympipool.shared.thread import RaisingThread


class PySlurmExecutor(ExecutorBroker):
Expand Down
10 changes: 0 additions & 10 deletions pympipool/shared/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1 @@
from pympipool.shared.communication import (
SocketInterface,
interface_bootup,
interface_connect,
interface_send,
interface_shutdown,
interface_receive,
)
from pympipool.shared.executorbase import cancel_items_in_queue
from pympipool.shared.thread import RaisingThread
from pympipool.shared.interface import MpiExecInterface, SrunInterface
179 changes: 0 additions & 179 deletions pympipool/shared/communication.py

This file was deleted.

3 changes: 2 additions & 1 deletion pympipool/shared/dependencies.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from executorlib_core.thread import RaisingThread

from pympipool.scheduler import create_executor
from pympipool.shared.executorbase import ExecutorSteps, execute_tasks_with_dependencies
from pympipool.shared.thread import RaisingThread


class ExecutorWithDependencies(ExecutorSteps):
Expand Down
Loading