Skip to content

Commit 4af4e97

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/main' into release_openmpi_constraint
# Conflicts: # pympipool/scheduler/__init__.py # pympipool/shared/inputcheck.py # tests/test_shared_input_check.py
2 parents ed541e0 + 75613c1 commit 4af4e97

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

pympipool/scheduler/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
check_threads_per_core,
1313
check_oversubscribe,
1414
check_executor,
15-
validate_backend,
1615
check_init_function,
1716
check_pmi,
17+
validate_backend,
1818
validate_number_of_cores,
1919
)
2020
from pympipool.scheduler.slurm import (

pympipool/shared/inputcheck.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def check_refresh_rate(refresh_rate: float):
6969

7070
def validate_backend(
7171
backend: str, flux_installed: bool = False, slurm_installed: bool = False
72-
):
72+
) -> str:
7373
if backend not in ["auto", "mpi", "slurm", "flux"]:
7474
raise ValueError(
7575
'The currently implemented backends are ["flux", "mpi", "slurm"]. '

tests/test_shared_input_check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
check_threads_per_core,
77
check_oversubscribe,
88
check_executor,
9-
validate_backend,
109
check_init_function,
1110
check_refresh_rate,
1211
check_resource_dict,
1312
check_resource_dict_is_empty,
13+
validate_backend,
1414
)
1515

1616

0 commit comments

Comments
 (0)