Skip to content
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.

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

Clean BuildFiles after Reco in alphabet #29485

Merged
merged 1 commit into from
Apr 22, 2020
Merged

Clean BuildFiles after Reco in alphabet #29485

merged 1 commit into from
Apr 22, 2020

Conversation

guitargeek
Copy link
Contributor

PR description:

Another quick partially automatic BuildFile cleaning PR in the style of many before (for example #29295), this time covering all subsystems that come after Reco in the alphabet.

Nothing special this time, except for maybe moving a file SimTracker/TrackerFilters/{interface → plugins}/CosmicTIFTrigFilter.h such that the header file and and the implementation are in the same (plugins) library and the dependencies are not mixed.

PR validation:

CMSSW compiles. It was checked that all newly added dependencies are actually required by the package with git grep.

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@guitargeek
Copy link
Contributor Author

Well these affects too many areas and collecting the signatures would take forever. Should be split up somehow.

@guitargeek guitargeek closed this Apr 15, 2020
@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29485/14700

  • This PR adds an extra 132KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @guitargeek (Jonas Rembser) for master.

It involves the following packages:

Alignment/OfflineValidation
DQM/SiTrackerPhase2
DQMOffline/JetMET
RecoTracker/NuclearSeedGenerator
RecoTracker/TkNavigation
SLHCUpgradeSimulations/Geometry
SUSYBSMAnalysis/HSCP
SimCalorimetry/CaloSimAlgos
SimCalorimetry/CastorSim
SimCalorimetry/CastorTechTrigProducer
SimCalorimetry/EcalEBTrigPrimAlgos
SimCalorimetry/EcalEBTrigPrimProducers
SimCalorimetry/EcalSelectiveReadoutProducers
SimCalorimetry/EcalSimProducers
SimCalorimetry/EcalTestBeam
SimCalorimetry/EcalTrigPrimAlgos
SimCalorimetry/EcalTrigPrimProducers
SimCalorimetry/EcalZeroSuppressionProducers
SimCalorimetry/HGCalSimAlgos
SimCalorimetry/HGCalSimProducers
SimCalorimetry/HcalTestBeam
SimCalorimetry/HcalTrigPrimAlgos
SimCalorimetry/HcalZeroSuppressionProducers
SimDataFormats/CaloAnalysis
SimDataFormats/CrossingFrame
SimDataFormats/EcalTestBeam
SimDataFormats/GEMDigiSimLink
SimDataFormats/RPCDigiSimLink
SimDataFormats/TrackingAnalysis
SimFastTiming/FastTimingCommon
SimG4CMS/CherenkovAnalysis
SimG4CMS/EcalTestBeam
SimG4CMS/FP420
SimG4CMS/Forward
SimG4CMS/HGCalTestBeam
SimG4CMS/HcalTestBeam
SimG4CMS/Muon
SimG4CMS/ShowerLibraryProducer
SimG4CMS/Tracker
SimG4Core/Application
SimG4Core/CustomPhysics
SimG4Core/DD4hepGeometry
SimG4Core/GFlash
SimG4Core/Generators
SimG4Core/Geometry
SimG4Core/GeometryProducer
SimG4Core/MagneticField
SimG4Core/PhysicsLists
SimG4Core/PrintGeomInfo
SimG4Core/SensitiveDetector
SimG4Core/Watcher
SimGeneral/CaloAnalysis
SimGeneral/DataMixingModule
SimGeneral/Debugging
SimGeneral/HepPDTESSource
SimGeneral/MixingModule
SimGeneral/PileupInformation
SimGeneral/PreMixingModule
SimGeneral/TrackingAnalysis
SimMuon/CSCDigitizer
SimMuon/DTDigitizer
SimMuon/GEMDigitizer
SimMuon/MCTruth
SimMuon/Neutron
SimMuon/RPCDigitizer
SimPPS/PPSPixelDigiProducer
SimPPS/PPSSimTrackProducer
SimPPS/RPDigiProducer
SimRomanPot/SimFP420
SimTracker/Records
SimTracker/SiPhase2Digitizer
SimTracker/SiPixelDigitizer
SimTracker/SiStripDigitizer
SimTracker/TrackAssociation
SimTracker/TrackAssociatorProducers
SimTracker/TrackHistory
SimTracker/TrackTriggerAssociation
SimTracker/TrackerFilters
SimTracker/TrackerHitAssociation
SimTracker/VertexAssociation
SimTransport/PPSProtonTransport
TauAnalysis/MCEmbeddingTools
TopQuarkAnalysis/Examples
TopQuarkAnalysis/TopEventProducers
TopQuarkAnalysis/TopHitFit
TopQuarkAnalysis/TopKinFitter
TopQuarkAnalysis/TopObjectResolutions
TopQuarkAnalysis/TopPairBSM
TopQuarkAnalysis/TopSkimming
TopQuarkAnalysis/TopTools
TrackPropagation/Geant4e
TrackPropagation/RungeKutta
TrackPropagation/SteppingHelixPropagator
TrackingTools/GeomPropagators
TrackingTools/GsfTracking
TrackingTools/KalmanUpdators
TrackingTools/PatternTools
TrackingTools/TrackAssociator
TrackingTools/TrackFitters
TrackingTools/TrackRefitter
TrackingTools/TrajectoryCleaning
TrackingTools/TrajectoryFiltering
TrackingTools/TransientTrack
Utilities/DavixAdaptor
Validation/RecoEgamma

@andrius-k, @schneiml, @ianna, @kpedro88, @rekovic, @fioriNTU, @tlampen, @pohsun, @santocch, @perrotta, @civanch, @makortel, @cmsbuild, @smuzaffar, @Dr15Jones, @cvuosalo, @mdhildreth, @jfernan2, @tocheng, @slava77, @benkrikler, @kmaeshima, @christopheralanwest can you please review it and eventually sign? Thanks.
@echabert, @rappoccio, @felicepantaleo, @schoef, @robervalwalsh, @emilbols, @argiro, @jshlee, @wddgit, @pfs, @thomreis, @tlampen, @ahinzmann, @lgray, @threus, @mmusich, @seemasharmafnal, @mmarionncern, @kreczko, @sethzenz, @JyothsnaKomaragiri, @makortel, @smoortga, @mverzett, @jhgoh, @dgulhan, @apsallid, @prolay, @HuguesBrun, @cericeci, @dildick, @ferencek, @pieterdavid, @rociovilar, @vandreev11, @abbiendi, @GiacomoSguazzoni, @rovere, @VinInn, @cseez, @bellan, @nhanvtran, @gkasieczka, @tocheng, @deguio, @wmtford, @mschrode, @ebrondol, @ptcox, @fabiocos, @clelange, @jdamgov, @namapane, @jdolen, @adewit, @trocino, @battibass, @gbenelli, @Fedespring, @calderona, @hatakeyamak, @dkotlins, @lecriste, @gpetruc, @mariadalfonso, @andrzejnovak, @folguera this is something you requested to watch as well.
@silviodonato, @dpiparo you are the release manager for this.

cms-bot commands are listed here

@kpedro88
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 15, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/5709/console Started: 2020/04/15 21:41

@guitargeek
Copy link
Contributor Author

Well, since this is already getting tested I might as well reopen it and give it a shot!

@guitargeek guitargeek reopened this Apr 15, 2020
@cmsbuild
Copy link
Contributor

-1

Tested at: 9cacd94

CMSSW: CMSSW_11_1_X_2020-04-15-1100
SCRAM_ARCH: slc7_amd64_gcc820
You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-57ebbf/5709/summary.html

I found follow errors while testing this PR

Failed tests: UnitTests

  • Unit Tests:

I found errors in the following unit tests:

---> test testPhase2PixelNtuple had ERRORS

@jfernan2
Copy link
Contributor

+1

@santocch
Copy link

+1

@silviodonato
Copy link
Contributor

Hi @silviodonato, splitting it up would actually take more time because these BuildFiles are all correlated and it does not factorize trivially. So it would be cool if we could go through with this, after all #29295 required an equal number of signatures and got through pretty quickly so there is a chance that happens here too.

ok, then let me send a reminder to
l1: @benkrikler @rekovic
reconstruction: @perrotta @slava77
alca: @pohsun @tlampen @tocheng @christopheralanwest

<use name="TrackingTools/DetLayers"/>
<export>
<lib name="1"/>
</export>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently this file was not needed before.

what does this do for a header-only package?

@makortel @Dr15Jones

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently this file was not needed before.

what does this do for a header-only package?

@makortel @Dr15Jones

@smuzaffar Could you clarify?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BuildFiles are useful for header only packages too. This way one exports the dependency so that the packages which use this do not have to explicitly add the missing dependencies. The <export> </export> section in this type of BuildFile(s) does not make any sence as there is no library generated for such packages. SCRAM silently ignores this. Better to remove the <export> </export> section here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, that's good too know! I was checking the wrong header-only package for inspiration: https://github.com/cms-sw/cmssw/tree/master/RecoCaloTools/Selector

@slava77, as this is in the reco area, how do you want to proceed? We can either change this now, or we rely for now on scram ignoring the export statement and remove it in another PR (which can also cover the other header-only libraries). I favour the latter solution, because then it doesn't reset all the signatures and we are almost there...

@slava77
Copy link
Contributor

slava77 commented Apr 18, 2020

+1

for #29485 9cacd94

@pohsun
Copy link

pohsun commented Apr 19, 2020

+1

@silviodonato
Copy link
Contributor

@benkrikler @rekovic ?

@guitargeek
Copy link
Contributor Author

Hi @benkrikler @rekovic, hoping to make thinks faster here before the 100+ edited files collide with another PR :) The packages that fall under your area here are SimCalorimetry/EcalEBTrigPrimProducers and SimCalorimetry/EcalTrigPrimProducers and a few more in SimCalorimetry which are trivial because only lines in the BuildFile.xml files are removed. In the two packages I explicitly mentioned, there are also added lines.

@rekovic
Copy link
Contributor

rekovic commented Apr 22, 2020

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @silviodonato, @dpiparo (and backports should be raised in the release meeting by the corresponding L2)

@silviodonato
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit ee0a261 into cms-sw:master Apr 22, 2020
@guitargeek guitargeek deleted the deps_after_reco branch April 22, 2020 09:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.