summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorEric Wieser <wieser.eric@gmail.com>2018-06-04 23:54:19 -0700
committerEric Wieser <wieser.eric@gmail.com>2018-06-04 23:54:19 -0700
commitad5b8e908b605fb69a667f7c3bc0e04418edaad6 (patch)
tree2e74a602219fc87437909403e35fc6853a897642 /numpy
parent1e11149de47929cafbbc0108beae4702e7ffc2a9 (diff)
downloadnumpy-ad5b8e908b605fb69a667f7c3bc0e04418edaad6.tar.gz
MAINT: Don't update the flags a second time
`PyArray_UpdateFlags(view, NPY_ARRAY_UPDATE_ALL);` is already called within PyArray_NewFromDescr_int
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/src/multiarray/arrayobject.c1
-rw-r--r--numpy/core/src/multiarray/arraytypes.c.src2
-rw-r--r--numpy/core/src/multiarray/ctors.c1
-rw-r--r--numpy/core/src/multiarray/einsum.c.src21
-rw-r--r--numpy/core/src/multiarray/shape.c5
5 files changed, 0 insertions, 30 deletions
diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c
index 6f4d3d349..e1db4d6f6 100644
--- a/numpy/core/src/multiarray/arrayobject.c
+++ b/numpy/core/src/multiarray/arrayobject.c
@@ -1663,7 +1663,6 @@ array_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
descr = NULL;
goto fail;
}
- PyArray_UpdateFlags(ret, NPY_ARRAY_UPDATE_ALL);
Py_INCREF(buffer.base);
if (PyArray_SetBaseObject(ret, buffer.base) < 0) {
Py_DECREF(ret);
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
index 972147bb0..48003e6a3 100644
--- a/numpy/core/src/multiarray/arraytypes.c.src
+++ b/numpy/core/src/multiarray/arraytypes.c.src
@@ -736,7 +736,6 @@ VOID_getitem(void *input, void *vap)
Py_DECREF(ret);
return NULL;
}
- PyArray_UpdateFlags((PyArrayObject *)ret, NPY_ARRAY_UPDATE_ALL);
return (PyObject *)ret;
}
@@ -936,7 +935,6 @@ VOID_setitem(PyObject *op, void *input, void *vap)
Py_DECREF(ret);
return -1;
}
- PyArray_UpdateFlags(ret, NPY_ARRAY_UPDATE_ALL);
res = PyArray_CopyObject(ret, op);
Py_DECREF(ret);
return res;
diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c
index 60b48350c..70f5c72aa 100644
--- a/numpy/core/src/multiarray/ctors.c
+++ b/numpy/core/src/multiarray/ctors.c
@@ -3684,7 +3684,6 @@ PyArray_FromBuffer(PyObject *buf, PyArray_Descr *type,
Py_DECREF(ret);
return NULL;
}
- PyArray_UpdateFlags(ret, NPY_ARRAY_ALIGNED);
return (PyObject *)ret;
}
diff --git a/numpy/core/src/multiarray/einsum.c.src b/numpy/core/src/multiarray/einsum.c.src
index 0eab25299..3c086351f 100644
--- a/numpy/core/src/multiarray/einsum.c.src
+++ b/numpy/core/src/multiarray/einsum.c.src
@@ -2078,17 +2078,6 @@ get_single_op_view(PyArrayObject *op, int iop, char *labels,
if (*ret == NULL) {
return -1;
}
- if (!PyArray_Check(*ret)) {
- Py_DECREF(*ret);
- *ret = NULL;
- PyErr_SetString(PyExc_RuntimeError,
- "NewFromDescr failed to return an array");
- return -1;
- }
- PyArray_UpdateFlags(*ret,
- NPY_ARRAY_C_CONTIGUOUS|
- NPY_ARRAY_ALIGNED|
- NPY_ARRAY_F_CONTIGUOUS);
Py_INCREF(op);
if (PyArray_SetBaseObject(*ret, (PyObject *)op) < 0) {
Py_DECREF(*ret);
@@ -2183,16 +2172,6 @@ get_combined_dims_view(PyArrayObject *op, int iop, char *labels)
if (ret == NULL) {
return NULL;
}
- if (!PyArray_Check(ret)) {
- Py_DECREF(ret);
- PyErr_SetString(PyExc_RuntimeError,
- "NewFromDescr failed to return an array");
- return NULL;
- }
- PyArray_UpdateFlags(ret,
- NPY_ARRAY_C_CONTIGUOUS|
- NPY_ARRAY_ALIGNED|
- NPY_ARRAY_F_CONTIGUOUS);
Py_INCREF(op);
if (PyArray_SetBaseObject(ret, (PyObject *)op) < 0) {
Py_DECREF(ret);
diff --git a/numpy/core/src/multiarray/shape.c b/numpy/core/src/multiarray/shape.c
index 05c24d6da..dec9eedc9 100644
--- a/numpy/core/src/multiarray/shape.c
+++ b/numpy/core/src/multiarray/shape.c
@@ -284,8 +284,6 @@ PyArray_Newshape(PyArrayObject *self, PyArray_Dims *newdims,
Py_DECREF(ret);
return NULL;
}
-
- PyArray_UpdateFlags(ret, NPY_ARRAY_C_CONTIGUOUS | NPY_ARRAY_F_CONTIGUOUS);
return (PyObject *)ret;
fail:
@@ -970,9 +968,6 @@ PyArray_Ravel(PyArrayObject *arr, NPY_ORDER order)
if (ret == NULL) {
return NULL;
}
-
- PyArray_UpdateFlags(ret,
- NPY_ARRAY_C_CONTIGUOUS|NPY_ARRAY_F_CONTIGUOUS);
Py_INCREF(arr);
if (PyArray_SetBaseObject(ret, (PyObject *)arr) < 0) {
Py_DECREF(ret);