Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork11k
ENH: Use array indexing preparation routines for flatiter objects#28590
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
lysnikolaou wants to merge10 commits intonumpy:mainChoose a base branch
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Open
Changes from1 commit
Commits
Show all changes
10 commits Select commitHold shift + click to select a range
bc55a60 [ENH] Use array indexing preparation routines for flatiter objects
lysnikolaouf19745e Fix assign subscript and add tests for it
lysnikolaoua563242 Fix regression test
lysnikolaou9f2d51f Remove unnecessary dims array
lysnikolaou33109dd Add release note
lysnikolaoudc362b4 Remove unnecessary branch from iter_subscript
lysnikolaou8255e5a Add more benchmarks
lysnikolaoucfcdabf Merge branch 'main' into use-prepare-index-flatiter
lysnikolaou368b404 Merge branch 'main' into use-prepare-index-flatiter
lysnikolaouae101a5 Add special cases to fix performance regression
lysnikolaouFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
NextNext commit
[ENH] Use array indexing preparation routines for flatiter objects
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commitbc55a606dfb7fa215d046e92c42e1edb0512a80c
There are no files selected for viewing
236 changes: 95 additions & 141 deletionsnumpy/_core/src/multiarray/iterators.c
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 |
|---|---|---|
| @@ -426,7 +426,7 @@ iter_length(PyArrayIterObject *self) | ||
| } | ||
| staticPyObject * | ||
| iter_subscript_Bool(PyArrayIterObject *self, PyArrayObject *ind, | ||
| NPY_cast_info *cast_info) | ||
| { | ||
| @@ -483,7 +483,7 @@ iter_subscript_Bool(PyArrayIterObject *self, PyArrayObject *ind, | ||
| } | ||
| PyArray_ITER_RESET(self); | ||
| } | ||
| return(PyObject *)ret; | ||
| } | ||
| static PyObject * | ||
| @@ -561,195 +561,149 @@ iter_subscript_int(PyArrayIterObject *self, PyArrayObject *ind, | ||
| NPY_NO_EXPORT PyObject * | ||
| iter_subscript(PyArrayIterObject *self, PyObject *ind) | ||
| { | ||
| PyObject *ret = NULL; | ||
| int index_type; | ||
| int index_num = -1; | ||
| int ndim, fancy_ndim; | ||
| npy_intp start, stop, step, n_steps; | ||
| npy_index_info indices[NPY_MAXDIMS * 2 + 1]; | ||
| PyArray_Descr *dtype = PyArray_DESCR(self->ao); | ||
| npy_intp dtype_size = dtype->elsize; | ||
| NPY_cast_info cast_info = {.func = NULL}; | ||
| /* Prepare the indices */ | ||
| npy_intp dims[1] = {self->size}; | ||
| index_type = prepare_index_noarray(1, dims, ind, indices, &index_num, | ||
| &ndim, &fancy_ndim, 1, 1); | ||
| if (index_type < 0) { | ||
| return NULL; | ||
| } | ||
| else if (index_num == 0) { | ||
| Py_INCREF(self->ao); | ||
| ret = (PyObject *) self->ao; | ||
| goto finish; | ||
| } | ||
| else if (indices[0].type == HAS_NEWAXIS) { | ||
| PyErr_SetString(PyExc_IndexError, | ||
| "only integers, slices (`:`), ellipsis (`...`) and integer or boolean " | ||
| "arrays are valid indices" | ||
| ); | ||
| goto finish; | ||
| } | ||
| // Single ellipsis index | ||
| else if (index_type == HAS_ELLIPSIS) { | ||
| ind = PySlice_New(NULL, NULL, NULL); | ||
| if (ind == NULL) { | ||
| goto finish; | ||
| } | ||
| ret = iter_subscript(self, ind); | ||
| Py_DECREF(ind); | ||
| goto finish; | ||
| } | ||
| // Single boolean index | ||
| else if (indices[0].type == HAS_0D_BOOL) { | ||
| if (indices[0].value) { | ||
| ret = PyArray_ToScalar(self->dataptr, self->ao); | ||
| goto finish; | ||
| } | ||
| else { /* empty array */ | ||
| npy_intp ii = 0; | ||
| Py_INCREF(dtype); | ||
| ret = PyArray_NewFromDescr(Py_TYPE(self->ao), | ||
| dtype, | ||
| 1, &ii, | ||
| NULL, NULL, 0, | ||
| (PyObject *)self->ao); | ||
| goto finish; | ||
| } | ||
| } | ||
| PyArray_ITER_RESET(self); | ||
| if (index_type == HAS_INTEGER) { | ||
| if (check_and_adjust_index(&indices[0].value, self->size, -1, NULL) < 0) { | ||
| goto finish; | ||
| } | ||
| PyArray_ITER_GOTO1D(self, indices[0].value); | ||
| ret = PyArray_ToScalar(self->dataptr, self->ao); | ||
| PyArray_ITER_RESET(self); | ||
| goto finish; | ||
| } | ||
| /* set up a cast to handle item copying */ | ||
| NPY_ARRAYMETHOD_FLAGS transfer_flags = 0; | ||
| npy_intp one = 1; | ||
| /* We can assume the newly allocated output array is aligned */ | ||
| int is_aligned = IsUintAligned(self->ao); | ||
| if (PyArray_GetDTypeTransferFunction( | ||
| is_aligned,dtype_size, dtype_size, dtype, dtype, 0, &cast_info, | ||
| &transfer_flags) < 0) { | ||
| gotofinish; | ||
| } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Seems like | ||
| if (index_type & HAS_SLICE) { | ||
| if (PySlice_GetIndicesEx(indices[0].object, | ||
| dims[0], | ||
| &start, &stop, &step, &n_steps) < 0) { | ||
| goto finish; | ||
| } | ||
| PyArray_ITER_GOTO1D(self, start); | ||
| Py_INCREF(dtype); | ||
| ret = PyArray_NewFromDescr(Py_TYPE(self->ao), | ||
| dtype, | ||
| 1, &n_steps, | ||
| NULL, NULL, | ||
| 0, (PyObject *)self->ao); | ||
| if (ret == NULL) { | ||
| gotofinish; | ||
| } | ||
| char *dptr = PyArray_DATA((PyArrayObject *) ret); | ||
| while (n_steps--) { | ||
| char *args[2] = {self->dataptr, dptr}; | ||
| npy_intp transfer_strides[2] = {dtype_size, dtype_size}; | ||
| if (cast_info.func(&cast_info.context, args, &one, | ||
| transfer_strides, cast_info.auxdata) < 0) { | ||
| gotofinish; | ||
| } | ||
| start +=step; | ||
| PyArray_ITER_GOTO1D(self, start); | ||
| dptr +=dtype_size; | ||
| } | ||
| PyArray_ITER_RESET(self); | ||
| goto finish; | ||
| } | ||
| if (index_type == HAS_BOOL) { | ||
| ret = iter_subscript_Bool(self, (PyArrayObject *) indices[0].object, &cast_info); | ||
| gotofinish; | ||
| } | ||
| if (index_type == HAS_FANCY) { | ||
| ret = iter_subscript_int(self, (PyArrayObject *) indices[0].object, &cast_info); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. It must be an integer array here, I think. But I don't think it is guaranteed to be an | ||
| goto finish; | ||
| } | ||
| PyErr_SetString(PyExc_IndexError, | ||
| "only integers, slices (`:`), ellipsis (`...`) and integer or boolean " | ||
| "arrays are valid indices" | ||
| ); | ||
| finish: | ||
| NPY_cast_info_xfree(&cast_info); | ||
| for (int i = 0; i < index_num; i++) { | ||
| Py_XDECREF(indices[i].object); | ||
| } | ||
| return ret; | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
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.