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

bug fixes for Hydjets and Pyquen #36918

Merged
merged 2 commits into from Feb 15, 2022
Merged

bug fixes for Hydjets and Pyquen #36918

merged 2 commits into from Feb 15, 2022

Conversation

wouf
Copy link
Contributor

@wouf wouf commented Feb 9, 2022

PR description:

This is bugfix for #36316 . It fixes some bugs from here
Also two cff files unused in Configuration/Generator have been deleted in this PR.

PR validation:

Hydjet2 - wf 160
Hydjet - wf 150
Pyquen - wf 300

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 9, 2022

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36918/28227

  • This PR adds an extra 48KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 9, 2022

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

It involves the following packages:

  • Configuration/Generator (generators)
  • GeneratorInterface/Hydjet2Interface (generators)
  • GeneratorInterface/HydjetInterface (generators)
  • GeneratorInterface/PyquenInterface (generators)

@SiewYan, @mkirsano, @Saptaparna, @cmsbuild, @GurpreetSinghChahal, @alberto-sanchez can you please review it and eventually sign? Thanks.
@mkirsano, @cbaus, @Martin-Grunewald, @missirol, @alberto-sanchez, @fabiocos 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

@SiewYan
Copy link
Contributor

SiewYan commented Feb 9, 2022

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 9, 2022

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-60297d/22309/summary.html
COMMIT: b8808b7
CMSSW: CMSSW_12_3_X_2022-02-09-1100/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/36918/22309/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: 10 differences found in the comparisons
  • DQMHistoTests: Total files compared: 46
  • DQMHistoTests: Total histograms compared: 3765080
  • DQMHistoTests: Total failures: 21
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 3765036
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.004 KiB( 45 files compared)
  • DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
  • Checked 193 log files, 42 edm output root files, 46 DQM output files
  • TriggerResults: no differences found

@qliphy
Copy link
Contributor

qliphy commented Feb 10, 2022

type bugfix

@qliphy
Copy link
Contributor

qliphy commented Feb 10, 2022

please test workflow 148.0

@perrotta
Copy link
Contributor

@wouf could you please write a title slightly more descriptive for this PR? At least Hydjet should be present in it

@wouf wouf changed the title bug fixes bug fixes for Hydjets and Pyquen Feb 10, 2022
@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-60297d/22332/summary.html
COMMIT: b8808b7
CMSSW: CMSSW_12_3_X_2022-02-09-2300/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/36918/22332/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

@slava77 comparisons for the following workflows were not done due to missing matrix map:

  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-60297d/148.0_HydjetQ_MinBias_XeXe_5442GeV_2017+HydjetQ_MinBias_XeXe_5442GeV_2017+DIGIHI2017+RECOHI2017+HARVESTHI2017

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 46
  • DQMHistoTests: Total histograms compared: 3764420
  • DQMHistoTests: Total failures: 4
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3764394
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 45 files compared)
  • Checked 193 log files, 42 edm output root files, 46 DQM output files
  • TriggerResults: no differences found

@wouf
Copy link
Contributor Author

wouf commented Feb 11, 2022

Please hold it, the solution is not correct!

@@ -462,6 +459,9 @@ bool Hydjet2Hadronizer::get_particles(HepMC::GenEvent *evt) {
}
ihy++;
}
if (sub_vertices)
Copy link
Contributor

Choose a reason for hiding this comment

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

There is no need to check that the pointer is non-null before calling delete. Internally delete does such a check.

@perrotta
Copy link
Contributor

urgent

@cmsbuild
Copy link
Contributor

Pull request #36918 was updated. @SiewYan, @mkirsano, @Saptaparna, @cmsbuild, @GurpreetSinghChahal, @alberto-sanchez can you please check and sign again.

@wouf
Copy link
Contributor Author

wouf commented Feb 15, 2022

Please hold it, the solution is not correct!

Please @wouf proceed with the correct solution, taking also into account the suggestion from Chris: wf 148.0 keeps crashing in the IBs, and we woukdn't like to propagate that crash to pre5. An acceptable (intermediate) solution could be to strip the bug fixes specific to solve the issue with that wf in a separate PR, and take your time to proceed with the other issues addressed by this PR

@perrotta This PR can be merged, I will put memory leak bugfix to other.

@perrotta
Copy link
Contributor

@cms-sw/generators-l2 please have a look: this is needed in pre5

@SiewYan
Copy link
Contributor

SiewYan commented Feb 15, 2022

@wouf , thank for your effort. If I understood correctly, you have removed the two unused cfi and the pointer. The bugfix PR will come later?

@perrotta
Copy link
Contributor

@wouf , thank for your effort. If I understood correctly, you have removed the two unused cfi and the pointer. The bugfix PR will come later?

@SiewYan this is THE bugfix for the crash that we observe in wf 148 in the IB, due to an int parameter being declared as a bool in a few configurations

Then, there is some possible memory leak reported by the static analyzer, and that's what differed to a future PR (unless the delete statements implemented here already solve it: I'm realizing that the bot tests were not run yet, doing it now)

@perrotta
Copy link
Contributor

please test workflow 148.0

@SiewYan
Copy link
Contributor

SiewYan commented Feb 15, 2022

@perrotta , thank you for the description, it is very hard to follow from the long thread... I will sign it once the test is a success.

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-60297d/22419/summary.html
COMMIT: 4ed1ac9
CMSSW: CMSSW_12_3_X_2022-02-14-2300/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/36918/22419/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

@slava77 comparisons for the following workflows were not done due to missing matrix map:

  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-60297d/148.0_HydjetQ_MinBias_XeXe_5442GeV_2017+HydjetQ_MinBias_XeXe_5442GeV_2017+DIGIHI2017+RECOHI2017+HARVESTHI2017

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 46
  • DQMHistoTests: Total histograms compared: 3764435
  • DQMHistoTests: Total failures: 4
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3764409
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 45 files compared)
  • Checked 193 log files, 42 edm output root files, 46 DQM output files
  • TriggerResults: no differences found

@SiewYan
Copy link
Contributor

SiewYan commented Feb 15, 2022

+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)

@perrotta
Copy link
Contributor

+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