Skip to content

Commit

Permalink
Merge 0e5f9c4 into 4ee7b21
Browse files Browse the repository at this point in the history
  • Loading branch information
jan-janssen committed Sep 17, 2023
2 parents 4ee7b21 + 0e5f9c4 commit 913f1c7
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ dependencies:
- jinja2 =3.1.2
- paramiko =3.3.1
- tqdm =4.66.1
- pympipool =0.6.2
- pympipool =0.7.0
- cloudpickle =2.2.1
13 changes: 7 additions & 6 deletions pysqa/executor/backend.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
import sys

from pympipool import PoolExecutor
from pympipool.mpi import PyMPIExecutor
from pysqa.executor.helper import (
read_from_file,
deserialize,
Expand Down Expand Up @@ -39,15 +39,16 @@ def execute_files_from_list(tasks_in_progress_dict, cache_directory, executor):

def execute_tasks(cores, cache_directory):
tasks_in_progress_dict = {}
with PoolExecutor(
with PyMPIExecutor(
max_workers=cores,
cores_per_worker=1,
threads_per_core=1,
gpus_per_worker=0,
oversubscribe=False,
enable_flux_backend=False,
enable_slurm_backend=False,
init_function=None,
cwd=cache_directory,
sleep_interval=0.1,
queue_adapter=None,
queue_adapter_kwargs=None,
enable_slurm_backend=False,
) as exe:
while True:
execute_files_from_list(
Expand Down
2 changes: 1 addition & 1 deletion pysqa/executor/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import queue
from concurrent.futures import Future, Executor as FutureExecutor

from pympipool import cancel_items_in_queue, RaisingThread
from pympipool.shared import cancel_items_in_queue, RaisingThread
from pysqa.executor.helper import (
reload_previous_futures,
find_executed_tasks,
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
extras_require={
"sge": ['defusedxml==0.7.1'],
"remote": ['paramiko==3.3.1', 'tqdm==4.66.1'],
"executor": ['pympipool==0.6.2', 'cloudpickle==2.2.1'],
"executor": ['pympipool==0.7.0', 'cloudpickle==2.2.1'],
},
cmdclass=versioneer.get_cmdclass(),
entry_points={
Expand Down

0 comments on commit 913f1c7

Please sign in to comment.