Skip to content

Commit bf6cb62

Browse files
committed
TPC laser: make GPUTYPE configurable via WORKFLOW_PARAMETERS
1 parent 355a532 commit bf6cb62

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

DATA/production/calib/tpc-laser-filter.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ FILEWORKDIR2="/home/epn/odc/files/"
1313
#ARGS_ALL_CONFIG+="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR2;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR;keyval.input_dir=$FILEWORKDIR;keyval.output_dir=/dev/null"
1414
#ARGS_ALL_CONFIG+="NameConf.mDirGRP=$FILEWORKDIR;NameConf.mDirGeom=$FILEWORKDIR2;NameConf.mDirCollContext=$FILEWORKDIR;NameConf.mDirMatLUT=$FILEWORKDIR"
1515

16+
GPUTYPE=${GPUTYPE:-CPU}
17+
HOSTMEMSIZE=0
18+
if workflow_has_parameter GPU; then
19+
GPUTYPE=HIP
20+
GPUMEMSIZE=$(( 24 << 30 ))
21+
HOSTMEMSIZE=$(( 5 << 30 ))
22+
fi
23+
1624
if [ ${NUMAGPUIDS} != 0 ]; then
1725
ARGS_ALL+=" --child-driver 'numactl --membind $NUMAID --cpunodebind $NUMAID'"
1826
fi

DATA/production/calib/tpc-laser.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ FILEWORKDIR="/home/wiechula/processData/inputFilesTracking/triggeredLaser"
1010

1111
FILEWORKDIR2="/home/epn/odc/files/"
1212

13+
GPUTYPE=${GPUTYPE:-CPU}
14+
HOSTMEMSIZE=0
15+
if workflow_has_parameter GPU; then
16+
GPUTYPE=HIP
17+
GPUMEMSIZE=$(( 24 << 30 ))
18+
HOSTMEMSIZE=$(( 5 << 30 ))
19+
fi
20+
1321
if [ $NUMAGPUIDS != 0 ]; then
1422
ARGS_ALL+=" --child-driver 'numactl --membind $NUMAID --cpunodebind $NUMAID'"
1523
fi

DATA/production/standalone-calibration.desc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ TPC-pulser-long: "O2PDPSuite" reco,1,1," production/calib/tpc-pulser-long.sh"
3838

3939
TPC-pedestal: "O2PDPSuite" reco,1,1," production/calib/tpc-pedestal.sh"
4040

41-
TPC-laser: "O2PDPSuite" reco,1,1,"SHMSIZE=$((128 << 30)) GPUTYPE=HIP GPUMEMSIZE=$(( 24 << 30 )) HOSTMEMSIZE=$(( 5 << 30 )) production/calib/tpc-laser.sh"
41+
TPC-laser: "O2PDPSuite" reco,1,1,"SHMSIZE=$((128 << 30)) production/calib/tpc-laser.sh"
4242

43-
TPC-laser-multi: "O2PDPSuite" reco,10,10,"SHMSIZE=$((128 << 30)) GPUTYPE=HIP GPUMEMSIZE=$(( 24 << 30 )) HOSTMEMSIZE=$(( 5 << 30 )) production/calib/tpc-laser-filter.sh" calib,1,"production/calib/tpc-laser-aggregator.sh"
43+
TPC-laser-multi: "O2PDPSuite" reco,10,10,"SHMSIZE=$((128 << 30)) production/calib/tpc-laser-filter.sh" calib,1,"production/calib/tpc-laser-aggregator.sh"
4444

4545
MFT-noise-calibration: "O2PDPSuite" reco,20,20,"production/calib/mft-noise-processing.sh" calib,20,"production/calib/mft-noise-aggregator.sh"
4646

0 commit comments

Comments
 (0)