opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-29 17:42:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use both SLURM_NTASKS and SLURM_CPUS_PER_TASK to set GALAXY_SLOTS

Browse Source
This commit is contained in:
Lance Parsons
2015-12-16 14:07:13 -05:00
parent 191f75407e
commit d24bc3df1e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh
+5 -5
View File
@@ -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