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

Merge pull request #2145 from mvdbeek/pbs_ncpu

Browse Source 
Use "$NCPUS" if defined to set GALAXY_SLOTS
This commit is contained in:
Nicola Soranzo
2016-04-14 15:50:06 +01:00
parent 87e2a6cd57 3c97d30cd6
commit 148d4ee88d
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh
+2
View File
@@ -15,6 +15,8 @@ elif [ -n "$SLURM_NTASKS" ] || [ -n "$SLURM_CPUS_PER_TASK" ]; then
GALAXY_SLOTS=`expr "${SLURM_NTASKS:-1}" \* "${SLURM_CPUS_PER_TASK:-1}"`
elif [ -n "$NSLOTS" ]; then
GALAXY_SLOTS="$NSLOTS"
elif [ -n "$NCPUS" ]; then
GALAXY_SLOTS="$NCPUS"
elif [ -n "$PBS_NCPUS" ]; then
GALAXY_SLOTS="$PBS_NCPUS"
elif [ -f "$PBS_NODEFILE" ]; then