Merge pull request #45572 from fwyzard/alpaka_make_device_view

Add specialisations of `make_device_view` with a Queue argument

Author: cmsbuild

DataFormats/TrackingRecHitSoA/interface/TrackingRecHitsDevice.h

@@ -25,15 +25,13 @@ class TrackingRecHitDevice : public PortableDeviceCollection<TrackingRecHitLayou
   template <typename TQueue>
   explicit TrackingRecHitDevice(TQueue queue, uint32_t nHits, int32_t offsetBPIX2, uint32_t const* hitsModuleStart)
       : PortableDeviceCollection<TrackingRecHitLayout<TrackerTraits>, TDev>(nHits, queue), offsetBPIX2_{offsetBPIX2} {
-    const auto device = alpaka::getDev(queue);
-
-    auto start_h = cms::alpakatools::make_device_view(device, hitsModuleStart, TrackerTraits::numberOfModules + 1);
+    auto start_h = cms::alpakatools::make_device_view(queue, hitsModuleStart, TrackerTraits::numberOfModules + 1);
     auto start_d =
-        cms::alpakatools::make_device_view(device, view().hitsModuleStart().data(), TrackerTraits::numberOfModules + 1);
+        cms::alpakatools::make_device_view(queue, view().hitsModuleStart().data(), TrackerTraits::numberOfModules + 1);
     alpaka::memcpy(queue, start_d, start_h);
 
     auto off_h = cms::alpakatools::make_host_view(offsetBPIX2_);
-    auto off_d = cms::alpakatools::make_device_view(device, view().offsetBPIX2());
+    auto off_d = cms::alpakatools::make_device_view(queue, view().offsetBPIX2());
     alpaka::memcpy(queue, off_d, off_h);
   }
 
@@ -47,7 +45,7 @@ class TrackingRecHitDevice : public PortableDeviceCollection<TrackingRecHitLayou
   template <typename TQueue>
   void updateFromDevice(TQueue queue) {
     auto off_h = cms::alpakatools::make_host_view(offsetBPIX2_);
-    auto off_d = cms::alpakatools::make_device_view(alpaka::getDev(queue), view().offsetBPIX2());
+    auto off_d = cms::alpakatools::make_device_view(queue, view().offsetBPIX2());
     alpaka::memcpy(queue, off_h, off_d);
   }
 

EventFilter/EcalRawToDigi/plugins/alpaka/EcalRawToDigiPortable.cc

@@ -98,8 +98,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
     OutputProduct digisDevEE{static_cast<int32_t>(config_.maxChannelsEE), queue};
     // reset the size scalar of the SoA
     // memset takes an alpaka view that is created from the scalar in a view to the device collection
-    auto digiViewEB = cms::alpakatools::make_device_view<uint32_t>(alpaka::getDev(queue), digisDevEB.view().size());
-    auto digiViewEE = cms::alpakatools::make_device_view<uint32_t>(alpaka::getDev(queue), digisDevEE.view().size());
+    auto digiViewEB = cms::alpakatools::make_device_view<uint32_t>(queue, digisDevEB.view().size());
+    auto digiViewEE = cms::alpakatools::make_device_view<uint32_t>(queue, digisDevEE.view().size());
     alpaka::memset(queue, digiViewEB, 0);
     alpaka::memset(queue, digiViewEE, 0);