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

use removeSchedulingTokensFromModuleLabel in pat::TriggerObjectStandAlone #40428

Merged

Conversation

missirol
Copy link
Contributor

@missirol missirol commented Jan 4, 2023

PR description:

This PR is a follow-up of #37181 (see also #37157 and #40007).

It updates pat::TriggerObjectStandAlone to use the centrally-provided method edm::path_configuration::removeSchedulingTokensFromModuleLabel, introduced in #40425.

Merely technical. No changes expected.

Requires #40425.

(On a quick look, I did not spot other obvious clients for removeSchedulingTokensFromModuleLabel.)

PR validation:

None.

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:

N/A

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 4, 2023

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40428/33562

ERROR: Build errors found during clang-tidy run.

DataFormats/PatCandidates/src/TriggerObjectStandAlone.cc:420:61: error: no member named 'removeSchedulingTokensFromModuleLabel' in namespace 'edm::path_configuration' [clang-diagnostic-error]
          auto const moduleStrip = edm::path_configuration::removeSchedulingTokensFromModuleLabel(module);
                                                            ^
Suppressed 1072 warnings (1071 in non-user code, 1 with check filters).
--
gmake: *** [config/SCRAM/GMake/Makefile.coderules:129: code-checks] Error 2
gmake: *** [There are compilation/build errors. Please see the detail log above.] Error 2

@missirol
Copy link
Contributor Author

missirol commented Jan 4, 2023

Too soon. Will rebase and test once #40425 is merged.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 5, 2023

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40428/33564

  • This PR adds an extra 20KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 5, 2023

A new Pull Request was created by @missirol (Marino Missiroli) for master.

It involves the following packages:

  • DataFormats/PatCandidates (xpog, reconstruction)

@cmsbuild, @mandrenguyen, @clacaputo, @swertz, @vlimant can you please review it and eventually sign? Thanks.
@gpetruc, @gouskos, @rovere, @hatakeyamak this is something you requested to watch as well.
@perrotta, @dpiparo, @rappoccio you are the release manager for this.

cms-bot commands are listed here

@missirol
Copy link
Contributor Author

missirol commented Jan 5, 2023

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 5, 2023

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-78d94b/29803/summary.html
COMMIT: 984f353
CMSSW: CMSSW_13_0_X_2023-01-05-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/40428/29803/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: 13 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3555748
  • DQMHistoTests: Total failures: 12
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3555714
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 211 log files, 162 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@missirol
Copy link
Contributor Author

missirol commented Jan 5, 2023

As expected, no changes in the outputs of PR tests due to this PR.

@mandrenguyen
Copy link
Contributor

+reconstruction
Technical. No changes to comparisons observed.

@swertz
Copy link
Contributor

swertz commented Jan 9, 2023

+xpog

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 9, 2023

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

@perrotta
Copy link
Contributor

perrotta commented Jan 9, 2023

This PR needs #40425, which is now merged but currently shows some issue with gcc12, which has to be fixed. Let wait for a possible fix for that PR before going on with merging this one. I don't think it will need to be reverted, but let just keep ready in case of it.

@missirol
Copy link
Contributor Author

missirol commented Jan 9, 2023

(I agree. No problem waiting.)

The only issue with #40425 is that

#include <array>

needs to be added in

FWCore/Utilities/src/path_configuration.cc

@perrotta
Copy link
Contributor

perrotta commented Jan 9, 2023

Ah, ok: thank you @missirol
If it is that simple, a possible fix is now in #40452

@perrotta
Copy link
Contributor

perrotta commented Jan 9, 2023

+1

  • Ok, the fix seems to work (it builds without errors), no reason to keep this in standby any further

@cmsbuild cmsbuild merged commit 42bac2f into cms-sw:master Jan 9, 2023
@missirol missirol deleted the devel_useModLabelStripperInPATTrigger branch January 9, 2023 13:13
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