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

Fix moduleLabelsInSequences to support modules with a "label" parameter #29777

Merged
merged 1 commit into from May 11, 2020

Conversation

fwyzard
Copy link
Contributor

@fwyzard fwyzard commented May 8, 2020

PR description:

Fix moduleLabelsInSequences() to support paths and sequences that include modules that define a label top level parameter.

PR validation:

Run with

from FWCore.ParameterSet.Utilities import moduleLabelsInSequences
process.DependencyGraph = cms.Service("DependencyGraph",
    highlightModules = cms.untracked.vstring(moduleLabelsInSequences(process.raw2digi_step, process.reconstruction_step))
)

on top of the 10824.512 workflow.

@fwyzard
Copy link
Contributor Author

fwyzard commented May 8, 2020

@cmsbuild, please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 8, 2020

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented May 8, 2020

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29777/15234

@cmsbuild
Copy link
Contributor

cmsbuild commented May 8, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/6183/console Started: 2020/05/08 15:43

@cmsbuild
Copy link
Contributor

cmsbuild commented May 8, 2020

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

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 you are the release manager for this.

cms-bot commands are listed here

@makortel
Copy link
Contributor

makortel commented May 8, 2020

I agree with the fix, but could you give an example in the way the old code did not work for ESProducers?

@fwyzard
Copy link
Contributor Author

fwyzard commented May 8, 2020

Yep, the old code failed with

$ python step3_RAW2DIGI_RECO_VALIDATION_DQM.py

Traceback (most recent call last):
  File "step3_RAW2DIGI_RECO_VALIDATION_DQM.py", line 152, in <module>
    highlightModules = cms.untracked.vstring(moduleLabelsInSequences(process.raw2digi_step, process.reconstruction_step))
  File "/data/cmssw/slc7_amd64_gcc820/cms/cmssw/CMSSW_11_1_0_pre5_Patatrack/python/FWCore/ParameterSet/Utilities.py", line 165, in moduleLabelsInSequences
    return [module.label() for module in modulesInSequences(* sequences)]
TypeError: 'string' object is not callable

when it encounters an ESProducer included in a Task included in the reconstruction_step.

@makortel
Copy link
Contributor

makortel commented May 8, 2020

Thanks. Out of curiosity, which ESProducer is that?

@fwyzard
Copy link
Contributor Author

fwyzard commented May 8, 2020

from EventFilter.EcalRawToDigi.ecalElectronicsMappingGPUESProducer_cfi import ecalElectronicsMappingGPUESProducer

(in the Patatrack branch)

@makortel
Copy link
Contributor

makortel commented May 8, 2020

Thanks. The ESProducer indeed has a parameter label which then "overrides" the method.

@fwyzard fwyzard changed the title Fix moduleLabelsInSequences to support EventSetup modules Fix moduleLabelsInSequences to support modules with a "label" parameter May 8, 2020
@fwyzard
Copy link
Contributor Author

fwyzard commented May 8, 2020

Right... let me update the PR and commit message to clarify the reason for the error.

Fix moduleLabelsInSequences to run on paths or sequences that include a
module that defines "label" as a top-level parameter.
@fwyzard fwyzard force-pushed the Fix_moduleLabelsInSequences branch from cbf5c62 to 2c6442e Compare May 8, 2020 14:20
@fwyzard
Copy link
Contributor Author

fwyzard commented May 8, 2020

@cmsbuild, please test

@fwyzard
Copy link
Contributor Author

fwyzard commented May 11, 2020

@cmsbuild, please test

@fwyzard
Copy link
Contributor Author

fwyzard commented May 11, 2020

let's try again ...

@cmsbuild
Copy link
Contributor

cmsbuild commented May 11, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/6214/console Started: 2020/05/11 11:37

@cmsbuild
Copy link
Contributor

+1
Tested at: 2c6442e
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-cae4bf/6214/summary.html
CMSSW: CMSSW_11_1_X_2020-05-10-2300
SCRAM_ARCH: slc7_amd64_gcc820

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-cae4bf/6214/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 2697527
  • DQMHistoTests: Total failures: 17
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2697191
  • DQMHistoTests: Total skipped: 319
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
  • Checked 147 log files, 16 edm output root files, 34 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 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)

fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request May 11, 2020
@silviodonato
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit b5140c9 into cms-sw:master May 11, 2020
fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request May 11, 2020
@fwyzard fwyzard deleted the Fix_moduleLabelsInSequences branch May 12, 2020 15:36
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