Skip to content

Commit d1f5488

Browse files
authored
Set exclusive=False by default (#233)
* Set `exclusive=False` by default * Fix tests
1 parent 9fa3229 commit d1f5488

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

adaptive_scheduler/_scheduler/slurm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def __init__( # noqa: PLR0915
124124
nodes: int | tuple[int | None | Callable[[], int | None], ...] | None = None,
125125
cores_per_node: int | tuple[int | None | Callable[[], int | None], ...] | None = None,
126126
partition: str | tuple[str | None | Callable[[], str | None], ...] | None = None,
127-
exclusive: bool | tuple[bool | Callable[[], bool], ...] = True,
127+
exclusive: bool | tuple[bool | Callable[[], bool], ...] = False,
128128
python_executable: str | None = None,
129129
log_folder: str | Path = "",
130130
mpiexec_executable: str | None = None,

adaptive_scheduler/_server_support/slurm_run.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,13 @@ def slurm_run(
3131
num_threads: int | tuple[int | Callable[[], int], ...] = 1,
3232
save_interval: float = 300,
3333
log_interval: float = 300,
34+
job_manager_interval: float = 60,
3435
cleanup_first: bool = True,
3536
save_dataframe: bool = True,
3637
dataframe_format: _DATAFRAME_FORMATS = "pickle",
3738
max_fails_per_job: int = 50,
3839
max_simultaneous_jobs: int = 100,
39-
exclusive: bool | tuple[bool | Callable[[], bool], ...] = True,
40+
exclusive: bool | tuple[bool | Callable[[], bool], ...] = False,
4041
executor_type: EXECUTOR_TYPES
4142
| tuple[EXECUTOR_TYPES | Callable[[], EXECUTOR_TYPES], ...] = "process-pool",
4243
extra_scheduler: list[str] | tuple[list[str] | Callable[[], list[str]], ...] | None = None,
@@ -90,6 +91,9 @@ def slurm_run(
9091
The interval at which to save the learners.
9192
log_interval
9293
The interval at which to log the status of the run.
94+
job_manager_interval
95+
The interval at which the job manager checks the status of the jobs and
96+
submits new jobs.
9397
cleanup_first
9498
Whether to clean up the folder before starting the run.
9599
save_dataframe
@@ -197,6 +201,7 @@ def slurm_run(
197201
max_fails_per_job=max_fails_per_job,
198202
max_simultaneous_jobs=max_simultaneous_jobs,
199203
initializers=initializers,
204+
job_manager_interval=job_manager_interval,
200205
)
201206
if extra_run_manager_kwargs is None:
202207
extra_run_manager_kwargs = {}

tests/test_slurm_run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def test_slurm_run_with_default_arguments(
4646
assert rm.log_interval == 300
4747
assert rm.learners == learners
4848
assert rm.fnames == fnames
49-
assert rm.scheduler.exclusive is True
49+
assert rm.scheduler.exclusive is False
5050

5151

5252
def goal_example(learner: adaptive.Learner1D) -> bool:

tests/test_slurm_scheduler.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ def test_job_script() -> None:
7272
s = SLURM(cores=4)
7373
job_script = s.job_script(options={})
7474
assert "#SBATCH --ntasks 4" in job_script
75-
assert "#SBATCH --exclusive" in job_script
7675
assert "#SBATCH --no-requeue" in job_script
7776
assert "MKL_NUM_THREADS=1" in job_script
7877
assert "OPENBLAS_NUM_THREADS=1" in job_script
@@ -112,7 +111,6 @@ def test_slurm_job_script_default() -> None:
112111

113112
assert "#SBATCH --ntasks 4" in job_script
114113
assert "#SBATCH --no-requeue" in job_script
115-
assert "#SBATCH --exclusive" in job_script
116114
assert "export MKL_NUM_THREADS=1" in job_script
117115
assert "export OPENBLAS_NUM_THREADS=1" in job_script
118116
assert "export OMP_NUM_THREADS=1" in job_script
@@ -188,7 +186,6 @@ def test_slurm_scheduler_job_script_ipyparallel() -> None:
188186
#!/bin/bash
189187
#SBATCH --ntasks 4
190188
#SBATCH --no-requeue
191-
#SBATCH --exclusive
192189
#SBATCH --exclusive=user
193190
#SBATCH --time=1
194191

0 commit comments

Comments
 (0)