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

[CPP20][GEOMETRY] Replace some enums with constexpr ints #44514

Merged

Conversation

iarspider
Copy link
Contributor

PR description:

Replace some enums with constexpr ints to avoid deprecated enum arithmetics. Replaces #44488 following @makortel's suggestion.

PR validation:

Bot tests

If this PR is a backport please specify the original PR and why you need to backport that PR. If this PR will be backported please specify to which release cycle the backport is meant for:

Before submitting your pull requests, make sure you followed this checklist:

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 22, 2024

cms-bot internal usage

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-44514/39638

  • This PR adds an extra 36KB to repository

@iarspider
Copy link
Contributor Author

please test for CMSSW_14_1_CPP20_X

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

  • DataFormats/EcalDetId (simulation)
  • DataFormats/HcalDetId (simulation)
  • Geometry/CaloTopology (geometry)
  • Geometry/EcalAlgo (geometry)
  • Geometry/ForwardGeometry (geometry)

@makortel, @mdhildreth, @civanch, @bsunanda, @Dr15Jones can you please review it and eventually sign? Thanks.
@ReyerBand, @bsunanda, @fabiocos, @missirol, @argiro, @mariadalfonso, @abdoulline, @thomreis, @rovere, @wang0jin, @rchatter this is something you requested to watch as well.
@antoniovilela, @sextonkennedy, @rappoccio you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

-1

Failed Tests: RelVals
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-f40703/38349/summary.html
COMMIT: 2a3d9c1
CMSSW: CMSSW_14_1_CPP20_X_2024-03-18-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44514/38349/install.sh to create a dev area with all the needed externals and cmssw changes.

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-f40703/38349/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-f40703/38349/git-merge-result

RelVals

----- Begin Fatal Exception 22-Mar-2024 18:55:20 CET-----------------------
An exception of category 'ConfigFileReadError' occurred while
   [0] Processing the python configuration file named step2_DIGI_L1TrackTrigger_L1_DIGI2RAW_HLT.py
Exception Message:
 unknown python problem occurred.
RuntimeError: An exception of category 'FileInPathError' occurred.
Exception Message:
edm::FileInPath unable to find file RecoBTag/Combined/data/DeepFlavourV02_PhaseII/DeepJet_retraining_phase2_new_inputs.onnx anywhere in the search path.
The search path is defined by: CMSSW_SEARCH_PATH
${CMSSW_SEARCH_PATH} is: /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44514/38349/CMSSW_14_1_CPP20_X_2024-03-18-1100/poison:/cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44514/38349/CMSSW_14_1_CPP20_X_2024-03-18-1100/src:/cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44514/38349/CMSSW_14_1_CPP20_X_2024-03-18-1100/external/el8_amd64_gcc12/data:/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src:/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/external/el8_amd64_gcc12/data
Current directory is: /data/cmsbld/jenkins/workspace/ib-run-pr-relvals/matrix-results/24896.0_CloseByPGun_CE_E_Front_120um+2026D98


At:
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Types.py(887): insertInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Mixins.py(384): insertContentsInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Mixins.py(519): insertInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Modules.py(161): insertInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Config.py(1216): _insertManyInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Config.py(1489): fillProcessDesc
  <string>(2): <module>

----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 22-Mar-2024 18:55:52 CET-----------------------
An exception of category 'ConfigFileReadError' occurred while
   [0] Processing the python configuration file named step2_DIGI_L1TrackTrigger_L1_DIGI2RAW_HLT.py
Exception Message:
 unknown python problem occurred.
RuntimeError: An exception of category 'FileInPathError' occurred.
Exception Message:
edm::FileInPath unable to find file RecoBTag/Combined/data/DeepFlavourV02_PhaseII/DeepJet_retraining_phase2_new_inputs.onnx anywhere in the search path.
The search path is defined by: CMSSW_SEARCH_PATH
${CMSSW_SEARCH_PATH} is: /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44514/38349/CMSSW_14_1_CPP20_X_2024-03-18-1100/poison:/cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44514/38349/CMSSW_14_1_CPP20_X_2024-03-18-1100/src:/cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44514/38349/CMSSW_14_1_CPP20_X_2024-03-18-1100/external/el8_amd64_gcc12/data:/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src:/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/external/el8_amd64_gcc12/data
Current directory is: /data/cmsbld/jenkins/workspace/ib-run-pr-relvals/matrix-results/24900.0_CloseByPGun_CE_H_Coarse_Scint+2026D98


At:
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Types.py(887): insertInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Mixins.py(384): insertContentsInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Mixins.py(519): insertInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Modules.py(161): insertInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Config.py(1216): _insertManyInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Config.py(1489): fillProcessDesc
  <string>(2): <module>

----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 22-Mar-2024 18:59:06 CET-----------------------
An exception of category 'ConfigFileReadError' occurred while
   [0] Processing the python configuration file named step2_DIGI_L1TrackTrigger_L1_DIGI2RAW_HLT.py
Exception Message:
 unknown python problem occurred.
RuntimeError: An exception of category 'FileInPathError' occurred.
Exception Message:
edm::FileInPath unable to find file RecoBTag/Combined/data/DeepFlavourV02_PhaseII/DeepJet_retraining_phase2_new_inputs.onnx anywhere in the search path.
The search path is defined by: CMSSW_SEARCH_PATH
${CMSSW_SEARCH_PATH} is: /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44514/38349/CMSSW_14_1_CPP20_X_2024-03-18-1100/poison:/cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44514/38349/CMSSW_14_1_CPP20_X_2024-03-18-1100/src:/cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44514/38349/CMSSW_14_1_CPP20_X_2024-03-18-1100/external/el8_amd64_gcc12/data:/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src:/cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/external/el8_amd64_gcc12/data
Current directory is: /data/cmsbld/jenkins/workspace/ib-run-pr-relvals/matrix-results/24834.0_TTbar_14TeV+2026D98


At:
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Types.py(887): insertInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Mixins.py(384): insertContentsInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Mixins.py(519): insertInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Modules.py(161): insertInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Config.py(1216): _insertManyInto
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02829/el8_amd64_gcc12/cms/cmssw/CMSSW_14_1_CPP20_X_2024-03-18-1100/src/FWCore/ParameterSet/python/Config.py(1489): fillProcessDesc
  <string>(2): <module>

----- End Fatal Exception -------------------------------------------------
Expand to see more relval errors ...

@iarspider
Copy link
Contributor Author

RelVal failures are unrelated.

@iarspider
Copy link
Contributor Author

please test
let's retrigger to get clean tests

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-f40703/38404/summary.html
COMMIT: 2a3d9c1
CMSSW: CMSSW_14_1_X_2024-03-25-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/44514/38404/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • You potentially removed 3 lines from the logs
  • Reco comparison results: 53 differences found in the comparisons
  • DQMHistoTests: Total files compared: 48
  • DQMHistoTests: Total histograms compared: 3297537
  • DQMHistoTests: Total failures: 9
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3297508
  • DQMHistoTests: Total skipped: 20
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 47 files compared)
  • Checked 202 log files, 165 edm output root files, 48 DQM output files
  • TriggerResults: no differences found

@bsunanda
Copy link
Contributor

+geometry

@iarspider
Copy link
Contributor Author

please test for CMSSW_14_1_CPP20_X

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-f40703/38446/summary.html
COMMIT: 2a3d9c1
CMSSW: CMSSW_14_1_CPP20_X_2024-03-25-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/44514/38446/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

@civanch
Copy link
Contributor

civanch commented Mar 28, 2024

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

@antoniovilela
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit adfc6f7 into cms-sw:master Mar 28, 2024
17 checks passed
@iarspider iarspider deleted the cpp20-no-enum-arithmetics-geometry-v2 branch April 2, 2024 07:09
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.

5 participants