Skip to content

Commit 0c1ba85

Browse files
fwyzardfwyzard
committed
Simplify code using make_device_view
Simplify code using make_device_view(alpaka::getDev(queue), ...) to use the new specialisation make_device_view(queue, ...) .
1 parent f478157 commit 0c1ba85

File tree

7 files changed

+44
-53
lines changed

7 files changed

+44
-53
lines changed

‎DataFormats/TrackingRecHitSoA/interface/TrackingRecHitsDevice.h‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,13 @@ class TrackingRecHitDevice : public PortableDeviceCollection<TrackingRecHitLayou
2525
template <typename TQueue>
2626
explicit TrackingRecHitDevice(TQueue queue, uint32_t nHits, int32_t offsetBPIX2, uint32_t const* hitsModuleStart)
2727
: PortableDeviceCollection<TrackingRecHitLayout<TrackerTraits>, TDev>(nHits, queue), offsetBPIX2_{offsetBPIX2} {
28-
const auto device = alpaka::getDev(queue);
29-
30-
auto start_h = cms::alpakatools::make_device_view(device, hitsModuleStart, TrackerTraits::numberOfModules + 1);
28+
auto start_h = cms::alpakatools::make_device_view(queue, hitsModuleStart, TrackerTraits::numberOfModules + 1);
3129
auto start_d =
32-
cms::alpakatools::make_device_view(device, view().hitsModuleStart().data(), TrackerTraits::numberOfModules + 1);
30+
cms::alpakatools::make_device_view(queue, view().hitsModuleStart().data(), TrackerTraits::numberOfModules + 1);
3331
alpaka::memcpy(queue, start_d, start_h);
3432

3533
auto off_h = cms::alpakatools::make_host_view(offsetBPIX2_);
36-
auto off_d = cms::alpakatools::make_device_view(device, view().offsetBPIX2());
34+
auto off_d = cms::alpakatools::make_device_view(queue, view().offsetBPIX2());
3735
alpaka::memcpy(queue, off_d, off_h);
3836
}
3937

@@ -47,7 +45,7 @@ class TrackingRecHitDevice : public PortableDeviceCollection<TrackingRecHitLayou
4745
template <typename TQueue>
4846
void updateFromDevice(TQueue queue) {
4947
auto off_h = cms::alpakatools::make_host_view(offsetBPIX2_);
50-
auto off_d = cms::alpakatools::make_device_view(alpaka::getDev(queue), view().offsetBPIX2());
48+
auto off_d = cms::alpakatools::make_device_view(queue, view().offsetBPIX2());
5149
alpaka::memcpy(queue, off_h, off_d);
5250
}
5351

‎EventFilter/EcalRawToDigi/plugins/alpaka/EcalRawToDigiPortable.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
9898
OutputProduct digisDevEE{static_cast<int32_t>(config_.maxChannelsEE), queue};
9999
// reset the size scalar of the SoA
100100
// memset takes an alpaka view that is created from the scalar in a view to the device collection
101-
auto digiViewEB = cms::alpakatools::make_device_view<uint32_t>(alpaka::getDev(queue), digisDevEB.view().size());
102-
auto digiViewEE = cms::alpakatools::make_device_view<uint32_t>(alpaka::getDev(queue), digisDevEE.view().size());
101+
auto digiViewEB = cms::alpakatools::make_device_view<uint32_t>(queue, digisDevEB.view().size());
102+
auto digiViewEE = cms::alpakatools::make_device_view<uint32_t>(queue, digisDevEE.view().size());
103103
alpaka::memset(queue, digiViewEB, 0);
104104
alpaka::memset(queue, digiViewEE, 0);
105105

‎RecoLocalCalo/EcalRecProducers/plugins/alpaka/EcalUncalibRecHitProducerPortable.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
162162

163163
// copy the actual numbers of digis in the collections to host
164164
auto ebDigisSizeDevConstView =
165-
cms::alpakatools::make_device_view<const uint32_t>(alpaka::getDev(queue), ebDigisDev.const_view().size());
165+
cms::alpakatools::make_device_view<const uint32_t>(queue, ebDigisDev.const_view().size());
166166
auto eeDigisSizeDevConstView =
167-
cms::alpakatools::make_device_view<const uint32_t>(alpaka::getDev(queue), eeDigisDev.const_view().size());
167+
cms::alpakatools::make_device_view<const uint32_t>(queue, eeDigisDev.const_view().size());
168168
alpaka::memcpy(queue, ebDigisSizeHostBuf_, ebDigisSizeDevConstView);
169169
alpaka::memcpy(queue, eeDigisSizeHostBuf_, eeDigisSizeDevConstView);
170170
}
@@ -186,9 +186,9 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
186186
// reset the size scalar of the SoA
187187
// memset takes an alpaka view that is created from the scalar in a view to the portable device collection
188188
auto uncalibRecHitSizeViewEB =
189-
cms::alpakatools::make_device_view<uint32_t>(alpaka::getDev(queue), uncalibRecHitsDevEB.view().size());
189+
cms::alpakatools::make_device_view<uint32_t>(queue, uncalibRecHitsDevEB.view().size());
190190
auto uncalibRecHitSizeViewEE =
191-
cms::alpakatools::make_device_view<uint32_t>(alpaka::getDev(queue), uncalibRecHitsDevEE.view().size());
191+
cms::alpakatools::make_device_view<uint32_t>(queue, uncalibRecHitsDevEE.view().size());
192192
alpaka::memset(queue, uncalibRecHitSizeViewEB, 0);
193193
alpaka::memset(queue, uncalibRecHitSizeViewEE, 0);
194194

‎RecoLocalCalo/HGCalRecProducers/plugins/alpaka/HGCalLayerClustersAlgoWrapper.dev.cc‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,15 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
2626
queue, dc, kappa, outlierDeltaFactor, false);
2727

2828
// Initialize output memory to 0
29-
auto delta = cms::alpakatools::make_device_view<float>(alpaka::getDev(queue), outputs.delta(), size);
29+
auto delta = cms::alpakatools::make_device_view<float>(queue, outputs.delta(), size);
3030
alpaka::memset(queue, delta, 0x0);
31-
auto rho = cms::alpakatools::make_device_view<float>(alpaka::getDev(queue), outputs.rho(), size);
31+
auto rho = cms::alpakatools::make_device_view<float>(queue, outputs.rho(), size);
3232
alpaka::memset(queue, rho, 0x0);
33-
auto nearestHigher =
34-
cms::alpakatools::make_device_view<unsigned int>(alpaka::getDev(queue), outputs.nearestHigher(), size);
33+
auto nearestHigher = cms::alpakatools::make_device_view<unsigned int>(queue, outputs.nearestHigher(), size);
3534
alpaka::memset(queue, nearestHigher, 0x0);
36-
auto clusterIndex = cms::alpakatools::make_device_view<int>(alpaka::getDev(queue), outputs.clusterIndex(), size);
35+
auto clusterIndex = cms::alpakatools::make_device_view<int>(queue, outputs.clusterIndex(), size);
3736
alpaka::memset(queue, clusterIndex, kInvalidClusterByte);
38-
auto isSeed = cms::alpakatools::make_device_view<uint8_t>(alpaka::getDev(queue), outputs.isSeed(), size);
37+
auto isSeed = cms::alpakatools::make_device_view<uint8_t>(queue, outputs.isSeed(), size);
3938
alpaka::memset(queue, isSeed, 0x0);
4039

4140
algoStandalone.makeClustersCMSSW(size,

‎RecoLocalCalo/HGCalRecProducers/plugins/alpaka/HGCalLayerClustersSoAAlgoWrapper.dev.cc‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
7676
clusterEnergy = (clusterSeed == kInvalidIndex) ? 0.f : input_rechits_soa[clusterSeed].weight();
7777
}
7878
} // CAS
79-
} // uniform_elements
80-
} // operator()
79+
} // uniform_elements
80+
} // operator()
8181
};
8282

8383
// Real Kernel position
@@ -115,7 +115,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
115115
alpaka::atomicAdd(acc, &outputs[cluster_index].y(), input_rechits_soa[hit_index].dim2() * Wi);
116116
alpaka::atomicAdd(acc, &outputs_service[cluster_index].total_weight_log(), Wi);
117117
} // uniform_elements
118-
} // operator()
118+
} // operator()
119119
};
120120

121121
// Besides the final position, add also the DetId of the seed of each cluster
@@ -144,7 +144,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
144144
}
145145
outputs[cluster_index].z() = input_rechits_soa[max_energy_index].dim3();
146146
} // uniform_elements
147-
} // operator()
147+
} // operator()
148148
};
149149

150150
void HGCalLayerClustersSoAAlgoWrapper::run(Queue& queue,
@@ -155,29 +155,25 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
155155
const HGCalSoARecHitsExtraDeviceCollection::ConstView input_clusters_soa,
156156
HGCalSoAClustersDeviceCollection::View outputs,
157157
HGCalSoAClustersExtraDeviceCollection::View outputs_service) const {
158-
auto x = cms::alpakatools::make_device_view<float>(alpaka::getDev(queue), outputs.x(), size);
158+
auto x = cms::alpakatools::make_device_view<float>(queue, outputs.x(), size);
159159
alpaka::memset(queue, x, 0x0);
160-
auto y = cms::alpakatools::make_device_view<float>(alpaka::getDev(queue), outputs.y(), size);
160+
auto y = cms::alpakatools::make_device_view<float>(queue, outputs.y(), size);
161161
alpaka::memset(queue, y, 0x0);
162-
auto z = cms::alpakatools::make_device_view<float>(alpaka::getDev(queue), outputs.z(), size);
162+
auto z = cms::alpakatools::make_device_view<float>(queue, outputs.z(), size);
163163
alpaka::memset(queue, z, 0x0);
164-
auto seed = cms::alpakatools::make_device_view<int>(alpaka::getDev(queue), outputs.seed(), size);
164+
auto seed = cms::alpakatools::make_device_view<int>(queue, outputs.seed(), size);
165165
alpaka::memset(queue, seed, 0x0);
166-
auto energy = cms::alpakatools::make_device_view<float>(alpaka::getDev(queue), outputs.energy(), size);
166+
auto energy = cms::alpakatools::make_device_view<float>(queue, outputs.energy(), size);
167167
alpaka::memset(queue, energy, 0x0);
168-
auto cells = cms::alpakatools::make_device_view<int>(alpaka::getDev(queue), outputs.cells(), size);
168+
auto cells = cms::alpakatools::make_device_view<int>(queue, outputs.cells(), size);
169169
alpaka::memset(queue, cells, 0x0);
170-
auto total_weight =
171-
cms::alpakatools::make_device_view<float>(alpaka::getDev(queue), outputs_service.total_weight(), size);
170+
auto total_weight = cms::alpakatools::make_device_view<float>(queue, outputs_service.total_weight(), size);
172171
alpaka::memset(queue, total_weight, 0x0);
173-
auto total_weight_log =
174-
cms::alpakatools::make_device_view<float>(alpaka::getDev(queue), outputs_service.total_weight_log(), size);
172+
auto total_weight_log = cms::alpakatools::make_device_view<float>(queue, outputs_service.total_weight_log(), size);
175173
alpaka::memset(queue, total_weight_log, 0x0);
176-
auto maxEnergyValue =
177-
cms::alpakatools::make_device_view<float>(alpaka::getDev(queue), outputs_service.maxEnergyValue(), size);
174+
auto maxEnergyValue = cms::alpakatools::make_device_view<float>(queue, outputs_service.maxEnergyValue(), size);
178175
alpaka::memset(queue, maxEnergyValue, 0x0);
179-
auto maxEnergyIndex =
180-
cms::alpakatools::make_device_view<int>(alpaka::getDev(queue), outputs_service.maxEnergyIndex(), size);
176+
auto maxEnergyIndex = cms::alpakatools::make_device_view<int>(queue, outputs_service.maxEnergyIndex(), size);
181177
alpaka::memset(queue, maxEnergyIndex, kInvalidIndexByte);
182178

183179
// use 64 items per group (this value is arbitrary, but it's a reasonable starting point)

‎RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/SiPixelRawToClusterKernel.dev.cc‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
7474
slopeCol = 1;
7575
rowOffset = 2 * ::pixelDetails::numRowsInRoc - 1;
7676
colOffset = (rocIdInDetUnit - 8) * ::pixelDetails::numColsInRoc;
77-
} // if roc
77+
} // if roc
7878
} else { // +Z side: 4 non-flipped modules oriented like 'pppp', but all 8 in layer1
7979
if (rocIdInDetUnit < 8) {
8080
slopeRow = -1;
@@ -426,7 +426,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
426426
} // end of stride on grid
427427

428428
} // end of Raw to Digi kernel operator()
429-
}; // end of Raw to Digi struct
429+
}; // end of Raw to Digi struct
430430

431431
template <typename TrackerTraits>
432432
struct FillHitsModuleStart {
@@ -515,7 +515,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
515515
#endif
516516

517517
} // end of FillHitsModuleStart kernel operator()
518-
}; // end of FillHitsModuleStart struct
518+
}; // end of FillHitsModuleStart struct
519519

520520
// Interface to outside
521521
template <typename TrackerTraits>
@@ -639,8 +639,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
639639
alpaka::exec<Acc1D>(
640640
queue, workDiv, CountModules<TrackerTraits>{}, digis_d->view(), clusters_d->view(), wordCounter);
641641

642-
auto moduleStartFirstElement =
643-
cms::alpakatools::make_device_view(alpaka::getDev(queue), clusters_d->view().moduleStart(), 1u);
642+
auto moduleStartFirstElement = cms::alpakatools::make_device_view(queue, clusters_d->view().moduleStart(), 1u);
644643
alpaka::memcpy(queue, nModules_Clusters_h, moduleStartFirstElement);
645644

646645
const auto elementsPerBlockFindClus = FindClus<TrackerTraits>::maxElementsPerBlock;
@@ -676,13 +675,13 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
676675
alpaka::exec<Acc1D>(queue, workDivOneBlock, FillHitsModuleStart<TrackerTraits>{}, clusters_d->view());
677676

678677
// last element holds the number of all clusters
679-
const auto clusModuleStartLastElement = cms::alpakatools::make_device_view(
680-
alpaka::getDev(queue), clusters_d->const_view().clusModuleStart() + numberOfModules, 1u);
678+
const auto clusModuleStartLastElement =
679+
cms::alpakatools::make_device_view(queue, clusters_d->const_view().clusModuleStart() + numberOfModules, 1u);
681680
constexpr int startBPIX2 = TrackerTraits::layerStart[1];
682681

683682
// element startBPIX2 hold the number of clusters until BPIX2
684-
const auto bpix2ClusterStart = cms::alpakatools::make_device_view(
685-
alpaka::getDev(queue), clusters_d->const_view().clusModuleStart() + startBPIX2, 1u);
683+
const auto bpix2ClusterStart =
684+
cms::alpakatools::make_device_view(queue, clusters_d->const_view().clusModuleStart() + startBPIX2, 1u);
686685
auto nModules_Clusters_h_1 = cms::alpakatools::make_host_view(nModules_Clusters_h.data() + 1, 1u);
687686
alpaka::memcpy(queue, nModules_Clusters_h_1, clusModuleStartLastElement);
688687

@@ -728,8 +727,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
728727
alpaka::exec<Acc1D>(
729728
queue, workDiv, CountModules<pixelTopology::Phase2>{}, digis_view, clusters_d->view(), numDigis);
730729

731-
auto moduleStartFirstElement =
732-
cms::alpakatools::make_device_view(alpaka::getDev(queue), clusters_d->view().moduleStart(), 1u);
730+
auto moduleStartFirstElement = cms::alpakatools::make_device_view(queue, clusters_d->view().moduleStart(), 1u);
733731
alpaka::memcpy(queue, nModules_Clusters_h, moduleStartFirstElement);
734732

735733
const auto elementsPerBlockFindClus = FindClus<TrackerTraits>::maxElementsPerBlock;
@@ -765,12 +763,12 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
765763
alpaka::exec<Acc1D>(queue, workDivOneBlock, FillHitsModuleStart<TrackerTraits>{}, clusters_d->view());
766764

767765
// last element holds the number of all clusters
768-
const auto clusModuleStartLastElement = cms::alpakatools::make_device_view(
769-
alpaka::getDev(queue), clusters_d->const_view().clusModuleStart() + numberOfModules, 1u);
766+
const auto clusModuleStartLastElement =
767+
cms::alpakatools::make_device_view(queue, clusters_d->const_view().clusModuleStart() + numberOfModules, 1u);
770768
constexpr int startBPIX2 = pixelTopology::Phase2::layerStart[1];
771769
// element startBPIX2 hold the number of clusters until BPIX2
772-
const auto bpix2ClusterStart = cms::alpakatools::make_device_view(
773-
alpaka::getDev(queue), clusters_d->const_view().clusModuleStart() + startBPIX2, 1u);
770+
const auto bpix2ClusterStart =
771+
cms::alpakatools::make_device_view(queue, clusters_d->const_view().clusModuleStart() + startBPIX2, 1u);
774772
auto nModules_Clusters_h_1 = cms::alpakatools::make_host_view(nModules_Clusters_h.data() + 1, 1u);
775773
alpaka::memcpy(queue, nModules_Clusters_h_1, clusModuleStartLastElement);
776774

‎RecoTracker/PixelSeeding/plugins/alpaka/CAHitNtupletGeneratorKernels.dev.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
6666
cms::alpakatools::make_device_buffer<cms::alpakatools::AtomicPairCounter::DoubleWord[]>(queue, 3u)},
6767
device_hitTuple_apc_{reinterpret_cast<cms::alpakatools::AtomicPairCounter *>(device_storage_.data())},
6868
device_hitToTuple_apc_{reinterpret_cast<cms::alpakatools::AtomicPairCounter *>(device_storage_.data() + 1)},
69-
device_nCells_{cms::alpakatools::make_device_view(alpaka::getDev(queue),
70-
*reinterpret_cast<uint32_t *>(device_storage_.data() + 2))} {
69+
device_nCells_{
70+
cms::alpakatools::make_device_view(queue, *reinterpret_cast<uint32_t *>(device_storage_.data() + 2))} {
7171
#ifdef GPU_DEBUG
7272
std::cout << "Allocation for tuple building. N hits " << nhits << std::endl;
7373
#endif

0 commit comments

Comments
 (0)