Skip to content
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

Jump to bottom

Fix nuclear norm with requires_grad=True #26303

Closed
wants to merge 7 commits into from
Closed

Fix nuclear norm with requires_grad=True #26303

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa116fb
Fix nuclear norm with requires_grad=True
vishwakftw Sep 16, 2019
04d0a53
Code Review - I: accommodate GradMode
vishwakftw Sep 17, 2019
aeeb5fa
Merge remote-tracking branch 'origin/master' into HEAD
Sep 19, 2019
1499bc5
Merge remote-tracking branch 'origin/master' into HEAD
Sep 22, 2019
a808722
Merge remote-tracking branch 'origin/master' into HEAD
Sep 24, 2019
d93518e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 24, 2019
3444f14
Merge remote-tracking branch 'origin/master' into HEAD
Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions aten/src/ATen/native/LinearAlgebra.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,29 +546,29 @@ Tensor nuclear_norm(const Tensor& self, bool keepdim) {
self.dim() == 2,
"Expected a tensor with 2 dimensions, but got a tensor with ",
self.dim(), " dimension", self.dim()==1 ? "" : "s", " instead.");
return at::sum(std::get<1>(at::svd(self)), 0, keepdim);
return at::sum(std::get<1>(at::svd(self, /*some=*/true, /*compute_uv=*/self.requires_grad())), 0, keepdim);
}

Tensor &nuclear_norm_out(Tensor& result, const Tensor& self, bool keepdim) {
TORCH_CHECK(
self.dim() == 2,
"Expected a tensor with 2 dimensions, but got a tensor with ",
self.dim(), " dimension", self.dim()==1 ? "" : "s", " instead.");
return at::sum_out(result, std::get<1>(at::svd(self)), 0, keepdim);
return at::sum_out(result, std::get<1>(at::svd(self, /*some=*/true, /*compute_uv=*/self.requires_grad())), 0, keepdim);
}

Tensor nuclear_norm(const Tensor& self, IntArrayRef dim, bool keepdim) {
TORCH_CHECK(dim.size() == 2, "nuclear norm requires a 'dim' argument of size 2");

Tensor p = _move_to_end(self, dim);
return at::sum(std::get<1>(at::svd(p, /*some=*/true, /*compute_uv=*/false)), -1, keepdim);
return at::sum(std::get<1>(at::svd(p, /*some=*/true, /*compute_uv=*/self.requires_grad())), -1, keepdim);
}

Tensor& nuclear_norm_out(Tensor& result, const Tensor& self, IntArrayRef dim, bool keepdim) {
TORCH_CHECK(dim.size() == 2, "nuclear norm requires a 'dim' argument of size 2");

Tensor p = _move_to_end(self, dim);
return at::sum_out(result, std::get<1>(at::svd(p, /*some=*/true, /*compute_uv=*/false)), -1, keepdim);
return at::sum_out(result, std::get<1>(at::svd(p, /*some=*/true, /*compute_uv=*/self.requires_grad())), -1, keepdim);
vishwakftw marked this conversation as resolved.
Show resolved Hide resolved
}

static inline Tensor _chain_matmul_general(TensorList matrices, std::vector<std::vector<int64_t>>& order, int64_t i, int64_t j) {
Expand Down
1 change: 1 addition & 0 deletions test/common_methods_invocations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,7 @@ def method_tests():
('norm', (S, S), ('fro',), 'fro_default'),
('norm', (S, S), ('fro', [0, 1],), 'fro'),
('norm', (S, S), ('nuc',), 'nuc', (), NO_ARGS, [skipIfNoLapack]),
('norm', (S, S, S), ('nuc', [1, 2]), 'nuc_batched', (), NO_ARGS, [skipIfNoLapack]),
('norm', (S, S), (-1,), 'neg_1'),
('norm', (S, S), (-2,), 'neg_2'),
('norm', (S, S), (-0.5,), 'neg_0_5'),
Expand Down