Respect the user-provided number of entries to be displayed by vepadulano · Pull Request #11398 · root-project/root

vepadulano · 2022-09-21T08:37:52Z

Improves the workflow of DisplayHelper::Exec as follows:

We always check whether there are entries to be displayed with RDisplay::HasNext. If so, add one row to the display object
If no more entries should be displayed, signal this node has finished its job. Make sure the call to StopProcessing is done only once with a boolean flag, to avoid early stop of the execution due to more stop signals than the children who actually have finished their job.

phsft-bot · 2022-09-21T08:37:59Z

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac1015/cxx17, mac11/cxx14, windows10/cxx14
How to customize builds

tree/dataframe/test/dataframe_display.cxx

ikabadzhov

The clang format should be fixed. But other than that and my minor comment, the PR looks good to me! Thanks for taking care of this!

phsft-bot · 2022-09-21T10:16:42Z

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

Warnings:

[2022-09-21T09:35:02.116Z] /Users/sftnight/build/workspace/root-pullrequests-build/root/tmva/sofie/inc/TMVA/ROperator_Softmax.hxx:97:21: warning: variable 'N' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
[2022-09-21T09:35:02.116Z] /Users/sftnight/build/workspace/root-pullrequests-build/root/tmva/sofie/inc/TMVA/ROperator_Softmax.hxx:97:21: warning: variable 'N' is used uninitialized whenever '&&' condition is false [-Wsometimes-uninitialized]
[2022-09-21T09:35:02.116Z] /Users/sftnight/build/workspace/root-pullrequests-build/root/tmva/sofie/inc/TMVA/ROperator_Softmax.hxx:97:21: warning: variable 'iStride' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
[2022-09-21T09:35:02.116Z] /Users/sftnight/build/workspace/root-pullrequests-build/root/tmva/sofie/inc/TMVA/ROperator_Softmax.hxx:97:21: warning: variable 'iStride' is used uninitialized whenever '&&' condition is false [-Wsometimes-uninitialized]

phsft-bot · 2022-09-21T15:47:15Z

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

Warnings:

[2022-09-21T14:44:20.184Z] /Volumes/HD2/build/workspace/root-pullrequests-build/root/tmva/sofie/inc/TMVA/ROperator_Softmax.hxx:97:21: warning: variable 'N' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
[2022-09-21T14:44:20.184Z] /Volumes/HD2/build/workspace/root-pullrequests-build/root/tmva/sofie/inc/TMVA/ROperator_Softmax.hxx:97:21: warning: variable 'N' is used uninitialized whenever '&&' condition is false [-Wsometimes-uninitialized]
[2022-09-21T14:44:20.184Z] /Volumes/HD2/build/workspace/root-pullrequests-build/root/tmva/sofie/inc/TMVA/ROperator_Softmax.hxx:97:21: warning: variable 'iStride' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
[2022-09-21T14:44:20.184Z] /Volumes/HD2/build/workspace/root-pullrequests-build/root/tmva/sofie/inc/TMVA/ROperator_Softmax.hxx:97:21: warning: variable 'iStride' is used uninitialized whenever '&&' condition is false [-Wsometimes-uninitialized]

Failing tests:

projectroot.gui.webdisplay.test.test_webgui_ping

phsft-bot · 2022-09-21T16:01:42Z

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac1015/cxx17, mac11/cxx14, windows10/cxx14
How to customize builds

eguiraud

LGTM, but see below for an alternative fix that might result in overall simpler code (might be subjective :) ).

tree/dataframe/inc/ROOT/RDF/ActionHelpers.hxx

phsft-bot · 2022-10-04T13:46:38Z

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac1015/cxx17, mac11/cxx14, windows10/cxx14
How to customize builds

phsft-bot · 2022-10-04T13:51:17Z

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac1015/cxx17, mac11/cxx14, windows10/cxx14
How to customize builds

Fixes root-project#11390 Improves the workflow of `DisplayHelper::Exec` as follows: * The number of entries left to be displayed is now a data member of the action helper, not of RDisplay. * Early exit from the method if there are no more entries to process. * Otherwise, add one row to the display table and decrement by one the data member of the helper. * When there are no more entries to process for the first time, send a signal upstream that work is done for this node of the graph. Co-authored-by: Enrico Guiraud <[email protected]>

phsft-bot · 2022-10-04T14:00:31Z

Build failed on ROOT-ubuntu2004/python3.
Running on root-ubuntu-2004-1.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

[2022-10-04T14:00:30.366Z] FAILED: lib/modules.idx

phsft-bot · 2022-10-04T14:00:36Z

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac1015/cxx17, mac11/cxx14, windows10/cxx14
How to customize builds

phsft-bot · 2022-10-04T14:10:24Z

Build failed on ROOT-ubuntu2004/python3.
Running on root-ubuntu-2004-1.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

[2022-10-04T14:10:23.098Z] FAILED: lib/modules.idx

pcanal · 2022-10-04T14:19:53Z

PR build will fail because of missing: #11490, so cancelling for now.

pcanal · 2022-10-04T14:37:07Z

@phsft-bot build

phsft-bot · 2022-10-04T14:37:13Z

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac1015/cxx17, mac11/cxx14, windows10/cxx14
How to customize builds

phsft-bot · 2022-10-04T14:44:37Z

Build failed on ROOT-ubuntu2004/python3.
Running on root-ubuntu-2004-1.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

[2022-10-04T14:44:17.961Z] FAILED: tmva/sofie/test/CMakeFiles/SofieCompileModels_ROOT.util

phsft-bot · 2022-10-04T16:23:19Z

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

Failing tests:

projectroot.bindings.pyroot.pythonizations.test.pyunittests_pyroot_pyz_rtensor

vepadulano · 2022-10-05T07:07:47Z

@phsft-bot build

phsft-bot · 2022-10-05T07:07:54Z

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac1015/cxx17, mac11/cxx14, windows10/cxx14
How to customize builds

phsft-bot · 2022-10-05T07:17:07Z

Build failed on ROOT-ubuntu2004/python3.
Running on root-ubuntu-2004-1.cern.ch:/home/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

[2022-10-05T07:16:02.896Z] FAILED: tmva/sofie/test/CMakeFiles/SofieCompileModels_ROOT.util

phsft-bot · 2022-10-05T09:53:52Z

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

vepadulano added the in:RDataFrame label Sep 21, 2022

vepadulano requested a review from ikabadzhov September 21, 2022 08:37

vepadulano self-assigned this Sep 21, 2022

vepadulano requested a review from eguiraud as a code owner September 21, 2022 08:37

ikabadzhov reviewed Sep 21, 2022

View reviewed changes

tree/dataframe/test/dataframe_display.cxx Outdated Show resolved Hide resolved

ikabadzhov self-requested a review September 21, 2022 08:57

ikabadzhov approved these changes Sep 21, 2022

View reviewed changes

vepadulano force-pushed the rdf-fix-display branch 2 times, most recently from b7704c0 to 2dbf7a2 Compare September 21, 2022 16:01

root-project deleted a comment from phsft-bot Sep 22, 2022

eguiraud approved these changes Sep 27, 2022

View reviewed changes

tree/dataframe/inc/ROOT/RDF/ActionHelpers.hxx Outdated Show resolved Hide resolved

vepadulano force-pushed the rdf-fix-display branch from 2dbf7a2 to d7c1403 Compare October 4, 2022 13:46

vepadulano force-pushed the rdf-fix-display branch from d7c1403 to 0845519 Compare October 4, 2022 13:51

vepadulano force-pushed the rdf-fix-display branch from 0845519 to 935f1b1 Compare October 4, 2022 14:00

vepadulano merged commit 179211a into root-project:master Oct 5, 2022

Conversation

vepadulano commented Sep 21, 2022

Uh oh!

phsft-bot commented Sep 21, 2022

Uh oh!

Uh oh!

ikabadzhov left a comment

Choose a reason for hiding this comment

Uh oh!

phsft-bot commented Sep 21, 2022

Warnings:

Uh oh!

phsft-bot commented Sep 21, 2022

Warnings:

Failing tests:

Uh oh!

phsft-bot commented Sep 21, 2022

Uh oh!

eguiraud left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

phsft-bot commented Oct 4, 2022

Uh oh!

phsft-bot commented Oct 4, 2022

Uh oh!

phsft-bot commented Oct 4, 2022

Errors:

Uh oh!

phsft-bot commented Oct 4, 2022

Uh oh!

phsft-bot commented Oct 4, 2022

Errors:

Uh oh!

pcanal commented Oct 4, 2022

Uh oh!

pcanal commented Oct 4, 2022

Uh oh!

phsft-bot commented Oct 4, 2022

Uh oh!

phsft-bot commented Oct 4, 2022

Errors:

Uh oh!

phsft-bot commented Oct 4, 2022

Failing tests:

Uh oh!

vepadulano commented Oct 5, 2022

Uh oh!

phsft-bot commented Oct 5, 2022

Uh oh!

phsft-bot commented Oct 5, 2022

Errors:

Uh oh!

phsft-bot commented Oct 5, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants