diff options
| -rw-r--r-- | numpy/core/code_generators/generate_umath.py | 10 | ||||
| -rw-r--r-- | numpy/core/src/umathmodule.c.src | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/numpy/core/code_generators/generate_umath.py b/numpy/core/code_generators/generate_umath.py index e1cc54f06..00fde1360 100644 --- a/numpy/core/code_generators/generate_umath.py +++ b/numpy/core/code_generators/generate_umath.py @@ -229,7 +229,7 @@ defdict = { docstrings.get('numpy.core.umath.power'), TD(ints), TD(inexact, f='pow'), - TD(O, f='PyNumber_Power'), + TD(O, f='npy_ObjectPower'), ), 'absolute' : Ufunc(1, 1, None, @@ -308,25 +308,25 @@ defdict = { Ufunc(2, 1, None, docstrings.get('numpy.core.umath.maximum'), TD(noobj), - TD(O, f='_npy_ObjectMax') + TD(O, f='npy_ObjectMax') ), 'minimum' : Ufunc(2, 1, None, docstrings.get('numpy.core.umath.minimum'), TD(noobj), - TD(O, f='_npy_ObjectMin') + TD(O, f='npy_ObjectMin') ), 'fmax' : Ufunc(2, 1, None, "", TD(noobj), - TD(O, f='_npy_ObjectMax') + TD(O, f='npy_ObjectMax') ), 'fmin' : Ufunc(2, 1, None, "", TD(noobj), - TD(O, f='_npy_ObjectMin') + TD(O, f='npy_ObjectMin') ), 'logaddexp' : Ufunc(2, 1, None, diff --git a/numpy/core/src/umathmodule.c.src b/numpy/core/src/umathmodule.c.src index 1e3202932..fbcf7a91c 100644 --- a/numpy/core/src/umathmodule.c.src +++ b/numpy/core/src/umathmodule.c.src @@ -143,18 +143,17 @@ Py_reciprocal(PyObject *o) * Define numpy version of PyNumber_Power as binary function. */ static PyObject * -npy_PyNumber_Power(PyObject *x, PyObject *y) +npy_ObjectPower(PyObject *x, PyObject *y) { - PyNumber_Power(x, y, Py_None); + return PyNumber_Power(x, y, Py_None); } -#define PyNumber_Power npy_PyNumber_Power /**begin repeat * #Kind = Max, Min# * #OP = >=, <=# */ static PyObject * -_npy_Object@Kind@(PyObject *i1, PyObject *i2) +npy_Object@Kind@(PyObject *i1, PyObject *i2) { PyObject *result; int cmp; @@ -173,6 +172,7 @@ _npy_Object@Kind@(PyObject *i1, PyObject *i2) } /**end repeat**/ + /* ***************************************************************************** ** COMPLEX FUNCTIONS ** |