Make PyTorch code-base clang-tidy compliant (#56892)

Summary:
This is an automatic change generated by the following script:
```
#!/usr/bin/env python3
from subprocess import check_output, check_call
import os

def get_compiled_files_list():
    import json
    with open("build/compile_commands.json") as f:
        data = json.load(f)
    files = [os.path.relpath(node['file']) for node in data]
    for idx, fname in enumerate(files):
        if fname.startswith('build/') and fname.endswith('.DEFAULT.cpp'):
            files[idx] = fname[len('build/'):-len('.DEFAULT.cpp')]
    return files

def run_clang_tidy(fname):
    check_call(["python3", "tools/clang_tidy.py", "-c", "build", "-x", fname,"-s"])
    changes = check_output(["git", "ls-files", "-m"])
    if len(changes) == 0:
        return
    check_call(["git", "commit","--all", "-m", f"NOLINT stubs for {fname}"])

def main():
    git_files = check_output(["git", "ls-files"]).decode("ascii").split("\n")
    compiled_files = get_compiled_files_list()
    for idx, fname in enumerate(git_files):
        if fname not in compiled_files:
            continue
        if fname.startswith("caffe2/contrib/aten/"):
            continue
        print(f"[{idx}/{len(git_files)}] Processing {fname}")
        run_clang_tidy(fname)

if __name__ == "__main__":
    main()
```

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

Reviewed By: H-Huang

Differential Revision: D27991944

Pulled By: malfet

fbshipit-source-id: 5415e1eb2c1b34319a4f03024bfaa087007d7179
This commit is contained in:
Nikita Shulga
2021-04-28 14:09:06 -07:00
committed by Facebook GitHub Bot
parent 5a10ee71d6
commit 4cb534f92e
1327 changed files with 20540 additions and 148 deletions
+107
View File
@@ -18,6 +18,7 @@ struct AGIUnit2 : torch::nn::Module {
struct ModuleTest : torch::test::SeedingFixture {};
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, CanEnableAndDisableTrainingMode) {
Linear module(3, 4);
ASSERT_TRUE(module->is_training());
@@ -29,28 +30,35 @@ TEST_F(ModuleTest, CanEnableAndDisableTrainingMode) {
ASSERT_TRUE(module->is_training());
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ZeroGrad) {
Linear module(3, 4);
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
auto weight = torch::ones({8, 3}, torch::requires_grad());
auto loss = module(weight).sum();
loss.backward();
for (auto& parameter : module->parameters()) {
// NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
auto grad = parameter.grad();
ASSERT_TRUE(grad.defined());
ASSERT_NE(grad.sum().item<float>(), 0);
}
module->zero_grad();
for (auto& parameter : module->parameters()) {
// NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
auto grad = parameter.grad();
ASSERT_TRUE(grad.defined());
ASSERT_EQ(grad.sum().item<float>(), 0);
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ZeroGradWithUndefined) {
struct TestModule : torch::nn::Module {
TestModule() {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
x = register_parameter("x", torch::ones(5, torch::requires_grad()));
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
y = register_parameter("y", torch::ones(5, torch::requires_grad()));
}
torch::Tensor x, y;
@@ -71,6 +79,7 @@ TEST_F(ModuleTest, ZeroGradWithUndefined) {
ASSERT_EQ(module.x.grad().sum().item<float>(), 0);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, RegisterModuleThrowsForEmptyOrDottedName) {
struct TestModel : public torch::nn::Module {};
ASSERT_THROWS_WITH(
@@ -81,6 +90,7 @@ TEST_F(ModuleTest, RegisterModuleThrowsForEmptyOrDottedName) {
"Submodule name must not be empty");
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, RegisterModuleThrowsForDuplicateModuleName) {
struct TestModel : public torch::nn::Module {};
TestModel model;
@@ -90,6 +100,7 @@ TEST_F(ModuleTest, RegisterModuleThrowsForDuplicateModuleName) {
"Submodule 'linear' already defined");
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ReplaceModuleThrowsForUnknownModuleName) {
torch::nn::Module model;
ASSERT_THROWS_WITH(
@@ -97,6 +108,7 @@ TEST_F(ModuleTest, ReplaceModuleThrowsForUnknownModuleName) {
"Submodule 'linear' is not defined");
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ReplaceModule) {
struct TestModel : public torch::nn::Module {
torch::nn::Linear l1{nullptr};
@@ -105,11 +117,13 @@ TEST_F(ModuleTest, ReplaceModule) {
}
};
auto model = std::make_shared<TestModel>();
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
model->l1 = model->replace_module("l1", torch::nn::Linear(5, 6));
ASSERT_EQ(model->named_parameters()["l1.weight"].size(0), 6);
ASSERT_EQ(model->l1.get(), model->named_modules()["l1"]->as<Linear>());
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, UnregisterModule) {
struct TestModel : public torch::nn::Module {};
TestModel model;
@@ -121,6 +135,7 @@ TEST_F(ModuleTest, UnregisterModule) {
ASSERT_TRUE(model.children().empty());
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, RegisterParameterThrowsForEmptyOrDottedName) {
struct TestModel : public torch::nn::Module {};
ASSERT_THROWS_WITH(
@@ -131,15 +146,18 @@ TEST_F(ModuleTest, RegisterParameterThrowsForEmptyOrDottedName) {
"Parameter name must not be empty");
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, RegisterParameterThrowsForDuplicateModuleName) {
struct TestModel : public torch::nn::Module {};
TestModel model;
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
model.register_parameter("p", torch::ones(5));
ASSERT_THROWS_WITH(
model.register_parameter("p", torch::ones(5)),
"Parameter 'p' already defined");
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, RegisterParameterUndefinedTensor) {
struct TestModel : public torch::nn::Module {};
{
@@ -163,6 +181,7 @@ TEST_F(ModuleTest, RegisterParameterUndefinedTensor) {
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, RegisterBufferThrowsForEmptyOrDottedName) {
struct TestModel : public torch::nn::Module {};
ASSERT_THROWS_WITH(
@@ -173,14 +192,17 @@ TEST_F(ModuleTest, RegisterBufferThrowsForEmptyOrDottedName) {
"Buffer name must not be empty");
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, RegisterBufferThrowsForDuplicateModuleName) {
struct TestModel : public torch::nn::Module {};
TestModel model;
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
model.register_buffer("p", torch::ones(5));
ASSERT_THROWS_WITH(
model.register_buffer("p", torch::ones(5)), "Buffer 'p' already defined");
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, CanGetName) {
// CHECK instead of REQUIRE because demangling may fail.
AGIUnit agi;
@@ -192,6 +214,7 @@ TEST_F(ModuleTest, CanGetName) {
EXPECT_EQ(test::AGIUnit2().name(), "Foo");
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, AsCastsModulesCorrectly) {
Linear module(3, 4);
ASSERT_EQ(module->as<Linear>(), module.get());
@@ -224,6 +247,7 @@ void test_DeviceOrDtypeConversionSkipsUndefinedTensor(
torch::Device to_device, torch::Dtype to_dtype) {
{
// Case 1: Undefined tensors as parameters
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
Linear module(LinearOptions(10, 20).bias(false));
ASSERT_TRUE(module->weight.defined());
ASSERT_FALSE(module->bias.defined());
@@ -240,6 +264,7 @@ void test_DeviceOrDtypeConversionSkipsUndefinedTensor(
}
{
// Case 2: Undefined tensors as buffers
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
BatchNorm1d module(BatchNorm1dOptions(5).track_running_stats(false).affine(true));
ASSERT_TRUE(module->weight.defined());
ASSERT_FALSE(module->running_mean.defined());
@@ -256,16 +281,20 @@ void test_DeviceOrDtypeConversionSkipsUndefinedTensor(
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, DeviceOrDtypeConversionSkipsUndefinedTensor) {
test_DeviceOrDtypeConversionSkipsUndefinedTensor(torch::kCPU, torch::kDouble);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, DeviceOrDtypeConversionSkipsUndefinedTensor_CUDA) {
test_DeviceOrDtypeConversionSkipsUndefinedTensor(torch::kCUDA, torch::kDouble);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ParametersAndBuffersAccessorSkipsUndefinedTensor) {
{
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
Linear module(LinearOptions(10, 20).bias(false));
auto params = module->parameters();
@@ -277,6 +306,7 @@ TEST_F(ModuleTest, ParametersAndBuffersAccessorSkipsUndefinedTensor) {
ASSERT_TRUE(pointer_equal(named_params["weight"], module->weight));
}
{
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
BatchNorm1d module(BatchNorm1dOptions(5).track_running_stats(false).affine(false));
auto buffers = module->buffers();
@@ -285,6 +315,7 @@ TEST_F(ModuleTest, ParametersAndBuffersAccessorSkipsUndefinedTensor) {
ASSERT_EQ(named_buffers.size(), 0);
}
{
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
BatchNorm1d module(BatchNorm1dOptions(5).track_running_stats(true).affine(false));
auto buffers = module->buffers();
@@ -301,7 +332,9 @@ TEST_F(ModuleTest, ParametersAndBuffersAccessorSkipsUndefinedTensor) {
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, Conversion_MultiCUDA) {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
Linear module(128, 64);
for (auto& parameter : module->parameters()) {
ASSERT_EQ(parameter.device(), torch::Device(torch::kCPU));
@@ -349,12 +382,14 @@ TEST_F(ModuleTest, Conversion_MultiCUDA) {
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, CallingCloneOnModuleThatDoesNotOverrideCloneThrows) {
struct UnCloneable : Module {};
UnCloneable module;
ASSERT_THROWS_WITH(module.clone(), "clone() has not been implemented");
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, CallingCloneOnModuleThatDoesOverrideCloneDoesNotThrow) {
struct Cloneable : Module {
std::shared_ptr<Module> clone(
@@ -364,17 +399,23 @@ TEST_F(ModuleTest, CallingCloneOnModuleThatDoesOverrideCloneDoesNotThrow) {
}
};
Cloneable module;
// NOLINTNEXTLINE(hicpp-avoid-goto,cppcoreguidelines-avoid-goto)
ASSERT_NO_THROW({ module.clone(); });
}
// NOLINTNEXTLINE(bugprone-exception-escape)
struct TestDistinctParametersModule
: public Cloneable<TestDistinctParametersModule> {
TestDistinctParametersModule() {
// NOLINTNEXTLINE(clang-analyzer-optin.cplusplus.VirtualCall)
reset();
}
void reset() override {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
l1 = register_module("l1", Linear(10, 3));
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
l2 = register_module("l2", Linear(3, 5));
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
l3 = register_module("l3", Linear(5, 100));
buffer = register_buffer("buf", torch::ones({2, 2}));
}
@@ -411,6 +452,7 @@ void testDistinctParameters(std::shared_ptr<Module> m1, std::shared_ptr<Module>
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, CloneCreatesDistinctParameters) {
auto module = std::make_shared<TestDistinctParametersModule>();
torch::NoGradGuard no_grad;
@@ -418,6 +460,7 @@ TEST_F(ModuleTest, CloneCreatesDistinctParameters) {
testDistinctParameters(module, module2);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, CloneCreatesDistinctParametersExplicitDevice_CUDA) {
auto module = std::make_shared<TestDistinctParametersModule>();
torch::NoGradGuard no_grad;
@@ -427,6 +470,7 @@ TEST_F(ModuleTest, CloneCreatesDistinctParametersExplicitDevice_CUDA) {
testDistinctParameters(module, module2);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, CloneCreatesDistinctParametersExplicitDevice_MultiCUDA) {
auto module = std::make_shared<TestDistinctParametersModule>();
torch::NoGradGuard no_grad;
@@ -449,9 +493,12 @@ TEST_F(ModuleTest, CloneCreatesDistinctParametersExplicitDevice_MultiCUDA) {
testDistinctParameters(module, module2);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ClonePreservesExternalReferences) {
// NOLINTNEXTLINE(bugprone-exception-escape)
struct TestModule : public Cloneable<TestModule> {
TestModule() {
// NOLINTNEXTLINE(clang-analyzer-optin.cplusplus.VirtualCall)
reset();
}
void reset() override {
@@ -479,9 +526,12 @@ TEST_F(ModuleTest, ClonePreservesExternalReferences) {
pointer_equal(module2->weight, module->named_parameters()["weight"]));
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, CloneCopiesTheValuesOfVariablesOfSubmodules) {
// NOLINTNEXTLINE(bugprone-exception-escape)
struct TestModule : public Cloneable<TestModule> {
TestModule() {
// NOLINTNEXTLINE(clang-analyzer-optin.cplusplus.VirtualCall)
reset();
}
void reset() override {
@@ -491,8 +541,10 @@ TEST_F(ModuleTest, CloneCopiesTheValuesOfVariablesOfSubmodules) {
torch::Tensor weight;
int value = 0;
};
// NOLINTNEXTLINE(bugprone-exception-escape)
struct NestedModule : public Cloneable<NestedModule> {
NestedModule() {
// NOLINTNEXTLINE(clang-analyzer-optin.cplusplus.VirtualCall)
reset();
}
void reset() override {
@@ -505,6 +557,7 @@ TEST_F(ModuleTest, CloneCopiesTheValuesOfVariablesOfSubmodules) {
{
torch::NoGradGuard no_grad;
a->module->weight += 1;
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
a->module->value = 123;
}
@@ -519,14 +572,20 @@ TEST_F(ModuleTest, CloneCopiesTheValuesOfVariablesOfSubmodules) {
ASSERT_EQ(b->module->value, a->module->value);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, CloneToDevicePreservesTheDeviceOfParameters_CUDA) {
// NOLINTNEXTLINE(bugprone-exception-escape)
struct TestModule : public Cloneable<TestModule> {
TestModule() {
// NOLINTNEXTLINE(clang-analyzer-optin.cplusplus.VirtualCall)
reset();
}
void reset() override {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
l1 = register_module("l1", Linear(10, 3));
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
l2 = register_module("l2", Linear(3, 5));
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
l3 = register_module("l3", Linear(5, 100));
buffer = register_buffer("buf", torch::ones({2, 2}));
}
@@ -551,16 +610,22 @@ TEST_F(ModuleTest, CloneToDevicePreservesTheDeviceOfParameters_CUDA) {
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(
ModuleTest,
CloningToAParticularDevicePlacesAllParametersThere_MultiCUDA) {
// NOLINTNEXTLINE(bugprone-exception-escape)
struct TestModule : public Cloneable<TestModule> {
TestModule() {
// NOLINTNEXTLINE(clang-analyzer-optin.cplusplus.VirtualCall)
reset();
}
void reset() override {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
l1 = register_module("l1", Linear(10, 3));
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
l2 = register_module("l2", Linear(3, 5));
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
l3 = register_module("l3", Linear(5, 100));
buffer = register_buffer("buf", torch::ones({2, 2}));
}
@@ -593,12 +658,14 @@ struct ParameterTestModule : Module {
torch::Tensor a, b, c;
};
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, HasCorrectNumberOfParameters) {
ParameterTestModule module;
ASSERT_EQ(module.parameters().size(), 3);
ASSERT_EQ(module.named_parameters().size(), 3);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ContainsParametersWithTheCorrectName) {
ParameterTestModule module;
auto parameters = module.named_parameters();
@@ -617,12 +684,14 @@ struct BufferTestModule : Module {
torch::Tensor a, b, c;
};
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, HasCorrectNumberOfBuffers) {
BufferTestModule module;
ASSERT_EQ(module.buffers().size(), 3);
ASSERT_EQ(module.named_buffers().size(), 3);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ContainsBuffersWithTheCorrectName) {
BufferTestModule module;
auto buffers = module.named_buffers();
@@ -632,12 +701,14 @@ TEST_F(ModuleTest, ContainsBuffersWithTheCorrectName) {
}
struct AImpl : torch::nn::Module {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
AImpl() : x_(123) {}
AImpl(int x) : x_(x) {}
int x_;
};
TORCH_MODULE(A);
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(
ModuleTest,
DefaultConstructorOfModuleHolderCallsDefaultConstructorOfImpl) {
@@ -647,15 +718,18 @@ TEST_F(
ASSERT_EQ(a->x_, 123);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(
ModuleTest,
ValueConstructorOfModuleHolderCallsCorrectConstructorInImpl) {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
A a(5);
ASSERT_TRUE(a);
ASSERT_FALSE(a.is_empty());
ASSERT_EQ(a->x_, 5);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, NullptrConstructorLeavesTheModuleHolderInEmptyState) {
A a = nullptr;
ASSERT_FALSE(a);
@@ -678,6 +752,7 @@ struct TestModule : public torch::nn::Module {
torch::Tensor p1, p2, b1, b2;
};
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ModulesReturnsExpectedSubmodulesForFlatModel) {
torch::nn::Sequential model(TestModule(1), TestModule(2), TestModule(3));
std::vector<std::shared_ptr<torch::nn::Module>> modules = model->modules();
@@ -690,6 +765,7 @@ TEST_F(ModuleTest, ModulesReturnsExpectedSubmodulesForFlatModel) {
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ModulesExcludesSelfWhenIncludeSelfSetToFalse) {
torch::nn::Sequential model(TestModule(1), TestModule(2), TestModule(3));
std::vector<std::shared_ptr<torch::nn::Module>> modules =
@@ -703,6 +779,7 @@ TEST_F(ModuleTest, ModulesExcludesSelfWhenIncludeSelfSetToFalse) {
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, NamedModulesReturnsExpectedNamedSubmodulesForFlatModel) {
torch::nn::Sequential model(TestModule(1), TestModule(2), TestModule(3));
torch::OrderedDict<std::string, std::shared_ptr<torch::nn::Module>> modules =
@@ -717,6 +794,7 @@ TEST_F(ModuleTest, NamedModulesReturnsExpectedNamedSubmodulesForFlatModel) {
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, NamedModulesExcludesSelfWhenIncludeSelfSetToFalse) {
torch::nn::Sequential model(TestModule(1), TestModule(2), TestModule(3));
torch::OrderedDict<std::string, std::shared_ptr<torch::nn::Module>> modules =
@@ -732,6 +810,7 @@ TEST_F(ModuleTest, NamedModulesExcludesSelfWhenIncludeSelfSetToFalse) {
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ChildrenReturnsExpectedSubmodulesForFlatModel) {
torch::nn::Sequential model(TestModule(1), TestModule(2), TestModule(3));
std::vector<std::shared_ptr<torch::nn::Module>> modules = model->children();
@@ -747,6 +826,7 @@ TEST_F(ModuleTest, ChildrenReturnsExpectedSubmodulesForFlatModel) {
ASSERT_EQ(modules, model->modules(/*include_self=*/false));
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, NamedChildrenReturnsExpectedNamedSubmodulesForFlatModel) {
torch::nn::Sequential model(TestModule(1), TestModule(2), TestModule(3));
torch::OrderedDict<std::string, std::shared_ptr<torch::nn::Module>> modules =
@@ -761,6 +841,7 @@ TEST_F(ModuleTest, NamedChildrenReturnsExpectedNamedSubmodulesForFlatModel) {
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ParametersReturnsExpectedTensorsForFlatModel) {
TestModule module(1);
std::vector<torch::Tensor> parameters = module.parameters();
@@ -769,6 +850,7 @@ TEST_F(ModuleTest, ParametersReturnsExpectedTensorsForFlatModel) {
ASSERT_EQ(parameters[1].data_ptr<float>(), module.p2.data_ptr<float>());
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, NamedParametersReturnsExpectedTensorsForFlatModel) {
TestModule module(1);
torch::OrderedDict<std::string, torch::Tensor> parameters =
@@ -780,6 +862,7 @@ TEST_F(ModuleTest, NamedParametersReturnsExpectedTensorsForFlatModel) {
ASSERT_EQ(parameters[1]->data_ptr<float>(), module.p2.data_ptr<float>());
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, BuffersReturnsExpectedTensorsForFlatModel) {
TestModule module(1);
std::vector<torch::Tensor> buffers = module.buffers();
@@ -788,6 +871,7 @@ TEST_F(ModuleTest, BuffersReturnsExpectedTensorsForFlatModel) {
ASSERT_EQ(buffers[1].data_ptr<float>(), module.b2.data_ptr<float>());
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, NamedBuffersReturnsExpectedTensorsForFlatModel) {
TestModule module(1);
torch::OrderedDict<std::string, torch::Tensor> buffers =
@@ -822,8 +906,11 @@ std::shared_ptr<TestContainer> make_deeply_nested_test_container() {
{TestContainer(1, {TestContainer(2), TestContainer(3)}),
TestContainer(4),
TestContainer(
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
5,
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
{TestContainer(6),
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
TestContainer(7, {TestContainer(8), TestContainer(9)})})}));
}
@@ -834,13 +921,19 @@ make_key_value_pairs_for_deeply_nested_container() {
{"test_prefix.0.0", 2},
{"test_prefix.0.1", 3},
{"test_prefix.1", 4},
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
{"test_prefix.2", 5},
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
{"test_prefix.2.0", 6},
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
{"test_prefix.2.1", 7},
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
{"test_prefix.2.1.0", 8},
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
{"test_prefix.2.1.1", 9}};
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ModulesReturnsExpectedSubmodulesForDeepModel) {
auto model = make_deeply_nested_test_container();
std::vector<std::shared_ptr<torch::nn::Module>> modules = model->modules();
@@ -851,6 +944,7 @@ TEST_F(ModuleTest, ModulesReturnsExpectedSubmodulesForDeepModel) {
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, NamedModulesReturnsExpectedNamedSubmodulesForDeepModel) {
auto model = make_deeply_nested_test_container();
torch::OrderedDict<std::string, std::shared_ptr<torch::nn::Module>> modules =
@@ -865,6 +959,7 @@ TEST_F(ModuleTest, NamedModulesReturnsExpectedNamedSubmodulesForDeepModel) {
}
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ChildrensReturnsExpectedSubmodulesForDeepModel) {
auto model = make_deeply_nested_test_container();
std::vector<std::shared_ptr<torch::nn::Module>> modules = model->children();
@@ -875,6 +970,7 @@ TEST_F(ModuleTest, ChildrensReturnsExpectedSubmodulesForDeepModel) {
ASSERT_EQ(get_test_container_item(modules[2]), 5);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, NamedChildrensReturnsExpectedNamedSubmodulesForDeepModel) {
auto model = make_deeply_nested_test_container();
torch::OrderedDict<std::string, std::shared_ptr<torch::nn::Module>> modules =
@@ -892,6 +988,7 @@ TEST_F(ModuleTest, NamedChildrensReturnsExpectedNamedSubmodulesForDeepModel) {
ASSERT_EQ(modules[2].key(), "2");
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ModuleApplyIteratesCorreclty) {
auto model = make_deeply_nested_test_container();
int64_t index = 0;
@@ -901,6 +998,7 @@ TEST_F(ModuleTest, ModuleApplyIteratesCorreclty) {
ASSERT_EQ(index, 10);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ConstModuleApplyIteratesCorreclty) {
std::shared_ptr<const TestContainer> model =
make_deeply_nested_test_container();
@@ -911,6 +1009,7 @@ TEST_F(ModuleTest, ConstModuleApplyIteratesCorreclty) {
ASSERT_EQ(index, 10);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, NamedModuleApplyIteratesCorreclty) {
auto model = make_deeply_nested_test_container();
auto expected = make_key_value_pairs_for_deeply_nested_container();
@@ -926,6 +1025,7 @@ TEST_F(ModuleTest, NamedModuleApplyIteratesCorreclty) {
ASSERT_EQ(index, 10);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ConstNamedModuleApplyIteratesCorreclty) {
std::shared_ptr<const TestContainer> model =
make_deeply_nested_test_container();
@@ -943,6 +1043,7 @@ TEST_F(ModuleTest, ConstNamedModuleApplyIteratesCorreclty) {
ASSERT_EQ(index, 10);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ModulePointerApplyIteratesCorreclty) {
auto model = make_deeply_nested_test_container();
int64_t index = 0;
@@ -952,6 +1053,7 @@ TEST_F(ModuleTest, ModulePointerApplyIteratesCorreclty) {
ASSERT_EQ(index, 10);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, NamedModulePointerApplyIteratesCorreclty) {
auto model = make_deeply_nested_test_container();
auto expected = make_key_value_pairs_for_deeply_nested_container();
@@ -967,6 +1069,7 @@ TEST_F(ModuleTest, NamedModulePointerApplyIteratesCorreclty) {
ASSERT_EQ(index, 10);
}
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, ThrowsWhenAttemptingtoGetTopLevelModuleAsSharedPtr) {
{
TestModule module(1);
@@ -977,16 +1080,19 @@ TEST_F(ModuleTest, ThrowsWhenAttemptingtoGetTopLevelModuleAsSharedPtr) {
}
{
TestModule module(1);
// NOLINTNEXTLINE(hicpp-avoid-goto,cppcoreguidelines-avoid-goto)
ASSERT_NO_THROW(module.modules(/*include_self=*/false));
}
{
auto module = std::make_shared<TestModule>(1);
// NOLINTNEXTLINE(hicpp-avoid-goto,cppcoreguidelines-avoid-goto)
ASSERT_NO_THROW(module->modules());
}
}
struct EmptyModule : torch::nn::Module {};
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, PrettyPrint) {
struct TestModule : torch::nn::Module {
TestModule(int x, float y) : x_(x), y_(y) {}
@@ -1011,6 +1117,7 @@ struct ModuleWithNonTensorForwardImpl : torch::nn::Module {
};
TORCH_MODULE(ModuleWithNonTensorForward);
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
TEST_F(ModuleTest, CanCallForwardOnNonTensorForwardThroughPimpl) {
ModuleWithNonTensorForward m;
ASSERT_EQ(m(torch::ones(123)), 123);