Merge pull request cms-sw#25 from fwyzard/update_SiPixelDigisSoA_dict…

…ionaries

Update the `SiPixelDigisSoA` data formats and dictionaries

DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsDevice.h

@@ -2,22 +2,24 @@
 #define DataFormats_SiPixelDigiSoA_interface_SiPixelDigiErrorsDevice_h
 
 #include <cstdint>
+
 #include <alpaka/alpaka.hpp>
-#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
-// #include "HeterogeneousCore/AlpakaInterface/interface/memory.h"
+
 #include "DataFormats/Portable/interface/PortableDeviceCollection.h"
-#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsLayout.h"
+#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsSoA.h"
 // #include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsHost.h"
 #include "DataFormats/SiPixelRawData/interface/SiPixelErrorCompact.h"
 #include "HeterogeneousCore/AlpakaInterface/interface/SimpleVector.h"
+#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
+// #include "HeterogeneousCore/AlpakaInterface/interface/memory.h"
 
 template <typename TDev>
-class SiPixelDigiErrorsDevice : public PortableDeviceCollection<SiPixelDigiErrorsLayout<>, TDev> {
+class SiPixelDigiErrorsDevice : public PortableDeviceCollection<SiPixelDigiErrorsSoA, TDev> {
 public:
   SiPixelDigiErrorsDevice() = default;
   template <typename TQueue>
   explicit SiPixelDigiErrorsDevice(size_t maxFedWords, TQueue queue)
-      : PortableDeviceCollection<SiPixelDigiErrorsLayout<>, TDev>(maxFedWords, queue), maxFedWords_(maxFedWords) {
+      : PortableDeviceCollection<SiPixelDigiErrorsSoA, TDev>(maxFedWords, queue), maxFedWords_(maxFedWords) {
     // printf("SiPixelDigiErrorsDevice\n");
     // data_d = cms::alpakatools::make_device_buffer<SiPixelErrorCompact[]>(queue, maxFedWords);
     // error_d = cms::alpakatools::make_device_buffer<cms::alpakatools::SimpleVector<SiPixelErrorCompact>>(queue);
@@ -31,7 +33,7 @@ class SiPixelDigiErrorsDevice : public PortableDeviceCollection<SiPixelDigiError
 
   // Constructor which specifies the SoA size
   explicit SiPixelDigiErrorsDevice(size_t maxFedWords, TDev const& device)
-      : PortableDeviceCollection<SiPixelDigiErrorsLayout<>, TDev>(maxFedWords, device) {}
+      : PortableDeviceCollection<SiPixelDigiErrorsSoA, TDev>(maxFedWords, device) {}
 
   SiPixelDigiErrorsDevice(SiPixelDigiErrorsDevice&&) = default;
   SiPixelDigiErrorsDevice& operator=(SiPixelDigiErrorsDevice&&) = default;

DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsHost.h

@@ -2,21 +2,23 @@
 #define DataFormats_SiPixelDigiSoA_interface_SiPixelDigiErrorsHost_h
 
 #include <utility>
+
 #include <alpaka/alpaka.hpp>
-#include "DataFormats/SiPixelRawData/interface/SiPixelErrorCompact.h"
-#include "HeterogeneousCore/AlpakaInterface/interface/memory.h"
+
 #include "DataFormats/Portable/interface/PortableHostCollection.h"
+#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsSoA.h"
+#include "DataFormats/SiPixelRawData/interface/SiPixelErrorCompact.h"
 #include "HeterogeneousCore/AlpakaInterface/interface/SimpleVector.h"
-#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsLayout.h"
+#include "HeterogeneousCore/AlpakaInterface/interface/memory.h"
 
-class SiPixelDigiErrorsHost : public PortableHostCollection<SiPixelDigiErrorsLayout<>> {
+class SiPixelDigiErrorsHost : public PortableHostCollection<SiPixelDigiErrorsSoA> {
 public:
   SiPixelDigiErrorsHost() = default;
   // template <typename TQueue>
   // explicit SiPixelDigiErrorsHost(int maxFedWords,
   //                                cms::alpakatools::host_buffer<SiPixelErrorCompact[]> data,
   //                                TQueue queue)
-  //     : PortableHostCollection<SiPixelDigiErrorsLayout<>>(maxFedWords, queue), maxFedWords_(maxFedWords) {
+  //     : PortableHostCollection<SiPixelDigiErrorsSoA>(maxFedWords, queue), maxFedWords_(maxFedWords) {
   //   printf("SiPixelDigiErrorsHost\n");
   //   // view().pixelErrors() = std::move(data.data());
   //   // error_h = cms::alpakatools::make_host_buffer<cms::alpakatools::SimpleVector<SiPixelErrorCompact>>();
@@ -26,7 +28,7 @@ class SiPixelDigiErrorsHost : public PortableHostCollection<SiPixelDigiErrorsLay
   // }
   template <typename TQueue>
   explicit SiPixelDigiErrorsHost(int maxFedWords, TQueue queue)
-      : PortableHostCollection<SiPixelDigiErrorsLayout<>>(maxFedWords, queue), maxFedWords_(maxFedWords) {
+      : PortableHostCollection<SiPixelDigiErrorsSoA>(maxFedWords, queue), maxFedWords_(maxFedWords) {
     // printf("SiPixelDigiErrorsHost\n");
     // data_h = cms::alpakatools::make_host_buffer<SiPixelErrorCompact[]>(nErrorWords);
     // error_h = cms::alpakatools::make_host_buffer<cms::alpakatools::SimpleVector<SiPixelErrorCompact>>();
@@ -59,4 +61,4 @@ class SiPixelDigiErrorsHost : public PortableHostCollection<SiPixelDigiErrorsLay
   // std::optional<cms::alpakatools::host_buffer<cms::alpakatools::SimpleVector<SiPixelErrorCompact>>> error_h;
 };
 
-#endif  // DataFormats_SiPixelDigiSoA_interface_SiPixelDigiErrorsHost_h
+#endif  // DataFormats_SiPixelDigiSoA_interface_SiPixelDigiErrorsHost_h

DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsLayout.h → DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsSoA.h

@@ -1,5 +1,5 @@
-#ifndef DataFormats_SiPixelDigi_SiPixelDigiErrorsLayout_h
-#define DataFormats_SiPixelDigi_SiPixelDigiErrorsLayout_h
+#ifndef DataFormats_SiPixelDigiSoA_interface_SiPixelDigiErrorsSoA_h
+#define DataFormats_SiPixelDigiSoA_interface_SiPixelDigiErrorsSoA_h
 
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 #include "DataFormats/SiPixelRawData/interface/SiPixelErrorCompact.h"
@@ -12,8 +12,8 @@ GENERATE_SOA_LAYOUT(SiPixelDigiErrorsLayout,
                     SOA_SCALAR(uint32_t, size))  //,
 // SOA_SCALAR(SiPixelErrorCompactVec, pixelErrorsVec))
 
-using SiPixelDigiErrorsLayoutSoA = SiPixelDigiErrorsLayout<>;
-using SiPixelDigiErrorsLayoutSoAView = SiPixelDigiErrorsLayout<>::View;
-using SiPixelDigiErrorsLayoutSoAConstView = SiPixelDigiErrorsLayout<>::ConstView;
+using SiPixelDigiErrorsSoA = SiPixelDigiErrorsLayout<>;
+using SiPixelDigiErrorsSoAView = SiPixelDigiErrorsSoA::View;
+using SiPixelDigiErrorsSoAConstView = SiPixelDigiErrorsSoA::ConstView;
 
-#endif  // DataFormats_SiPixelDigi_SiPixelDigisErrorLayout_h
+#endif  // DataFormats_SiPixelDigiSoA_interface_SiPixelDigiErrorsSoA_h

DataFormats/SiPixelDigiSoA/interface/SiPixelDigisDevice.h

@@ -2,24 +2,25 @@
 #define DataFormats_SiPixelDigiSoA_interface_SiPixelDigisDevice_h
 
 #include <cstdint>
+
 #include <alpaka/alpaka.hpp>
-#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
+
 #include "DataFormats/Portable/interface/PortableDeviceCollection.h"
-#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisHost.h"
-#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisLayout.h"
+#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisSoAv2.h"
+#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
 
 template <typename TDev>
-class SiPixelDigisDevice : public PortableDeviceCollection<SiPixelDigisLayout<>, TDev> {
+class SiPixelDigisDevice : public PortableDeviceCollection<SiPixelDigisSoAv2, TDev> {
 public:
   SiPixelDigisDevice() = default;
   template <typename TQueue>
   explicit SiPixelDigisDevice(size_t maxFedWords, TQueue queue)
-      : PortableDeviceCollection<SiPixelDigisLayout<>, TDev>(maxFedWords + 1, queue) {}
+      : PortableDeviceCollection<SiPixelDigisSoAv2, TDev>(maxFedWords + 1, queue) {}
   ~SiPixelDigisDevice() = default;
 
   // Constructor which specifies the SoA size
   explicit SiPixelDigisDevice(size_t maxFedWords, TDev const &device)
-      : PortableDeviceCollection<SiPixelDigisLayout<>, TDev>(maxFedWords + 1, device) {}
+      : PortableDeviceCollection<SiPixelDigisSoAv2, TDev>(maxFedWords + 1, device) {}
 
   SiPixelDigisDevice(SiPixelDigisDevice &&) = default;
   SiPixelDigisDevice &operator=(SiPixelDigisDevice &&) = default;
@@ -37,4 +38,4 @@ class SiPixelDigisDevice : public PortableDeviceCollection<SiPixelDigisLayout<>,
   uint32_t nDigis_h = 0;
 };
 
-#endif  // DataFormats_SiPixelDigiSoA_interface_SiPixelDigisDevice_h
+#endif  // DataFormats_SiPixelDigiSoA_interface_SiPixelDigisDevice_h

DataFormats/SiPixelDigiSoA/interface/SiPixelDigisHost.h

@@ -1,20 +1,18 @@
 #ifndef DataFormats_SiPixelDigiSoA_interface_SiPixelDigisHost_h
 #define DataFormats_SiPixelDigiSoA_interface_SiPixelDigisHost_h
 
-#include <alpaka/alpaka.hpp>
 #include "DataFormats/Portable/interface/PortableHostCollection.h"
-
-#include "SiPixelDigisLayout.h"
+#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisSoAv2.h"
 
 // TODO: The class is created via inheritance of the PortableDeviceCollection.
 // This is generally discouraged, and should be done via composition.
 // See: https://github.com/cms-sw/cmssw/pull/40465#discussion_r1067364306
-class SiPixelDigisHost : public PortableHostCollection<SiPixelDigisLayout<>> {
+class SiPixelDigisHost : public PortableHostCollection<SiPixelDigisSoAv2> {
 public:
   SiPixelDigisHost() = default;
   template <typename TQueue>
   explicit SiPixelDigisHost(size_t maxFedWords, TQueue queue)
-      : PortableHostCollection<SiPixelDigisLayout<>>(maxFedWords + 1, queue) {}
+      : PortableHostCollection<SiPixelDigisSoAv2>(maxFedWords + 1, queue) {}
   ~SiPixelDigisHost() = default;
 
   SiPixelDigisHost(SiPixelDigisHost &&) = default;
@@ -33,4 +31,4 @@ class SiPixelDigisHost : public PortableHostCollection<SiPixelDigisLayout<>> {
   uint32_t nDigis_h = 0;
 };
 
-#endif  // DataFormats_SiPixelDigiSoA_interface_SiPixelDigisHost_h
+#endif  // DataFormats_SiPixelDigiSoA_interface_SiPixelDigisHost_h

DataFormats/SiPixelDigiSoA/interface/SiPixelDigisLayout.h → DataFormats/SiPixelDigiSoA/interface/SiPixelDigisSoAv2.h

@@ -1,5 +1,5 @@
-#ifndef DataFormats_SiPixelDigi_SiPixelDigisLayout_h
-#define DataFormats_SiPixelDigi_SiPixelDigisLayout_h
+#ifndef DataFormats_SiPixelDigiSoA_interface_SiPixelDigisSoAv2_h
+#define DataFormats_SiPixelDigiSoA_interface_SiPixelDigisSoAv2_h
 
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 
@@ -12,8 +12,8 @@ GENERATE_SOA_LAYOUT(SiPixelDigisLayout,
                     SOA_COLUMN(uint16_t, yy),
                     SOA_COLUMN(uint16_t, moduleId))
 
-using SiPixelDigisLayoutSoA = SiPixelDigisLayout<>;
-using SiPixelDigisLayoutSoAView = SiPixelDigisLayout<>::View;
-using SiPixelDigisLayoutSoAConstView = SiPixelDigisLayout<>::ConstView;
+using SiPixelDigisSoAv2 = SiPixelDigisLayout<>;
+using SiPixelDigisSoAv2View = SiPixelDigisSoAv2::View;
+using SiPixelDigisSoAv2ConstView = SiPixelDigisSoAv2::ConstView;
 
-#endif  // DataFormats_SiPixelDigi_SiPixelDigisLayout_h
+#endif  // DataFormats_SiPixelDigiSoA_interface_SiPixelDigisSoAv2_h

DataFormats/SiPixelDigiSoA/interface/alpaka/SiPixelDigiErrorsCollection.h

@@ -2,15 +2,15 @@
 #define DataFormats_SiPixelDigiSoA_interface_alpaka_SiPixelDigiErrorsCollection_h
 
 #include <cstdint>
+
 #include <alpaka/alpaka.hpp>
+
 #include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsHost.h"
 #include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsDevice.h"
-#include "DataFormats/SiPixelDigiSoA/interface/alpaka/SiPixelDigiErrorsUtilities.h"
-#include "DataFormats/SiPixelRawData/interface/SiPixelErrorCompact.h"
+//#include "DataFormats/SiPixelDigiSoA/interface/alpaka/SiPixelDigiErrorsUtilities.h"
+//#include "DataFormats/SiPixelRawData/interface/SiPixelErrorCompact.h"
 #include "HeterogeneousCore/AlpakaInterface/interface/config.h"
 #include "HeterogeneousCore/AlpakaInterface/interface/memory.h"
-
-#include "HeterogeneousCore/AlpakaInterface/interface/SimpleVector.h"
 #include "HeterogeneousCore/AlpakaInterface/interface/CopyToHost.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE {
@@ -19,14 +19,13 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
 #else
   using SiPixelDigiErrorsCollection = SiPixelDigiErrorsDevice<Device>;
 #endif
-  using SiPixelDigiErrorsSoA = SiPixelDigiErrorsCollection;
 }  // namespace ALPAKA_ACCELERATOR_NAMESPACE
 
 namespace cms::alpakatools {
   template <>
-  struct CopyToHost<ALPAKA_ACCELERATOR_NAMESPACE::SiPixelDigiErrorsSoA> {
+  struct CopyToHost<ALPAKA_ACCELERATOR_NAMESPACE::SiPixelDigiErrorsCollection> {
     template <typename TQueue>
-    static auto copyAsync(TQueue& queue, ALPAKA_ACCELERATOR_NAMESPACE::SiPixelDigiErrorsSoA const& srcData) {
+    static auto copyAsync(TQueue& queue, ALPAKA_ACCELERATOR_NAMESPACE::SiPixelDigiErrorsCollection const& srcData) {
       // auto error_vector_d = srcData.error_vector();
       // auto error_data_h = cms::alpakatools::make_host_buffer<SiPixelErrorCompact[]>(error_vector_d.capacity());
       // auto error_data_d = srcData.error_data();
@@ -47,4 +46,4 @@ namespace cms::alpakatools {
   };
 }  // namespace cms::alpakatools
 
-#endif  // DataFormats_SiPixelDigiSoA_interface_alpaka_SiPixelDigiErrorsCollection_h
+#endif  // DataFormats_SiPixelDigiSoA_interface_alpaka_SiPixelDigiErrorsCollection_h

DataFormats/SiPixelDigiSoA/interface/alpaka/SiPixelDigiErrorsUtilities.h

@@ -1,29 +1,29 @@
 #ifndef DataFormats_SiPixelDigiSoA_interface_alpaka_SiPixelDigiErrorsUtilities_h
 #define DataFormats_SiPixelDigiSoA_interface_alpaka_SiPixelDigiErrorsUtilities_h
 
-#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsLayout.h"
+#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsSoA.h"
 #include "DataFormats/SiPixelRawData/interface/SiPixelErrorCompact.h"
 #include "HeterogeneousCore/AlpakaInterface/interface/SimpleVector.h"
 
 // ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE static constexpr SiPixelErrorCompactVec* error(
-//     SiPixelDigiErrorsLayoutSoAView& errors) {
+//     SiPixelDigiErrorsSoAView& errors) {
 //   return (&errors.pixelErrorsVec());
 // }
 // ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE static constexpr SiPixelErrorCompactVec const* error(
-//     const SiPixelDigiErrorsLayoutSoAConstView& errors) {
+//     const SiPixelDigiErrorsSoAConstView& errors) {
 //   return (&errors.pixelErrorsVec());
 // }
 // ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE static constexpr SiPixelErrorCompact& error_data(
-//     SiPixelDigiErrorsLayoutSoAView& errors) {
+//     SiPixelDigiErrorsSoAView& errors) {
 //   return (*errors.pixelErrors());
 // }
 // ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE static constexpr SiPixelErrorCompact const& error_data(
-//     const SiPixelDigiErrorsLayoutSoAConstView& errors) {
+//     const SiPixelDigiErrorsSoAConstView& errors) {
 //   return (*errors.pixelErrors());
 // }
 // ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE static constexpr SiPixelErrorCompactVec& error_vector(
-//     SiPixelDigiErrorsLayoutSoAView& errors) {
+//     SiPixelDigiErrorsSoAView& errors) {
 //   return (errors.pixelErrorsVec());
 // }
 
-#endif  // DataFormats_SiPixelDigiSoA_interface_alpaka_SiPixelDigiErrorsUtilities_h
+#endif  // DataFormats_SiPixelDigiSoA_interface_alpaka_SiPixelDigiErrorsUtilities_h

DataFormats/SiPixelDigiSoA/interface/alpaka/SiPixelDigisCollection.h

@@ -1,31 +1,32 @@
-#ifndef DataFormats_SiPixelDigi_interface_alpaka_SiPixelDigisCollection_h
-#define DataFormats_SiPixelDigi_interface_alpaka_SiPixelDigisCollection_h
+#ifndef DataFormats_SiPixelDigiSoA_interface_alpaka_SiPixelDigisCollection_h
+#define DataFormats_SiPixelDigiSoA_interface_alpaka_SiPixelDigisCollection_h
 
 #include <cstdint>
+
 #include <alpaka/alpaka.hpp>
-#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
-#include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
-#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisHost.h"
+
+//#include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
 #include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisDevice.h"
-#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisLayout.h"
+#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisHost.h"
+//#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisSoAv2.h"
 #include "HeterogeneousCore/AlpakaInterface/interface/CopyToHost.h"
+#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE {
 
 #ifdef ALPAKA_ACC_CPU_B_SEQ_T_SEQ_ENABLED
   using SiPixelDigisCollection = SiPixelDigisHost;
 #else
   using SiPixelDigisCollection = SiPixelDigisDevice<Device>;
-
 #endif
-  using SiPixelDigisSoA = SiPixelDigisCollection;
+
 }  // namespace ALPAKA_ACCELERATOR_NAMESPACE
 
 namespace cms::alpakatools {
   template <>
-  struct CopyToHost<ALPAKA_ACCELERATOR_NAMESPACE::SiPixelDigisSoA> {
+  struct CopyToHost<ALPAKA_ACCELERATOR_NAMESPACE::SiPixelDigisCollection> {
     template <typename TQueue>
-    static auto copyAsync(TQueue &queue, ALPAKA_ACCELERATOR_NAMESPACE::SiPixelDigisSoA const &srcData) {
+    static auto copyAsync(TQueue &queue, ALPAKA_ACCELERATOR_NAMESPACE::SiPixelDigisCollection const &srcData) {
       SiPixelDigisHost dstData(srcData.view().metadata().size(), queue);
       alpaka::memcpy(queue, dstData.buffer(), srcData.buffer());
       dstData.setNModulesDigis(srcData.nModules(), srcData.nDigis());
@@ -34,5 +35,4 @@ namespace cms::alpakatools {
   };
 }  // namespace cms::alpakatools
 
-// }  // namespace ALPAKA_ACCELERATOR_NAMESPACE
-#endif  // DataFormats_SiPixelDigi_interface_alpaka_SiPixelDigisCollection_h
+#endif  // DataFormats_SiPixelDigiSoA_interface_alpaka_SiPixelDigisCollection_h

DataFormats/SiPixelDigiSoA/src/alpaka/classes_cuda.h

@@ -1,12 +1,12 @@
 #ifndef DataFormats_SiPixelDigiSoA_Alpaka_Classes_cuda_h
 #define DataFormats_SiPixelDigiSoA_Alpaka_Classes_cuda_h
 
-#include "DataFormats/Common/interface/Wrapper.h"
 #include "DataFormats/Common/interface/DeviceProduct.h"
-#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisLayout.h"
-#include "DataFormats/SiPixelDigiSoA/interface/alpaka/SiPixelDigisCollection.h"
+#include "DataFormats/Common/interface/Wrapper.h"
+#include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
+#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsSoA.h"
+#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisSoAv2.h"
 #include "DataFormats/SiPixelDigiSoA/interface/alpaka/SiPixelDigiErrorsCollection.h"
-#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigisDevice.h"
-#include "DataFormats/SiPixelDigiSoA/interface/SiPixelDigiErrorsDevice.h"
+#include "DataFormats/SiPixelDigiSoA/interface/alpaka/SiPixelDigisCollection.h"
 
-#endif  // DataFormats_SiPixelDigiSoA_src_alpaka_classes_cuda_h
+#endif  // DataFormats_SiPixelDigiSoA_src_alpaka_classes_cuda_h

DataFormats/SiPixelDigiSoA/src/alpaka/classes_cuda_def.xml

@@ -1,11 +1,15 @@
 <lcgdict>
-  <class name="PortableDeviceCollection<SiPixelDigisLayoutSoA, alpaka::DevUniformCudaHipRt<alpaka::ApiCudaRt>>" persistent="false"/>
-  <class name="SiPixelDigisDevice<alpaka::DevUniformCudaHipRt<alpaka::ApiCudaRt>>" persistent="false"/>
-  <class name="edm::DeviceProduct<SiPixelDigisDevice<alpaka::DevUniformCudaHipRt<alpaka::ApiCudaRt>>>" persistent="false"/>
-  <class name="edm::Wrapper<edm::DeviceProduct<SiPixelDigisDevice<alpaka::DevUniformCudaHipRt<alpaka::ApiCudaRt>>>>" persistent="false"/>
+  <!-- SiPixelDigisSoAv2-related collections -->
+  <class name="alpaka_cuda_async::PortableCollection<SiPixelDigisSoAv2>" persistent="false"/>
+  <!-- SiPixelDigisCollection inherits from PortableCollection<SiPixelDigisSoAv2> -->
+  <class name="alpaka_cuda_async::SiPixelDigisCollection" persistent="false"/>
+  <class name="edm::DeviceProduct<alpaka_cuda_async::SiPixelDigisCollection>" persistent="false"/>
+  <class name="edm::Wrapper<edm::DeviceProduct<alpaka_cuda_async::SiPixelDigisCollection>>" persistent="false"/>
 
-  <class name="PortableDeviceCollection<SiPixelDigiErrorsLayoutSoA, alpaka::DevUniformCudaHipRt<alpaka::ApiCudaRt>>" persistent="false"/>
-  <class name="SiPixelDigiErrorsDevice<alpaka::DevUniformCudaHipRt<alpaka::ApiCudaRt>>" persistent="false"/>
-  <class name="edm::DeviceProduct<SiPixelDigiErrorsDevice<alpaka::DevUniformCudaHipRt<alpaka::ApiCudaRt>>>" persistent="false"/>
-  <class name="edm::Wrapper<edm::DeviceProduct<SiPixelDigiErrorsDevice<alpaka::DevUniformCudaHipRt<alpaka::ApiCudaRt>>>>" persistent="false"/>
-</lcgdict>
+  <!-- SiPixelDigiErrors-related collections -->
+  <class name="alpaka_cuda_async::PortableCollection<SiPixelDigiErrorsSoA>" persistent="false"/>
+  <!-- SiPixelDigiErrorsCollection inherits from PortableCollection<SiPixelDigiErrorsSoA> -->
+  <class name="alpaka_cuda_async::SiPixelDigiErrorsCollection" persistent="false"/>
+  <class name="edm::DeviceProduct<alpaka_cuda_async::SiPixelDigiErrorsCollection>" persistent="false"/>
+  <class name="edm::Wrapper<edm::DeviceProduct<alpaka_cuda_async::SiPixelDigiErrorsCollection>>" persistent="false"/>
+</lcgdict>