[fix] Dropout2d-3d no-batch-dim (#69885)

Summary:
Fixes https://github.com/pytorch/pytorch/issues/69801

TODO:
* [x] Update C++ API

cc albanD mruberry jbschlosser walterddr kshitij12345

Pull Request resolved: https://github.com/pytorch/pytorch/pull/69885

Reviewed By: mruberry

Differential Revision: D33175470

Pulled By: jbschlosser

fbshipit-source-id: c9d7d9e0f59ba290a0157725c338a345f3d58b9f
(cherry picked from commit 7e4271a156)
This commit is contained in:
kshitij12345
2022-02-02 08:30:25 -08:00
committed by PyTorch MergeBot
parent 39483b5918
commit 02f6226bff
8 changed files with 164 additions and 60 deletions
+4 -8
View File
@@ -2622,35 +2622,31 @@ TEST_F(FunctionalTest, Dropout) {
}
TEST_F(FunctionalTest, Dropout2d) {
auto input = torch::randn({50, 100});
auto input = torch::randn({2, 2, 50, 100});
auto input_mean = input.mean();
auto input_std = input.std();
for (const auto rate : {0.2, 0.5, 0.8}) {
auto output = F::dropout2d(input, F::Dropout2dFuncOptions().p(rate));
ASSERT_TRUE(torch::allclose(input_mean, output.mean(), 0.01, 0.05));
ASSERT_TRUE((input_std <= output.std()).all().item<bool>());
}
auto output = F::dropout2d(input);
ASSERT_TRUE(torch::allclose(input_mean, output.mean(), 0.01, 0.05));
ASSERT_TRUE((input_std <= output.std()).all().item<bool>());
ASSERT_TRUE(F::dropout2d(torch::randn({50, 100})).defined());
ASSERT_TRUE(F::dropout2d(torch::randn({2, 50, 100})).defined());
}
TEST_F(FunctionalTest, Dropout3d) {
auto input = torch::randn({50, 10, 10});
auto input = torch::randn({2, 2, 50, 10, 10});
auto input_mean = input.mean();
auto input_std = input.std();
for (const auto rate : {0.2, 0.5, 0.8}) {
auto output = F::dropout3d(input, F::Dropout3dFuncOptions().p(rate));
ASSERT_TRUE(torch::allclose(input_mean, output.mean(), 0.01, 0.05));
ASSERT_TRUE((input_std <= output.std()).all().item<bool>());
}
auto output = F::dropout3d(input);
ASSERT_TRUE(torch::allclose(input_mean, output.mean(), 0.01, 0.05));
ASSERT_TRUE((input_std <= output.std()).all().item<bool>());
ASSERT_TRUE(F::dropout3d(torch::randn({50, 100})).defined());
ASSERT_TRUE(F::dropout3d(torch::randn({2, 50, 10, 10})).defined());
}
template<c10::ScalarType S, typename T>