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

[Do not merge] Update classversion CLHEP::Hep3Vector #32420

Merged

Conversation

mrodozov
Copy link
Contributor

@mrodozov mrodozov commented Dec 8, 2020

PR description:

This is needed for testing geant4 changes, since clhep is updated
We cannot have this in master, not until we use the updated version of clhep for our master on https://github.com/cms-sw/cmsdist

PR validation:

DataFormats/CLHEP is building

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 8, 2020

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-32420/20286

  • This PR adds an extra 12KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 8, 2020

A new Pull Request was created by @mrodozov (Mircho Rodozov) for master.

It involves the following packages:

DataFormats/CLHEP

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

cms-bot commands are listed here

@mrodozov
Copy link
Contributor Author

mrodozov commented Dec 8, 2020

please test with cms-sw/cmsdist#6486

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 8, 2020

-1

CMSSW: CMSSW_11_3_X_2020-12-08-1100
SCRAM_ARCH: slc7_amd64_gcc900
You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-36750b/11431/summary.html

I found follow errors while testing this PR

Failed tests: UnitTests

  • Unit Tests:

I found errors in the following unit tests:

---> test testTauEmbeddingProducers had ERRORS

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 9, 2020

Comparison results are now available
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-36750b/11431/summary.html
CMSSW: CMSSW_11_3_X_2020-12-08-1100
SCRAM_ARCH: slc7_amd64_gcc900

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 47744 differences found in the comparisons
  • DQMHistoTests: Total files compared: 36
  • DQMHistoTests: Total histograms compared: 2747014
  • DQMHistoTests: Total failures: 304138
  • DQMHistoTests: Total nulls: 543
  • DQMHistoTests: Total successes: 2442311
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.028 KiB( 35 files compared)
  • DQMHistoSizes: changed ( 250202.181 ): -0.873 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 25202.0 ): 0.171 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 7.3 ): -1.667 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 8.0 ): 2.397 KiB SiStrip/MechanicalView
  • Checked 153 log files, 37 edm output root files, 36 DQM output files

@mrodozov
Copy link
Contributor Author

mrodozov commented Dec 9, 2020

please test with cms-sw/cmsdist#6492

@davidlange6
Copy link
Contributor

davidlange6 commented Dec 9, 2020 via email

@mrodozov
Copy link
Contributor Author

mrodozov commented Dec 9, 2020

should it be one additional record like:

  <class name="CLHEP::Hep3Vector" ClassVersion="11">
   <version ClassVersion="11" checksum="newchecksum"/>
  </class>
  <class name="CLHEP::Hep3Vector" ClassVersion="10">
   <version ClassVersion="10" checksum="3040806103"/>
  </class>

@mrodozov
Copy link
Contributor Author

mrodozov commented Dec 9, 2020

abort

@mrodozov
Copy link
Contributor Author

mrodozov commented Dec 9, 2020

I see there are other records like this in the same file

@davidlange6
Copy link
Contributor

davidlange6 commented Dec 9, 2020 via email

@civanch
Copy link
Contributor

civanch commented Dec 10, 2020

@mrodozov , if I understand correctly, today we cannot simply include new CLHEP in 11_3_GEANT4_X, because it is another external? In 11_3_GEANT4_X we take master and can add only Geant4 modification, not other external libraries?

@davidlange6
Copy link
Contributor

davidlange6 commented Dec 10, 2020 via email

@mrodozov
Copy link
Contributor Author

the unit test failing looks unrelated, but in case we wanted to get this I would've tried to figure it out where this python failure comes from.
@civanch almost, yes, we can add new externals to GEANT4 as we changed VecGeom last week - as long as the externals does not require changes like this one in CMSSW. Now, CLHEP requires changes also in cmssw

we can have only one version of
<class name="CLHEP::Hep3Vector" ClassVersion="11">
in CMSSW master
but
geant4 cmsdist branch with clhep 2440 will require version 11
master cmsdist branch with clnep 2413 will require version 10
and because we have only one branch on cmssw that we use for both, we must have another one for geant4
@smuzaffar should we branch master with another name to use for geant4 ?

@davidlange6
Copy link
Contributor

davidlange6 commented Dec 10, 2020 via email

@mrodozov
Copy link
Contributor Author

there is no commit history because I took clhep 2.4.4.0 from a tar file following:
cms-externals/geant4#51
I see they have the tag also on gitlab now
https://gitlab.cern.ch/CLHEP/CLHEP
but they didn't few days ago.

@civanch
Copy link
Contributor

civanch commented Dec 10, 2020

I may be do not understand something, but in the diff between new branch v2.4.4.0 and the master I do not see any difference in numerical constants, while in the CLHEP documentation there is an entry:

2020-07-20 Gabriele Cosmo Gabriele.Cosmo@cern.ch

This is a claim, that they peaked up from Britannica and Wikipedia new values for number of constants. Values are changed on level of 5th or 6th digits, which should change slightly cross sections and secondary distributions on such level, likely changing simulation histories.

By the way, I cannot see this in our repository, only in CLHEP original.

@davidlange6
Copy link
Contributor

davidlange6 commented Dec 10, 2020 via email

@davidlange6
Copy link
Contributor

It seems something is wrong with the diffs link (not sure what.. anyone see why?)

https://gitlab.cern.ch/CLHEP/CLHEP/-/compare/CLHEP_2_4_1_3...CLHEP_2_4_4_0

@davidlange6
Copy link
Contributor

@davidlange6
Copy link
Contributor

@civanch

  • static constexpr double e_SI = 1.602176487e-19;// positron charge in coulomb
  • static constexpr double e_SI = 1.602176634e-19;// positron charge in coulomb

-static constexpr double h_Planck = 6.62606896e-34 * joules;
+static constexpr double h_Planck = 6.62607015e-34 * joule
s;

-static constexpr double k_Boltzmann = 8.617343e-11 * MeV/kelvin;
+static constexpr double k_Boltzmann = 8.617333e-11 * MeV/kelvin;

-static constexpr double Avogadro = 6.02214179e+23/mole;
+static constexpr double Avogadro = 6.02214076e+23/mole;

@davidlange6
Copy link
Contributor

davidlange6 commented Dec 10, 2020 via email

@smuzaffar
Copy link
Contributor

one problem with cmssw-queue-override.file is that it is not used by PR testing setup or for local development (e.g. cms-addpkg is not going to apply these patches)

@civanch
Copy link
Contributor

civanch commented Dec 10, 2020

Again, I may be not understand something but He3Vector change is the optimization of the code itself: https://gitlab.cern.ch/CLHEP/CLHEP/-/commit/5f20daf0cae911793d9aa5fc62987d6dc83647ab
but not change any functionality of the class.

@civanch
Copy link
Contributor

civanch commented Dec 10, 2020

We may request PPD validation of new CLHEP+VecGeom on top of existing master together with 11_3_0_pre1 or 11_2_0.
This will take significant time but we follow the CMS procedure.

@civanch
Copy link
Contributor

civanch commented Dec 15, 2020

@mrodozov , @smuzaffar , how we can resolve this problem? I see two possibilities: 1) ask PPD validation of the new CLHEP separate, later we will ask for validation of GEANT4 10.7; 2) asking validation of CLHEP+Geant4 10.7 together?

@mrodozov
Copy link
Contributor Author

@civanch CLHEP validation only will be more simple because you have to test Geant 10.7 for some time and ask for validation later on

@davidlange6
Copy link
Contributor

davidlange6 commented Dec 15, 2020 via email

@smuzaffar
Copy link
Contributor

@civanch , @davidlange6 I have created CMSSW_11_3_GEANT4_X branch. As discussed during ORP, we can include new clhep and geant4 (along with this change here) for geant4 IBs and ask for a validation.

@smuzaffar smuzaffar changed the base branch from master to CMSSW_11_3_GEANT4_X December 15, 2020 16:54
@smuzaffar
Copy link
Contributor

please test with cms-sw/cmsdist#6486

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-36750b/11699/summary.html
CMSSW: CMSSW_11_3_GEANT4_X_2020-12-11-2300/slc7_amd64_gcc900

Found compilation warnings

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 47556 differences found in the comparisons
  • DQMHistoTests: Total files compared: 36
  • DQMHistoTests: Total histograms compared: 2747284
  • DQMHistoTests: Total failures: 301913
  • DQMHistoTests: Total nulls: 553
  • DQMHistoTests: Total successes: 2444796
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -1.646 KiB( 35 files compared)
  • DQMHistoSizes: changed ( 10224.0 ): -0.488 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 250202.181 ): -0.404 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 25202.0 ): 0.171 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 312.0 ): 0.004 KiB MessageLogger/Warnings
  • DQMHistoSizes: changed ( 7.3 ): -3.326 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 8.0 ): 2.397 KiB SiStrip/MechanicalView
  • Checked 153 log files, 37 edm output root files, 36 DQM output files

@smuzaffar
Copy link
Contributor

looks good for geant4 IB. lets get this merged for geant4 IBs so that we can build g4 release for validation

@mrodozov
Copy link
Contributor Author

please test with cms-sw/cmsdist#6512

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-36750b/11746/summary.html
CMSSW: CMSSW_11_3_GEANT4_X_2020-12-15-2300/slc7_amd64_gcc900

Found compilation warnings

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 47493 differences found in the comparisons
  • DQMHistoTests: Total files compared: 36
  • DQMHistoTests: Total histograms compared: 2747284
  • DQMHistoTests: Total failures: 233653
  • DQMHistoTests: Total nulls: 552
  • DQMHistoTests: Total successes: 2513057
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -1.65 KiB( 35 files compared)
  • DQMHistoSizes: changed ( 10224.0 ): -0.488 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 250202.181 ): -0.404 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 25202.0 ): 0.171 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 7.3 ): -3.326 KiB SiStrip/MechanicalView
  • DQMHistoSizes: changed ( 8.0 ): 2.397 KiB SiStrip/MechanicalView
  • Checked 153 log files, 37 edm output root files, 36 DQM output files

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