From 7985fa51068a0ee589845f0c916396a2cd80b89a Mon Sep 17 00:00:00 2001 From: Ilya Churaev Date: Fri, 13 Oct 2023 13:19:53 +0400 Subject: [PATCH] Migrated all subgraph tests after quantization graphs (#20381) * Migrated all subgraph tests after quantization graphs * Fixed skip tests config * Add alias for NPU * Try to fix NPU * Remove unsupported precisions * Remove GNA test * Remove more tests --- .../skip_tests_config.cpp | 4 +- .../subgraph_tests/range_add.cpp | 131 ++++++++---------- .../subgraph_tests/relu_shape_of.cpp | 24 ++-- .../reshape_squeeze_reshape_relu.cpp | 71 +++++----- .../subgraph_tests/split_conv_concat.cpp | 28 ++-- .../subgraph_tests/variadic_split_pad.cpp | 70 +++++----- .../reshape_squeeze_reshape_relu.cpp | 49 ------- .../subgraph_tests/split_conv_concat.cpp | 22 --- .../reshape_squeeze_reshape_relu.cpp | 70 +++++----- .../subgraph_tests/split_conv_concat.cpp | 25 ++-- .../include/subgraph_tests/range_add.hpp | 10 +- .../include/subgraph_tests/relu_shape_of.hpp | 8 +- .../reshape_squeeze_reshape_relu.hpp | 10 +- .../subgraph_tests/split_conv_concat.hpp | 13 +- .../subgraph_tests/variadic_split_pad.hpp | 10 +- .../shared_test_classes/base/ov_subgraph.hpp | 6 + .../subgraph/range_add.hpp | 37 +++-- .../subgraph/relu_shape_of.hpp | 29 ++-- .../subgraph/reshape_squeeze_reshape_relu.hpp | 38 ++--- .../subgraph/split_conv_concat.hpp | 28 +++- .../subgraph/variadic_split_pad.hpp | 42 +++--- .../src/subgraph/range_add.cpp | 75 +++++----- .../src/subgraph/relu_shape_of.cpp | 51 +++---- .../subgraph/reshape_squeeze_reshape_relu.cpp | 82 +++++------ .../src/subgraph/split_conv_concat.cpp | 100 ++++++++++--- .../src/subgraph/variadic_split_pad.cpp | 42 +++--- 26 files changed, 538 insertions(+), 537 deletions(-) delete mode 100644 src/plugins/intel_gna/tests/functional/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp delete mode 100644 src/plugins/intel_gna/tests/functional/shared_tests_instances/subgraph_tests/split_conv_concat.cpp diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp index 01d8aed2669..4ea5a806700 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp @@ -24,8 +24,8 @@ std::vector disabledTestPatterns() { R"(.*(QuantGroupConv3D).*)", // TODO: Issue: 34518 R"(.*RangeLayerTest.*)", - R"(.*(RangeAddSubgraphTest).*Start=1.2.*Stop=(5.2|-5.2).*Step=(0.1|-0.1).*netPRC=FP16.*)", - R"(.*(RangeNumpyAddSubgraphTest).*netPRC=FP16.*)", + R"(.*(RangeAddSubgraphTest).*Start=1.2.*Stop=(5.2|-5.2).*Step=(0.1|-0.1).*ET=f16.*)", + R"(.*(RangeNumpyAddSubgraphTest).*ET=f16.*)", // TODO: Issue: 43793 R"(.*InferRequestPreprocessDynamicallyInSetBlobTest.*iPRC=0.*_iLT=1.*)", R"(.*InferRequestPreprocessDynamicallyInSetBlobTest.*oPRC=0.*_oLT=1.*)", diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/range_add.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/range_add.cpp index 409ba17f27e..5b19f8b34d7 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/range_add.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/range_add.cpp @@ -2,97 +2,76 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "subgraph_tests/range_add.hpp" + #include -#include "subgraph_tests/range_add.hpp" -#include "common_test_utils/test_constants.hpp" - -using namespace SubgraphTestsDefinitions; +using namespace ov::test; namespace { -const std::vector positiveStart = { 1.0f, 1.2f }; -const std::vector positiveStop = { 5.0f, 5.2f }; -const std::vector positiveStep = { 1.0f, 0.1f }; +const std::vector positiveStart = {1.0f, 1.2f}; +const std::vector positiveStop = {5.0f, 5.2f}; +const std::vector positiveStep = {1.0f, 0.1f}; -const std::vector negativeStart = { 1.0f, 1.2f }; -const std::vector negativeStop = { -5.0f, -5.2f }; -const std::vector negativeStep = { -1.0f, -0.1f }; +const std::vector negativeStart = {1.0f, 1.2f}; +const std::vector negativeStop = {-5.0f, -5.2f}; +const std::vector negativeStep = {-1.0f, -0.1f}; -const std::vector trunc_start = { 1.2f, 1.9f }; -const std::vector trunc_stop = { 11.4f, 11.8f }; -const std::vector trunc_step = { 1.3f, 2.8f }; +const std::vector trunc_start = {1.2f, 1.9f}; +const std::vector trunc_stop = {11.4f, 11.8f}; +const std::vector trunc_step = {1.3f, 2.8f}; -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16 // "[NOT_IMPLEMENTED] Input image format FP16 is not supported yet... +const std::vector element_types = { + ov::element::f32, + ov::element::f16 // "[NOT_IMPLEMENTED] Input image format FP16 is not supported yet... }; // ------------------------------ V0 ------------------------------ -INSTANTIATE_TEST_SUITE_P(smoke_BasicPositive, RangeAddSubgraphTest, - ::testing::Combine( - ::testing::ValuesIn(positiveStart), - ::testing::ValuesIn(positiveStop), - ::testing::ValuesIn(positiveStep), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(ov::test::utils::DEVICE_CPU)), - RangeAddSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_BasicPositive, + RangeAddSubgraphTest, + ::testing::Combine(::testing::ValuesIn(positiveStart), + ::testing::ValuesIn(positiveStop), + ::testing::ValuesIn(positiveStep), + ::testing::ValuesIn(element_types), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + RangeAddSubgraphTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_BasicNegative, RangeAddSubgraphTest, - ::testing::Combine( - ::testing::ValuesIn(negativeStart), - ::testing::ValuesIn(negativeStop), - ::testing::ValuesIn(negativeStep), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(ov::test::utils::DEVICE_CPU)), - RangeAddSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_BasicNegative, + RangeAddSubgraphTest, + ::testing::Combine(::testing::ValuesIn(negativeStart), + ::testing::ValuesIn(negativeStop), + ::testing::ValuesIn(negativeStep), + ::testing::ValuesIn(element_types), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + RangeAddSubgraphTest::getTestCaseName); // ------------------------------ V4 ------------------------------ -INSTANTIATE_TEST_SUITE_P(smoke_BasicPositive, RangeNumpyAddSubgraphTest, - ::testing::Combine( - ::testing::ValuesIn(positiveStart), - ::testing::ValuesIn(positiveStop), - ::testing::ValuesIn(positiveStep), - ::testing::ValuesIn(netPrecisions), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(ov::test::utils::DEVICE_CPU)), - RangeNumpyAddSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_BasicPositive, + RangeNumpyAddSubgraphTest, + ::testing::Combine(::testing::ValuesIn(positiveStart), + ::testing::ValuesIn(positiveStop), + ::testing::ValuesIn(positiveStep), + ::testing::ValuesIn(element_types), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + RangeNumpyAddSubgraphTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_BasicNegative, RangeNumpyAddSubgraphTest, - ::testing::Combine( - ::testing::ValuesIn(negativeStart), - ::testing::ValuesIn(negativeStop), - ::testing::ValuesIn(negativeStep), - ::testing::ValuesIn(netPrecisions), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(ov::test::utils::DEVICE_CPU)), - RangeNumpyAddSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_BasicNegative, + RangeNumpyAddSubgraphTest, + ::testing::Combine(::testing::ValuesIn(negativeStart), + ::testing::ValuesIn(negativeStop), + ::testing::ValuesIn(negativeStep), + ::testing::ValuesIn(element_types), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + RangeNumpyAddSubgraphTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_BasicTruncateInputs, RangeNumpyAddSubgraphTest, - ::testing::Combine( - ::testing::ValuesIn(trunc_start), - ::testing::ValuesIn(trunc_stop), - ::testing::ValuesIn(trunc_step), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::Precision::I32), - ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(ov::test::utils::DEVICE_CPU)), - RangeNumpyAddSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_BasicTruncateInputs, + RangeNumpyAddSubgraphTest, + ::testing::Combine(::testing::ValuesIn(trunc_start), + ::testing::ValuesIn(trunc_stop), + ::testing::ValuesIn(trunc_step), + ::testing::ValuesIn(element_types), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + RangeNumpyAddSubgraphTest::getTestCaseName); } // namespace diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/relu_shape_of.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/relu_shape_of.cpp index 18ad81aecc2..00559d09144 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/relu_shape_of.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/relu_shape_of.cpp @@ -2,22 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "subgraph_tests/relu_shape_of.hpp" + #include -#include "subgraph_tests/relu_shape_of.hpp" -#include "common_test_utils/test_constants.hpp" - -using namespace SubgraphTestsDefinitions; +using namespace ov::test; namespace { - const std::vector netPrecisions = { - InferenceEngine::Precision::I32 - }; +const std::vector input_types = {ov::element::i32}; - INSTANTIATE_TEST_SUITE_P(smoke_Check, ReluShapeOfSubgraphTest, - ::testing::Combine( - ::testing::ValuesIn(netPrecisions), - ::testing::Values(std::vector({20, 10, 10, 10})), - ::testing::Values(ov::test::utils::DEVICE_CPU)), - ReluShapeOfSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Check, + ReluShapeOfSubgraphTest, + ::testing::Combine(::testing::ValuesIn(input_types), + ::testing::Values(ov::element::i64), + ::testing::Values(ov::Shape{20, 10, 10, 10}), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + ReluShapeOfSubgraphTest::getTestCaseName); } // namespace diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp index 79743431999..fa82dc5baa7 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp @@ -2,47 +2,46 @@ // SPDX-License-Identifier: Apache-2.0 // -#include #include "subgraph_tests/reshape_squeeze_reshape_relu.hpp" -#include "common_test_utils/test_constants.hpp" -using namespace SubgraphTestsDefinitions; +#include + +using namespace ov::test; namespace { - std::vector inputs{ - {{1, 1, 3}, {0, 1}}, - {{1, 1, 3}, {0}}, - {{1, 1, 3}, {1}}, - {{1, 3, 1}, {0, 2}}, - {{1, 3, 1}, {0}}, - {{1, 3, 1}, {2}}, - {{3, 1, 1}, {1, 2}}, - {{3, 1, 1}, {1}}, - {{3, 1, 1}, {2}}, - {{4, 1, 3, 1}, {1, 3}}, - {{4, 1, 1, 3}, {1, 2}}, - {{1, 4, 1, 3}, {0, 2}}, - {{1, 3, 5, 2, 1}, {0, 4}}, - {{3, 1, 2, 4, 4, 3}, {1}}, - {{1, 1, 1, 1, 1, 3}, {0, 1, 2, 3, 4}}, - {{1, 1, 1, 1, 1, 3}, {1, 3}}, - {{1}, {0}}, - }; +std::vector inputs{ + {{1, 1, 3}, {0, 1}}, + {{1, 1, 3}, {0}}, + {{1, 1, 3}, {1}}, + {{1, 3, 1}, {0, 2}}, + {{1, 3, 1}, {0}}, + {{1, 3, 1}, {2}}, + {{3, 1, 1}, {1, 2}}, + {{3, 1, 1}, {1}}, + {{3, 1, 1}, {2}}, + {{4, 1, 3, 1}, {1, 3}}, + {{4, 1, 1, 3}, {1, 2}}, + {{1, 4, 1, 3}, {0, 2}}, + {{1, 3, 5, 2, 1}, {0, 4}}, + {{3, 1, 2, 4, 4, 3}, {1}}, + {{1, 1, 1, 1, 1, 3}, {0, 1, 2, 3, 4}}, + {{1, 1, 1, 1, 1, 3}, {1, 3}}, + {{1}, {0}}, +}; - std::vector netPrecisions = {InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16, - }; +std::vector input_types = { + ov::element::f32, + ov::element::f16, +}; - const std::vector opTypes = { - ngraph::helpers::SqueezeOpType::SQUEEZE, - ngraph::helpers::SqueezeOpType::UNSQUEEZE - }; +const std::vector opTypes = {ov::test::utils::SqueezeOpType::SQUEEZE, + ov::test::utils::SqueezeOpType::UNSQUEEZE}; - INSTANTIATE_TEST_SUITE_P(smoke_reshape_squeeze_reshape_relu, ReshapeSqueezeReshapeRelu, - ::testing::Combine( - ::testing::ValuesIn(inputs), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::test::utils::DEVICE_CPU), - ::testing::ValuesIn(opTypes)), - ReshapeSqueezeReshapeRelu::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_reshape_squeeze_reshape_relu, + ReshapeSqueezeReshapeRelu, + ::testing::Combine(::testing::ValuesIn(inputs), + ::testing::ValuesIn(input_types), + ::testing::Values(ov::test::utils::DEVICE_CPU), + ::testing::ValuesIn(opTypes)), + ReshapeSqueezeReshapeRelu::getTestCaseName); } // namespace diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/split_conv_concat.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/split_conv_concat.cpp index 8e347ad75c3..1d60e681877 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/split_conv_concat.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/split_conv_concat.cpp @@ -2,28 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "subgraph_tests/split_conv_concat.hpp" + #include -#include "subgraph_tests/split_conv_concat.hpp" -#include "common_test_utils/test_constants.hpp" - -using namespace SubgraphTestsDefinitions; +using namespace ov::test; namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16 -}; +const std::vector input_types = {ov::element::f32, ov::element::f16}; -INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, SplitConvConcat, - ::testing::Combine( - ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::SizeVector({1, 6, 40, 40})), - ::testing::Values(ov::test::utils::DEVICE_CPU)), - SplitConvConcat::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, + SplitConvConcat, + ::testing::Combine(::testing::ValuesIn(input_types), + ::testing::Values(ov::Shape{1, 6, 40, 40}), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + SplitConvConcat::getTestCaseName); } // namespace - - - - diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/variadic_split_pad.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/variadic_split_pad.cpp index 7386a46ef38..27d63ad27ff 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/variadic_split_pad.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/variadic_split_pad.cpp @@ -4,60 +4,52 @@ #include "subgraph_tests/variadic_split_pad.hpp" -using namespace SubgraphTestsDefinitions; +using namespace ov::test; namespace { -const std::vector netPrecision = { - InferenceEngine::Precision::FP32 -}; +const std::vector input_type = {ov::element::f32}; -const std::vector shapes = { - {1, 8, 3, 2}, - {3, 8, 8, 8}, +const std::vector shapes = { + {1, 8, 3, 2}, + {3, 8, 8, 8}, }; const std::vector> connectedIndexes = { - {0}, - {0, 2}, - {0, 1, 3}, - {0, 1, 1, 0}, - {0, 0, 0, 1}, + {0}, + {0, 2}, + {0, 1, 3}, + {0, 1, 1, 0}, + {0, 0, 0, 1}, }; -const std::vector> numSplits = { - {2, 2, 2, 2}, - {1, 2, 4, 1}, - {3, 2, 2, 1} -}; +const std::vector> numSplits = {{2, 2, 2, 2}, {1, 2, 4, 1}, {3, 2, 2, 1}}; const std::vector> padsBegin = { - {0, 0, 0, 0}, - {0, 0, 1, 1}, + {0, 0, 0, 0}, + {0, 0, 1, 1}, }; const std::vector> padsEnd = { - {0, 0, 0, 0}, - {0, 0, 1, 1}, + {0, 0, 0, 0}, + {0, 0, 1, 1}, }; -const std::vector padMode = { - ngraph::helpers::PadMode::CONSTANT, - ngraph::helpers::PadMode::EDGE, - ngraph::helpers::PadMode::REFLECT, - ngraph::helpers::PadMode::SYMMETRIC -}; +const std::vector padMode = {ov::op::PadMode::CONSTANT, + ov::op::PadMode::EDGE, + ov::op::PadMode::REFLECT, + ov::op::PadMode::SYMMETRIC}; -INSTANTIATE_TEST_SUITE_P(smoke_CPU, VariadicSplitPad, - ::testing::Combine( - ::testing::ValuesIn(shapes), - ::testing::Values(1), - ::testing::ValuesIn(numSplits), - ::testing::ValuesIn(connectedIndexes), - ::testing::ValuesIn(padsBegin), - ::testing::ValuesIn(padsEnd), - ::testing::ValuesIn(padMode), - ::testing::ValuesIn(netPrecision), - ::testing::Values(ov::test::utils::DEVICE_CPU)), - VariadicSplitPad::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CPU, + VariadicSplitPad, + ::testing::Combine(::testing::ValuesIn(shapes), + ::testing::Values(1), + ::testing::ValuesIn(numSplits), + ::testing::ValuesIn(connectedIndexes), + ::testing::ValuesIn(padsBegin), + ::testing::ValuesIn(padsEnd), + ::testing::ValuesIn(padMode), + ::testing::ValuesIn(input_type), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + VariadicSplitPad::getTestCaseName); } // namespace diff --git a/src/plugins/intel_gna/tests/functional/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp b/src/plugins/intel_gna/tests/functional/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp deleted file mode 100644 index f702ba9b3ec..00000000000 --- a/src/plugins/intel_gna/tests/functional/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "subgraph_tests/reshape_squeeze_reshape_relu.hpp" - -#include - -#include "common_test_utils/test_constants.hpp" - -using namespace SubgraphTestsDefinitions; - -namespace { -std::vector inputs{ - {{1, 1, 3}, {0, 1}}, - {{1, 1, 3}, {0}}, - {{1, 1, 3}, {1}}, - {{1, 3, 1}, {0, 2}}, - {{1, 3, 1}, {0}}, - {{1, 3, 1}, {2}}, - {{3, 1, 1}, {1, 2}}, - {{3, 1, 1}, {1}}, - {{3, 1, 1}, {2}}, - {{4, 1, 3, 1}, {1, 3}}, - {{4, 1, 1, 3}, {1, 2}}, - {{1, 4, 1, 3}, {0, 2}}, - {{1, 3, 5, 2, 1}, {0, 4}}, - {{3, 1, 2, 4, 4, 3}, {1}}, - {{1, 1, 1, 1, 1, 3}, {0, 1, 2, 3, 4}}, - {{1, 1, 1, 1, 1, 3}, {1, 3}}, - {{1}, {0}}, -}; - -std::vector netPrecisions = { - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16, -}; - -const std::vector opTypes = {ngraph::helpers::SqueezeOpType::SQUEEZE, - ngraph::helpers::SqueezeOpType::UNSQUEEZE}; - -INSTANTIATE_TEST_SUITE_P(smoke_reshape_squeeze_reshape_relu, - ReshapeSqueezeReshapeRelu, - ::testing::Combine(::testing::ValuesIn(inputs), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::test::utils::DEVICE_GNA), - ::testing::ValuesIn(opTypes)), - ReshapeSqueezeReshapeRelu::getTestCaseName); -} // namespace diff --git a/src/plugins/intel_gna/tests/functional/shared_tests_instances/subgraph_tests/split_conv_concat.cpp b/src/plugins/intel_gna/tests/functional/shared_tests_instances/subgraph_tests/split_conv_concat.cpp deleted file mode 100644 index 1d9cea34c78..00000000000 --- a/src/plugins/intel_gna/tests/functional/shared_tests_instances/subgraph_tests/split_conv_concat.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "subgraph_tests/split_conv_concat.hpp" - -#include - -#include "common_test_utils/test_constants.hpp" - -using namespace SubgraphTestsDefinitions; -const std::vector netPrecisions = {InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16}; - -std::vector> inputShapes = {{1, 32, 1, 130}, {1, 64, 1, 170}, {1, 32, 1, 1026}}; - -INSTANTIATE_TEST_SUITE_P(smoke_SplitConvConcat, - SplitConvConcat, - ::testing::Combine(::testing::ValuesIn(netPrecisions), - ::testing::ValuesIn(inputShapes), - ::testing::Values(ov::test::utils::DEVICE_GNA)), - SplitConvConcat::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp index 872140ceea8..78cef86f3b0 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp @@ -2,48 +2,48 @@ // SPDX-License-Identifier: Apache-2.0 // -#include #include "subgraph_tests/reshape_squeeze_reshape_relu.hpp" + +#include + #include "common_test_utils/test_constants.hpp" -using namespace SubgraphTestsDefinitions; +using namespace ov::test; namespace { - std::vector inputs_squeeze { - {{1, 1, 3}, {0, 1}}, - {{1, 1, 3}, {1}}, - {{1, 3, 1}, {0, 2}}, - {{3, 1, 1}, {1}}, - {{1, 4, 1, 3}, {0, 2}}, - {{3, 1, 2, 4, 4, 3}, {1}}, - {{1, 1, 1, 1, 1, 3}, {0, 1, 2, 3, 4}}, - {{1}, {0}}, - }; +std::vector inputs_squeeze{ + {{1, 1, 3}, {0, 1}}, + {{1, 1, 3}, {1}}, + {{1, 3, 1}, {0, 2}}, + {{3, 1, 1}, {1}}, + {{1, 4, 1, 3}, {0, 2}}, + {{3, 1, 2, 4, 4, 3}, {1}}, + {{1, 1, 1, 1, 1, 3}, {0, 1, 2, 3, 4}}, + {{1}, {0}}, +}; - std::vector inputs_unsqueeze{ - {{1}, {0}}, - {{1}, {0, 1}}, - {{1}, {0, 1, 2}}, - {{1, 2, 3}, {0}}, - {{1, 1, 3}, {1, 2}}, - {{1, 4, 1, 3}, {0, 2}}, - }; +std::vector inputs_unsqueeze{ + {{1}, {0}}, + {{1}, {0, 1}}, + {{1}, {0, 1, 2}}, + {{1, 2, 3}, {0}}, + {{1, 1, 3}, {1, 2}}, + {{1, 4, 1, 3}, {0, 2}}, +}; - std::vector netPrecisions = {InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16, - }; +std::vector input_types = { + ov::element::f32, + ov::element::f16, +}; +const std::vector opTypes = {ov::test::utils::SqueezeOpType::SQUEEZE, + ov::test::utils::SqueezeOpType::UNSQUEEZE}; - const std::vector opTypes = { - ngraph::helpers::SqueezeOpType::SQUEEZE, - ngraph::helpers::SqueezeOpType::UNSQUEEZE - }; - - INSTANTIATE_TEST_SUITE_P(smoke_reshape_squeeze_reshape_relu, ReshapeSqueezeReshapeRelu, - ::testing::Combine( - ::testing::ValuesIn(inputs_squeeze), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::test::utils::DEVICE_GPU), - ::testing::ValuesIn(opTypes)), - ReshapeSqueezeReshapeRelu::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_reshape_squeeze_reshape_relu, + ReshapeSqueezeReshapeRelu, + ::testing::Combine(::testing::ValuesIn(inputs_squeeze), + ::testing::ValuesIn(input_types), + ::testing::Values(ov::test::utils::DEVICE_GPU), + ::testing::ValuesIn(opTypes)), + ReshapeSqueezeReshapeRelu::getTestCaseName); } // namespace diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/split_conv_concat.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/split_conv_concat.cpp index 3d5a1af9051..5857c2188cf 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/split_conv_concat.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/split_conv_concat.cpp @@ -2,26 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "subgraph_tests/split_conv_concat.hpp" + #include -#include "subgraph_tests/split_conv_concat.hpp" -#include "common_test_utils/test_constants.hpp" - -using namespace SubgraphTestsDefinitions; +using namespace ov::test; namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16 -}; +const std::vector input_types = {ov::element::f32, ov::element::f16}; -INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, SplitConvConcat, - ::testing::Combine( - ::testing::ValuesIn(netPrecisions), - ::testing::Values(std::vector({1, 6, 40, 40})), - ::testing::Values(ov::test::utils::DEVICE_GPU)), - SplitConvConcat::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, + SplitConvConcat, + ::testing::Combine(::testing::ValuesIn(input_types), + ::testing::Values(ov::Shape{1, 6, 40, 40}), + ::testing::Values(ov::test::utils::DEVICE_GPU)), + SplitConvConcat::getTestCaseName); } // namespace - diff --git a/src/tests/functional/plugin/shared/include/subgraph_tests/range_add.hpp b/src/tests/functional/plugin/shared/include/subgraph_tests/range_add.hpp index 197fe81621e..ce16e585074 100644 --- a/src/tests/functional/plugin/shared/include/subgraph_tests/range_add.hpp +++ b/src/tests/functional/plugin/shared/include/subgraph_tests/range_add.hpp @@ -6,14 +6,16 @@ #include "shared_test_classes/subgraph/range_add.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { TEST_P(RangeAddSubgraphTest, CompareWithRefs) { - Run(); + run(); } TEST_P(RangeNumpyAddSubgraphTest, CompareWithRefs) { - Run(); + run(); } -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov diff --git a/src/tests/functional/plugin/shared/include/subgraph_tests/relu_shape_of.hpp b/src/tests/functional/plugin/shared/include/subgraph_tests/relu_shape_of.hpp index b2391ef6c04..e26e8837f80 100644 --- a/src/tests/functional/plugin/shared/include/subgraph_tests/relu_shape_of.hpp +++ b/src/tests/functional/plugin/shared/include/subgraph_tests/relu_shape_of.hpp @@ -6,10 +6,12 @@ #include "shared_test_classes/subgraph/relu_shape_of.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { TEST_P(ReluShapeOfSubgraphTest, CompareWithRefs) { - Run(); + run(); } -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov diff --git a/src/tests/functional/plugin/shared/include/subgraph_tests/reshape_squeeze_reshape_relu.hpp b/src/tests/functional/plugin/shared/include/subgraph_tests/reshape_squeeze_reshape_relu.hpp index 331ee30f7e5..7b1c841d7d1 100644 --- a/src/tests/functional/plugin/shared/include/subgraph_tests/reshape_squeeze_reshape_relu.hpp +++ b/src/tests/functional/plugin/shared/include/subgraph_tests/reshape_squeeze_reshape_relu.hpp @@ -6,10 +6,12 @@ #include "shared_test_classes/subgraph/reshape_squeeze_reshape_relu.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { -TEST_P(ReshapeSqueezeReshapeRelu, CompareWithRefs){ - Run(); +TEST_P(ReshapeSqueezeReshapeRelu, CompareWithRefs) { + run(); }; -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov diff --git a/src/tests/functional/plugin/shared/include/subgraph_tests/split_conv_concat.hpp b/src/tests/functional/plugin/shared/include/subgraph_tests/split_conv_concat.hpp index c121683977f..5fd61dd48f7 100644 --- a/src/tests/functional/plugin/shared/include/subgraph_tests/split_conv_concat.hpp +++ b/src/tests/functional/plugin/shared/include/subgraph_tests/split_conv_concat.hpp @@ -6,14 +6,17 @@ #include "shared_test_classes/subgraph/split_conv_concat.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { TEST_P(SplitConvConcat, CompareWithRefImpl) { - Run(); + run(); }; -TEST_P(SplitConvConcat, QueryNetwork) { - QueryNetwork(); +TEST_P(SplitConvConcat, QueryModel) { + query_model(); } -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov + diff --git a/src/tests/functional/plugin/shared/include/subgraph_tests/variadic_split_pad.hpp b/src/tests/functional/plugin/shared/include/subgraph_tests/variadic_split_pad.hpp index 9b9d4fb7783..8f1eec6cbf6 100644 --- a/src/tests/functional/plugin/shared/include/subgraph_tests/variadic_split_pad.hpp +++ b/src/tests/functional/plugin/shared/include/subgraph_tests/variadic_split_pad.hpp @@ -6,10 +6,12 @@ #include "shared_test_classes/subgraph/variadic_split_pad.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { -TEST_P(VariadicSplitPad, CompareWithRefs){ - Run(); +TEST_P(VariadicSplitPad, CompareWithRefs) { + run(); }; -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/ov_subgraph.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/ov_subgraph.hpp index 05867b81d67..5ca0b6531a3 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/ov_subgraph.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/ov_subgraph.hpp @@ -20,6 +20,12 @@ using ElementType = ov::element::Type_t; using Config = ov::AnyMap; using TargetDevice = std::string; +typedef std::tuple + BasicParams; + class SubgraphBaseTest : public ov::test::TestsCommon { public: virtual void run(); diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/range_add.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/range_add.hpp index 18fe4775ebb..6139db3244f 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/range_add.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/range_add.hpp @@ -4,36 +4,45 @@ #pragma once -#include -#include -#include #include +#include +#include +#include -#include "shared_test_classes/base/layer_test_utils.hpp" -#include "ov_models/builders.hpp" +#include "shared_test_classes/base/ov_subgraph.hpp" -#include "shared_test_classes/single_layer/range.hpp" +namespace ov { +namespace test { -namespace SubgraphTestsDefinitions { +typedef std::tuple + RangeParams; // ------------------------------ V0 ------------------------------ -class RangeAddSubgraphTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { +class RangeAddSubgraphTest : public testing::WithParamInterface, + virtual public ov::test::SubgraphBaseStaticTest { public: - static std::string getTestCaseName(const testing::TestParamInfo& obj); + static std::string getTestCaseName(const testing::TestParamInfo& obj); + protected: void SetUp() override; }; // ------------------------------ V4 ------------------------------ -class RangeNumpyAddSubgraphTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { +class RangeNumpyAddSubgraphTest : public testing::WithParamInterface, + virtual public ov::test::SubgraphBaseStaticTest { public: - static std::string getTestCaseName(const testing::TestParamInfo& obj); + static std::string getTestCaseName(const testing::TestParamInfo& obj); + protected: void SetUp() override; }; -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/relu_shape_of.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/relu_shape_of.hpp index c84f0e2d829..6127de67d74 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/relu_shape_of.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/relu_shape_of.hpp @@ -4,23 +4,26 @@ #pragma once -#include -#include -#include -#include +#include "shared_test_classes/base/ov_subgraph.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" -#include "shared_test_classes/single_layer/shape_of.hpp" +namespace ov { +namespace test { -#include "ov_models/builders.hpp" +typedef std::tuple + ShapeOfParams; -namespace SubgraphTestsDefinitions { - -class ReluShapeOfSubgraphTest : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { +class ReluShapeOfSubgraphTest : public testing::WithParamInterface, + virtual public ov::test::SubgraphBaseStaticTest { public: - static std::string getTestCaseName(const testing::TestParamInfo& obj); + static std::string getTestCaseName(const testing::TestParamInfo& obj); + protected: void SetUp() override; }; -} // namespace SubgraphTestsDefinitions + +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_squeeze_reshape_relu.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_squeeze_reshape_relu.hpp index eb4811e08cf..b2c69f96d94 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_squeeze_reshape_relu.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/reshape_squeeze_reshape_relu.hpp @@ -4,30 +4,32 @@ #pragma once -#include #include +#include #include -#include -#include "shared_test_classes/base/layer_test_utils.hpp" -#include "ov_models/builders.hpp" -#include "ov_models/utils/ov_helpers.hpp" -namespace SubgraphTestsDefinitions { -using ShapeAxesTuple = std::pair, std::vector>; +#include "common_test_utils/test_enums.hpp" +#include "shared_test_classes/base/ov_subgraph.hpp" -using ReshapeSqueezeReshapeReluTuple = typename std::tuple< - ShapeAxesTuple, // Input shapes & squeeze_indices - InferenceEngine::Precision, // Network precision - std::string, // Device name - ngraph::helpers::SqueezeOpType // SqueezeOpType ->; +namespace ov { +namespace test { -class ReshapeSqueezeReshapeRelu - : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { +using ShapeAxesTuple = std::pair>; + +using ReshapeSqueezeReshapeReluTuple = typename std::tuple; + +class ReshapeSqueezeReshapeRelu : public testing::WithParamInterface, + virtual public ov::test::SubgraphBaseStaticTest { public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); + static std::string getTestCaseName(const testing::TestParamInfo& obj); + protected: void SetUp() override; }; -} // namespace SubgraphTestsDefinitions + +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_conv_concat.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_conv_concat.hpp index a02822a50b9..d74865a6bb0 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_conv_concat.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/split_conv_concat.hpp @@ -4,19 +4,37 @@ #pragma once +#include +#include #include #include -#include -#include #include "shared_test_classes/base/layer_test_utils.hpp" -#include "ov_models/utils/ov_helpers.hpp" -#include "ov_models/builders.hpp" +#include "shared_test_classes/base/ov_subgraph.hpp" + +namespace ov { +namespace test { + +class SplitConvConcatBase : public ov::test::SubgraphBaseStaticTest { +protected: + void configure_test(const ov::test::BasicParams& param); +}; + +class SplitConvConcat : public testing::WithParamInterface, virtual public SplitConvConcatBase { +public: + static std::string getTestCaseName(const testing::TestParamInfo& obj); + +protected: + void SetUp() override; +}; + +} // namespace test +} // namespace ov namespace SubgraphTestsDefinitions { class SplitConvConcat : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { + virtual public ov::test::SplitConvConcatBase { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/variadic_split_pad.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/variadic_split_pad.hpp index 6cfbf942869..d9744f8b2ab 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/variadic_split_pad.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/variadic_split_pad.hpp @@ -4,33 +4,35 @@ #pragma once -#include #include +#include #include -#include "shared_test_classes/base/layer_test_utils.hpp" -#include "ov_models/builders.hpp" +#include "shared_test_classes/base/ov_subgraph.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { -typedef std::tuple< - InferenceEngine::SizeVector, // Input shapes - size_t, // Axis - std::vector, // Split number - std::vector, // Index connected layer - std::vector, // Pad begin - std::vector, // Pad end - ngraph::helpers::PadMode, // Pad mode - InferenceEngine::Precision, // Network precision - std::string // Device name -> SplitPadTuple; +typedef std::tuple, // Split number + std::vector, // Index connected layer + std::vector, // Pad begin + std::vector, // Pad end + ov::op::PadMode, // Pad mode + ov::element::Type, // Input element type + std::string // Device name + > + SplitPadTuple; - -class VariadicSplitPad: public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon{ +class VariadicSplitPad : public testing::WithParamInterface, + virtual public ov::test::SubgraphBaseStaticTest { public: - static std::string getTestCaseName(const testing::TestParamInfo &obj); + static std::string getTestCaseName(const testing::TestParamInfo& obj); + protected: void SetUp() override; }; -} // namespace SubgraphTestsDefinitions + +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/src/subgraph/range_add.cpp b/src/tests/functional/shared_test_classes/src/subgraph/range_add.cpp index 86cfab9864b..129b19667ba 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/range_add.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/range_add.cpp @@ -4,84 +4,79 @@ #include "shared_test_classes/subgraph/range_add.hpp" -namespace SubgraphTestsDefinitions { +#include "ov_models/builders.hpp" + +namespace ov { +namespace test { // ------------------------------ V0 ------------------------------ -std::string RangeAddSubgraphTest::getTestCaseName(const testing::TestParamInfo& obj) { - InferenceEngine::Precision netPrecision; - InferenceEngine::Precision inPrc, outPrc; - InferenceEngine::Layout inLayout, outLayout; +std::string RangeAddSubgraphTest::getTestCaseName(const testing::TestParamInfo& obj) { + ov::element::Type input_type; float start, stop, step; std::string targetDevice; - std::tie(start, stop, step, netPrecision, inPrc, outPrc, inLayout, outLayout, targetDevice) = obj.param; + std::tie(start, stop, step, input_type, targetDevice) = obj.param; std::ostringstream result; const char separator = '_'; result << "Start=" << start << separator; result << "Stop=" << stop << separator; result << "Step=" << step << separator; - result << "netPRC=" << netPrecision.name() << separator; + result << "ET=" << input_type << separator; result << "targetDevice=" << targetDevice; return result.str(); } void RangeAddSubgraphTest::SetUp() { - InferenceEngine::Precision netPrecision; + ov::element::Type element_type; float start, stop, step; - std::tie(start, stop, step, netPrecision, inPrc, outPrc, inLayout, outLayout, targetDevice) = GetParam(); - auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); + std::tie(start, stop, step, element_type, targetDevice) = GetParam(); - auto startConstant = std::make_shared(ngPrc, ngraph::Shape{}, start); - auto stopConstant = std::make_shared(ngPrc, ngraph::Shape{}, stop); - auto stepConstant = std::make_shared(ngPrc, ngraph::Shape{}, step); - auto range = std::make_shared(startConstant, stopConstant, stepConstant); + auto startConstant = std::make_shared(element_type, ov::Shape{}, start); + auto stopConstant = std::make_shared(element_type, ov::Shape{}, stop); + auto stepConstant = std::make_shared(element_type, ov::Shape{}, step); + auto range = std::make_shared(startConstant, stopConstant, stepConstant); - ov::ParameterVector params{std::make_shared(ngPrc, range->get_shape())}; - auto eltwise = ngraph::builder::makeEltwise(params.front(), range, ngraph::helpers::EltwiseTypes::ADD); - const ngraph::ResultVector results{std::make_shared(eltwise)}; - function = std::make_shared(results, params, "RangeEltwise"); + ov::ParameterVector params{std::make_shared(element_type, range->get_shape())}; + auto eltwise = ngraph::builder::makeEltwise(params.front(), range, ov::test::utils::EltwiseTypes::ADD); + const ov::ResultVector results{std::make_shared(eltwise)}; + function = std::make_shared(results, params, "RangeEltwise"); } // ------------------------------ V4 ------------------------------ -std::string RangeNumpyAddSubgraphTest::getTestCaseName(const testing::TestParamInfo& obj) { - InferenceEngine::Precision netPrc; - InferenceEngine::Precision constPrc; - InferenceEngine::Precision outPrc; - InferenceEngine::Layout inLayout, outLayout; +std::string RangeNumpyAddSubgraphTest::getTestCaseName(const testing::TestParamInfo& obj) { + ov::element::Type element_type; float start, stop, step; std::string targetDevice; - std::tie(start, stop, step, constPrc, netPrc, outPrc, inLayout, outLayout, targetDevice) = obj.param; + std::tie(start, stop, step, element_type, targetDevice) = obj.param; std::ostringstream result; const char separator = '_'; result << "Start=" << start << separator; result << "Stop=" << stop << separator; result << "Step=" << step << separator; - result << "constPRC=" << constPrc.name() << separator; - result << "netPRC=" << netPrc.name() << separator; + result << "ET=" << element_type << separator; result << "targetDevice=" << targetDevice; return result.str(); } void RangeNumpyAddSubgraphTest::SetUp() { - InferenceEngine::Precision netPrc; - InferenceEngine::Precision constPrc; + ov::element::Type element_type; float start, stop, step; - std::tie(start, stop, step, constPrc, netPrc, outPrc, inLayout, outLayout, targetDevice) = GetParam(); - auto ngConstPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(constPrc); - auto ngNetPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrc); + std::tie(start, stop, step, element_type, targetDevice) = GetParam(); - auto startConstant = std::make_shared(ngConstPrc, ngraph::Shape{}, start); - auto stopConstant = std::make_shared(ngConstPrc, ngraph::Shape{}, stop); - auto stepConstant = std::make_shared(ngConstPrc, ngraph::Shape{}, step); - auto range = std::make_shared(startConstant, stopConstant, stepConstant, ngNetPrc); + auto startConstant = std::make_shared(element_type, ov::Shape{}, start); + auto stopConstant = std::make_shared(element_type, ov::Shape{}, stop); + auto stepConstant = std::make_shared(element_type, ov::Shape{}, step); + auto range = std::make_shared(startConstant, stopConstant, stepConstant, element_type); - ov::ParameterVector params{std::make_shared(ngNetPrc, range->get_shape())}; + ov::ParameterVector params{std::make_shared(element_type, range->get_shape())}; - auto eltwise = ngraph::builder::makeEltwise(params.front(), range, ngraph::helpers::EltwiseTypes::ADD); - const ngraph::ResultVector results{std::make_shared(eltwise)}; - function = std::make_shared(results, params, "RangeEltwise"); + auto eltwise = ngraph::builder::makeEltwise(params.front(), range, ov::test::utils::EltwiseTypes::ADD); + const ov::ResultVector results{std::make_shared(eltwise)}; + function = std::make_shared(results, params, "RangeEltwise"); } -} // namespace SubgraphTestsDefinitions + +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/src/subgraph/relu_shape_of.cpp b/src/tests/functional/shared_test_classes/src/subgraph/relu_shape_of.cpp index b23f32f4d5b..bbb78339d04 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/relu_shape_of.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/relu_shape_of.cpp @@ -4,29 +4,32 @@ #include "shared_test_classes/subgraph/relu_shape_of.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { - std::string ReluShapeOfSubgraphTest::getTestCaseName(const testing::TestParamInfo& obj) { - InferenceEngine::SizeVector inputShapes; - InferenceEngine::Precision inputPrecision; - std::string targetDevice; - std::tie(inputPrecision, inputShapes, targetDevice) = obj.param; - std::ostringstream result; - result << "IS=" << ov::test::utils::vec2str(inputShapes) << "_"; - result << "Precision=" << inputPrecision.name() << "_"; - result << "TargetDevice=" << targetDevice; - return result.str(); - } +std::string ReluShapeOfSubgraphTest::getTestCaseName(const testing::TestParamInfo& obj) { + ov::Shape inputShapes; + ov::element::Type element_type, output_type; + std::string targetDevice; + std::tie(element_type, output_type, inputShapes, targetDevice) = obj.param; + std::ostringstream result; + result << "IS=" << ov::test::utils::vec2str(inputShapes) << "_"; + result << "IET=" << element_type << "_"; + result << "OET=" << output_type << "_"; + result << "TargetDevice=" << targetDevice; + return result.str(); +} - void ReluShapeOfSubgraphTest::SetUp() { - InferenceEngine::SizeVector inputShapes; - InferenceEngine::Precision inputPrecision; - std::tie(inputPrecision, inputShapes, targetDevice) = this->GetParam(); - auto inType = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(inputPrecision); - ov::ParameterVector param {std::make_shared(inType, ov::Shape(inputShapes))}; - auto relu = std::make_shared(param[0]); - auto shapeOf = std::make_shared(relu, inType); - const ngraph::ResultVector results{std::make_shared(shapeOf)}; - function = std::make_shared(results, param, "ReluShapeOf"); - } -} // namespace SubgraphTestsDefinitions +void ReluShapeOfSubgraphTest::SetUp() { + ov::Shape inputShapes; + ov::element::Type element_type, output_type; + std::tie(element_type, output_type, inputShapes, targetDevice) = this->GetParam(); + ov::ParameterVector param{std::make_shared(element_type, ov::Shape(inputShapes))}; + auto relu = std::make_shared(param[0]); + auto shapeOf = std::make_shared(relu, output_type); + const ov::ResultVector results{std::make_shared(shapeOf)}; + function = std::make_shared(results, param, "ReluShapeOf"); +} + +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/src/subgraph/reshape_squeeze_reshape_relu.cpp b/src/tests/functional/shared_test_classes/src/subgraph/reshape_squeeze_reshape_relu.cpp index 098f1d12a5e..1d0c680a554 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/reshape_squeeze_reshape_relu.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/reshape_squeeze_reshape_relu.cpp @@ -2,46 +2,50 @@ // SPDX-License-Identifier: Apache-2.0 // -#include #include "shared_test_classes/subgraph/reshape_squeeze_reshape_relu.hpp" -namespace SubgraphTestsDefinitions { - std::string ReshapeSqueezeReshapeRelu::getTestCaseName(const testing::TestParamInfo &obj) { - ShapeAxesTuple squeezeShape; - InferenceEngine::Precision netPrecision; - std::string targetName; - ngraph::helpers::SqueezeOpType opType; - std::tie(squeezeShape, netPrecision, targetName, opType) = obj.param; - std::ostringstream results; - results << "OpType=" << opType; - results << "IS=" << ov::test::utils::vec2str(squeezeShape.first) << "_"; - results << "indices=" << ov::test::utils::vec2str(squeezeShape.second) << "_"; - results << "netPRC=" << netPrecision.name() << "_"; - results << "targetDevice=" << targetName << "_"; - return results.str(); - } +#include "ov_models/builders.hpp" - void ReshapeSqueezeReshapeRelu::SetUp() { - ShapeAxesTuple squeezeShape; - InferenceEngine::Precision netPrecision; - ngraph::helpers::SqueezeOpType opType; - std::tie(squeezeShape, netPrecision, targetDevice, opType) = this->GetParam(); - const std::size_t input_dim = InferenceEngine::details::product(squeezeShape.first); - auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - std::vector shape_input{1, input_dim}; - ov::ParameterVector input {std::make_shared(ngPrc, ov::Shape(shape_input))}; - auto reshape1_pattern = std::make_shared(ngraph::element::i64, - ngraph::Shape{squeezeShape.first.size()}, - squeezeShape.first); - auto reshape1 = std::make_shared(input[0], reshape1_pattern, false); - auto squeeze = ngraph::builder::makeSqueezeUnsqueeze(reshape1, ngraph::element::i64, squeezeShape.second, opType); - auto reshape2_pattern = std::make_shared(ngraph::element::i64, - ngraph::Shape{2}, - std::vector{1, input_dim}); - auto reshape2 = std::make_shared(squeeze, reshape2_pattern, false); - auto func = std::make_shared(reshape2); - std::string squeezeType; +namespace ov { +namespace test { - function = std::make_shared(func, input, "reshape_squeeze_reshape_relu"); - } -} // namespace SubgraphTestsDefinitions +std::string ReshapeSqueezeReshapeRelu::getTestCaseName( + const testing::TestParamInfo& obj) { + ShapeAxesTuple squeezeShape; + ov::element::Type element_type; + std::string targetName; + ov::test::utils::SqueezeOpType opType; + std::tie(squeezeShape, element_type, targetName, opType) = obj.param; + std::ostringstream results; + results << "OpType=" << opType; + results << "IS=" << ov::test::utils::vec2str(squeezeShape.first) << "_"; + results << "indices=" << ov::test::utils::vec2str(squeezeShape.second) << "_"; + results << "netPRC=" << element_type << "_"; + results << "targetDevice=" << targetName << "_"; + return results.str(); +} + +void ReshapeSqueezeReshapeRelu::SetUp() { + ShapeAxesTuple squeezeShape; + ov::element::Type element_type; + ov::test::utils::SqueezeOpType opType; + std::tie(squeezeShape, element_type, targetDevice, opType) = this->GetParam(); + const size_t input_dim = ov::shape_size(squeezeShape.first); + std::vector shape_input{1, input_dim}; + ov::ParameterVector input{std::make_shared(element_type, ov::Shape(shape_input))}; + auto reshape1_pattern = std::make_shared(ov::element::i64, + ov::Shape{squeezeShape.first.size()}, + squeezeShape.first); + auto reshape1 = std::make_shared(input[0], reshape1_pattern, false); + auto squeeze = ngraph::builder::makeSqueezeUnsqueeze(reshape1, ov::element::i64, squeezeShape.second, opType); + auto reshape2_pattern = + std::make_shared(ov::element::i64, ov::Shape{2}, std::vector{1, input_dim}); + auto reshape2 = std::make_shared(squeeze, reshape2_pattern, false); + auto func = std::make_shared(reshape2); + std::string squeezeType; + + function = std::make_shared(func, input, "reshape_squeeze_reshape_relu"); +} + +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/src/subgraph/split_conv_concat.cpp b/src/tests/functional/shared_test_classes/src/subgraph/split_conv_concat.cpp index 60ad615b756..7dc009d0022 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/split_conv_concat.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/split_conv_concat.cpp @@ -4,30 +4,40 @@ #include "shared_test_classes/subgraph/split_conv_concat.hpp" -namespace SubgraphTestsDefinitions { +#include "common_test_utils/data_utils.hpp" +#include "ie_common.h" +#include "ov_models/builders.hpp" +#include "shared_test_classes/base/layer_test_utils.hpp" +#include "shared_test_classes/base/ov_subgraph.hpp" -std::string SplitConvConcat::getTestCaseName(const testing::TestParamInfo& obj) { - InferenceEngine::Precision netPrecision; - InferenceEngine::SizeVector inputShapes, newInputShapes; +namespace ov { +namespace test { + +std::string SplitConvConcat::getTestCaseName(const testing::TestParamInfo& obj) { + ov::element::Type element_type; + ov::Shape inputShapes; std::string targetDevice; - std::tie(netPrecision, inputShapes, targetDevice) = obj.param; + std::tie(element_type, inputShapes, targetDevice) = obj.param; std::ostringstream result; result << "IS=" << ov::test::utils::vec2str(inputShapes) << "_"; - result << "netPRC=" << netPrecision.name() << "_"; + result << "ET=" << element_type << "_"; result << "targetDevice=" << targetDevice; return result.str(); } void SplitConvConcat::SetUp() { - std::vector inputShape; - InferenceEngine::Precision netPrecision; - std::tie(netPrecision, inputShape, targetDevice) = this->GetParam(); - auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); + configure_test(this->GetParam()); +} - ov::ParameterVector params{std::make_shared(ngPrc, ov::Shape(inputShape))}; +void SplitConvConcatBase::configure_test(const ov::test::BasicParams& param) { + ov::Shape inputShape; + ov::element::Type element_type; + std::tie(element_type, inputShape, targetDevice) = param; - auto split = ngraph::builder::makeSplit(params[0], ngPrc, 2, 1); + ov::ParameterVector params{std::make_shared(element_type, ov::Shape(inputShape))}; + + auto split = ngraph::builder::makeSplit(params[0], element_type, 2, 1); std::vector filterWeights1; std::vector filterWeights2; @@ -35,17 +45,65 @@ void SplitConvConcat::SetUp() { filterWeights1 = ov::test::utils::generate_float_numbers(8 * inputShape[1] / 2 * 3, -0.2f, 0.2f); filterWeights2 = ov::test::utils::generate_float_numbers(8 * inputShape[1] / 2 * 3, -0.2f, 0.2f); } - auto conv1 = ngraph::builder::makeConvolution(split->output(0), ngPrc, {1, 3}, {1, 1}, {0, 0}, {0, 0}, {1, 1}, - ngraph::op::PadType::VALID, 8, false, filterWeights1); - auto relu1 = std::make_shared(conv1); + auto conv1 = ngraph::builder::makeConvolution(split->output(0), + element_type, + {1, 3}, + {1, 1}, + {0, 0}, + {0, 0}, + {1, 1}, + ov::op::PadType::VALID, + 8, + false, + filterWeights1); + auto relu1 = std::make_shared(conv1); - auto conv2 = ngraph::builder::makeConvolution(split->output(1), ngPrc, {1, 3}, {1, 1}, {0, 0}, {0, 0}, {1, 1}, - ngraph::op::PadType::VALID, 8, false, filterWeights2); - auto relu2 = std::make_shared(conv2); - auto concat = std::make_shared(ngraph::OutputVector{relu1->output(0), relu2->output(0)}, 1); + auto conv2 = ngraph::builder::makeConvolution(split->output(1), + element_type, + {1, 3}, + {1, 1}, + {0, 0}, + {0, 0}, + {1, 1}, + ov::op::PadType::VALID, + 8, + false, + filterWeights2); + auto relu2 = std::make_shared(conv2); + auto concat = std::make_shared(ov::OutputVector{relu1->output(0), relu2->output(0)}, 1); - ngraph::ResultVector results{std::make_shared(concat)}; - function = std::make_shared(results, params, "SplitConvConcat"); + ov::ResultVector results{std::make_shared(concat)}; + function = std::make_shared(results, params, "SplitConvConcat"); +} + +} // namespace test +} // namespace ov + +namespace SubgraphTestsDefinitions { + +std::string SplitConvConcat::getTestCaseName(const testing::TestParamInfo& obj) { + InferenceEngine::Precision precision; + InferenceEngine::SizeVector inputShapes; + std::string targetDevice; + std::tie(precision, inputShapes, targetDevice) = obj.param; + auto element_type = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(precision); + + std::ostringstream result; + result << "IS=" << ov::test::utils::vec2str(inputShapes) << "_"; + result << "ET=" << element_type << "_"; + result << "targetDevice=" << targetDevice; + return result.str(); +} + +void SplitConvConcat::SetUp() { + InferenceEngine::Precision precision; + InferenceEngine::SizeVector inputShapes; + std::tie(precision, inputShapes, targetDevice) = this->GetParam(); + auto element_type = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(precision); + ov::Shape shape = inputShapes; + + ov::test::BasicParams param(element_type, shape, targetDevice); + configure_test(param); } } // namespace SubgraphTestsDefinitions diff --git a/src/tests/functional/shared_test_classes/src/subgraph/variadic_split_pad.cpp b/src/tests/functional/shared_test_classes/src/subgraph/variadic_split_pad.cpp index 13d1c9c542c..8c7906c275e 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/variadic_split_pad.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/variadic_split_pad.cpp @@ -4,48 +4,54 @@ #include "shared_test_classes/subgraph/variadic_split_pad.hpp" -namespace SubgraphTestsDefinitions { +#include "ov_models/builders.hpp" -std::string VariadicSplitPad::getTestCaseName(const testing::TestParamInfo &obj) { - InferenceEngine::SizeVector inputShape; +namespace ov { +namespace test { + +std::string VariadicSplitPad::getTestCaseName(const testing::TestParamInfo& obj) { + ov::Shape input_shape; int64_t axis; std::vector numSplits, connectIndexes; std::vector padsBegin, padsEnd; - ngraph::helpers::PadMode padMode; - InferenceEngine::Precision netPrecision; + ov::op::PadMode padMode; + ov::element::Type element_type; std::string targetName; - std::tie(inputShape, axis, numSplits, connectIndexes, padsBegin, padsEnd, padMode, netPrecision, targetName) = obj.param; + std::tie(input_shape, axis, numSplits, connectIndexes, padsBegin, padsEnd, padMode, element_type, targetName) = + obj.param; std::ostringstream results; - results << "IS=" << ov::test::utils::vec2str(inputShape) << "_"; + results << "IS=" << ov::test::utils::vec2str(input_shape) << "_"; results << "Axis=" << axis << "_"; results << "NumSplits=" << ov::test::utils::vec2str(numSplits) << "_"; results << "ConnectIndexes=" << ov::test::utils::vec2str(connectIndexes) << "_"; results << "padsBegin=" << ov::test::utils::vec2str(padsBegin) << "_"; results << "padsEnd=" << ov::test::utils::vec2str(padsEnd) << "_"; results << "PadMode=" << padMode << "_"; - results << "netPRC=" << netPrecision.name() << "_"; + results << "netPRC=" << element_type << "_"; results << "targetDevice=" << targetName << "_"; return results.str(); } void VariadicSplitPad::SetUp() { - InferenceEngine::SizeVector inputs; + ov::Shape input_shape; int64_t axis; std::vector numSplits, connectIndexes; std::vector padBegin, padEnd; - ngraph::helpers::PadMode padMode; - InferenceEngine::Precision netPrecision; - std::tie(inputs, axis, numSplits, connectIndexes, padBegin, padEnd, padMode, netPrecision, targetDevice) = this->GetParam(); - auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - ov::ParameterVector input {std::make_shared(ngPrc, ov::Shape(inputs))}; + ov::op::PadMode padMode; + ov::element::Type element_type; + std::tie(input_shape, axis, numSplits, connectIndexes, padBegin, padEnd, padMode, element_type, targetDevice) = + this->GetParam(); + ov::ParameterVector input{std::make_shared(element_type, ov::Shape(input_shape))}; auto split = ngraph::builder::makeVariadicSplit(input[0], numSplits, axis); - ngraph::ResultVector results; + ov::ResultVector results; for (size_t i : connectIndexes) { auto pad = ngraph::builder::makePad(split->output(i), padBegin, padEnd, 0, padMode); - results.push_back(std::make_shared(pad)); + results.push_back(std::make_shared(pad)); } - function = std::make_shared(results, input, "variadic_split_pad"); + function = std::make_shared(results, input, "variadic_split_pad"); } -} // namespace SubgraphTestsDefinitions + +} // namespace test +} // namespace ov