Clean-up eval + panel benchmarks

Author: jorisvandenbossche

asv_bench/benchmarks/eval.py

@@ -3,7 +3,7 @@
 import pandas.computation.expressions as expr
 
 
-class eval_frame(object):
+class Eval(object):
     goal_time = 0.2
 
     params = [['numexpr', 'python'], [1, 'all']]
@@ -34,8 +34,11 @@ def time_mult(self, engine, threads):
         df, df2, df3, df4 = self.df, self.df2, self.df3, self.df4
         pd.eval('df * df2 * df3 * df4', engine=engine)
 
+    def teardown(self, engine, threads):
+        expr.set_numexpr_threads()
 
-class query_datetime_index(object):
+
+class Query(object):
     goal_time = 0.2
 
     def setup(self):
@@ -45,41 +48,19 @@ def setup(self):
         self.s = Series(self.index)
         self.ts = self.s.iloc[self.halfway]
         self.df = DataFrame({'a': np.random.randn(self.N), }, index=self.index)
+        self.df2 = DataFrame({'dates': self.s.values,})
+
+        self.df3 = DataFrame({'a': np.random.randn(self.N),})
+        self.min_val = self.df3['a'].min()
+        self.max_val = self.df3['a'].max()
 
     def time_query_datetime_index(self):
         ts = self.ts
         self.df.query('index < @ts')
 
-
-class query_datetime_series(object):
-    goal_time = 0.2
-
-    def setup(self):
-        self.N = 1000000
-        self.halfway = ((self.N // 2) - 1)
-        self.index = date_range('20010101', periods=self.N, freq='T')
-        self.s = Series(self.index)
-        self.ts = self.s.iloc[self.halfway]
-        self.df = DataFrame({'dates': self.s.values, })
-
     def time_query_datetime_series(self):
         ts = self.ts
-        self.df.query('dates < @ts')
-
-
-class query_with_boolean_selection(object):
-    goal_time = 0.2
-
-    def setup(self):
-        self.N = 1000000
-        self.halfway = ((self.N // 2) - 1)
-        self.index = date_range('20010101', periods=self.N, freq='T')
-        self.s = Series(self.index)
-        self.ts = self.s.iloc[self.halfway]
-        self.N = 1000000
-        self.df = DataFrame({'a': np.random.randn(self.N), })
-        self.min_val = self.df['a'].min()
-        self.max_val = self.df['a'].max()
+        self.df2.query('dates < @ts')
 
     def time_query_with_boolean_selection(self):
         min_val, max_val = self.min_val, self.max_val

asv_bench/benchmarks/panel_ctor.py

@@ -1,7 +1,7 @@
 from .pandas_vb_common import *
 
 
-class panel_from_dict_all_different_indexes(object):
+class Constructors1(object):
     goal_time = 0.2
 
     def setup(self):
@@ -18,7 +18,7 @@ def time_panel_from_dict_all_different_indexes(self):
         Panel.from_dict(self.data_frames)
 
 
-class panel_from_dict_equiv_indexes(object):
+class Constructors2(object):
     goal_time = 0.2
 
     def setup(self):
@@ -32,7 +32,7 @@ def time_panel_from_dict_equiv_indexes(self):
         Panel.from_dict(self.data_frames)
 
 
-class panel_from_dict_same_index(object):
+class Constructors3(object):
     goal_time = 0.2
 
     def setup(self):
@@ -46,7 +46,7 @@ def time_panel_from_dict_same_index(self):
         Panel.from_dict(self.data_frames)
 
 
-class panel_from_dict_two_different_indexes(object):
+class Constructors4(object):
     goal_time = 0.2
 
     def setup(self):

asv_bench/benchmarks/panel_methods.py

@@ -1,56 +1,24 @@
 from .pandas_vb_common import *
 
 
-class panel_pct_change_items(object):
+class PanelMethods(object):
     goal_time = 0.2
 
     def setup(self):
         self.index = date_range(start='2000', freq='D', periods=1000)
         self.panel = Panel(np.random.randn(100, len(self.index), 1000))
 
-    def time_panel_pct_change_items(self):
+    def time_pct_change_items(self):
         self.panel.pct_change(1, axis='items')
 
-
-class panel_pct_change_major(object):
-    goal_time = 0.2
-
-    def setup(self):
-        self.index = date_range(start='2000', freq='D', periods=1000)
-        self.panel = Panel(np.random.randn(100, len(self.index), 1000))
-
-    def time_panel_pct_change_major(self):
+    def time_pct_change_major(self):
         self.panel.pct_change(1, axis='major')
 
-
-class panel_pct_change_minor(object):
-    goal_time = 0.2
-
-    def setup(self):
-        self.index = date_range(start='2000', freq='D', periods=1000)
-        self.panel = Panel(np.random.randn(100, len(self.index), 1000))
-
-    def time_panel_pct_change_minor(self):
+    def time_pct_change_minor(self):
         self.panel.pct_change(1, axis='minor')
 
-
-class panel_shift(object):
-    goal_time = 0.2
-
-    def setup(self):
-        self.index = date_range(start='2000', freq='D', periods=1000)
-        self.panel = Panel(np.random.randn(100, len(self.index), 1000))
-
-    def time_panel_shift(self):
+    def time_shift(self):
         self.panel.shift(1)
 
-
-class panel_shift_minor(object):
-    goal_time = 0.2
-
-    def setup(self):
-        self.index = date_range(start='2000', freq='D', periods=1000)
-        self.panel = Panel(np.random.randn(100, len(self.index), 1000))
-
-    def time_panel_shift_minor(self):
-        self.panel.shift(1, axis='minor')
+    def time_shift_minor(self):
+        self.panel.shift(1, axis='minor')