From 3081fac7581933568b496a3c4e744d1cee481619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ko=C5=BCykowski?= Date: Wed, 1 Sep 2021 13:19:38 +0200 Subject: [PATCH] Unify SLTs classes of Convert and ConvertLike operations (#7129) * update comparisiofiles to use const ref param * introduce conversion layer test definitions * adapt old tests to the new format * remove old duplicated conversion tests * fix "convertion" typo to "conversion" * fix style issues and abandon unnecessary changes * fix include order * update remaining conversion tests to use introduced class * fix gpu class test naming * bring back convert.hpp and convert_like.hpp files * bring back convert.hppcppd convert_like.cpp files * bring back single_layer_tests/convert.hpp file * add missing copyright info * fix issue with braces initiator for conversion types * add missing convert_like tests * add deprecated code macros * update deprecated code macro message * add missing space in deprecated code macro message * update skip ConvertLike tests ticket * update deprecated code to use IE macros * update remaining ngraph_deprecated macros to use IE macros --- .../functional/op_reference/conversion.hpp | 2 +- .../{convert.cpp => conversion.cpp} | 18 ++++--- .../single_layer_tests/conversion.cpp | 50 +++++++++++++++++++ .../single_layer_tests/convert.cpp | 47 ----------------- .../single_layer_tests/convert_like.cpp | 33 ------------ .../skip_tests_config.cpp | 4 +- .../{convert.cpp => conversion.cpp} | 27 ++++++---- .../{convert.cpp => conversion.cpp} | 12 +++-- .../single_layer_tests/convert_like.cpp | 33 ------------ .../{convert_like.hpp => conversion.hpp} | 8 ++- .../include/single_layer_tests/convert.hpp | 7 ++- .../single_layer/comparison.hpp | 2 +- .../single_layer/conversion.hpp | 39 +++++++++++++++ .../single_layer/convert.hpp | 8 +-- .../single_layer/convert_like.hpp | 8 +-- .../src/single_layer/comparison.cpp | 2 +- .../src/single_layer/conversion.cpp | 45 +++++++++++++++++ .../src/single_layer/convert.cpp | 7 ++- .../src/single_layer/convert_like.cpp | 7 ++- 19 files changed, 208 insertions(+), 151 deletions(-) rename inference-engine/tests/functional/inference_engine/serialization/single_layer/{convert.cpp => conversion.cpp} (70%) create mode 100644 inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/conversion.cpp delete mode 100644 inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert.cpp delete mode 100644 inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert_like.cpp rename inference-engine/tests/functional/plugin/cpu/single_layer_tests/{convert.cpp => conversion.cpp} (63%) rename inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/{convert.cpp => conversion.cpp} (70%) delete mode 100644 inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert_like.cpp rename inference-engine/tests/functional/plugin/shared/include/single_layer_tests/{convert_like.hpp => conversion.hpp} (50%) create mode 100644 inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/conversion.hpp create mode 100644 inference-engine/tests/functional/shared_test_classes/src/single_layer/conversion.cpp diff --git a/docs/template_plugin/tests/functional/op_reference/conversion.hpp b/docs/template_plugin/tests/functional/op_reference/conversion.hpp index f3846c7eab6..666060ddb82 100644 --- a/docs/template_plugin/tests/functional/op_reference/conversion.hpp +++ b/docs/template_plugin/tests/functional/op_reference/conversion.hpp @@ -47,7 +47,7 @@ public: static std::string getTestCaseName(const testing::TestParamInfo& obj) { const auto& param = obj.param; std::ostringstream result; - result << "convertionType=" << conversionNames[param.conversionType] << "_"; + result << "conversionType=" << conversionNames[param.conversionType] << "_"; result << "shape=" << param.pshape << "_"; result << "iType=" << param.inType << "_"; result << "oType=" << param.outType; diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/convert.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/conversion.cpp similarity index 70% rename from inference-engine/tests/functional/inference_engine/serialization/single_layer/convert.cpp rename to inference-engine/tests/functional/inference_engine/serialization/single_layer/conversion.cpp index 7cc308c41e2..e62e5ca4ccc 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/convert.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/conversion.cpp @@ -2,13 +2,18 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "shared_test_classes/single_layer/convert.hpp" +#include "shared_test_classes/single_layer/conversion.hpp" #include using namespace LayerTestsDefinitions; namespace { +const std::vector conversionOpTypes = { + ngraph::helpers::ConversionTypes::CONVERT, + ngraph::helpers::ConversionTypes::CONVERT_LIKE, +}; + const std::vector> inShape = {{1, 2, 3, 4}}; const std::vector precisions = { @@ -21,18 +26,19 @@ const std::vector precisions = { InferenceEngine::Precision::BF16, InferenceEngine::Precision::FP16, InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP64}; -TEST_P(ConvertLayerTest, Serialize) { +TEST_P(ConversionLayerTest, Serialize) { Serialize(); } INSTANTIATE_TEST_SUITE_P( - smoke_Serialization_ConvertLayerTest, ConvertLayerTest, - ::testing::Combine(::testing::Values(inShape), + smoke_Serialization_ConversionLayerTest, ConversionLayerTest, + ::testing::Combine(::testing::ValuesIn(conversionOpTypes), + ::testing::Values(inShape), ::testing::ValuesIn(precisions), ::testing::ValuesIn(precisions), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvertLayerTest::getTestCaseName); + ConversionLayerTest::getTestCaseName); -} // namespace \ No newline at end of file +} // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/conversion.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/conversion.cpp new file mode 100644 index 00000000000..03be6f86285 --- /dev/null +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/conversion.cpp @@ -0,0 +1,50 @@ +// Copyright (C) 2018-2021 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include + +#include "common_test_utils/test_constants.hpp" +#include "single_layer_tests/conversion.hpp" + +using namespace LayerTestsDefinitions; + +namespace { +const std::vector conversionOpTypes = { + ngraph::helpers::ConversionTypes::CONVERT, + ngraph::helpers::ConversionTypes::CONVERT_LIKE, +}; + +const std::vector> inShape = {{1, 2, 3, 4}}; + +const std::vector netPrecisions = { + // Ticket: 59594 + // InferenceEngine::Precision::I4, + InferenceEngine::Precision::I8, + InferenceEngine::Precision::I16, + InferenceEngine::Precision::I32, + InferenceEngine::Precision::I64, + // Ticket: 59594 + // InferenceEngine::Precision::BIN, + // InferenceEngine::Precision::BOOL, + // InferenceEngine::Precision::U4, + InferenceEngine::Precision::U8, + InferenceEngine::Precision::U16, + // Ticket: 59594 + // InferenceEngine::Precision::U32, + InferenceEngine::Precision::U64, + InferenceEngine::Precision::BF16, + InferenceEngine::Precision::FP16, + InferenceEngine::Precision::FP32}; + +INSTANTIATE_TEST_SUITE_P(smoke_ConversionLayerTest, + ConversionLayerTest, + ::testing::Combine(::testing::ValuesIn(conversionOpTypes), + ::testing::Values(inShape), + ::testing::ValuesIn(netPrecisions), + ::testing::ValuesIn(netPrecisions), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(InferenceEngine::Layout::ANY), + ::testing::Values(CommonTestUtils::DEVICE_CPU)), + ConversionLayerTest::getTestCaseName); +} // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert.cpp deleted file mode 100644 index e7ac96b6540..00000000000 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (C) 2018-2021 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include - -#include "single_layer_tests/convert.hpp" -#include "common_test_utils/test_constants.hpp" - -using namespace LayerTestsDefinitions; -using namespace InferenceEngine; - -namespace { -const std::vector> inShape = {{1, 2, 3, 4}}; - -const std::vector precisions = { - // Ticket: 59594 - // Precision::I4, - Precision::I8, - Precision::I16, - Precision::I32, - Precision::I64, - // Ticket: 59594 - // Precision::BIN, - // Precision::BOOL, - // Precision::U4, - Precision::U8, - Precision::U16, - // Ticket: 59594 - // Precision::U32, - Precision::U64, - Precision::BF16, - Precision::FP16, - Precision::FP32 -}; - -INSTANTIATE_TEST_SUITE_P(smoke_ConvertLayerTest, ConvertLayerTest, - ::testing::Combine( - ::testing::Values(inShape), - ::testing::ValuesIn(precisions), - ::testing::ValuesIn(precisions), - ::testing::Values(Layout::ANY), - ::testing::Values(Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvertLayerTest::getTestCaseName); - -} // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert_like.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert_like.cpp deleted file mode 100644 index f9e20dcf0de..00000000000 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert_like.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (C) 2018-2021 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include - -#include "single_layer_tests/convert_like.hpp" -#include "common_test_utils/test_constants.hpp" - -using namespace LayerTestsDefinitions; - -namespace { -const std::vector> inShape = {{1, 2, 3, 4}}; - -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16, - InferenceEngine::Precision::U8, - InferenceEngine::Precision::I8, -}; - -INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, ConvertLikeLayerTest, - ::testing::Combine( - ::testing::Values(inShape), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(inShape), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvertLikeLayerTest::getTestCaseName); - -} // namespace \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/skip_tests_config.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/skip_tests_config.cpp index e3b6c8e1a15..be837c29702 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/skip_tests_config.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/skip_tests_config.cpp @@ -29,8 +29,8 @@ std::vector disabledTestPatterns() { R"(.*InferRequestPreprocessDynamicallyInSetBlobTest.*oPRC=0.*_oLT=1.*)", // TODO: Issue: 34348 R"(.*IEClassGetAvailableDevices.*)", - // TODO: Issue: 25533 - R"(.*ConvertLikeLayerTest.*)", + // TODO: Issue: 63469 + R"(.*ConversionLayerTest.*ConvertLike.*)", // TODO: Issue: 34055 R"(.*ShapeOfLayerTest.*)", R"(.*ReluShapeOfSubgraphTest.*)", diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/conversion.cpp similarity index 63% rename from inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert.cpp rename to inference-engine/tests/functional/plugin/cpu/single_layer_tests/conversion.cpp index 3a8d3a920e2..b41ea5a889c 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/conversion.cpp @@ -2,26 +2,31 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include using namespace LayerTestsDefinitions; using namespace InferenceEngine; namespace CPULayerTestsDefinitions { -class ConvertCPULayerTest : public ConvertLayerTest {}; +class ConvertCPULayerTest : public ConversionLayerTest {}; TEST_P(ConvertCPULayerTest, CompareWithRefs) { SKIP_IF_CURRENT_TEST_IS_DISABLED() - ConvertParamsTuple params = GetParam(); - inPrc = std::get<1>(params); - outPrc = std::get<2>(params); + ConversionParamsTuple params = GetParam(); + inPrc = std::get<2>(params); + outPrc = std::get<3>(params); Run(); } namespace { +const std::vector conversionOpTypes = { + ngraph::helpers::ConversionTypes::CONVERT, + ngraph::helpers::ConversionTypes::CONVERT_LIKE, +}; + const std::vector> inShape = {{1, 2, 3, 4}}; // List of precisions natively supported by mkldnn. @@ -33,24 +38,26 @@ const std::vector precisions = { Precision::BF16 }; -INSTANTIATE_TEST_SUITE_P(smoke_ConvertLayerTest_From_BF16, ConvertCPULayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConversionLayerTest_From_BF16, ConvertCPULayerTest, ::testing::Combine( + ::testing::ValuesIn(conversionOpTypes), ::testing::Values(inShape), ::testing::Values(Precision::BF16), ::testing::ValuesIn(precisions), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvertLayerTest::getTestCaseName); + ConversionLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_ConvertLayerTest_To_BF16, ConvertCPULayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConversionLayerTest_To_BF16, ConvertCPULayerTest, ::testing::Combine( + ::testing::ValuesIn(conversionOpTypes), ::testing::Values(inShape), ::testing::ValuesIn(precisions), ::testing::Values(Precision::BF16), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), - ConvertLayerTest::getTestCaseName); + ConversionLayerTest::getTestCaseName); } // namespace -} // namespace CPULayerTestsDefinitions \ No newline at end of file +} // namespace CPULayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/conversion.cpp similarity index 70% rename from inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert.cpp rename to inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/conversion.cpp index e404be39af6..41df370e47b 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/conversion.cpp @@ -4,12 +4,17 @@ #include -#include "single_layer_tests/convert.hpp" +#include "single_layer_tests/conversion.hpp" #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; namespace { +const std::vector conversionOpTypes = { + ngraph::helpers::ConversionTypes::CONVERT, + ngraph::helpers::ConversionTypes::CONVERT_LIKE, +}; + const std::vector> inShape = {{1, 2, 3, 4}}; const std::vector netPrecisions = { @@ -19,14 +24,15 @@ const std::vector netPrecisions = { InferenceEngine::Precision::I8, }; -INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, ConvertLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, ConversionLayerTest, ::testing::Combine( + ::testing::ValuesIn(conversionOpTypes), ::testing::Values(inShape), ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_GPU)), - ConvertLayerTest::getTestCaseName); + ConversionLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert_like.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert_like.cpp deleted file mode 100644 index c55dc9d85bd..00000000000 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert_like.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (C) 2018-2021 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include - -#include "single_layer_tests/convert_like.hpp" -#include "common_test_utils/test_constants.hpp" - -using namespace LayerTestsDefinitions; - -namespace { -const std::vector> inShape = {{1, 2, 3, 4}}; - -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16, - InferenceEngine::Precision::U8, - InferenceEngine::Precision::I8, -}; - -INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, ConvertLikeLayerTest, - ::testing::Combine( - ::testing::Values(inShape), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(inShape), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_GPU)), - ConvertLikeLayerTest::getTestCaseName); - -} // namespace diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert_like.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/conversion.hpp similarity index 50% rename from inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert_like.hpp rename to inference-engine/tests/functional/plugin/shared/include/single_layer_tests/conversion.hpp index e4baa2315b9..18396e4ed99 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert_like.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/conversion.hpp @@ -4,12 +4,10 @@ #pragma once -#include "shared_test_classes/single_layer/convert_like.hpp" +#include "shared_test_classes/single_layer/conversion.hpp" namespace LayerTestsDefinitions { - -TEST_P(ConvertLikeLayerTest, CompareWithRefs) { +TEST_P(ConversionLayerTest, CompareWithRefs) { Run(); }; - -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert.hpp index 81e61f78234..02bd6dd05fc 100644 --- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/convert.hpp @@ -4,6 +4,9 @@ #pragma once +#include +IE_SUPPRESS_DEPRECATED_START + #include "shared_test_classes/single_layer/convert.hpp" namespace LayerTestsDefinitions { @@ -12,4 +15,6 @@ TEST_P(ConvertLayerTest, CompareWithRefs) { Run(); }; -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions + +IE_SUPPRESS_DEPRECATED_END diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/comparison.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/comparison.hpp index 1335d721eff..cfa0ae928d9 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/comparison.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/comparison.hpp @@ -36,6 +36,6 @@ protected: void SetUp() override; public: - static std::string getTestCaseName(testing::TestParamInfo obj); + static std::string getTestCaseName(const testing::TestParamInfo &obj); }; } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/conversion.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/conversion.hpp new file mode 100644 index 00000000000..093ad7fa07e --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/conversion.hpp @@ -0,0 +1,39 @@ +// Copyright (C) 2021 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include + +#include +#include + +#include "common_test_utils/common_utils.hpp" +#include "common_test_utils/test_common.hpp" +#include "common_test_utils/test_constants.hpp" +#include "ie_core.hpp" + +namespace LayerTestsDefinitions { + +static std::map conversionNames = { + {ngraph::helpers::ConversionTypes::CONVERT, "Convert"}, + {ngraph::helpers::ConversionTypes::CONVERT_LIKE, "ConvertLike"}}; + +using ConversionParamsTuple = typename std::tuple>, // Input1 shapes + InferenceEngine::Precision, // Input1 precision + InferenceEngine::Precision, // Input2 precision + InferenceEngine::Layout, // Input layout + InferenceEngine::Layout, // Output layout + std::string>; // Device name + +class ConversionLayerTest : public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { +public: + static std::string getTestCaseName(const testing::TestParamInfo& obj); + +protected: + void SetUp() override; +}; +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert.hpp index a50b1d2d6a9..545d85e7752 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert.hpp @@ -23,8 +23,10 @@ using ConvertParamsTuple = typename std::tuple< InferenceEngine::Layout, // Output layout std::string>; // Device name -class ConvertLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { +class INFERENCE_ENGINE_DEPRECATED("This class is deprecated and will be removed soon. " + "Please use new ConversionLayerTest class.") ConvertLayerTest : + public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(const testing::TestParamInfo &obj); @@ -32,4 +34,4 @@ protected: void SetUp() override; }; -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert_like.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert_like.hpp index d7872ac1d93..12d72d8a770 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert_like.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/convert_like.hpp @@ -24,8 +24,10 @@ using ConvertLikeParamsTuple = typename std::tuple< InferenceEngine::Layout, // Output layout std::string>; // Device name -class ConvertLikeLayerTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { +class INFERENCE_ENGINE_DEPRECATED("This class is deprecated and will be removed soon. " + "Please use new ConversionLayerTest class.") ConvertLikeLayerTest : + public testing::WithParamInterface, + virtual public LayerTestsUtils::LayerTestsCommon { public: static std::string getTestCaseName(const testing::TestParamInfo &obj); @@ -33,4 +35,4 @@ protected: void SetUp() override; }; -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/comparison.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/comparison.cpp index 1f2981b35ac..8092f41f6e5 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/comparison.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/comparison.cpp @@ -8,7 +8,7 @@ using namespace LayerTestsDefinitions::ComparisonParams; namespace LayerTestsDefinitions { -std::string ComparisonLayerTest::getTestCaseName(testing::TestParamInfo obj) { +std::string ComparisonLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { InputShapesTuple inputShapes; InferenceEngine::Precision ngInputsPrecision; ngraph::helpers::ComparisonTypes comparisonOpType; diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/conversion.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/conversion.cpp new file mode 100644 index 00000000000..0c5e7a387a7 --- /dev/null +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/conversion.cpp @@ -0,0 +1,45 @@ +// Copyright (C) 2021 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "shared_test_classes/single_layer/conversion.hpp" + +#include "ngraph_functions/builders.hpp" + +namespace LayerTestsDefinitions { + +std::string ConversionLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { + ngraph::helpers::ConversionTypes conversionOpType; + InferenceEngine::Precision inputPrecision, targetPrecision; + InferenceEngine::Layout inLayout, outLayout; + std::string targetName; + std::vector> inputShape; + std::tie(conversionOpType, inputShape, inputPrecision, targetPrecision, inLayout, outLayout, targetName) = + obj.param; + std::ostringstream result; + result << "conversionOpType=" << conversionNames[conversionOpType] << "_"; + result << "IS=" << CommonTestUtils::vec2str(inputShape) << "_"; + result << "inputPRC=" << inputPrecision.name() << "_"; + result << "targetPRC=" << targetPrecision.name() << "_"; + result << "inL=" << inLayout << "_"; + result << "outL=" << outLayout << "_"; + result << "trgDev=" << targetName; + return result.str(); +} + +void ConversionLayerTest::SetUp() { + ngraph::helpers::ConversionTypes conversionOpType; + InferenceEngine::Precision inputPrecision, targetPrecision; + std::vector> inputShape; + std::tie(conversionOpType, inputShape, inputPrecision, targetPrecision, inLayout, outLayout, targetDevice) = + GetParam(); + + auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(inputPrecision); + auto targetPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(targetPrecision); + auto params = ngraph::builder::makeParams(ngPrc, inputShape); + auto conversion = ngraph::builder::makeConversion(params.front(), targetPrc, conversionOpType); + + ngraph::ResultVector results{std::make_shared(conversion)}; + function = std::make_shared(results, params, "Conversion"); +} +} // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/convert.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convert.cpp index 17c23818fe9..01def7670cc 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/convert.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convert.cpp @@ -2,6 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // +#include +IE_SUPPRESS_DEPRECATED_START + #include "shared_test_classes/single_layer/convert.hpp" namespace LayerTestsDefinitions { @@ -33,4 +36,6 @@ void ConvertLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(convert)}; function = std::make_shared(results, params, "Convert"); } -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions + +IE_SUPPRESS_DEPRECATED_END diff --git a/inference-engine/tests/functional/shared_test_classes/src/single_layer/convert_like.cpp b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convert_like.cpp index d08d402c81e..8f2a92b78af 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/single_layer/convert_like.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/single_layer/convert_like.cpp @@ -2,6 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // +#include +IE_SUPPRESS_DEPRECATED_START + #include "shared_test_classes/single_layer/convert_like.hpp" namespace LayerTestsDefinitions { @@ -35,4 +38,6 @@ void ConvertLikeLayerTest::SetUp() { ngraph::ResultVector results{std::make_shared(convertLike)}; function = std::make_shared(results, params, "ConvertLike"); } -} // namespace LayerTestsDefinitions \ No newline at end of file +} // namespace LayerTestsDefinitions + +IE_SUPPRESS_DEPRECATED_END