Skip to content

Commit

Permalink
fix progress bar for frames
Browse files Browse the repository at this point in the history
  • Loading branch information
@VanyaBelyaev
VanyaBelyaev committed Jul 31, 2024
1 parent 1e98c42 commit 55cd982
Show file tree
Hide file tree
Showing 6 changed files with 152 additions and 63 deletions.
66 changes: 47 additions & 19 deletions ostap/frames/frames.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@ def frame_progress1 ( frame , length ) :
cnt = frame.Count ()

## commented out
if not isatty () : return frame , cnt ## ATTENTION
elif ( 6 , 32 ) <= root_info : return frame , cnt ## ATTENTION
if not isatty () : return frame , cnt ## ATTENTION
elif length <= 0 : return frame_progress2 ( frame , length )

if 2048 < length : nchunks = 2000
elif 1024 < length : nchunks = 1000
Expand All @@ -322,9 +322,12 @@ def frame_progress1 ( frame , length ) :
csize = max ( csize , 1 )

if rr : nchunks += 1

fun = Ostap.Utils.frame_progress ( nchunks , progress_conf () )
cnt.OnPartialResultSlot ( csize , fun )

if (6,32 ) <= root_info :
cnt = Ostap.Utils.add_progress_bar ( cnt , nchunks , csize , progress_conf () )
else :
fun = Ostap.Utils.frame_progress ( nchunks , progress_conf () )
cnt = cnt.OnPartialResultSlot ( csize , fun )

return frame , cnt

Expand All @@ -347,16 +350,35 @@ def frame_progress2 ( frame , length = -1 ) :

cnt = frame.Count ()

if not isatty () :return frame , cnt ## ATTENTION
if not isatty () : return frame , cnt ## ATTENTION
elif root_info < ( 6, 30 ) : return frame , cnt ## ATTENTION!

## add progress bar
ROOT.ROOT.RDF.Experimental.AddProgressBar ( frame )
return frame, cnt

# =========================================================================
if ( 6,30 ) < root_info : frame_progress = frame_progress2
else : frame_progress = frame_progress1
## Add progress bar to the frame
# @code
# frame = ...
# frame , cnt = frame_progrees ( frame , nevents )
# @endcode
def frame_progress ( frame , length = -1 ) :
"""Add progress bar to the frame
>>> frame = ...
>>> frame , cnt = frame_progrees ( frame , nevents )
"""

if isinstance ( frame , frame_types ) : pass
elif isinstance ( frame , ROOT.TTree ) :
length = len ( frame )
frame = DataFrame ( frame )
else :
frame = as_rnode ( frame )

if 1 <= length : return frame_progress1 ( frame , length )
else : return frame_progress2 ( frame , length )


# ==============================================================================
## Prescale the frame
Expand Down Expand Up @@ -395,15 +417,14 @@ def frame_prescale ( frame , prescale , name = '' ) :

raise TypeError ( "Invalid type/value for 'prescale' %s/%s" %( prescale , type ( prescale ) ) )

# ==============================================================================
from ostap.fitting.dataset import ds_draw as _ds_draw
# ==============================================================================
## Draw the variables for the frame
def frame_draw ( frame , *args , **kwargs ) :
"""Draw the varibale (s) for the frames
"""Draw the variable (s) for the frames
"""
node = as_rnode ( frame )
return _ds_draw ( node , *args , **kwargs )
from ostap.fitting.dataset import ds_draw as _ds_draw_
return _ds_draw_ ( node , *args , **kwargs )

# =============================================================================
## Simplified print out for the frame
Expand Down Expand Up @@ -720,25 +741,19 @@ def frame_project ( frame , model , expressions , cuts = '' , lazy = True ) :

## convert histogram-like objects into 'models'

print ( 'FRAME PROJECT-BEFORE/1', type ( current ) , type ( model ) , items , cname )

histo = None
if isinstance ( model , ROOT.TProfile2D ) : histo, model = model, model.model ()
elif isinstance ( model , ROOT.TProfile ) : histo, model = model, model.model ()
elif isinstance ( model , ROOT.TH3 ) and 3 == model.dim () : histo, model = model, model.model ()
elif isinstance ( model , ROOT.TH2 ) and 2 == model.dim () : histo, model = model, model.model ()
elif isinstance ( model , ROOT.TH1 ) and 1 == model.dim () : histo, model = model, model.model ()

print ( 'FRAME PROJECT-BEFORE/2', type ( current ) , type ( model ) , items , cname )

if histo : histo.Reset()

nvars = len ( items )
pvars = [ v for v in items.values() ]
if cname : pvars.append ( cname )

print ( 'FRAME PROJECT-AFTER', type ( current ) , type ( model ) , pvars )

if 3 == nvars and isinstance ( model , DF_P2Model ) : action = current.Profile2D ( model , *pvars )
elif 2 == nvars and isinstance ( model , DF_P1Model ) : action = current.Profiel1D ( model , *pvars )
elif 3 == nvars and isinstance ( model , DF_H3Model ) : action = current.Histo3D ( model , *pvars )
Expand Down Expand Up @@ -855,7 +870,16 @@ def _fr_param_ ( frame , poly , expressions , cuts = '' , lazy = True ) :


# ==========================================================================
## draw the variable(s) from the frame
# @code
# frame = ...
# result = frame_draw ( frame , 'x+12/z' , cut = 'z>1' )
## @endcode
def _fr_draw_ ( frame , expressions , cuts = '' , opts = '' , **kwargs ) :
"""Draw the variable(s) from the frame
>>> frame = ...
>>> result = frame_draw ( frame , 'x+12/z' , cut = 'z>1' )
"""

## decode expressions & cuts
current , items, cname , _ = _fr_helper_ ( frame , expressions , cuts )
Expand Down Expand Up @@ -1946,7 +1970,7 @@ def frame_param ( frame , poly , expressions , cuts = '' ) :
# frame = ...
# mean = frame_range ( frame , 'x*x' , '0<y' )
# @endcode
def frame_range( frame , expressions , cuts = '' , delta = 0.05 ) :
def frame_range ( frame , expressions , cuts = '' , delta = 0.05 ) :
"""Get the approproavte range values for variables
- In case there is no suitable range None is returned
>>> frame = ...
Expand All @@ -1961,6 +1985,10 @@ def frame_range( frame , expressions , cuts = '' , delta = 0.05 ) :
ranges [ k ] = axis_range ( mn , mx , delta = delta )
else : ranges = axis_range ( ranges.min() , ranges.max() , delta = delta )
return ranges


## use more efficient drawing function
frame_draw = _fr_draw_

__all__ += (
'frame_arithmetic_mean' ,
Expand Down
56 changes: 40 additions & 16 deletions ostap/stats/moment.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,7 @@ def _mn_reduce_ ( cnt ) :
Ostap.Math.WHarmonicMean . __reduce__ = _mn_reduce_
Ostap.Math.WArithmeticMean . __reduce__ = _mn_reduce_


# =============================================================================
## serialization of Power means
# @see Ostap::Math::PoweMean
Expand Down Expand Up @@ -855,41 +856,64 @@ def _lm_reduce_ ( cnt ) :
Ostap.Math.LehmerMean . __reduce__ = _lm_reduce_
Ostap.Math.WLehmerMean . __reduce__ = _lm_reduce_

# =============================================================================
## serialization of MinMaxValues
# @see Ostap::Math::MinMaxValue
# @see Ostap::Math::WMinMaxValue
def _nx_reduce_ ( cnt ) :
"""Serialization of MinMax values
- see Ostap::Math::MinMaxValue
- see Ostap::Math::WMinMaxValue
"""
return root_factory , ( type ( cnt ) , cnt.min () , cnt.max() , cnt.conuter ())

Ostap.Math.MinMaxValue . __reduce__ = _nx_reduce_
Ostap.Math.WMinMaxValue . __reduce__ = _nx_reduce_

# ==============================================================================
## equality for the mean
# @see Ostap::Math::GeometricMean
# @see Ostap::Math::HarmonicMean
# @see Ostap::Math::ArithmeticMean
# @see Ostap::Math::WGeometricMean
# @see Ostap::Math::WHarmonicMean
# @see Ostap::Math::WArithmeticMean
def _mn_eq_ ( cnt , another ) :
"""Equality Harmonic&Geometric means
- see Ostap::Math::GeometricMean
- see Ostap::Math::HarmonicMean
- see Ostap::Math::ArithmeticMean
- see Ostap::Math::WGeometricMean
- see Ostap::Math::WHarmonicMean
- see Ostap::Math::WArithmeticMean
"""
if not type ( cnt ) is type ( another ) : return NotImplemented
return isequal ( cnt.value() , another.value() ) and \
cnt.counter() == another.counter()

Ostap.Math.GeometricMean . __eq__ = _mn_eq_
Ostap.Math.HarmonicMean . __eq__ = _mn_eq_
Ostap.Math.WGeometricMean . __eq__ = _mn_eq_
Ostap.Math.WHarmonicMean . __eq__ = _mn_eq_

Ostap.Math.GeometricMean . __eq__ = _mn_eq_
Ostap.Math.HarmonicMean . __eq__ = _mn_eq_
Ostap.Math.ArithmeticMean . __eq__ = _mn_eq_
Ostap.Math.WGeometricMean . __eq__ = _mn_eq_
Ostap.Math.WHarmonicMean . __eq__ = _mn_eq_
Ostap.Math.WArithmeticMean . __eq__ = _mn_eq_


_decorated_classes = (
Ostap.Math.Moment ,
Ostap.Math.WMoment ,
Ostap.Math.Moment_(0) ,
Ostap.Math.Moment_(1) ,
Ostap.Math.Moment_(0) ,
Ostap.Math.Moment_(1) ,
Ostap.Math.Moment ,
Ostap.Math.WMoment ,
Ostap.Math.Moment_(0) ,
Ostap.Math.Moment_(1) ,
Ostap.Math.Moment_(0) ,
Ostap.Math.Moment_(1) ,
##
Ostap.Math.GeometricMean ,
Ostap.Math.HarmonicMean ,
Ostap.Math.WGeometricMean ,
Ostap.Math.WHarmonicMean ,
)
Ostap.Math.GeometricMean ,
Ostap.Math.HarmonicMean ,
Ostap.Math.ArithmeticMean ,
Ostap.Math.WGeometricMean ,
Ostap.Math.WHarmonicMean ,
Ostap.Math.WArithmeticMean ,
)

_new_methods_ = (
##
Expand Down
27 changes: 27 additions & 0 deletions source/include/Ostap/DataFrameUtils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,19 @@
#include <string>
#include <functional>
// ============================================================================
// ROOT
// ============================================================================
#include "RVersion.h"
// ============================================================================
// Ostap
// ============================================================================
#include "Ostap/DataFrame.h"
// ============================================================================
#if ROOT_VERSION(6,32,0) <= ROOT_VERSION_CODE
// ============================================================================
namespace ROOT { namespace RDF { template <class T> class RResultPtr ; } }
// ============================================================================
#endif
namespace Ostap
{
// ==========================================================================
Expand Down Expand Up @@ -61,6 +70,24 @@ namespace Ostap
*/
unsigned int mt_pool_size () ;
// ========================================================================
#if ROOT_VERSION(6,32,0) <= ROOT_VERSION_CODE
// ========================================================================
/** helper utility to add progress bar
* to "Conut"-action
* @see https://root-forum.cern.ch/t/problems-with-onpartialresultslot-in-new-root-version-6-32-02/60257/3
* @param count input counter
* @param nchunks
* @param progress progress bar configuration
*/
ROOT::RDF::RResultPtr<ULong64_t>&
add_progress_bar
( ROOT::RDF::RResultPtr<ULong64_t>& result ,
const unsigned short nchunks ,
const unsigned long how_often ,
const ProgressConf& progress ) ;
// ========================================================================
#endif
// ========================================================================
} // The end of namespace Ostap::Utils
// ==========================================================================
} // The end of namespace Ostap
Expand Down
56 changes: 33 additions & 23 deletions source/src/DataFrameUtils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace
std::mutex s_mutex_bar {} ;
// ==========================================================================
/** @class DataFrameProgress
* Helper class to show th eprogree bar for data frame
* Helper class to show the progrees bar for data frame
*/
class DataFrameProgress : public Ostap::Utils::ProgressConf
{
Expand All @@ -59,37 +59,24 @@ namespace
if ( !m_nchunks ) { setWidth ( 0 ) ; } // DISABLE IT!
}
// ========================================================================
/// default move constructor
// DataFrameProgress ( DataFrameProgress&& ) = default ;
/// disabled copy constructir
// DataFrameProgress ( const DataFrameProgress& ) = default ;
// ========================================================================
/// destructor
~DataFrameProgress()
{
// std::cout << "DESTRUCTOR1 "
// << ( m_done ? "DONE" : "NOT_YET" )
// << "/" << m_chunks
// << "/" << m_nchunks
// << std::endl ;
if ( m_nchunks && m_chunks && !m_done )
{
m_chunks = m_nchunks ;
ULong64_t dummy = 0 ;
(*this)( 0 , dummy ) ;
}
// std::cout << "DESTRUCTOR2 "
// << ( m_done ? "DONE" : "NOT_YET" )
// << "/" << m_chunks
// << "/" << m_nchunks
// << std::endl ;
{
m_chunks = m_nchunks ;
ULong64_t dummy = 0 ;
(*this)( 0 , dummy ) ;
}
}
// ========================================================================
public:
// ========================================================================
// the main method
// ========================================================================
void operator() ( unsigned int islot , ULong64_t& /* u */ )
void operator()
( unsigned int islot ,
ULong64_t& /* u */ )
{
std::lock_guard<std::mutex> lock ( s_mutex_bar ) ;
///
Expand Down Expand Up @@ -190,14 +177,37 @@ unsigned int Ostap::Utils::mt_pool_size ()
return std::max
( 1u ,
ROOT::IsImplicitMTEnabled() ?
#if ROOT_VERSION_CODE >= ROOT_VERSION(6,22,0)
#if ROOT_VERSION(6,22,0) <= ROOT_VERSION_CODE
ROOT::GetThreadPoolSize () : 1u
#else
ROOT::GetImplicitMTPoolSize () : 1u
#endif
) ;
}
// ============================================================================
#if ROOT_VERSION(6,32,0) <= ROOT_VERSION_CODE
// ============================================================================
/* helper utility to add progress bar
* to "Conut"-action
* @see https://root-forum.cern.ch/t/problems-with-onpartialresultslot-in-new-root-version-6-32-02/60257/3
* @param count input counter
* @param progress cporgress bar configuration
*/
// ============================================================================
ROOT::RDF::RResultPtr<ULong64_t>&
Ostap::Utils::add_progress_bar
( ROOT::RDF::RResultPtr<ULong64_t>& result ,
const unsigned short nchunks ,
const unsigned long howoften ,
const Ostap::Utils::ProgressConf& progress )
{
auto thefun = frame_progress ( nchunks , progress ) ;
return result.OnPartialResultSlot( howoften , thefun );
}
// ===========================================================================
#endif



// ============================================================================
// The END
Expand Down
4 changes: 2 additions & 2 deletions source/src/StatEntity.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Ostap::StatEntity::StatEntity
, m_max ( maxv )
{
// empty counter (ignore min/max)
if ( 0 == m_n )
if ( empty () )
{
Ostap::Assert ( s_zero ( m_mu ) && s_zero ( m_mu2 ) ,
"Ostap::StatEntity: invalid mu/mu2 for empty counter!" ,
Expand All @@ -76,7 +76,7 @@ Ostap::StatEntity::StatEntity
//
if ( s_zero ( m_mu2 ) ) { m_mu2 = 0 ; }
//
Ostap::Assert ( ( empty() && !m_mu2 ) || ( !empty() && m_mu2 ) ,
Ostap::Assert ( ( !empty () ) || ( empty() && !m_mu2 ) ,
"Ostap::StatEntity: inconsistent mu2/empty!" ,
"Ostap::StatEntity" ) ;
//
Expand Down
Loading

0 comments on commit 55cd982

Please sign in to comment.