[WIP] More sophisticated RHist binning comparisons by HadrienG2 · Pull Request #5725 · root-project/root

HadrienG2 · 2020-05-28T13:12:48Z

This is the current state of my experiment towards enabling finer-grained axis binning comparisons that "axis configuration is exactly the same" or "axis configuration is different".

Once finished, this should enable switching between several histogram merging logics, including...

The current implementation, which is maximally fast but a bit too limited (it doesn't even allow the target histogram to grow to span the source histogram range if it is able to).
- Note that said implementation did already gain some superpowers in the current state of this PR, such as ability to merge when axis bin borders are slightly different.
More permissive implementations, which trade speed for generality.

Here's what should IMO be added before this PR can be considered ready to merge:

Tests, lots of them. There's some very tricky code in there, even if it got clearer over time...
Performance optimizations to reduce the impact of comparing axis binning, including...
- Not comparing every axis bin border when the axes are equidistant
- Reducing reliance on virtual function calls, especially in loops
- Possibly early algorithm exit as soon as complete conclusions are reached (but this will only benefit worst-case scenarios where axis binnings are very different, so...)
Demonstration of a more permissive histogram merging algorithm, to cross-check that the current binning comparison info adequately enables writing one as intended.

phsft-bot · 2020-05-28T13:13:01Z

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos7-multicore/default, ROOT-fedora29/python3, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1015/cxx17, windows10/cxx14
How to customize builds

hist/histv7/src/RAxis.cxx

phsft-bot · 2020-06-02T14:53:44Z

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos7-multicore/default, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac1015/cxx17, windows10/cxx14
How to customize builds

phsft-bot · 2020-06-04T07:24:26Z

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos7-multicore/default, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac1015/cxx17, windows10/cxx14
How to customize builds

phsft-bot · 2020-06-04T07:45:19Z

Build failed on ROOT-fedora30/cxx14.
Running on root-fedora30-2.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See cdash.
See console output.

Errors:

[2020-06-04T07:44:57.029Z] FAILED: hist/histv7/CMakeFiles/ROOTHist.dir/src/RAxis.cxx.o
[2020-06-04T07:44:57.325Z] /home/sftnight/build/workspace/root-pullrequests-build/root/hist/histv7/src/RAxis.cxx:364:35: error: use of deleted function ‘ROOT::Experimental::RAxisBase::BinningCompatibility::BinningCompatibility(const ROOT::Experimental::RAxisBase::BinningCompatibility&)’
[2020-06-04T07:44:57.325Z] /home/sftnight/build/workspace/root-pullrequests-build/root/hist/histv7/inc/ROOT/RAxis.hxx:849:38: error: union member ‘ROOT::Experimental::RAxisBase::BinningCompatibility::<unnamed union>::fLabeled’ with non-trivial ‘ROOT::Experimental::RAxisBase::LabeledBinningCompatibility::LabeledBinningCompatibility(const ROOT::Experimental::RAxisBase::LabeledBinningCompatibility&)’
[2020-06-04T07:44:57.325Z] /home/sftnight/build/workspace/root-pullrequests-build/root/hist/histv7/src/RAxis.cxx:368:7: error: use of deleted function ‘ROOT::Experimental::RAxisBase::BinningCompatibility::BinningCompatibility(const ROOT::Experimental::RAxisBase::BinningCompatibility&)’
[2020-06-04T07:44:57.325Z] /home/sftnight/build/workspace/root-pullrequests-build/root/hist/histv7/src/RAxis.cxx:373:65: error: use of deleted function ‘ROOT::Experimental::RAxisBase::BinningCompatibility::BinningCompatibility(const ROOT::Experimental::RAxisBase::BinningCompatibility&)’

phsft-bot · 2020-06-04T07:45:20Z

Build failed on ROOT-debian10-i386/cxx14.
Running on pcepsft10.dyndns.cern.ch:/build/workspace/root-pullrequests-build
See cdash.
See console output.

Errors:

[2020-06-04T07:44:53.428Z] /home/sftnight/build/workspace/root-pullrequests-build/root/hist/histv7/src/RAxis.cxx:364:35: error: use of deleted function ‘ROOT::Experimental::RAxisBase::BinningCompatibility::BinningCompatibility(const ROOT::Experimental::RAxisBase::BinningCompatibility&)’
[2020-06-04T07:44:53.428Z] /home/sftnight/build/workspace/root-pullrequests-build/root/hist/histv7/inc/ROOT/RAxis.hxx:849:38: error: union member ‘ROOT::Experimental::RAxisBase::BinningCompatibility::<unnamed union>::fLabeled’ with non-trivial ‘ROOT::Experimental::RAxisBase::LabeledBinningCompatibility::LabeledBinningCompatibility(const ROOT::Experimental::RAxisBase::LabeledBinningCompatibility&)’
[2020-06-04T07:44:53.428Z] /home/sftnight/build/workspace/root-pullrequests-build/root/hist/histv7/src/RAxis.cxx:368:7: error: use of deleted function ‘ROOT::Experimental::RAxisBase::BinningCompatibility::BinningCompatibility(const ROOT::Experimental::RAxisBase::BinningCompatibility&)’
[2020-06-04T07:44:53.428Z] /home/sftnight/build/workspace/root-pullrequests-build/root/hist/histv7/src/RAxis.cxx:373:65: error: use of deleted function ‘ROOT::Experimental::RAxisBase::BinningCompatibility::BinningCompatibility(const ROOT::Experimental::RAxisBase::BinningCompatibility&)’

phsft-bot · 2020-06-04T07:59:01Z

Build failed on windows10/cxx14.
Running on null:C:\build\workspace\root-pullrequests-build
See cdash.
See console output.

Errors:

[2020-06-04T07:48:07.945Z] C:\build\workspace\root-pullrequests-build\root\hist\histv7\src\RAxis.cxx(364,1): error C2280: 'ROOT::Experimental::RAxisBase::BinningCompatibility::BinningCompatibility(const ROOT::Experimental::RAxisBase::BinningCompatibility &)': attempting to reference a deleted function [C:\build\workspace\root-pullrequests-build\build\hist\histv7\ROOTHist.vcxproj]

phsft-bot · 2020-06-04T09:34:16Z

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos7-multicore/default, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac1015/cxx17, windows10/cxx14
How to customize builds

phsft-bot · 2020-06-04T11:04:52Z

Build failed on windows10/cxx14.
Running on null:C:\build\workspace\root-pullrequests-build
See cdash.
See console output.

phsft-bot · 2020-06-04T15:56:47Z

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos7-multicore/default, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac1015/cxx17, windows10/cxx14
How to customize builds

phsft-bot · 2020-06-10T12:07:27Z

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos7-multicore/default, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac1015/cxx17, windows10/cxx14
How to customize builds

phsft-bot · 2020-06-10T12:14:12Z

Build failed on ROOT-fedora30/cxx14.
Running on root-fedora30-2.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See cdash.
See console output.

phsft-bot · 2020-06-10T12:14:27Z

Build failed on ROOT-fedora31/noimt.
Running on root-fedora-31-1.cern.ch:/build/workspace/root-pullrequests-build
See cdash.
See console output.

phsft-bot · 2020-06-10T12:20:20Z

Build failed on ROOT-ubuntu16/nortcxxmod.
Running on sft-ubuntu-1604-4.cern.ch:/build/workspace/root-pullrequests-build
See cdash.
See console output.

phsft-bot · 2020-06-10T12:33:44Z

Build failed on mac1015/cxx17.
Running on macphsft20.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See cdash.
See console output.

phsft-bot · 2020-06-10T12:34:40Z

Build failed on ROOT-performance-centos7-multicore/default.
Running on olhswep22.cern.ch:/data/sftnight/workspace/root-pullrequests-build
See cdash.
See console output.

phsft-bot · 2020-06-10T12:49:56Z

Build failed on windows10/cxx14.
Running on null:C:\build\workspace\root-pullrequests-build
See cdash.
See console output.

phsft-bot · 2020-06-10T13:08:26Z

Build failed on mac1014/python3.
Running on macphsft17.dyndns.cern.ch:/build/jenkins/workspace/root-pullrequests-build
See cdash.
See console output.

phsft-bot · 2020-06-10T13:12:47Z

Build failed on ROOT-debian10-i386/cxx14.
Running on pcepsft10.dyndns.cern.ch:/build/workspace/root-pullrequests-build
See cdash.
See console output.

…g tests

…entation detail.

phsft-bot · 2020-06-11T07:51:09Z

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos7-multicore/default, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac1015/cxx17, windows10/cxx14
How to customize builds

phsft-bot · 2020-06-11T08:12:24Z

Build failed on ROOT-performance-centos7-multicore/default.
Running on olhswep22.cern.ch:/data/sftnight/workspace/root-pullrequests-build
See cdash.
See console output.

Failing tests:

phsft-bot · 2020-06-22T16:08:45Z

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos7-multicore/default, ROOT-fedora30/cxx14, ROOT-fedora31/noimt, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac1015/cxx17, windows10/cxx14
How to customize builds

phsft-bot · 2020-06-22T17:47:31Z

Build failed on mac1014/python3.
Running on macitois21.cern.ch:/build/jenkins/workspace/root-pullrequests-build
See cdash.
See console output.

Failing tests:

And 25 more

ferdymercury · 2025-04-01T07:16:25Z

Closing for the moment due to #18191

HadrienG2 added new feature do not merge improvement labels May 28, 2020

HadrienG2 requested review from Axel-Naumann and claireguyot May 28, 2020 13:12

HadrienG2 self-assigned this May 28, 2020

HadrienG2 changed the title ~~[WIP] More sophisticated binning comparisons~~ [WIP] More sophisticated RHist binning comparisons May 28, 2020

Axel-Naumann reviewed Jun 2, 2020

View reviewed changes

hist/histv7/src/RAxis.cxx Outdated Show resolved Hide resolved

HadrienG2 added 4 commits June 11, 2020 09:50

Use smarter bitfield design for labels comparison

1ff5ef8

First draft of binning comparison API

668692f

Second draft of binning comparison API contract

523ba1f

Typo fix

0cdcab5

HadrienG2 added 21 commits June 11, 2020 09:50

Make labeled binning compatibility testing more exhaustive

05db07b

Add a test of mapping into an equidistant axis, fix some bugs

22bd70a

I can live with shorter names

138d253

Let's constify

b44cf46

Clarify that smaller/larger bins need more work

c4906dd

Test non-commensurate binning too

78612f9

Deduplicate some more

be40cbf

Start testing merging into an irregular axis

6043241

Avoid unnecessary codegen bloat + test base class

e0ce77b

Test Irr<-Eq specific scenarios

432f594

Add a note on Irr<-Irr scenarios

02c9fce

A bit of breathing room

3e6da76

Be polite

3ddde04

Reduce nesting of labeled axis tests

363a5c4

Test adding/removing irregular axis bin borders

5852915

Start testing Grow<-Something scenarios + clean formatting + fix a bug

5470a63

Deduplicate

d34bf87

Extend axis shifting tests + growable target version of all eq binnin…

baec909

…g tests

Un-nesting check_labeled_axis is good, but it should remain an implem…

3790a5c

…entation detail.

Generalize Eq<-Irr tests to growable axes

caf89b4

Test specifics of the Grow<-Irr scenario

1bc93c8

Silence a silly warning

9d87e41

hageboeck removed the do not merge label Sep 14, 2020

ferdymercury added the in:Hist label Apr 15, 2024

ferdymercury closed this Apr 1, 2025

Conversation

HadrienG2 commented May 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

phsft-bot commented May 28, 2020

Uh oh!

Uh oh!

phsft-bot commented Jun 2, 2020

Uh oh!

phsft-bot commented Jun 4, 2020

Uh oh!

phsft-bot commented Jun 4, 2020

Errors:

Uh oh!

phsft-bot commented Jun 4, 2020

Errors:

Uh oh!

phsft-bot commented Jun 4, 2020

Errors:

Uh oh!

phsft-bot commented Jun 4, 2020

Uh oh!

phsft-bot commented Jun 4, 2020

Uh oh!

phsft-bot commented Jun 4, 2020

Uh oh!

phsft-bot commented Jun 10, 2020

Uh oh!

phsft-bot commented Jun 10, 2020

Uh oh!

phsft-bot commented Jun 10, 2020

Uh oh!

phsft-bot commented Jun 10, 2020

Uh oh!

phsft-bot commented Jun 10, 2020

Uh oh!

phsft-bot commented Jun 10, 2020

Uh oh!

phsft-bot commented Jun 10, 2020

Uh oh!

phsft-bot commented Jun 10, 2020

Uh oh!

phsft-bot commented Jun 10, 2020

Uh oh!

phsft-bot commented Jun 11, 2020

Uh oh!

phsft-bot commented Jun 11, 2020

Failing tests:

Uh oh!

phsft-bot commented Jun 22, 2020

Uh oh!

phsft-bot commented Jun 22, 2020

Failing tests:

Uh oh!

ferdymercury commented Apr 1, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

HadrienG2 commented May 28, 2020 •

edited

Loading