summaryrefslogtreecommitdiff
path: root/numpy/core
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/core')
-rw-r--r--numpy/core/code_generators/numpy_api.py2
-rw-r--r--numpy/core/src/multiarray/arrayobject.c4
-rw-r--r--numpy/core/src/multiarray/arraytypes.c.src6
-rw-r--r--numpy/core/src/multiarray/convert.c2
-rw-r--r--numpy/core/src/multiarray/ctors.c12
-rw-r--r--numpy/core/src/multiarray/descriptor.c1
-rw-r--r--numpy/core/src/multiarray/einsum.c.src4
-rw-r--r--numpy/core/src/multiarray/getset.c2
-rw-r--r--numpy/core/src/multiarray/item_selection.c2
-rw-r--r--numpy/core/src/multiarray/iterators.c4
-rw-r--r--numpy/core/src/multiarray/mapping.c6
-rw-r--r--numpy/core/src/multiarray/methods.c8
-rw-r--r--numpy/core/src/multiarray/multiarraymodule.c2
-rw-r--r--numpy/core/src/multiarray/nditer_api.c2
-rw-r--r--numpy/core/src/multiarray/nditer_constr.c4
-rw-r--r--numpy/core/src/multiarray/nditer_pywrap.c2
-rw-r--r--numpy/core/src/multiarray/scalarapi.c2
-rw-r--r--numpy/core/src/multiarray/sequence.c2
-rw-r--r--numpy/core/src/multiarray/shape.c8
19 files changed, 37 insertions, 38 deletions
diff --git a/numpy/core/code_generators/numpy_api.py b/numpy/core/code_generators/numpy_api.py
index 08d25d899..a256d849a 100644
--- a/numpy/core/code_generators/numpy_api.py
+++ b/numpy/core/code_generators/numpy_api.py
@@ -318,7 +318,7 @@ multiarray_funcs_api = {
# End 1.6 API
'PyArray_MaskedCopyInto': 281,
'PyArray_MaskedMoveInto': 282,
- 'PyArray_SetBase': 283,
+ 'PyArray_SetBaseObject': 283,
}
ufunc_types_api = {
diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c
index 21325bbb1..cd2060133 100644
--- a/numpy/core/src/multiarray/arrayobject.c
+++ b/numpy/core/src/multiarray/arrayobject.c
@@ -72,7 +72,7 @@ PyArray_Size(PyObject *op)
* Returns 0 on success, -1 on failure.
*/
NPY_NO_EXPORT int
-PyArray_SetBase(PyArrayObject *arr, PyObject *obj)
+PyArray_SetBaseObject(PyArrayObject *arr, PyObject *obj)
{
if (obj == NULL) {
PyErr_SetString(PyExc_ValueError,
@@ -1414,7 +1414,7 @@ array_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
}
PyArray_UpdateFlags(ret, NPY_ARRAY_UPDATE_ALL);
Py_INCREF(buffer.base);
- if (PyArray_SetBase(ret, buffer.base) < 0) {
+ if (PyArray_SetBaseObject(ret, buffer.base) < 0) {
Py_DECREF(ret);
ret = NULL;
goto fail;
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
index 86abb792b..cb76d5af9 100644
--- a/numpy/core/src/multiarray/arraytypes.c.src
+++ b/numpy/core/src/multiarray/arraytypes.c.src
@@ -610,7 +610,7 @@ VOID_getitem(char *ip, PyArrayObject *ap)
return NULL;
}
Py_INCREF(ap);
- if (PyArray_SetBase(ret, (PyObject *)ap) < 0) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)ap) < 0) {
Py_DECREF(ret);
return NULL;
}
@@ -640,7 +640,7 @@ VOID_getitem(char *ip, PyArrayObject *ap)
PyArray_ISWRITEABLE(ap) ? NPY_ARRAY_WRITEABLE : 0,
NULL);
Py_INCREF(ap);
- if (PyArray_SetBase(u, ap) < 0) {
+ if (PyArray_SetBaseObject(u, ap) < 0) {
Py_DECREF(u);
return NULL;
}
@@ -742,7 +742,7 @@ VOID_setitem(PyObject *op, char *ip, PyArrayObject *ap)
return -1;
}
Py_INCREF(ap);
- if (PyArray_SetBase(ret, (PyObject *)ap) < 0) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)ap) < 0) {
Py_DECREF(ret);
return -1;
}
diff --git a/numpy/core/src/multiarray/convert.c b/numpy/core/src/multiarray/convert.c
index 29da74799..d399912a6 100644
--- a/numpy/core/src/multiarray/convert.c
+++ b/numpy/core/src/multiarray/convert.c
@@ -512,7 +512,7 @@ PyArray_View(PyArrayObject *self, PyArray_Descr *type, PyTypeObject *pytype)
return NULL;
}
Py_INCREF(self);
- if (PyArray_SetBase(new, (PyObject *)self) < 0) {
+ if (PyArray_SetBaseObject(new, (PyObject *)self) < 0) {
Py_DECREF(new);
Py_DECREF(type);
return NULL;
diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c
index 9397221a7..b527a1074 100644
--- a/numpy/core/src/multiarray/ctors.c
+++ b/numpy/core/src/multiarray/ctors.c
@@ -2070,7 +2070,7 @@ PyArray_FromArray(PyArrayObject *arr, PyArray_Descr *newtype, int flags)
}
if (flags & NPY_ARRAY_UPDATEIFCOPY) {
/*
- * Don't use PyArray_SetBase, because that compresses
+ * Don't use PyArray_SetBaseObject, because that compresses
* the chain of bases.
*/
Py_INCREF(arr);
@@ -2101,7 +2101,7 @@ PyArray_FromArray(PyArrayObject *arr, PyArray_Descr *newtype, int flags)
if (ret == NULL) {
return NULL;
}
- if (PyArray_SetBase(ret, (PyObject *)arr)) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)arr)) {
Py_DECREF(ret);
return NULL;
}
@@ -2143,7 +2143,7 @@ PyArray_FromArray(PyArrayObject *arr, PyArray_Descr *newtype, int flags)
}
if (flags & NPY_ARRAY_UPDATEIFCOPY) {
/*
- * Don't use PyArray_SetBase, because that compresses
+ * Don't use PyArray_SetBaseObject, because that compresses
* the chain of bases.
*/
Py_INCREF(arr);
@@ -2204,7 +2204,7 @@ PyArray_FromStructInterface(PyObject *input)
inter->strides, inter->data,
inter->flags, NULL);
Py_INCREF(input);
- if (PyArray_SetBase(ret, input) < 0) {
+ if (PyArray_SetBaseObject(ret, input) < 0) {
Py_DECREF(ret);
return NULL;
}
@@ -2376,7 +2376,7 @@ PyArray_FromInterface(PyObject *input)
return NULL;
}
Py_INCREF(base);
- if (PyArray_SetBase(ret, base) < 0) {
+ if (PyArray_SetBaseObject(ret, base) < 0) {
Py_DECREF(ret);
return NULL;
}
@@ -3902,7 +3902,7 @@ PyArray_FromBuffer(PyObject *buf, PyArray_Descr *type,
PyArray_CLEARFLAGS(ret, NPY_ARRAY_WRITEABLE);
}
/* Store a reference for decref on deallocation */
- if (PyArray_SetBase(ret, buf) < 0) {
+ if (PyArray_SetBaseObject(ret, buf) < 0) {
Py_DECREF(ret);
return NULL;
}
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c
index 5a18fbc0d..4f832bd12 100644
--- a/numpy/core/src/multiarray/descriptor.c
+++ b/numpy/core/src/multiarray/descriptor.c
@@ -869,7 +869,6 @@ _convert_from_dict(PyObject *obj, int align)
PyErr_SetString(PyExc_ValueError,
"NumPy dtype descriptor includes 'aligned' entry, "
"but its value is neither True nor False");
- Py_DECREF(new);
return NULL;
}
}
diff --git a/numpy/core/src/multiarray/einsum.c.src b/numpy/core/src/multiarray/einsum.c.src
index 39f6ce228..6447e9843 100644
--- a/numpy/core/src/multiarray/einsum.c.src
+++ b/numpy/core/src/multiarray/einsum.c.src
@@ -2207,7 +2207,7 @@ get_single_op_view(PyArrayObject *op, int iop, char *labels,
NPY_ARRAY_ALIGNED|
NPY_ARRAY_F_CONTIGUOUS);
Py_INCREF(op);
- if (PyArray_SetBase(*ret, (PyObject *)op) < 0) {
+ if (PyArray_SetBaseObject(*ret, (PyObject *)op) < 0) {
Py_DECREF(*ret);
*ret = NULL;
return 0;
@@ -2312,7 +2312,7 @@ get_combined_dims_view(PyArrayObject *op, int iop, char *labels)
NPY_ARRAY_ALIGNED|
NPY_ARRAY_F_CONTIGUOUS);
Py_INCREF(op);
- if (PyArray_SetBase(ret, (PyObject *)op) < 0) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)op) < 0) {
Py_DECREF(ret);
return NULL;
}
diff --git a/numpy/core/src/multiarray/getset.c b/numpy/core/src/multiarray/getset.c
index bcaf299e6..e9e052683 100644
--- a/numpy/core/src/multiarray/getset.c
+++ b/numpy/core/src/multiarray/getset.c
@@ -638,7 +638,7 @@ _get_part(PyArrayObject *self, int imag)
return NULL;
}
Py_INCREF(self);
- if (PyArray_SetBase(ret, (PyObject *)self) < 0) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)self) < 0) {
Py_DECREF(ret);
return NULL;
}
diff --git a/numpy/core/src/multiarray/item_selection.c b/numpy/core/src/multiarray/item_selection.c
index 2304f13d2..54de27e05 100644
--- a/numpy/core/src/multiarray/item_selection.c
+++ b/numpy/core/src/multiarray/item_selection.c
@@ -1898,7 +1898,7 @@ finish:
return NULL;
}
Py_INCREF(ret);
- if (PyArray_SetBase(view, (PyObject *)ret) < 0) {
+ if (PyArray_SetBaseObject(view, (PyObject *)ret) < 0) {
Py_DECREF(ret);
Py_DECREF(ret_tuple);
}
diff --git a/numpy/core/src/multiarray/iterators.c b/numpy/core/src/multiarray/iterators.c
index ecf57b465..e1d44740f 100644
--- a/numpy/core/src/multiarray/iterators.c
+++ b/numpy/core/src/multiarray/iterators.c
@@ -1165,7 +1165,7 @@ iter_array(PyArrayIterObject *it, PyObject *NPY_UNUSED(op))
return NULL;
}
Py_INCREF(it->ao);
- if (PyArray_SetBase(ret, (PyObject *)it->ao) < 0) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)it->ao) < 0) {
Py_DECREF(ret);
return NULL;
}
@@ -1184,7 +1184,7 @@ iter_array(PyArrayIterObject *it, PyObject *NPY_UNUSED(op))
return NULL;
}
/*
- * Don't use PyArray_SetBase, because that compresses
+ * Don't use PyArray_SetBaseObject, because that compresses
* the chain of bases.
*/
Py_INCREF(it->ao);
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c
index 30d9f4416..5cd6531d4 100644
--- a/numpy/core/src/multiarray/mapping.c
+++ b/numpy/core/src/multiarray/mapping.c
@@ -66,7 +66,7 @@ array_big_item(PyArrayObject *self, intp i)
return NULL;
}
Py_INCREF(self);
- if (PyArray_SetBase(r, (PyObject *)self) < 0) {
+ if (PyArray_SetBaseObject(r, (PyObject *)self) < 0) {
Py_DECREF(r);
return NULL;
}
@@ -407,7 +407,7 @@ add_new_axes_0d(PyArrayObject *arr, int newaxis_count)
return NULL;
}
Py_INCREF(arr);
- if (PyArray_SetBase(other, (PyObject *)arr) < 0) {
+ if (PyArray_SetBaseObject(other, (PyObject *)arr) < 0) {
Py_DECREF(other);
return NULL;
}
@@ -546,7 +546,7 @@ array_subscript_simple(PyArrayObject *self, PyObject *op)
return NULL;
}
Py_INCREF(self);
- if (PyArray_SetBase(other, (PyObject *)self) < 0) {
+ if (PyArray_SetBaseObject(other, (PyObject *)self) < 0) {
Py_DECREF(other);
return NULL;
}
diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
index 7dd767da9..28fb8f8cf 100644
--- a/numpy/core/src/multiarray/methods.c
+++ b/numpy/core/src/multiarray/methods.c
@@ -309,7 +309,7 @@ PyArray_GetField(PyArrayObject *self, PyArray_Descr *typed, int offset)
return NULL;
}
Py_INCREF(self);
- if (PyArray_SetBase(((PyArrayObject *)ret), (PyObject *)self) < 0) {
+ if (PyArray_SetBaseObject(((PyArrayObject *)ret), (PyObject *)self) < 0) {
Py_DECREF(ret);
return NULL;
}
@@ -911,7 +911,7 @@ array_wraparray(PyArrayObject *self, PyObject *args)
return NULL;
}
Py_INCREF(obj);
- if (PyArray_SetBase(ret, obj) < 0) {
+ if (PyArray_SetBaseObject(ret, obj) < 0) {
Py_DECREF(ret);
return NULL;
}
@@ -962,7 +962,7 @@ array_preparearray(PyArrayObject *self, PyObject *args)
return NULL;
}
Py_INCREF(arr);
- if (PyArray_SetBase(ret, (PyObject *)arr) < 0) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)arr) < 0) {
Py_DECREF(ret);
return NULL;
}
@@ -1003,7 +1003,7 @@ array_getarray(PyArrayObject *self, PyObject *args)
return NULL;
}
Py_INCREF(self);
- PyArray_SetBase(new, (PyObject *)self);
+ PyArray_SetBaseObject(new, (PyObject *)self);
self = new;
}
else {
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
index 2dd001490..2c1061656 100644
--- a/numpy/core/src/multiarray/multiarraymodule.c
+++ b/numpy/core/src/multiarray/multiarraymodule.c
@@ -1535,7 +1535,7 @@ _prepend_ones(PyArrayObject *arr, int nd, int ndmin)
return NULL;
}
/* steals a reference to arr --- so don't increment here */
- if (PyArray_SetBase(ret, (PyObject *)arr) < 0) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)arr) < 0) {
Py_DECREF(ret);
return NULL;
}
diff --git a/numpy/core/src/multiarray/nditer_api.c b/numpy/core/src/multiarray/nditer_api.c
index cc4dfc400..4875c1e34 100644
--- a/numpy/core/src/multiarray/nditer_api.c
+++ b/numpy/core/src/multiarray/nditer_api.c
@@ -1049,7 +1049,7 @@ NpyIter_GetIterView(NpyIter *iter, npy_intp i)
}
/* Tell the view who owns the data */
Py_INCREF(obj);
- if (PyArray_SetBase(view, (PyObject *)obj) < 0) {
+ if (PyArray_SetBaseObject(view, (PyObject *)obj) < 0) {
Py_DECREF(view);
return NULL;
}
diff --git a/numpy/core/src/multiarray/nditer_constr.c b/numpy/core/src/multiarray/nditer_constr.c
index feecb6480..441f19de0 100644
--- a/numpy/core/src/multiarray/nditer_constr.c
+++ b/numpy/core/src/multiarray/nditer_constr.c
@@ -2702,7 +2702,7 @@ npyiter_new_temp_array(NpyIter *iter, PyTypeObject *subtype,
Py_DECREF(ret);
return NULL;
}
- if (PyArray_SetBase(newret, (PyObject *)ret) < 0) {
+ if (PyArray_SetBaseObject(newret, (PyObject *)ret) < 0) {
Py_DECREF(newret);
return NULL;
}
@@ -2863,7 +2863,7 @@ npyiter_allocate_arrays(NpyIter *iter,
/* If the data will be written to, set UPDATEIFCOPY */
if (op_itflags[iop] & NPY_OP_ITFLAG_WRITE) {
/*
- * Don't use PyArray_SetBase, because that compresses
+ * Don't use PyArray_SetBaseObject, because that compresses
* the chain of bases.
*/
Py_INCREF(op[iop]);
diff --git a/numpy/core/src/multiarray/nditer_pywrap.c b/numpy/core/src/multiarray/nditer_pywrap.c
index 7a7f55cb2..5e4f0ea74 100644
--- a/numpy/core/src/multiarray/nditer_pywrap.c
+++ b/numpy/core/src/multiarray/nditer_pywrap.c
@@ -2077,7 +2077,7 @@ npyiter_seq_item(NewNpyArrayIterObject *self, Py_ssize_t i)
&innerstride, dataptr,
self->writeflags[i] ? NPY_ARRAY_WRITEABLE : 0, NULL);
Py_INCREF(self);
- if (PyArray_SetBase(ret, (PyObject *)self) < 0) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)self) < 0) {
Py_DECREF(ret);
return NULL;
}
diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c
index d7702b786..fa783dabf 100644
--- a/numpy/core/src/multiarray/scalarapi.c
+++ b/numpy/core/src/multiarray/scalarapi.c
@@ -289,7 +289,7 @@ PyArray_FromScalar(PyObject *scalar, PyArray_Descr *outcode)
return NULL;
}
Py_INCREF(scalar);
- if (PyArray_SetBase(r, (PyObject *)scalar) < 0) {
+ if (PyArray_SetBaseObject(r, (PyObject *)scalar) < 0) {
Py_DECREF(r);
return NULL;
}
diff --git a/numpy/core/src/multiarray/sequence.c b/numpy/core/src/multiarray/sequence.c
index 7448435a1..354dcfa2f 100644
--- a/numpy/core/src/multiarray/sequence.c
+++ b/numpy/core/src/multiarray/sequence.c
@@ -77,7 +77,7 @@ array_slice(PyArrayObject *self, Py_ssize_t ilow, Py_ssize_t ihigh)
return NULL;
}
Py_INCREF(self);
- if (PyArray_SetBase(ret, (PyObject *)self) < 0) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)self) < 0) {
Py_DECREF(ret);
return NULL;
}
diff --git a/numpy/core/src/multiarray/shape.c b/numpy/core/src/multiarray/shape.c
index 506c9ba06..3754e6a1e 100644
--- a/numpy/core/src/multiarray/shape.c
+++ b/numpy/core/src/multiarray/shape.c
@@ -312,7 +312,7 @@ PyArray_Newshape(PyArrayObject *self, PyArray_Dims *newdims,
if (incref) {
Py_INCREF(self);
}
- if (PyArray_SetBase(ret, (PyObject *)self)) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)self)) {
Py_DECREF(ret);
return NULL;
}
@@ -628,7 +628,7 @@ PyArray_Squeeze(PyArrayObject *self)
}
PyArray_CLEARFLAGS(ret, NPY_ARRAY_OWNDATA);
Py_INCREF(self);
- if (PyArray_SetBase(ret, (PyObject *)self) < 0) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)self) < 0) {
Py_DECREF(ret);
return NULL;
}
@@ -758,7 +758,7 @@ PyArray_Transpose(PyArrayObject *ap, PyArray_Dims *permute)
}
/* point at true owner of memory: */
Py_INCREF(ap);
- if (PyArray_SetBase(ret, (PyObject *)ap) < 0) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)ap) < 0) {
Py_DECREF(ret);
return NULL;
}
@@ -895,7 +895,7 @@ PyArray_Ravel(PyArrayObject *a, NPY_ORDER order)
PyArray_UpdateFlags(ret,
NPY_ARRAY_C_CONTIGUOUS|NPY_ARRAY_F_CONTIGUOUS);
Py_INCREF(a);
- if (PyArray_SetBase(ret, (PyObject *)a) < 0) {
+ if (PyArray_SetBaseObject(ret, (PyObject *)a) < 0) {
Py_DECREF(ret);
ret = NULL;
}
View Lorry Controller Status