lst::createWorkDiv now depends on Acc to avoid ODR; allocBufWrapper c…

…orrect parameter is TDev
cms-sw · Aug 9, 2024 · c6a2468 · c6a2468
1 parent a7d73c0
commit c6a2468
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 24 deletions.
diff --git a/RecoTracker/LSTCore/interface/Constants.h b/RecoTracker/LSTCore/interface/Constants.h
@@ -14,23 +14,21 @@ namespace lst {
   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 TAcc, typename TSize, typename TQueue>
-  ALPAKA_FN_HOST ALPAKA_FN_INLINE Buf<alpaka::Dev<TAcc>, T> allocBufWrapper(TAcc const& devAccIn,
-                                                                            TSize nElements,
-                                                                            TQueue queue) {
+  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>(
-        devAccIn, queue, alpaka_common::Vec1D(static_cast<alpaka_common::Idx>(nElements)));
+        dev, queue, alpaka_common::Vec1D(static_cast<alpaka_common::Idx>(nElements)));
 #else
-    return alpaka::allocBuf<T, alpaka_common::Idx>(devAccIn,
+    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 TAcc, typename TSize>
-  ALPAKA_FN_HOST ALPAKA_FN_INLINE Buf<alpaka::Dev<TAcc>, T> allocBufWrapper(TAcc const& devAccIn, TSize nElements) {
-    return alpaka::allocBuf<T, alpaka_common::Idx>(devAccIn,
+  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)));
   }
 

diff --git a/RecoTracker/LSTCore/interface/alpaka/Constants.h b/RecoTracker/LSTCore/interface/alpaka/Constants.h
@@ -36,25 +36,24 @@ namespace lst {
 #endif
 
   // Adjust grid and block sizes based on backend configuration
-  template <typename Vec>
-  ALPAKA_FN_HOST ALPAKA_FN_INLINE WorkDiv3D createWorkDiv(const Vec& blocksPerGrid,
-                                                          const Vec& threadsPerBlock,
-                                                          const Vec& elementsPerThreadArg) {
+  template <typename Vec, typename TAcc = ALPAKA_ACCELERATOR_NAMESPACE::Acc<typename Vec::Dim>>
+  ALPAKA_FN_HOST ALPAKA_FN_INLINE WorkDiv<typename Vec::Dim> createWorkDiv(const Vec& blocksPerGrid,
+                                                                           const Vec& threadsPerBlock,
+                                                                           const Vec& elementsPerThreadArg) {
     Vec adjustedBlocks = blocksPerGrid;
     Vec adjustedThreads = threadsPerBlock;
 
-    // Serial execution, so all launch parameters set to 1.
-#if defined(ALPAKA_ACC_CPU_B_SEQ_T_SEQ_ENABLED)
-    adjustedBlocks = Vec::all(static_cast<Idx>(1));
-    adjustedThreads = Vec::all(static_cast<Idx>(1));
-#endif
+    // special overrides for CPU/host cases
+    if constexpr (std::is_same_v<Platform, alpaka::PlatformCpu>) {
+      adjustedBlocks = Vec::all(static_cast<Idx>(1));
 
-    // Threads enabled, set number of blocks to 1.
-#if defined(ALPAKA_ACC_CPU_B_SEQ_T_THREADS_ENABLED)
-    adjustedBlocks = Vec::all(static_cast<Idx>(1));
-#endif
+      if constexpr (alpaka::accMatchesTags<TAcc, alpaka::TagCpuSerial>) {
+        // Serial execution, set threads to 1 as well
+        adjustedThreads = Vec::all(static_cast<Idx>(1));  // probably redundant
+      }
+    }
 
-    return WorkDiv3D(adjustedBlocks, adjustedThreads, elementsPerThreadArg);
+    return WorkDiv<typename Vec::Dim>(adjustedBlocks, adjustedThreads, elementsPerThreadArg);
   }
 
   // The constants below are usually used in functions like alpaka::math::min(),

diff --git a/RecoTracker/LSTCore/src/ModuleMethods.h b/RecoTracker/LSTCore/src/ModuleMethods.h
@@ -12,6 +12,7 @@
 #include "RecoTracker/LSTCore/interface/PixelMap.h"
 
 #include "HeterogeneousCore/AlpakaInterface/interface/host.h"
+#include "HeterogeneousCore/AlpakaInterface/interface/memory.h"
 
 namespace lst {
   struct ModuleMetaData {
@@ -80,7 +81,7 @@ namespace lst {
     nPixels = connectedPix_size;
 
     // Now we re-initialize connectedPixels_buf since nPixels is now known
-    modulesBuf.connectedPixels_buf = allocBufWrapper<unsigned int>(cms::alpakatools::host(), nPixels);
+    modulesBuf.connectedPixels_buf = cms::alpakatools::make_host_buffer<unsigned int[]>(nPixels);
     modulesBuf.data_.setData(modulesBuf);
 
     unsigned int* connectedPixels = modulesBuf.connectedPixels_buf.data();