From 36a8c436166930b6aeaa8eaa3db6d1c8520750ee Mon Sep 17 00:00:00 2001 From: Andres Rios Tascon Date: Mon, 14 Oct 2024 13:51:19 -0700 Subject: [PATCH] Moved MiniDoubletsDeviceCollection definition --- RecoTracker/LSTCore/interface/MiniDoubletsSoA.h | 9 ++++----- .../interface/alpaka/MiniDoubletsDeviceCollection.h | 12 ++++++++++++ RecoTracker/LSTCore/src/alpaka/MiniDoublet.h | 1 + 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 RecoTracker/LSTCore/interface/alpaka/MiniDoubletsDeviceCollection.h diff --git a/RecoTracker/LSTCore/interface/MiniDoubletsSoA.h b/RecoTracker/LSTCore/interface/MiniDoubletsSoA.h index 72fe6cb60c6bf..c3b0ac4525f23 100644 --- a/RecoTracker/LSTCore/interface/MiniDoubletsSoA.h +++ b/RecoTracker/LSTCore/interface/MiniDoubletsSoA.h @@ -2,9 +2,9 @@ #define RecoTracker_LSTCore_interface_MiniDoubletsSoA_h #include "DataFormats/SoATemplate/interface/SoALayout.h" -#include "DataFormats/Portable/interface/alpaka/PortableCollection.h" +#include "DataFormats/Portable/interface/PortableCollection.h" -namespace ALPAKA_ACCELERATOR_NAMESPACE::lst { +namespace lst { GENERATE_SOA_LAYOUT(MiniDoubletsSoALayout, SOA_COLUMN(unsigned int, anchorHitIndices), @@ -53,9 +53,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst { using MiniDoubletsOccupancy = MiniDoubletsOccupancySoA::View; using MiniDoubletsOccupancyConst = MiniDoubletsOccupancySoA::ConstView; - using MiniDoubletsDeviceCollection = PortableCollection2; using MiniDoubletsHostCollection = PortableHostMultiCollection; -} // namespace ALPAKA_ACCELERATOR_NAMESPACE::lst +} // namespace lst -#endif \ No newline at end of file +#endif diff --git a/RecoTracker/LSTCore/interface/alpaka/MiniDoubletsDeviceCollection.h b/RecoTracker/LSTCore/interface/alpaka/MiniDoubletsDeviceCollection.h new file mode 100644 index 0000000000000..03d2eceb22d34 --- /dev/null +++ b/RecoTracker/LSTCore/interface/alpaka/MiniDoubletsDeviceCollection.h @@ -0,0 +1,12 @@ +#ifndef RecoTracker_LSTCore_interface_alpaka_MiniDoubletsSoA_h +#define RecoTracker_LSTCore_interface_alpaka_MiniDoubletsSoA_h + +#include "DataFormats/Portable/interface/alpaka/PortableCollection.h" + +#include "RecoTracker/LSTCore/interface/MiniDoubletsSoA.h" + +namespace ALPAKA_ACCELERATOR_NAMESPACE::lst { + using MiniDoubletsDeviceCollection = PortableCollection2; +} // namespace ALPAKA_ACCELERATOR_NAMESPACE::lst + +#endif diff --git a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h index dad5ebe7c9c8b..e81ca10469b35 100644 --- a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h +++ b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h @@ -5,6 +5,7 @@ #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/MiniDoubletsSoA.h" +#include "RecoTracker/LSTCore/interface/alpaka/MiniDoubletsDeviceCollection.h" #include "RecoTracker/LSTCore/interface/Module.h" #include "RecoTracker/LSTCore/interface/EndcapGeometry.h"