Skip to content

Commit a53a212

Browse files
committed
Fix second iteration
1 parent 80d88a3 commit a53a212

File tree

5 files changed

+165
-122
lines changed

5 files changed

+165
-122
lines changed

Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/TrackingKernels.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,10 @@ void processNeighboursHandler(const int startLayer,
195195
const float MaxChi2ClusterAttachment,
196196
const o2::base::Propagator* propagator,
197197
const o2::base::PropagatorF::MatCorrType matCorrType,
198-
std::vector<int>& updatedCellIdHost, // temporary host vectors
199-
std::vector<CellSeed>& updatedCellSeedHost, // temporary host vectors
198+
const std::vector<int>& lastCellIdHost, // temporary host vector
199+
const std::vector<CellSeed>& lastCellSeedHost, // temporary host vector
200+
std::vector<int>& updatedCellIdHost, // temporary host vector
201+
std::vector<CellSeed>& updatedCellSeedHost, // temporary host vector
200202
const int nBlocks,
201203
const int nThreads);
202204

Detectors/ITSMFT/ITS/tracking/GPU/cuda/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
if(CUDA_ENABLED)
1414
find_package(CUDAToolkit)
1515
message(STATUS "Building ITS CUDA tracker")
16-
# add_compile_options(-O0 -g -lineinfo -fPIC)
16+
add_compile_options(-O0 -g -lineinfo -fPIC)
1717
# add_compile_definitions(ITS_MEASURE_GPU_TIME)
1818
o2_add_library(ITStrackingCUDA
1919
SOURCES ClusterLinesGPU.cu

Detectors/ITSMFT/ITS/tracking/GPU/cuda/TrackerTraitsGPU.cxx

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -298,19 +298,39 @@ void TrackerTraitsGPU<nLayers>::findRoads(const int iteration)
298298
mTrkParams[0].MaxChi2ClusterAttachment, // float maxChi2ClusterAttachment
299299
mTimeFrameGPU->getDevicePropagator(),
300300
mCorrType,
301+
lastCellId, // temporary host vector
302+
lastCellSeed, // temporary host vector
301303
updatedCellId, // temporary host vectors
302304
updatedCellSeed, // temporary host vectors
303305
conf.nBlocks,
304306
conf.nThreads);
305307

306-
int level = startLevel;
307-
for (int iLayer{startLayer - 1}; iLayer > 0 && level > 2; --iLayer) {
308-
lastCellSeed.swap(updatedCellSeed);
309-
lastCellId.swap(updatedCellId);
310-
std::vector<CellSeed>().swap(updatedCellSeed); /// tame the memory peaks
311-
updatedCellId.clear();
312-
processNeighbours(iLayer, --level, lastCellSeed, lastCellId, updatedCellSeed, updatedCellId);
313-
}
308+
// int level = startLevel;
309+
// for (int iLayer{startLayer - 1}; iLayer > 0 && level > 2; --iLayer) {
310+
// lastCellSeed.swap(updatedCellSeed);
311+
// lastCellId.swap(updatedCellId);
312+
// std::vector<CellSeed>().swap(updatedCellSeed); /// tame the memory peaks
313+
// updatedCellId.clear();
314+
// processNeighboursHandler<nLayers>(iLayer,
315+
// --level,
316+
// mTimeFrameGPU->getDeviceArrayCells(),
317+
// mTimeFrameGPU->getDeviceCells()[iLayer],
318+
// mTimeFrameGPU->getNCells()[iLayer],
319+
// mTimeFrameGPU->getDeviceArrayUsedClusters(),
320+
// mTimeFrameGPU->getDeviceNeighbours(iLayer - 1),
321+
// mTimeFrameGPU->getDeviceNeighboursLUTs(),
322+
// mTimeFrameGPU->getDeviceArrayTrackingFrameInfo(),
323+
// mBz,
324+
// mTrkParams[0].MaxChi2ClusterAttachment, // float maxChi2ClusterAttachment
325+
// mTimeFrameGPU->getDevicePropagator(),
326+
// mCorrType,
327+
// lastCellId, // temporary host vector
328+
// lastCellSeed, // temporary host vector
329+
// updatedCellId, // temporary host vectors
330+
// updatedCellSeed, // temporary host vectors
331+
// conf.nBlocks,
332+
// conf.nThreads);
333+
// }
314334
for (auto& seed : updatedCellSeed) {
315335
if (seed.getQ2Pt() > 1.e3 || seed.getChi2() > mTrkParams[0].MaxChi2NDF * ((startLevel + 2) * 2 - 5)) {
316336
continue;

0 commit comments

Comments
 (0)