Skip to content

Commit 1e2087c

Browse files
committed
Fix CUDA compilation
1 parent 759c093 commit 1e2087c

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class TrackerTraitsGPU : public TrackerTraits
4141

4242
// Methods to get CPU execution from traits
4343
void initialiseTimeFrameHybrid(const int iteration) override { initialiseTimeFrame(iteration); };
44-
void computeTrackletsHybrid(const int iteration) override;
44+
void computeTrackletsHybrid(const int iteration, int, int) override;
4545
void computeCellsHybrid(const int iteration) override;
4646
void findCellsNeighboursHybrid(const int iteration) override;
4747
void findRoadsHybrid(const int iteration) override;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,9 +1162,9 @@ int TrackerTraitsGPU<nLayers>::getTFNumberOfCells() const
11621162
////////////////////////////////////////////////////////////////////////////////
11631163
// Hybrid tracking
11641164
template <int nLayers>
1165-
void TrackerTraitsGPU<nLayers>::computeTrackletsHybrid(const int iteration)
1165+
void TrackerTraitsGPU<nLayers>::computeTrackletsHybrid(const int iteration, int, int)
11661166
{
1167-
TrackerTraits::computeLayerTracklets(iteration);
1167+
TrackerTraits::computeLayerTracklets(iteration, iteration, iteration);
11681168
mTimeFrameGPU->loadTrackletsDevice();
11691169
}
11701170

Detectors/ITSMFT/ITS/tracking/include/ITStracking/TrackerTraits.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class TrackerTraits
5757
virtual void findCellsNeighbours(const int iteration);
5858
virtual void findRoads(const int iteration);
5959
virtual void initialiseTimeFrameHybrid(const int iteration) { LOGP(error, "initialiseTimeFrameHybrid: this method should never be called with CPU traits"); }
60-
virtual void computeTrackletsHybrid(const int iteration) { LOGP(error, "computeTrackletsHybrid: this method should never be called with CPU traits"); }
60+
virtual void computeTrackletsHybrid(const int iteration, int, int) { LOGP(error, "computeTrackletsHybrid: this method should never be called with CPU traits"); }
6161
virtual void computeCellsHybrid(const int iteration) { LOGP(error, "computeCellsHybrid: this method should never be called with CPU traits"); }
6262
virtual void findCellsNeighboursHybrid(const int iteration) { LOGP(error, "findCellsNeighboursHybrid: this method should never be called with CPU traits"); }
6363
virtual void findRoadsHybrid(const int iteration) { LOGP(error, "findRoadsHybrid: this method should never be called with CPU traits"); }

Detectors/ITSMFT/ITS/tracking/src/Tracker.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ void Tracker::initialiseTimeFrameHybrid(int& iteration)
195195

196196
void Tracker::computeTrackletsHybrid(int& iteration, int&, int&)
197197
{
198-
mTraits->computeTrackletsHybrid(iteration);
198+
mTraits->computeTrackletsHybrid(iteration, iteration, iteration); // placeholder for the proper ROF/vertex slicing
199199
}
200200

201201
void Tracker::computeCellsHybrid(int& iteration)

0 commit comments

Comments
 (0)