From d24bc3df1e627a0586860600a89352f6bddf49b1 Mon Sep 17 00:00:00 2001
From: Lance Parsons <lparsons@genomics.princeton.edu>
Date: Wed, 16 Dec 2015 13:46:15 -0500
Subject: [PATCH] Use both SLURM_NTASKS and SLURM_CPUS_PER_TASK to set
 GALAXY_SLOTS

---
 .../runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh b/lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh
index 0b35a4b9c35..c28f99e2647 100644
--- a/lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh
+++ b/lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh
@@ -1,9 +1,9 @@
 export GALAXY_SLOTS_CONFIGURED="1"
-if [ -n "$SLURM_NTASKS" ]; then
-    # May want to multiply this by ${SLURM_CPUS_PER_TASK:-1}.
-    # SLURM_NTASKS is total tasks over all nodes so this is 
-    # shouldn't be used for multi-node requests.
-    GALAXY_SLOTS="$SLURM_NTASKS"
+if [ -n "$SLURM_NTASKS" ] || [ -n "$SLURM_CPUS_PER_TASK" ]; then
+    # Multiply these values since SLURM_NTASKS is total tasks over all nodes.
+    # GALAXY_SLOTS maps to CPUS on a single node and shouldn't be used for
+    # multi-node requests.
+    GALAXY_SLOTS=`expr "${SLURM_NTASKS:-1}" \* "${SLURM_CPUS_PER_TASK:-1}"`
 elif [ -n "$NSLOTS" ]; then
     GALAXY_SLOTS="$NSLOTS"
 elif [ -n "$PBS_NCPUS" ]; then