Skip to content

Commit 3cc5c24

Browse files
authored
Merge branch 'master' into cat_fix
2 parents 5e8e23b + 031d7a9 commit 3cc5c24

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+624
-2151
lines changed

asv_bench/benchmarks/sparse.py

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from itertools import repeat
2+
13
from .pandas_vb_common import *
24
import scipy.sparse
35
from pandas import SparseSeries, SparseDataFrame
@@ -27,6 +29,12 @@ class sparse_frame_constructor(object):
2729
def time_sparse_frame_constructor(self):
2830
SparseDataFrame(columns=np.arange(100), index=np.arange(1000))
2931

32+
def time_sparse_from_scipy(self):
33+
SparseDataFrame(scipy.sparse.rand(1000, 1000, 0.005))
34+
35+
def time_sparse_from_dict(self):
36+
SparseDataFrame(dict(zip(range(1000), repeat([0]))))
37+
3038

3139
class sparse_series_from_coo(object):
3240
goal_time = 0.2

asv_bench/vbench_to_asv.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def translate_module(target_module):
114114
l_vars = {}
115115
exec('import ' + target_module) in g_vars
116116

117-
print target_module
117+
print(target_module)
118118
module = eval(target_module, g_vars)
119119

120120
benchmarks = []
@@ -157,7 +157,7 @@ def translate_module(target_module):
157157
mod = os.path.basename(module)
158158
if mod in ['make.py', 'measure_memory_consumption.py', 'perf_HEAD.py', 'run_suite.py', 'test_perf.py', 'generate_rst_files.py', 'test.py', 'suite.py']:
159159
continue
160-
print
161-
print mod
160+
print('')
161+
print(mod)
162162

163163
translate_module(mod.replace('.py', ''))

bench/alignment.py

-22
This file was deleted.

bench/bench_dense_to_sparse.py

-14
This file was deleted.

bench/bench_get_put_value.py

-56
This file was deleted.

bench/bench_groupby.py

-66
This file was deleted.

bench/bench_join_panel.py

-85
This file was deleted.

bench/bench_khash_dict.py

-89
This file was deleted.

0 commit comments

Comments
 (0)