Skip to content

Commit 3be7047

Browse files
committed
Calib workflow generation defaults: derrive default shm size from number of cores used
1 parent dbd0984 commit 3be7047

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

DATA/common/setenv.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ if [[ $EPNSYNCMODE == 0 ]]; then
8080
if [[ -z "${WORKFLOW_DETECTORS_FLP_PROCESSING+x}" ]]; then export WORKFLOW_DETECTORS_FLP_PROCESSING=""; fi # No FLP processing by default when we do not run the sync EPN workflow, e.g. full system test will also run full FLP processing
8181
else # Defaults when running on the EPN
8282
if [[ "0$GEN_TOPO_CALIB_WORKFLOW" != "01" ]]; then
83-
if [[ -z "$SHMSIZE" ]]; then export SHMSIZE=$(( 32 << 30 )); fi
83+
if [[ -z $GEN_TOPO_CALIB_NCORES ]]; then
84+
if [[ -z "$SHMSIZE" ]]; then export SHMSIZE=$(( 32 << 30 )); fi
85+
else
86+
if [[ -z "$SHMSIZE" ]]; then export SHMSIZE=$(( ($GEN_TOPO_CALIB_NCORES * 2) << 30 )); fi
87+
fi
8488
else
8589
if [[ -z "$SHMSIZE" ]]; then export SHMSIZE=$(( 112 << 30 )); fi
8690
fi

DATA/tools/parse

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ for line in f:
128128
if reco_num_nodes_override == 0:
129129
os.environ['RECO_NUM_NODES_WORKFLOW'] = wf[1]
130130
command_preopt = 'GEN_TOPO_CALIB_WORKFLOW=' + str(is_calib_workflow)
131+
if is_calib_workflow:
132+
command_preopt += ' GEN_TOPO_CALIB_NCORES=' + calibcores
131133
if os.environ['WORKFLOWMODE'] == 'dds':
132134
command_preopt += ' WORKFLOWMODE_FILE=' + filename
133135
command = command_preopt + ' GLOBALDPLOPT+=" -b --dds-workflow-suffix _' + wf[0] + str(i) + '" ' + wf[3]

0 commit comments

Comments
 (0)