Skip to content

[NDArray] Allow creating a view from a strided array #15132

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

Merged
masahi merged 2 commits into from
Jun 22, 2023
Merged

[NDArray] Allow creating a view from a strided array #15132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d25111
Allow creating a view from a stride array
masahi Jun 21, 2023
e40c344
use IsContiguous
masahi Jun 21, 2023
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
25 changes: 24 additions & 1 deletion src/runtime/ndarray.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,30 @@ struct NDArray::Internal {

NDArray NDArray::CreateView(ShapeTuple shape, DLDataType dtype) {
ICHECK(data_ != nullptr);
ICHECK(get_mutable()->dl_tensor.strides == nullptr) << "Can only create view for compact tensor";

const DLTensor& orig = get_mutable()->dl_tensor;
ICHECK(IsContiguous()) << "Can only create view for compact tensor, but found strides " <<
[&orig]() {
std::stringstream ss;
ss << "[";
for (int i = 0; i < orig.ndim; i++) {
if (i) ss << ", ";
ss << orig.strides[i];
}
ss << "]";
return ss.str();
}() << ", for shape "
<< [&]() {
std::stringstream ss;
ss << "[";
for (int i = 0; i < orig.ndim; i++) {
if (i) ss << ", ";
ss << orig.shape[i];
}
ss << "]";
return ss.str();
}();

NDArray ret = Internal::Create(shape, dtype, get_mutable()->dl_tensor.device);
ret.get_mutable()->dl_tensor.byte_offset = this->get_mutable()->dl_tensor.byte_offset;
size_t curr_size = GetDataSize(this->get_mutable()->dl_tensor);
Expand Down
13 changes: 13 additions & 0 deletions tests/python/unittest/test_runtime_dlpack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,18 @@ def test_from_dlpack_shape_one():
tvm.testing.assert_allclose(c.numpy(), a.numpy() + b.numpy())


@tvm.testing.requires_package("torch")
def test_from_dlpack_strided():
import torch
from torch.utils.dlpack import to_dlpack

rows = 1
inp = torch.randn(rows, 16)
a = tvm.runtime.ndarray.from_dlpack(to_dlpack(inp))
view = a._create_view((2, 8))

np.testing.assert_equal(inp.numpy().reshape(2, 8), view.numpy())


if __name__ == "__main__":
tvm.testing.main()