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

Add specific friendly names for unordered_set and unordered_map #29987

Merged
merged 1 commit into from May 26, 2020

Conversation

makortel
Copy link
Contributor

PR description:

This PR adds specific friendly class names for std::unordered_set and std::unordered_map to avoid underscores in their friendly class names. Resolves #29967.

PR validation:

Unit test passes.

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29987/15659

  • This PR adds an extra 20KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @makortel (Matti Kortelainen) for master.

It involves the following packages:

FWCore/Utilities

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

cms-bot commands are listed here

@makortel
Copy link
Contributor Author

@cmsbuild, please test

@makortel
Copy link
Contributor Author

@Dr15Jones please review

@cmsbuild
Copy link
Contributor

cmsbuild commented May 26, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/6594/console Started: 2020/05/26 17:30

@@ -37,6 +37,10 @@ void testfriendlyName::test() {
classToFriendly.insert(Values("bar::Foo", "barFoo"));
classToFriendly.insert(Values("std::vector<Foo>", "Foos"));
classToFriendly.insert(Values("std::vector<bar::Foo>", "barFoos"));
classToFriendly.insert(Values("std::set<bar::Foo>", "barFoostdset"));
classToFriendly.insert(Values("std::map<Foo, bar::Bar>", "FoobarBarstdmap"));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added these two just to test the current behavior with std::set and std::map.

@Dr15Jones
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs after it passes the integration tests. This pull request will now be reviewed by the release team before it's merged. @silviodonato, @dpiparo (and backports should be raised in the release meeting by the corresponding L2)

@cmsbuild
Copy link
Contributor

+1
Tested at: c5a8740
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-1c5c24/6594/summary.html
CMSSW: CMSSW_11_2_X_2020-05-26-1100
SCRAM_ARCH: slc7_amd64_gcc820

@cmsbuild
Copy link
Contributor

Comparison job queued.

@silviodonato
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 1e5e526 into cms-sw:master May 26, 2020
@makortel makortel deleted the friendlyClassNameUnorderedMap branch May 26, 2020 17:50
@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-1c5c24/6594/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 36
  • DQMHistoTests: Total histograms compared: 2780792
  • DQMHistoTests: Total failures: 49
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2780693
  • DQMHistoTests: Total skipped: 50
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 35 files compared)
  • Checked 152 log files, 16 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.

Can not produce std::unordered_map - illegal underscore
4 participants