[RF] Test schema evolution of RooDataHist from version 5 and 6 by guitargeek · Pull Request #8090 · root-project/root

guitargeek · 2021-05-04T13:57:05Z

Extend the RooDataHist tests to also validate the schema evolution
from version 5 and version 6.

Version 6 is the current version, so the dataHistv6_ref.root reference
file was produced with ROOT master. Version 5 was used in ROOT 6.24,
which was used to produce the dataHistv5_ref.root reference file.

The version 6 reference file is a little bit smaller than the version 5 file, as the _realVars member was removed with version 6.

A nice aspect of the version 6 update is also that it's backwards compatible. The initialize() function is called in the custom streamer of RooDataHist, so if the _realVars member is missing in the ROOT file it will still be initialized.

This fixes issue #8037.

phsft-bot · 2021-05-04T13:57:13Z

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

phsft-bot · 2021-05-04T14:14:02Z

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

Failing tests:

projectroot.roofit.roofitcore.test.gtest_roofit_roofitcore_test_testRooDataHist

phsft-bot · 2021-05-04T14:16:36Z

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

Failing tests:

projectroot.roofit.roofitcore.test.gtest_roofit_roofitcore_test_testRooDataHist

Extend the RooDataHist tests to also validate the schema evolution from version 5 and version 6. Version 6 is the current version, so the `dataHistv6_ref.root` reference file was produced with ROOT master. Version 5 was used in ROOT 6.24, which was used to produce the `dataHistv5_ref.root` reference file.

phsft-bot · 2021-05-04T14:22:06Z

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

phsft-bot · 2021-05-04T15:03:48Z

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

Errors:

[2021-05-04T15:03:47.682Z] CMake Error at /home/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/rootCommon.cmake:330:
[2021-05-04T15:03:47.682Z] CMake Error at /home/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:2 (include):
[2021-05-04T15:03:47.682Z] CMake Error at /home/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1121 (file):
[2021-05-04T15:03:47.682Z] CMake Error at /home/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1122 (ctest_start):

hageboeck

LGTM! 👍

hageboeck · 2021-05-04T15:07:17Z

@guitargeek Maybe commit a comment on how to create the reference file above the test. Sorry that I didn't do that already.

phsft-bot · 2021-05-04T15:13:26Z

Build failed on mac11.0/cxx17.
Running on macphsft23.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

[2021-05-04T15:13:25.952Z] CMake Error at /Users/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/rootCommon.cmake:134:
[2021-05-04T15:13:25.952Z] CMake Error at /Users/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:2 (include):
[2021-05-04T15:13:25.952Z] CMake Error at /Users/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1121 (file):
[2021-05-04T15:13:25.952Z] CMake Error at /Users/sftnight/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1122 (ctest_start):

guitargeek · 2021-05-04T15:32:30Z

@guitargeek Maybe commit a comment on how to create the reference file above the test. Sorry that I didn't do that already.

The way I did this was simply to open the v4 file with a newer ROOT version, use the copy constructor of RooDataHist and save the copied object. Is this the way that you would document, or is there an easier way?

hageboeck · 2021-05-04T15:45:18Z

The way I did this was simply to open the v4 file with a newer ROOT version, use the copy constructor of RooDataHist and save the copied object. Is this the way that you would document, or is there an easier way?

Ah, right. That will work. I thought you re-engineered that RooDataHist to document it in the style of:

root/roofit/roofitcore/test/testProxiesAndCategories.cxx

Lines 59 to 80 in ef483dd

    
             /* Test the reading of a simple mock category that has the states 
        
              * one = 0 
        
              * two = 1 
        
              * three = 2 
        
              * four = 3 
        
              * The ranges "evens" and "odds" for even and odd state names are defined. 
        
              * Now, we check that set ranges are read and written properly, and that 
        
              * sharing of those ranges works even after reading back. 
        
              * A mock file can be created as follows: 
        
                 RooCategory cat("cat", "a category") 
        
                 cat.defineType("one") 
        
                 cat.defineType("two") 
        
                 cat.defineType("three") 
        
                 cat.defineType("four") 
        
                 cat.addToRange("evens", "two,four") 
        
                 cat.addToRange("odds", "one,three") 
        
                 RooDataSet data("data", "a dataset with a category", RooArgSet(cat)) 
        
                 data.fill() 
        
                 TFile outfile("/tmp/testCategories.root", "RECREATE") 
        
                 outfile.WriteObject(&cat, "catOrig") 
        
                 outfile.WriteObject(&data, "data") 
        
              */

In this case, it was probably this, but I don't remember:

root/roofit/roofitcore/test/testRooDataHist.cxx

Lines 242 to 248 in ef483dd

    
           void fillHist(TH2D* histo, double content) { 
        
             for (int i=0; i < histo->GetNbinsX()+2; ++i) { 
        
               for (int j=0; j < histo->GetNbinsY()+2; ++j) { 
        
                 histo->SetBinContent(i, j, content + (i-1)*100 + (j-1)); 
        
               } 
        
             } 
        
           }

phsft-bot · 2021-05-04T15:54:49Z

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

Errors:

[2021-05-04T15:54:48.520Z] CMake Error at C:/build/workspace/root-pullrequests-build/rootspi/jenkins/rootCommon.cmake:134:
[2021-05-04T15:54:48.520Z] CMake Error at C:/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:2 (include):
[2021-05-04T15:54:48.520Z] CMake Error at C:/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1121 (file):
[2021-05-04T15:54:48.520Z] CMake Error at C:/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1122 (ctest_start):

guitargeek requested review from hageboeck and lmoneta as code owners May 4, 2021 13:57

guitargeek self-assigned this May 4, 2021

guitargeek added the in:RooFit label May 4, 2021

guitargeek linked an issue May 4, 2021 that may be closed by this pull request

[RF] Test schema evolution of RooDataHist #8037

Closed

guitargeek force-pushed the issue-8037 branch from 9ba0a69 to 0e2587f Compare May 4, 2021 14:21

guitargeek requested a review from oshadura as a code owner May 4, 2021 14:21

hageboeck approved these changes May 4, 2021

View reviewed changes

guitargeek merged commit f05491e into root-project:master May 4, 2021

guitargeek deleted the issue-8037 branch May 4, 2021 17:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RF] Test schema evolution of RooDataHist from version 5 and 6#8090

[RF] Test schema evolution of RooDataHist from version 5 and 6#8090
guitargeek merged 1 commit intoroot-project:masterfrom
guitargeek:issue-8037

guitargeek commented May 4, 2021

Uh oh!

phsft-bot commented May 4, 2021

Uh oh!

phsft-bot commented May 4, 2021

Uh oh!

phsft-bot commented May 4, 2021

Uh oh!

phsft-bot commented May 4, 2021

Uh oh!

phsft-bot commented May 4, 2021

Uh oh!

hageboeck left a comment

Uh oh!

hageboeck commented May 4, 2021

Uh oh!

phsft-bot commented May 4, 2021

Uh oh!

guitargeek commented May 4, 2021

Uh oh!

hageboeck commented May 4, 2021

Uh oh!

phsft-bot commented May 4, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

guitargeek commented May 4, 2021

Uh oh!

phsft-bot commented May 4, 2021

Uh oh!

phsft-bot commented May 4, 2021

Failing tests:

Uh oh!

phsft-bot commented May 4, 2021

Failing tests:

Uh oh!

phsft-bot commented May 4, 2021

Uh oh!

phsft-bot commented May 4, 2021

Errors:

Uh oh!

hageboeck left a comment

Choose a reason for hiding this comment

Uh oh!

hageboeck commented May 4, 2021

Uh oh!

phsft-bot commented May 4, 2021

Errors:

Uh oh!

guitargeek commented May 4, 2021

Uh oh!

hageboeck commented May 4, 2021

Uh oh!

phsft-bot commented May 4, 2021

Errors:

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants