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

extend Modifier boolean expressions to include "not" and "or" [94X] #24480

Merged
merged 6 commits into from Sep 11, 2018

Conversation

kpedro88
Copy link
Contributor

@kpedro88 kpedro88 commented Sep 6, 2018

This is a partial backport of #22210. Only the changes in FWCore/ParameterSet/python/Config.py were backported. The additional Modifier functionality is needed in 94X for the ongoing fastsim backport.

attn: @makortel @ssekmen

…ressions of Modifiers

For these to work I had to bypass the isChosen() checks of the
contained Modifiers as they may not be enabled.
Using the same bypass of contained-Modifier isChosen() status as with toModify()
It's a bit simpler to avoid traversing the tree of Modifiers back to
some leaf.
@kpedro88
Copy link
Contributor Author

kpedro88 commented Sep 6, 2018

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 6, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/30288/console Started: 2018/09/06 23:29

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 6, 2018

A new Pull Request was created by @kpedro88 (Kevin Pedro) for CMSSW_9_4_X.

It involves the following packages:

FWCore/ParameterSet

@cmsbuild, @smuzaffar, @Dr15Jones can you please review it and eventually sign? Thanks.
@makortel, @Martin-Grunewald, @wddgit this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 7, 2018

-1

Tested at: ed090f1

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-24480/30288/summary.html

I found follow errors while testing this PR

Failed tests: UnitTests

  • Unit Tests:

I found errors in the following unit tests:

---> test testPythonParameterSet had ERRORS

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 7, 2018

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 7, 2018

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 27
  • DQMHistoTests: Total histograms compared: 2721493
  • DQMHistoTests: Total failures: 138
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2721193
  • DQMHistoTests: Total skipped: 162
  • DQMHistoTests: Total Missing objects: 0

@Dr15Jones
Copy link
Contributor

+1
The unit test failure is unrelated to this pull request.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 7, 2018

This pull request is fully signed and it will be integrated in one of the next CMSSW_9_4_X IBs (but tests are reportedly failing) and once validation in the development release cycle CMSSW_10_3_X is complete. This pull request will now be reviewed by the release team before it's merged. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

@fabiocos
Copy link
Contributor

fabiocos commented Sep 9, 2018

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 9, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/30305/console Started: 2018/09/09 10:13

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 9, 2018

-1

Tested at: ed090f1

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-24480/30305/summary.html

I found follow errors while testing this PR

Failed tests: UnitTests

  • Unit Tests:

I found errors in the following unit tests:

---> test testPythonParameterSet had ERRORS

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 9, 2018

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 9, 2018

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 27
  • DQMHistoTests: Total histograms compared: 2721493
  • DQMHistoTests: Total failures: 109
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2721222
  • DQMHistoTests: Total skipped: 162
  • DQMHistoTests: Total Missing objects: 0

@kpedro88
Copy link
Contributor Author

@fabiocos please merge, the unit test failure is the usual one due to wrong file path, unrelated to this PR

@fabiocos
Copy link
Contributor

+1

@fabiocos
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit 3d960a1 into cms-sw:CMSSW_9_4_X Sep 11, 2018
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

5 participants