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

Replaced DQM histogram booking macro to regular methods inside IBooker #26161

Merged
merged 4 commits into from May 21, 2019

Conversation

andrius-k
Copy link

@andrius-k andrius-k commented Mar 13, 2019

PR description:

Changed a macro that would generate histogram booking calls to regular methods inside IBooker.

Previous implementation was using a macro to generate a facade monitor element booking methods for DQMStore. Such approach saves some lines of code but code navigation becomes impossible and readability decreases.

Due to the fact that argument forwarding (std::forward<Args>(args)...) somehow caries out the type information of literal value arguments, different overloads are chosen after the update. Such cases were identified and fixed in this PR.

The problematic methods are these two. When 0 literal value is passed to the fourth argument, the pointer overload is (incorrectly) selected because of two reasons:

  • 0 is a valid null pointer literal value, and
  • it takes an implicit conversion (from int to double) for a double overload to be called

Previously the double version of the overload would be selected and the new behaviour is incorrect.

The fix is simple: finding all the cases where one of these two overloads are called and replacing zero literal values (i.e. 0) with double literal values (i.e. 0.0 or '0.').

PR validation:

The calls mentioned above were found by temporarily changing the type of first overload from double to int and compiling with -k (keep going in case of errors) option. This resulted in an ambiguity (compiler error with a corresponding message) because 0 literal value could be used for both methods without any implicit conversions.

@andrius-k
Copy link
Author

andrius-k commented Mar 13, 2019

Closing because work is still in progress.

@andrius-k andrius-k closed this Mar 13, 2019
@andrius-k
Copy link
Author

please test

@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-26161/8756

  • This PR adds an extra 48KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 13, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/33565/console Started: 2019/03/13 13:25

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @andrius-k (Andrius) for master.

It involves the following packages:

DQM/Physics
DQM/SiPixelPhase1Summary
DQM/TrackingMonitor
DQM/TrackingMonitorSource
DQMServices/Core

@andrius-k, @kmaeshima, @schneiml, @cmsbuild, @jfernan2, @fioriNTU can you please review it and eventually sign? Thanks.
@rappoccio, @barvic, @hdelanno, @makortel, @mtosi, @fioriNTU, @jandrea, @idebruyn, @threus this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

-1

Tested at: 2bae404

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-26161/33565/summary.html

I found follow errors while testing this PR

Failed tests: Build ClangBuild

  • Build:

I found compilation warning when building: See details on the summary page.

  • Clang:

I found compilation warning while trying to compile with clang. Command used:

USER_CUDA_FLAGS='--expt-relaxed-constexpr' USER_CXXFLAGS='-Wno-register -fsyntax-only' scram build -k -j 32 COMPILER='llvm compile'

See details on the summary page.

@cmsbuild
Copy link
Contributor

Comparison not run due to Build errors (RelVals and Igprof tests were also skipped)

@andrius-k
Copy link
Author

unhold

@cmsbuild cmsbuild removed the hold label May 20, 2019
@andrius-k
Copy link
Author

+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. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

@schneiml
Copy link
Contributor

@fabiocos can we get this merged, and also the code-format PR for DQMServices/Core (or all of DQMServices) as soon as possible?

My work depends on this PR and touches many files in DQMServices/Core, I don't want to spent more time constantly rebasing than actually working. So I'd like to get all pending changes for DQM core in in the next days.

@fabiocos
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 21, 2019

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/371/console Started: 2019/05/21 14:14

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 33
  • DQMHistoTests: Total histograms compared: 3206828
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3206493
  • DQMHistoTests: Total skipped: 334
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 32 files compared)
  • Checked 137 log files, 14 edm output root files, 33 DQM output files

@fabiocos
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 74f35fa into cms-sw:master May 21, 2019
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