Skip to content

[Backport]Handle negative dim for Diagonal Scatter (#6123) #6129

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
merged 1 commit into from
Dec 13, 2023
Merged

[Backport]Handle negative dim for Diagonal Scatter (#6123) #6129

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions test/test_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,6 +1200,13 @@ def test_fn(a):

self.runAtenTest(torch.rand(4, 3), test_fn)

def test_diagonal_scatter_negative_dim(self):

def test_fn(input, src):
return torch.diagonal_scatter(input, src, 0, dim1=-1, dim2=0)

self.runAtenTest([torch.zeros(3, 3), torch.ones(3)], test_fn)

def test_scatter_add_bool(self):
xla_device = xm.xla_device()
a = torch.tensor([[True, True, True, True, True],
Expand Down
9 changes: 7 additions & 2 deletions torch_xla/csrc/aten_xla_type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,10 +1105,15 @@ at::Tensor XLANativeFunctions::diagonal_scatter(const at::Tensor& base,
int64_t dim2) {
auto base_ = bridge::GetXlaTensor(base);
auto mutated_view_ = bridge::GetXlaTensor(mutated_view);
int64_t base_rank = bridge::GetXlaTensor(base)->shape().get().rank();
int64_t canonical_dim1 =
torch::lazy::GetCanonicalDimensionIndex(dim1, base_rank);
int64_t canonical_dim2 =
torch::lazy::GetCanonicalDimensionIndex(dim2, base_rank);
return bridge::AtenFromXlaTensor(
base_->CreateFrom(torch::lazy::MakeNode<DiagonalViewUpdate>(
base_->GetIrValue(), mutated_view_->GetIrValue(), offset, dim1,
dim2)));
base_->GetIrValue(), mutated_view_->GetIrValue(), offset,
canonical_dim1, canonical_dim2)));
}

at::Tensor XLANativeFunctions::div(const at::Tensor& self,
Expand Down