Revert D30652629: use irange for loops

Test Plan: revert-hammer

Differential Revision:
D30652629 (https://github.com/pytorch/pytorch/commit/687c2267d4dfb69138483f90deb4d4f5921a2965)

Original commit changeset: 0ae6c4bbbb55

fbshipit-source-id: 5c4f067b584a021c8c9656454d1ee60999600fb3
This commit is contained in:
Xue Li
2021-10-15 15:19:28 -07:00
committed by Facebook GitHub Bot
parent 1e2b2ee5ff
commit 2f099c7555
487 changed files with 21930 additions and 22184 deletions
+9 -10
View File
@@ -1,6 +1,5 @@
#include <gtest/gtest.h>
#include <c10/util/irange.h>
#include <torch/torch.h>
#include <test/cpp/api/support.h>
@@ -700,7 +699,7 @@ TEST_F(ModuleTest, ModulesReturnsExpectedSubmodulesForFlatModel) {
std::vector<std::shared_ptr<torch::nn::Module>> expected = {
model.ptr(), model[0], model[1], model[2]};
ASSERT_EQ(modules.size(), expected.size());
for (const auto i : c10::irange(expected.size())) {
for (size_t i = 0; i < expected.size(); ++i) {
// Assert pointer equality.
ASSERT_EQ(modules[i].get(), expected[i].get());
}
@@ -713,7 +712,7 @@ TEST_F(ModuleTest, ModulesExcludesSelfWhenIncludeSelfSetToFalse) {
std::vector<std::shared_ptr<torch::nn::Module>> expected = {
model[0], model[1], model[2]};
ASSERT_EQ(modules.size(), expected.size());
for (const auto i : c10::irange(expected.size())) {
for (size_t i = 0; i < expected.size(); ++i) {
// Assert pointer equality.
ASSERT_EQ(modules[i].get(), expected[i].get());
}
@@ -726,7 +725,7 @@ TEST_F(ModuleTest, NamedModulesReturnsExpectedNamedSubmodulesForFlatModel) {
std::vector<std::shared_ptr<torch::nn::Module>> expected = {
model.ptr(), model[0], model[1], model[2]};
ASSERT_EQ(modules.size(), expected.size());
for (const auto i : c10::irange(expected.size())) {
for (size_t i = 0; i < expected.size(); ++i) {
// Assert pointer equality.
ASSERT_EQ(modules[i].key(), i ? std::to_string(i - 1) : std::string());
ASSERT_EQ(modules[i].value().get(), expected[i].get());
@@ -741,7 +740,7 @@ TEST_F(ModuleTest, NamedModulesExcludesSelfWhenIncludeSelfSetToFalse) {
std::vector<std::shared_ptr<torch::nn::Module>> expected = {
model[0], model[1], model[2]};
ASSERT_EQ(modules.size(), expected.size());
for (const auto i : c10::irange(expected.size())) {
for (size_t i = 0; i < expected.size(); ++i) {
// Assert pointer equality.
ASSERT_EQ(modules[i].key(), std::to_string(i));
ASSERT_EQ(modules[i].value().get(), expected[i].get());
@@ -754,7 +753,7 @@ TEST_F(ModuleTest, ChildrenReturnsExpectedSubmodulesForFlatModel) {
std::vector<std::shared_ptr<torch::nn::Module>> expected = {
model[0], model[1], model[2]};
ASSERT_EQ(modules.size(), expected.size());
for (const auto i : c10::irange(expected.size())) {
for (size_t i = 0; i < expected.size(); ++i) {
// Assert pointer equality.
ASSERT_EQ(modules[i].get(), expected[i].get());
}
@@ -770,7 +769,7 @@ TEST_F(ModuleTest, NamedChildrenReturnsExpectedNamedSubmodulesForFlatModel) {
std::vector<std::shared_ptr<torch::nn::Module>> expected = {
model[0], model[1], model[2]};
ASSERT_EQ(modules.size(), expected.size());
for (const auto i : c10::irange(expected.size())) {
for (size_t i = 0; i < expected.size(); ++i) {
// Assert pointer equality.
ASSERT_EQ(modules[i].key(), std::to_string(i));
ASSERT_EQ(modules[i].value().get(), expected[i].get());
@@ -818,7 +817,7 @@ TEST_F(ModuleTest, NamedBuffersReturnsExpectedTensorsForFlatModel) {
struct TestContainer : torch::nn::Module {
TestContainer(int64_t number, std::vector<TestContainer> modules = {})
: tensor(torch::tensor(number)) {
for (const auto i : c10::irange(modules.size())) {
for (size_t i = 0; i < modules.size(); ++i) {
register_module(
std::to_string(i),
std::make_shared<TestContainer>(std::move(modules[i])));
@@ -862,7 +861,7 @@ TEST_F(ModuleTest, ModulesReturnsExpectedSubmodulesForDeepModel) {
std::vector<std::shared_ptr<torch::nn::Module>> modules = model->modules();
ASSERT_EQ(modules.size(), 10);
for (const auto i : c10::irange(modules.size())) {
for (size_t i = 0; i < modules.size(); ++i) {
ASSERT_EQ(get_test_container_item(modules[i]), i);
}
}
@@ -875,7 +874,7 @@ TEST_F(ModuleTest, NamedModulesReturnsExpectedNamedSubmodulesForDeepModel) {
ASSERT_EQ(modules.size(), expected.size());
for (const auto i : c10::irange(expected.size())) {
for (size_t i = 0; i < expected.size(); ++i) {
ASSERT_EQ(modules[i].key(), expected[i].first);
ASSERT_EQ(get_test_container_item(modules[i].value()), expected[i].second);
}