From 5c6af2806454a2aaa8b93157de9d0257f0949b5c Mon Sep 17 00:00:00 2001 From: Patryk Elszkowski Date: Mon, 21 Jun 2021 13:44:41 +0200 Subject: [PATCH] update ReshapeLayerTest to have unsigned in output axis --- .../single_layer_tests/reshape.cpp | 12 ++++++------ .../serialization/single_layer/reshape.cpp | 6 +++--- .../single_layer_tests/reshape.cpp | 12 ++++++------ .../single_layer_tests/reshape.cpp | 12 ++++++------ .../shared_test_classes/single_layer/reshape.hpp | 8 ++------ .../shared_test_classes/src/single_layer/reshape.cpp | 6 ++++-- 6 files changed, 27 insertions(+), 29 deletions(-) diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp index e0c986ad8b52e5..fe8eccf41cd401 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp @@ -16,7 +16,7 @@ const std::vector netPrecisions = { }; INSTANTIATE_TEST_CASE_P( - smoke_ReshapeCheckDynBatch, ReshapeLayerTestRevise, + smoke_ReshapeCheckDynBatch, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -27,10 +27,10 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE), ::testing::Values(std::map({}))), - ReshapeLayerTestRevise::getTestCaseName); + ReshapeLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P( - smoke_ReshapeCheck, ReshapeLayerTestRevise, + smoke_ReshapeCheck, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -41,10 +41,10 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({10, 0, 100})), ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE), ::testing::Values(std::map({}))), - ReshapeLayerTestRevise::getTestCaseName); + ReshapeLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P( - smoke_ReshapeCheckNegative, ReshapeLayerTestRevise, + smoke_ReshapeCheckNegative, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -55,5 +55,5 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::vector({10, -1, 100})), ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE), ::testing::Values(std::map({}))), - ReshapeLayerTestRevise::getTestCaseName); + ReshapeLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/reshape.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/reshape.cpp index 9ba9aec704b19d..88729e0d7a9edd 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/reshape.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/reshape.cpp @@ -10,7 +10,7 @@ using namespace LayerTestsDefinitions; namespace { - TEST_P(ReshapeLayerTestRevise, Serialize) { + TEST_P(ReshapeLayerTest, Serialize) { Serialize(); } @@ -19,7 +19,7 @@ namespace { InferenceEngine::Precision::FP16 }; - INSTANTIATE_TEST_CASE_P(smoke_ReshapeSerialization, ReshapeLayerTestRevise, + INSTANTIATE_TEST_CASE_P(smoke_ReshapeSerialization, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), @@ -31,5 +31,5 @@ namespace { ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(std::map({{CONFIG_KEY(DYN_BATCH_ENABLED), CONFIG_VALUE(YES)}}))), - ReshapeLayerTestRevise::getTestCaseName); + ReshapeLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reshape.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reshape.cpp index 28419ec971fca7..de1bd372212850 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reshape.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reshape.cpp @@ -15,7 +15,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::FP16 }; -INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckDynBatch, ReshapeLayerTestRevise, +INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckDynBatch, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), @@ -27,9 +27,9 @@ INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckDynBatch, ReshapeLayerTestRevise, ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(std::map({{CONFIG_KEY(DYN_BATCH_ENABLED), CONFIG_VALUE(YES)}}))), - ReshapeLayerTestRevise::getTestCaseName); + ReshapeLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheck, ReshapeLayerTestRevise, +INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheck, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), @@ -41,9 +41,9 @@ INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheck, ReshapeLayerTestRevise, ::testing::Values(std::vector({10, 0, 100})), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(std::map({}))), - ReshapeLayerTestRevise::getTestCaseName); + ReshapeLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckNegative, ReshapeLayerTestRevise, +INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckNegative, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), @@ -55,5 +55,5 @@ INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckNegative, ReshapeLayerTestRevise, ::testing::Values(std::vector({10, -1, 100})), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(std::map({}))), - ReshapeLayerTestRevise::getTestCaseName); + ReshapeLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reshape.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reshape.cpp index 84d30807341593..9f3fd3d2fd9968 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reshape.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reshape.cpp @@ -16,7 +16,7 @@ const std::vector netPrecisions = { }; //TODO: Issue : - 28981 -INSTANTIATE_TEST_CASE_P(DISABLE_smoke_ReshapeCheckDynBatch, ReshapeLayerTestRevise, +INSTANTIATE_TEST_CASE_P(DISABLE_smoke_ReshapeCheckDynBatch, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), @@ -28,9 +28,9 @@ INSTANTIATE_TEST_CASE_P(DISABLE_smoke_ReshapeCheckDynBatch, ReshapeLayerTestRevi ::testing::Values(std::vector({1, 0, 256})), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::Values(std::map({{CONFIG_KEY(DYN_BATCH_ENABLED), CONFIG_VALUE(YES)}}))), - ReshapeLayerTestRevise::getTestCaseName); + ReshapeLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheck, ReshapeLayerTestRevise, +INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheck, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), @@ -42,9 +42,9 @@ INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheck, ReshapeLayerTestRevise, ::testing::Values(std::vector({10, 0, 100})), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::Values(std::map({}))), - ReshapeLayerTestRevise::getTestCaseName); + ReshapeLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckNegative, ReshapeLayerTestRevise, +INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckNegative, ReshapeLayerTest, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), @@ -56,5 +56,5 @@ INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckNegative, ReshapeLayerTestRevise, ::testing::Values(std::vector({10, -1, 100})), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::Values(std::map({}))), - ReshapeLayerTestRevise::getTestCaseName); + ReshapeLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reshape.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reshape.hpp index 9ddeeed509aa48..e6c4fbd5c8dd3d 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reshape.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/reshape.hpp @@ -15,7 +15,6 @@ namespace LayerTestsDefinitions { -//TODO: remove this alias when ticket 57975 is done - ticket: 57976 typedef std::tuple, // Input shapes - std::vector, // OutForm Shapes + std::vector, // OutForm Shapes std::string, // Device name std::map // Config > reshapeParams; - -//TODO: remove this class when ticket 57975 is done - ticket: 57976 class ReshapeLayerTest : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { public: @@ -41,7 +38,7 @@ class ReshapeLayerTest : public testing::WithParamInterface, }; -//TODO: use this alias in all dependencies - ticket: 57975 +//TODO: Drop this Revise impl when all pluging will switch back to ReshapeLayerTest typedef std::tuple reshapeParamsRevise; -//TODO: use this class in all dependencies - ticket: 57975 class ReshapeLayerTestRevise : public testing::WithParamInterface, virtual public LayerTestsUtils::LayerTestsCommon { diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/reshape.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/reshape.cpp index 708c40ebbe058d..59e95716088f2e 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/reshape.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/reshape.cpp @@ -9,7 +9,8 @@ std::string ReshapeLayerTest::getTestCaseName(testing::TestParamInfo outFormShapes; std::string targetDevice; std::map config; bool specialZero; @@ -28,7 +29,8 @@ std::string ReshapeLayerTest::getTestCaseName(testing::TestParamInfo outFormShapes; bool specialZero; InferenceEngine::Precision netPrecision; std::tie(specialZero, netPrecision, inPrc, outPrc, inLayout, outLayout, inputShapes, outFormShapes, targetDevice, configuration) =