diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2019-10-15 20:20:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 20:20:20 +0100 |
| commit | 10a7a4a815105e16828fe83fb89778c3bbafe692 (patch) | |
| tree | 2c73effc6bf4b8404e63564f78661caff034b255 /numpy/core/umath.py | |
| parent | d0731e118a5c40d866702f1b5da2be4d4f52ded9 (diff) | |
| parent | 83da5faca3a313c5d37226b86fa781956f8d162b (diff) | |
| download | numpy-10a7a4a815105e16828fe83fb89778c3bbafe692.tar.gz | |
Merge branch 'master' into master
Diffstat (limited to 'numpy/core/umath.py')
| -rw-r--r-- | numpy/core/umath.py | 4 |
1 files changed, 2 insertions, 2 deletions
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', |