migrate EndcapGeometry to SoATemplate

RecoTracker/LSTCore/interface/EndcapGeometryDevSoA.h

@@ -0,0 +1,20 @@
+#ifndef RecoTracker_LSTCore_interface_EndcapGeometryDevSoA_h
+#define RecoTracker_LSTCore_interface_EndcapGeometryDevSoA_h
+
+#include "DataFormats/SoATemplate/interface/SoALayout.h"
+#include "DataFormats/Portable/interface/PortableCollection.h"
+
+namespace lst {
+
+  GENERATE_SOA_LAYOUT(EndcapGeometryDevSoALayout, SOA_COLUMN(unsigned int, geoMapDetId), SOA_COLUMN(float, geoMapPhi))
+
+  using EndcapGeometryDevSoA = EndcapGeometryDevSoALayout<>;
+
+  using EndcapGeometryDev = EndcapGeometryDevSoA::View;
+  using EndcapGeometryDevConst = EndcapGeometryDevSoA::ConstView;
+
+  using EndcapGeometryDevHostCollection = PortableHostCollection<EndcapGeometryDevSoA>;
+
+}  // namespace lst
+
+#endif

RecoTracker/LSTCore/interface/LSTESData.h

@@ -2,7 +2,7 @@
 #define RecoTracker_LSTCore_interface_LSTESData_h
 
 #include "RecoTracker/LSTCore/interface/Constants.h"
-#include "RecoTracker/LSTCore/interface/EndcapGeometryBuffer.h"
+#include "RecoTracker/LSTCore/interface/EndcapGeometryDevSoA.h"
 #include "RecoTracker/LSTCore/interface/Module.h"
 #include "RecoTracker/LSTCore/interface/PixelMap.h"
 
@@ -20,22 +20,22 @@ namespace lst {
     unsigned int nPixels;
     unsigned int nEndCapMap;
     ModulesBuffer<TDev> modulesBuffers;
-    EndcapGeometryBuffer<TDev> endcapGeometryBuffers;
+    std::unique_ptr<const PortableCollection<EndcapGeometryDevSoA, TDev>> endcapGeometry;
     std::shared_ptr<const PixelMap> pixelMapping;
 
     LSTESData(uint16_t const& nModulesIn,
               uint16_t const& nLowerModulesIn,
               unsigned int const& nPixelsIn,
               unsigned int const& nEndCapMapIn,
               ModulesBuffer<TDev> const& modulesBuffersIn,
-              EndcapGeometryBuffer<TDev> const& endcapGeometryBuffersIn,
+              std::unique_ptr<const PortableCollection<EndcapGeometryDevSoA, TDev>> endcapGeometryIn,
               std::shared_ptr<const PixelMap> const& pixelMappingIn)
         : nModules(nModulesIn),
           nLowerModules(nLowerModulesIn),
           nPixels(nPixelsIn),
           nEndCapMap(nEndCapMapIn),
           modulesBuffers(modulesBuffersIn),
-          endcapGeometryBuffers(endcapGeometryBuffersIn),
+          endcapGeometry(std::move(endcapGeometryIn)),
           pixelMapping(pixelMappingIn) {}
   };
 
@@ -44,6 +44,19 @@ namespace lst {
 }  // namespace lst
 
 namespace cms::alpakatools {
+
+  // The templated definition in CMSSW doesn't work when using CPU as the device
+  template <>
+  struct CopyToDevice<PortableHostCollection<lst::EndcapGeometryDevSoA>> {
+    template <typename TQueue>
+    static auto copyAsync(TQueue& queue, PortableHostCollection<lst::EndcapGeometryDevSoA> const& srcData) {
+      using TDevice = typename alpaka::trait::DevType<TQueue>::type;
+      PortableCollection<lst::EndcapGeometryDevSoA, TDevice> dstData(srcData->metadata().size(), queue);
+      alpaka::memcpy(queue, dstData.buffer(), srcData.buffer());
+      return dstData;
+    }
+  };
+
   template <>
   struct CopyToDevice<lst::LSTESData<alpaka_common::DevHost>> {
     template <typename TQueue>
@@ -52,16 +65,15 @@ namespace cms::alpakatools {
       auto deviceModulesBuffers =
           lst::ModulesBuffer<alpaka::Dev<TQueue>>(alpaka::getDev(queue), srcData.nModules, srcData.nPixels);
       deviceModulesBuffers.copyFromSrc(queue, srcData.modulesBuffers);
-      auto deviceEndcapGeometryBuffers =
-          lst::EndcapGeometryBuffer<alpaka::Dev<TQueue>>(alpaka::getDev(queue), srcData.nEndCapMap);
-      deviceEndcapGeometryBuffers.copyFromSrc(queue, srcData.endcapGeometryBuffers);
+      auto deviceEndcapGeometry = std::make_unique<PortableCollection<lst::EndcapGeometryDevSoA, alpaka::Dev<TQueue>>>(
+          CopyToDevice<PortableHostCollection<lst::EndcapGeometryDevSoA>>::copyAsync(queue, *srcData.endcapGeometry));
 
       return lst::LSTESData<alpaka::Dev<TQueue>>(srcData.nModules,
                                                  srcData.nLowerModules,
                                                  srcData.nPixels,
                                                  srcData.nEndCapMap,
                                                  std::move(deviceModulesBuffers),
-                                                 std::move(deviceEndcapGeometryBuffers),
+                                                 std::move(deviceEndcapGeometry),
                                                  srcData.pixelMapping);
     }
   };

RecoTracker/LSTCore/interface/alpaka/EndcapGeometryDevDeviceCollection.h

@@ -0,0 +1,12 @@
+#ifndef RecoTracker_LSTCore_interface_alpaka_EndcapGeometryDevDeviceCollection_h
+#define RecoTracker_LSTCore_interface_alpaka_EndcapGeometryDevDeviceCollection_h
+
+#include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
+
+#include "RecoTracker/LSTCore/interface/EndcapGeometryDevSoA.h"
+
+namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
+  using EndcapGeometryDevDeviceCollection = PortableCollection<EndcapGeometryDevSoA>;
+}  // namespace ALPAKA_ACCELERATOR_NAMESPACE::lst
+
+#endif

RecoTracker/LSTCore/src/LSTESData.cc

@@ -87,12 +87,12 @@ std::unique_ptr<lst::LSTESData<alpaka_common::DevHost>> lst::loadAndFillESHost()
   ModuleConnectionMap moduleConnectionMap;
   ::loadMapsHost(pLStoLayer, endcapGeometry, tiltedGeometry, moduleConnectionMap);
 
-  auto endcapGeometryBuffers =
-      EndcapGeometryBuffer<alpaka_common::DevHost>(cms::alpakatools::host(), endcapGeometry.nEndCapMap);
-  std::memcpy(endcapGeometryBuffers.geoMapDetId_buf.data(),
+  auto endcapGeometryDev =
+      std::make_unique<EndcapGeometryDevHostCollection>(endcapGeometry.nEndCapMap, cms::alpakatools::host());
+  std::memcpy(endcapGeometryDev->view().geoMapDetId(),
               endcapGeometry.geoMapDetId_buf.data(),
               endcapGeometry.nEndCapMap * sizeof(unsigned int));
-  std::memcpy(endcapGeometryBuffers.geoMapPhi_buf.data(),
+  std::memcpy(endcapGeometryDev->view().geoMapPhi(),
               endcapGeometry.geoMapPhi_buf.data(),
               endcapGeometry.nEndCapMap * sizeof(float));
 
@@ -113,6 +113,6 @@ std::unique_ptr<lst::LSTESData<alpaka_common::DevHost>> lst::loadAndFillESHost()
                                                              nPixels,
                                                              endcapGeometry.nEndCapMap,
                                                              std::move(modulesBuffers),
-                                                             std::move(endcapGeometryBuffers),
+                                                             std::move(endcapGeometryDev),
                                                              pixelMappingPtr);
 }

RecoTracker/LSTCore/src/alpaka/Event.dev.cc

@@ -139,8 +139,7 @@ void Event::addHitToEvent(std::vector<float> const& x,
                       TwoS,
                       nModules_,
                       nEndCapMap_,
-                      endcapGeometryBuffers_.geoMapDetId_buf.data(),
-                      endcapGeometryBuffers_.geoMapPhi_buf.data(),
+                      endcapGeometry_.const_view(),
                       *modulesBuffers_.data(),
                       hitsDC_->view<HitsSoA>(),
                       hitsDC_->view<HitsOccupancySoA>(),

RecoTracker/LSTCore/src/alpaka/Event.h

@@ -8,6 +8,7 @@
 #include "RecoTracker/LSTCore/interface/alpaka/LST.h"
 #include "RecoTracker/LSTCore/interface/Module.h"
 #include "RecoTracker/LSTCore/interface/alpaka/ObjectRangesDeviceCollection.h"
+#include "RecoTracker/LSTCore/interface/alpaka/EndcapGeometryDevDeviceCollection.h"
 
 #include "Hit.h"
 #include "Segment.h"
@@ -78,7 +79,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
     const unsigned int nEndCapMap_;
     ModulesBuffer<Device> const& modulesBuffers_;
     PixelMap const& pixelMapping_;
-    EndcapGeometryBuffer<Device> const& endcapGeometryBuffers_;
+    EndcapGeometryDevDeviceCollection const& endcapGeometry_;
 
   public:
     // Constructor used for CMSSW integration. Uses an external queue.
@@ -91,7 +92,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
           nEndCapMap_(deviceESData->nEndCapMap),
           modulesBuffers_(deviceESData->modulesBuffers),
           pixelMapping_(*deviceESData->pixelMapping),
-          endcapGeometryBuffers_(deviceESData->endcapGeometryBuffers) {
+          endcapGeometry_(*deviceESData->endcapGeometry) {
       initSync(verbose);
     }
     void resetEventSync();  // synchronizes

RecoTracker/LSTCore/src/alpaka/Hit.h

@@ -103,17 +103,18 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
   struct HitLoopKernel {
     template <typename TAcc>
     ALPAKA_FN_ACC void operator()(TAcc const& acc,
-                                  uint16_t Endcap,                  // Integer corresponding to endcap in module subdets
-                                  uint16_t TwoS,                    // Integer corresponding to TwoS in moduleType
-                                  unsigned int nModules,            // Number of modules
-                                  unsigned int nEndCapMap,          // Number of elements in endcap map
-                                  const unsigned int* geoMapDetId,  // DetId's from endcap map
-                                  const float* geoMapPhi,           // Phi values from endcap map
+                                  uint16_t Endcap,          // Integer corresponding to endcap in module subdets
+                                  uint16_t TwoS,            // Integer corresponding to TwoS in moduleType
+                                  unsigned int nModules,    // Number of modules
+                                  unsigned int nEndCapMap,  // Number of elements in endcap map
+                                  EndcapGeometryDevConst endcapGeometry,
                                   Modules modulesInGPU,
                                   Hits hits,
                                   HitsOccupancy hitsOccupancy,
                                   unsigned int nHits) const  // Total number of hits in event
     {
+      auto geoMapDetId = endcapGeometry.geoMapDetId();  // DetId's from endcap map
+      auto geoMapPhi = endcapGeometry.geoMapPhi();      // Phi values from endcap map
       auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
       auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
       for (unsigned int ihit = globalThreadIdx[2]; ihit < nHits; ihit += gridThreadExtent[2]) {