Skip to content

[Second Try] [BC-breaking] Shallow-copy indices and values in sparse tensor ctor #20614

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
yf225 wants to merge 12 commits into from
Closed

[Second Try] [BC-breaking] Shallow-copy indices and values in sparse tensor ctor #20614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
634863f
[WIP]
May 9, 2019
084cfe2
better comments
May 15, 2019
5b193ec
fix shallow_copy_and_detach
May 16, 2019
d658b34
add test
May 16, 2019
f69015b
Merge branch 'master' of https://github.com/yf225/pytorch into sparse…
May 16, 2019
c2df590
test indices
May 16, 2019
43b88d1
Fix test
May 16, 2019
797725a
Fix test
May 16, 2019
2f78477
Fix test
May 16, 2019
4cacc72
fix cuda test
May 16, 2019
1e8f503
more fix
May 16, 2019
7994243
more fix
May 16, 2019
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
12 changes: 10 additions & 2 deletions aten/src/ATen/native/sparse/SparseTensor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ SparseTensor new_with_dims_sparse(int64_t sparse_dim, int64_t dense_dim, ArrayRe
return self;
}

// Does NOT make copies of indices and values
SparseTensor new_with_dims_and_tensor_sparse(
int64_t sparse_dim,
int64_t dense_dim,
Expand All @@ -101,7 +100,16 @@ SparseTensor new_with_dims_and_tensor_sparse(
const TensorOptions& options) {
SparseTensor self = new_sparse(options);
get_sparse_impl(self)->resize_(sparse_dim, dense_dim, size);
alias_into_sparse(self, indices, values);
// NOTE: There is no guarantee that `indices` and `values` don't contain AutogradMeta. However,
// we want to maintain the invariant that `indices_` and `values_` of a sparse tensor don't
// contain AutogradMeta, and to achieve that we shallow-copy `indices` and `values` here.
auto indices_shallow_copy = LongTensor(indices.unsafeGetTensorImpl()->shallow_copy_and_detach(
/*version_counter=*/indices.unsafeGetTensorImpl()->version_counter(),
/*allow_tensor_metadata_change=*/true));
auto values_shallow_copy = Tensor(values.unsafeGetTensorImpl()->shallow_copy_and_detach(
/*version_counter=*/values.unsafeGetTensorImpl()->version_counter(),
/*allow_tensor_metadata_change=*/true));
alias_into_sparse(self, indices_shallow_copy, values_shallow_copy);
return self;
}

Expand Down
41 changes: 41 additions & 0 deletions test/test_sparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1957,6 +1957,47 @@ def do_test(t):
do_test(self.sparse_empty(3, 0).data)
do_test(self.sparse_empty(3, 0).detach())

def test_change_tensor_metadata(self):
i = self.index_tensor([[0], [1]])
v = self.value_tensor([[3, 4, 5]])
t = torch.sparse_coo_tensor(i, v, torch.Size([1, 2, 3]))
i.resize_(2, 3)
v.resize_(4, 5)
self.assertEqual(list(t.coalesce().indices().size()), [2, 1])
self.assertEqual(list(t.coalesce().values().size()), [1, 3])

i = self.index_tensor([[0], [1]])
v = self.value_tensor([[3, 4, 5]])
t = torch.sparse_coo_tensor(i, v, torch.Size([1, 2, 3]))
i.resize_as_(self.index_tensor([0, 1]))
v.resize_as_(self.value_tensor([3, 4, 5]))
self.assertEqual(list(t.coalesce().indices().size()), [2, 1])
self.assertEqual(list(t.coalesce().values().size()), [1, 3])

i = self.index_tensor([[0], [1]])
v = self.value_tensor([[3, 4, 5]])
t = torch.sparse_coo_tensor(i, v, torch.Size([1, 2, 3]))
i.as_strided_((2, 1), (1, 1))
v.as_strided_((1, 3), (1, 1))
self.assertEqual(list(t.coalesce().indices().size()), [2, 1])
self.assertEqual(list(t.coalesce().values().size()), [1, 3])

i = self.index_tensor([[0], [1]])
v = self.value_tensor([[3, 4, 5]])
t = torch.sparse_coo_tensor(i, v, torch.Size([1, 2, 3]))
i.set_(self.index_tensor([0, 1]))
v.set_(self.value_tensor([3, 4, 5]))
self.assertEqual(list(t.coalesce().indices().size()), [2, 1])
self.assertEqual(list(t.coalesce().values().size()), [1, 3])

i = self.index_tensor([[0], [1]])
v = self.value_tensor([[3, 4, 5]])
t = torch.sparse_coo_tensor(i, v, torch.Size([1, 2, 3]))
i.transpose_(0, 1)
v.transpose_(0, 1)
self.assertEqual(list(t.coalesce().indices().size()), [2, 1])
self.assertEqual(list(t.coalesce().values().size()), [1, 3])


class TestUncoalescedSparse(TestSparse):
def setUp(self):
Expand Down