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][L1,UPGRADE] Replace some enums with constexpr ints #44534

Merged
merged 1 commit into from
Mar 28, 2024

Conversation

iarspider
Copy link
Contributor

PR description:

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

PR validation:

Bot tests

@iarspider
Copy link
Contributor Author

please test for CMSSW_14_1_CPP20_X

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 25, 2024

cms-bot internal usage

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-44534/39665

  • This PR adds an extra 52KB to repository

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

  • DataFormats/CSCDigi (simulation)
  • DataFormats/L1CSCTrackFinder (l1)
  • DataFormats/L1TrackTrigger (upgrade, l1)
  • L1Trigger/GlobalCaloTrigger (l1)
  • L1Trigger/HardwareValidation (l1)
  • L1Trigger/L1ExtraFromDigis (l1)
  • L1Trigger/Phase2L1ParticleFlow (upgrade, l1)
  • L1Trigger/RPCTrigger (l1)
  • L1Trigger/TrackTrigger (upgrade, l1)
  • L1Trigger/VertexFinder (l1)

@epalencia, @subirsarkar, @mdhildreth, @srimanob, @aloeliger, @civanch can you please review it and eventually sign? Thanks.
@missirol, @rovere, @erikbutz, @JanFSchulte, @eyigitba, @giovanni-mocellin, @skinnari, @ptcox, @sviret, @Martin-Grunewald 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: Build HeaderConsistency
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4c6833/38390/summary.html
COMMIT: 2060718
CMSSW: CMSSW_14_1_CPP20_X_2024-03-22-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/44534/38390/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-4c6833/38390/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4c6833/38390/git-merge-result

Build

I found compilation error when building:

>> Compiling  src/DataFormats/L1TrackTrigger/src/TTCluster.cc
>> Compiling  src/DataFormats/L1TrackTrigger/src/TTDTC.cc
>> Compiling  src/DataFormats/L1TrackTrigger/src/TTTrack.cc
>> Compiling  src/DataFormats/L1TrackTrigger/src/TTTrack_TrackWord.cc
In file included from src/DataFormats/L1TrackTrigger/src/TTTrack_TrackWord.cc:13:
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_14_1_CPP20_X_2024-03-22-1100/src/DataFormats/L1TrackTrigger/interface/TTTrack_TrackWord.h:55:54: error: stray ',' at end of member declaration
   55 |                                         kMVAOtherSize,  // Width of the track word in bits
      |                                                      ^
      |                                                      -
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_14_1_CPP20_X_2024-03-22-1100/src/DataFormats/L1TrackTrigger/interface/TTTrack_TrackWord.h:132:39: error: 'kTrackWordSize' is not a member of 'TTTrack_TrackWord::TrackBitWidths'
  132 |   typedef std::bitset tkword_bs_t;  // Entire track word;


@iarspider
Copy link
Contributor Author

please test for CMSSW_14_1_CPP20_X

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-44534/39676

  • This PR adds an extra 52KB to repository

@cmsbuild
Copy link
Contributor

Pull request #44534 was updated. @epalencia, @subirsarkar, @aloeliger, @civanch, @mdhildreth, @srimanob can you please check and sign again.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-44534/39682

  • This PR adds an extra 48KB to repository

@cmsbuild
Copy link
Contributor

Pull request #44534 was updated. @epalencia, @aloeliger, @mdhildreth, @civanch, @cmsbuild, @subirsarkar, @srimanob can you please check and sign again.

@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-4c6833/38417/summary.html
COMMIT: 57f96fb
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/44534/38417/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

@aloeliger
Copy link
Contributor

+l1

  • Technical tweaks

@srimanob
Copy link
Contributor

+Upgrade

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

@antoniovilela
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit d9cd83d into cms-sw:master Mar 28, 2024
10 checks passed
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.

6 participants