From 2a00918b119b6b3d61ed263a4f49cfe2fbeb6647 Mon Sep 17 00:00:00 2001 From: jsamudio Date: Thu, 26 Sep 2024 09:30:57 -0500 Subject: [PATCH] Code checks and formatting --- .../plugins/alpaka/PFClusterSoAProducer.cc | 35 +++++++++---------- .../alpaka/PFClusterSoAProducerKernel.dev.cc | 31 ++++++++-------- .../alpaka/PFClusterSoAProducerKernel.h | 31 ++++++++-------- 3 files changed, 46 insertions(+), 51 deletions(-) diff --git a/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducer.cc b/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducer.cc index 9c4671d85f9ef..27371b3edd9c6 100644 --- a/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducer.cc +++ b/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducer.cc @@ -42,28 +42,26 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { // device buffer to store rhf size auto size_d = cms::alpakatools::make_device_buffer(event.queue()); - alpaka::memset(event.queue(), size_d, 0x00); + alpaka::memset(event.queue(), size_d, 0x00); if (nRH != 0) { PFClusterProducerKernel kernel(event.queue(), pfRecHits); kernel.step1(event.queue(), - params, - topology, - *pfClusteringVars, - *pfClusteringEdgeVars, - pfRecHits, - *pfClusters, - size_d.data()); + params, + topology, + *pfClusteringVars, + *pfClusteringEdgeVars, + pfRecHits, + *pfClusters, + size_d.data()); } - auto device_num_rhf = - cms::alpakatools::make_device_view(alpaka::getDev(event.queue()), *size_d.data()); + auto device_num_rhf = cms::alpakatools::make_device_view(alpaka::getDev(event.queue()), *size_d.data()); alpaka::memcpy(event.queue(), num_rhf_, device_num_rhf); } void produce(device::Event& event, device::EventSetup const& setup) override { - const reco::PFClusterParamsDeviceCollection& params = setup.getData(pfClusParamsToken); const reco::PFRecHitHCALTopologyDeviceCollection& topology = setup.getData(topologyToken_); const reco::PFRecHitHostCollection& pfRecHits = event.get(inputPFRecHitSoA_Token_); @@ -75,18 +73,17 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { pfrhFractions = std::make_unique(*num_rhf_.data(), event.queue()); PFClusterProducerKernel kernel(event.queue(), pfRecHits); kernel.step2(event.queue(), - params, - topology, - *pfClusteringVars, - *pfClusteringEdgeVars, - pfRecHits, - *pfClusters, - *pfrhFractions); + params, + topology, + *pfClusteringVars, + *pfClusteringEdgeVars, + pfRecHits, + *pfClusters, + *pfrhFractions); } else { pfrhFractions = std::make_unique(0, event.queue()); } - if (synchronise_) alpaka::wait(event.queue()); diff --git a/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducerKernel.dev.cc b/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducerKernel.dev.cc index 1bc18b3df09d6..1615473854236 100644 --- a/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducerKernel.dev.cc +++ b/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducerKernel.dev.cc @@ -1469,13 +1469,13 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { } void PFClusterProducerKernel::step1(Queue& queue, - const reco::PFClusterParamsDeviceCollection& params, - const reco::PFRecHitHCALTopologyDeviceCollection& topology, - reco::PFClusteringVarsDeviceCollection& pfClusteringVars, - reco::PFClusteringEdgeVarsDeviceCollection& pfClusteringEdgeVars, - const reco::PFRecHitHostCollection& pfRecHits, - reco::PFClusterDeviceCollection& pfClusters, - uint32_t* __restrict__ size_d) { + const reco::PFClusterParamsDeviceCollection& params, + const reco::PFRecHitHCALTopologyDeviceCollection& topology, + reco::PFClusteringVarsDeviceCollection& pfClusteringVars, + reco::PFClusteringEdgeVarsDeviceCollection& pfClusteringEdgeVars, + const reco::PFRecHitHostCollection& pfRecHits, + reco::PFClusterDeviceCollection& pfClusters, + uint32_t* __restrict__ size_d) { const int nRH = pfRecHits->size(); const int threadsPerBlock = 256; const int blocks = divide_up_by(nRH, threadsPerBlock); @@ -1526,17 +1526,16 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { pfClusters.view(), nSeeds.data(), size_d); - } - void PFClusterProducerKernel::step2(Queue& queue, - const reco::PFClusterParamsDeviceCollection& params, - const reco::PFRecHitHCALTopologyDeviceCollection& topology, - reco::PFClusteringVarsDeviceCollection& pfClusteringVars, - reco::PFClusteringEdgeVarsDeviceCollection& pfClusteringEdgeVars, - const reco::PFRecHitHostCollection& pfRecHits, - reco::PFClusterDeviceCollection& pfClusters, - reco::PFRecHitFractionDeviceCollection& pfrhFractions) { + void PFClusterProducerKernel::step2(Queue& queue, + const reco::PFClusterParamsDeviceCollection& params, + const reco::PFRecHitHCALTopologyDeviceCollection& topology, + reco::PFClusteringVarsDeviceCollection& pfClusteringVars, + reco::PFClusteringEdgeVarsDeviceCollection& pfClusteringEdgeVars, + const reco::PFRecHitHostCollection& pfRecHits, + reco::PFClusterDeviceCollection& pfClusters, + reco::PFRecHitFractionDeviceCollection& pfrhFractions) { const int nRH = pfRecHits->size(); // fillRhfIndex diff --git a/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducerKernel.h b/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducerKernel.h index 9b562301c3a2a..b97bc63feeb7b 100644 --- a/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducerKernel.h +++ b/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducerKernel.h @@ -41,23 +41,23 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { PFClusterProducerKernel(Queue& queue, const reco::PFRecHitHostCollection& pfRecHits); void step1(Queue& queue, - const reco::PFClusterParamsDeviceCollection& params, - const reco::PFRecHitHCALTopologyDeviceCollection& topology, - reco::PFClusteringVarsDeviceCollection& pfClusteringVars, - reco::PFClusteringEdgeVarsDeviceCollection& pfClusteringEdgeVars, - const reco::PFRecHitHostCollection& pfRecHits, - reco::PFClusterDeviceCollection& pfClusters, - uint32_t* __restrict__ size_d); + const reco::PFClusterParamsDeviceCollection& params, + const reco::PFRecHitHCALTopologyDeviceCollection& topology, + reco::PFClusteringVarsDeviceCollection& pfClusteringVars, + reco::PFClusteringEdgeVarsDeviceCollection& pfClusteringEdgeVars, + const reco::PFRecHitHostCollection& pfRecHits, + reco::PFClusterDeviceCollection& pfClusters, + uint32_t* __restrict__ size_d); void step2(Queue& queue, - const reco::PFClusterParamsDeviceCollection& params, - const reco::PFRecHitHCALTopologyDeviceCollection& topology, - reco::PFClusteringVarsDeviceCollection& pfClusteringVars, - reco::PFClusteringEdgeVarsDeviceCollection& pfClusteringEdgeVars, - const reco::PFRecHitHostCollection& pfRecHits, - reco::PFClusterDeviceCollection& pfClusters, - reco::PFRecHitFractionDeviceCollection& pfrhFractions); - + const reco::PFClusterParamsDeviceCollection& params, + const reco::PFRecHitHCALTopologyDeviceCollection& topology, + reco::PFClusteringVarsDeviceCollection& pfClusteringVars, + reco::PFClusteringEdgeVarsDeviceCollection& pfClusteringEdgeVars, + const reco::PFRecHitHostCollection& pfRecHits, + reco::PFClusterDeviceCollection& pfClusters, + reco::PFRecHitFractionDeviceCollection& pfrhFractions); + private: cms::alpakatools::device_buffer nSeeds; cms::alpakatools::device_buffer globalClusterPos; @@ -66,7 +66,6 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { cms::alpakatools::device_buffer globalRhFracSum; cms::alpakatools::device_buffer globalSeeds; cms::alpakatools::device_buffer globalRechits; - }; } // namespace ALPAKA_ACCELERATOR_NAMESPACE