Skip to content

Make DataView iterator implementation std::forward_iterator compatible for cpp20 #2976

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

Draft
mlxd wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Make DataView iterator implementation std::forward_iterator compatible for cpp20 #2976

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 12 additions & 11 deletions runtime/include/DataView.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#pragma once

#include <vector>
#include <cstdint>

/**
* A multi-dimensional view for MemRef-like and std::vector<T> types.
Expand All @@ -38,7 +39,7 @@ template <typename T, size_t R> class DataView {
public:
class iterator {
private:
const DataView<T, R> &view;
const DataView<T, R>* view;

int64_t loc; // physical index
size_t indices[R] = {0};
Expand All @@ -50,45 +51,45 @@ template <typename T, size_t R> class DataView {
using pointer = T *; // LCOV_EXCL_LINE
using reference = T &; // LCOV_EXCL_LINE

iterator(const DataView<T, R> &_view, int64_t begin_idx) : view(_view), loc(begin_idx) {}
pointer operator->() const { return &view.data_aligned[loc]; }
reference operator*() const { return view.data_aligned[loc]; }
iterator(const DataView<T, R> &_view, int64_t begin_idx) : view(&_view), loc(begin_idx) {}
pointer operator->() const { return &view->data_aligned[loc]; }
reference operator*() const { return view->data_aligned[loc]; }
iterator &operator++()
{
int64_t next_axis = -1;
for (int64_t axis = R - 1; axis >= 0; axis--) {
if (++indices[axis] < view.sizes[axis]) {
if (++indices[axis] < view->sizes[axis]) {
next_axis = axis;
break;
}

indices[axis] = 0;

loc -= view.sizes[axis] == 0 ? 0 : (view.sizes[axis] - 1) * view.strides[axis];
loc -= view->sizes[axis] == 0 ? 0 : (view->sizes[axis] - 1) * view->strides[axis];
}

loc = next_axis == -1 ? -1 : loc + view.strides[next_axis];
loc = next_axis == -1 ? -1 : loc + view->strides[next_axis];
return *this;
}
iterator operator++(int)
{
auto cached_iter = *this;
int64_t next_axis = -1;
for (int64_t axis = R - 1; axis >= 0; axis--) {
if (++indices[axis] < view.sizes[axis]) {
if (++indices[axis] < view->sizes[axis]) {
next_axis = axis;
break;
}
indices[axis] = 0;
loc -= view.sizes[axis] == 0 ? 0 : (view.sizes[axis] - 1) * view.strides[axis];
loc -= view->sizes[axis] == 0 ? 0 : (view->sizes[axis] - 1) * view->strides[axis];
}

loc = next_axis == -1 ? -1 : loc + view.strides[next_axis];
loc = next_axis == -1 ? -1 : loc + view->strides[next_axis];
return cached_iter;
}
bool operator==(const iterator &other) const
{
return (loc == other.loc && view.data_aligned == other.view.data_aligned);
return (loc == other.loc && view->data_aligned == other.view->data_aligned);
}
bool operator!=(const iterator &other) const { return !(*this == other); }
};
Expand Down
Loading