Code checks and formatting

cms-sw · Sep 26, 2024 · 2a00918 · 2a00918
1 parent 4758556
commit 2a00918
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 51 deletions.
diff --git 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<uint32_t>(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<uint32_t>(alpaka::getDev(event.queue()), *size_d.data());
+      auto device_num_rhf = cms::alpakatools::make_device_view<uint32_t>(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<reco::PFRecHitFractionDeviceCollection>(*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<reco::PFRecHitFractionDeviceCollection>(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
@@ -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
@@ -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<Device, uint32_t> nSeeds;
     cms::alpakatools::device_buffer<Device, reco::pfClustering::Position4[]> globalClusterPos;
@@ -66,7 +66,6 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
     cms::alpakatools::device_buffer<Device, float[]> globalRhFracSum;
     cms::alpakatools::device_buffer<Device, int[]> globalSeeds;
     cms::alpakatools::device_buffer<Device, int[]> globalRechits;
-
   };
 
 }  // namespace ALPAKA_ACCELERATOR_NAMESPACE