Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLN: fix some issues in asv benchmark suite #13630

Merged
merged 4 commits into from
Jul 14, 2016
Merged

CLN: fix some issues in asv benchmark suite #13630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
441e7e1
CLN: fix params list
jorisvandenbossche Jul 12, 2016
de0f071
Fix issue in asv.conf.json for win32+other environment
jorisvandenbossche Jul 12, 2016
0e25ca7
CLN: remove DataMatrix
jorisvandenbossche Jul 12, 2016
6b6f07f
ASV: fix exlusion of tables package for non-conda environments
jorisvandenbossche Jul 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions asv_bench/asv.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@
// On conda install pytables, otherwise tables
{"environment_type": "conda", "tables": ""},
{"environment_type": "conda", "pytables": null},
{"environment_type": "virtualenv", "tables": null},
{"environment_type": "virtualenv", "pytables": ""},
{"environment_type": "(?!conda).*", "tables": null},
{"environment_type": "(?!conda).*", "pytables": ""},
// On conda&win32, install libpython
{"sys_platform": "(?!win32).*", "libpython": ""},
{"sys_platform": "win32", "libpython": null},
{"environment_type": "conda", "sys_platform": "win32", "libpython": null},
{"environment_type": "(?!conda).*", "libpython": ""}
],
"include": [],
Expand Down
20 changes: 0 additions & 20 deletions asv_bench/benchmarks/indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,6 @@ def time_dataframe_getitem_scalar(self):
self.df[self.col][self.idx]


class datamatrix_getitem_scalar(object):
goal_time = 0.2

def setup(self):
try:
self.klass = DataMatrix
except:
self.klass = DataFrame
self.index = tm.makeStringIndex(1000)
self.columns = tm.makeStringIndex(30)
self.df = self.klass(np.random.rand(1000, 30), index=self.index, columns=self.columns)
self.idx = self.index[100]
self.col = self.columns[10]

def time_datamatrix_getitem_scalar(self):
self.df[self.col][self.idx]


class series_get_value(object):
goal_time = 0.2

Expand Down Expand Up @@ -498,5 +480,3 @@ def setup(self):

def time_float_loc(self):
self.ind.get_loc(0)


10 changes: 5 additions & 5 deletions asv_bench/benchmarks/inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,12 @@ class to_numeric(object):

param_names = ['data', 'downcast']
params = [
[(['1'] * N / 2) + ([2] * N / 2),
(['-1'] * N / 2) + ([2] * N / 2),
np.repeat(np.array('1970-01-01', '1970-01-02',
[(['1'] * (N / 2)) + ([2] * (N / 2)),
(['-1'] * (N / 2)) + ([2] * (N / 2)),
np.repeat(np.array(['1970-01-01', '1970-01-02'],
dtype='datetime64[D]'), N),
(['1.1'] * N / 2) + ([2] * N / 2),
([1] * N / 2) + ([2] * N / 2),
(['1.1'] * (N / 2)) + ([2] * (N / 2)),
([1] * (N / 2)) + ([2] * (N / 2)),
np.repeat(np.int32(1), N)],
[None, 'integer', 'signed', 'unsigned', 'float'],
]
Expand Down
16 changes: 0 additions & 16 deletions asv_bench/benchmarks/join_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,6 @@ def setup(self):
self.df_multi = DataFrame(np.random.randn(len(self.index2), 4), index=self.index2, columns=['A', 'B', 'C', 'D'])
except:
pass
try:
self.DataFrame = DataMatrix
except:
pass
self.df = pd.DataFrame({'data1': np.random.randn(100000), 'data2': np.random.randn(100000), 'key1': self.key1, 'key2': self.key2, })
self.df_key1 = pd.DataFrame(np.random.randn(len(self.level1), 4), index=self.level1, columns=['A', 'B', 'C', 'D'])
self.df_key2 = pd.DataFrame(np.random.randn(len(self.level2), 4), index=self.level2, columns=['A', 'B', 'C', 'D'])
Expand Down Expand Up @@ -210,10 +206,6 @@ def setup(self):
self.df_multi = DataFrame(np.random.randn(len(self.index2), 4), index=self.index2, columns=['A', 'B', 'C', 'D'])
except:
pass
try:
self.DataFrame = DataMatrix
except:
pass
self.df = pd.DataFrame({'data1': np.random.randn(100000), 'data2': np.random.randn(100000), 'key1': self.key1, 'key2': self.key2, })
self.df_key1 = pd.DataFrame(np.random.randn(len(self.level1), 4), index=self.level1, columns=['A', 'B', 'C', 'D'])
self.df_key2 = pd.DataFrame(np.random.randn(len(self.level2), 4), index=self.level2, columns=['A', 'B', 'C', 'D'])
Expand Down Expand Up @@ -241,10 +233,6 @@ def setup(self):
self.df_multi = DataFrame(np.random.randn(len(self.index2), 4), index=self.index2, columns=['A', 'B', 'C', 'D'])
except:
pass
try:
self.DataFrame = DataMatrix
except:
pass
self.df = pd.DataFrame({'data1': np.random.randn(100000), 'data2': np.random.randn(100000), 'key1': self.key1, 'key2': self.key2, })
self.df_key1 = pd.DataFrame(np.random.randn(len(self.level1), 4), index=self.level1, columns=['A', 'B', 'C', 'D'])
self.df_key2 = pd.DataFrame(np.random.randn(len(self.level2), 4), index=self.level2, columns=['A', 'B', 'C', 'D'])
Expand Down Expand Up @@ -272,10 +260,6 @@ def setup(self):
self.df_multi = DataFrame(np.random.randn(len(self.index2), 4), index=self.index2, columns=['A', 'B', 'C', 'D'])
except:
pass
try:
self.DataFrame = DataMatrix
except:
pass
self.df = pd.DataFrame({'data1': np.random.randn(100000), 'data2': np.random.randn(100000), 'key1': self.key1, 'key2': self.key2, })
self.df_key1 = pd.DataFrame(np.random.randn(len(self.level1), 4), index=self.level1, columns=['A', 'B', 'C', 'D'])
self.df_key2 = pd.DataFrame(np.random.randn(len(self.level2), 4), index=self.level2, columns=['A', 'B', 'C', 'D'])
Expand Down