Consistency fixes

cms-sw · Oct 25, 2024 · d08032a · d08032a
1 parent 891a97d
commit d08032a
Show file tree

Hide file tree

Showing 20 changed files with 95 additions and 37 deletions.
diff --git a/RecoTracker/LSTCore/interface/EndcapGeometryDevHostCollection.h b/RecoTracker/LSTCore/interface/EndcapGeometryDevHostCollection.h
@@ -0,0 +1,10 @@
+#ifndef RecoTracker_LSTCore_interface_EndcapGeometryDevHostCollection_h
+#define RecoTracker_LSTCore_interface_EndcapGeometryDevHostCollection_h
+
+#include "RecoTracker/LSTCore/interface/EndcapGeometryDevSoA.h"
+#include "DataFormats/Portable/interface/PortableHostCollection.h"
+
+namespace lst {
+  using EndcapGeometryDevHostCollection = PortableHostCollection<EndcapGeometryDevSoA>;
+}  // namespace lst
+#endif
diff --git a/RecoTracker/LSTCore/interface/EndcapGeometryDevSoA.h b/RecoTracker/LSTCore/interface/EndcapGeometryDevSoA.h
@@ -13,8 +13,6 @@ namespace lst {
   using EndcapGeometryDev = EndcapGeometryDevSoA::View;
   using EndcapGeometryDevConst = EndcapGeometryDevSoA::ConstView;
 
-  using EndcapGeometryDevHostCollection = PortableHostCollection<EndcapGeometryDevSoA>;
-
 }  // namespace lst
 
 #endif
diff --git a/RecoTracker/LSTCore/interface/HitsHostCollection.h b/RecoTracker/LSTCore/interface/HitsHostCollection.h
@@ -0,0 +1,10 @@
+#ifndef RecoTracker_LSTCore_interface_HitsHostCollection_h
+#define RecoTracker_LSTCore_interface_HitsHostCollection_h
+
+#include "RecoTracker/LSTCore/interface/HitsSoA.h"
+#include "DataFormats/Portable/interface/PortableHostCollection.h"
+
+namespace lst {
+  using HitsHostCollection = PortableHostMultiCollection<HitsSoA, HitsOccupancySoA>;
+}  // namespace lst
+#endif
diff --git a/RecoTracker/LSTCore/interface/HitsSoA.h b/RecoTracker/LSTCore/interface/HitsSoA.h
@@ -4,6 +4,8 @@
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 #include "DataFormats/Portable/interface/PortableCollection.h"
 
+#include "RecoTracker/LSTCore/interface/Constants.h"
+
 namespace lst {
 
   GENERATE_SOA_LAYOUT(HitsSoALayout,
@@ -36,8 +38,6 @@ namespace lst {
   using HitsOccupancy = HitsOccupancySoA::View;
   using HitsOccupancyConst = HitsOccupancySoA::ConstView;
 
-  using HitsHostCollection = PortableHostMultiCollection<HitsSoA, HitsOccupancySoA>;
-
 }  // namespace lst
 
 #endif
diff --git a/RecoTracker/LSTCore/interface/LSTESData.h b/RecoTracker/LSTCore/interface/LSTESData.h
@@ -2,8 +2,8 @@
 #define RecoTracker_LSTCore_interface_LSTESData_h
 
 #include "RecoTracker/LSTCore/interface/Constants.h"
-#include "RecoTracker/LSTCore/interface/EndcapGeometryDevSoA.h"
-#include "RecoTracker/LSTCore/interface/ModulesSoA.h"
+#include "RecoTracker/LSTCore/interface/EndcapGeometryDevHostCollection.h"
+#include "RecoTracker/LSTCore/interface/ModulesHostCollection.h"
 #include "RecoTracker/LSTCore/interface/PixelMap.h"
 
 #include "HeterogeneousCore/AlpakaInterface/interface/CopyToDevice.h"

diff --git a/RecoTracker/LSTCore/interface/MiniDoubletsHostCollection.h b/RecoTracker/LSTCore/interface/MiniDoubletsHostCollection.h
@@ -0,0 +1,10 @@
+#ifndef RecoTracker_LSTCore_interface_MiniDoubletsHostCollection_h
+#define RecoTracker_LSTCore_interface_MiniDoubletsHostCollection_h
+
+#include "RecoTracker/LSTCore/interface/MiniDoubletsSoA.h"
+#include "DataFormats/Portable/interface/PortableHostCollection.h"
+
+namespace lst {
+  using MiniDoubletsHostCollection = PortableHostMultiCollection<MiniDoubletsSoA, MiniDoubletsOccupancySoA>;
+}  // namespace lst
+#endif
diff --git a/RecoTracker/LSTCore/interface/MiniDoubletsSoA.h b/RecoTracker/LSTCore/interface/MiniDoubletsSoA.h
@@ -53,8 +53,6 @@ namespace lst {
   using MiniDoubletsOccupancy = MiniDoubletsOccupancySoA::View;
   using MiniDoubletsOccupancyConst = MiniDoubletsOccupancySoA::ConstView;
 
-  using MiniDoubletsHostCollection = PortableHostMultiCollection<MiniDoubletsSoA, MiniDoubletsOccupancySoA>;
-
 }  // namespace lst
 
 #endif
diff --git a/RecoTracker/LSTCore/interface/ModulesHostCollection.h b/RecoTracker/LSTCore/interface/ModulesHostCollection.h
@@ -0,0 +1,10 @@
+#ifndef RecoTracker_LSTCore_interface_ModulesHostCollection_h
+#define RecoTracker_LSTCore_interface_ModulesHostCollection_h
+
+#include "RecoTracker/LSTCore/interface/ModulesSoA.h"
+#include "DataFormats/Portable/interface/PortableHostCollection.h"
+
+namespace lst {
+  using ModulesHostCollection = PortableHostMultiCollection<ModulesSoA, ModulesPixelSoA>;
+}  // namespace lst
+#endif
diff --git a/RecoTracker/LSTCore/interface/ModulesSoA.h b/RecoTracker/LSTCore/interface/ModulesSoA.h
@@ -4,6 +4,8 @@
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 #include "DataFormats/Portable/interface/PortableCollection.h"
 
+#include "RecoTracker/LSTCore/interface/Constants.h"
+
 namespace lst {
 
   enum SubDet { InnerPixel = 0, Barrel = 5, Endcap = 4 };
@@ -50,8 +52,6 @@ namespace lst {
   using ModulesPixel = ModulesPixelSoA::View;
   using ModulesPixelConst = ModulesPixelSoA::ConstView;
 
-  using ModulesHostCollection = PortableHostMultiCollection<ModulesSoA, ModulesPixelSoA>;
-
 }  // namespace lst
 
 #endif
diff --git a/RecoTracker/LSTCore/interface/ObjectRangesHostCollection.h b/RecoTracker/LSTCore/interface/ObjectRangesHostCollection.h
@@ -0,0 +1,10 @@
+#ifndef RecoTracker_LSTCore_interface_ObjectRangesHostCollection_h
+#define RecoTracker_LSTCore_interface_ObjectRangesHostCollection_h
+
+#include "RecoTracker/LSTCore/interface/ObjectRangesSoA.h"
+#include "DataFormats/Portable/interface/PortableHostCollection.h"
+
+namespace lst {
+  using ObjectRangesHostCollection = PortableHostMultiCollection<ObjectRangesSoA, ObjectOccupancySoA>;
+}  // namespace lst
+#endif
diff --git a/RecoTracker/LSTCore/interface/ObjectRangesSoA.h b/RecoTracker/LSTCore/interface/ObjectRangesSoA.h
@@ -4,6 +4,8 @@
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 #include "DataFormats/Portable/interface/PortableCollection.h"
 
+#include "RecoTracker/LSTCore/interface/Constants.h"
+
 namespace lst {
 
   GENERATE_SOA_LAYOUT(ObjectRangesSoALayout,
@@ -43,8 +45,6 @@ namespace lst {
   using ObjectOccupancy = ObjectOccupancySoA::View;
   using ObjectOccupancyConst = ObjectOccupancySoA::ConstView;
 
-  using ObjectRangesHostCollection = PortableHostMultiCollection<ObjectRangesSoA, ObjectOccupancySoA>;
-
 }  // namespace lst
 
 #endif
diff --git a/RecoTracker/LSTCore/interface/SegmentsHostCollection.h b/RecoTracker/LSTCore/interface/SegmentsHostCollection.h
@@ -0,0 +1,10 @@
+#ifndef RecoTracker_LSTCore_interface_SegmentsHostCollection_h
+#define RecoTracker_LSTCore_interface_SegmentsHostCollection_h
+
+#include "RecoTracker/LSTCore/interface/SegmentsSoA.h"
+#include "DataFormats/Portable/interface/PortableHostCollection.h"
+
+namespace lst {
+  using SegmentsHostCollection = PortableHostMultiCollection<SegmentsSoA, SegmentsOccupancySoA, SegmentsPixelSoA>;
+}  // namespace lst
+#endif
diff --git a/RecoTracker/LSTCore/interface/SegmentsSoA.h b/RecoTracker/LSTCore/interface/SegmentsSoA.h
@@ -60,8 +60,6 @@ namespace lst {
   using SegmentsPixel = SegmentsPixelSoA::View;
   using SegmentsPixelConst = SegmentsPixelSoA::ConstView;
 
-  using SegmentsHostCollection = PortableHostMultiCollection<SegmentsSoA, SegmentsOccupancySoA, SegmentsPixelSoA>;
-
 }  // namespace lst
 
 #endif
diff --git a/RecoTracker/LSTCore/src/ModuleMethods.h b/RecoTracker/LSTCore/src/ModuleMethods.h
@@ -6,6 +6,7 @@
 
 #include "RecoTracker/LSTCore/interface/Constants.h"
 #include "RecoTracker/LSTCore/interface/ModulesSoA.h"
+#include "RecoTracker/LSTCore/interface/ModulesHostCollection.h"
 #include "RecoTracker/LSTCore/interface/TiltedGeometry.h"
 #include "RecoTracker/LSTCore/interface/EndcapGeometry.h"
 #include "RecoTracker/LSTCore/interface/ModuleConnectionMap.h"

diff --git a/RecoTracker/LSTCore/src/alpaka/Event.dev.cc b/RecoTracker/LSTCore/src/alpaka/Event.dev.cc
@@ -386,14 +386,14 @@ void Event::createMiniDoublets() {
     alpaka::memset(queue_, totOccupancyMDs_view, 0u);
   }
 
-  Vec3D const threadsPerBlockCreateMDInGPU{1, 16, 32};
-  Vec3D const blocksPerGridCreateMDInGPU{1, nLowerModules_ / threadsPerBlockCreateMDInGPU[1], 1};
-  WorkDiv3D const createMiniDoubletsInGPUv2_workDiv =
-      createWorkDiv(blocksPerGridCreateMDInGPU, threadsPerBlockCreateMDInGPU, elementsPerThread);
+  Vec3D const threadsPerBlockCreateMD{1, 16, 32};
+  Vec3D const blocksPerGridCreateMD{1, nLowerModules_ / threadsPerBlockCreateMD[1], 1};
+  WorkDiv3D const createMiniDoublets_workDiv =
+      createWorkDiv(blocksPerGridCreateMD, threadsPerBlockCreateMD, elementsPerThread);
 
   alpaka::exec<Acc3D>(queue_,
-                      createMiniDoubletsInGPUv2_workDiv,
-                      CreateMiniDoubletsInGPUv2{},
+                      createMiniDoublets_workDiv,
+                      CreateMiniDoublets{},
                       modules_.const_view<ModulesSoA>(),
                       hitsDC_->const_view<HitsSoA>(),
                       hitsDC_->const_view<HitsOccupancySoA>(),
@@ -435,12 +435,12 @@ void Event::createSegmentsWithModuleMap() {
 
   Vec3D const threadsPerBlockCreateSeg{1, 1, 64};
   Vec3D const blocksPerGridCreateSeg{1, 1, nLowerModules_};
-  WorkDiv3D const createSegmentsInGPUv2_workDiv =
+  WorkDiv3D const createSegments_workDiv =
       createWorkDiv(blocksPerGridCreateSeg, threadsPerBlockCreateSeg, elementsPerThread);
 
   alpaka::exec<Acc3D>(queue_,
-                      createSegmentsInGPUv2_workDiv,
-                      CreateSegmentsInGPUv2{},
+                      createSegments_workDiv,
+                      CreateSegments{},
                       modules_.const_view<ModulesSoA>(),
                       miniDoubletsDC_->const_view<MiniDoubletsSoA>(),
                       miniDoubletsDC_->const_view<MiniDoubletsOccupancySoA>(),
@@ -691,14 +691,14 @@ void Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls_triplets) {
                       hitsDC_->const_view<HitsSoA>(),
                       quintupletsDC_->const_view<QuintupletsSoA>());
 
-  Vec3D const threadsPerBlock_addpLSasTrackCandidateInGPU{1, 1, 384};
-  Vec3D const blocksPerGrid_addpLSasTrackCandidateInGPU{1, 1, max_blocks};
-  WorkDiv3D const addpLSasTrackCandidateInGPU_workDiv = createWorkDiv(
-      blocksPerGrid_addpLSasTrackCandidateInGPU, threadsPerBlock_addpLSasTrackCandidateInGPU, elementsPerThread);
+  Vec3D const threadsPerBlock_addpLSasTrackCandidate{1, 1, 384};
+  Vec3D const blocksPerGrid_addpLSasTrackCandidate{1, 1, max_blocks};
+  WorkDiv3D const addpLSasTrackCandidate_workDiv =
+      createWorkDiv(blocksPerGrid_addpLSasTrackCandidate, threadsPerBlock_addpLSasTrackCandidate, elementsPerThread);
 
   alpaka::exec<Acc3D>(queue_,
-                      addpLSasTrackCandidateInGPU_workDiv,
-                      AddpLSasTrackCandidateInGPU{},
+                      addpLSasTrackCandidate_workDiv,
+                      AddpLSasTrackCandidate{},
                       nLowerModules_,
                       trackCandidatesDC_->view(),
                       segmentsDC_->const_view<SegmentsOccupancySoA>(),

diff --git a/RecoTracker/LSTCore/src/alpaka/Event.h b/RecoTracker/LSTCore/src/alpaka/Event.h
@@ -3,13 +3,16 @@
 
 #include <optional>
 
-#include "RecoTracker/LSTCore/interface/MiniDoubletsSoA.h"
+#include "RecoTracker/LSTCore/interface/HitsHostCollection.h"
+#include "RecoTracker/LSTCore/interface/MiniDoubletsHostCollection.h"
 #include "RecoTracker/LSTCore/interface/PixelQuintupletsHostCollection.h"
 #include "RecoTracker/LSTCore/interface/PixelTripletsHostCollection.h"
 #include "RecoTracker/LSTCore/interface/QuintupletsHostCollection.h"
-#include "RecoTracker/LSTCore/interface/SegmentsSoA.h"
+#include "RecoTracker/LSTCore/interface/SegmentsHostCollection.h"
 #include "RecoTracker/LSTCore/interface/TrackCandidatesHostCollection.h"
 #include "RecoTracker/LSTCore/interface/TripletsHostCollection.h"
+#include "RecoTracker/LSTCore/interface/ObjectRangesHostCollection.h"
+#include "RecoTracker/LSTCore/interface/ModulesHostCollection.h"
 #include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
 #include "RecoTracker/LSTCore/interface/alpaka/LST.h"
 #include "RecoTracker/LSTCore/interface/alpaka/MiniDoubletsDeviceCollection.h"

diff --git a/RecoTracker/LSTCore/src/alpaka/LST.dev.cc b/RecoTracker/LSTCore/src/alpaka/LST.dev.cc
@@ -36,11 +36,11 @@ namespace {
       maxNHits = Params_pLS::kHits;  // pLS
 
     for (unsigned int i = 0; i < maxNHits; i++) {
-      unsigned int hitIdxInGPU = tcHitIndices[i];
+      unsigned int hitIdxDev = tcHitIndices[i];
       unsigned int hitIdx =
           (trackCandidateType == 8)
-              ? hitIdxInGPU
-              : hitIndices[hitIdxInGPU];  // Hit indices are stored differently in the standalone for pLS.
+              ? hitIdxDev
+              : hitIndices[hitIdxDev];  // Hit indices are stored differently in the standalone for pLS.
 
       // For p objects, the 3rd and 4th hit maybe the same,
       // due to the way pLS hits are stored in the standalone.

diff --git a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h
@@ -691,7 +691,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
     }
   }
 
-  struct CreateMiniDoubletsInGPUv2 {
+  struct CreateMiniDoublets {
     template <typename TAcc>
     ALPAKA_FN_ACC void operator()(TAcc const& acc,
                                   ModulesConst modules,

diff --git a/RecoTracker/LSTCore/src/alpaka/Segment.h b/RecoTracker/LSTCore/src/alpaka/Segment.h
@@ -535,7 +535,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
     }
   }
 
-  struct CreateSegmentsInGPUv2 {
+  struct CreateSegments {
     template <typename TAcc>
     ALPAKA_FN_ACC void operator()(TAcc const& acc,
                                   ModulesConst modules,

diff --git a/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h b/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h
@@ -397,7 +397,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
     }
   };
 
-  struct AddpLSasTrackCandidateInGPU {
+  struct AddpLSasTrackCandidate {
     template <typename TAcc>
     ALPAKA_FN_ACC void operator()(TAcc const& acc,
                                   uint16_t nLowerModules,