MAINT: struct assignment "by field position", multi-field indices return views #6053
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -774,66 +774,173 @@ VOID_getitem(void *input, void *vap) | |
|
|
||
| NPY_NO_EXPORT int PyArray_CopyObject(PyArrayObject *, PyObject *); | ||
|
|
||
| /* Given a structured PyArrayObject arr, index i and structured datatype descr, | ||
| * modify the dtype of arr to contain a single field corresponding to the ith | ||
| * field of descr, recompute the alignment flag, and return the offset of the | ||
| * field (in offset_p). This is useful in preparation for calling copyswap on | ||
| * individual fields of a numpy structure, in VOID_setitem. Compare to inner | ||
| * loops in VOID_getitem and VOID_nonzero. | ||
| * | ||
| * WARNING: Clobbers arr's dtype and alignment flag. | ||
| */ | ||
| NPY_NO_EXPORT int | ||
| _setup_field(int i, PyArray_Descr *descr, PyArrayObject *arr, | ||
| npy_intp *offset_p) | ||
| { | ||
| PyObject *key; | ||
| PyObject *tup; | ||
| PyArray_Descr *new; | ||
| npy_intp offset; | ||
|
|
||
| key = PyTuple_GET_ITEM(descr->names, i); | ||
| tup = PyDict_GetItem(descr->fields, key); | ||
| if (_unpack_field(tup, &new, &offset) < 0) { | ||
| return -1; | ||
| } | ||
|
|
||
| ((PyArrayObject_fields *)(arr))->descr = new; | ||
| if ((new->alignment > 1) && ((offset % new->alignment) != 0)) { | ||
| PyArray_CLEARFLAGS(arr, NPY_ARRAY_ALIGNED); | ||
| } | ||
| else { | ||
| PyArray_ENABLEFLAGS(arr, NPY_ARRAY_ALIGNED); | ||
| } | ||
|
|
||
| *offset_p = offset; | ||
| return 0; | ||
| } | ||
|
|
||
| /* Helper function for VOID_setitem, which uses the copyswap or casting code to | ||
| * copy structured datatypes between numpy arrays or scalars. | ||
| */ | ||
| static int | ||
| _copy_and_return_void_setitem(PyArray_Descr *dstdescr, char *dstdata, | ||
| PyArray_Descr *srcdescr, char *srcdata){ | ||
| PyArrayObject_fields dummy_struct; | ||
| PyArrayObject *dummy = (PyArrayObject *)&dummy_struct; | ||
| npy_int names_size = PyTuple_GET_SIZE(dstdescr->names); | ||
| npy_intp offset; | ||
| npy_int i; | ||
| int ret; | ||
|
|
||
| /* Fast path if dtypes are equal */ | ||
| if (PyArray_EquivTypes(srcdescr, dstdescr)) { | ||
| for (i = 0; i < names_size; i++) { | ||
| /* neither line can ever fail, in principle */ | ||
| if (_setup_field(i, dstdescr, dummy, &offset)) { | ||
| return -1; | ||
| } | ||
| PyArray_DESCR(dummy)->f->copyswap(dstdata + offset, | ||
| srcdata + offset, 0, dummy); | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| /* Slow path */ | ||
| ret = PyArray_CastRawArrays(1, srcdata, dstdata, 0, 0, | ||
| srcdescr, dstdescr, 0); | ||
| if (ret != NPY_SUCCEED) { | ||
| return -1; | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| static int | ||
| VOID_setitem(PyObject *op, void *input, void *vap) | ||
| { | ||
| char *ip = input; | ||
| PyArrayObject *ap = vap; | ||
| PyArray_Descr *descr; | ||
| int flags; | ||
| int itemsize=PyArray_DESCR(ap)->elsize; | ||
| int res; | ||
|
|
||
| descr = PyArray_DESCR(ap); | ||
| flags = PyArray_FLAGS(ap); | ||
| if (PyDataType_HASFIELDS(descr)) { | ||
| PyObject *errmsg; | ||
| npy_int i; | ||
| npy_intp offset; | ||
| int failed = 0; | ||
|
|
||
| /* If op is 0d-ndarray or numpy scalar, directly get dtype & data ptr */ | ||
| if (PyArray_Check(op)) { | ||
| PyArrayObject *oparr = (PyArrayObject *)op; | ||
| if (PyArray_SIZE(oparr) != 1) { | ||
| PyErr_SetString(PyExc_ValueError, | ||
| "setting an array element with a sequence."); | ||
| return -1; | ||
| } | ||
| return _copy_and_return_void_setitem(descr, ip, | ||
| PyArray_DESCR(oparr), PyArray_DATA(oparr)); | ||
| } | ||
| else if (PyArray_IsScalar(op, Void)) { | ||
| PyArray_Descr *srcdescr = ((PyVoidScalarObject *)op)->descr; | ||
| char *srcdata = ((PyVoidScalarObject *)op)->obval; | ||
| return _copy_and_return_void_setitem(descr, ip, srcdescr, srcdata); | ||
| } | ||
| else if (PyTuple_Check(op)) { | ||
| /* if it's a tuple, copy field-by-field to ap, */ | ||
| npy_intp names_size = PyTuple_GET_SIZE(descr->names); | ||
|
|
||
| if (names_size != PyTuple_Size(op)) { | ||
| errmsg = PyUString_FromFormat( | ||
| "could not assign tuple of length %zd to structure " | ||
| "with %" NPY_INTP_FMT " fields.", | ||
| PyTuple_Size(op), names_size); | ||
| PyErr_SetObject(PyExc_ValueError, errmsg); | ||
| Py_DECREF(errmsg); | ||
| return -1; | ||
| } | ||
|
|
||
| for (i = 0; i < names_size; i++) { | ||
| PyObject *item; | ||
|
|
||
| /* temporarily make ap have only this field */ | ||
| if (_setup_field(i, descr, ap, &offset) == -1) { | ||
| failed = 1; | ||
| break; | ||
| } | ||
| item = PyTuple_GetItem(op, i); | ||
| if (item == NULL) { | ||
| failed = 1; | ||
| break; | ||
| } | ||
| /* use setitem to set this field */ | ||
| if (PyArray_DESCR(ap)->f->setitem(item, ip + offset, ap) < 0) { | ||
| failed = 1; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| else { | ||
| /* Otherwise must be non-void scalar. Try to assign to each field */ | ||
| npy_intp names_size = PyTuple_GET_SIZE(descr->names); | ||
|
|
||
| for (i = 0; i < names_size; i++) { | ||
| /* temporarily make ap have only this field */ | ||
| if (_setup_field(i, descr, ap, &offset) == -1) { | ||
| failed = 1; | ||
| break; | ||
| } | ||
| /* use setitem to set this field */ | ||
| if (PyArray_DESCR(ap)->f->setitem(op, ip + offset, ap) < 0) { | ||
| failed = 1; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /* reset clobbered attributes */ | ||
| ((PyArrayObject_fields *)(ap))->descr = descr; | ||
| ((PyArrayObject_fields *)(ap))->flags = flags; | ||
|
|
||
| if (failed) { | ||
| return -1; | ||
| } | ||
| return 0; | ||
| } | ||
| else if (PyDataType_HASSUBARRAY(descr)) { | ||
| /* copy into an array of the same basic type */ | ||
| PyArray_Dims shape = {NULL, -1}; | ||
| PyArrayObject *ret; | ||
|
|
@@ -862,29 +969,24 @@ VOID_setitem(PyObject *op, void *input, void *vap) | |
| return res; | ||
| } | ||
|
|
||
| /* | ||
| * Fall through case - non-structured void datatype. This is a very | ||
| * undiscerning case: It interprets any object as a buffer | ||
| * and reads as many bytes as possible, padding with 0. | ||
| */ | ||
| { | ||
| const void *buffer; | ||
| Py_ssize_t buflen; | ||
|
There was a problem hiding this comment. Why is this no longer an issue? There was a problem hiding this comment. Because all cases involving objects now must fall into the HASFIELDS branch. Because of other work I've done I'm fairly sure it is not possible to create a void unstructured type containing pointers. In the old code, however, many structured arrays would fall into this part of the code (eg, see #6314). |
||
| res = PyObject_AsReadBuffer(op, &buffer, &buflen); | ||
| if (res == -1) { | ||
| return -1; | ||
| } | ||
| memcpy(ip, buffer, PyArray_MIN(buflen, itemsize)); | ||
| if (itemsize > buflen) { | ||
| memset(ip + buflen, 0, itemsize - buflen); | ||
| } | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| static PyObject * | ||
|
|
||
This file contains hidden or 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 hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What type of cast is even allowed here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This accounts for assigning between structures with different field types, eg ''f4,f4' to 'i4,i4'.