From a32dcbfc6e46a1ea1299b6637a32e95c11d1960e Mon Sep 17 00:00:00 2001 From: Vanya Belyaev Date: Wed, 9 Oct 2024 10:33:27 +0200 Subject: [PATCH] fix? --- .aux/test_with_lcg | 2 +- ostap/stats/gof_utils.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.aux/test_with_lcg b/.aux/test_with_lcg index 90df8fb9..46dcdb6d 100755 --- a/.aux/test_with_lcg +++ b/.aux/test_with_lcg @@ -4,5 +4,5 @@ CMTCONFIG=$2 source /cvmfs/sft.cern.ch/lcg/views/${LCG}/${CMTCONFIG}/setup.sh source build/INSTALL/thisostap.sh cd build -ctest -N && cmake .. -DCMAKE_INSTALL_PREFIX=./INSTALL/ && ctest -j4 --output-on-failure --test-output-size-failed=5000000 +ctest -N && cmake .. -DCMAKE_INSTALL_PREFIX=./INSTALL/ && ctest -j2 -R gof --output-on-failure --test-output-size-failed=5000000 diff --git a/ostap/stats/gof_utils.py b/ostap/stats/gof_utils.py index 02cb4fa9..7c7fc0cc 100644 --- a/ostap/stats/gof_utils.py +++ b/ostap/stats/gof_utils.py @@ -288,7 +288,7 @@ def __call__ ( self , N , silent = True ) : ## Run NN-permutations in parallel using joblib def joblib_run ( self , NN , silent = True ) : """ Run NN-permutations in parallel using joblib """ - nj = 4 * numcpu () + 4 + nj = 3 * numcpu () + 4 lst = splitter ( NN , nj ) ## conf = { 'n_jobs' : -1 , 'verbose' : 0 } @@ -300,7 +300,7 @@ def joblib_run ( self , NN , silent = True ) : with warnings.catch_warnings(): warnings.simplefilter ( "ignore" ) ## , category = DeprecationWarning ) results = jl.Parallel ( **conf ) ( input ) - for r in progress_bar ( results , max_value = nj , silent = silent , description = 'Jobs:') : + for r in progress_bar ( results , max_value = nj , silent = silent , description = 'Permutations:') : counter += r ## return counter @@ -319,7 +319,7 @@ def joblib_run ( self , NN , silent = True ) : ## Run NN-permutations in parallel using WorkManager def pp_run ( self , NN , silent = True ) : """ Run NN-permutations in parallel using WorkManager""" - nj = 4 * numcpu () + 4 + nj = 3 * numcpu () + 4 lst = splitter ( NN , nj ) ## from ostap.parallel.parallel import WorkManager @@ -374,7 +374,7 @@ def __call__ ( self , N , silent = True ) : ## Run N-toys in parallel using WorkManager def run ( self , NN , silent = False ) : """ Run NN-permutations in parallel using WorkManager""" - nj = 4 * numcpu () + 4 + nj = 3 * numcpu () + 4 lst = splitter ( NN , nj ) ## from ostap.parallel.parallel import WorkManager