Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2815 from certik/backport444
Backport444
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1977,84 +1977,113 @@ PyArray_FromStructInterface(PyObject *input) | |
|
|
||
| /*NUMPY_API*/ | ||
| NPY_NO_EXPORT PyObject * | ||
| PyArray_FromInterface(PyObject *origin) | ||
| { | ||
| PyObject *tmp = NULL; | ||
| PyObject *iface = NULL; | ||
| PyObject *attr = NULL; | ||
| PyObject *base = NULL; | ||
| PyArrayObject *ret; | ||
| PyArray_Descr *dtype = NULL; | ||
| char *data = NULL; | ||
| Py_ssize_t buffer_len; | ||
| int res, i, n; | ||
| npy_intp dims[NPY_MAXDIMS], strides[NPY_MAXDIMS]; | ||
| int dataflags = NPY_ARRAY_BEHAVED; | ||
|
|
||
| /* Get the typestring -- ignore array_descr */ | ||
| /* Get the shape */ | ||
| /* Get the memory from __array_data__ and __array_offset__ */ | ||
| /* Get the strides */ | ||
|
|
||
| iface = PyObject_GetAttrString(origin, "__array_interface__"); | ||
| if (iface == NULL) { | ||
| PyErr_Clear(); | ||
| return Py_NotImplemented; | ||
| } | ||
| if (!PyDict_Check(iface)) { | ||
| Py_DECREF(iface); | ||
| PyErr_SetString(PyExc_ValueError, | ||
| "Invalid __array_interface__ value, must be a dict"); | ||
| return NULL; | ||
| } | ||
|
|
||
| /* Get type string from interface specification */ | ||
| attr = PyDict_GetItemString(iface, "typestr"); | ||
| if (attr == NULL) { | ||
| Py_DECREF(iface); | ||
| PyErr_SetString(PyExc_ValueError, | ||
| "Missing __array_interface__ typestr"); | ||
| return NULL; | ||
| } | ||
| #if defined(NPY_PY3K) | ||
| /* Allow unicode type strings */ | ||
| if (PyUnicode_Check(attr)) { | ||
| tmp = PyUnicode_AsASCIIString(attr); | ||
| attr = tmp; | ||
| } | ||
| #endif | ||
| if (!PyBytes_Check(attr)) { | ||
| PyErr_SetString(PyExc_TypeError, | ||
| "__array_interface__ typestr must be a string"); | ||
| goto fail; | ||
| } | ||
| /* Get dtype from type string */ | ||
| dtype = _array_typedescr_fromstr(PyString_AS_STRING(attr)); | ||
| #if defined(NPY_PY3K) | ||
| if (tmp == attr) { | ||
| Py_DECREF(tmp); | ||
| } | ||
| #endif | ||
| if (dtype == NULL) { | ||
| goto fail; | ||
| } | ||
|
|
||
| /* Get shape tuple from interface specification */ | ||
| attr = PyDict_GetItemString(iface, "shape"); | ||
| if (attr == NULL) { | ||
| /* Shape must be specified when 'data' is specified */ | ||
| if (PyDict_GetItemString(iface, "data") != NULL) { | ||
| Py_DECREF(iface); | ||
| PyErr_SetString(PyExc_ValueError, | ||
| "Missing __array_interface__ shape"); | ||
| return NULL; | ||
| } | ||
| /* Assume shape as scalar otherwise */ | ||
| else { | ||
| /* NOTE: pointers to data and base should be NULL */ | ||
| n = dims[0] = 0; | ||
| } | ||
| } | ||
| /* Make sure 'shape' is a tuple */ | ||
| else if (!PyTuple_Check(attr)) { | ||
| PyErr_SetString(PyExc_TypeError, | ||
| "shape must be a tuple"); | ||
| goto fail; | ||
| } | ||
| /* Get dimensions from shape tuple */ | ||
| else { | ||
| n = PyTuple_GET_SIZE(attr); | ||
| for (i = 0; i < n; i++) { | ||
| tmp = PyTuple_GET_ITEM(attr, i); | ||
| dims[i] = PyArray_PyIntAsIntp(tmp); | ||
| if (error_converting(dims[i])) { | ||
| goto fail; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /* Get data buffer from interface specification */ | ||
| attr = PyDict_GetItemString(iface, "data"); | ||
|
|
||
| /* Case for data access through pointer */ | ||
| if (attr && PyTuple_Check(attr)) { | ||
| PyObject *dataptr; | ||
| if (n == 0) { | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
certik
Author
Contributor
|
||
| PyErr_SetString(PyExc_ValueError, | ||
| "__array_interface__ shape must be at least size 1"); | ||
| goto fail; | ||
| } | ||
| if (PyTuple_GET_SIZE(attr) != 2) { | ||
| PyErr_SetString(PyExc_TypeError, | ||
| "__array_interface__ data must be a 2-tuple with " | ||
|
|
@@ -2083,90 +2112,102 @@ PyArray_FromInterface(PyObject *input) | |
| if (PyObject_IsTrue(PyTuple_GET_ITEM(attr,1))) { | ||
| dataflags &= ~NPY_ARRAY_WRITEABLE; | ||
| } | ||
| base = origin; | ||
| } | ||
|
|
||
| /* Case for data access through buffer */ | ||
| else if (attr) { | ||
| if (n == 0) { | ||
| PyErr_SetString(PyExc_ValueError, | ||
| "__array_interface__ shape must be at least size 1"); | ||
| goto fail; | ||
| } | ||
| if (attr && (attr != Py_None)) { | ||
| base = attr; | ||
| } | ||
| else { | ||
| base = origin; | ||
| } | ||
| res = PyObject_AsWriteBuffer(base, (void **)&data, &buffer_len); | ||
| if (res < 0) { | ||
| PyErr_Clear(); | ||
| res = PyObject_AsReadBuffer( | ||
| base, (const void **)&data, &buffer_len); | ||
| if (res < 0) { | ||
| goto fail; | ||
| } | ||
| dataflags &= ~NPY_ARRAY_WRITEABLE; | ||
| } | ||
| /* Get offset number from interface specification */ | ||
| attr = PyDict_GetItemString(origin, "offset"); | ||
| if (attr) { | ||
| npy_longlong num = PyLong_AsLongLong(attr); | ||
| if (error_converting(num)) { | ||
| PyErr_SetString(PyExc_TypeError, | ||
| "__array_interface__ offset must be an integer"); | ||
| goto fail; | ||
| } | ||
| data += num; | ||
| } | ||
| } | ||
|
|
||
| ret = (PyArrayObject *)PyArray_NewFromDescr(&PyArray_Type, dtype, | ||
| n, dims, | ||
| NULL, data, | ||
| dataflags, NULL); | ||
| if (ret == NULL) { | ||
| goto fail; | ||
| } | ||
| if (data == NULL) { | ||
| if (PyArray_SIZE(ret) > 1) { | ||
| PyErr_SetString(PyExc_ValueError, | ||
| "cannot coerce scalar to array with size > 1"); | ||
| Py_DECREF(ret); | ||
| goto fail; | ||
| } | ||
| if (PyArray_SETITEM(ret, PyArray_DATA(ret), origin) < 0) { | ||
| Py_DECREF(ret); | ||
| goto fail; | ||
| } | ||
| } | ||
| if (base) { | ||
| Py_INCREF(base); | ||
| if (PyArray_SetBaseObject(ret, base) < 0) { | ||
| Py_DECREF(ret); | ||
| goto fail; | ||
| } | ||
| } | ||
| attr = PyDict_GetItemString(iface, "strides"); | ||
| if (attr != NULL && attr != Py_None) { | ||
| if (!PyTuple_Check(attr)) { | ||
| PyErr_SetString(PyExc_TypeError, | ||
| "strides must be a tuple"); | ||
| Py_DECREF(ret); | ||
| goto fail; | ||
| } | ||
| if (n != PyTuple_GET_SIZE(attr)) { | ||
| PyErr_SetString(PyExc_ValueError, | ||
| "mismatch in length of strides and shape"); | ||
| Py_DECREF(ret); | ||
| goto fail; | ||
| } | ||
| for (i = 0; i < n; i++) { | ||
| tmp = PyTuple_GET_ITEM(attr, i); | ||
| strides[i] = PyArray_PyIntAsIntp(tmp); | ||
| if (error_converting(strides[i])) { | ||
| Py_DECREF(ret); | ||
| goto fail; | ||
| } | ||
| } | ||
| memcpy(PyArray_STRIDES(ret), strides, n*sizeof(npy_intp)); | ||
| } | ||
| PyArray_UpdateFlags(ret, NPY_ARRAY_UPDATE_ALL); | ||
| Py_DECREF(iface); | ||
| return (PyObject *)ret; | ||
|
|
||
| fail: | ||
| Py_XDECREF(dtype); | ||
| Py_XDECREF(iface); | ||
| return NULL; | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This check seems un-necessary and it causes at least one failure in code that uses np.ndindex(). The array interface should support passing array scalars around.