fixed bug with disabled tests in conv_fusion_test.cpp (#8482)

* remove /DISABLED_/ from conv_fusion_tests.cpp

* fixed? i changed some shapes in tests data
This commit is contained in:
Smirnov Grigorii 2021-11-12 00:51:44 +03:00 committed by GitHub
parent 8686100c80
commit 8f55d72c93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -169,15 +169,15 @@ INSTANTIATE_TEST_SUITE_P(ConvAddFusion, ConvFusionTests,
std::make_tuple(InputShape{3, 3, DYN}, WeightsShape{1, 3, 3},
add::get_type_info_static(), EltwiseShape{1, 1}, false)));
INSTANTIATE_TEST_SUITE_P(DISABLED_ConvAddFusionNegative, ConvFusionTests,
INSTANTIATE_TEST_SUITE_P(ConvAddFusionNegative, ConvFusionTests,
testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, WeightsShape{8, 3, 1, 2, 3},
add::get_type_info_static(), EltwiseShape{2, 1}, true),
std::make_tuple(InputShape{DYN, 3, 64, 64, 64}, WeightsShape{8, 3, 1, 2, 3},
add::get_type_info_static(), EltwiseShape{8, 1, 1}, true),
add::get_type_info_static(), EltwiseShape{8, 1, 1, 1, 1}, true),
std::make_tuple(InputShape{2, DYN, 64, 64, 64}, WeightsShape{9, 3, 2, 3, 1},
add::get_type_info_static(), EltwiseShape{9, 1, 1, 1, 1}, true)));
add::get_type_info_static(), EltwiseShape{2, 1, 1, 1, 1}, true)));
INSTANTIATE_TEST_SUITE_P(DISABLED_ConvMulFusion, ConvFusionTests,
INSTANTIATE_TEST_SUITE_P(ConvMulFusion, ConvFusionTests,
testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, WeightsShape{8, 3, 1, 2, 3},
mul::get_type_info_static(), EltwiseShape{8, 1, 1, 1}, false),
std::make_tuple(InputShape{DYN, 3, 64, 64, 64}, WeightsShape{8, 3, 1, 2, 3},
@ -211,12 +211,12 @@ INSTANTIATE_TEST_SUITE_P(DISABLED_ConvMulFusion, ConvFusionTests,
std::make_tuple(InputShape{3, 3, DYN}, WeightsShape{1, 3, 3},
mul::get_type_info_static(), EltwiseShape{1, 1}, false)));
INSTANTIATE_TEST_SUITE_P(DISABLED_ConvMulFusionNegative, ConvFusionTests,
INSTANTIATE_TEST_SUITE_P(ConvMulFusionNegative, ConvFusionTests,
testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, WeightsShape{8, 3, 1, 2, 3},
mul::get_type_info_static(), EltwiseShape{2, 1}, true),
std::make_tuple(InputShape{DYN, 3, 64, 64}, WeightsShape{8, 3, 1, 2, 3},
mul::get_type_info_static(), EltwiseShape{8, 1, 1}, true),
std::make_tuple(InputShape{2, DYN, 64, 64}, WeightsShape{9, 3, 2, 3, 1},
std::make_tuple(InputShape{DYN, 3, 64, 64}, WeightsShape{ 3, 3, 2, 3},
mul::get_type_info_static(), EltwiseShape{8, 1, 1, 1}, true),
std::make_tuple(InputShape{2, DYN, 64, 64}, WeightsShape{ 3, 2, 3, 1},
mul::get_type_info_static(), EltwiseShape{9, 1, 1, 1, 1}, true)));