Fix whole node allocation for SpiderLauncher

apmechev · Oct 25, 2019 · be08f82 · be08f82
1 parent ff0f1b7
commit be08f82
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/GRID_LRT/application/submit.py b/GRID_LRT/application/submit.py
@@ -340,7 +340,7 @@ def __init__(self, numjobs=1, token_type='t_test',
         self.numjobs = numjobs
         self.parameter_step = parameter_step
         self.token_type = token_type
-        self.wholenodes = 'false'
+        self.wholenodes = False
 
         if 'wholenode' in kwargs:
             self.wholenodes = kwargs['wholenode']
@@ -349,7 +349,7 @@ def __init__(self, numjobs=1, token_type='t_test',
         else:
             self.ncpu = 1
         if self.ncpu == 0:
-            self.wholenodes = 'true'
+            self.wholenodes = True
         if "queue" in kwargs:
             self.queue = kwargs['queue']
         else:
@@ -379,9 +379,9 @@ def build_slurm_file(self, database=None):
             raise IOError("Launch file doesn't exist! "+self.launch_file)
         slurmfile = '#!/usr/bin/env bash\n'
         if self.wholenodes:
-            slurmfile += '#SBATCH --exclusive --nodes=1 --cpus-per-task={ncpu:d} -p {queue:s} --array 1-{njobs:d}%{concurrent:d}\n'
+            slurmfile += '#SBATCH --exclusive --nodes=1 --ntasks 1--cpus-per-task={ncpu:d} -p {queue:s} --array 1-{njobs:d}%{concurrent:d}\n'
         else:
-            slurmfile += '#SBATCH --nodes=1 --cpus-per-task={ncpu:d} -p {queue:s} --array 1-{njobs:d}%{concurrent:d}\n'
+            slurmfile += '#SBATCH --nodes=1 --ntasks 1 --cpus-per-task={ncpu:d} -p {queue:s} --array 1-{njobs:d}%{concurrent:d}\n'
         slurmfile += """
 echo Job landed on $(hostname)
 JOBDIR=$(mktemp -d -p $TMPDIR)