Skip to content

Have fillDescriptions generate a template for VPSet in cfi files #47374

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

Merged
merged 4 commits into from
Feb 18, 2025

Conversation

Dr15Jones
Copy link
Contributor

PR description:

The ParameterSetDescription passed to the function which adds a VPSet to the configuration is used to generate the template argument for the cms.VPSet written to the cfi files. This allows python to validate PSets passed to the VPSet.

This also fixes a bug where declaring cms.VPSet(cms.PSet(), template = ...) and then calling dumpPython() on the VPSet would generate syntactically invalid python.

PR validation:

Code compiles and framework unit tests pass.

resolves cms-sw/framework-team#1226

Avoid implicit `if` failure which could happen if a source were to define a different criteria (such as __len__).
If a VPSet had a single entry and defined a `template` then a `dumpPython` would not create a syntactically correct output.
If the PSetTemplate assigned to template is empty, do not print it when doing dumpPython.
The ParameterSetDescription passed to the declaration of a VPSet in fillDescriptions will be used to generate the value passed as `template` to the VPSet.
@Dr15Jones
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 17, 2025

cms-bot internal usage

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-47374/43732

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @Dr15Jones for master.

It involves the following packages:

  • FWCore/Integration (core)
  • FWCore/ParameterSet (core)

@Dr15Jones, @makortel, @smuzaffar can you please review it and eventually sign? Thanks.
@makortel, @missirol, @wddgit this is something you requested to watch as well.
@antoniovilela, @mandrenguyen, @rappoccio, @sextonkennedy you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

+1

Size: This PR adds an extra 116KB to repository
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-3834d2/44438/summary.html
COMMIT: f4700bc
CMSSW: CMSSW_15_1_X_2025-02-17-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/47374/44438/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • You potentially added 5 lines to the logs
  • Reco comparison results: 6 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3905432
  • DQMHistoTests: Total failures: 3
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3905409
  • DQMHistoTests: Total skipped: 20
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 214 log files, 184 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@makortel
Copy link
Contributor

+core

@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. @sextonkennedy, @rappoccio, @antoniovilela, @mandrenguyen (and backports should be raised in the release meeting by the corresponding L2)

@mandrenguyen
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit e65a5fe into cms-sw:master Feb 18, 2025
11 checks passed
@Dr15Jones Dr15Jones deleted the addPSetTemplateToVPSetInCfi branch February 18, 2025 12:59
@mmusich
Copy link
Contributor

mmusich commented Mar 21, 2025

It appears this PR created issues for ConfDB, see discussion at #47630 (comment)

@makortel
Copy link
Contributor

For the future record, in the end this PR did not create problems. More details in #47653.

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.

Have fillDescription generate a VPSet using template argument
5 participants