From 0c41b8f97587314ae5a88c890e0420cc120170a4 Mon Sep 17 00:00:00 2001 From: bw4sz Date: Tue, 20 Mar 2018 13:22:37 -0700 Subject: [PATCH 1/3] changed -A to --account --- dask_jobqueue/slurm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dask_jobqueue/slurm.py b/dask_jobqueue/slurm.py index 8828239d..275a7474 100644 --- a/dask_jobqueue/slurm.py +++ b/dask_jobqueue/slurm.py @@ -53,7 +53,7 @@ def __init__(self, Passed to `#SBATCH -p` option. project : str Accounting string associated with each worker job. Passed to - `#SBATCH -A` option. + `#SBATCH --account` option. threads_per_worker : int Number of threads per process. processes : int @@ -78,7 +78,7 @@ def __init__(self, #SBATCH -J %(name)s #SBATCH -n %(processes)d #SBATCH -p %(queue)s -#SBATCH -A %(project)s +#SBATCH --account %(project)s #SBATCH -t %(walltime)s #SBATCH -e %(name)s.err #SBATCH -o %(name)s.out From 1893136f58fbf3e7928e4035a2bfa8ba502dc44b Mon Sep 17 00:00:00 2001 From: bw4sz Date: Tue, 20 Mar 2018 13:46:23 -0700 Subject: [PATCH 2/3] Logging statements are not needed --- dask_jobqueue/core.py | 3 +-- dask_jobqueue/slurm.py | 10 +++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dask_jobqueue/core.py b/dask_jobqueue/core.py index f0ea6dc7..9d974f3b 100644 --- a/dask_jobqueue/core.py +++ b/dask_jobqueue/core.py @@ -4,10 +4,8 @@ import toolz from distributed.utils import tmpfile, ignoring - logger = logging.getLogger(__name__) - class JobQueueCluster(object): """ Base class to launch Dask Clusters for Job queues @@ -75,6 +73,7 @@ def _calls(self, cmds): Also logs any stderr information """ logger.debug("Submitting the following calls to command line") + for cmd in cmds: logger.debug(' '.join(cmd)) procs = [subprocess.Popen(cmd, diff --git a/dask_jobqueue/slurm.py b/dask_jobqueue/slurm.py index 275a7474..4612109f 100644 --- a/dask_jobqueue/slurm.py +++ b/dask_jobqueue/slurm.py @@ -48,12 +48,9 @@ def __init__(self, ---------- name : str Name of worker jobs. Passed to `#SBATCH -J` option. - queue : str - Destination queue for each worker job. - Passed to `#SBATCH -p` option. project : str Accounting string associated with each worker job. Passed to - `#SBATCH --account` option. + `#SBATCH -A` option. threads_per_worker : int Number of threads per process. processes : int @@ -77,8 +74,7 @@ def __init__(self, #SBATCH -J %(name)s #SBATCH -n %(processes)d -#SBATCH -p %(queue)s -#SBATCH --account %(project)s +#SBATCH -A %(project)s #SBATCH -t %(walltime)s #SBATCH -e %(name)s.err #SBATCH -o %(name)s.out @@ -87,7 +83,7 @@ def __init__(self, export LANGUAGE="en_US.utf8" export LC_ALL="en_US.utf8" -%(base_path)s/dask-worker %(scheduler)s \ +"%(base_path)s/dask-worker" %(scheduler)s \ --nthreads %(threads_per_worker)d \ --nprocs %(processes)s \ --memory-limit %(memory)s \ From 9d9eb5fee96f916511643c1734331dfd3462945b Mon Sep 17 00:00:00 2001 From: bw4sz Date: Wed, 21 Mar 2018 15:54:27 -0700 Subject: [PATCH 3/3] don't need queue in the dict either --- dask_jobqueue/slurm.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/dask_jobqueue/slurm.py b/dask_jobqueue/slurm.py index 4612109f..272a3fc1 100644 --- a/dask_jobqueue/slurm.py +++ b/dask_jobqueue/slurm.py @@ -32,7 +32,6 @@ class SLURMCluster(JobQueueCluster): """ def __init__(self, name='dask', - queue='', project=None, threads_per_worker=4, processes=8, @@ -105,7 +104,6 @@ def __init__(self, self.cluster = LocalCluster(n_workers=0, ip=host, **kwargs) memory = memory.replace(' ', '') self.config = {'name': name, - 'queue': queue, 'project': project, 'threads_per_worker': threads_per_worker, 'processes': processes,