move TrackCandidatesDeviceCollection and related aliases to interface…

…/alpaka
cms-sw · Oct 5, 2024 · 69804f0 · 69804f0
1 parent a296da7
commit 69804f0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/RecoTracker/LSTCore/interface/TrackCandidatesSoA.h b/RecoTracker/LSTCore/interface/TrackCandidatesSoA.h
@@ -26,14 +26,7 @@ namespace lst {
                       SOA_SCALAR(unsigned int, nTrackCandidatesT5))                 //
 
   using TrackCandidatesSoA = TrackCandidatesSoALayout<>;
-
-  ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE void initScalars(TrackCandidatesSoA::View& v) {
-    v.nTrackCandidates() = 0;
-    v.nTrackCandidatesT5() = 0;
-    v.nTrackCandidatespT3() = 0;
-    v.nTrackCandidatespT5() = 0;
-    v.nTrackCandidatespLS() = 0;
-  }
-
+  using TrackCandidates = TrackCandidatesSoA::View;
+  using TrackCandidatesConst = TrackCandidatesSoA::ConstView;
 }  // namespace lst
 #endif
diff --git a/RecoTracker/LSTCore/interface/alpaka/TrackCandidatesDeviceCollection.h b/RecoTracker/LSTCore/interface/alpaka/TrackCandidatesDeviceCollection.h
@@ -0,0 +1,10 @@
+#ifndef RecoTracker_LSTCore_interface_TrackCandidatesDeviceCollection_h
+#define RecoTracker_LSTCore_interface_TrackCandidatesDeviceCollection_h
+
+#include "RecoTracker/LSTCore/interface/TrackCandidatesSoA.h"
+#include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
+
+namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
+  using TrackCandidatesDeviceCollection = PortableCollection<TrackCandidatesSoA>;
+}  // namespace ALPAKA_ACCELERATOR_NAMESPACE::lst
+#endif
diff --git a/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h b/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h
@@ -1,12 +1,11 @@
 #ifndef RecoTracker_LSTCore_src_alpaka_TrackCandidate_h
 #define RecoTracker_LSTCore_src_alpaka_TrackCandidate_h
 
-#include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
-
 #include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
 #include "RecoTracker/LSTCore/interface/Module.h"
 #include "RecoTracker/LSTCore/interface/TrackCandidatesHostCollection.h"
 #include "RecoTracker/LSTCore/interface/TrackCandidatesSoA.h"
+#include "RecoTracker/LSTCore/interface/alpaka/TrackCandidatesDeviceCollection.h"
 
 #include "Triplet.h"
 #include "Segment.h"
@@ -17,11 +16,6 @@
 #include "ObjectRanges.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
-  using TrackCandidatesDeviceCollection = PortableCollection<::lst::TrackCandidatesSoA>;
-
-  using TrackCandidates = ::lst::TrackCandidatesSoA::View;
-  using TrackCandidatesConst = ::lst::TrackCandidatesSoA::ConstView;
-
   ALPAKA_FN_ACC ALPAKA_FN_INLINE void addpLSTrackCandidateToMemory(TrackCandidates& cands,
                                                                    unsigned int trackletIndex,
                                                                    unsigned int trackCandidateIndex,