batch8 of updates for LST integration in CMSSW (#113)

* Removed allocBufWrapper and cache toggle * Removed references to temporaries * Fixed headers * Removed devAcc_ * Simplified view creation * File and class renaming * Update workflow, enums, compilation flags * Move LSTOutputConverter to edm::stream::EDProducer * Merge standalone and CMSSW functions to get hits and TCs * Updates to remove syncs when creating or destroying the LSTEvent in CMSSW * Rename lst_INF and finalize simplification of compilation flags * Create lstProducerTask, move to C++20 pi and use C++20 in standalone compilation * Include numbers * Limit number of make threads --------- Co-authored-by: Andres Rios Tascon <[email protected]> Co-authored-by: Manos Vourliotis <[email protected]>
cms-sw · Nov 4, 2024 · 476d3aa · 476d3aa
1 parent 4d603ca
commit 476d3aa
Show file tree

Hide file tree

Showing 60 changed files with 880 additions and 945 deletions.
diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -529,7 +529,7 @@ def condition_(self, fragment, stepList, key, hasHarvest):
 )
 upgradeWFs['lstOnGPUIters01TrackingOnly'].step3 = upgradeWFs['trackingOnly'].step3 | {
     '--procModifiers': 'trackingIters01,trackingLST',
-    '--accelerators' : 'gpu-nvidia'
+    '--accelerators' : 'gpu-*'
 }
 
 #DeepCore seeding for JetCore iteration workflow

diff --git a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py
@@ -428,10 +428,10 @@
 from RecoTracker.LST.lstSeedTracks_cff import lstInitialStepSeedTracks,lstHighPtTripletStepSeedTracks
 from RecoTracker.LST.lstPixelSeedInputProducer_cfi import lstPixelSeedInputProducer
 from RecoTracker.LST.lstPhase2OTHitsInputProducer_cfi import lstPhase2OTHitsInputProducer
-from RecoTracker.LST.lstProducer_cff import *
+from RecoTracker.LST.lstProducerTask_cff import *
 
 _HighPtTripletStepTask_LST.add(siPhase2RecHits, lstInitialStepSeedTracks, lstHighPtTripletStepSeedTracks, lstPixelSeedInputProducer, lstPhase2OTHitsInputProducer,
-                               lstProducer, lstModulesDevESProducer, highPtTripletStepLSTpTracks, highPtTripletStepLSTT5Tracks, highPtTripletStepSelectorLSTT5)
+                               lstProducerTask, highPtTripletStepLSTpTracks, highPtTripletStepLSTT5Tracks, highPtTripletStepSelectorLSTT5)
 (trackingPhase2PU140 & trackingLST).toReplaceWith(HighPtTripletStepTask, _HighPtTripletStepTask_LST)
 
 # fast tracking mask producer 

diff --git a/RecoTracker/LST/plugins/BuildFile.xml b/RecoTracker/LST/plugins/BuildFile.xml
@@ -35,7 +35,6 @@
   <use name="RecoTracker/LST"/>
   <use name="RecoTracker/LSTCore"/>
   <use name="RecoTracker/Record"/>
-  <flags CXXFLAGS="-DLST_IS_CMSSW_PACKAGE"/>
   <flags ALPAKA_BACKENDS="1"/>
   <flags EDM_PLUGIN="1"/>
 </library>

diff --git a/RecoTracker/LST/plugins/LSTOutputConverter.cc b/RecoTracker/LST/plugins/LSTOutputConverter.cc
@@ -3,7 +3,7 @@
 #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
 #include "DataFormats/TrackReco/interface/SeedStopInfo.h"
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
-#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -25,15 +25,15 @@
 #include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
 
-class LSTOutputConverter : public edm::global::EDProducer<> {
+class LSTOutputConverter : public edm::stream::EDProducer<> {
 public:
   explicit LSTOutputConverter(edm::ParameterSet const& iConfig);
   ~LSTOutputConverter() override = default;
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
-  void produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const override;
+  void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
 
   const edm::EDGetTokenT<LSTOutput> lstOutputToken_;
   const edm::EDGetTokenT<LSTPhase2OTHitsInput> lstPhase2OTHitsInputToken_;
@@ -110,7 +110,7 @@ void LSTOutputConverter::fillDescriptions(edm::ConfigurationDescriptions& descri
   descriptions.addWithDefaultLabel(desc);
 }
 
-void LSTOutputConverter::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
+void LSTOutputConverter::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   // Setup
   auto const& lstOutput = iEvent.get(lstOutputToken_);
   auto const& phase2OTRecHits = iEvent.get(lstPhase2OTHitsInputToken_);

diff --git a/RecoTracker/LST/python/lstProducer_cff.py → ...Tracker/LST/python/lstProducerTask_cff.py b/RecoTracker/LST/python/lstProducer_cff.py → ...Tracker/LST/python/lstProducerTask_cff.py
@@ -5,4 +5,4 @@
 from RecoTracker.LST.lstModulesDevESProducer_cfi import lstModulesDevESProducer
 
 # not scheduled task to get the framework to hide the producer
-dummyLSTModulesDevESProducerTask = cms.Task(lstModulesDevESProducer)
+lstProducerTask = cms.Task(lstModulesDevESProducer, lstProducer)
diff --git a/RecoTracker/LSTCore/BuildFile.xml b/RecoTracker/LSTCore/BuildFile.xml
@@ -2,7 +2,7 @@
 <use name="boost_header"/>
 <use name="root"/>
 <use name="HeterogeneousCore/AlpakaInterface"/>
-<flags CXXFLAGS="-DCACHE_ALLOC -DT4FromT3 -DUSE_RZCHI2 -DUSE_T5_DNN -DPT_CUT=0.8 -DDUP_pLS -DDUP_T5 -DDUP_pT5 -DDUP_pT3 -DCrossclean_T5 -DCrossclean_pT3"/>
+<flags CXXFLAGS="-DPT_CUT=0.8"/>
 <use name="RecoTracker/LSTCore" for="alpaka"/>
 <flags ALPAKA_BACKENDS="1"/>
 <export>

diff --git a/RecoTracker/LSTCore/interface/Constants.h → RecoTracker/LSTCore/interface/Common.h b/RecoTracker/LSTCore/interface/Constants.h → RecoTracker/LSTCore/interface/Common.h
@@ -1,5 +1,5 @@
-#ifndef RecoTracker_LSTCore_interface_Constants_h
-#define RecoTracker_LSTCore_interface_Constants_h
+#ifndef RecoTracker_LSTCore_interface_Common_h
+#define RecoTracker_LSTCore_interface_Common_h
 
 #include "HeterogeneousCore/AlpakaInterface/interface/config.h"
 #include "DataFormats/Common/interface/StdArray.h"
@@ -12,38 +12,14 @@
 #endif
 #endif
 
-#ifdef CACHE_ALLOC
-#include "HeterogeneousCore/AlpakaInterface/interface/CachedBufAlloc.h"
-#endif
-
 namespace lst {
 
-  // Buffer type for allocations where auto type can't be used.
-  template <typename TDev, typename TData>
-  using Buf = alpaka::Buf<TDev, TData, alpaka_common::Dim1D, alpaka_common::Idx>;
-
-  // Allocation wrapper function to make integration of the caching allocator easier and reduce code boilerplate.
-  template <typename T, typename TDev, typename TSize, typename TQueue>
-  ALPAKA_FN_HOST ALPAKA_FN_INLINE Buf<TDev, T> allocBufWrapper(TDev const& dev, TSize nElements, TQueue queue) {
-#ifdef CACHE_ALLOC
-    return cms::alpakatools::allocCachedBuf<T, alpaka_common::Idx>(
-        dev, queue, alpaka_common::Vec1D(static_cast<alpaka_common::Idx>(nElements)));
-#else
-    return alpaka::allocBuf<T, alpaka_common::Idx>(dev,
-                                                   alpaka_common::Vec1D(static_cast<alpaka_common::Idx>(nElements)));
-#endif
-  }
-
-  // Second allocation wrapper function when queue is not given. Reduces code boilerplate.
-  template <typename T, typename TDev, typename TSize>
-  ALPAKA_FN_HOST ALPAKA_FN_INLINE Buf<TDev, T> allocBufWrapper(TDev const& dev, TSize nElements) {
-    return alpaka::allocBuf<T, alpaka_common::Idx>(dev,
-                                                   alpaka_common::Vec1D(static_cast<alpaka_common::Idx>(nElements)));
-  }
-
   // Named constants for pixelTypes
   enum PixelType : int8_t { kInvalid = -1, kHighPt = 0, kLowPtPosCurv = 1, kLowPtNegCurv = 2 };
 
+  // Named types for LST objects
+  enum LSTObjType { T5 = 4, pT3 = 5, pT5 = 7, pLS = 8 };
+
 // If a compile time flag does not define PT_CUT, default to 0.8 (GeV)
 #ifndef PT_CUT
   constexpr float PT_CUT = 0.8f;

diff --git a/RecoTracker/LSTCore/interface/HitsSoA.h b/RecoTracker/LSTCore/interface/HitsSoA.h
@@ -4,7 +4,7 @@
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 #include "DataFormats/Portable/interface/PortableCollection.h"
 
-#include "RecoTracker/LSTCore/interface/Constants.h"
+#include "RecoTracker/LSTCore/interface/Common.h"
 
 namespace lst {
 

diff --git a/RecoTracker/LSTCore/interface/LSTESData.h b/RecoTracker/LSTCore/interface/LSTESData.h
@@ -1,7 +1,7 @@
 #ifndef RecoTracker_LSTCore_interface_LSTESData_h
 #define RecoTracker_LSTCore_interface_LSTESData_h
 
-#include "RecoTracker/LSTCore/interface/Constants.h"
+#include "RecoTracker/LSTCore/interface/Common.h"
 #include "RecoTracker/LSTCore/interface/EndcapGeometryDevHostCollection.h"
 #include "RecoTracker/LSTCore/interface/ModulesHostCollection.h"
 #include "RecoTracker/LSTCore/interface/PixelMap.h"
@@ -21,6 +21,7 @@ namespace lst {
     unsigned int nEndCapMap;
     std::unique_ptr<const PortableMultiCollection<TDev, ModulesSoA, ModulesPixelSoA>> modules;
     std::unique_ptr<const PortableCollection<EndcapGeometryDevSoA, TDev>> endcapGeometry;
+    // Host-side object that is shared between the LSTESData<TDev> objects for different devices
     std::shared_ptr<const PixelMap> pixelMapping;
 
     LSTESData(uint16_t const& nModulesIn,

diff --git a/RecoTracker/LSTCore/interface/MiniDoubletsSoA.h b/RecoTracker/LSTCore/interface/MiniDoubletsSoA.h
@@ -39,11 +39,11 @@ namespace lst {
                       SOA_COLUMN(float, outerHighEdgeX),
                       SOA_COLUMN(float, outerHighEdgeY),
                       SOA_COLUMN(float, outerLowEdgeX),
-                      SOA_COLUMN(float, outerLowEdgeY));
+                      SOA_COLUMN(float, outerLowEdgeY))
 
   GENERATE_SOA_LAYOUT(MiniDoubletsOccupancySoALayout,
                       SOA_COLUMN(unsigned int, nMDs),
-                      SOA_COLUMN(unsigned int, totOccupancyMDs));
+                      SOA_COLUMN(unsigned int, totOccupancyMDs))
 
   using MiniDoubletsSoA = MiniDoubletsSoALayout<>;
   using MiniDoubletsOccupancySoA = MiniDoubletsOccupancySoALayout<>;

diff --git a/RecoTracker/LSTCore/interface/ModulesSoA.h b/RecoTracker/LSTCore/interface/ModulesSoA.h
@@ -4,7 +4,7 @@
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 #include "DataFormats/Portable/interface/PortableCollection.h"
 
-#include "RecoTracker/LSTCore/interface/Constants.h"
+#include "RecoTracker/LSTCore/interface/Common.h"
 
 namespace lst {
 

diff --git a/RecoTracker/LSTCore/interface/ObjectRangesSoA.h b/RecoTracker/LSTCore/interface/ObjectRangesSoA.h
@@ -4,7 +4,7 @@
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 #include "DataFormats/Portable/interface/PortableCollection.h"
 
-#include "RecoTracker/LSTCore/interface/Constants.h"
+#include "RecoTracker/LSTCore/interface/Common.h"
 
 namespace lst {
 

diff --git a/RecoTracker/LSTCore/interface/PixelMap.h b/RecoTracker/LSTCore/interface/PixelMap.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <cstdint>
 
-#include "RecoTracker/LSTCore/interface/Constants.h"
+#include "RecoTracker/LSTCore/interface/Common.h"
 
 namespace lst {
   struct PixelMap {

diff --git a/RecoTracker/LSTCore/interface/PixelQuintupletsSoA.h b/RecoTracker/LSTCore/interface/PixelQuintupletsSoA.h
@@ -5,7 +5,7 @@
 #include "DataFormats/Common/interface/StdArray.h"
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 
-#include "RecoTracker/LSTCore/interface/Constants.h"
+#include "RecoTracker/LSTCore/interface/Common.h"
 
 namespace lst {
   GENERATE_SOA_LAYOUT(PixelQuintupletsSoALayout,

diff --git a/RecoTracker/LSTCore/interface/PixelTripletsSoA.h b/RecoTracker/LSTCore/interface/PixelTripletsSoA.h
@@ -5,7 +5,7 @@
 #include "DataFormats/Common/interface/StdArray.h"
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 
-#include "RecoTracker/LSTCore/interface/Constants.h"
+#include "RecoTracker/LSTCore/interface/Common.h"
 
 namespace lst {
   GENERATE_SOA_LAYOUT(PixelTripletsSoALayout,

diff --git a/RecoTracker/LSTCore/interface/QuintupletsSoA.h b/RecoTracker/LSTCore/interface/QuintupletsSoA.h
@@ -5,7 +5,7 @@
 #include "DataFormats/Common/interface/StdArray.h"
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 
-#include "RecoTracker/LSTCore/interface/Constants.h"
+#include "RecoTracker/LSTCore/interface/Common.h"
 
 namespace lst {
   GENERATE_SOA_LAYOUT(QuintupletsSoALayout,

diff --git a/RecoTracker/LSTCore/interface/SegmentsSoA.h b/RecoTracker/LSTCore/interface/SegmentsSoA.h
@@ -4,7 +4,7 @@
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 #include "DataFormats/Portable/interface/PortableCollection.h"
 
-#include "RecoTracker/LSTCore/interface/Constants.h"
+#include "RecoTracker/LSTCore/interface/Common.h"
 
 namespace lst {
 
@@ -19,9 +19,7 @@ namespace lst {
                       SOA_COLUMN(uint16_t, outerLowerModuleIndices),
                       SOA_COLUMN(Params_LS::ArrayUxLayers, mdIndices),
                       SOA_COLUMN(unsigned int, innerMiniDoubletAnchorHitIndices),
-                      SOA_COLUMN(unsigned int, outerMiniDoubletAnchorHitIndices)
-                      //SOA_SCALAR(unsigned int, nMemoryLocations)
-  )
+                      SOA_COLUMN(unsigned int, outerMiniDoubletAnchorHitIndices))
 
   GENERATE_SOA_LAYOUT(SegmentsOccupancySoALayout,
                       SOA_COLUMN(unsigned int, nSegments),  //number of segments per inner lower module

diff --git a/RecoTracker/LSTCore/interface/TrackCandidatesSoA.h b/RecoTracker/LSTCore/interface/TrackCandidatesSoA.h
@@ -5,7 +5,7 @@
 #include "DataFormats/Common/interface/StdArray.h"
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 
-#include "RecoTracker/LSTCore/interface/Constants.h"
+#include "RecoTracker/LSTCore/interface/Common.h"
 
 namespace lst {
   GENERATE_SOA_LAYOUT(TrackCandidatesSoALayout,

diff --git a/RecoTracker/LSTCore/interface/TripletsSoA.h b/RecoTracker/LSTCore/interface/TripletsSoA.h
@@ -5,7 +5,7 @@
 #include "DataFormats/Common/interface/StdArray.h"
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
 
-#include "RecoTracker/LSTCore/interface/Constants.h"
+#include "RecoTracker/LSTCore/interface/Common.h"
 
 namespace lst {
   GENERATE_SOA_LAYOUT(TripletsSoALayout,

diff --git a/...cker/LSTCore/interface/alpaka/Constants.h → ...Tracker/LSTCore/interface/alpaka/Common.h b/...cker/LSTCore/interface/alpaka/Constants.h → ...Tracker/LSTCore/interface/alpaka/Common.h
@@ -1,7 +1,9 @@
-#ifndef RecoTracker_LSTCore_interface_alpaka_Constants_h
-#define RecoTracker_LSTCore_interface_alpaka_Constants_h
+#ifndef RecoTracker_LSTCore_interface_alpaka_Common_h
+#define RecoTracker_LSTCore_interface_alpaka_Common_h
 
-#include "RecoTracker/LSTCore/interface/Constants.h"
+#include <numbers>
+
+#include "RecoTracker/LSTCore/interface/Common.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
 
@@ -34,6 +36,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
   // expecting a reference (T const&) in the arguments. Hence,
   // ALPAKA_STATIC_ACC_MEM_GLOBAL needs to be used in addition to constexpr.
 
+  ALPAKA_STATIC_ACC_MEM_GLOBAL constexpr float kPi = std::numbers::pi_v<float>;
   // 15 MeV constant from the approximate Bethe-Bloch formula
   ALPAKA_STATIC_ACC_MEM_GLOBAL constexpr float kMulsInGeV = 0.015;
   ALPAKA_STATIC_ACC_MEM_GLOBAL constexpr float kMiniMulsPtScaleBarrel[6] = {
@@ -54,8 +57,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
   ALPAKA_STATIC_ACC_MEM_GLOBAL constexpr float kWidth2S = 0.009;
   ALPAKA_STATIC_ACC_MEM_GLOBAL constexpr float kWidthPS = 0.01;
   ALPAKA_STATIC_ACC_MEM_GLOBAL constexpr float kPt_betaMax = 7.0;
-  // Since C++ can't represent infinity, lst_INF = 123456789 was used to represent infinity in the data table
-  ALPAKA_STATIC_ACC_MEM_GLOBAL constexpr float lst_INF = 123456789.0;
+  // To be updated with std::numeric_limits<float>::infinity() in the code and data files
+  ALPAKA_STATIC_ACC_MEM_GLOBAL constexpr float kVerticalModuleSlope = 123456789.0;
 
   namespace t5dnn {
 

diff --git a/RecoTracker/LSTCore/interface/alpaka/EndcapGeometryDevDeviceCollection.h b/RecoTracker/LSTCore/interface/alpaka/EndcapGeometryDevDeviceCollection.h
@@ -3,6 +3,7 @@
 
 #include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
 
+#include "RecoTracker/LSTCore/interface/alpaka/Common.h"
 #include "RecoTracker/LSTCore/interface/EndcapGeometryDevSoA.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {

diff --git a/RecoTracker/LSTCore/interface/alpaka/HitsDeviceCollection.h b/RecoTracker/LSTCore/interface/alpaka/HitsDeviceCollection.h
@@ -3,6 +3,7 @@
 
 #include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
 
+#include "RecoTracker/LSTCore/interface/alpaka/Common.h"
 #include "RecoTracker/LSTCore/interface/HitsSoA.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {

diff --git a/RecoTracker/LSTCore/interface/alpaka/LST.h b/RecoTracker/LSTCore/interface/alpaka/LST.h
@@ -1,15 +1,15 @@
 #ifndef RecoTracker_LSTCore_interface_alpaka_LST_h
 #define RecoTracker_LSTCore_interface_alpaka_LST_h
 
-#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Common.h"
 #include "RecoTracker/LSTCore/interface/LSTESData.h"
 
 #include <cstdlib>
 #include <numeric>
 #include <alpaka/alpaka.hpp>
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
-  class Event;
+  class LSTEvent;
 
   class LST {
   public:
@@ -65,7 +65,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
                       std::vector<float> const& ph2_y,
                       std::vector<float> const& ph2_z);
 
-    void getOutput(Event& event);
+    void getOutput(LSTEvent& event);
 
     // Input and output vectors
     std::vector<float> in_trkX_;

diff --git a/RecoTracker/LSTCore/interface/alpaka/MiniDoubletsDeviceCollection.h b/RecoTracker/LSTCore/interface/alpaka/MiniDoubletsDeviceCollection.h
@@ -3,6 +3,7 @@
 
 #include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
 
+#include "RecoTracker/LSTCore/interface/alpaka/Common.h"
 #include "RecoTracker/LSTCore/interface/MiniDoubletsSoA.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {

diff --git a/RecoTracker/LSTCore/interface/alpaka/ModulesDeviceCollection.h b/RecoTracker/LSTCore/interface/alpaka/ModulesDeviceCollection.h
@@ -3,6 +3,7 @@
 
 #include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
 
+#include "RecoTracker/LSTCore/interface/alpaka/Common.h"
 #include "RecoTracker/LSTCore/interface/ModulesSoA.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {

diff --git a/RecoTracker/LSTCore/interface/alpaka/ObjectRangesDeviceCollection.h b/RecoTracker/LSTCore/interface/alpaka/ObjectRangesDeviceCollection.h
@@ -3,6 +3,7 @@
 
 #include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
 
+#include "RecoTracker/LSTCore/interface/alpaka/Common.h"
 #include "RecoTracker/LSTCore/interface/ObjectRangesSoA.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {

diff --git a/RecoTracker/LSTCore/interface/alpaka/PixelQuintupletsDeviceCollection.h b/RecoTracker/LSTCore/interface/alpaka/PixelQuintupletsDeviceCollection.h
@@ -1,9 +1,11 @@
 #ifndef RecoTracker_LSTCore_interface_PixelQuintupletsDeviceCollection_h
 #define RecoTracker_LSTCore_interface_PixelQuintupletsDeviceCollection_h
 
-#include "RecoTracker/LSTCore/interface/PixelQuintupletsSoA.h"
 #include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
 
+#include "RecoTracker/LSTCore/interface/alpaka/Common.h"
+#include "RecoTracker/LSTCore/interface/PixelQuintupletsSoA.h"
+
 namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
   using PixelQuintupletsDeviceCollection = PortableCollection<PixelQuintupletsSoA>;
 }  // namespace ALPAKA_ACCELERATOR_NAMESPACE::lst

diff --git a/RecoTracker/LSTCore/interface/alpaka/PixelTripletsDeviceCollection.h b/RecoTracker/LSTCore/interface/alpaka/PixelTripletsDeviceCollection.h
@@ -1,9 +1,11 @@
 #ifndef RecoTracker_LSTCore_interface_PixelTripletsDeviceCollection_h
 #define RecoTracker_LSTCore_interface_PixelTripletsDeviceCollection_h
 
-#include "RecoTracker/LSTCore/interface/PixelTripletsSoA.h"
 #include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
 
+#include "RecoTracker/LSTCore/interface/alpaka/Common.h"
+#include "RecoTracker/LSTCore/interface/PixelTripletsSoA.h"
+
 namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
   using PixelTripletsDeviceCollection = PortableCollection<PixelTripletsSoA>;
 }  // namespace ALPAKA_ACCELERATOR_NAMESPACE::lst