Skip to content

Commit 5b5cf0e

Browse files
committed
Switch to setting GALAXY_SLOTS using ROOT_MAX_THREADS for HTCondor submitted jobs
At the moment, Pulsar is using ROOT_MAX_THREADS (designed to control the ROOT data analysis framework from CERN) to set GALAXY_SLOTS. Switch to PYTHON_CPU_COUNT (controls the amount of CPUs that Python sees).
1 parent 20f08cb commit 5b5cf0e

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

pulsar/managers/util/job_script/CLUSTER_SLOTS_STATEMENT.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ elif [ -n "$LSB_DJOB_NUMPROC" ]; then
2626
elif [ -n "$GALAXY_SLOTS" ]; then
2727
# kubernetes runner injects GALAXY_SLOTS into environment
2828
GALAXY_SLOTS=$GALAXY_SLOTS
29-
elif [ -n "$ROOT_MAX_THREADS" ]; then
29+
elif [ -n "$PYTHON_CPU_COUNT" ]; then
3030
# HTCondor sets a couple of environment variables read by various
3131
# frameworks to control the number of threads they are allowed to use. A
3232
# list can be found in the HTCondor docs (the list itself is configurable,
@@ -36,9 +36,8 @@ elif [ -n "$ROOT_MAX_THREADS" ]; then
3636
# configuration-macros.html#STARTER_NUM_THREADS_ENV_VARS
3737
#
3838
# Any of these variables can be used to set GALAXY_SLOTS. Set it using the
39-
# variable ROOT_MAX_THREADS (designed to control the ROOT data analysis
40-
# framework from CERN).
41-
GALAXY_SLOTS="$ROOT_MAX_THREADS"
39+
# variable PYTHON_CPU_COUNT (controls the amount of CPUs that Python sees).
40+
GALAXY_SLOTS="$PYTHON_CPU_COUNT"
4241
else
4342
GALAXY_SLOTS="1"
4443
unset GALAXY_SLOTS_CONFIGURED

0 commit comments

Comments
 (0)