From 86510a4d4e7c638b40c42ad1aca1e1ebc275c095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Thu, 5 Mar 2020 04:53:02 +0100 Subject: [PATCH 1/3] Switch to use_stdin=True for LSFCluster. --- dask_jobqueue/jobqueue.yaml | 2 +- dask_jobqueue/lsf.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dask_jobqueue/jobqueue.yaml b/dask_jobqueue/jobqueue.yaml index 6a165eb3..14fdb67e 100644 --- a/dask_jobqueue/jobqueue.yaml +++ b/dask_jobqueue/jobqueue.yaml @@ -140,7 +140,7 @@ jobqueue: job-extra: [] log-directory: null lsf-units: null - use-stdin: null # (bool) How jobs are launched, i.e. 'bsub jobscript.sh' or 'bsub < jobscript.sh' + use-stdin: True # (bool) How jobs are launched, i.e. 'bsub jobscript.sh' or 'bsub < jobscript.sh' htcondor: name: dask-worker diff --git a/dask_jobqueue/lsf.py b/dask_jobqueue/lsf.py index d6eb11ea..93802aa8 100644 --- a/dask_jobqueue/lsf.py +++ b/dask_jobqueue/lsf.py @@ -52,8 +52,6 @@ def __init__( if use_stdin is None: use_stdin = dask.config.get("jobqueue.%s.use-stdin" % self.config_name) - if use_stdin is None: - use_stdin = lsf_version() < "10" self.use_stdin = use_stdin header_lines = [] From e22f3d1f5bcf36b66a06aab053b855e04651fcdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Thu, 5 Mar 2020 06:57:42 +0100 Subject: [PATCH 2/3] Add changelog. --- docs/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 28b3b956..0316c8bf 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -14,6 +14,7 @@ Development version of threads per process is roughly the same. Old default was to use one process and only threads, i.e. ``proccesses=1``, ``threads_per_process=cores``. - fix bug (forgotten async def) in ``OARCluster._submit_job`` (:pr:`380`). +- ``LSFCluster``: switch to ``use_stdin=False`` (:pr:`388`). 0.7.0 / 2019-10-09 ------------------ From e412db723011a1d235adb3b6d85fa5ca53d85d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Thu, 5 Mar 2020 10:18:13 +0100 Subject: [PATCH 3/3] Fix --- docs/source/changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 0316c8bf..66a9fa87 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -14,7 +14,7 @@ Development version of threads per process is roughly the same. Old default was to use one process and only threads, i.e. ``proccesses=1``, ``threads_per_process=cores``. - fix bug (forgotten async def) in ``OARCluster._submit_job`` (:pr:`380`). -- ``LSFCluster``: switch to ``use_stdin=False`` (:pr:`388`). +- ``LSFCluster``: switch to ``use_stdin=True`` (:pr:`388`). 0.7.0 / 2019-10-09 ------------------