diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2012-10-23 14:32:30 +0200 |
|---|---|---|
| committer | Sebastian Berg <sebastian@sipsolutions.net> | 2012-10-23 14:32:30 +0200 |
| commit | 02ebf8b3e7674a6b8a06636feaa6c761fcdf4e2d (patch) | |
| tree | 693e11c3ad78cf760535a15485a8a326e9fd2a3d /numpy | |
| parent | 4d741d282641ae7bd152ec6d89de8f24e9983267 (diff) | |
| download | numpy-02ebf8b3e7674a6b8a06636feaa6c761fcdf4e2d.tar.gz | |
MNT: Remove unnecessary special cases in _UpdateContiguousFlags
Remove unnecessary special cases for 0 and 1-d arrays as suggested
by njsmith.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/flagsobject.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/numpy/core/src/multiarray/flagsobject.c b/numpy/core/src/multiarray/flagsobject.c index b26ac9813..ef04bdb20 100644 --- a/numpy/core/src/multiarray/flagsobject.c +++ b/numpy/core/src/multiarray/flagsobject.c @@ -101,23 +101,7 @@ _UpdateContiguousFlags(PyArrayObject *ap) int i; npy_bool is_c_contig = 1; - if (PyArray_NDIM(ap) == 0) { - PyArray_ENABLEFLAGS(ap, NPY_ARRAY_C_CONTIGUOUS); - PyArray_ENABLEFLAGS(ap, NPY_ARRAY_F_CONTIGUOUS); - return; - } sd = PyArray_DESCR(ap)->elsize; - if (PyArray_NDIM(ap) == 1) { - if (PyArray_DIMS(ap)[0] == 1 || sd == PyArray_STRIDES(ap)[0]) { - PyArray_ENABLEFLAGS(ap, NPY_ARRAY_C_CONTIGUOUS); - PyArray_ENABLEFLAGS(ap, NPY_ARRAY_F_CONTIGUOUS); - return; - } - PyArray_CLEARFLAGS(ap, NPY_ARRAY_C_CONTIGUOUS); - PyArray_CLEARFLAGS(ap, NPY_ARRAY_F_CONTIGUOUS); - return; - } - for (i = PyArray_NDIM(ap) - 1; i >= 0; --i) { dim = PyArray_DIMS(ap)[i]; /* contiguous by definition */ |