Merge pull request cms-sw#23 from fwyzard/update_SiPixelClusterSoA_di…

…ctionaries Update `SiPixelClusterSoA` dictionaries
missirol · Jun 29, 2023 · f1c7226 · f1c7226
2 parents e289d31 + cc855ee
commit f1c7226
Show file tree

Hide file tree

Showing 23 changed files with 73 additions and 89 deletions.
diff --git a/DataFormats/SiPixelClusterSoA/interface/SiPixelClustersDevice.h b/DataFormats/SiPixelClusterSoA/interface/SiPixelClustersDevice.h
@@ -6,22 +6,22 @@
 #include "HeterogeneousCore/AlpakaInterface/interface/config.h"
 #include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersHost.h"
 #include "DataFormats/Portable/interface/PortableDeviceCollection.h"
-#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersLayout.h"
+#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersSoA.h"
 #include "HeterogeneousCore/AlpakaInterface/interface/CopyToHost.h"
 
 template <typename TDev>
-class SiPixelClustersDevice : public PortableDeviceCollection<SiPixelClustersLayout<>, TDev> {
+class SiPixelClustersDevice : public PortableDeviceCollection<SiPixelClustersSoA, TDev> {
 public:
   SiPixelClustersDevice() = default;
   ~SiPixelClustersDevice() = default;
 
   template <typename TQueue>
   explicit SiPixelClustersDevice(size_t maxModules, TQueue queue)
-      : PortableDeviceCollection<SiPixelClustersLayout<>, TDev>(maxModules + 1, queue) {}
+      : PortableDeviceCollection<SiPixelClustersSoA, TDev>(maxModules + 1, queue) {}
 
   // Constructor which specifies the SoA size
   explicit SiPixelClustersDevice(size_t maxModules, TDev const &device)
-      : PortableDeviceCollection<SiPixelClustersLayout<>, TDev>(maxModules + 1, device) {}
+      : PortableDeviceCollection<SiPixelClustersSoA, TDev>(maxModules + 1, device) {}
 
   SiPixelClustersDevice(SiPixelClustersDevice &&) = default;
   SiPixelClustersDevice &operator=(SiPixelClustersDevice &&) = default;
@@ -39,4 +39,4 @@ class SiPixelClustersDevice : public PortableDeviceCollection<SiPixelClustersLay
   int32_t offsetBPIX2_h = 0;
 };
 
-#endif  // DataFormats_SiPixelClusterSoA_interface_SiPixelClustersDevice_h
+#endif  // DataFormats_SiPixelClusterSoA_interface_SiPixelClustersDevice_h
diff --git a/DataFormats/SiPixelClusterSoA/interface/SiPixelClustersHost.h b/DataFormats/SiPixelClusterSoA/interface/SiPixelClustersHost.h
@@ -4,20 +4,19 @@
 #include <alpaka/alpaka.hpp>
 #include "HeterogeneousCore/AlpakaInterface/interface/config.h"
 #include "DataFormats/Portable/interface/PortableHostCollection.h"
-
-#include "SiPixelClustersLayout.h"
+#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersSoA.h"
 
 // TODO: The class is created via inheritance of the PortableCollection.
 // This is generally discouraged, and should be done via composition.
 // See: https://github.com/cms-sw/cmssw/pull/40465#discussion_r1067364306
-class SiPixelClustersHost : public PortableHostCollection<SiPixelClustersLayout<>> {
+class SiPixelClustersHost : public PortableHostCollection<SiPixelClustersSoA> {
 public:
   SiPixelClustersHost() = default;
   ~SiPixelClustersHost() = default;
 
   template <typename TQueue>
   explicit SiPixelClustersHost(size_t maxModules, TQueue queue)
-      : PortableHostCollection<SiPixelClustersLayout<>>(maxModules + 1, queue) {}
+      : PortableHostCollection<SiPixelClustersSoA>(maxModules + 1, queue) {}
 
   SiPixelClustersHost(SiPixelClustersHost &&) = default;
   SiPixelClustersHost &operator=(SiPixelClustersHost &&) = default;
@@ -35,4 +34,4 @@ class SiPixelClustersHost : public PortableHostCollection<SiPixelClustersLayout<
   int32_t offsetBPIX2_h = 0;
 };
 
-#endif  // DataFormats_SiPixelClusterSoA_interface_SiPixelClustersHost_h
+#endif  // DataFormats_SiPixelClusterSoA_interface_SiPixelClustersHost_h
diff --git a/...sterSoA/interface/SiPixelClustersLayout.h → ...ClusterSoA/interface/SiPixelClustersSoA.h b/...sterSoA/interface/SiPixelClustersLayout.h → ...ClusterSoA/interface/SiPixelClustersSoA.h
@@ -9,8 +9,8 @@ GENERATE_SOA_LAYOUT(SiPixelClustersLayout,
                     SOA_COLUMN(uint32_t, moduleId),
                     SOA_COLUMN(uint32_t, clusModuleStart))
 
-using SiPixelClustersLayoutSoA = SiPixelClustersLayout<>;
-using SiPixelClustersLayoutSoAView = SiPixelClustersLayout<>::View;
-using SiPixelClustersLayoutSoAConstView = SiPixelClustersLayout<>::ConstView;
+using SiPixelClustersSoA = SiPixelClustersLayout<>;
+using SiPixelClustersSoAView = SiPixelClustersSoA::View;
+using SiPixelClustersSoAConstView = SiPixelClustersSoA::ConstView;
 
 #endif  // DataFormats_SiPixelClusterSoA_SiPixelClustersLayout_h
diff --git a/DataFormats/SiPixelClusterSoA/interface/alpaka/SiPixelClustersCollection.h b/DataFormats/SiPixelClusterSoA/interface/alpaka/SiPixelClustersCollection.h
@@ -2,13 +2,15 @@
 #define DataFormats_SiPixelClusterSoA_interface_alpaka_SiPixelClustersCollection_h
 
 #include <cstdint>
+
 #include <alpaka/alpaka.hpp>
-#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
-#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersHost.h"
-#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersDevice.h"
+
 #include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
-#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersLayout.h"
+#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersDevice.h"
+#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersHost.h"
+#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersSoA.h"
 #include "HeterogeneousCore/AlpakaInterface/interface/CopyToHost.h"
+#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
 
 // TODO: The class is created via inheritance of the PortableCollection.
 // This is generally discouraged, and should be done via composition.
@@ -18,16 +20,14 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
   using SiPixelClustersCollection = SiPixelClustersHost;
 #else
   using SiPixelClustersCollection = SiPixelClustersDevice<Device>;
-
 #endif
-  using SiPixelClustersSoA = SiPixelClustersCollection;
 }  // namespace ALPAKA_ACCELERATOR_NAMESPACE
 
 namespace cms::alpakatools {
   template <>
-  struct CopyToHost<ALPAKA_ACCELERATOR_NAMESPACE::SiPixelClustersSoA> {
+  struct CopyToHost<ALPAKA_ACCELERATOR_NAMESPACE::SiPixelClustersCollection> {
     template <typename TQueue>
-    static auto copyAsync(TQueue &queue, ALPAKA_ACCELERATOR_NAMESPACE::SiPixelClustersSoA const &srcData) {
+    static auto copyAsync(TQueue &queue, ALPAKA_ACCELERATOR_NAMESPACE::SiPixelClustersCollection const &srcData) {
       SiPixelClustersHost dstData(srcData->metadata().size(), queue);
       alpaka::memcpy(queue, dstData.buffer(), srcData.buffer());
       dstData.setNClusters(srcData.nClusters(), srcData.offsetBPIX2());
@@ -36,4 +36,4 @@ namespace cms::alpakatools {
   };
 }  // namespace cms::alpakatools
 
-#endif  // DataFormats_SiPixelClusterSoA_interface_alpaka_SiPixelClustersCollection_h
+#endif  // DataFormats_SiPixelClusterSoA_interface_alpaka_SiPixelClustersCollection_h
diff --git a/DataFormats/SiPixelClusterSoA/src/alpaka/classes_cuda.h b/DataFormats/SiPixelClusterSoA/src/alpaka/classes_cuda.h
@@ -1,11 +1,8 @@
-#ifndef DataFormats_SiPixelClusterSoA_Alpaka_Classes_CUDA_h
-#define DataFormats_SiPixelClusterSoA_Alpaka_Classes_CUDA_h
+#ifndef DataFormats_SiPixelClusterSoA_src_alpaka_classes_cuda_h
+#define DataFormats_SiPixelClusterSoA_src_alpaka_classes_cuda_h
 
 #include "DataFormats/Common/interface/Wrapper.h"
 #include "DataFormats/Common/interface/DeviceProduct.h"
-#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersLayout.h"
 #include "DataFormats/SiPixelClusterSoA/interface/alpaka/SiPixelClustersCollection.h"
-#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersDevice.h"
-#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersHost.h"
 
-#endif  // DataFormats_SiPixelClusterSoA_Alpaka_Classes_CUDA_h
+#endif  // DataFormats_SiPixelClusterSoA_src_alpaka_classes_cuda_h
diff --git a/DataFormats/SiPixelClusterSoA/src/alpaka/classes_cuda_def.xml b/DataFormats/SiPixelClusterSoA/src/alpaka/classes_cuda_def.xml
@@ -1,17 +1,6 @@
 <lcgdict>
-  <!--
-  <class name="alpaka_cuda_async::SiPixelClustersDevice" persistent="false"/>
-  <class name="edm::Wrapper<alpaka_cuda_async::SiPixelClustersDevice>" persistent="false"/>
-  -->
-  <!-- <class name="alpaka_cuda_async::SiPixelClustersSoA" persistent="false"/>
-  <class name="edm::Wrapper<alpaka_cuda_async::SiPixelClustersSoA>" persistent="false"/>
-  -->
-  <!--
-  <class name="edm::DeviceProduct<alpaka_cuda_async::SiPixelClustersSoA>" persistent="false"/>
-  <class name="edm::Wrapper<edm::DeviceProduct<alpaka_cuda_async::SiPixelClustersSoA>>" persistent="false"/>
-  -->
-  <class name="PortableDeviceCollection<SiPixelClustersLayoutSoA, alpaka::DevUniformCudaHipRt<alpaka::ApiCudaRt>>" persistent="false"/>
-  <class name="SiPixelClustersDevice<alpaka::DevUniformCudaHipRt<alpaka::ApiCudaRt>>" persistent="false"/>
-  <class name="edm::DeviceProduct<SiPixelClustersDevice<alpaka::DevUniformCudaHipRt<alpaka::ApiCudaRt>>>" persistent="false"/>
-  <class name="edm::Wrapper<edm::DeviceProduct<SiPixelClustersDevice<alpaka::DevUniformCudaHipRt<alpaka::ApiCudaRt>>>>" persistent="false"/>
+  <class name="alpaka_cuda_async::PortableCollection<SiPixelClustersSoA>" persistent="false"/>
+  <class name="alpaka_cuda_async::SiPixelClustersCollection" persistent="false"/>
+  <class name="edm::DeviceProduct<alpaka_cuda_async::SiPixelClustersCollection>" persistent="false"/>
+  <class name="edm::Wrapper<edm::DeviceProduct<alpaka_cuda_async::SiPixelClustersCollection>>" persistent="false"/>
 </lcgdict>
diff --git a/DataFormats/SiPixelClusterSoA/src/alpaka/classes_rocm.h b/DataFormats/SiPixelClusterSoA/src/alpaka/classes_rocm.h
@@ -1,10 +1,8 @@
-#ifndef DataFormats_SiPixelClusterSoA_Alpaka_Classes_rocm_h
-#define DataFormats_SiPixelClusterSoA_Alpaka_Classes_rocm_h
+#ifndef DataFormats_SiPixelClusterSoA_src_alpaka_classes_rocm_h
+#define DataFormats_SiPixelClusterSoA_src_alpaka_classes_rocm_h
 
 #include "DataFormats/Common/interface/Wrapper.h"
 #include "DataFormats/Common/interface/DeviceProduct.h"
-#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersLayout.h"
 #include "DataFormats/SiPixelClusterSoA/interface/alpaka/SiPixelClustersCollection.h"
-#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersDevice.h"
 
-#endif  // DataFormats_SiPixelClusterSoA_Alpaka_Classes_rocm_h
+#endif  // DataFormats_SiPixelClusterSoA_src_alpaka_classes_rocm_h
diff --git a/DataFormats/SiPixelClusterSoA/src/alpaka/classes_rocm_def.xml b/DataFormats/SiPixelClusterSoA/src/alpaka/classes_rocm_def.xml
@@ -1,4 +1,6 @@
 <lcgdict>
-  <class name="alpaka_rocm_async::SiPixelClustersSoA" persistent="false"/>
-  <class name="edm::Wrapper<alpaka_rocm_async::SiPixelClustersSoA>" persistent="false"/>
-</lcgdict>
+  <class name="alpaka_rocm_async::PortableCollection<SiPixelClustersSoA>" persistent="false"/>
+  <class name="alpaka_rocm_async::SiPixelClustersCollection" persistent="false"/>
+  <class name="edm::DeviceProduct<alpaka_rocm_async::SiPixelClustersCollection>" persistent="false"/>
+  <class name="edm::Wrapper<edm::DeviceProduct<alpaka_rocm_async::SiPixelClustersCollection>>" persistent="false"/>
+</lcgdict>
diff --git a/DataFormats/SiPixelClusterSoA/src/classes.h b/DataFormats/SiPixelClusterSoA/src/classes.h
@@ -2,7 +2,6 @@
 #define DataFormats_SiPixelClusterSoA_src_classes_h
 
 #include "DataFormats/Common/interface/Wrapper.h"
-#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersLayout.h"
 #include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersHost.h"
 
-#endif  // DataFormats_SiPixelClusterSoA_src_classes_h
+#endif  // DataFormats_SiPixelClusterSoA_src_classes_h
diff --git a/DataFormats/SiPixelClusterSoA/src/classes_def.xml b/DataFormats/SiPixelClusterSoA/src/classes_def.xml
@@ -1,19 +1,19 @@
 <lcgdict>
-  <class name="SiPixelClustersLayoutSoA"/>
-  <class name="SiPixelClustersLayoutSoA::View"/>
-  <class name="PortableHostCollection<SiPixelClustersLayoutSoA>"/>
+  <class name="SiPixelClustersSoA"/>
+  <class name="SiPixelClustersSoA::View"/>
+  <class name="PortableHostCollection<SiPixelClustersSoA>"/>
   <read
-    sourceClass="PortableHostCollection<SiPixelClustersLayoutSoA>"
-    targetClass="PortableHostCollection<SiPixelClustersLayoutSoA>"
+    sourceClass="PortableHostCollection<SiPixelClustersSoA>"
+    targetClass="PortableHostCollection<SiPixelClustersSoA>"
     version="[1-]"
-    source="SiPixelClustersLayoutSoA layout_;"
+    source="SiPixelClustersSoA layout_;"
     target="buffer_"
     embed="false">
   <![CDATA[
-    PortableHostCollection<SiPixelClustersLayoutSoA>::ROOTReadStreamer(newObj, onfile.layout_);
+    PortableHostCollection<SiPixelClustersSoA>::ROOTReadStreamer(newObj, onfile.layout_);
   ]]>
   </read>
 
   <class name="SiPixelClustersHost"/>
   <class name="edm::Wrapper<SiPixelClustersHost>" splitLevel="0"/>
-</lcgdict>
+</lcgdict>
diff --git a/DataFormats/SiPixelClusterSoA/test/alpaka/Clusters_test.cc b/DataFormats/SiPixelClusterSoA/test/alpaka/Clusters_test.cc
@@ -4,7 +4,7 @@
 #include "DataFormats/SiPixelClusterSoA/interface/alpaka/SiPixelClustersCollection.h"
 #include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersDevice.h"
 #include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersHost.h"
-#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersLayout.h"
+#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersSoA.h"
 
 #include "HeterogeneousCore/AlpakaInterface/interface/devices.h"
 #include "HeterogeneousCore/AlpakaInterface/interface/host.h"
@@ -17,7 +17,7 @@ using namespace ALPAKA_ACCELERATOR_NAMESPACE;
 namespace ALPAKA_ACCELERATOR_NAMESPACE {
   namespace testClusterSoA {
 
-    void runKernels(SiPixelClustersLayoutSoAView clust_view, Queue& queue);
+    void runKernels(SiPixelClustersSoAView clust_view, Queue& queue);
   }
 }  // namespace ALPAKA_ACCELERATOR_NAMESPACE
 
@@ -30,7 +30,7 @@ int main() {
   {
     // Instantiate tracks on device. PortableDeviceCollection allocates
     // SoA on device automatically.
-    SiPixelClustersSoA clusters_d(100, queue);
+    SiPixelClustersCollection clusters_d(100, queue);
     testClusterSoA::runKernels(clusters_d.view(), queue);
 
     // Instantate tracks on host. This is where the data will be

diff --git a/DataFormats/SiPixelClusterSoA/test/alpaka/Clusters_test.dev.cc b/DataFormats/SiPixelClusterSoA/test/alpaka/Clusters_test.dev.cc
@@ -14,7 +14,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
     class TestFillKernel {
     public:
       template <typename TAcc, typename = std::enable_if_t<isAccelerator<TAcc>>>
-      ALPAKA_FN_ACC void operator()(TAcc const& acc, SiPixelClustersLayoutSoAView clust_view) const {
+      ALPAKA_FN_ACC void operator()(TAcc const& acc, SiPixelClustersSoAView clust_view) const {
         for (int32_t j : elements_with_stride(acc, clust_view.metadata().size())) {
           clust_view[j].moduleStart() = j;
           clust_view[j].clusInModule() = j * 2;
@@ -27,7 +27,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
     class TestVerifyKernel {
     public:
       template <typename TAcc, typename = std::enable_if_t<isAccelerator<TAcc>>>
-      ALPAKA_FN_ACC void operator()(TAcc const& acc, SiPixelClustersLayoutSoAConstView clust_view) const {
+      ALPAKA_FN_ACC void operator()(TAcc const& acc, SiPixelClustersSoAConstView clust_view) const {
         for (uint32_t j : elements_with_stride(acc, clust_view.metadata().size())) {
           assert(clust_view[j].moduleStart() == j);
           assert(clust_view[j].clusInModule() == j * 2);
@@ -37,7 +37,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
       }
     };
 
-    void runKernels(SiPixelClustersLayoutSoAView clust_view, Queue& queue) {
+    void runKernels(SiPixelClustersSoAView clust_view, Queue& queue) {
       uint32_t items = 64;
       uint32_t groups = divide_up_by(clust_view.metadata().size(), items);
       auto workDiv = make_workdiv<Acc1D>(groups, items);

diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/CalibPixel.h b/RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/CalibPixel.h
@@ -11,7 +11,7 @@
 #include "CondFormats/SiPixelObjects/interface/alpaka/SiPixelGainCalibrationForHLTDevice.h"
 #include "CondFormats/SiPixelObjects/interface/alpaka/SiPixelGainCalibrationForHLTUtilities.h"
 #include "DataFormats/SiPixelClusterSoA/interface/ClusteringConstants.h"
-#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersLayout.h"
+#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersSoA.h"
 #include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsLayout.h"
 #include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisLayout.h"
 #include "HeterogeneousCore/AlpakaInterface/interface/config.h"
@@ -42,7 +42,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
       ALPAKA_FN_ACC void operator()(const TAcc& acc,
                                     bool isRun2,
                                     SiPixelDigisLayoutSoAView view,
-                                    SiPixelClustersLayoutSoAView clus_view,
+                                    SiPixelClustersSoAView clus_view,
                                     const SiPixelGainCalibrationForHLTSoAConstView gains,
                                     int numElements) const {
         const uint32_t threadIdxGlobal(alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc)[0u]);
@@ -93,7 +93,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
     //   template <typename TAcc>
     //   ALPAKA_FN_ACC void operator()(const TAcc& acc,
     //                                 SiPixelDigisLayoutSoAView& view,
-    //                                 SiPixelClustersLayoutSoAView& clus_view,
+    //                                 SiPixelClustersSoAView& clus_view,
     //                                 int numElements
     //   ) const {
     //     const uint32_t threadIdxGlobal(alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc)[0u]);

diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/ClusterChargeCut.h b/RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/ClusterChargeCut.h
@@ -8,7 +8,7 @@
 #include "HeterogeneousCore/AlpakaInterface/interface/prefixScan.h"
 #include "DataFormats/SiPixelClusterSoA/interface/ClusteringConstants.h"
 #include "RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterThresholds.h"
-#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersLayout.h"
+#include "DataFormats/SiPixelClusterSoA/interface/SiPixelClustersSoA.h"
 #include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisLayout.h"
 
 // namespace ALPAKA_ACCELERATOR_NAMESPACE {
@@ -20,7 +20,7 @@ namespace pixelClustering {
     ALPAKA_FN_ACC void operator()(
         const TAcc& acc,
         SiPixelDigisLayoutSoAView digi_view,
-        SiPixelClustersLayoutSoAView clus_view,
+        SiPixelClustersSoAView clus_view,
         SiPixelClusterThresholds
             clusterThresholds,  // charge cut on cluster in electrons (for layer 1 and for other layers)
         const uint32_t numElements) const {
@@ -178,4 +178,4 @@ namespace pixelClustering {
 
 }  // namespace pixelClustering
 
-#endif  //
+#endif  //
diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/PixelClustering.h b/RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/PixelClustering.h
@@ -88,7 +88,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
       template <typename TAcc>
       ALPAKA_FN_ACC void operator()(const TAcc& acc,
                                     SiPixelDigisLayoutSoAView digi_view,
-                                    SiPixelClustersLayoutSoAView clus_view,
+                                    SiPixelClustersSoAView clus_view,
                                     const unsigned int numElements) const {
         [[maybe_unused]] constexpr int nMaxModules = TrackerTraits::numberOfModules;
 
@@ -115,7 +115,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
       template <typename TAcc>
       ALPAKA_FN_ACC void operator()(const TAcc& acc,
                                     SiPixelDigisLayoutSoAView digi_view,
-                                    SiPixelClustersLayoutSoAView clus_view,
+                                    SiPixelClustersSoAView clus_view,
                                     const unsigned int numElements) const {
         const uint32_t blockIdx(alpaka::getIdx<alpaka::Grid, alpaka::Blocks>(acc)[0u]);
         if (blockIdx >= clus_view[0].moduleStart())

diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/SiPixelPhase2DigiToCluster.cc b/RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/SiPixelPhase2DigiToCluster.cc
@@ -68,7 +68,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
 
     device::EDPutToken<SiPixelDigisSoA> digiPutToken_;
     device::EDPutToken<SiPixelDigiErrorsSoA> digiErrorPutToken_;
-    device::EDPutToken<SiPixelClustersSoA> clusterPutToken_;
+    device::EDPutToken<SiPixelClustersCollection> clusterPutToken_;
 
     pixelDetails::SiPixelRawToClusterKernel Algo_;
 
@@ -148,7 +148,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
 
   void SiPixelPhase2DigiToCluster::produce(device::Event& iEvent, device::EventSetup const& iSetup) {
     if (nDigis_ == 0) {
-      SiPixelClustersSoA clusters_d = SiPixelClustersSoA(pixelTopology::Phase1::numberOfModules, iEvent.queue());
+      SiPixelClustersCollection clusters_d{pixelTopology::Phase1::numberOfModules, iEvent.queue()};
       iEvent.emplace(digiPutToken_, std::move(digis_d));
       iEvent.emplace(clusterPutToken_, std::move(clusters_d));
       if (includeErrors_) {

diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/SiPixelRawToCluster.cc b/RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/SiPixelRawToCluster.cc
@@ -75,7 +75,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
     edm::EDPutTokenT<SiPixelFormatterErrors> fmtErrorToken_;
     device::EDPutToken<SiPixelDigisSoA> digiPutToken_;
     device::EDPutToken<SiPixelDigiErrorsSoA> digiErrorPutToken_;
-    device::EDPutToken<SiPixelClustersSoA> clusterPutToken_;
+    device::EDPutToken<SiPixelClustersCollection> clusterPutToken_;
 
     edm::ESWatcher<SiPixelFedCablingMapRcd> recordWatcher_;
     const device::ESGetToken<SiPixelMappingDevice, SiPixelMappingSoARecord> mapToken_;
@@ -283,7 +283,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
       // are no valid pointers to clusters' Collection columns, instantiation
       // of TrackingRecHits fail. Example: workflow 11604.0
       SiPixelDigisSoA digis_d = SiPixelDigisSoA(nDigis_, iEvent.queue());
-      SiPixelClustersSoA clusters_d = SiPixelClustersSoA(pixelTopology::Phase1::numberOfModules, iEvent.queue());
+      SiPixelClustersCollection clusters_d{pixelTopology::Phase1::numberOfModules, iEvent.queue()};
       iEvent.emplace(digiPutToken_, std::move(digis_d));
       iEvent.emplace(clusterPutToken_, std::move(clusters_d));
       if (includeErrors_) {