Skip to content

Commit e3523a9

Browse files
davidrohrdavidrohr
committed
GPU Workflow: Rename the tpc-tracker process into gpu-reconstruction
1 parent b2c192d commit e3523a9

6 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎Detectors/TPC/workflow/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The workflow consists of the following DPL processors:
1818
* `tpc-digit-reader` -> using tool [o2::framework::RootTreeReader](../../../Framework/Utils/include/Utils/RootTreeReader.h)
1919
* `tpc-clusterer` -> interfaces [o2::tpc::HwClusterer](../reconstruction/include/TPCReconstruction/HwClusterer.h)
2020
* `tpc-cluster-decoder` -> interfaces [o2::tpc::HardwareClusterDecoder](../reconstruction/include/TPCReconstruction/HardwareClusterDecoder.h)
21-
* `tpc-tracker` -> interfaces [o2::tpc::GPUCATracking](../reconstruction/include/TPCReconstruction/GPUCATracking.h)
21+
* `gpu-reconstruction` -> interfaces [o2::tpc::GPUCATracking](../reconstruction/include/TPCReconstruction/GPUCATracking.h)
2222
* `tpc-track-writer` -> implements simple writing to ROOT file
2323

2424
Depending on the input and output types the default workflow is extended by the following readers and writers:

‎Detectors/TPC/workflow/src/tpc-reco-workflow.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void customize(std::vector<o2::framework::CompletionPolicy>& policies)
9494
policies.push_back(CompletionPolicyHelpers::defineByName("tpc-cluster-decoder.*", CompletionPolicy::CompletionOp::Consume));
9595
policies.push_back(CompletionPolicyHelpers::defineByName("tpc-clusterer.*", CompletionPolicy::CompletionOp::Consume));
9696
// the custom completion policy for the tracker
97-
policies.push_back(o2::tpc::TPCSectorCompletionPolicy("tpc-tracker.*", o2::tpc::TPCSectorCompletionPolicy::Config::RequireAll, &gPolicyData, &gTpcSectorMask)());
97+
policies.push_back(o2::tpc::TPCSectorCompletionPolicy("gpu-reconstruction.*", o2::tpc::TPCSectorCompletionPolicy::Config::RequireAll, &gPolicyData, &gTpcSectorMask)());
9898
}
9999

100100
#include "Framework/runDataProcessing.h" // the main driver

‎GPU/Workflow/src/GPUWorkflowSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ DataProcessorSpec getGPURecoWorkflowSpec(GPUWorkflow::CompletionPolicyData* poli
791791
return std::move(outputSpecs);
792792
};
793793

794-
return DataProcessorSpec{"tpc-tracker", // process id
794+
return DataProcessorSpec{"gpu-reconstruction", // process id
795795
{createInputSpecs()},
796796
{createOutputSpecs()},
797797
AlgorithmSpec(initFunction)};

‎prodtests/full-system-test/dpl-workflow.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ fi
108108

109109
# Common workflows
110110
WORKFLOW+="o2-its-reco-workflow $ARGS_ALL --trackerCA $DISABLE_MC --clusters-from-upstream --disable-root-output $ITS_CONFIG --configKeyValues \"HBFUtils.nHBFPerTF=${NHBPERTF};$ITS_CONFIG_KEY\" | "
111-
WORKFLOW+="o2-tpc-reco-workflow ${ARGS_ALL/--severity $SEVERITY/--severity $SEVERITY_TPC} --input-type=$TPC_INPUT $DISABLE_MC --output-type $TPC_OUTPUT --pipeline tpc-tracker:$NGPUS,tpc-entropy-encoder:$N_TPCENT $TPC_CONFIG --configKeyValues \"HBFUtils.nHBFPerTF=$NHBPERTF;GPU_global.deviceType=$GPUTYPE;GPU_proc.debugLevel=0;$TPC_CONFIG_KEY;$TPC_EXTRA_CONFIG\" | "
111+
WORKFLOW+="o2-tpc-reco-workflow ${ARGS_ALL/--severity $SEVERITY/--severity $SEVERITY_TPC} --input-type=$TPC_INPUT $DISABLE_MC --output-type $TPC_OUTPUT --pipeline gpu-reconstruction:$NGPUS,tpc-entropy-encoder:$N_TPCENT $TPC_CONFIG --configKeyValues \"HBFUtils.nHBFPerTF=$NHBPERTF;GPU_global.deviceType=$GPUTYPE;GPU_proc.debugLevel=0;$TPC_CONFIG_KEY;$TPC_EXTRA_CONFIG\" | "
112112
WORKFLOW+="o2-tpcits-match-workflow $ARGS_ALL --disable-root-input --disable-root-output $DISABLE_MC --pipeline itstpc-track-matcher:$N_TPCITS --configKeyValues \"HBFUtils.nHBFPerTF=${NHBPERTF};\" | "
113113
WORKFLOW+="o2-ft0-reco-workflow $ARGS_ALL --disable-root-input --disable-root-output $DISABLE_MC --configKeyValues \"HBFUtils.nHBFPerTF=${NHBPERTF};\" | "
114114
WORKFLOW+="o2-tof-reco-workflow $ARGS_ALL --configKeyValues \"HBFUtils.nHBFPerTF=$NHBPERTF\" --input-type $TOF_INPUT --output-type $TOF_OUTPUT --disable-root-input --disable-root-output $DISABLE_MC | "

‎prodtests/full_system_test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ for STAGE in $STAGES; do
168168
echo "walltime_${STAGE},${TAG} value=${walltime}" >> ${METRICFILE}
169169

170170
# GPU reconstruction (also in CPU version) processing time
171-
gpurecotime=`grep "tpc-tracker" reco_NOGPU.log | grep -e "Total Wall Time:" | awk '//{printf "%f", $6/1000000}'`
171+
gpurecotime=`grep "gpu-reconstruction" reco_NOGPU.log | grep -e "Total Wall Time:" | awk '//{printf "%f", $6/1000000}'`
172172
echo "gpurecotime_${STAGE},${TAG} value=${gpurecotime}" >> ${METRICFILE}
173173

174174
# memory
@@ -178,7 +178,7 @@ for STAGE in $STAGES; do
178178
echo "avgmem_${STAGE},${TAG} value=${avgmem}" >> ${METRICFILE}
179179

180180
# some physics quantities
181-
tpctracks=`grep "tpc-tracker" ${logfile} | grep -e "found.*track" | awk '//{print $4}'`
181+
tpctracks=`grep "gpu-reconstruction" ${logfile} | grep -e "found.*track" | awk '//{print $4}'`
182182
echo "tpctracks_${STAGE},${TAG} value=${tpctracks}" >> ${METRICFILE}
183183
tpcclusters=`grep -e "Event has.*TPC Clusters" ${logfile} | awk '//{print $5}'`
184184
echo "tpcclusters_${STAGE},${TAG} value=${tpcclusters}" >> ${METRICFILE}

‎prodtests/full_system_test_pipeline.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ for STAGE in $STAGES; do
8888
echo "walltime_${STAGE},${TAG} value=${walltime}" >> ${METRICFILE}
8989

9090
# GPU reconstruction (also in CPU version) processing time
91-
gpurecotime=`grep "tpc-tracker" reco_NOGPU.log | grep -e "Total Wall Time:" | awk '//{printf "%f", $6/1000000}'`
91+
gpurecotime=`grep "gpu-reconstruction" reco_NOGPU.log | grep -e "Total Wall Time:" | awk '//{printf "%f", $6/1000000}'`
9292
echo "gpurecotime_${STAGE},${TAG} value=${gpurecotime}" >> ${METRICFILE}
9393

9494
# memory
@@ -98,7 +98,7 @@ for STAGE in $STAGES; do
9898
echo "avgmem_${STAGE},${TAG} value=${avgmem}" >> ${METRICFILE}
9999

100100
# some physics quantities
101-
tpctracks=`grep "tpc-tracker" ${logfile} | grep -e "found.*track" | awk '//{print $4}'`
101+
tpctracks=`grep "gpu-reconstruction" ${logfile} | grep -e "found.*track" | awk '//{print $4}'`
102102
echo "tpctracks_${STAGE},${TAG} value=${tpctracks}" >> ${METRICFILE}
103103
tpcclusters=`grep -e "Event has.*TPC Clusters" ${logfile} | awk '//{print $5}'`
104104
echo "tpcclusters_${STAGE},${TAG} value=${tpcclusters}" >> ${METRICFILE}

0 commit comments

Comments
 (0)