Skip to content

Add iterator to memoryview #19

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ghost wants to merge 8 commits into from
Closed

Add iterator to memoryview #19

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2ece789
Add iterator to memoryview
Sep 2, 2020
6890921
Fix formatting
Sep 3, 2020
83eef55
Bugfix - proper error handling for diff dimension memoryviews
Sep 3, 2020
b62bee2
Code restructure - bugfix
Sep 3, 2020
bcf1b4d
Initial optimization attempt
Sep 3, 2020
b1f69e6
Optimization - memoryiter_next()
Sep 4, 2020
2fcf41a
Code restructure
Sep 5, 2020
a54b24d
fix comment
Sep 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions Objects/memoryobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2334,8 +2334,7 @@ ptr_from_tuple(Py_buffer *view, PyObject *tup)
with the type specified by view->format. Otherwise, the item is a sub-view.
The function is used by memory_subscript(), memoryiter_next() and
memory_as_sequence.
Note: Iteration of multi-dimensional arrays is not yet implemented
(as of Python 3.10.0a0) */
Note: Iteration of multi-dimensional arrays is not yet implemented */
static PyObject *
memory_item(PyMemoryViewObject *self, Py_ssize_t index)
{
Expand Down Expand Up @@ -3216,10 +3215,7 @@ memoryiter_next(memoryiterobject *it)
if (seq == NULL) {
return NULL;
}
if (seq->view.ndim != 1) {
PyErr_SetString(PyExc_NotImplementedError,
"multi-dimensional sub-views are not implemented");
}

if (it->it_index < memory_length(seq)) {
return memory_item(seq, it->it_index++);
}
Expand All @@ -3244,8 +3240,19 @@ memory_iter(PyObject *seq)
}

it->it_index = 0;
Py_INCREF(seq);
it->it_seq = (PyMemoryViewObject *)seq;
Py_INCREF(seq);

int ndims = it->it_seq->view.ndim;
if (ndims == 0) {
PyErr_SetString(PyExc_TypeError, "invalid indexing of 0-dim memory");
return NULL;
}
if (ndims != 1) {
PyErr_SetString(PyExc_NotImplementedError,
"multi-dimensional sub-views are not implemented");
return NULL;
}
_PyObject_GC_TRACK(it);
return (PyObject *)it;
}
Expand Down Expand Up @@ -3289,4 +3296,4 @@ PyTypeObject PyMemoryView_Type = {
0, /* tp_init */
0, /* tp_alloc */
memoryview, /* tp_new */
};
};