Skip to content

Add missing dependencies on TBB #40376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 1 commit into from
Jan 10, 2023
Merged

Add missing dependencies on TBB #40376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions CommonTools/Utils/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<use name="boost"/>
<use name="boost_regex"/>
<use name="roothistmatrix"/>
<use name="tbb"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Math"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Reflection"/>
<use name="FWCore/SOA" source_only="1"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="boost"/>
<use name="boost_regex"/>
<use name="roothistmatrix"/>
<export>
<lib name="1"/>
</export>
17 changes: 9 additions & 8 deletions DQM/EcalCommon/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
<use name="boost"/>
<use name="rootcore"/>
<use name="tbb"/>
<use name="CalibCalorimetry/EcalLaserAnalyzer"/>
<use name="CondFormats/EcalObjects"/>
<use name="DQMServices/Core"/>
<use name="DataFormats/DetId"/>
<use name="DataFormats/EcalDetId"/>
<use name="DataFormats/EcalRawData"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="Geometry/EcalMapping"/>
<use name="Geometry/CaloTopology"/>
<use name="FWCore/Utilities"/>
<use name="Geometry/CaloGeometry"/>
<use name="Geometry/CaloTopology"/>
<use name="Geometry/EcalMapping"/>
<use name="Geometry/Records"/>
<use name="CalibCalorimetry/EcalLaserAnalyzer"/>
<use name="CondFormats/EcalObjects"/>
<use name="DQMServices/Core"/>
<use name="rootcore"/>
<use name="boost"/>
<export>
<lib name="1"/>
</export>
7 changes: 4 additions & 3 deletions DQMServices/Core/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<use name="classlib"/>
<use name="protobuf"/>
<use name="roothistmatrix"/>
<use name="tbb"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="classlib"/>
<use name="roothistmatrix"/>
<use name="protobuf"/>
<export>
<lib name="1"/>
</export>
9 changes: 5 additions & 4 deletions DQMServices/FwkIO/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<use name="DataFormats/Histograms"/>
<use name="roothistmatrix"/>
<use name="tbb"/>
<use name="DQMServices/Core"/>
<use name="DataFormats/Histograms"/>
<use name="FWCore/Catalog"/>
<use name="FWCore/Framework"/>
<use name="FWCore/Sources"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Sources"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/Catalog"/>
<use name="roothistmatrix"/>
<library file="*.cc" name="DQMServicesFwkIOPlugins">
<flags EDM_PLUGIN="1"/>
</library>
3 changes: 2 additions & 1 deletion DataFormats/Common/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<use name="boost"/>
<use name="tbb"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="boost"/>
<export>
<lib name="1"/>
</export>
1 change: 1 addition & 0 deletions DataFormats/L1GlobalMuonTrigger/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<use name="tbb"/>
<use name="DataFormats/Common"/>
<use name="FWCore/MessageLogger"/>
<export>
Expand Down
39 changes: 20 additions & 19 deletions DataFormats/PatCandidates/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,38 @@
<use name="FWCore/Utilities"/>
<use name="FWCore/Common"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Candidate"/>
<use name="DataFormats/MuonReco"/>
<use name="DataFormats/TauReco"/>
<use name="DataFormats/JetReco"/>
<use name="DataFormats/METReco"/>
<use name="DataFormats/EgammaCandidates"/>
<use name="DataFormats/ParticleFlowCandidate"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/HepMCCandidate"/>
<use name="boost"/>
<use name="boost_regex"/>
<use name="tbb"/>
<use name="DataFormats/BTauReco"/>
<use name="DataFormats/L1GlobalTrigger"/>
<use name="DataFormats/L1Trigger"/>
<use name="DataFormats/HLTReco"/>
<use name="DataFormats/CLHEP"/>
<use name="DataFormats/CaloTowers"/>
<use name="DataFormats/Candidate"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/EcalRecHit"/>
<use name="DataFormats/JetMatching"/>
<use name="DataFormats/CLHEP"/>
<use name="DataFormats/EgammaCandidates"/>
<use name="DataFormats/EgammaReco"/>
<use name="DataFormats/GeometryCommonDetAlgo"/>
<use name="DataFormats/GsfTrackReco"/>
<use name="DataFormats/HLTReco"/>
<use name="DataFormats/HepMCCandidate"/>
<use name="DataFormats/JetMatching"/>
<use name="DataFormats/JetReco"/>
<use name="DataFormats/L1GlobalTrigger"/>
<use name="DataFormats/L1Trigger"/>
<use name="DataFormats/METReco"/>
<use name="DataFormats/Math"/>
<use name="DataFormats/MuonReco"/>
<use name="DataFormats/ParticleFlowCandidate"/>
<use name="DataFormats/Provenance"/>
<use name="DataFormats/RecoCandidate"/>
<use name="DataFormats/SiPixelDetId"/>
<use name="DataFormats/SiStripDetId"/>
<use name="DataFormats/TauReco"/>
<use name="DataFormats/TrackReco"/>
<use name="DataFormats/VertexReco"/>
<use name="FWCore/Common"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Reflection"/>
<use name="boost"/>
<use name="boost_regex"/>
<use name="FWCore/Utilities"/>
<flags LCG_DICT_HEADER="classes_objects.h classes_trigger.h classes_user.h classes_other.h"/>
<flags LCG_DICT_XML="classes_def_objects.xml classes_def_trigger.xml classes_def_user.xml classes_def_other.xml"/>
<export>
Expand Down
11 changes: 6 additions & 5 deletions EventFilter/Utilities/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<use name="curl"/>
<use name="stdcxx-fs"/>
<use name="tbb"/>
<use name="DataFormats/FEDRawData"/>
<use name="DataFormats/TCDS"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Framework"/>
<use name="FWCore/Sources"/>
<use name="DataFormats/FEDRawData"/>
<use name="DataFormats/TCDS"/>
<use name="IOPool/Streamer"/>
<use name="curl"/>
<use name="stdcxx-fs"/>
<export>
<lib name="1"/>
</export>
3 changes: 2 additions & 1 deletion FWCore/Common/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<use name="DataFormats/Provenance"/>
<use name="tbb"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<export>
Expand Down
7 changes: 4 additions & 3 deletions FWCore/Framework/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<use name="boost"/>
<use name="rootcore"/>
<use name="tbb"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Common"/>
<use name="FWCore/Concurrency"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Reflection"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/Version"/>
<use name="boost"/>
<use name="rootcore"/>
<flags ADD_SUBDIR="1"/>
<export>
<lib name="1"/>
Expand Down
9 changes: 5 additions & 4 deletions FWCore/PythonFramework/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<use name="FWCore/Framework"/>
<use name="FWCore/PythonParameterSet"/>
<use name="boost"/>
<use name="py3-pybind11"/>
<use name="tbb"/>
<use name="FWCore/Concurrency"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/PythonParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="boost"/>
<use name="py3-pybind11"/>
<export>
<lib name="1"/>
</export>
1 change: 1 addition & 0 deletions FWCore/Reflection/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<use name="rootcling"/>
<use name="tbb"/>
<use name="FWCore/Utilities"/>
<export>
<lib name="1"/>
Expand Down
9 changes: 5 additions & 4 deletions FWCore/Services/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<use name="boost"/>
<use name="cpu_features"/>
<use name="gcc-atomic"/>
<use name="tbb"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Concurrency"/>
<use name="FWCore/Framework"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/Services"/>
<use name="FWCore/Reflection"/>
<use name="FWCore/Services"/>
<use name="Utilities/StorageFactory"/>
<use name="Utilities/XrdAdaptor"/>
<use name="boost"/>
<use name="gcc-atomic"/>
<use name="cpu_features"/>
<library file="*.cc" name="FWCoreServicesPlugins">
<flags EDM_PLUGIN="1"/>
</library>
7 changes: 4 additions & 3 deletions FWCore/TestProcessor/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSetReader"/>
<use name="boost"/>
<use name="tbb"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Concurrency"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ParameterSetReader"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="boost"/>
<export>
<lib name="1"/>
</export>
16 changes: 9 additions & 7 deletions GeneratorInterface/LHEInterface/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
<use name="stdcxx-fs"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="GeneratorInterface/LHEInterface"/>
<use name="stdcxx-fs"/>

<library name="GeneratorInterfaceLHEProducer" file="LHEFilter.cc LHE2HepMCConverter.cc ExternalLHEProducer.cc ExternalLHEAsciiDumper.cc">
<use name="tbb"/>
<use name="FWCore/Framework"/>
<use name="SimDataFormats/GeneratorProducts"/>
<flags EDM_PLUGIN="1"/>
</library>
<library name="GeneratorInterfaceLHEIO" file="LH5Source.cc LHESource.cc LHEProvenanceHelper.cc LHEWriter.cc">
<use name="FWCore/Framework"/>
<use name="FWCore/Sources"/>
<use name="SimDataFormats/GeneratorProducts"/>
<flags EDM_PLUGIN="1"/>

<library name="GeneratorInterfaceLHEIO" file="LH5Source.cc LHESource.cc LHEProvenanceHelper.cc LHEWriter.cc">
<use name="FWCore/Framework"/>
<use name="FWCore/Sources"/>
<use name="SimDataFormats/GeneratorProducts"/>
<flags EDM_PLUGIN="1"/>
</library>

<library name="GeneratorInterfaceLHECOMWeightProducer" file="LHECOMWeightProducer.cc">
<use name="lhapdf"/>
<use name="FWCore/Framework"/>
<use name="SimDataFormats/GeneratorProducts"/>
<use name="lhapdf"/>
<flags EDM_PLUGIN="1"/>
</library>
3 changes: 2 additions & 1 deletion HLTrigger/Timer/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<library file="*.cc" name="HLTriggerTimerPlugins">
<use name="boost_regex"/>
<use name="fmt"/>
<use name="json"/>
<use name="tbb"/>
<use name="DQMServices/Core"/>
<use name="DataFormats/Provenance"/>
<use name="DataFormats/Scalers"/>
Expand All @@ -9,6 +11,5 @@
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="HLTrigger/Timer"/>
<use name="boost_regex"/>
<flags EDM_PLUGIN="1"/>
</library>
16 changes: 8 additions & 8 deletions HeterogeneousCore/CUDACore/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<iftool name="cuda-gcc-support">
<bin file="test_*.cc test_*.cu" name="testHeterogeneousCoreCUDACore">
<use name="catch2"/>
<use name="cuda"/>
<use name="tbb"/>
<use name="CUDADataFormats/Common"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ParameterSetReader"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="HeterogeneousCore/CUDACore"/>
<use name="catch2"/>
<use name="cuda"/>
</bin>

<bin file="testStreamEvent.cu" name="testHeterogeneousCoreCUDACoreStreamEvent">
<use name="HeterogeneousCore/CUDAUtilities"/>
<use name="cuda"/>
<use name="HeterogeneousCore/CUDAUtilities"/>
</bin>

<bin name="cudaTimeMeasurement" file="cudaTimeMeasurement.cu">
<use name="cuda"/>
<use name="HeterogeneousCore/CUDAUtilities"/>
<flags TEST_RUNNER_CMD="cudaTimeMeasurement -a10 -t100 -s10000 -q -p12345"/>
</bin>
</bin>

<bin name="mpiCudaGeneric" file="mpiCudaGeneric.cu">
<use name="openmpi"/>
<bin name="mpiCudaGeneric" file="mpiCudaGeneric.cu">
<use name="cuda"/>
<use name="openmpi"/>
<use name="HeterogeneousCore/CUDAUtilities"/>
<flags TEST_RUNNER_CMD="cudaIsEnabled &amp;&amp; cmsenv_mpirun -np 2 mpiCudaGeneric -t100 -a10 -s200000 -p123 || echo 'Failed to initialise the CUDA runtime, the test will be skipped.'"/>
</bin>

</bin>
</iftool>
5 changes: 2 additions & 3 deletions HeterogeneousCore/CUDAServices/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
<iftool name="cuda">
<use name="cuda"/>
<use name="tbb"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="HeterogeneousCore/CUDAServices"/>
<use name="HLTrigger/Timer"/>

<use name="HeterogeneousCore/CUDAServices"/>
<library file="*.cc" name="HeterogeneousCoreCUDAServicesPlugins">
<flags EDM_PLUGIN="1"/>
</library>

</iftool>
3 changes: 2 additions & 1 deletion IOPool/Output/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<use name="rootcore"/>
<use name="tbb"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Framework"/>
Expand All @@ -8,7 +10,6 @@
<use name="FWCore/Version"/>
<use name="IOPool/Common"/>
<use name="IOPool/Provenance"/>
<use name="rootcore"/>
<export>
<lib name="1"/>
</export>
Loading