Skip to content

Commit 39fc2dd

Browse files
peri044peri044
committed
chore: Moving threshold constants to utils
Signed-off-by: Dheeraj Peri <[email protected]>
1 parent 8448dfa commit 39fc2dd

17 files changed

+65
-68
lines changed

‎tests/core/partitioning/test_conditionals.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ TEST(Partitioning, FallbackInplaceOPInConditionalsCorrectly) {
7171
auto jit_results = mod.forward(jit_inputs_ivalues).toTensor();
7272
auto trt_mod = torch_tensorrt::core::CompileGraph(mod, cfg);
7373
auto trt_results = trt_mod.forward(trt_inputs_ivalues).toTensor();
74-
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results, trt_results, 2e-6));
74+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(jit_results, trt_results));
7575
}

‎tests/core/partitioning/test_fallback_graph_output.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ TEST(Partitioning, ComputeResNet50FallbackGraphCorrectly) {
3434
auto jit_results = mod.forward(jit_inputs_ivalues).toTensor();
3535
auto trt_mod = torch_tensorrt::core::CompileGraph(mod, cfg);
3636
auto trt_results = trt_mod.forward(trt_inputs_ivalues).toTensor();
37-
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(jit_results, trt_results, 0.99));
37+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(jit_results, trt_results));
3838
}
3939

4040
TEST(Partitioning, ComputeMobileNetFallbackGraphCorrectly) {
@@ -64,6 +64,6 @@ TEST(Partitioning, ComputeMobileNetFallbackGraphCorrectly) {
6464
auto jit_results = mod.forward(jit_inputs_ivalues).toTensor();
6565
auto trt_mod = torch_tensorrt::core::CompileGraph(mod, cfg);
6666
auto trt_results = trt_mod.forward(trt_inputs_ivalues).toTensor();
67-
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(jit_results, trt_results, 0.99));
67+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(jit_results, trt_results));
6868
}
6969
#endif

‎tests/core/partitioning/test_loop_fallback.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ TEST(Partitioning, CheckLoopFallbackEvalCompilesCorrectly) {
3030
auto jit_results = mod.forward(jit_inputs_ivalues).toTensor();
3131
auto trt_mod = torch_tensorrt::core::CompileGraph(mod, cfg);
3232
auto trt_results = trt_mod.forward(trt_inputs_ivalues).toTensor();
33-
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results, trt_results, 2e-6));
33+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(jit_results, trt_results));
3434
}
3535

3636
TEST(Partitioning, CheckLoopFallbackNoEvalCompilesCorrectly) {
@@ -58,5 +58,5 @@ TEST(Partitioning, CheckLoopFallbackNoEvalCompilesCorrectly) {
5858
auto jit_results = mod.forward(jit_inputs_ivalues).toTensor();
5959
auto trt_mod = torch_tensorrt::core::CompileGraph(mod, cfg);
6060
auto trt_results = trt_mod.forward(trt_inputs_ivalues).toTensor();
61-
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results, trt_results, 2e-6));
61+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(jit_results, trt_results));
6262
}

‎tests/core/partitioning/test_resolve_nontensor_inputs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ TEST(Partitioning, ResolveNonTensorInputsForIFBlockCorrectly) {
8787
auto jit_results = mod.forward({jit_in0, jit_in1});
8888
auto trt_results = new_mod.forward({trt_in0, trt_in1});
8989

90-
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results.toTensor(), trt_results.toTensor(), 2e-6));
90+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(jit_results.toTensor(), trt_results.toTensor()));
9191
}
9292

9393
TEST(Partitioning, ResolveNonTensorInputsCorrectly) {

‎tests/cpp/cpp_api_test.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "torch/script.h"
77
#include "torch_tensorrt/torch_tensorrt.h"
88

9-
using PathAndInput = std::tuple<std::string, std::vector<std::vector<int64_t>>, std::vector<c10::ScalarType>, float>;
9+
using PathAndInput = std::tuple<std::string, std::vector<std::vector<int64_t>>, std::vector<c10::ScalarType>>;
1010

1111
class CppAPITests : public testing::TestWithParam<PathAndInput> {
1212
public:
@@ -22,7 +22,6 @@ class CppAPITests : public testing::TestWithParam<PathAndInput> {
2222
}
2323
input_shapes = std::get<1>(params);
2424
input_types = std::get<2>(params);
25-
threshold = std::get<3>(params);
2625
}
2726

2827
void TearDown() {
@@ -34,5 +33,4 @@ class CppAPITests : public testing::TestWithParam<PathAndInput> {
3433
torch::jit::script::Module mod;
3534
std::vector<std::vector<int64_t>> input_shapes;
3635
std::vector<c10::ScalarType> input_types;
37-
float threshold;
3836
};

‎tests/cpp/test_collections.cpp

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ TEST(CppAPITests, TestCollectionStandardTensorInput) {
4242
auto trt_mod = torch_tensorrt::torchscript::compile(mod, compile_settings);
4343
auto trt_out = trt_mod.forward(inputs_);
4444

45-
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(out.toTensor(), trt_out.toTensor(), 0.99));
45+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(out.toTensor(), trt_out.toTensor()));
4646
}
4747

4848
TEST(CppAPITests, TestCollectionTupleInput) {
@@ -85,7 +85,7 @@ TEST(CppAPITests, TestCollectionTupleInput) {
8585
auto trt_mod = torch_tensorrt::torchscript::compile(mod, compile_settings);
8686
auto trt_out = trt_mod.forward(complex_inputs);
8787

88-
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(out.toTensor(), trt_out.toTensor(), 0.99));
88+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(out.toTensor(), trt_out.toTensor()));
8989
}
9090

9191
TEST(CppAPITests, TestCollectionListInput) {
@@ -144,7 +144,7 @@ TEST(CppAPITests, TestCollectionListInput) {
144144
LOG_DEBUG("Finish compile");
145145
auto trt_out = trt_mod.forward(complex_inputs);
146146

147-
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(out.toTensor(), trt_out.toTensor(), 0.99));
147+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(out.toTensor(), trt_out.toTensor()));
148148
}
149149

150150
TEST(CppAPITests, TestCollectionTupleInputOutput) {
@@ -178,23 +178,18 @@ TEST(CppAPITests, TestCollectionTupleInputOutput) {
178178
torch::jit::IValue complex_input_shape(input_shape_tuple);
179179
std::tuple<torch::jit::IValue> input_tuple2(complex_input_shape);
180180
torch::jit::IValue complex_input_shape2(input_tuple2);
181-
// torch::jit::IValue complex_input_shape(list);
182181

183182
auto compile_settings = torch_tensorrt::ts::CompileSpec(complex_input_shape2);
184183
compile_settings.min_block_size = 1;
185184

186-
// compile_settings.torch_executed_ops.push_back("prim::TupleConstruct");
187-
188185
// // FP16 execution
189186
compile_settings.enabled_precisions = {torch::kHalf};
190187
// // Compile module
191188
auto trt_mod = torch_tensorrt::torchscript::compile(mod, compile_settings);
192189
auto trt_out = trt_mod.forward(complex_inputs);
193190

194-
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(
195-
out.toTuple()->elements()[0].toTensor(), trt_out.toTuple()->elements()[0].toTensor(), 1e-4));
196-
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(
197-
out.toTuple()->elements()[1].toTensor(), trt_out.toTuple()->elements()[1].toTensor(), 1e-4));
191+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(out.toTuple()->elements()[0].toTensor(), trt_out.toTuple()->elements()[0].toTensor()));
192+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(out.toTuple()->elements()[1].toTensor(), trt_out.toTuple()->elements()[1].toTensor()));
198193
}
199194

200195
TEST(CppAPITests, TestCollectionListInputOutput) {
@@ -252,10 +247,8 @@ TEST(CppAPITests, TestCollectionListInputOutput) {
252247
auto trt_mod = torch_tensorrt::torchscript::compile(mod, compile_settings);
253248
auto trt_out = trt_mod.forward(complex_inputs);
254249

255-
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(
256-
out.toList().vec()[0].toTensor(), trt_out.toList().vec()[0].toTensor(), 1e-5));
257-
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(
258-
out.toList().vec()[1].toTensor(), trt_out.toList().vec()[1].toTensor(), 1e-5));
250+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(out.toList().vec()[0].toTensor(), trt_out.toList().vec()[0].toTensor()));
251+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(out.toList().vec()[1].toTensor(), trt_out.toList().vec()[1].toTensor()));
259252
}
260253

261254
TEST(CppAPITests, TestCollectionComplexModel) {
@@ -313,8 +306,6 @@ TEST(CppAPITests, TestCollectionComplexModel) {
313306
auto trt_mod = torch_tensorrt::torchscript::compile(mod, compile_settings);
314307
auto trt_out = trt_mod.forward(complex_inputs);
315308

316-
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(
317-
out.toTuple()->elements()[0].toTensor(), trt_out.toTuple()->elements()[0].toTensor(), 1e-5));
318-
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(
319-
out.toTuple()->elements()[1].toTensor(), trt_out.toTuple()->elements()[1].toTensor(), 1e-5));
309+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(out.toTuple()->elements()[0].toTensor(), trt_out.toTuple()->elements()[0].toTensor()));
310+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(out.toTuple()->elements()[1].toTensor(), trt_out.toTuple()->elements()[1].toTensor()));
320311
}

‎tests/cpp/test_compiled_modules.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ TEST_P(CppAPITests, CompiledModuleIsClose) {
4242

4343
for (size_t i = 0; i < trt_results.size(); i++) {
4444
ASSERT_TRUE(
45-
torch_tensorrt::tests::util::cosineSimEqual(jit_results[i], trt_results[i].reshape_as(jit_results[i]), 0.99));
45+
torch_tensorrt::tests::util::cosineSimEqual(jit_results[i], trt_results[i].reshape_as(jit_results[i])));
4646
}
4747
}
4848

@@ -52,10 +52,10 @@ INSTANTIATE_TEST_SUITE_P(
5252
CompiledModuleForwardIsCloseSuite,
5353
CppAPITests,
5454
testing::Values(
55-
PathAndInput({"tests/modules/resnet18_scripted.jit.pt", {{1, 3, 224, 224}}, {at::kFloat}, 2e-5}),
56-
PathAndInput({"tests/modules/mobilenet_v2_scripted.jit.pt", {{1, 3, 224, 224}}, {at::kFloat}, 2e-5}),
57-
PathAndInput({"tests/modules/efficientnet_b0_scripted.jit.pt", {{1, 3, 224, 224}}, {at::kFloat}, 8e-3}),
58-
PathAndInput({"tests/modules/bert_base_uncased_traced.jit.pt", {{1, 14}, {1, 14}}, {at::kInt, at::kInt}, 8e-2}),
59-
PathAndInput({"tests/modules/vit_scripted.jit.pt", {{1, 3, 224, 224}}, {at::kFloat}, 8e-2})));
55+
PathAndInput({"tests/modules/resnet18_scripted.jit.pt", {{1, 3, 224, 224}}, {at::kFloat}}),
56+
PathAndInput({"tests/modules/mobilenet_v2_scripted.jit.pt", {{1, 3, 224, 224}}, {at::kFloat}}),
57+
PathAndInput({"tests/modules/efficientnet_b0_scripted.jit.pt", {{1, 3, 224, 224}}, {at::kFloat}}),
58+
PathAndInput({"tests/modules/bert_base_uncased_traced.jit.pt", {{1, 14}, {1, 14}}, {at::kInt, at::kInt}}),
59+
PathAndInput({"tests/modules/vit_scripted.jit.pt", {{1, 3, 224, 224}}, {at::kFloat}})));
6060

6161
#endif

‎tests/cpp/test_default_input_types.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,4 @@ INSTANTIATE_TEST_SUITE_P(
117117
CompiledModuleForwardIsCloseSuite,
118118
CppAPITests,
119119
testing::Values(
120-
PathAndInput({"tests/modules/resnet18_traced.jit.pt", {{1, 3, 224, 224}}, {at::kFloat} /*unused*/, 2e-5})));
120+
PathAndInput({"tests/modules/resnet18_traced.jit.pt", {{1, 3, 224, 224}}, {at::kFloat}})));

‎tests/cpp/test_example_tensors.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ TEST_P(CppAPITests, InputsFromTensors) {
2121
INSTANTIATE_TEST_SUITE_P(
2222
CompiledModuleForwardIsCloseSuite,
2323
CppAPITests,
24-
testing::Values(PathAndInput({"tests/modules/resnet18_traced.jit.pt", {{1, 3, 224, 224}}, {at::kFloat}, 2e-5})));
24+
testing::Values(PathAndInput({"tests/modules/resnet18_traced.jit.pt", {{1, 3, 224, 224}}, {at::kFloat}})));

‎tests/cpp/test_module_fallback.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ TEST(CppAPITest, ResNetModuleFallbacksCorrectly) {
3030
auto jit_results = mod.forward(jit_inputs_ivalues).toTensor();
3131
auto trt_mod = torch_tensorrt::ts::compile(mod, cfg);
3232
auto trt_results = trt_mod.forward(trt_inputs_ivalues).toTensor();
33-
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(jit_results, trt_results, 0.99));
33+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(jit_results, trt_results));
3434
}
3535

3636
TEST(CppAPITest, MobileNetModuleFallbacksCorrectlyWithOneEngine) {
@@ -69,6 +69,6 @@ TEST(CppAPITest, MobileNetModuleFallbacksCorrectlyWithOneEngine) {
6969
ASSERT_TRUE(trt_count == 1);
7070

7171
auto trt_results = trt_mod.forward(trt_inputs_ivalues).toTensor();
72-
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(jit_results, trt_results, 0.99));
72+
ASSERT_TRUE(torch_tensorrt::tests::util::cosineSimEqual(jit_results, trt_results));
7373
}
7474
#endif

0 commit comments

Comments
 (0)