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

fixing removal of modules from FinalPath #37022

Merged
merged 1 commit into from Feb 24, 2022

Conversation

missirol
Copy link
Contributor

PR description:

This PR follows #36932 and #36937, and concerns the removal of a module from a FinalPath.

It looks like said removal does not work correctly in 12_3_0_pre5, as [1] returns [2] (the issue was reported by @sanuvarghese from TSG).

The implementation in this PR is basically a copy-paste of the solution provided by @Dr15Jones in #36937.

The PR is mainly a way to point out the issue. I'm happy to close it if it's incorrect/incomplete, of if experts prefer to take care of the implementation of this fix.

FYI: @Martin-Grunewald @Sam-Harper @silviodonato

[1] Example borrowed from #36932

import FWCore.ParameterSet.Config as cms

process = cms.Process("HLT")

process.dqmOutput = cms.OutputModule("DQMRootOutputModule",
    fileName = cms.untracked.string("DQMIO.root")
)

process.DQMOutput = cms.FinalPath( process.dqmOutput )

process.DQMOutput.remove(process.dqmOutput)

[2]

Traceback (most recent call last):
  File "tmp.py", line 11, in <module>
    process.DQMOutput.remove(process.dqmOutput)
  File "/cvmfs/cms.cern.ch/slc7_amd64_gcc10/cms/cmssw/CMSSW_12_3_0_pre5/python/FWCore/ParameterSet/SequenceTypes.py", line 500, in remove
    self.associate(*v.result(self)[1])
TypeError: associate() missing 1 required positional argument: 'task'

PR validation:

The example in [1] works, and unit tests of FWCore/ParameterSet pass.

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

N/A

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37022/28449

  • This PR adds an extra 28KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @missirol (Marino Missiroli) for master.

It involves the following packages:

  • FWCore/ParameterSet (core)

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

cms-bot commands are listed here

@makortel
Copy link
Contributor

Thanks @missirol! @Dr15Jones, could you take a look?

@makortel
Copy link
Contributor

@cmsbuild, please test

Comment on lines +2342 to +2347
fp = FinalPath(m1)
fp.remove(m1)
self.assertEqual(fp.dumpPython(), "cms.FinalPath()\n")
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you extend the test to also cover the case where there are multiple items in the FinalPath and only one is removed? I just want to test the if branch

Suggested change
fp = FinalPath(m1)
fp.remove(m1)
self.assertEqual(fp.dumpPython(), "cms.FinalPath()\n")
fp = FinalPath(m1+m2)
fp.remove(m1)
self.assertEqual(fp.dumpPython(), "cms.FinalPath(process.m2)\n")
fp = FinalPath(m1)
fp.remove(m1)
self.assertEqual(fp.dumpPython(), "cms.FinalPath()\n")

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. Done by force-push to minimise commits.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37022/28458

  • This PR adds an extra 28KB to repository

@cmsbuild
Copy link
Contributor

Pull request #37022 was updated. @cmsbuild, @smuzaffar, @Dr15Jones, @makortel can you please check and sign again.

@makortel
Copy link
Contributor

@cmsbuild, please abort

@makortel
Copy link
Contributor

@cmsbuild, please test

@missirol
Copy link
Contributor Author

The bot reports 1 error, in the (HLT) addOnTest called hlt_mc_PRef, but I can't reproduce that locally (and don't know how that could be caused by this PR).

@cmsbuild
Copy link
Contributor

-1

Failed Tests: AddOn
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ce79da/22582/summary.html
COMMIT: 43db69b
CMSSW: CMSSW_12_3_X_2022-02-22-1100/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/37022/22582/install.sh to create a dev area with all the needed externals and cmssw changes.

AddOn Tests

  • hlt_mc_PRefcmsDriver.py RelVal -s HLT:PRef,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run3_mc_PRef --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run3 --processName=HLTRECO --filein file:RelVal_Raw_PRef_MC.root --fileout file:RelVal_Raw_PRef_MC_HLT_RECO.root : FAILED - time: date Tue Feb 22 17:03:56 2022-date Tue Feb 22 16:56:28 2022 s - exit: 35584

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3965143
  • DQMHistoTests: Total failures: 7
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 3965113
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.004 KiB( 48 files compared)
  • DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
  • Checked 204 log files, 45 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@Martin-Grunewald
Copy link
Contributor

Martin-Grunewald commented Feb 22, 2022

Module: MkFitProducer:pixelLessStepTrackCandidatesMkFit (crashed)
Module: MkFitProducer:highPtTripletStepTrackCandidatesMkFit
Module: MultiHitFromChi2EDProducer:pixelLessStepHitTriplets
Module: MkFitProducer:highPtTripletStepTrackCandidatesMkFit

MkFit has introduced some problems, as discussed in the ORP today.

@Martin-Grunewald
Copy link
Contributor

please test

@missirol
Copy link
Contributor Author

Regarding my previous comment, I should add that I was testing this PR on top of plain 12_3_0_pre5, not a recent IB.

@Dr15Jones
Copy link
Contributor

As long as it passes the FWCore/ParameterSet unit tests, I'm happy.

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ce79da/22590/summary.html
COMMIT: 43db69b
CMSSW: CMSSW_12_3_X_2022-02-22-1100/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/37022/22590/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: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3965143
  • DQMHistoTests: Total failures: 8
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3965113
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 204 log files, 45 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

missirol added a commit to missirol/cmssw that referenced this pull request Feb 23, 2022
Backport to CMSSW_12_2_X of the following PRs:
 - cms-sw#36937 (b1f49c8)
 - cms-sw#37022 (43db69b)
@missirol
Copy link
Contributor Author

type bugfix

I took the liberty to open a backport of these FinalPath fixes to 12_2_X, because HLT makes use of FinalPath in that release cycle, too: #37043.

@Dr15Jones
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. @perrotta, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

@qliphy
Copy link
Contributor

qliphy commented Feb 24, 2022

+1

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

6 participants