Skip to content

Commit 9b20db8

Browse files
mpucciompuccio
committed
Fix GPU tracker traits
1 parent f12eec7 commit 9b20db8

3 files changed

Lines changed: 30 additions & 29 deletions

File tree

‎Detectors/ITSMFT/ITS/tracking/cuda/include/ITStrackingCUDA/PrimaryVertexContextNV.h‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -38,83 +38,83 @@ class PrimaryVertexContextNV final : public PrimaryVertexContext
3838
PrimaryVertexContextNV() = default;
3939
virtual ~PrimaryVertexContextNV() = default;
4040

41-
virtual void initialise(const MemoryParameters& memParam, const std::array<std::vector<Cluster>, constants::its::LayersNumber>& cl,
41+
virtual void initialise(const MemoryParameters& memParam, const std::array<std::vector<Cluster>, constants::its2::LayersNumber>& cl,
4242
const std::array<float, 3>& pv, const int iteration);
4343

4444
GPU::DeviceStoreNV& getDeviceContext();
45-
GPU::Array<GPU::Vector<Cluster>, constants::its::LayersNumber>& getDeviceClusters();
46-
GPU::Array<GPU::Vector<Tracklet>, constants::its::TrackletsPerRoad>& getDeviceTracklets();
47-
GPU::Array<GPU::Vector<int>, constants::its::CellsPerRoad>& getDeviceTrackletsLookupTable();
48-
GPU::Array<GPU::Vector<int>, constants::its::CellsPerRoad>& getDeviceTrackletsPerClustersTable();
49-
GPU::Array<GPU::Vector<Cell>, constants::its::CellsPerRoad>& getDeviceCells();
50-
GPU::Array<GPU::Vector<int>, constants::its::CellsPerRoad - 1>& getDeviceCellsLookupTable();
51-
GPU::Array<GPU::Vector<int>, constants::its::CellsPerRoad - 1>& getDeviceCellsPerTrackletTable();
52-
std::array<GPU::Vector<int>, constants::its::CellsPerRoad>& getTempTableArray();
53-
std::array<GPU::Vector<Tracklet>, constants::its::CellsPerRoad>& getTempTrackletArray();
54-
std::array<GPU::Vector<Cell>, constants::its::CellsPerRoad - 1>& getTempCellArray();
45+
GPU::Array<GPU::Vector<Cluster>, constants::its2::LayersNumber>& getDeviceClusters();
46+
GPU::Array<GPU::Vector<Tracklet>, constants::its2::TrackletsPerRoad>& getDeviceTracklets();
47+
GPU::Array<GPU::Vector<int>, constants::its2::CellsPerRoad>& getDeviceTrackletsLookupTable();
48+
GPU::Array<GPU::Vector<int>, constants::its2::CellsPerRoad>& getDeviceTrackletsPerClustersTable();
49+
GPU::Array<GPU::Vector<Cell>, constants::its2::CellsPerRoad>& getDeviceCells();
50+
GPU::Array<GPU::Vector<int>, constants::its2::CellsPerRoad - 1>& getDeviceCellsLookupTable();
51+
GPU::Array<GPU::Vector<int>, constants::its2::CellsPerRoad - 1>& getDeviceCellsPerTrackletTable();
52+
std::array<GPU::Vector<int>, constants::its2::CellsPerRoad>& getTempTableArray();
53+
std::array<GPU::Vector<Tracklet>, constants::its2::CellsPerRoad>& getTempTrackletArray();
54+
std::array<GPU::Vector<Cell>, constants::its2::CellsPerRoad - 1>& getTempCellArray();
5555
void updateDeviceContext();
5656

5757
private:
5858
GPU::DeviceStoreNV mGPUContext;
5959
GPU::UniquePointer<GPU::DeviceStoreNV> mGPUContextDevicePointer;
60-
std::array<GPU::Vector<int>, constants::its::CellsPerRoad> mTempTableArray;
61-
std::array<GPU::Vector<Tracklet>, constants::its::CellsPerRoad> mTempTrackletArray;
62-
std::array<GPU::Vector<Cell>, constants::its::CellsPerRoad - 1> mTempCellArray;
60+
std::array<GPU::Vector<int>, constants::its2::CellsPerRoad> mTempTableArray;
61+
std::array<GPU::Vector<Tracklet>, constants::its2::CellsPerRoad> mTempTrackletArray;
62+
std::array<GPU::Vector<Cell>, constants::its2::CellsPerRoad - 1> mTempCellArray;
6363
};
6464

6565
inline GPU::DeviceStoreNV& PrimaryVertexContextNV::getDeviceContext()
6666
{
6767
return *mGPUContextDevicePointer;
6868
}
6969

70-
inline GPU::Array<GPU::Vector<Cluster>, constants::its::LayersNumber>& PrimaryVertexContextNV::getDeviceClusters()
70+
inline GPU::Array<GPU::Vector<Cluster>, constants::its2::LayersNumber>& PrimaryVertexContextNV::getDeviceClusters()
7171
{
7272
return mGPUContext.getClusters();
7373
}
7474

75-
inline GPU::Array<GPU::Vector<Tracklet>, constants::its::TrackletsPerRoad>& PrimaryVertexContextNV::getDeviceTracklets()
75+
inline GPU::Array<GPU::Vector<Tracklet>, constants::its2::TrackletsPerRoad>& PrimaryVertexContextNV::getDeviceTracklets()
7676
{
7777
return mGPUContext.getTracklets();
7878
}
7979

80-
inline GPU::Array<GPU::Vector<int>, constants::its::CellsPerRoad>& PrimaryVertexContextNV::getDeviceTrackletsLookupTable()
80+
inline GPU::Array<GPU::Vector<int>, constants::its2::CellsPerRoad>& PrimaryVertexContextNV::getDeviceTrackletsLookupTable()
8181
{
8282
return mGPUContext.getTrackletsLookupTable();
8383
}
8484

85-
inline GPU::Array<GPU::Vector<int>, constants::its::CellsPerRoad>&
85+
inline GPU::Array<GPU::Vector<int>, constants::its2::CellsPerRoad>&
8686
PrimaryVertexContextNV::getDeviceTrackletsPerClustersTable()
8787
{
8888
return mGPUContext.getTrackletsPerClusterTable();
8989
}
9090

91-
inline GPU::Array<GPU::Vector<Cell>, constants::its::CellsPerRoad>& PrimaryVertexContextNV::getDeviceCells()
91+
inline GPU::Array<GPU::Vector<Cell>, constants::its2::CellsPerRoad>& PrimaryVertexContextNV::getDeviceCells()
9292
{
9393
return mGPUContext.getCells();
9494
}
9595

96-
inline GPU::Array<GPU::Vector<int>, constants::its::CellsPerRoad - 1>& PrimaryVertexContextNV::getDeviceCellsLookupTable()
96+
inline GPU::Array<GPU::Vector<int>, constants::its2::CellsPerRoad - 1>& PrimaryVertexContextNV::getDeviceCellsLookupTable()
9797
{
9898
return mGPUContext.getCellsLookupTable();
9999
}
100100

101-
inline GPU::Array<GPU::Vector<int>, constants::its::CellsPerRoad - 1>&
101+
inline GPU::Array<GPU::Vector<int>, constants::its2::CellsPerRoad - 1>&
102102
PrimaryVertexContextNV::getDeviceCellsPerTrackletTable()
103103
{
104104
return mGPUContext.getCellsPerTrackletTable();
105105
}
106106

107-
inline std::array<GPU::Vector<int>, constants::its::CellsPerRoad>& PrimaryVertexContextNV::getTempTableArray()
107+
inline std::array<GPU::Vector<int>, constants::its2::CellsPerRoad>& PrimaryVertexContextNV::getTempTableArray()
108108
{
109109
return mTempTableArray;
110110
}
111111

112-
inline std::array<GPU::Vector<Tracklet>, constants::its::CellsPerRoad>& PrimaryVertexContextNV::getTempTrackletArray()
112+
inline std::array<GPU::Vector<Tracklet>, constants::its2::CellsPerRoad>& PrimaryVertexContextNV::getTempTrackletArray()
113113
{
114114
return mTempTrackletArray;
115115
}
116116

117-
inline std::array<GPU::Vector<Cell>, constants::its::CellsPerRoad - 1>& PrimaryVertexContextNV::getTempCellArray()
117+
inline std::array<GPU::Vector<Cell>, constants::its2::CellsPerRoad - 1>& PrimaryVertexContextNV::getTempCellArray()
118118
{
119119
return mTempCellArray;
120120
}
@@ -124,11 +124,12 @@ inline void PrimaryVertexContextNV::updateDeviceContext()
124124
mGPUContextDevicePointer = GPU::UniquePointer<GPU::DeviceStoreNV>{mGPUContext};
125125
}
126126

127-
inline void PrimaryVertexContextNV::initialise(const MemoryParameters& memParam, const std::array<std::vector<Cluster>, constants::its::LayersNumber>& cl,
127+
inline void PrimaryVertexContextNV::initialise(const MemoryParameters& memParam, const std::array<std::vector<Cluster>, constants::its2::LayersNumber>& cl,
128128
const std::array<float, 3>& pv, const int iteration)
129129
{
130-
this->PrimaryVertexContext::initialise(memParam, cl, pv, iteration);
131-
mGPUContextDevicePointer = mGPUContext.initialise(mPrimaryVertex, mClusters, mTracklets, mCells, mCellsLookupTable, mMinR, mMaxR);
130+
///TODO: to be re-enabled in the future
131+
// this->PrimaryVertexContext::initialise(memParam, cl, pv, iteration);
132+
// mGPUContextDevicePointer = mGPUContext.initialise(mPrimaryVertex, mClusters, mTracklets, mCells, mCellsLookupTable, mMinR, mMaxR);
132133
}
133134

134135
} // namespace its

‎Detectors/ITSMFT/ITS/tracking/cuda/include/ITStrackingCUDA/TrackerTraitsNV.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class TrackerTraitsNV : public TrackerTraits
3434

3535
void computeLayerCells() final;
3636
void computeLayerTracklets() final;
37-
void refitTracks(const std::array<std::vector<TrackingFrameInfo>, 7>& tf, std::vector<TrackITSExt>& tracks) final;
37+
void refitTracks(const std::array<std::vector<TrackingFrameInfo>, 7>& tf, std::vector<TrackITSExt>& tracks);
3838
};
3939

4040
extern "C" TrackerTraits* createTrackerTraitsNV();

‎Detectors/ITSMFT/ITS/tracking/cuda/src/DeviceStoreNV.cu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ __device__ void fillIndexTables(GPU::DeviceStoreNV& primaryVertexContext, const
5757

5858
if (currentClusterIndex == nextLayerClustersNum - 1) {
5959

60-
for (int iBin{currentBinIndex + 1}; iBin <= o2::its::constants::index_table::ZBins * o2::its::constants::index_table::PhiBins;
60+
for (int iBin{currentBinIndex + 1}; iBin <= o2::its::constants::its2::ZBins * o2::its::constants::its2::PhiBins;
6161
iBin++) {
6262

6363
primaryVertexContext.getIndexTables()[layerIndex][iBin] = nextLayerClustersNum;

0 commit comments

Comments
 (0)