From 8d2366bea51a0c8778c1256c0d6a9f27ac2edd94 Mon Sep 17 00:00:00 2001 From: Manos Vourliotis Date: Fri, 16 Aug 2024 09:15:04 -0700 Subject: [PATCH 1/4] Remove pass by const reference when std::move-ing --- RecoTracker/LST/interface/LSTOutput.h | 17 +++--- .../LST/interface/LSTPhase2OTHitsInput.h | 17 ++---- RecoTracker/LST/interface/LSTPixelSeedInput.h | 61 +++++++++---------- 3 files changed, 44 insertions(+), 51 deletions(-) diff --git a/RecoTracker/LST/interface/LSTOutput.h b/RecoTracker/LST/interface/LSTOutput.h index a337f107e35ba..1a2b91fd0f375 100644 --- a/RecoTracker/LST/interface/LSTOutput.h +++ b/RecoTracker/LST/interface/LSTOutput.h @@ -7,15 +7,14 @@ class LSTOutput { public: LSTOutput() = default; - LSTOutput(std::vector> const& hitIdx, - std::vector const& len, - std::vector const& seedIdx, - std::vector const& trackCandidateType) { - hitIdx_ = std::move(hitIdx); - len_ = std::move(len); - seedIdx_ = std::move(seedIdx); - trackCandidateType_ = std::move(trackCandidateType); - } + LSTOutput(std::vector> const hitIdx, + std::vector const len, + std::vector const seedIdx, + std::vector const trackCandidateType) + : hitIdx_(std::move(hitIdx)), + len_(std::move(len)), + seedIdx_(std::move(seedIdx)), + trackCandidateType_(std::move(trackCandidateType)) {} ~LSTOutput() = default; diff --git a/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h b/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h index 40b265db3edb7..0bb8e9f2ba05b 100644 --- a/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h +++ b/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h @@ -9,17 +9,12 @@ class LSTPhase2OTHitsInput { public: LSTPhase2OTHitsInput() = default; - LSTPhase2OTHitsInput(std::vector const& detId, - std::vector const& x, - std::vector const& y, - std::vector const& z, - std::vector const& hits) { - detId_ = std::move(detId); - x_ = std::move(x); - y_ = std::move(y); - z_ = std::move(z); - hits_ = std::move(hits); - } + LSTPhase2OTHitsInput(std::vector const detId, + std::vector const x, + std::vector const y, + std::vector const z, + std::vector const hits) + : detId_(std::move(detId)), x_(std::move(x)), y_(std::move(y)), z_(std::move(z)), hits_(std::move(hits)) {} ~LSTPhase2OTHitsInput() = default; diff --git a/RecoTracker/LST/interface/LSTPixelSeedInput.h b/RecoTracker/LST/interface/LSTPixelSeedInput.h index 2fb6a244a5648..efbc41d26a913 100644 --- a/RecoTracker/LST/interface/LSTPixelSeedInput.h +++ b/RecoTracker/LST/interface/LSTPixelSeedInput.h @@ -7,37 +7,36 @@ class LSTPixelSeedInput { public: LSTPixelSeedInput() = default; - LSTPixelSeedInput(std::vector const& px, - std::vector const& py, - std::vector const& pz, - std::vector const& dxy, - std::vector const& dz, - std::vector const& ptErr, - std::vector const& etaErr, - std::vector const& stateTrajGlbX, - std::vector const& stateTrajGlbY, - std::vector const& stateTrajGlbZ, - std::vector const& stateTrajGlbPx, - std::vector const& stateTrajGlbPy, - std::vector const& stateTrajGlbPz, - std::vector const& q, - std::vector> const& hitIdx) { - px_ = std::move(px); - py_ = std::move(py); - pz_ = std::move(pz); - dxy_ = std::move(dxy); - dz_ = std::move(dz); - ptErr_ = std::move(ptErr); - etaErr_ = std::move(etaErr); - stateTrajGlbX_ = std::move(stateTrajGlbX); - stateTrajGlbY_ = std::move(stateTrajGlbY); - stateTrajGlbZ_ = std::move(stateTrajGlbZ); - stateTrajGlbPx_ = std::move(stateTrajGlbPx); - stateTrajGlbPy_ = std::move(stateTrajGlbPy); - stateTrajGlbPz_ = std::move(stateTrajGlbPz); - q_ = std::move(q); - hitIdx_ = std::move(hitIdx); - } + LSTPixelSeedInput(std::vector const px, + std::vector const py, + std::vector const pz, + std::vector const dxy, + std::vector const dz, + std::vector const ptErr, + std::vector const etaErr, + std::vector const stateTrajGlbX, + std::vector const stateTrajGlbY, + std::vector const stateTrajGlbZ, + std::vector const stateTrajGlbPx, + std::vector const stateTrajGlbPy, + std::vector const stateTrajGlbPz, + std::vector const q, + std::vector> const hitIdx) + : px_(std::move(px)), + py_(std::move(py)), + pz_(std::move(pz)), + dxy_(std::move(dxy)), + dz_(std::move(dz)), + ptErr_(std::move(ptErr)), + etaErr_(std::move(etaErr)), + stateTrajGlbX_(std::move(stateTrajGlbX)), + stateTrajGlbY_(std::move(stateTrajGlbY)), + stateTrajGlbZ_(std::move(stateTrajGlbZ)), + stateTrajGlbPx_(std::move(stateTrajGlbPx)), + stateTrajGlbPy_(std::move(stateTrajGlbPy)), + stateTrajGlbPz_(std::move(stateTrajGlbPz)), + q_(std::move(q)), + hitIdx_(std::move(hitIdx)) {} ~LSTPixelSeedInput() = default; From d5e443a15b4f267fbf18084abbc0fc044a2e79b1 Mon Sep 17 00:00:00 2001 From: Manos Vourliotis Date: Fri, 16 Aug 2024 09:33:38 -0700 Subject: [PATCH 2/4] Remove user-defined destructors --- RecoTracker/LST/interface/LSTOutput.h | 2 -- RecoTracker/LST/interface/LSTPhase2OTHitsInput.h | 2 -- RecoTracker/LST/interface/LSTPixelSeedInput.h | 2 -- RecoTracker/LSTCore/interface/EndcapGeometry.h | 1 - RecoTracker/LSTCore/interface/ModuleConnectionMap.h | 1 - RecoTracker/LSTCore/interface/TiltedGeometry.h | 1 - RecoTracker/LSTCore/src/ModuleConnectionMap.cc | 2 -- 7 files changed, 11 deletions(-) diff --git a/RecoTracker/LST/interface/LSTOutput.h b/RecoTracker/LST/interface/LSTOutput.h index 1a2b91fd0f375..5be4f645d3416 100644 --- a/RecoTracker/LST/interface/LSTOutput.h +++ b/RecoTracker/LST/interface/LSTOutput.h @@ -16,8 +16,6 @@ class LSTOutput { seedIdx_(std::move(seedIdx)), trackCandidateType_(std::move(trackCandidateType)) {} - ~LSTOutput() = default; - enum LSTTCType { T5 = 4, pT3 = 5, pT5 = 7, pLS = 8 }; // Hit indices of each of the LST track candidates. diff --git a/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h b/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h index 0bb8e9f2ba05b..00fd77846c4c3 100644 --- a/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h +++ b/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h @@ -16,8 +16,6 @@ class LSTPhase2OTHitsInput { std::vector const hits) : detId_(std::move(detId)), x_(std::move(x)), y_(std::move(y)), z_(std::move(z)), hits_(std::move(hits)) {} - ~LSTPhase2OTHitsInput() = default; - std::vector const& detId() const { return detId_; } std::vector const& x() const { return x_; } std::vector const& y() const { return y_; } diff --git a/RecoTracker/LST/interface/LSTPixelSeedInput.h b/RecoTracker/LST/interface/LSTPixelSeedInput.h index efbc41d26a913..18d3768b2e0fc 100644 --- a/RecoTracker/LST/interface/LSTPixelSeedInput.h +++ b/RecoTracker/LST/interface/LSTPixelSeedInput.h @@ -38,8 +38,6 @@ class LSTPixelSeedInput { q_(std::move(q)), hitIdx_(std::move(hitIdx)) {} - ~LSTPixelSeedInput() = default; - std::vector const& px() const { return px_; } std::vector const& py() const { return py_; } std::vector const& pz() const { return pz_; } diff --git a/RecoTracker/LSTCore/interface/EndcapGeometry.h b/RecoTracker/LSTCore/interface/EndcapGeometry.h index 555955d83941c..1a84d89abf90d 100644 --- a/RecoTracker/LSTCore/interface/EndcapGeometry.h +++ b/RecoTracker/LSTCore/interface/EndcapGeometry.h @@ -23,7 +23,6 @@ namespace lst { EndcapGeometry() = default; EndcapGeometry(std::string const& filename); - ~EndcapGeometry() = default; void load(std::string const&); void fillGeoMapArraysExplicit(); diff --git a/RecoTracker/LSTCore/interface/ModuleConnectionMap.h b/RecoTracker/LSTCore/interface/ModuleConnectionMap.h index b3a931345b3a5..1d4445d3b423e 100644 --- a/RecoTracker/LSTCore/interface/ModuleConnectionMap.h +++ b/RecoTracker/LSTCore/interface/ModuleConnectionMap.h @@ -16,7 +16,6 @@ namespace lst { public: ModuleConnectionMap(); ModuleConnectionMap(std::string const& filename); - ~ModuleConnectionMap(); void load(std::string const&); void add(std::string const&); diff --git a/RecoTracker/LSTCore/interface/TiltedGeometry.h b/RecoTracker/LSTCore/interface/TiltedGeometry.h index b70a1d95a357b..420000dd38aa0 100644 --- a/RecoTracker/LSTCore/interface/TiltedGeometry.h +++ b/RecoTracker/LSTCore/interface/TiltedGeometry.h @@ -18,7 +18,6 @@ namespace lst { public: TiltedGeometry() = default; TiltedGeometry(std::string const& filename); - ~TiltedGeometry() = default; void load(std::string const&); diff --git a/RecoTracker/LSTCore/src/ModuleConnectionMap.cc b/RecoTracker/LSTCore/src/ModuleConnectionMap.cc index fe0826bbd80e6..d1b68b7f485bb 100644 --- a/RecoTracker/LSTCore/src/ModuleConnectionMap.cc +++ b/RecoTracker/LSTCore/src/ModuleConnectionMap.cc @@ -4,8 +4,6 @@ lst::ModuleConnectionMap::ModuleConnectionMap() {} lst::ModuleConnectionMap::ModuleConnectionMap(std::string const& filename) { load(filename); } -lst::ModuleConnectionMap::~ModuleConnectionMap() {} - void lst::ModuleConnectionMap::load(std::string const& filename) { moduleConnections_.clear(); From 787dfe1faca472b4dd067388964ca229c24452f0 Mon Sep 17 00:00:00 2001 From: Manos Vourliotis Date: Fri, 16 Aug 2024 10:38:02 -0700 Subject: [PATCH 3/4] Renaming of kernels --- RecoTracker/LSTCore/src/alpaka/Event.dev.cc | 62 +++++++++---------- RecoTracker/LSTCore/src/alpaka/Hit.h | 4 +- RecoTracker/LSTCore/src/alpaka/Kernels.h | 10 +-- RecoTracker/LSTCore/src/alpaka/MiniDoublet.h | 28 ++++----- .../LSTCore/src/alpaka/PixelQuintuplet.h | 2 +- RecoTracker/LSTCore/src/alpaka/PixelTriplet.h | 2 +- RecoTracker/LSTCore/src/alpaka/Quintuplet.h | 14 ++--- RecoTracker/LSTCore/src/alpaka/Segment.h | 8 +-- .../LSTCore/src/alpaka/TrackCandidate.h | 14 ++--- RecoTracker/LSTCore/src/alpaka/Triplet.h | 6 +- 10 files changed, 75 insertions(+), 75 deletions(-) diff --git a/RecoTracker/LSTCore/src/alpaka/Event.dev.cc b/RecoTracker/LSTCore/src/alpaka/Event.dev.cc index f9757b0659691..74ad80a633e14 100644 --- a/RecoTracker/LSTCore/src/alpaka/Event.dev.cc +++ b/RecoTracker/LSTCore/src/alpaka/Event.dev.cc @@ -191,7 +191,7 @@ void lst::Event::addHitToEvent(std::vector const& x, Vec3D const blocksPerGrid1{1, 1, max_blocks}; WorkDiv3D const hit_loop_workdiv = createWorkDiv(blocksPerGrid1, threadsPerBlock1, elementsPerThread); - hitLoopKernel hit_loop_kernel; + HitLoopKernel hit_loop_kernel; alpaka::exec(queue, hit_loop_workdiv, hit_loop_kernel, @@ -209,7 +209,7 @@ void lst::Event::addHitToEvent(std::vector const& x, Vec3D const blocksPerGrid2{1, 1, max_blocks}; WorkDiv3D const module_ranges_workdiv = createWorkDiv(blocksPerGrid2, threadsPerBlock2, elementsPerThread); - moduleRangesKernel module_ranges_kernel; + ModuleRangesKernel module_ranges_kernel; alpaka::exec( queue, module_ranges_workdiv, module_ranges_kernel, *modulesBuffers_.data(), *hitsInGPU, nLowerModules_); } @@ -259,7 +259,7 @@ void lst::Event::addPixelSegmentToEvent(std::vector const& WorkDiv1D const createMDArrayRangesGPU_workDiv = createWorkDiv({1}, {1024}, {1}); - lst::createMDArrayRangesGPU createMDArrayRangesGPU_kernel; + lst::CreateMDArrayRangesGPU createMDArrayRangesGPU_kernel; alpaka::exec( queue, createMDArrayRangesGPU_workDiv, createMDArrayRangesGPU_kernel, *modulesBuffers_.data(), *rangesInGPU); @@ -282,7 +282,7 @@ void lst::Event::addPixelSegmentToEvent(std::vector const& WorkDiv1D const createSegmentArrayRanges_workDiv = createWorkDiv({1}, {1024}, {1}); - lst::createSegmentArrayRanges createSegmentArrayRanges_kernel; + lst::CreateSegmentArrayRanges createSegmentArrayRanges_kernel; alpaka::exec(queue, createSegmentArrayRanges_workDiv, createSegmentArrayRanges_kernel, @@ -355,7 +355,7 @@ void lst::Event::addPixelSegmentToEvent(std::vector const& Vec3D const blocksPerGrid{1, 1, max_blocks}; WorkDiv3D const addPixelSegmentToEvent_workdiv = createWorkDiv(blocksPerGrid, threadsPerBlock, elementsPerThread); - addPixelSegmentToEventKernel addPixelSegmentToEvent_kernel; + AddPixelSegmentToEventKernel addPixelSegmentToEvent_kernel; alpaka::exec(queue, addPixelSegmentToEvent_workdiv, addPixelSegmentToEvent_kernel, @@ -386,7 +386,7 @@ void lst::Event::createMiniDoublets() { WorkDiv1D const createMDArrayRangesGPU_workDiv = createWorkDiv({1}, {1024}, {1}); - lst::createMDArrayRangesGPU createMDArrayRangesGPU_kernel; + lst::CreateMDArrayRangesGPU createMDArrayRangesGPU_kernel; alpaka::exec( queue, createMDArrayRangesGPU_workDiv, createMDArrayRangesGPU_kernel, *modulesBuffers_.data(), *rangesInGPU); @@ -408,7 +408,7 @@ void lst::Event::createMiniDoublets() { WorkDiv3D const createMiniDoubletsInGPUv2_workDiv = createWorkDiv(blocksPerGridCreateMDInGPU, threadsPerBlockCreateMDInGPU, elementsPerThread); - lst::createMiniDoubletsInGPUv2 createMiniDoubletsInGPUv2_kernel; + lst::CreateMiniDoubletsInGPUv2 createMiniDoubletsInGPUv2_kernel; alpaka::exec(queue, createMiniDoubletsInGPUv2_workDiv, createMiniDoubletsInGPUv2_kernel, @@ -419,7 +419,7 @@ void lst::Event::createMiniDoublets() { WorkDiv1D const addMiniDoubletRangesToEventExplicit_workDiv = createWorkDiv({1}, {1024}, {1}); - lst::addMiniDoubletRangesToEventExplicit addMiniDoubletRangesToEventExplicit_kernel; + lst::AddMiniDoubletRangesToEventExplicit addMiniDoubletRangesToEventExplicit_kernel; alpaka::exec(queue, addMiniDoubletRangesToEventExplicit_workDiv, addMiniDoubletRangesToEventExplicit_kernel, @@ -446,7 +446,7 @@ void lst::Event::createSegmentsWithModuleMap() { WorkDiv3D const createSegmentsInGPUv2_workDiv = createWorkDiv(blocksPerGridCreateSeg, threadsPerBlockCreateSeg, elementsPerThread); - lst::createSegmentsInGPUv2 createSegmentsInGPUv2_kernel; + lst::CreateSegmentsInGPUv2 createSegmentsInGPUv2_kernel; alpaka::exec(queue, createSegmentsInGPUv2_workDiv, createSegmentsInGPUv2_kernel, @@ -457,7 +457,7 @@ void lst::Event::createSegmentsWithModuleMap() { WorkDiv1D const addSegmentRangesToEventExplicit_workDiv = createWorkDiv({1}, {1024}, {1}); - lst::addSegmentRangesToEventExplicit addSegmentRangesToEventExplicit_kernel; + lst::AddSegmentRangesToEventExplicit addSegmentRangesToEventExplicit_kernel; alpaka::exec(queue, addSegmentRangesToEventExplicit_workDiv, addSegmentRangesToEventExplicit_kernel, @@ -474,7 +474,7 @@ void lst::Event::createTriplets() { if (tripletsInGPU == nullptr) { WorkDiv1D const createTripletArrayRanges_workDiv = createWorkDiv({1}, {1024}, {1}); - lst::createTripletArrayRanges createTripletArrayRanges_kernel; + lst::CreateTripletArrayRanges createTripletArrayRanges_kernel; alpaka::exec(queue, createTripletArrayRanges_workDiv, createTripletArrayRanges_kernel, @@ -535,7 +535,7 @@ void lst::Event::createTriplets() { WorkDiv3D const createTripletsInGPUv2_workDiv = createWorkDiv(blocksPerGridCreateTrip, threadsPerBlockCreateTrip, elementsPerThread); - lst::createTripletsInGPUv2 createTripletsInGPUv2_kernel; + lst::CreateTripletsInGPUv2 createTripletsInGPUv2_kernel; alpaka::exec(queue, createTripletsInGPUv2_workDiv, createTripletsInGPUv2_kernel, @@ -549,7 +549,7 @@ void lst::Event::createTriplets() { WorkDiv1D const addTripletRangesToEventExplicit_workDiv = createWorkDiv({1}, {1024}, {1}); - lst::addTripletRangesToEventExplicit addTripletRangesToEventExplicit_kernel; + lst::AddTripletRangesToEventExplicit addTripletRangesToEventExplicit_kernel; alpaka::exec(queue, addTripletRangesToEventExplicit_workDiv, addTripletRangesToEventExplicit_kernel, @@ -575,7 +575,7 @@ void lst::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls_ WorkDiv3D const crossCleanpT3_workDiv = createWorkDiv(blocksPerGrid_crossCleanpT3, threadsPerBlock_crossCleanpT3, elementsPerThread); - lst::crossCleanpT3 crossCleanpT3_kernel; + lst::CrossCleanpT3 crossCleanpT3_kernel; alpaka::exec(queue, crossCleanpT3_workDiv, crossCleanpT3_kernel, @@ -587,7 +587,7 @@ void lst::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls_ WorkDiv1D const addpT3asTrackCandidatesInGPU_workDiv = createWorkDiv({1}, {512}, {1}); - lst::addpT3asTrackCandidatesInGPU addpT3asTrackCandidatesInGPU_kernel; + lst::AddpT3asTrackCandidatesInGPU addpT3asTrackCandidatesInGPU_kernel; alpaka::exec(queue, addpT3asTrackCandidatesInGPU_workDiv, addpT3asTrackCandidatesInGPU_kernel, @@ -608,7 +608,7 @@ void lst::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls_ WorkDiv3D const removeDupQuintupletsInGPUBeforeTC_workDiv = createWorkDiv(blocksPerGridRemoveDupQuints, threadsPerBlockRemoveDupQuints, elementsPerThread); - lst::removeDupQuintupletsInGPUBeforeTC removeDupQuintupletsInGPUBeforeTC_kernel; + lst::RemoveDupQuintupletsInGPUBeforeTC removeDupQuintupletsInGPUBeforeTC_kernel; alpaka::exec(queue, removeDupQuintupletsInGPUBeforeTC_workDiv, removeDupQuintupletsInGPUBeforeTC_kernel, @@ -620,7 +620,7 @@ void lst::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls_ WorkDiv3D const crossCleanT5_workDiv = createWorkDiv(blocksPerGrid_crossCleanT5, threadsPerBlock_crossCleanT5, elementsPerThread); - lst::crossCleanT5 crossCleanT5_kernel; + lst::CrossCleanT5 crossCleanT5_kernel; alpaka::exec(queue, crossCleanT5_workDiv, crossCleanT5_kernel, @@ -635,7 +635,7 @@ void lst::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls_ WorkDiv3D const addT5asTrackCandidateInGPU_workDiv = createWorkDiv( blocksPerGrid_addT5asTrackCandidateInGPU, threadsPerBlock_addT5asTrackCandidateInGPU, elementsPerThread); - lst::addT5asTrackCandidateInGPU addT5asTrackCandidateInGPU_kernel; + lst::AddT5asTrackCandidateInGPU addT5asTrackCandidateInGPU_kernel; alpaka::exec(queue, addT5asTrackCandidateInGPU_workDiv, addT5asTrackCandidateInGPU_kernel, @@ -650,7 +650,7 @@ void lst::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls_ WorkDiv3D const checkHitspLS_workDiv = createWorkDiv(blocksPerGridCheckHitspLS, threadsPerBlockCheckHitspLS, elementsPerThread); - lst::checkHitspLS checkHitspLS_kernel; + lst::CheckHitspLS checkHitspLS_kernel; alpaka::exec( queue, checkHitspLS_workDiv, checkHitspLS_kernel, *modulesBuffers_.data(), *segmentsInGPU, true); } @@ -660,7 +660,7 @@ void lst::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls_ WorkDiv3D const crossCleanpLS_workDiv = createWorkDiv(blocksPerGrid_crossCleanpLS, threadsPerBlock_crossCleanpLS, elementsPerThread); - lst::crossCleanpLS crossCleanpLS_kernel; + lst::CrossCleanpLS crossCleanpLS_kernel; alpaka::exec(queue, crossCleanpLS_workDiv, crossCleanpLS_kernel, @@ -678,7 +678,7 @@ void lst::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls_ WorkDiv3D const addpLSasTrackCandidateInGPU_workDiv = createWorkDiv( blocksPerGrid_addpLSasTrackCandidateInGPU, threadsPerBlock_addpLSasTrackCandidateInGPU, elementsPerThread); - lst::addpLSasTrackCandidateInGPU addpLSasTrackCandidateInGPU_kernel; + lst::AddpLSasTrackCandidateInGPU addpLSasTrackCandidateInGPU_kernel; alpaka::exec(queue, addpLSasTrackCandidateInGPU_workDiv, addpLSasTrackCandidateInGPU_kernel, @@ -789,7 +789,7 @@ void lst::Event::createPixelTriplets() { WorkDiv3D const createPixelTripletsInGPUFromMapv2_workDiv = createWorkDiv(blocksPerGrid, threadsPerBlock, elementsPerThread); - lst::createPixelTripletsInGPUFromMapv2 createPixelTripletsInGPUFromMapv2_kernel; + lst::CreatePixelTripletsInGPUFromMapv2 createPixelTripletsInGPUFromMapv2_kernel; alpaka::exec(queue, createPixelTripletsInGPUFromMapv2_workDiv, createPixelTripletsInGPUFromMapv2_kernel, @@ -819,7 +819,7 @@ void lst::Event::createPixelTriplets() { WorkDiv3D const removeDupPixelTripletsInGPUFromMap_workDiv = createWorkDiv(blocksPerGridDupPixTrip, threadsPerBlockDupPixTrip, elementsPerThread); - lst::removeDupPixelTripletsInGPUFromMap removeDupPixelTripletsInGPUFromMap_kernel; + lst::RemoveDupPixelTripletsInGPUFromMap removeDupPixelTripletsInGPUFromMap_kernel; alpaka::exec(queue, removeDupPixelTripletsInGPUFromMap_workDiv, removeDupPixelTripletsInGPUFromMap_kernel, @@ -829,7 +829,7 @@ void lst::Event::createPixelTriplets() { void lst::Event::createQuintuplets() { WorkDiv1D const createEligibleModulesListForQuintupletsGPU_workDiv = createWorkDiv({1}, {1024}, {1}); - lst::createEligibleModulesListForQuintupletsGPU createEligibleModulesListForQuintupletsGPU_kernel; + lst::CreateEligibleModulesListForQuintupletsGPU createEligibleModulesListForQuintupletsGPU_kernel; alpaka::exec(queue, createEligibleModulesListForQuintupletsGPU_workDiv, createEligibleModulesListForQuintupletsGPU_kernel, @@ -860,7 +860,7 @@ void lst::Event::createQuintuplets() { WorkDiv3D const createQuintupletsInGPUv2_workDiv = createWorkDiv(blocksPerGridQuints, threadsPerBlockQuints, elementsPerThread); - lst::createQuintupletsInGPUv2 createQuintupletsInGPUv2_kernel; + lst::CreateQuintupletsInGPUv2 createQuintupletsInGPUv2_kernel; alpaka::exec(queue, createQuintupletsInGPUv2_workDiv, createQuintupletsInGPUv2_kernel, @@ -877,7 +877,7 @@ void lst::Event::createQuintuplets() { WorkDiv3D const removeDupQuintupletsInGPUAfterBuild_workDiv = createWorkDiv(blocksPerGridDupQuint, threadsPerBlockDupQuint, elementsPerThread); - lst::removeDupQuintupletsInGPUAfterBuild removeDupQuintupletsInGPUAfterBuild_kernel; + lst::RemoveDupQuintupletsInGPUAfterBuild removeDupQuintupletsInGPUAfterBuild_kernel; alpaka::exec(queue, removeDupQuintupletsInGPUAfterBuild_workDiv, removeDupQuintupletsInGPUAfterBuild_kernel, @@ -887,7 +887,7 @@ void lst::Event::createQuintuplets() { WorkDiv1D const addQuintupletRangesToEventExplicit_workDiv = createWorkDiv({1}, {1024}, {1}); - lst::addQuintupletRangesToEventExplicit addQuintupletRangesToEventExplicit_kernel; + lst::AddQuintupletRangesToEventExplicit addQuintupletRangesToEventExplicit_kernel; alpaka::exec(queue, addQuintupletRangesToEventExplicit_workDiv, addQuintupletRangesToEventExplicit_kernel, @@ -907,7 +907,7 @@ void lst::Event::pixelLineSegmentCleaning(bool no_pls_dupclean) { WorkDiv3D const checkHitspLS_workDiv = createWorkDiv(blocksPerGridCheckHitspLS, threadsPerBlockCheckHitspLS, elementsPerThread); - lst::checkHitspLS checkHitspLS_kernel; + lst::CheckHitspLS checkHitspLS_kernel; alpaka::exec( queue, checkHitspLS_workDiv, checkHitspLS_kernel, *modulesBuffers_.data(), *segmentsInGPU, false); } @@ -990,7 +990,7 @@ void lst::Event::createPixelQuintuplets() { WorkDiv3D const createPixelQuintupletsInGPUFromMapv2_workDiv = createWorkDiv(blocksPerGridCreatePixQuints, threadsPerBlockCreatePixQuints, elementsPerThread); - lst::createPixelQuintupletsInGPUFromMapv2 createPixelQuintupletsInGPUFromMapv2_kernel; + lst::CreatePixelQuintupletsInGPUFromMapv2 createPixelQuintupletsInGPUFromMapv2_kernel; alpaka::exec(queue, createPixelQuintupletsInGPUFromMapv2_workDiv, createPixelQuintupletsInGPUFromMapv2_kernel, @@ -1010,7 +1010,7 @@ void lst::Event::createPixelQuintuplets() { WorkDiv3D const removeDupPixelQuintupletsInGPUFromMap_workDiv = createWorkDiv(blocksPerGridDupPix, threadsPerBlockDupPix, elementsPerThread); - lst::removeDupPixelQuintupletsInGPUFromMap removeDupPixelQuintupletsInGPUFromMap_kernel; + lst::RemoveDupPixelQuintupletsInGPUFromMap removeDupPixelQuintupletsInGPUFromMap_kernel; alpaka::exec(queue, removeDupPixelQuintupletsInGPUFromMap_workDiv, removeDupPixelQuintupletsInGPUFromMap_kernel, @@ -1018,7 +1018,7 @@ void lst::Event::createPixelQuintuplets() { WorkDiv1D const addpT5asTrackCandidateInGPU_workDiv = createWorkDiv({1}, {256}, {1}); - lst::addpT5asTrackCandidateInGPU addpT5asTrackCandidateInGPU_kernel; + lst::AddpT5asTrackCandidateInGPU addpT5asTrackCandidateInGPU_kernel; alpaka::exec(queue, addpT5asTrackCandidateInGPU_workDiv, addpT5asTrackCandidateInGPU_kernel, diff --git a/RecoTracker/LSTCore/src/alpaka/Hit.h b/RecoTracker/LSTCore/src/alpaka/Hit.h index 3d43c94c62d40..cb95aa14538f3 100644 --- a/RecoTracker/LSTCore/src/alpaka/Hit.h +++ b/RecoTracker/LSTCore/src/alpaka/Hit.h @@ -176,7 +176,7 @@ namespace lst { return -1; } - struct moduleRangesKernel { + struct ModuleRangesKernel { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -199,7 +199,7 @@ namespace lst { } }; - struct hitLoopKernel { + struct HitLoopKernel { template ALPAKA_FN_ACC void operator()(TAcc const& acc, uint16_t Endcap, // Integer corresponding to endcap in module subdets diff --git a/RecoTracker/LSTCore/src/alpaka/Kernels.h b/RecoTracker/LSTCore/src/alpaka/Kernels.h index 496a3f2ce0fb2..31f057017a766 100644 --- a/RecoTracker/LSTCore/src/alpaka/Kernels.h +++ b/RecoTracker/LSTCore/src/alpaka/Kernels.h @@ -142,7 +142,7 @@ namespace lst { matched[1] = nMatched; } - struct removeDupQuintupletsInGPUAfterBuild { + struct RemoveDupQuintupletsInGPUAfterBuild { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -192,7 +192,7 @@ namespace lst { } }; - struct removeDupQuintupletsInGPUBeforeTC { + struct RemoveDupQuintupletsInGPUBeforeTC { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Quintuplets quintupletsInGPU, @@ -267,7 +267,7 @@ namespace lst { } }; - struct removeDupPixelTripletsInGPUFromMap { + struct RemoveDupPixelTripletsInGPUFromMap { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::PixelTriplets pixelTripletsInGPU) const { auto const globalThreadIdx = alpaka::getIdx(acc); @@ -304,7 +304,7 @@ namespace lst { } }; - struct removeDupPixelQuintupletsInGPUFromMap { + struct RemoveDupPixelQuintupletsInGPUFromMap { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::PixelQuintuplets pixelQuintupletsInGPU) const { auto const globalThreadIdx = alpaka::getIdx(acc); @@ -331,7 +331,7 @@ namespace lst { } }; - struct checkHitspLS { + struct CheckHitspLS { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, diff --git a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h index 60e1a7428edf5..a31747499e9aa 100644 --- a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h +++ b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h @@ -281,7 +281,7 @@ namespace lst { return false; } - ALPAKA_FN_ACC ALPAKA_FN_INLINE float moduleGapSize(struct lst::Modules const& modulesInGPU, uint16_t moduleIndex) { + ALPAKA_FN_ACC ALPAKA_FN_INLINE float moduleGapSize(lst::Modules const& modulesInGPU, uint16_t moduleIndex) { float miniDeltaTilted[3] = {0.26f, 0.26f, 0.26f}; float miniDeltaFlat[6] = {0.26f, 0.16f, 0.16f, 0.18f, 0.18f, 0.18f}; float miniDeltaLooseTilted[3] = {0.4f, 0.4f, 0.4f}; @@ -867,13 +867,13 @@ namespace lst { return alpaka::math::abs(acc, dPhiChange) < miniCut; } - struct createMiniDoubletsInGPUv2 { + struct CreateMiniDoubletsInGPUv2 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, - struct lst::Modules modulesInGPU, - struct lst::Hits hitsInGPU, - struct lst::MiniDoublets mdsInGPU, - struct lst::ObjectRanges rangesInGPU) const { + lst::Modules modulesInGPU, + lst::Hits hitsInGPU, + lst::MiniDoublets mdsInGPU, + lst::ObjectRanges rangesInGPU) const { auto const globalThreadIdx = alpaka::getIdx(acc); auto const gridThreadExtent = alpaka::getWorkDiv(acc); @@ -964,11 +964,11 @@ namespace lst { } }; - struct createMDArrayRangesGPU { + struct CreateMDArrayRangesGPU { template ALPAKA_FN_ACC void operator()(TAcc const& acc, - struct lst::Modules modulesInGPU, - struct lst::ObjectRanges rangesInGPU) const { + lst::Modules modulesInGPU, + lst::ObjectRanges rangesInGPU) const { // implementation is 1D with a single block static_assert(std::is_same_v, "Should be Acc1D"); ALPAKA_ASSERT_ACC((alpaka::getWorkDiv(acc)[0] == 1)); @@ -1060,13 +1060,13 @@ namespace lst { } }; - struct addMiniDoubletRangesToEventExplicit { + struct AddMiniDoubletRangesToEventExplicit { template ALPAKA_FN_ACC void operator()(TAcc const& acc, - struct lst::Modules modulesInGPU, - struct lst::MiniDoublets mdsInGPU, - struct lst::ObjectRanges rangesInGPU, - struct lst::Hits hitsInGPU) const { + lst::Modules modulesInGPU, + lst::MiniDoublets mdsInGPU, + lst::ObjectRanges rangesInGPU, + lst::Hits hitsInGPU) const { // implementation is 1D with a single block static_assert(std::is_same_v, "Should be Acc1D"); ALPAKA_ASSERT_ACC((alpaka::getWorkDiv(acc)[0] == 1)); diff --git a/RecoTracker/LSTCore/src/alpaka/PixelQuintuplet.h b/RecoTracker/LSTCore/src/alpaka/PixelQuintuplet.h index 06ba169c88bea..12161acc08de0 100644 --- a/RecoTracker/LSTCore/src/alpaka/PixelQuintuplet.h +++ b/RecoTracker/LSTCore/src/alpaka/PixelQuintuplet.h @@ -832,7 +832,7 @@ namespace lst { return RMSE; } - struct createPixelQuintupletsInGPUFromMapv2 { + struct CreatePixelQuintupletsInGPUFromMapv2 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, diff --git a/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h b/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h index 5cc5cf1d31a7a..0c78efcafc87f 100644 --- a/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h +++ b/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h @@ -925,7 +925,7 @@ namespace lst { return true; }; - struct createPixelTripletsInGPUFromMapv2 { + struct CreatePixelTripletsInGPUFromMapv2 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, diff --git a/RecoTracker/LSTCore/src/alpaka/Quintuplet.h b/RecoTracker/LSTCore/src/alpaka/Quintuplet.h index 4d957a0a1402e..e930d753dada6 100644 --- a/RecoTracker/LSTCore/src/alpaka/Quintuplet.h +++ b/RecoTracker/LSTCore/src/alpaka/Quintuplet.h @@ -2185,10 +2185,10 @@ namespace lst { template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runQuintupletDefaultAlgo(TAcc const& acc, - struct lst::Modules& modulesInGPU, - struct lst::MiniDoublets& mdsInGPU, - struct lst::Segments& segmentsInGPU, - struct lst::Triplets& tripletsInGPU, + lst::Modules& modulesInGPU, + lst::MiniDoublets& mdsInGPU, + lst::Segments& segmentsInGPU, + lst::Triplets& tripletsInGPU, uint16_t lowerModuleIndex1, uint16_t lowerModuleIndex2, uint16_t lowerModuleIndex3, @@ -2534,7 +2534,7 @@ namespace lst { return true; } - struct createQuintupletsInGPUv2 { + struct CreateQuintupletsInGPUv2 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -2663,7 +2663,7 @@ namespace lst { } }; - struct createEligibleModulesListForQuintupletsGPU { + struct CreateEligibleModulesListForQuintupletsGPU { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -2767,7 +2767,7 @@ namespace lst { } }; - struct addQuintupletRangesToEventExplicit { + struct AddQuintupletRangesToEventExplicit { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, diff --git a/RecoTracker/LSTCore/src/alpaka/Segment.h b/RecoTracker/LSTCore/src/alpaka/Segment.h index 6b44ddfbe24b7..9f9f0a6e025a5 100644 --- a/RecoTracker/LSTCore/src/alpaka/Segment.h +++ b/RecoTracker/LSTCore/src/alpaka/Segment.h @@ -701,7 +701,7 @@ namespace lst { } } - struct createSegmentsInGPUv2 { + struct CreateSegmentsInGPUv2 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -795,7 +795,7 @@ namespace lst { } }; - struct createSegmentArrayRanges { + struct CreateSegmentArrayRanges { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -899,7 +899,7 @@ namespace lst { } }; - struct addSegmentRangesToEventExplicit { + struct AddSegmentRangesToEventExplicit { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -924,7 +924,7 @@ namespace lst { } }; - struct addPixelSegmentToEventKernel { + struct AddPixelSegmentToEventKernel { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, diff --git a/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h b/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h index 0439050e100d2..da24db9a2a0d2 100644 --- a/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h +++ b/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h @@ -204,7 +204,7 @@ namespace lst { return npMatched; } - struct crossCleanpT3 { + struct CrossCleanpT3 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -245,7 +245,7 @@ namespace lst { } }; - struct crossCleanT5 { + struct CrossCleanT5 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -300,7 +300,7 @@ namespace lst { } }; - struct crossCleanpLS { + struct CrossCleanpLS { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -381,7 +381,7 @@ namespace lst { } }; - struct addpT3asTrackCandidatesInGPU { + struct AddpT3asTrackCandidatesInGPU { template ALPAKA_FN_ACC void operator()(TAcc const& acc, uint16_t nLowerModules, @@ -437,7 +437,7 @@ namespace lst { } }; - struct addT5asTrackCandidateInGPU { + struct AddT5asTrackCandidateInGPU { template ALPAKA_FN_ACC void operator()(TAcc const& acc, uint16_t nLowerModules, @@ -491,7 +491,7 @@ namespace lst { } }; - struct addpLSasTrackCandidateInGPU { + struct AddpLSasTrackCandidateInGPU { template ALPAKA_FN_ACC void operator()(TAcc const& acc, uint16_t nLowerModules, @@ -530,7 +530,7 @@ namespace lst { } }; - struct addpT5asTrackCandidateInGPU { + struct AddpT5asTrackCandidateInGPU { template ALPAKA_FN_ACC void operator()(TAcc const& acc, uint16_t nLowerModules, diff --git a/RecoTracker/LSTCore/src/alpaka/Triplet.h b/RecoTracker/LSTCore/src/alpaka/Triplet.h index c5ac432ebf310..15d48e62c41f4 100644 --- a/RecoTracker/LSTCore/src/alpaka/Triplet.h +++ b/RecoTracker/LSTCore/src/alpaka/Triplet.h @@ -808,7 +808,7 @@ namespace lst { return true; } - struct createTripletsInGPUv2 { + struct CreateTripletsInGPUv2 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -925,7 +925,7 @@ namespace lst { } }; - struct createTripletArrayRanges { + struct CreateTripletArrayRanges { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -1028,7 +1028,7 @@ namespace lst { } }; - struct addTripletRangesToEventExplicit { + struct AddTripletRangesToEventExplicit { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, From 5cce69a3d8140f161e16ac3b2cbbb8706fc26ab7 Mon Sep 17 00:00:00 2001 From: Manos Vourliotis Date: Fri, 16 Aug 2024 11:04:46 -0700 Subject: [PATCH 4/4] Code format and checks --- RecoTracker/LSTCore/src/alpaka/MiniDoublet.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h index a31747499e9aa..01166fe520348 100644 --- a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h +++ b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h @@ -966,9 +966,7 @@ namespace lst { struct CreateMDArrayRangesGPU { template - ALPAKA_FN_ACC void operator()(TAcc const& acc, - lst::Modules modulesInGPU, - lst::ObjectRanges rangesInGPU) const { + ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, lst::ObjectRanges rangesInGPU) const { // implementation is 1D with a single block static_assert(std::is_same_v, "Should be Acc1D"); ALPAKA_ASSERT_ACC((alpaka::getWorkDiv(acc)[0] == 1));