use irange for loops 10 (#69394)

Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/69394

Modified loops in files under fbsource/fbcode/caffe2/ from the format
```
for(TYPE var=x0;var<x_max;x++)
```
to the format
```
for(const auto var: irange(xmax))
```

This was achieved by running r-barnes's loop upgrader script (D28874212) with some modification to exclude all files under /torch/jit and a number of reversions or unused variable suppression warnings added by hand.

Test Plan: Sandcastle

Reviewed By: malfet

Differential Revision: D32837991

fbshipit-source-id: fc7c4f76d2f32a17a0faf329294b3fe7cb81df32
This commit is contained in:
Richard Barnes
2021-12-09 09:44:04 -08:00
committed by Facebook GitHub Bot
parent 2d5b3101c1
commit afb742382a
11 changed files with 103 additions and 85 deletions
+10 -9
View File
@@ -1,5 +1,6 @@
#include <gtest/gtest.h>
#include <c10/util/irange.h>
#include <torch/torch.h>
#include <test/cpp/api/support.h>
@@ -704,7 +705,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 (size_t i = 0; i < expected.size(); ++i) {
for (const auto i : c10::irange(expected.size())) {
// Assert pointer equality.
ASSERT_EQ(modules[i].get(), expected[i].get());
}
@@ -717,7 +718,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 (size_t i = 0; i < expected.size(); ++i) {
for (const auto i : c10::irange(expected.size())) {
// Assert pointer equality.
ASSERT_EQ(modules[i].get(), expected[i].get());
}
@@ -730,7 +731,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 (size_t i = 0; i < expected.size(); ++i) {
for (const auto i : c10::irange(expected.size())) {
// 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());
@@ -745,7 +746,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 (size_t i = 0; i < expected.size(); ++i) {
for (const auto i : c10::irange(expected.size())) {
// Assert pointer equality.
ASSERT_EQ(modules[i].key(), std::to_string(i));
ASSERT_EQ(modules[i].value().get(), expected[i].get());
@@ -758,7 +759,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 (size_t i = 0; i < expected.size(); ++i) {
for (const auto i : c10::irange(expected.size())) {
// Assert pointer equality.
ASSERT_EQ(modules[i].get(), expected[i].get());
}
@@ -774,7 +775,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 (size_t i = 0; i < expected.size(); ++i) {
for (const auto i : c10::irange(expected.size())) {
// Assert pointer equality.
ASSERT_EQ(modules[i].key(), std::to_string(i));
ASSERT_EQ(modules[i].value().get(), expected[i].get());
@@ -822,7 +823,7 @@ TEST_F(ModuleTest, NamedBuffersReturnsExpectedTensorsForFlatModel) {
struct TestContainer : torch::nn::Module {
TestContainer(int64_t number, std::vector<TestContainer> modules = {})
: tensor(torch::tensor(number)) {
for (size_t i = 0; i < modules.size(); ++i) {
for (const auto i : c10::irange(modules.size())) {
register_module(
std::to_string(i),
std::make_shared<TestContainer>(std::move(modules[i])));
@@ -866,7 +867,7 @@ TEST_F(ModuleTest, ModulesReturnsExpectedSubmodulesForDeepModel) {
std::vector<std::shared_ptr<torch::nn::Module>> modules = model->modules();
ASSERT_EQ(modules.size(), 10);
for (size_t i = 0; i < modules.size(); ++i) {
for (const auto i : c10::irange(modules.size())) {
ASSERT_EQ(get_test_container_item(modules[i]), i);
}
}
@@ -879,7 +880,7 @@ TEST_F(ModuleTest, NamedModulesReturnsExpectedNamedSubmodulesForDeepModel) {
ASSERT_EQ(modules.size(), expected.size());
for (size_t i = 0; i < expected.size(); ++i) {
for (const auto i : c10::irange(expected.size())) {
ASSERT_EQ(modules[i].key(), expected[i].first);
ASSERT_EQ(get_test_container_item(modules[i].value()), expected[i].second);
}