From 07abed5882291153c7c38fb03e7f1d5524334576 Mon Sep 17 00:00:00 2001 From: Junya Hayashi Date: Thu, 22 Jan 2015 15:10:00 +0900 Subject: [PATCH 1/2] FIX: Fixed some issues around vb_suite * temporary variable ``bmark`` in groupby was collected as Benchmark * indexing module had same name ('series_getitem_scalar') Benchmarks * VB_DIR pointed wrong directory --- vb_suite/groupby.py | 3 +++ vb_suite/indexing.py | 9 ++++----- vb_suite/test_perf.py | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/vb_suite/groupby.py b/vb_suite/groupby.py index 26311920ec861..27a442ece1281 100644 --- a/vb_suite/groupby.py +++ b/vb_suite/groupby.py @@ -559,3 +559,6 @@ def inject_bmark_into_globals(bmark): for func_name in no_arg_func_list: bmark = make_large_ngroups_bmark(ngroups, func_name) inject_bmark_into_globals(bmark) + +# avoid bmark to be collected as Benchmark object +del bmark diff --git a/vb_suite/indexing.py b/vb_suite/indexing.py index f05ebc47d2e25..e86ed6cf7e43e 100644 --- a/vb_suite/indexing.py +++ b/vb_suite/indexing.py @@ -15,9 +15,8 @@ dt = ts.index[500] """ statement = "ts[dt]" - bm_getitem = Benchmark(statement, setup, ncalls=100000, - name='series_getitem_scalar') + name='time_series_getitem_scalar') setup = common_setup + """ index = tm.makeStringIndex(1000) @@ -25,9 +24,9 @@ idx = index[100] """ statement = "s.get_value(idx)" -bm_df_getitem3 = Benchmark(statement, setup, - name='series_get_value', - start_date=datetime(2011, 11, 12)) +bm_get_value = Benchmark(statement, setup, + name='series_get_value', + start_date=datetime(2011, 11, 12)) setup = common_setup + """ diff --git a/vb_suite/test_perf.py b/vb_suite/test_perf.py index 8cf832ade2813..d7ab014453f2e 100755 --- a/vb_suite/test_perf.py +++ b/vb_suite/test_perf.py @@ -56,7 +56,7 @@ from pandas import DataFrame, Series from suite import REPO_PATH -VB_DIR = os.path.dirname(os.path.abspath(__file__)) +VB_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) DEFAULT_MIN_DURATION = 0.01 HEAD_COL="head[ms]" BASE_COL="base[ms]" @@ -505,7 +505,7 @@ def main(): print("\n") - # move away from the pandas root dit, to avoid possible import + # move away from the pandas root dir, to avoid possible import # surprises os.chdir(os.path.dirname(os.path.abspath(__file__))) From 938d8e7b3c9c8b06c2e9d002ac6ad6df9d6401d7 Mon Sep 17 00:00:00 2001 From: Junya Hayashi Date: Thu, 22 Jan 2015 21:53:09 +0900 Subject: [PATCH 2/2] FIX: Fixed typo, which causes checksum duplication issue. --- vb_suite/indexing.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vb_suite/indexing.py b/vb_suite/indexing.py index e86ed6cf7e43e..012eb462fcc48 100644 --- a/vb_suite/indexing.py +++ b/vb_suite/indexing.py @@ -226,10 +226,10 @@ series_loc_list_like = Benchmark("s.loc[[800000]]", setup) series_loc_array = Benchmark("s.loc[np.arange(10000)]", setup) -series_iloc_scalar = Benchmark("s.loc[800000]", setup) -series_iloc_slice = Benchmark("s.loc[:800000]", setup) -series_iloc_list_like = Benchmark("s.loc[[800000]]", setup) -series_iloc_array = Benchmark("s.loc[np.arange(10000)]", setup) +series_iloc_scalar = Benchmark("s.iloc[800000]", setup) +series_iloc_slice = Benchmark("s.iloc[:800000]", setup) +series_iloc_list_like = Benchmark("s.iloc[[800000]]", setup) +series_iloc_array = Benchmark("s.iloc[np.arange(10000)]", setup) series_ix_scalar = Benchmark("s.ix[800000]", setup) series_ix_slice = Benchmark("s.ix[:800000]", setup)