Skip to content

Commit 0e5c23b

Browse files
OliverRietmannOliverRietmann
committed
cleanup
1 parent b557930 commit 0e5c23b

8 files changed

Lines changed: 13 additions & 25 deletions

File tree

‎GPU/GPUTracking/DataCompression/GPUTPCCompressionTrackModel.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#elif defined(GPUCA_COMPRESSION_TRACK_MODEL_SECTORTRACKER)
2929
#include "GPUTPCTrackParam.h"
30+
#include "MemLayout.h"
3031

3132
#else // Default internal track model for compression
3233
#endif
@@ -121,7 +122,7 @@ class GPUTPCCompressionTrackModel
121122
const GPUParam* mParam;
122123

123124
#elif defined(GPUCA_COMPRESSION_TRACK_MODEL_SECTORTRACKER)
124-
GPUTPCTrackParam mTrk;
125+
GPUTPCTrackParamSkeleton<MemLayout::value> mTrk;
125126
float mAlpha;
126127
const GPUParam* mParam;
127128

‎GPU/GPUTracking/Global/GPUChainTracking.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@ class GPUChainTracking : public GPUChain
111111
std::unique_ptr<AliHLTTPCRawCluster[]> rawClusters[NSECTORS];
112112
std::unique_ptr<o2::tpc::ClusterNative[]> clustersNative;
113113
std::unique_ptr<o2::tpc::ClusterNativeAccess> clusterNativeAccess;
114-
115114
MemLayout::interface<GPUTPCTrackSkeleton, unique_ptr_array, MemLayout::Flag::aos>::type sectorTracks[NSECTORS];
116-
117115
std::unique_ptr<GPUTPCHitId[]> sectorClusters[NSECTORS];
118116
std::unique_ptr<AliHLTTPCClusterMCLabel[]> mcLabelsTPC;
119117
std::unique_ptr<GPUTPCMCInfo[]> mcInfosTPC;

‎GPU/GPUTracking/Merger/GPUTPCGMMerger.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ class GPUTPCGMMerger : public GPUProcessor
7474
GPUAtomic(uint32_t) nMergedTrackClusters;
7575
GPUAtomic(uint32_t) nO2Tracks;
7676
GPUAtomic(uint32_t) nO2ClusRefs;
77-
MemLayout::interface<GPUTPCTrackSkeleton, MemLayout::const_pointer, MemLayout::Flag::aos>::type firstExtrapolatedTracks[NSECTORS];
7877
GPUAtomic(uint32_t) tmpCounter[2 * NSECTORS];
7978
GPUAtomic(uint32_t) nLooperMatchCandidates;
8079
};

‎GPU/GPUTracking/SectorTracker/GPUTPCBaseTrackParam.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,6 @@ constexpr void swap(GPUTPCBaseTrackParamSkeleton<MemLayout::reference> a, GPUTPC
116116
swap(a.mP, b.mP);
117117
}
118118

119-
using GPUTPCBaseTrackParam = MemLayout::wrapper<GPUTPCBaseTrackParamSkeleton, MemLayout::value>;
120-
121119
} // namespace o2::gpu
122120

123121
#endif

‎GPU/GPUTracking/SectorTracker/GPUTPCTrack.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ constexpr void swap(GPUTPCTrackSkeleton<MemLayout::reference> a, GPUTPCTrackSkel
6666
swap(a.mParam, b.mParam);
6767
}
6868

69-
using GPUTPCTrack = MemLayout::wrapper<GPUTPCTrackSkeleton, MemLayout::value>;
70-
7169
} // namespace o2::gpu
7270

7371
namespace std {

‎GPU/GPUTracking/SectorTracker/GPUTPCTracker.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ void GPUTPCTracker::RegisterMemoryAllocation()
108108
mMemoryResOutput = mRec->RegisterMemoryAllocation(this, &GPUTPCTracker::SetPointersOutput, type, "TPCTrackerTracks");
109109
}
110110

111-
GPUhd() void GPUTPCTracker::SetPointersTrackletsHelper(void* & mem, GPUTPCTracker::TrackletArrayType<MemLayout::Flag::aos>& tracklets) {
111+
GPUhd() void GPUTPCTracker::SetPointersTrackletsHelper(void* & mem, MemLayout::interface<GPUTPCTrackletSkeleton, MemLayout::pointer, MemLayout::Flag::aos>::type& tracklets) {
112112
computePointerWithAlignment(mem, tracklets, mNMaxTracklets);
113113
}
114114

115-
GPUhd() void GPUTPCTracker::SetPointersTrackletsHelper(void* & mem, GPUTPCTracker::TrackletArrayType<MemLayout::Flag::soa>& tracklets) {
115+
GPUhd() void GPUTPCTracker::SetPointersTrackletsHelper(void* & mem, MemLayout::interface<GPUTPCTrackletSkeleton, MemLayout::pointer, MemLayout::Flag::soa>::type& tracklets) {
116116
computePointerWithAlignment(mem, tracklets.mFirstRow, mNMaxTracklets);
117117
computePointerWithAlignment(mem, tracklets.mLastRow, mNMaxTracklets);
118118

@@ -132,11 +132,11 @@ GPUhd() void* GPUTPCTracker::SetPointersTracklets(void* mem)
132132
return mem;
133133
}
134134

135-
GPUhd() void GPUTPCTracker::SetPointersTracksHelper(void* & mem, GPUTPCTracker::TrackArrayType<MemLayout::Flag::aos>& tracks) {
135+
GPUhd() void GPUTPCTracker::SetPointersTracksHelper(void* & mem, MemLayout::interface<GPUTPCTrackSkeleton, MemLayout::pointer, MemLayout::Flag::aos>::type& tracks) {
136136
computePointerWithAlignment(mem, tracks, mNMaxTracks);
137137
}
138138

139-
GPUhd() void GPUTPCTracker::SetPointersTracksHelper(void* & mem, GPUTPCTracker::TrackArrayType<MemLayout::Flag::soa>& tracks) {
139+
GPUhd() void GPUTPCTracker::SetPointersTracksHelper(void* & mem, MemLayout::interface<GPUTPCTrackSkeleton, MemLayout::pointer, MemLayout::Flag::soa>::type& tracks) {
140140
computePointerWithAlignment(mem, tracks.mFirstHitID, mNMaxTracks);
141141
computePointerWithAlignment(mem, tracks.mNHits, mNMaxTracks);
142142
computePointerWithAlignment(mem, tracks.mLocalTrackId, mNMaxTracks);

‎GPU/GPUTracking/SectorTracker/GPUTPCTracker.h‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@ class GPUTPCTracker : public GPUProcessor
6262
void DumpTrackletHits(std::ostream& out); // Same for Track Hits
6363
#endif
6464

65-
template <MemLayout::Flag layout>
66-
using TrackletArrayType = MemLayout::interface<GPUTPCTrackletSkeleton, MemLayout::pointer, layout>::type;
67-
68-
template <MemLayout::Flag layout>
69-
using TrackArrayType = MemLayout::interface<GPUTPCTrackSkeleton, MemLayout::pointer, layout>::type;
70-
7165
struct commonMemoryStruct {
7266
GPUAtomic(uint32_t) nStartHits = 0; // number of start hits
7367
GPUAtomic(uint32_t) nTracklets = 0; // number of tracklets
@@ -113,11 +107,11 @@ class GPUTPCTracker : public GPUProcessor
113107
void* SetPointersScratch(void* mem);
114108
void* SetPointersScratchHost(void* mem);
115109
void* SetPointersCommon(void* mem);
116-
void SetPointersTrackletsHelper(void* & mem, TrackletArrayType<MemLayout::Flag::aos>& tracklets);
117-
void SetPointersTrackletsHelper(void* & mem, TrackletArrayType<MemLayout::Flag::soa>& tracklets);
110+
void SetPointersTrackletsHelper(void* & mem, MemLayout::interface<GPUTPCTrackletSkeleton, MemLayout::pointer, MemLayout::Flag::aos>::type& tracklets);
111+
void SetPointersTrackletsHelper(void* & mem, MemLayout::interface<GPUTPCTrackletSkeleton, MemLayout::pointer, MemLayout::Flag::soa>::type& tracklets);
118112
void* SetPointersTracklets(void* mem);
119-
void SetPointersTracksHelper(void* & mem, TrackArrayType<MemLayout::Flag::aos>& tracks);
120-
void SetPointersTracksHelper(void* & mem, TrackArrayType<MemLayout::Flag::soa>& tracks);
113+
void SetPointersTracksHelper(void* & mem, MemLayout::interface<GPUTPCTrackSkeleton, MemLayout::pointer, MemLayout::Flag::aos>::type& tracks);
114+
void SetPointersTracksHelper(void* & mem, MemLayout::interface<GPUTPCTrackSkeleton, MemLayout::pointer, MemLayout::Flag::soa>::type& tracks);
121115
void* SetPointersTracks(void* mem);
122116
void* SetPointersOutput(void* mem);
123117
void RegisterMemoryAllocation();
@@ -253,9 +247,9 @@ class GPUTPCTracker : public GPUProcessor
253247
// event
254248
GPUglobalref() commonMemoryStruct* mCommonMem = nullptr; // common event memory
255249
GPUglobalref() GPUTPCHitId* mTrackletStartHits = nullptr; // start hits for the tracklets
256-
GPUglobalref() TrackletArrayType<MemLayout::Flag::aos> mTracklets; // tracklets
250+
GPUglobalref() MemLayout::interface<GPUTPCTrackletSkeleton, MemLayout::pointer, MemLayout::Flag::aos>::type mTracklets; // tracklets
257251
GPUglobalref() calink* mTrackletRowHits = nullptr; // Hits for each Tracklet in each row
258-
GPUglobalref() TrackArrayType<MemLayout::Flag::aos> mTracks; // reconstructed tracks
252+
GPUglobalref() MemLayout::interface<GPUTPCTrackSkeleton, MemLayout::pointer, MemLayout::Flag::aos>::type mTracks; // reconstructed tracks
259253
GPUglobalref() GPUTPCHitId* mTrackHits = nullptr; // array of track hit numbers
260254

261255
static int32_t StarthitSortComparison(const void* a, const void* b);

‎GPU/GPUTracking/display/render/GPUDisplayDraw.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ GPUDisplay::vboList GPUDisplay::DrawTracks(const GPUTPCTracker& tracker, int32_t
287287
}
288288
size_t startCount = mVertexBufferStart[iSector].size();
289289
for (uint32_t i = (global ? tracker.CommonMemory()->nLocalTracks : 0); i < (global ? *tracker.NTracks() : tracker.CommonMemory()->nLocalTracks); i++) {
290-
GPUTPCTrack& track = tracker.Tracks()[i];
290+
GPUTPCTrackSkeleton<MemLayout::reference> track = tracker.Tracks()[i];
291291
size_t startCountInner = mVertexBuffer[iSector].size();
292292
for (int32_t j = 0; j < track.NHits(); j++) {
293293
const GPUTPCHitId& hit = tracker.TrackHits()[track.FirstHitID() + j];

0 commit comments

Comments
 (0)