diff options
| author | Julian Taylor <jtaylor.debian@googlemail.com> | 2017-05-15 18:23:46 +0200 |
|---|---|---|
| committer | Julian Taylor <jtaylor.debian@googlemail.com> | 2017-05-15 18:27:12 +0200 |
| commit | 267a450d48402186eff0ba6f77fff51efd226825 (patch) | |
| tree | 6f5eacf3ac687d35148132de618ea656a914e155 | |
| parent | 3abc112883aa7f381b722f9f2e02bdb4ba5749f9 (diff) | |
| download | numpy-267a450d48402186eff0ba6f77fff51efd226825.tar.gz | |
MAINT: use PyArray_ISNUMBER to decide whether to elide
| -rw-r--r-- | numpy/core/src/multiarray/temp_elide.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/temp_elide.c b/numpy/core/src/multiarray/temp_elide.c index c4673bd4b..b93f4e67e 100644 --- a/numpy/core/src/multiarray/temp_elide.c +++ b/numpy/core/src/multiarray/temp_elide.c @@ -283,7 +283,7 @@ can_elide_temp(PyArrayObject * alhs, PyObject * orhs, int * cannot) * array of a basic type, own its data and size larger than threshold */ if (Py_REFCNT(alhs) != 1 || !PyArray_CheckExact(alhs) || - PyArray_DESCR(alhs)->type_num >= NPY_OBJECT || + !PyArray_ISNUMBER(alhs) || !(PyArray_FLAGS(alhs) & NPY_ARRAY_OWNDATA) || PyArray_NBYTES(alhs) < NPY_MIN_ELIDE_BYTES) { return 0; @@ -359,7 +359,7 @@ can_elide_temp_unary(PyArrayObject * m1) { int cannot; if (Py_REFCNT(m1) != 1 || !PyArray_CheckExact(m1) || - PyArray_DESCR(m1)->type_num >= NPY_OBJECT || + !PyArray_ISNUMBER(m1) || !(PyArray_FLAGS(m1) & NPY_ARRAY_OWNDATA) || PyArray_NBYTES(m1) < NPY_MIN_ELIDE_BYTES) { return 0; |