diff options
author | John Kirkham <kirkhamj@janelia.hhmi.org> | 2016-01-16 13:50:50 -0500 |
---|---|---|
committer | John Kirkham <kirkhamj@janelia.hhmi.org> | 2016-01-16 13:50:50 -0500 |
commit | 4c504072b9914c0bf16ba70e41c2afbf4807f0e6 (patch) | |
tree | d4c8b41b47854d001098f6b97073089f156a7ac4 /benchmarks | |
parent | 4ac1a77f0730f58383ed68615e4d93933cde74f0 (diff) | |
download | numpy-4c504072b9914c0bf16ba70e41c2afbf4807f0e6.tar.gz |
BENCH: Reorganize existing benchmarks by the order they show up when run in the benchmarking suite.
Diffstat (limited to 'benchmarks')
-rw-r--r-- | benchmarks/benchmarks/bench_linalg.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/benchmarks/benchmarks/bench_linalg.py b/benchmarks/benchmarks/bench_linalg.py index 3d26b800c..6cccf74f8 100644 --- a/benchmarks/benchmarks/bench_linalg.py +++ b/benchmarks/benchmarks/bench_linalg.py @@ -18,12 +18,12 @@ class Eindot(Benchmark): self.a3 = np.arange(480000.).reshape(60, 80, 100) self.b3 = np.arange(192000.).reshape(80, 60, 40) - def time_einsum_ij_jk_a_b(self): - np.einsum('ij,jk', self.a, self.b) - def time_dot_a_b(self): np.dot(self.a, self.b) + def time_dot_d_dot_b_c(self): + np.dot(self.d, np.dot(self.b, self.c)) + def time_dot_trans_a_at(self): np.dot(self.a, self.at) @@ -36,21 +36,21 @@ class Eindot(Benchmark): def time_dot_trans_atc_a(self): np.dot(self.atc, self.a) - def time_inner_trans_a_a(self): - np.inner(self.a, self.a) - - def time_inner_trans_a_ac(self): - np.inner(self.a, self.ac) - def time_einsum_i_ij_j(self): np.einsum('i,ij,j', self.d, self.b, self.c) - def time_dot_d_dot_b_c(self): - np.dot(self.d, np.dot(self.b, self.c)) + def time_einsum_ij_jk_a_b(self): + np.einsum('ij,jk', self.a, self.b) def time_einsum_ijk_jil_kl(self): np.einsum('ijk,jil->kl', self.a3, self.b3) + def time_inner_trans_a_a(self): + np.inner(self.a, self.a) + + def time_inner_trans_a_ac(self): + np.inner(self.a, self.ac) + def time_tensordot_a_b_axes_1_0_0_1(self): np.tensordot(self.a3, self.b3, axes=([1, 0], [0, 1])) |