GPU: Allow overriding number of TPC Clusterizer lanes for CPU processing

davidrohr · sawenzel · commit 0a7fffefc8e7 · 2022-06-29T12:10:23.000+02:00
diff --git a/GPU/GPUTracking/Base/GPUReconstruction.cxx b/GPU/GPUTracking/Base/GPUReconstruction.cxx
@@ -271,9 +271,11 @@ int GPUReconstruction::InitPhaseBeforeDevice()
   if (!(mRecoStepsGPU & GPUDataTypes::RecoStep::TPCMerging)) {
     mProcessingSettings.mergerSortTracks = false;
   }
+  if (mProcessingSettings.nTPCClustererLanes == -1) {
+    mProcessingSettings.nTPCClustererLanes = IsGPU() ? 3 : 1;
+  }
   if (!IsGPU()) {
     mProcessingSettings.nDeviceHelperThreads = 0;
-    mProcessingSettings.nTPCClustererLanes = 1;
   }
 
   if (param().rec.nonConsecutiveIDs) {
diff --git a/GPU/GPUTracking/Definitions/GPUSettingsList.h b/GPU/GPUTracking/Definitions/GPUSettingsList.h
@@ -151,7 +151,7 @@ AddOption(ompKernels, unsigned char, 2, "", 0, "Parallelize with OMP inside kern
 AddOption(ompAutoNThreads, bool, true, "", 0, "Auto-adjust number of OMP threads, decreasing the number for small input data")
 AddOption(nDeviceHelperThreads, int, 1, "", 0, "Number of CPU helper threads for CPU processing")
 AddOption(nStreams, char, 8, "", 0, "Number of GPU streams / command queues")
-AddOption(nTPCClustererLanes, char, 3, "", 0, "Number of TPC clusterers that can run in parallel")
+AddOption(nTPCClustererLanes, char, -1, "", 0, "Number of TPC clusterers that can run in parallel (-1 = autoset)")
 AddOption(trackletSelectorSlices, char, -1, "", 0, "Number of slices to processes in parallel at max")
 AddOption(trackletConstructorInPipeline, char, -1, "", 0, "Run tracklet constructor in the pipeline")
 AddOption(trackletSelectorInPipeline, char, -1, "", 0, "Run tracklet selector in the pipeline")

Original file line number	Diff line number	Diff line change
`@@ -271,9 +271,11 @@ int GPUReconstruction::InitPhaseBeforeDevice()`
`271`	`271`	`if (!(mRecoStepsGPU & GPUDataTypes::RecoStep::TPCMerging)) {`
`272`	`272`	`mProcessingSettings.mergerSortTracks = false;`
`273`	`273`	`}`
	`274`	`+ if (mProcessingSettings.nTPCClustererLanes == -1) {`
	`275`	`+ mProcessingSettings.nTPCClustererLanes = IsGPU() ? 3 : 1;`
	`276`	`+ }`
`274`	`277`	`if (!IsGPU()) {`
`275`	`278`	`mProcessingSettings.nDeviceHelperThreads = 0;`
`276`		`- mProcessingSettings.nTPCClustererLanes = 1;`
`277`	`279`	`}`
`278`	`280`
`279`	`281`	`if (param().rec.nonConsecutiveIDs) {`