Merge pull request #45607 from smuzaffar/sim-cleanup

Dependency cleanup for big simulation plugin
cms-sw · Aug 5, 2024 · 643935a · 643935a
2 parents f0cc3fd + b8b76c8
commit 643935a
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/BigProducts/Simulation/BuildFile.xml b/BigProducts/Simulation/BuildFile.xml
@@ -29,7 +29,6 @@
 <use name="Validation/EcalHits"/>
 <use name="Validation/Geometry"/>
 <use name="Validation/HcalHits"/>
-<use name="Validation/HGCalValidation"/>
 <use name="geant4static"/>
 <use name="g4hepemstatic"/>
 <flags DROP_DEP="geant4core"/>

diff --git a/CondFormats/EcalObjects/BuildFile.xml b/CondFormats/EcalObjects/BuildFile.xml
@@ -11,7 +11,11 @@
 <use name="boost_serialization"/>
 <use name="rootmath"/>
 <use name="clhep"/>
-<use name="cuda"/>
+<iftool name="cuda">
+  <use name="cuda"/>
+<else/>
+  <flags SKIP_FILES="%GPU.cc"/>
+</iftool>
 <use name="HeterogeneousCore/AlpakaInterface"/>
 <flags ALPAKA_BACKENDS="!serial"/>
 <export>

diff --git a/CondFormats/HGCalObjects/BuildFile.xml b/CondFormats/HGCalObjects/BuildFile.xml
@@ -7,8 +7,12 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>
 <use name="HeterogeneousCore/AlpakaInterface"/>
-<use name="HeterogeneousCore/CUDACore"/>
+<iftool name="cuda">
+  <use name="HeterogeneousCore/CUDACore"/>
+<else/>
+  <flags SKIP_FILES="T_EventSetup_HeterogeneousHGCalHEFCellPositionsConditions.cc"/>
+</iftool>
 <flags ALPAKA_BACKENDS="1"/>
 <export>
   <lib name="1"/>
-</export>
+</export>
diff --git a/CondFormats/HcalObjects/BuildFile.xml b/CondFormats/HcalObjects/BuildFile.xml
@@ -10,8 +10,12 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>
 <use name="Geometry/CaloTopology"/>
-<use name="HeterogeneousCore/CUDACore"/>
-<use name="HeterogeneousCore/CUDAUtilities"/>
+<iftool name="cuda">
+  <use name="HeterogeneousCore/CUDACore"/>
+  <use name="HeterogeneousCore/CUDAUtilities"/>
+<else/>
+  <flags SKIP_FILES="%GPU.cc"/>
+</iftool>
 <use name="HeterogeneousCore/AlpakaCore"/>
 <use name="HeterogeneousCore/AlpakaInterface"/>
 <flags ALPAKA_BACKENDS="1"/>

diff --git a/Validation/HGCalValidation/BuildFile.xml b/Validation/HGCalValidation/BuildFile.xml
@@ -8,7 +8,6 @@
 <use name="SimDataFormats/CaloAnalysis"/>
 <use name="RecoLocalCalo/HGCalRecAlgos"/>
 <use name="RecoLocalCalo/HGCalRecProducers"/>
-<use name="geant4core"/>
 <use name="clhep"/>
 <use name="hepmc"/>
 <export>

diff --git a/Validation/HGCalValidation/plugins/BuildFile.xml b/Validation/HGCalValidation/plugins/BuildFile.xml
@@ -26,7 +26,6 @@
 <use name="SimG4CMS/Calo"/>
 <use name="RecoLocalCalo/HGCalRecAlgos"/>
 <use name="Validation/HGCalValidation"/>
-<use name="geant4core"/>
 <use name="dd4hep"/>
 <use name="clhep"/>
 <use name="hepmc"/>

diff --git a/Validation/HGCalValidation/test/BuildFile.xml b/Validation/HGCalValidation/test/BuildFile.xml
@@ -9,7 +9,6 @@
 <use name="SimDataFormats/CaloTest"/>
 <use name="SimG4CMS/Calo"/>
 <use name="RecoLocalCalo/HGCalRecAlgos"/>
-<use name="geant4core"/>
 <use name="clhep"/>
 <use name="hepmc"/>
 <flags EDM_PLUGIN="1"/>