Skip to content

Commit

Permalink
fix: Relax thresholds of dynamo converters' tests (#3061)
Browse files Browse the repository at this point in the history
  • Loading branch information
zewenli98 committed Aug 23, 2024
1 parent 8f04c39 commit 1fc1b39
Show file tree
Hide file tree
Showing 62 changed files with 395 additions and 499 deletions.
20 changes: 10 additions & 10 deletions tests/core/conversion/converters/test_activation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ TEST(Converters, ATenReLUConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in});

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0]));
}

TEST(Converters, ATenSigmoidConvertsCorrectly) {
Expand All @@ -42,7 +42,7 @@ TEST(Converters, ATenSigmoidConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in});

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], 5e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0]));
}

TEST(Converters, ATenTanhConvertsCorrectly) {
Expand All @@ -62,7 +62,7 @@ TEST(Converters, ATenTanhConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in});

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], 7e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0]));
}

// TODO: Seems like the IR parser is not handling negative numbers well, need to
Expand All @@ -86,7 +86,7 @@ TEST(Converters, ATenHardTanhConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in});

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0]));
}

TEST(Converters, ATenHardTanhCustomRangeConvertsCorrectly) {
Expand All @@ -108,7 +108,7 @@ TEST(Converters, ATenHardTanhCustomRangeConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in});

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0]));
}

TEST(Converters, ATenPReLUConvertsCorrectly) {
Expand All @@ -131,7 +131,7 @@ TEST(Converters, ATenPReLUConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {slope});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in});

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0]));
}

TEST(Converters, ATenPReLUChannelAlignConvertsCorrectly) {
Expand Down Expand Up @@ -178,7 +178,7 @@ TEST(Converters, ATenPReLUChannelAlignConvertsCorrectly) {

auto trt = trt_results[0].reshape(jit_results[0].sizes());

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0]));
}

TEST(Converters, ATenPReLUMultiChannelConvertsCorrectly) {
Expand All @@ -201,7 +201,7 @@ TEST(Converters, ATenPReLUMultiChannelConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {slope});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in});

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0]));
}

TEST(Converters, ATenLeakyReluConvertsCorrectly) {
Expand All @@ -222,7 +222,7 @@ TEST(Converters, ATenLeakyReluConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in});

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0]));
}

TEST(Converters, ATenEluConvertsCorrectly) {
Expand All @@ -245,7 +245,7 @@ TEST(Converters, ATenEluConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in});

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0]));
}

#ifndef DISABLE_TEST_IN_CI
Expand Down
9 changes: 3 additions & 6 deletions tests/core/conversion/converters/test_atan2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ TEST(Converters, ATenAtan2ConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in_0, in_1});

ASSERT_TRUE(
torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0])));
}

TEST(Converters, ATenAtan2ManagesPosInfCorrectly) {
Expand All @@ -48,8 +47,7 @@ TEST(Converters, ATenAtan2ManagesPosInfCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in_0, in_1});

ASSERT_TRUE(
torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0])));
}

TEST(Converters, ATenAtan2ManagesNegInfCorrectly) {
Expand All @@ -71,6 +69,5 @@ TEST(Converters, ATenAtan2ManagesNegInfCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in_0, in_1});

ASSERT_TRUE(
torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0])));
}
12 changes: 4 additions & 8 deletions tests/core/conversion/converters/test_batch_norm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ TEST(Converters, ATenBatchNormConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {gamma, beta, mean, var});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in});

ASSERT_TRUE(
torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0])));
}

TEST(Converters, ATenBatchNormAffineFalseConvertsCorrectly) {
Expand Down Expand Up @@ -63,8 +62,7 @@ TEST(Converters, ATenBatchNormAffineFalseConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {mean, var});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in});

ASSERT_TRUE(
torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0])));
}

TEST(Converters, ATenBatchNorm1DConvertsCorrectly) {
Expand Down Expand Up @@ -96,8 +94,7 @@ TEST(Converters, ATenBatchNorm1DConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {gamma, beta, mean, var});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in});

ASSERT_TRUE(
torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0])));
}

TEST(Converters, ATenBatchNormShouldUnpackConvertsCorrectly) {
Expand Down Expand Up @@ -134,8 +131,7 @@ TEST(Converters, ATenBatchNormShouldUnpackConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {trt_gamma, trt_beta, trt_mean, trt_var});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {trt_in});

ASSERT_TRUE(
torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0])));
}

TEST(Converters, ATenBatchNormHalfConvertsCorrectly) {
Expand Down
15 changes: 7 additions & 8 deletions tests/core/conversion/converters/test_cast.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ TEST(Converters, ATenBoolToFP32DTypeConvertsCorrectly) {

auto trt = trt_results[0].reshape(jit_results[0].sizes());
ASSERT_TRUE(jit_results[0].scalar_type() == trt.scalar_type());
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt, 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt));
}

TEST(Converters, ATenBoolToINT32DTypeConvertsCorrectly) {
Expand Down Expand Up @@ -65,7 +65,7 @@ TEST(Converters, ATenBoolToINT32DTypeConvertsCorrectly) {

auto trt = trt_results[0].reshape(jit_results[0].sizes());
ASSERT_TRUE(jit_results[0].scalar_type() == trt.scalar_type());
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt, 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt));
}

TEST(Converters, ATenBoolToINT32DeviceDTypeConvertsCorrectly) {
Expand Down Expand Up @@ -97,7 +97,7 @@ TEST(Converters, ATenBoolToINT32DeviceDTypeConvertsCorrectly) {
auto trt = trt_results[0].reshape(jit_results[0].sizes());

ASSERT_TRUE(jit_results[0].scalar_type() == trt.scalar_type());
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt, 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt));
}

TEST(Converters, ATenBoolToINT32TensorConvertsCorrectly) {
Expand Down Expand Up @@ -132,7 +132,7 @@ TEST(Converters, ATenBoolToINT32TensorConvertsCorrectly) {

auto trt = trt_results[0].reshape(jit_results[0].sizes());
ASSERT_TRUE(jit_results[0].scalar_type() == trt.scalar_type());
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt, 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt));
}

TEST(Converters, ATenToSingleConvertsCorrectly) {
Expand Down Expand Up @@ -160,7 +160,7 @@ TEST(Converters, ATenToSingleConvertsCorrectly) {

auto trt = trt_results[0].reshape(jit_results[0].sizes());
ASSERT_TRUE(jit_results[0].scalar_type() == trt.scalar_type());
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt, 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt));
}

TEST(Converters, ATenToDuplicateConvertsCorrectly) {
Expand All @@ -187,7 +187,7 @@ TEST(Converters, ATenToDuplicateConvertsCorrectly) {
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {trt_in});
for (size_t i = 0UL; i < jit_results.size(); ++i) {
ASSERT_TRUE(jit_results[i].scalar_type() == trt_results[i].scalar_type());
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[i], trt_results[i], 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[i], trt_results[i]));
}
}

Expand Down Expand Up @@ -218,6 +218,5 @@ TEST(Converters, ATenTypeAsConvertsCorrectly) {

ASSERT_TRUE(jit_results[0].scalar_type() == trt_results[0].scalar_type());
ASSERT_TRUE(trt_results[0].scalar_type() == trt_results[1].scalar_type());
ASSERT_TRUE(
torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0])));
}
2 changes: 1 addition & 1 deletion tests/core/conversion/converters/test_chunk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ TEST(Converters, ATenChunkConvertsCorrectly) {

auto trt = trt_results[0].reshape(jit_results[0].sizes());

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt, 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt));
}
3 changes: 1 addition & 2 deletions tests/core/conversion/converters/test_clone.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@ TEST(Converters, ATenCloneConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in});

ASSERT_TRUE(
torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0])));
}
18 changes: 7 additions & 11 deletions tests/core/conversion/converters/test_concat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ TEST(Converters, ATenCatPureTensorConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in1, in2});

ASSERT_TRUE(
torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0])));
}

TEST(Converters, ATenCatFloatIntConvertsCorrectly) {
Expand All @@ -50,7 +49,7 @@ TEST(Converters, ATenCatFloatIntConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in1, in2});

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0]));
}

TEST(Converters, ATenCatIntHalfIntHalfConvertsCorrectly) {
Expand Down Expand Up @@ -79,7 +78,7 @@ TEST(Converters, ATenCatIntHalfIntHalfConvertsCorrectly) {
auto trt_results =
torch_tensorrt::tests::util::RunGraphEngine(g, params, {in1, in2, in3, in4}, nvinfer1::DataType::kHALF);

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0]));
}

TEST(Converters, ATenCatHalfIntFloatConvertsCorrectly) {
Expand All @@ -105,7 +104,7 @@ TEST(Converters, ATenCatHalfIntFloatConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in1, in2, in3});

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0]));
}

TEST(Converters, ATenCatDiffTensorConvertsCorrectly) {
Expand All @@ -129,8 +128,7 @@ TEST(Converters, ATenCatDiffTensorConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {in2});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in1});

ASSERT_TRUE(
torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0])));
}
TEST(Converters, ATenCatPureTensorNegDimConvertsCorrectly) {
const auto graph = R"IR(
Expand All @@ -153,8 +151,7 @@ TEST(Converters, ATenCatPureTensorNegDimConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in1, in2});

ASSERT_TRUE(
torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0])));
}

TEST(Converters, ATenCatDiffTensorNegDimConvertsCorrectly) {
Expand All @@ -178,6 +175,5 @@ TEST(Converters, ATenCatDiffTensorNegDimConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {in2});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in1});

ASSERT_TRUE(
torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0]), 2e-6));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0].reshape_as(jit_results[0])));
}
Loading

0 comments on commit 1fc1b39

Please sign in to comment.