diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2019-01-09 10:08:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-09 10:08:41 +0100 |
| commit | a4f1faadcef7a9866005d2017663c400c160d800 (patch) | |
| tree | 15b1ed85b612b0c87bc4378cf072ee42403dd54b /numpy | |
| parent | 924a9464545a29271da1f7c15fd05bd41d7cd52b (diff) | |
| parent | 0bdf90ca15e62dbc190036e3a42bb5e75da1a2e7 (diff) | |
| download | numpy-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 'numpy')
| -rw-r--r-- | numpy/core/tests/test_umath_complex.py | 3 | ||||
| -rw-r--r-- | numpy/core/umath.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/numpy/core/tests/test_umath_complex.py b/numpy/core/tests/test_umath_complex.py index 785ae8c57..1f5b4077f 100644 --- a/numpy/core/tests/test_umath_complex.py +++ b/numpy/core/tests/test_umath_complex.py @@ -5,7 +5,8 @@ import platform import pytest import numpy as np -import numpy.core.umath as ncu +# import the c-extension module directly since _arg is not exported via umath +import numpy.core._multiarray_umath as ncu from numpy.testing import ( assert_raises, assert_equal, assert_array_equal, assert_almost_equal ) diff --git a/numpy/core/umath.py b/numpy/core/umath.py index a0e8ad427..f3b26ab72 100644 --- a/numpy/core/umath.py +++ b/numpy/core/umath.py @@ -9,7 +9,7 @@ by importing from the extension module. from . import _multiarray_umath from numpy.core._multiarray_umath import * from numpy.core._multiarray_umath import ( - _UFUNC_API, _add_newdoc_ufunc, _arg, _ones_like + _UFUNC_API, _add_newdoc_ufunc, _ones_like ) __all__ = [ @@ -18,7 +18,7 @@ __all__ = [ 'FPE_DIVIDEBYZERO', 'FPE_INVALID', 'FPE_OVERFLOW', 'FPE_UNDERFLOW', 'NAN', 'NINF', 'NZERO', 'PINF', 'PZERO', 'SHIFT_DIVIDEBYZERO', 'SHIFT_INVALID', 'SHIFT_OVERFLOW', 'SHIFT_UNDERFLOW', 'UFUNC_BUFSIZE_DEFAULT', - 'UFUNC_PYVALS_NAME', '_add_newdoc_ufunc', '_arg', 'absolute', 'add', + 'UFUNC_PYVALS_NAME', '_add_newdoc_ufunc', 'absolute', 'add', 'arccos', 'arccosh', 'arcsin', 'arcsinh', 'arctan', 'arctan2', 'arctanh', 'bitwise_and', 'bitwise_or', 'bitwise_xor', 'cbrt', 'ceil', 'conj', 'conjugate', 'copysign', 'cos', 'cosh', 'deg2rad', 'degrees', 'divide', |