summaryrefslogtreecommitdiff
path: root/benchmarks
diff options
context:
space:
mode:
authorSebastian Berg <sebastian@sipsolutions.net>2019-01-09 10:08:41 +0100
committerGitHub <noreply@github.com>2019-01-09 10:08:41 +0100
commita4f1faadcef7a9866005d2017663c400c160d800 (patch)
tree15b1ed85b612b0c87bc4378cf072ee42403dd54b /benchmarks
parent924a9464545a29271da1f7c15fd05bd41d7cd52b (diff)
parent0bdf90ca15e62dbc190036e3a42bb5e75da1a2e7 (diff)
downloadnumpy-a4f1faadcef7a9866005d2017663c400c160d800.tar.gz
Merge pull request #12684 from mattip/benchmark-ufuncs
DEV: remove _arg from public API, add matmul to benchmark ufuncs
Diffstat (limited to 'benchmarks')
-rw-r--r--benchmarks/benchmarks/bench_ufunc.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/benchmarks/benchmarks/bench_ufunc.py b/benchmarks/benchmarks/bench_ufunc.py
index a7e385f70..62e70782d 100644
--- a/benchmarks/benchmarks/bench_ufunc.py
+++ b/benchmarks/benchmarks/bench_ufunc.py
@@ -15,7 +15,7 @@ ufuncs = ['abs', 'absolute', 'add', 'arccos', 'arccosh', 'arcsin', 'arcsinh',
'isinf', 'isnan', 'isnat', 'lcm', 'ldexp', 'left_shift', 'less',
'less_equal', 'log', 'log10', 'log1p', 'log2', 'logaddexp',
'logaddexp2', 'logical_and', 'logical_not', 'logical_or',
- 'logical_xor', 'maximum', 'minimum', 'mod', 'modf', 'multiply',
+ 'logical_xor', 'matmul', 'maximum', 'minimum', 'mod', 'modf', 'multiply',
'negative', 'nextafter', 'not_equal', 'positive', 'power',
'rad2deg', 'radians', 'reciprocal', 'remainder', 'right_shift',
'rint', 'sign', 'signbit', 'sin', 'sinh', 'spacing', 'sqrt',