mirror of
https://github.com/pytorch/pytorch.git
synced 2026-11-20 09:04:25 +08:00
Fix F::interpolate and torch::nn::Upsample implementation (#35025)
Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/35025 This PR fixes `F::interpolate` and `torch::nn::Upsample` implementation to match the Python API implementation. **This PR is BC-breaking in the following way:** There are changes to `UpsampleOptions` and `InterpolateFuncOptions`: - `size` is changed from `std::vector<int64_t>` to `c10::optional<std::vector<int64_t>>`. If you want to pass a list of `int64_t` to this argument, you must pass it as `std::vector<int64_t>`. - `scale_factor` is changed from `std::vector<double>` to `c10::optional<std::vector<double>>`. If you want to pass a list of `double` to this argument, you must pass it as `std::vector<double>`. **TODO**: cherry-pick this PR into v1.5 release branch. Test Plan: Imported from OSS Differential Revision: D20559892 Pulled By: yf225 fbshipit-source-id: ac18609e351a9f2931eaeced8966b9491b2995f7
This commit is contained in:
committed by
Facebook GitHub Bot
parent
c0958c883e
commit
a2557970f3
@@ -1875,7 +1875,7 @@ TEST_F(FunctionalTest, Interpolate) {
|
||||
// 1D interpolation
|
||||
auto input = torch::ones({1, 1, 2});
|
||||
auto options = F::InterpolateFuncOptions()
|
||||
.size({4})
|
||||
.size(std::vector<int64_t>({4}))
|
||||
.mode(torch::kNearest);
|
||||
auto output = F::interpolate(input, options);
|
||||
auto expected = torch::ones({1, 1, 4});
|
||||
@@ -1889,7 +1889,7 @@ TEST_F(FunctionalTest, Interpolate) {
|
||||
for (const auto scale_factor : {0.5, 1.5, 2.0}) {
|
||||
auto input = torch::ones({1, 1, 2, 2});
|
||||
auto options = F::InterpolateFuncOptions()
|
||||
.scale_factor({scale_factor, scale_factor})
|
||||
.scale_factor(std::vector<double>({scale_factor, scale_factor}))
|
||||
.mode(torch::kBilinear)
|
||||
.align_corners(align_corners);
|
||||
auto output = F::interpolate(input, options);
|
||||
@@ -1908,7 +1908,7 @@ TEST_F(FunctionalTest, Interpolate) {
|
||||
auto input = torch::ones({1, 1, 2, 2, 2});
|
||||
auto options =
|
||||
F::InterpolateFuncOptions()
|
||||
.scale_factor({scale_factor, scale_factor, scale_factor})
|
||||
.scale_factor(std::vector<double>({scale_factor, scale_factor, scale_factor}))
|
||||
.mode(torch::kTrilinear)
|
||||
.align_corners(align_corners);
|
||||
auto output = F::interpolate(input, options);
|
||||
@@ -1924,13 +1924,13 @@ TEST_F(FunctionalTest, Interpolate) {
|
||||
{
|
||||
auto input = torch::randn({3, 2, 2});
|
||||
ASSERT_THROWS_WITH(
|
||||
F::interpolate(input[0], F::InterpolateFuncOptions().size({4, 4})),
|
||||
F::interpolate(input[0], F::InterpolateFuncOptions().size(std::vector<int64_t>({4, 4}))),
|
||||
"Input Error: Only 3D, 4D and 5D input Tensors supported (got 2D) "
|
||||
"for the modes: nearest | linear | bilinear | bicubic | trilinear (got kNearest)");
|
||||
ASSERT_THROWS_WITH(
|
||||
F::interpolate(
|
||||
torch::reshape(input, {1, 1, 1, 3, 2, 2}),
|
||||
F::InterpolateFuncOptions().size({1, 1, 1, 3, 4, 4})),
|
||||
F::InterpolateFuncOptions().size(std::vector<int64_t>({1, 1, 1, 3, 4, 4}))),
|
||||
"Input Error: Only 3D, 4D and 5D input Tensors supported (got 6D) "
|
||||
"for the modes: nearest | linear | bilinear | bicubic | trilinear (got kNearest)");
|
||||
ASSERT_THROWS_WITH(
|
||||
@@ -1939,12 +1939,12 @@ TEST_F(FunctionalTest, Interpolate) {
|
||||
ASSERT_THROWS_WITH(
|
||||
F::interpolate(
|
||||
input,
|
||||
F::InterpolateFuncOptions().size({3, 4, 4}).scale_factor({0.5})),
|
||||
F::InterpolateFuncOptions().size(std::vector<int64_t>({3, 4, 4})).scale_factor(std::vector<double>({0.5}))),
|
||||
"only one of size or scale_factor should be defined");
|
||||
ASSERT_THROWS_WITH(
|
||||
F::interpolate(input, F::InterpolateFuncOptions().scale_factor({3, 2})),
|
||||
F::interpolate(input, F::InterpolateFuncOptions().scale_factor(std::vector<double>({3, 2}))),
|
||||
"scale_factor shape must match input shape. "
|
||||
"Input is 1D, scale_factor size is 2");
|
||||
"Input is 1D, scale_factor size is [3, 2]");
|
||||
ASSERT_THROWS_WITH(
|
||||
F::interpolate(
|
||||
input,
|
||||
|
||||
Reference in New Issue
Block a user