From 1b14bd262e5af9d862e84237aaf214aaf297550c Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Sun, 23 Nov 2025 01:54:44 +0100 Subject: [PATCH] Include Eigen core library before include the SoA definitions --- DataFormats/ParticleFlowReco/interface/CaloRecHitSoA.h | 3 --- DataFormats/ParticleFlowReco/src/alpaka/classes_cuda.h | 3 +++ DataFormats/ParticleFlowReco/src/alpaka/classes_rocm.h | 3 +++ DataFormats/ParticleFlowReco/src/classes_serial.cc | 3 +++ DataFormats/ParticleFlowReco/src/classes_serial.h | 3 +++ .../plugins/alpaka/PFClusterSoAProducerKernel.h | 3 +++ .../plugins/alpaka/CalorimeterDefinitions.h | 8 +++++--- .../PFRecHitProducer/test/PFRecHitProducerTest.cc | 3 +++ 8 files changed, 23 insertions(+), 6 deletions(-) diff --git a/DataFormats/ParticleFlowReco/interface/CaloRecHitSoA.h b/DataFormats/ParticleFlowReco/interface/CaloRecHitSoA.h index b627bca650149..4632f0738e42c 100644 --- a/DataFormats/ParticleFlowReco/interface/CaloRecHitSoA.h +++ b/DataFormats/ParticleFlowReco/interface/CaloRecHitSoA.h @@ -1,9 +1,6 @@ #ifndef DataFormats_ParticleFlowReco_interface_CaloRecHitSoA_h #define DataFormats_ParticleFlowReco_interface_CaloRecHitSoA_h -#include -#include - #include "DataFormats/SoATemplate/interface/SoACommon.h" #include "DataFormats/SoATemplate/interface/SoALayout.h" diff --git a/DataFormats/ParticleFlowReco/src/alpaka/classes_cuda.h b/DataFormats/ParticleFlowReco/src/alpaka/classes_cuda.h index 74c3591453e22..806574361dbf1 100644 --- a/DataFormats/ParticleFlowReco/src/alpaka/classes_cuda.h +++ b/DataFormats/ParticleFlowReco/src/alpaka/classes_cuda.h @@ -1,3 +1,6 @@ +// Include Eigen core library before include the SoA definitions +#include + #include "DataFormats/Common/interface/DeviceProduct.h" #include "DataFormats/Common/interface/Wrapper.h" #include "DataFormats/ParticleFlowReco/interface/CaloRecHitSoA.h" diff --git a/DataFormats/ParticleFlowReco/src/alpaka/classes_rocm.h b/DataFormats/ParticleFlowReco/src/alpaka/classes_rocm.h index 74c3591453e22..806574361dbf1 100644 --- a/DataFormats/ParticleFlowReco/src/alpaka/classes_rocm.h +++ b/DataFormats/ParticleFlowReco/src/alpaka/classes_rocm.h @@ -1,3 +1,6 @@ +// Include Eigen core library before include the SoA definitions +#include + #include "DataFormats/Common/interface/DeviceProduct.h" #include "DataFormats/Common/interface/Wrapper.h" #include "DataFormats/ParticleFlowReco/interface/CaloRecHitSoA.h" diff --git a/DataFormats/ParticleFlowReco/src/classes_serial.cc b/DataFormats/ParticleFlowReco/src/classes_serial.cc index 9aa4a6df5ce97..18a4bc88acf51 100644 --- a/DataFormats/ParticleFlowReco/src/classes_serial.cc +++ b/DataFormats/ParticleFlowReco/src/classes_serial.cc @@ -1,3 +1,6 @@ +// Include Eigen core library before include the SoA definitions +#include + #include "DataFormats/ParticleFlowReco/interface/CaloRecHitHostCollection.h" #include "DataFormats/ParticleFlowReco/interface/PFClusterHostCollection.h" #include "DataFormats/ParticleFlowReco/interface/PFRecHitFractionHostCollection.h" diff --git a/DataFormats/ParticleFlowReco/src/classes_serial.h b/DataFormats/ParticleFlowReco/src/classes_serial.h index 1f506370711e0..d1b0d6d93a0c1 100644 --- a/DataFormats/ParticleFlowReco/src/classes_serial.h +++ b/DataFormats/ParticleFlowReco/src/classes_serial.h @@ -1,3 +1,6 @@ +// Include Eigen core library before include the SoA definitions +#include + #include "DataFormats/Common/interface/Wrapper.h" #include "DataFormats/ParticleFlowReco/interface/CaloRecHitHostCollection.h" #include "DataFormats/ParticleFlowReco/interface/CaloRecHitSoA.h" diff --git a/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducerKernel.h b/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducerKernel.h index 3c768cdfb51ad..d5c6dacfb6503 100644 --- a/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducerKernel.h +++ b/RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterSoAProducerKernel.h @@ -1,6 +1,9 @@ #ifndef RecoParticleFlow_PFClusterProducer_PFClusterProducerAlpakaKernel_h #define RecoParticleFlow_PFClusterProducer_PFClusterProducerAlpakaKernel_h +// Include Eigen core library before include the SoA definitions +#include + #include "DataFormats/ParticleFlowReco/interface/alpaka/PFClusterDeviceCollection.h" #include "DataFormats/ParticleFlowReco/interface/alpaka/PFRecHitDeviceCollection.h" #include "DataFormats/ParticleFlowReco/interface/alpaka/PFRecHitFractionDeviceCollection.h" diff --git a/RecoParticleFlow/PFRecHitProducer/plugins/alpaka/CalorimeterDefinitions.h b/RecoParticleFlow/PFRecHitProducer/plugins/alpaka/CalorimeterDefinitions.h index 4f1d50a249288..c9f91c1295f20 100644 --- a/RecoParticleFlow/PFRecHitProducer/plugins/alpaka/CalorimeterDefinitions.h +++ b/RecoParticleFlow/PFRecHitProducer/plugins/alpaka/CalorimeterDefinitions.h @@ -3,21 +3,23 @@ #include +// Include Eigen core library before include the SoA definitions +#include + #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/EcalDetId/interface/EcalSubdetector.h" #include "DataFormats/EcalRecHit/interface/EcalRecHit.h" #include "DataFormats/HcalDetId/interface/HcalDetId.h" #include "DataFormats/HcalDetId/interface/HcalSubdetector.h" #include "DataFormats/HcalRecHit/interface/HBHERecHit.h" +#include "DataFormats/HcalRecHit/interface/HcalRecHitHostCollection.h" +#include "DataFormats/HcalRecHit/interface/alpaka/HcalRecHitDeviceCollection.h" #include "DataFormats/ParticleFlowReco/interface/CaloRecHitHostCollection.h" #include "DataFormats/ParticleFlowReco/interface/alpaka/CaloRecHitDeviceCollection.h" #include "RecoParticleFlow/PFRecHitProducer/interface/PFRecHitTopologyHostCollection.h" #include "RecoParticleFlow/PFRecHitProducer/interface/alpaka/PFRecHitParamsDeviceCollection.h" #include "RecoParticleFlow/PFRecHitProducer/interface/alpaka/PFRecHitTopologyDeviceCollection.h" -#include "DataFormats/HcalRecHit/interface/HcalRecHitHostCollection.h" -#include "DataFormats/HcalRecHit/interface/alpaka/HcalRecHitDeviceCollection.h" - // Forward declaration of EventSetup records, to avoid propagating the dependency on framework headers to device code class PFRecHitHCALParamsRecord; class PFRecHitHCALTopologyRecord; diff --git a/RecoParticleFlow/PFRecHitProducer/test/PFRecHitProducerTest.cc b/RecoParticleFlow/PFRecHitProducer/test/PFRecHitProducerTest.cc index 10c9972881d01..cea76aa1431d3 100644 --- a/RecoParticleFlow/PFRecHitProducer/test/PFRecHitProducerTest.cc +++ b/RecoParticleFlow/PFRecHitProducer/test/PFRecHitProducerTest.cc @@ -7,6 +7,9 @@ #include #include +// Include Eigen core library before include the SoA definitions +#include + #include "DQMServices/Core/interface/DQMEDAnalyzer.h" #include "DQMServices/Core/interface/DQMStore.h" #include "DataFormats/Common/interface/Handle.h"