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][ALCA] Replace some enums with constexpr ints #44509

Merged

Conversation

iarspider
Copy link
Contributor

PR description:

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

PR validation:

Bot tests

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 22, 2024

cms-bot internal usage

@iarspider
Copy link
Contributor Author

please test for CMSSW_14_1_CPP20_X

@iarspider iarspider changed the title [CPP20] Replace some enums with constexpr ints [CPP20][ALCA] Replace some enums with constexpr ints Mar 22, 2024
@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-44509/39628

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

  • Alignment/Geners (alca)
  • CalibFormats/SiStripObjects (alca)

@perrotta, @saumyaphor4252, @consuegs can you please review it and eventually sign? Thanks.
@tocheng, @rsreds, @mmusich, @adewit, @threus, @yuanchao this is something you requested to watch as well.
@rappoccio, @antoniovilela, @sextonkennedy you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

-1

Failed Tests: UnitTests RelVals
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-700ca2/38341/summary.html
COMMIT: 1185533
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/44509/38341/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-700ca2/38341/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-700ca2/38341/git-merge-result

Unit Tests

I found 1 errors in the following unit tests:

---> test testRecoBTagInfoWithUnsubJets had ERRORS

RelVals

----- Begin Fatal Exception 22-Mar-2024 15:25:14 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/44509/38341/CMSSW_14_1_CPP20_X_2024-03-18-1100/poison:/cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44509/38341/CMSSW_14_1_CPP20_X_2024-03-18-1100/src:/cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44509/38341/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 15:26:00 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/44509/38341/CMSSW_14_1_CPP20_X_2024-03-18-1100/poison:/cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44509/38341/CMSSW_14_1_CPP20_X_2024-03-18-1100/src:/cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44509/38341/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 15:28:38 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/44509/38341/CMSSW_14_1_CPP20_X_2024-03-18-1100/poison:/cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44509/38341/CMSSW_14_1_CPP20_X_2024-03-18-1100/src:/cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44509/38341/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

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-700ca2/38428/summary.html
COMMIT: 1185533
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/44509/38428/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

@perrotta
Copy link
Contributor

I am pretty sure that the several differences in tracking quantities are due to the different architecture CMSSW_14_1_CPP20_X in which this PR (and the previous #44485) is built. However, before signing let me satisfy my curiosity and retest with the same compiler as used for the references.

@perrotta
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: UnitTests
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-700ca2/38443/summary.html
COMMIT: 1185533
CMSSW: CMSSW_14_1_X_2024-03-26-2300/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/44509/38443/install.sh to create a dev area with all the needed externals and cmssw changes.

Unit Tests

I found 1 errors in the following unit tests:

---> test test-das-selected-lumis had ERRORS

Comparison Summary

Summary:

@perrotta
Copy link
Contributor

+alca

  • Unit test error is unrelated
  • Comparisons using the same compiler do not show differences in tracking quantities any more

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs (but tests are reportedly failing). This pull request will now be reviewed by the release team before it's merged. @antoniovilela, @rappoccio, @sextonkennedy (and backports should be raised in the release meeting by the corresponding L2)

@antoniovilela
Copy link
Contributor

ignore tests-rejected with external-failure

@antoniovilela
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 069243b into cms-sw:master Mar 28, 2024
16 of 17 checks passed
@iarspider iarspider deleted the cpp20-no-enum-arithmetics_alca_db-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.

4 participants