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

Sort the imports in the split configuration #32904

Merged

Conversation

fwyzard
Copy link
Contributor

@fwyzard fwyzard commented Feb 12, 2021

PR description:

When generating a split configuration, sort the import in each file by section and by module name.

For example, before:

from ..modules.l1tPFPuppiHT_cfi import *
from ..modules.l1tPFPuppiHT450off_cfi import *
from ..sequences.HLTParticleFlowSequence_cfi import *
from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import *
from ..modules.hltPFPuppiHT_cfi import *
from ..modules.hltPFPuppiHT1050_cfi import *

after:

from ..modules.hltPFPuppiHT_cfi import *
from ..modules.hltPFPuppiHT1050_cfi import *
from ..modules.l1tPFPuppiHT_cfi import *
from ..modules.l1tPFPuppiHT450off_cfi import *
from ..sequences.HLTAK4PFPuppiJetsReconstruction_cfi import *
from ..sequences.HLTParticleFlowSequence_cfi import *

PR validation:

None.

If this PR is a backport please specify the original PR and why you need to backport that PR:

Backport of #32754 to 11.1.x, used to build the Phase 2 HLT menu (see #32903).

When generating a split configuration, remove duplicates, and sort the import in
each file by section and by module name.
@fwyzard
Copy link
Contributor Author

fwyzard commented Feb 12, 2021

backport #32754

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 12, 2021

A new Pull Request was created by @fwyzard (Andrea Bocci) for CMSSW_11_1_X.

It involves the following packages:

FWCore/ParameterSet

@makortel, @smuzaffar, @cmsbuild, @Dr15Jones can you please review it and eventually sign? Thanks.
@makortel, @wddgit this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@fwyzard
Copy link
Contributor Author

fwyzard commented Feb 12, 2021

please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-01d4a3/12871/summary.html
COMMIT: 1c38631
CMSSW: CMSSW_11_1_X_2021-02-10-2300/slc7_amd64_gcc820
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/32904/12871/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 36
  • DQMHistoTests: Total histograms compared: 2784828
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2784777
  • DQMHistoTests: Total skipped: 50
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 35 files compared)
  • Checked 152 log files, 31 edm output root files, 36 DQM output files

@makortel
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

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

@qliphy
Copy link
Contributor

qliphy commented Feb 16, 2021

+1

@cmsbuild cmsbuild merged commit cdab7e4 into cms-sw:CMSSW_11_1_X Feb 16, 2021
@fwyzard fwyzard deleted the edmConfigSplit_sort_imports_111x branch August 18, 2021 13:38
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.

None yet

4 participants