diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/mul_conv_fusion.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/mul_conv_fusion.cpp index 480a538c6c6..4ab6ddfbaef 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/mul_conv_fusion.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/mul_conv_fusion.cpp @@ -2,263 +2,268 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "subgraph_tests/mul_conv_fusion.hpp" + #include -#include "subgraph_tests/mul_conv_fusion.hpp" #include "common_test_utils/test_constants.hpp" -#include - -using namespace SubgraphTestsDefinitions; +using namespace ov::test; namespace { - const std::vector types{ngraph::element::f32}; +const std::vector types{ov::element::f32}; - const std::vector const_shapes_fprop_1d{ - {}, - {1}, - {1, 1}, - {8, 1}, - {1, 1, 1}, - {1, 8, 1}, - }; +const std::vector const_shapes_fprop_1d{ + {}, + {1}, + {1, 1}, + {8, 1}, + {1, 1, 1}, + {1, 8, 1}, +}; - INSTANTIATE_TEST_SUITE_P(smoke_Convolution_1D, MulConvFusion, - ::testing::Combine( - ::testing::Values(ngraph::opset8::Convolution::get_type_info_static()), - ::testing::Values(ngraph::Shape{1, 8, 64}), - ::testing::Values(ngraph::Shape{64, 8, 1}), - ::testing::ValuesIn(const_shapes_fprop_1d), - ::testing::ValuesIn(types), - ::testing::Values(false), // Positive test - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MulConvFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Convolution_1D, + MulConvFusion, + ::testing::Combine(::testing::Values(ov::op::v1::Convolution::get_type_info_static()), + ::testing::Values(ov::Shape{1, 8, 64}), + ::testing::Values(ov::Shape{64, 8, 1}), + ::testing::ValuesIn(const_shapes_fprop_1d), + ::testing::ValuesIn(types), + ::testing::Values(false), // Positive test + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MulConvFusion::getTestCaseName); - const std::vector const_shapes_fprop_2d{ - {}, - {1}, - {1, 1}, - {1, 1, 1}, - {8, 1, 1}, - {1, 1, 1, 1}, - {1, 8, 1, 1}, - }; +const std::vector const_shapes_fprop_2d{ + {}, + {1}, + {1, 1}, + {1, 1, 1}, + {8, 1, 1}, + {1, 1, 1, 1}, + {1, 8, 1, 1}, +}; - INSTANTIATE_TEST_SUITE_P(smoke_Convolution_2D, MulConvFusion, - ::testing::Combine( - ::testing::Values(ngraph::opset8::Convolution::get_type_info_static()), - ::testing::Values(ngraph::Shape{2, 8, 14, 14}), - ::testing::Values(ngraph::Shape{2, 8, 7, 7}), - ::testing::ValuesIn(const_shapes_fprop_2d), - ::testing::ValuesIn(types), - ::testing::Values(false), // Positive test - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MulConvFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Convolution_2D, + MulConvFusion, + ::testing::Combine(::testing::Values(ov::op::v1::Convolution::get_type_info_static()), + ::testing::Values(ov::Shape{2, 8, 14, 14}), + ::testing::Values(ov::Shape{2, 8, 7, 7}), + ::testing::ValuesIn(const_shapes_fprop_2d), + ::testing::ValuesIn(types), + ::testing::Values(false), // Positive test + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MulConvFusion::getTestCaseName); - const std::vector const_shapes_fprop_2d_kernel_same_as_input{ - {7}, - {1, 7}, - {1, 1, 7}, - {8, 1, 7}, - {1, 1, 1, 7}, - {1, 8, 1, 7}, - {7, 1}, - {1, 7, 1}, - {8, 7, 1}, - {1, 1, 7, 1}, - {1, 8, 7, 1}, - {1, 1, 7, 7}, - {1, 8, 7, 7}, - }; +const std::vector const_shapes_fprop_2d_kernel_same_as_input{ + {7}, + {1, 7}, + {1, 1, 7}, + {8, 1, 7}, + {1, 1, 1, 7}, + {1, 8, 1, 7}, + {7, 1}, + {1, 7, 1}, + {8, 7, 1}, + {1, 1, 7, 1}, + {1, 8, 7, 1}, + {1, 1, 7, 7}, + {1, 8, 7, 7}, +}; - INSTANTIATE_TEST_SUITE_P(smoke_Convolution_2D_kernel_same_as_input, MulConvFusion, - ::testing::Combine( - ::testing::Values(ngraph::opset8::Convolution::get_type_info_static()), - ::testing::Values(ngraph::Shape{2, 8, 7, 7}), - ::testing::Values(ngraph::Shape{3, 8, 7, 7}), - ::testing::ValuesIn(const_shapes_fprop_2d_kernel_same_as_input), - ::testing::ValuesIn(types), - ::testing::Values(false), // Positive test - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MulConvFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Convolution_2D_kernel_same_as_input, + MulConvFusion, + ::testing::Combine(::testing::Values(ov::op::v1::Convolution::get_type_info_static()), + ::testing::Values(ov::Shape{2, 8, 7, 7}), + ::testing::Values(ov::Shape{3, 8, 7, 7}), + ::testing::ValuesIn(const_shapes_fprop_2d_kernel_same_as_input), + ::testing::ValuesIn(types), + ::testing::Values(false), // Positive test + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MulConvFusion::getTestCaseName); - const std::vector const_shapes_conv_bprop{ - {}, - {1}, - {1, 1}, - {1, 1, 1}, - {1, 1, 1, 1}, - {3, 1, 1}, - {1, 3, 1, 1}, - }; - INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData_2D, MulConvFusion, - ::testing::Combine( - ::testing::Values(ngraph::opset8::ConvolutionBackpropData::get_type_info_static()), - ::testing::Values(ngraph::Shape{4, 3, 64, 64}), - ::testing::Values(ngraph::Shape{3, 20, 3, 3}), - ::testing::ValuesIn(const_shapes_conv_bprop), - ::testing::ValuesIn(types), - ::testing::Values(false), // Positive test - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MulConvFusion::getTestCaseName); +const std::vector const_shapes_conv_bprop{ + {}, + {1}, + {1, 1}, + {1, 1, 1}, + {1, 1, 1, 1}, + {3, 1, 1}, + {1, 3, 1, 1}, +}; +INSTANTIATE_TEST_SUITE_P( + smoke_ConvolutionBackpropData_2D, + MulConvFusion, + ::testing::Combine(::testing::Values(ov::op::v1::ConvolutionBackpropData::get_type_info_static()), + ::testing::Values(ov::Shape{4, 3, 64, 64}), + ::testing::Values(ov::Shape{3, 20, 3, 3}), + ::testing::ValuesIn(const_shapes_conv_bprop), + ::testing::ValuesIn(types), + ::testing::Values(false), // Positive test + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MulConvFusion::getTestCaseName); - const std::vector const_shapes_group_conv{ - {}, - {1}, - {1, 1}, - {1, 1, 1}, - {12, 1, 1}, - {1, 1, 1, 1}, - {1, 12, 1, 1}, - }; +const std::vector const_shapes_group_conv{ + {}, + {1}, + {1, 1}, + {1, 1, 1}, + {12, 1, 1}, + {1, 1, 1, 1}, + {1, 12, 1, 1}, +}; - INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution_2D, MulConvFusion, - ::testing::Combine( - ::testing::Values(ngraph::opset8::GroupConvolution::get_type_info_static()), - ::testing::Values(ngraph::Shape{2, 12, 14, 14}), - ::testing::Values(ngraph::Shape{4, 5, 3, 7, 7}), - ::testing::ValuesIn(const_shapes_group_conv), - ::testing::ValuesIn(types), - ::testing::Values(false), // Positive test - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MulConvFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution_2D, + MulConvFusion, + ::testing::Combine(::testing::Values(ov::op::v1::GroupConvolution::get_type_info_static()), + ::testing::Values(ov::Shape{2, 12, 14, 14}), + ::testing::Values(ov::Shape{4, 5, 3, 7, 7}), + ::testing::ValuesIn(const_shapes_group_conv), + ::testing::ValuesIn(types), + ::testing::Values(false), // Positive test + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MulConvFusion::getTestCaseName); - const std::vector const_shapes_group_conv_kernel_same_as_input{ - {14}, - {1, 14}, - {1, 1, 14}, - {12, 1, 14}, - {1, 1, 1, 14}, - {1, 12, 1, 14}, - {14, 1}, - {1, 14, 1}, - {12, 14, 1}, - {1, 1, 14, 1}, - {1, 12, 14, 1}, - {1, 1, 14, 14}, - {1, 12, 14, 14}, - }; +const std::vector const_shapes_group_conv_kernel_same_as_input{ + {14}, + {1, 14}, + {1, 1, 14}, + {12, 1, 14}, + {1, 1, 1, 14}, + {1, 12, 1, 14}, + {14, 1}, + {1, 14, 1}, + {12, 14, 1}, + {1, 1, 14, 1}, + {1, 12, 14, 1}, + {1, 1, 14, 14}, + {1, 12, 14, 14}, +}; - INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution_2D_kernel_same_as_input, MulConvFusion, - ::testing::Combine( - ::testing::Values(ngraph::opset8::GroupConvolution::get_type_info_static()), - ::testing::Values(ngraph::Shape{2, 12, 14, 14}), - ::testing::Values(ngraph::Shape{4, 5, 3, 14, 14}), - ::testing::ValuesIn(const_shapes_group_conv_kernel_same_as_input), - ::testing::ValuesIn(types), - ::testing::Values(false), // Positive test - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MulConvFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution_2D_kernel_same_as_input, + MulConvFusion, + ::testing::Combine(::testing::Values(ov::op::v1::GroupConvolution::get_type_info_static()), + ::testing::Values(ov::Shape{2, 12, 14, 14}), + ::testing::Values(ov::Shape{4, 5, 3, 14, 14}), + ::testing::ValuesIn(const_shapes_group_conv_kernel_same_as_input), + ::testing::ValuesIn(types), + ::testing::Values(false), // Positive test + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MulConvFusion::getTestCaseName); - const std::vector const_shapes_group_conv_bprop{ - {}, - {1}, - {1, 1}, - {1, 1, 1}, - {12, 1, 1}, - {1, 1, 1, 1}, - {1, 12, 1, 1}, - }; +const std::vector const_shapes_group_conv_bprop{ + {}, + {1}, + {1, 1}, + {1, 1, 1}, + {12, 1, 1}, + {1, 1, 1, 1}, + {1, 12, 1, 1}, +}; - INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolutionBackpropData_2D, MulConvFusion, - ::testing::Combine( - ::testing::Values(ngraph::opset8::GroupConvolutionBackpropData::get_type_info_static()), - ::testing::Values(ngraph::Shape{2, 12, 10, 10}), - ::testing::Values(ngraph::Shape{4, 3, 5, 2, 2}), - ::testing::ValuesIn(const_shapes_group_conv_bprop), - ::testing::ValuesIn(types), - ::testing::Values(false), // Positive test - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MulConvFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P( + smoke_GroupConvolutionBackpropData_2D, + MulConvFusion, + ::testing::Combine(::testing::Values(ov::op::v1::GroupConvolutionBackpropData::get_type_info_static()), + ::testing::Values(ov::Shape{2, 12, 10, 10}), + ::testing::Values(ov::Shape{4, 3, 5, 2, 2}), + ::testing::ValuesIn(const_shapes_group_conv_bprop), + ::testing::ValuesIn(types), + ::testing::Values(false), // Positive test + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MulConvFusion::getTestCaseName); - const std::vector negative_const_shapes{ - {12, 64, 64}, - {2, 1, 1, 1}, - {1, 1, 64, 64}, - {1, 12, 64, 64}, - {2, 12, 64, 64}, - }; +const std::vector negative_const_shapes{ + {12, 64, 64}, + {2, 1, 1, 1}, + {1, 1, 64, 64}, + {1, 12, 64, 64}, + {2, 12, 64, 64}, +}; - INSTANTIATE_TEST_SUITE_P(smoke_NegativeConvolution_2D, MulConvFusion, - ::testing::Combine( - ::testing::Values(ngraph::opset8::Convolution::get_type_info_static()), - ::testing::Values(ngraph::Shape{2, 12, 64, 64}), - ::testing::Values(ngraph::Shape{20, 12, 1, 1}), - ::testing::ValuesIn(negative_const_shapes), - ::testing::ValuesIn(types), - ::testing::Values(true), // Negative test - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MulConvFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_NegativeConvolution_2D, + MulConvFusion, + ::testing::Combine(::testing::Values(ov::op::v1::Convolution::get_type_info_static()), + ::testing::Values(ov::Shape{2, 12, 64, 64}), + ::testing::Values(ov::Shape{20, 12, 1, 1}), + ::testing::ValuesIn(negative_const_shapes), + ::testing::ValuesIn(types), + ::testing::Values(true), // Negative test + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MulConvFusion::getTestCaseName); - INSTANTIATE_TEST_SUITE_P(smoke_NegativeConvolutionBackpropData_2D, MulConvFusion, - ::testing::Combine( - ::testing::Values(ngraph::opset8::ConvolutionBackpropData::get_type_info_static()), - ::testing::Values(ngraph::Shape{2, 12, 64, 64}), - ::testing::Values(ngraph::Shape{12, 20, 3, 3}), - ::testing::ValuesIn(negative_const_shapes), - ::testing::ValuesIn(types), - ::testing::Values(true), // Negative test - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MulConvFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P( + smoke_NegativeConvolutionBackpropData_2D, + MulConvFusion, + ::testing::Combine(::testing::Values(ov::op::v1::ConvolutionBackpropData::get_type_info_static()), + ::testing::Values(ov::Shape{2, 12, 64, 64}), + ::testing::Values(ov::Shape{12, 20, 3, 3}), + ::testing::ValuesIn(negative_const_shapes), + ::testing::ValuesIn(types), + ::testing::Values(true), // Negative test + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MulConvFusion::getTestCaseName); - INSTANTIATE_TEST_SUITE_P(smoke_NegativeGroupConvolution_2D, MulConvFusion, - ::testing::Combine( - ::testing::Values(ngraph::opset8::GroupConvolution::get_type_info_static()), - ::testing::Values(ngraph::Shape{2, 12, 64, 64}), - ::testing::Values(ngraph::Shape{4, 5, 3, 1, 2}), - ::testing::ValuesIn(negative_const_shapes), - ::testing::ValuesIn(types), - ::testing::Values(true), // Negative test - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MulConvFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_NegativeGroupConvolution_2D, + MulConvFusion, + ::testing::Combine(::testing::Values(ov::op::v1::GroupConvolution::get_type_info_static()), + ::testing::Values(ov::Shape{2, 12, 64, 64}), + ::testing::Values(ov::Shape{4, 5, 3, 1, 2}), + ::testing::ValuesIn(negative_const_shapes), + ::testing::ValuesIn(types), + ::testing::Values(true), // Negative test + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MulConvFusion::getTestCaseName); - INSTANTIATE_TEST_SUITE_P(smoke_NegativeGroupConvolutionBackpropData_2D, MulConvFusion, - ::testing::Combine( - ::testing::Values(ngraph::opset8::GroupConvolutionBackpropData::get_type_info_static()), - ::testing::Values(ngraph::Shape{2, 12, 64, 64}), - ::testing::Values(ngraph::Shape{4, 3, 5, 1, 1}), - ::testing::ValuesIn(negative_const_shapes), - ::testing::ValuesIn(types), - ::testing::Values(true), // Negative test - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MulConvFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P( + smoke_NegativeGroupConvolutionBackpropData_2D, + MulConvFusion, + ::testing::Combine(::testing::Values(ov::op::v1::GroupConvolutionBackpropData::get_type_info_static()), + ::testing::Values(ov::Shape{2, 12, 64, 64}), + ::testing::Values(ov::Shape{4, 3, 5, 1, 1}), + ::testing::ValuesIn(negative_const_shapes), + ::testing::ValuesIn(types), + ::testing::Values(true), // Negative test + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MulConvFusion::getTestCaseName); - const std::vector negative_const_shapes_kernel_same_as_input{ - {7}, - {1, 7}, - {1, 1, 7}, - {12, 1, 7}, - {1, 1, 1, 7}, - {1, 12, 1, 7}, - {7, 1}, - {1, 7, 1}, - {12, 7, 1}, - {1, 1, 7, 1}, - {1, 12, 7, 1}, - {1, 1, 7, 7}, - {1, 12, 7, 7}, - }; +const std::vector negative_const_shapes_kernel_same_as_input{ + {7}, + {1, 7}, + {1, 1, 7}, + {12, 1, 7}, + {1, 1, 1, 7}, + {1, 12, 1, 7}, + {7, 1}, + {1, 7, 1}, + {12, 7, 1}, + {1, 1, 7, 1}, + {1, 12, 7, 1}, + {1, 1, 7, 7}, + {1, 12, 7, 7}, +}; - INSTANTIATE_TEST_SUITE_P(smoke_NegativeConvolutionBackpropData_2D_kernel_same_as_input, MulConvFusion, - ::testing::Combine( - ::testing::Values(ngraph::opset8::ConvolutionBackpropData::get_type_info_static()), - ::testing::Values(ngraph::Shape{2, 12, 7, 7}), - ::testing::Values(ngraph::Shape{12, 20, 7, 7}), - ::testing::ValuesIn(negative_const_shapes_kernel_same_as_input), - ::testing::ValuesIn(types), - ::testing::Values(true), // Negative test - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MulConvFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P( + smoke_NegativeConvolutionBackpropData_2D_kernel_same_as_input, + MulConvFusion, + ::testing::Combine(::testing::Values(ov::op::v1::ConvolutionBackpropData::get_type_info_static()), + ::testing::Values(ov::Shape{2, 12, 7, 7}), + ::testing::Values(ov::Shape{12, 20, 7, 7}), + ::testing::ValuesIn(negative_const_shapes_kernel_same_as_input), + ::testing::ValuesIn(types), + ::testing::Values(true), // Negative test + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MulConvFusion::getTestCaseName); - INSTANTIATE_TEST_SUITE_P(smoke_NegativeGroupConvolutionBackpropData_2D_kernel_same_as_input, MulConvFusion, - ::testing::Combine( - ::testing::Values(ngraph::opset8::GroupConvolutionBackpropData::get_type_info_static()), - ::testing::Values(ngraph::Shape{2, 12, 7, 7}), - ::testing::Values(ngraph::Shape{4, 3, 5, 7, 7}), - ::testing::ValuesIn(negative_const_shapes_kernel_same_as_input), - ::testing::ValuesIn(types), - ::testing::Values(true), // Negative test - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MulConvFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P( + smoke_NegativeGroupConvolutionBackpropData_2D_kernel_same_as_input, + MulConvFusion, + ::testing::Combine(::testing::Values(ov::op::v1::GroupConvolutionBackpropData::get_type_info_static()), + ::testing::Values(ov::Shape{2, 12, 7, 7}), + ::testing::Values(ov::Shape{4, 3, 5, 7, 7}), + ::testing::ValuesIn(negative_const_shapes_kernel_same_as_input), + ::testing::ValuesIn(types), + ::testing::Values(true), // Negative test + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MulConvFusion::getTestCaseName); } // namespace diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/multiply_add.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/multiply_add.cpp index f28990117a3..c46e9270894 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/multiply_add.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/multiply_add.cpp @@ -2,31 +2,29 @@ // SPDX-License-Identifier: Apache-2.0 // -#include - #include "subgraph_tests/multiply_add.hpp" -using namespace SubgraphTestsDefinitions; +#include + +using namespace ov::test; namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32 +const std::vector input_type = {ov::element::f32}; + +const std::vector inputShapes = { + {1, 3, 2, 2, 4, 5}, + {1, 3, 2, 2, 2, 4, 5}, + {1, 3, 2, 2, 2, 2, 4, 5}, + {1, 3, 2, 2, 2, 2, 2, 4, 5}, + {1, 3, 2, 2, 2, 2, 2, 2, 4, 5}, }; -const std::vector> inputShapes = { - {1, 3, 2, 2, 4, 5}, - {1, 3, 2, 2, 2, 4, 5}, - {1, 3, 2, 2, 2, 2, 4, 5}, - {1, 3, 2, 2, 2, 2, 2, 4, 5}, - {1, 3, 2, 2, 2, 2, 2, 2, 4, 5}, -}; - -INSTANTIATE_TEST_SUITE_P(smoke_MultipleAdd_Nd, MultiplyAddLayerTest, - ::testing::Combine( - ::testing::ValuesIn(inputShapes), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MultiplyAddLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MultipleAdd_Nd, + MultiplyAddLayerTest, + ::testing::Combine(::testing::ValuesIn(inputShapes), + ::testing::ValuesIn(input_type), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MultiplyAddLayerTest::getTestCaseName); } // namespace diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/mvn_multiply_add.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/mvn_multiply_add.cpp index 4fe0990bfba..f27050440a7 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/mvn_multiply_add.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/mvn_multiply_add.cpp @@ -4,91 +4,75 @@ #include "subgraph_tests/mvn_multiply_add.hpp" -using namespace SubgraphTestsDefinitions; -using namespace InferenceEngine; +using namespace ov::test; namespace { -const std::vector netPrecision = { - Precision::FP32 +const std::vector netPrecision = {ov::element::f32}; + +std::vector idxPrecision = {ov::element::i64}; + +const std::vector acrossChannels = {true, false}; + +const std::vector normalizeVariance = {true, false}; + +const std::vector epsilon = {0.000000001f}; + +const std::vector epsMode = {"inside_sqrt", "outside_sqrt"}; + +const std::vector> shapes_1D = { + std::pair{ov::Shape{5}, ov::Shape{5}}, + std::pair{ov::Shape{64}, ov::Shape{64}}, }; -std::vector idxPrecision = { - Precision::I64 +const std::vector> shapes_2D = { + std::pair{ov::Shape{1, 5}, ov::Shape{1, 5}}, + std::pair{ov::Shape{2, 17}, ov::Shape{1, 17}}, + std::pair{ov::Shape{9, 64}, ov::Shape{1, 64}}, + std::pair{ov::Shape{5, 15}, ov::Shape{1, 15}}, }; -const std::vector acrossChannels = { - true, - false +const std::vector> shapes_3D = { + std::pair{ov::Shape{1, 5, 8}, ov::Shape{1, 5, 8}}, + std::pair{ov::Shape{2, 17, 9}, ov::Shape{1, 1, 9}}, + std::pair{ov::Shape{1, 1, 10}, ov::Shape{1, 1, 10}}, + std::pair{ov::Shape{2, 3, 3}, ov::Shape{2, 3, 3}}, }; -const std::vector normalizeVariance = { - true, - false -}; +INSTANTIATE_TEST_SUITE_P(smoke_MVNMultiplyAdd_1D, + MVNMultiplyAdd, + ::testing::Combine(::testing::ValuesIn(shapes_1D), + ::testing::ValuesIn(netPrecision), + ::testing::ValuesIn(idxPrecision), + ::testing::Values(std::vector{0}), + ::testing::ValuesIn(normalizeVariance), + ::testing::ValuesIn(epsilon), + ::testing::ValuesIn(epsMode), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MVNMultiplyAdd::getTestCaseName); -const std::vector epsilon = { - 0.000000001f -}; +INSTANTIATE_TEST_SUITE_P(smoke_MVNMultiplyAdd_2D, + MVNMultiplyAdd, + ::testing::Combine(::testing::ValuesIn(shapes_2D), + ::testing::ValuesIn(netPrecision), + ::testing::ValuesIn(idxPrecision), + ::testing::Values(std::vector{1}), + ::testing::ValuesIn(normalizeVariance), + ::testing::ValuesIn(epsilon), + ::testing::ValuesIn(epsMode), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MVNMultiplyAdd::getTestCaseName); -const std::vector epsMode = { - "inside_sqrt", - "outside_sqrt" -}; - -const std::vector> shapes_1D = { - std::pair{ SizeVector{5}, SizeVector{5}}, - std::pair{ SizeVector{64}, SizeVector{64}}, -}; - -const std::vector> shapes_2D = { - std::pair{ SizeVector{1, 5}, SizeVector{1, 5}}, - std::pair{ SizeVector{2, 17}, SizeVector{1, 17}}, - std::pair{ SizeVector{9, 64}, SizeVector{1, 64}}, - std::pair{ SizeVector{5, 15}, SizeVector{1, 15}}, -}; - -const std::vector> shapes_3D = { - std::pair{ SizeVector{1, 5, 8}, SizeVector{1, 5, 8}}, - std::pair{ SizeVector{2, 17, 9}, SizeVector{1, 1, 9}}, - std::pair{ SizeVector{1, 1, 10}, SizeVector{1, 1, 10}}, - std::pair{ SizeVector{2, 3, 3}, SizeVector{2, 3, 3}}, -}; - -INSTANTIATE_TEST_SUITE_P(smoke_MVNMultiplyAdd_1D, MVNMultiplyAdd, - ::testing::Combine( - ::testing::ValuesIn(shapes_1D), - ::testing::ValuesIn(netPrecision), - ::testing::ValuesIn(idxPrecision), - ::testing::Values(std::vector{0}), - ::testing::ValuesIn(normalizeVariance), - ::testing::ValuesIn(epsilon), - ::testing::ValuesIn(epsMode), - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MVNMultiplyAdd::getTestCaseName); - -INSTANTIATE_TEST_SUITE_P(smoke_MVNMultiplyAdd_2D, MVNMultiplyAdd, - ::testing::Combine( - ::testing::ValuesIn(shapes_2D), - ::testing::ValuesIn(netPrecision), - ::testing::ValuesIn(idxPrecision), - ::testing::Values(std::vector{1}), - ::testing::ValuesIn(normalizeVariance), - ::testing::ValuesIn(epsilon), - ::testing::ValuesIn(epsMode), - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MVNMultiplyAdd::getTestCaseName); - -INSTANTIATE_TEST_SUITE_P(smoke_MVNMultiplyAdd_3D, MVNMultiplyAdd, - ::testing::Combine( - ::testing::ValuesIn(shapes_3D), - ::testing::ValuesIn(netPrecision), - ::testing::ValuesIn(idxPrecision), - ::testing::Values(std::vector{2}), - ::testing::ValuesIn(normalizeVariance), - ::testing::ValuesIn(epsilon), - ::testing::ValuesIn(epsMode), - ::testing::Values(ov::test::utils::DEVICE_CPU)), - MVNMultiplyAdd::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MVNMultiplyAdd_3D, + MVNMultiplyAdd, + ::testing::Combine(::testing::ValuesIn(shapes_3D), + ::testing::ValuesIn(netPrecision), + ::testing::ValuesIn(idxPrecision), + ::testing::Values(std::vector{2}), + ::testing::ValuesIn(normalizeVariance), + ::testing::ValuesIn(epsilon), + ::testing::ValuesIn(epsMode), + ::testing::Values(ov::test::utils::DEVICE_CPU)), + MVNMultiplyAdd::getTestCaseName); } // namespace diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/parameter_result.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/parameter_result.cpp index 7f25b2ef54e..a70b3c7bbc3 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/parameter_result.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/parameter_result.cpp @@ -11,12 +11,6 @@ using namespace ov::test; namespace { -INSTANTIATE_TEST_SUITE_P(smoke_Check, - ParameterResultSubgraphTestLegacyApi, - ::testing::Combine(::testing::Values(ov::test::InputShape{{1, 3, 10, 10}, {}}), - ::testing::Values(ov::test::utils::DEVICE_CPU)), - ParameterResultSubgraphTestBase::getTestCaseName); - const std::vector inputShapes = { ov::test::InputShape{{1, 3, 10, 10}, {{1, 3, 10, 10}, {1, 3, 10, 10}}}, ov::test::InputShape{{-1, -1, -1, -1}, {{1, 3, 10, 10}, {2, 5, 3, 10}, {1, 3, 10, 10}, {1, 3, 10, 10}}}, diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp index 4fe713ebc44..8617d1e68c2 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp @@ -2,42 +2,45 @@ // SPDX-License-Identifier: Apache-2.0 // -#include #include "subgraph_tests/perm_conv_perm_concat.hpp" -#include "common_test_utils/test_constants.hpp" + +#include + namespace { -std::vector> input_shapes { +std::vector input_shapes{ {1, 1, 7, 32}, {1, 1, 8, 16}, }; -std::vector> kernel_shapes { +std::vector kernel_shapes{ {1, 3}, {1, 5}, }; -std::vector output_channels { +std::vector output_channels{ 32, 64, }; -std::vector netPrecisions = { - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16, +std::vector netPrecisions = { + ov::element::f32, + ov::element::f16, }; -std::map additional_config = { -}; -} // namespace +ov::AnyMap additional_config = {}; +} // namespace -namespace SubgraphTestsDefinitions { -INSTANTIATE_TEST_SUITE_P(smoke_basic, PermConvPermConcat, - ::testing::Combine( - ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::test::utils::DEVICE_CPU), - ::testing::ValuesIn(input_shapes), - ::testing::ValuesIn(kernel_shapes), - ::testing::ValuesIn(output_channels), - ::testing::Values(additional_config)), - PermConvPermConcat::getTestCaseName); -} // namespace SubgraphTestsDefinitions +namespace ov { +namespace test { + +INSTANTIATE_TEST_SUITE_P(smoke_basic, + PermConvPermConcat, + ::testing::Combine(::testing::ValuesIn(netPrecisions), + ::testing::Values(ov::test::utils::DEVICE_CPU), + ::testing::ValuesIn(input_shapes), + ::testing::ValuesIn(kernel_shapes), + ::testing::ValuesIn(output_channels), + ::testing::Values(additional_config)), + PermConvPermConcat::getTestCaseName); +} // namespace test +} // namespace ov diff --git a/src/plugins/intel_gna/tests/functional/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp b/src/plugins/intel_gna/tests/functional/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp deleted file mode 100644 index 299935865f1..00000000000 --- a/src/plugins/intel_gna/tests/functional/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "subgraph_tests/perm_conv_perm_concat.hpp" - -#include - -#include "common_test_utils/test_constants.hpp" -namespace { -std::vector> input_shapes{ - {1, 1, 7, 32}, - {1, 1, 8, 16}, -}; - -std::vector> kernel_shapes{ - {1, 3}, - {1, 5}, -}; - -std::vector output_channels{ - 32, - 64, -}; - -std::vector netPrecisions = { - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16, -}; - -std::vector> configs = {{{"GNA_DEVICE_MODE", "GNA_SW_EXACT"}}, - {{"GNA_DEVICE_MODE", "GNA_SW_FP32"}}}; -} // namespace - -namespace SubgraphTestsDefinitions { -INSTANTIATE_TEST_SUITE_P(smoke_basic, - PermConvPermConcat, - ::testing::Combine(::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::test::utils::DEVICE_GNA), - ::testing::ValuesIn(input_shapes), - ::testing::ValuesIn(kernel_shapes), - ::testing::ValuesIn(output_channels), - ::testing::ValuesIn(configs)), - PermConvPermConcat::getTestCaseName); -} // namespace SubgraphTestsDefinitions diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/multiply_add.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/multiply_add.cpp index d60cbeb5875..056a85a926a 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/multiply_add.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/multiply_add.cpp @@ -2,32 +2,29 @@ // SPDX-License-Identifier: Apache-2.0 // -#include - #include "subgraph_tests/multiply_add.hpp" -using namespace SubgraphTestsDefinitions; +#include + +using namespace ov::test; namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16 +const std::vector input_type = {ov::element::f32, ov::element::f16}; + +const std::vector inputShapes = { + {1, 3}, + {1, 3, 2}, + {1, 3, 2, 5}, + {1, 3, 2, 5, 4}, + {1, 3, 2, 2, 4, 5}, }; -const std::vector> inputShapes = { - {1, 3}, - {1, 3, 2}, - {1, 3, 2, 5}, - {1, 3, 2, 5, 4}, - {1, 3, 2, 2, 4, 5}, -}; - -INSTANTIATE_TEST_SUITE_P(smoke_MultipleAdd_Nd, MultiplyAddLayerTest, - ::testing::Combine( - ::testing::ValuesIn(inputShapes), - ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::test::utils::DEVICE_GPU)), - MultiplyAddLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MultipleAdd_Nd, + MultiplyAddLayerTest, + ::testing::Combine(::testing::ValuesIn(inputShapes), + ::testing::ValuesIn(input_type), + ::testing::Values(ov::test::utils::DEVICE_GPU)), + MultiplyAddLayerTest::getTestCaseName); } // namespace diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp index 105a37a30f2..5eda8a003d8 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp @@ -2,42 +2,41 @@ // SPDX-License-Identifier: Apache-2.0 // -#include #include "subgraph_tests/perm_conv_perm_concat.hpp" -#include "common_test_utils/test_constants.hpp" + +#include + namespace { -std::vector> input_shapes { +std::vector input_shapes{ {1, 1, 7, 32}, {1, 1, 8, 16}, }; -std::vector> kernel_shapes { +std::vector kernel_shapes{ {1, 3}, {1, 5}, }; -std::vector output_channels { +std::vector output_channels{ 32, 64, }; -std::vector netPrecisions = { - InferenceEngine::Precision::FP32, -// InferenceEngine::Precision::FP16, -}; +std::vector netPrecisions = {ov::element::f32}; -std::map additional_config = { -}; -} // namespace +ov::AnyMap additional_config = {}; +} // namespace -namespace SubgraphTestsDefinitions { - INSTANTIATE_TEST_SUITE_P(smoke_basic, PermConvPermConcat, - ::testing::Combine( - ::testing::ValuesIn(netPrecisions), - ::testing::Values(ov::test::utils::DEVICE_GPU), - ::testing::ValuesIn(input_shapes), - ::testing::ValuesIn(kernel_shapes), - ::testing::ValuesIn(output_channels), - ::testing::Values(additional_config)), - PermConvPermConcat::getTestCaseName); -} // namespace SubgraphTestsDefinitions +namespace ov { +namespace test { +INSTANTIATE_TEST_SUITE_P(smoke_basic, + PermConvPermConcat, + ::testing::Combine(::testing::ValuesIn(netPrecisions), + ::testing::Values(ov::test::utils::DEVICE_GPU), + ::testing::ValuesIn(input_shapes), + ::testing::ValuesIn(kernel_shapes), + ::testing::ValuesIn(output_channels), + ::testing::Values(additional_config)), + PermConvPermConcat::getTestCaseName); +} // namespace test +} // namespace ov diff --git a/src/tests/functional/plugin/shared/include/subgraph_tests/mul_conv_fusion.hpp b/src/tests/functional/plugin/shared/include/subgraph_tests/mul_conv_fusion.hpp index 46d65560b9e..529b22c56e4 100644 --- a/src/tests/functional/plugin/shared/include/subgraph_tests/mul_conv_fusion.hpp +++ b/src/tests/functional/plugin/shared/include/subgraph_tests/mul_conv_fusion.hpp @@ -6,9 +6,12 @@ #include "shared_test_classes/subgraph/mul_conv_fusion.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { TEST_P(MulConvFusion, CompareWithRefs) { - Run(); + run(); } -} // namespace SubgraphTestsDefinitions + +} // namespace test +} // namespace ov diff --git a/src/tests/functional/plugin/shared/include/subgraph_tests/multiply_add.hpp b/src/tests/functional/plugin/shared/include/subgraph_tests/multiply_add.hpp index f3d65830592..93f3600048a 100644 --- a/src/tests/functional/plugin/shared/include/subgraph_tests/multiply_add.hpp +++ b/src/tests/functional/plugin/shared/include/subgraph_tests/multiply_add.hpp @@ -6,10 +6,12 @@ #include "shared_test_classes/subgraph/multiply_add.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { TEST_P(MultiplyAddLayerTest, CompareWithRefs) { - Run(); + run(); }; -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov diff --git a/src/tests/functional/plugin/shared/include/subgraph_tests/mvn_multiply_add.hpp b/src/tests/functional/plugin/shared/include/subgraph_tests/mvn_multiply_add.hpp index 8b118b1295f..174dffd25ca 100644 --- a/src/tests/functional/plugin/shared/include/subgraph_tests/mvn_multiply_add.hpp +++ b/src/tests/functional/plugin/shared/include/subgraph_tests/mvn_multiply_add.hpp @@ -6,10 +6,12 @@ #include "shared_test_classes/subgraph/mvn_multiply_add.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { -TEST_P(MVNMultiplyAdd, CompareWithRefs){ - Run(); +TEST_P(MVNMultiplyAdd, CompareWithRefs) { + run(); }; -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov diff --git a/src/tests/functional/plugin/shared/include/subgraph_tests/perm_conv_perm_concat.hpp b/src/tests/functional/plugin/shared/include/subgraph_tests/perm_conv_perm_concat.hpp index b4ad568c56b..41582d13ffd 100644 --- a/src/tests/functional/plugin/shared/include/subgraph_tests/perm_conv_perm_concat.hpp +++ b/src/tests/functional/plugin/shared/include/subgraph_tests/perm_conv_perm_concat.hpp @@ -6,10 +6,12 @@ #include "shared_test_classes/subgraph/perm_conv_perm_concat.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { TEST_P(PermConvPermConcat, CompareWithRefs) { - Run(); + run(); } -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/mul_conv_fusion.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/mul_conv_fusion.hpp index 7486a950fff..571a8903c32 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/mul_conv_fusion.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/mul_conv_fusion.hpp @@ -4,32 +4,33 @@ #pragma once -#include #include +#include #include -#include "shared_test_classes/base/layer_test_utils.hpp" -#include -#include -namespace SubgraphTestsDefinitions { +#include "shared_test_classes/base/ov_subgraph.hpp" -typedef std::tuple< - ngraph::NodeTypeInfo, // Convolution type - ngraph::Shape, // Input shape - ngraph::Shape, // Weights shape - ngraph::Shape, // Const shape - ngraph::element::Type, // Network precision - bool, // True if test is negative - std::string // Device name - > MulConvFusionParams; +namespace ov { +namespace test { -class MulConvFusion - : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { +typedef std::tuple + MulConvFusionParams; + +class MulConvFusion : 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/multiply_add.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiply_add.hpp index 1e016857d47..fd93d5a01e3 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiply_add.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/multiply_add.hpp @@ -4,30 +4,28 @@ #pragma once -#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" -#include "common_test_utils/test_constants.hpp" +#include +#include +#include -namespace SubgraphTestsDefinitions { +#include "shared_test_classes/base/ov_subgraph.hpp" -using MultiplyAddParamsTuple = typename std::tuple< - std::vector, //input shapes - InferenceEngine::Precision, //Network precision - std::string>; //Device name +namespace ov { +namespace test { -class MultiplyAddLayerTest: - public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon{ +using MultiplyAddParamsTuple = typename std::tuple; // Device name + +class MultiplyAddLayerTest : public testing::WithParamInterface, + virtual public ov::test::SubgraphBaseStaticTest { public: - std::shared_ptr fn; - 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/mvn_multiply_add.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/mvn_multiply_add.hpp index 800fc2cbb0c..f8218c2f042 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/mvn_multiply_add.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/mvn_multiply_add.hpp @@ -4,31 +4,34 @@ #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< - std::pair, // Input shape, Constant shape - InferenceEngine::Precision, // Data precision - InferenceEngine::Precision, // Axes precision - std::vector, // Axes - bool, // Normalize variance - float, // Epsilon - std::string, // Epsilon mode - std::string // Device name -> mvnMultiplyAddParams; +typedef std::tuple, // Input shape, Constant shape + ov::element::Type, // Data precision + ov::element::Type, // Axes precision + std::vector, // Axes + bool, // Normalize variance + float, // Epsilon + std::string, // Epsilon mode + std::string // Device name + > + mvnMultiplyAddParams; -class MVNMultiplyAdd: public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon{ +class MVNMultiplyAdd : 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/perm_conv_perm_concat.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/perm_conv_perm_concat.hpp index b8be31f9327..e9b47db5482 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/perm_conv_perm_concat.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/perm_conv_perm_concat.hpp @@ -5,32 +5,29 @@ #pragma once #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 SubgraphTestsDefinitions { -typedef std::tuple< - InferenceEngine::Precision, // Network Precision - std::string, // Target Device - std::array, // Input shape - std::array, // Kernel shape - size_t, // Output channels - std::map // Configuration -> PermConvPermConcatParams; +namespace ov { +namespace test { + +typedef std::tuple + PermConvPermConcatParams; class PermConvPermConcat : public testing::WithParamInterface, - virtual public LayerTestsUtils::LayerTestsCommon { + virtual public ov::test::SubgraphBaseStaticTest { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); protected: void SetUp() override; - void Run() override; }; -} // namespace SubgraphTestsDefinitions + +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/src/subgraph/mul_conv_fusion.cpp b/src/tests/functional/shared_test_classes/src/subgraph/mul_conv_fusion.cpp index d16090a2e1c..411cff4a46a 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/mul_conv_fusion.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/mul_conv_fusion.cpp @@ -2,17 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "transformations/common_optimizations/mul_conv_fusion.hpp" -#include "ngraph/pass/constant_folding.hpp" #include "shared_test_classes/subgraph/mul_conv_fusion.hpp" + +#include "common_test_utils/graph_comparator.hpp" +#include "openvino/pass/manager.hpp" #include "ov_models/builders.hpp" +#include "transformations/common_optimizations/mul_conv_fusion.hpp" -namespace SubgraphTestsDefinitions { +namespace ov { +namespace test { -std::string MulConvFusion::getTestCaseName(const testing::TestParamInfo &obj) { - ngraph::NodeTypeInfo conv_type; - ngraph::Shape input_shape, weights_shape, const_shape; - ngraph::element::Type precision; +std::string MulConvFusion::getTestCaseName(const testing::TestParamInfo& obj) { + ov::NodeTypeInfo conv_type; + ov::Shape input_shape, weights_shape, const_shape; + ov::element::Type precision; std::string device; std::tie(conv_type, input_shape, weights_shape, const_shape, precision, std::ignore, device) = obj.param; std::ostringstream results; @@ -27,36 +30,43 @@ std::string MulConvFusion::getTestCaseName(const testing::TestParamInfoGetParam(); - auto param = std::make_shared(precision, input_shape); + std::tie(conv_type, input_shape, weights_shape, const_shape, precision, is_negative, targetDevice) = + this->GetParam(); + auto param = std::make_shared(precision, input_shape); auto spatial_dims = input_shape.size() - 2; auto mul_const = ngraph::builder::makeConstant(precision, const_shape, {}, true); - auto mul = std::make_shared(param, mul_const); - ngraph::Shape strides(spatial_dims, 1); + auto mul = std::make_shared(param, mul_const); + ov::Shape strides(spatial_dims, 1); std::vector pad_begin(spatial_dims, 0), pad_end(spatial_dims, 0); auto weights = ngraph::builder::makeConstant(precision, weights_shape, {}, true); - std::shared_ptr conv; - if (conv_type == ngraph::opset8::Convolution::get_type_info_static()) { - conv = std::make_shared(mul, weights, strides, pad_begin, pad_end, strides); - } else if (conv_type == ngraph::opset8::GroupConvolution::get_type_info_static()) { - conv = std::make_shared(mul, weights, strides, pad_begin, pad_end, strides); - } else if (conv_type == ngraph::opset8::ConvolutionBackpropData::get_type_info_static()) { - conv = std::make_shared(mul, weights, strides, pad_begin, pad_end, strides); - } else if (conv_type == ngraph::opset8::GroupConvolutionBackpropData::get_type_info_static()) { - conv = std::make_shared(mul, weights, strides, pad_begin, pad_end, strides); + std::shared_ptr conv; + if (conv_type == ov::op::v1::Convolution::get_type_info_static()) { + conv = std::make_shared(mul, weights, strides, pad_begin, pad_end, strides); + } else if (conv_type == ov::op::v1::GroupConvolution::get_type_info_static()) { + conv = std::make_shared(mul, weights, strides, pad_begin, pad_end, strides); + } else if (conv_type == ov::op::v1::ConvolutionBackpropData::get_type_info_static()) { + conv = + std::make_shared(mul, weights, strides, pad_begin, pad_end, strides); + } else if (conv_type == ov::op::v1::GroupConvolutionBackpropData::get_type_info_static()) { + conv = std::make_shared(mul, + weights, + strides, + pad_begin, + pad_end, + strides); } else { OPENVINO_THROW("Unsupported type"); } - function = std::make_shared(ngraph::OutputVector{conv}, ngraph::ParameterVector{param}); - auto cloned_function = ngraph::clone_function(*function); + function = std::make_shared(ov::OutputVector{conv}, ov::ParameterVector{param}); + auto cloned_function = function->clone(); - ngraph::pass::Manager manager; + ov::pass::Manager manager; manager.register_pass(); manager.register_pass(); manager.register_pass(); @@ -65,58 +75,75 @@ void MulConvFusion::SetUp() { bool functions_equal = false; if (!is_negative) { - auto param = std::make_shared(precision, input_shape); - ngraph::Shape strides(spatial_dims, 1); + auto param = std::make_shared(precision, input_shape); + ov::Shape strides(spatial_dims, 1); std::vector pad_begin(spatial_dims, 0), pad_end(spatial_dims, 0); - std::shared_ptr conv; - if (conv_type == ngraph::opset8::Convolution::get_type_info_static()) { - weights = std::make_shared(weights, mul_const); + std::shared_ptr conv; + if (conv_type == ov::op::v1::Convolution::get_type_info_static()) { + weights = std::make_shared(weights, mul_const); weights = ov::get_constant_from_source(weights); ASSERT_NE(nullptr, weights); - conv = std::make_shared(param, weights, strides, pad_begin, pad_end, strides); - } else if (conv_type == ngraph::opset8::GroupConvolution::get_type_info_static()) { + conv = std::make_shared(param, weights, strides, pad_begin, pad_end, strides); + } else if (conv_type == ov::op::v1::GroupConvolution::get_type_info_static()) { const_shape.insert(const_shape.begin(), weights_shape.size() - const_shape.size(), 1); auto G = const_shape[2] > 1 ? weights_shape[0] : 1; const_shape[0] = G; const_shape[2] /= G; - auto reshape = std::make_shared(mul_const, - ngraph::op::Constant::create(ngraph::element::u64, ngraph::Shape{const_shape.size()}, const_shape), false); - weights = std::make_shared(weights, reshape); + auto reshape = std::make_shared( + mul_const, + ov::op::v0::Constant::create(ov::element::u64, ov::Shape{const_shape.size()}, const_shape), + false); + weights = std::make_shared(weights, reshape); weights = ov::get_constant_from_source(weights); ASSERT_NE(nullptr, weights); - conv = std::make_shared(param, weights, strides, pad_begin, pad_end, strides); - } else if (conv_type == ngraph::opset8::ConvolutionBackpropData::get_type_info_static()) { + conv = std::make_shared(param, weights, strides, pad_begin, pad_end, strides); + } else if (conv_type == ov::op::v1::ConvolutionBackpropData::get_type_info_static()) { const_shape.insert(const_shape.begin(), weights_shape.size() - const_shape.size(), 1); const_shape[0] = const_shape[1]; const_shape[1] = 1; - auto reshape = std::make_shared(mul_const, - ngraph::op::Constant::create(ngraph::element::u64, ngraph::Shape{const_shape.size()}, const_shape), false); - weights = std::make_shared(weights, reshape); + auto reshape = std::make_shared( + mul_const, + ov::op::v0::Constant::create(ov::element::u64, ov::Shape{const_shape.size()}, const_shape), + false); + weights = std::make_shared(weights, reshape); weights = ov::get_constant_from_source(weights); ASSERT_NE(nullptr, weights); - conv = std::make_shared(param, weights, strides, pad_begin, pad_end, strides); - } else if (conv_type == ngraph::opset8::GroupConvolutionBackpropData::get_type_info_static()) { + conv = std::make_shared(param, + weights, + strides, + pad_begin, + pad_end, + strides); + } else if (conv_type == ov::op::v1::GroupConvolutionBackpropData::get_type_info_static()) { const_shape.insert(const_shape.begin(), weights_shape.size() - const_shape.size(), 1); auto G = const_shape[2] > 1 ? weights_shape[0] : 1; const_shape[0] = G; const_shape[1] = const_shape[2] / G; const_shape[2] = 1; - auto reshape = std::make_shared(mul_const, - ngraph::op::Constant::create(ngraph::element::u64, ngraph::Shape{const_shape.size()}, const_shape), false); - weights = std::make_shared(weights, reshape); + auto reshape = std::make_shared( + mul_const, + ov::op::v0::Constant::create(ov::element::u64, ov::Shape{const_shape.size()}, const_shape), + false); + weights = std::make_shared(weights, reshape); weights = ov::get_constant_from_source(weights); ASSERT_NE(nullptr, weights); - conv = std::make_shared(param, weights, strides, pad_begin, pad_end, strides); + conv = std::make_shared(param, + weights, + strides, + pad_begin, + pad_end, + strides); } else { OPENVINO_THROW("Unsupported type"); } - auto reference_function = std::make_shared(ngraph::OutputVector{conv}, ngraph::ParameterVector{param}); + auto reference_function = std::make_shared(ov::OutputVector{conv}, ov::ParameterVector{param}); std::tie(functions_equal, std::ignore) = compare_functions(cloned_function, reference_function, true); ASSERT_TRUE(functions_equal); } else { - auto reference_function = ngraph::clone_function(*function); + auto reference_function = function->clone(); std::tie(functions_equal, std::ignore) = compare_functions(cloned_function, reference_function, true); ASSERT_TRUE(functions_equal); } } -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/src/subgraph/multiply_add.cpp b/src/tests/functional/shared_test_classes/src/subgraph/multiply_add.cpp index 8b070a70026..dfc1dcdb5f7 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/multiply_add.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/multiply_add.cpp @@ -4,37 +4,43 @@ #include "shared_test_classes/subgraph/multiply_add.hpp" -namespace SubgraphTestsDefinitions { -std::string MultiplyAddLayerTest::getTestCaseName(const testing::TestParamInfo &obj) { - std::vector inputShapes; - InferenceEngine::Precision netPrecision; +#include "ov_models/builders.hpp" +#include "ov_models/utils/ov_helpers.hpp" + +namespace ov { +namespace test { + +std::string MultiplyAddLayerTest::getTestCaseName(const testing::TestParamInfo& obj) { + ov::Shape inputShapes; + ov::element::Type element_type; std::string targetName; - std::tie(inputShapes, netPrecision, targetName) = obj.param; + std::tie(inputShapes, element_type, targetName) = obj.param; std::ostringstream results; results << "IS=" << ov::test::utils::vec2str(inputShapes) << "_"; - results << "netPRC=" << netPrecision.name() << "_"; + results << "ET=" << element_type << "_"; results << "targetDevice=" << targetName << "_"; return results.str(); } void MultiplyAddLayerTest::SetUp() { - std::vector inputShape; - auto netPrecision = InferenceEngine::Precision::UNSPECIFIED; - std::tie(inputShape, netPrecision, targetDevice) = this->GetParam(); - auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - ov::ParameterVector params{std::make_shared(ngPrc, ov::Shape(inputShape))}; - auto paramOuts = ngraph::helpers::convert2OutputVector( - ngraph::helpers::castOps2Nodes(params)); + ov::Shape inputShape; + ov::element::Type element_type; + std::tie(inputShape, element_type, targetDevice) = this->GetParam(); + ov::ParameterVector params{std::make_shared(element_type, ov::PartialShape(inputShape))}; + auto paramOuts = + ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); std::vector constShape(inputShape.size(), 1); constShape[1] = inputShape[1]; - auto const_mul = ngraph::builder::makeConstant(ngPrc, constShape, {}, true); - auto mul = std::make_shared(paramOuts[0], const_mul); - auto const_add = ngraph::builder::makeConstant(ngPrc, constShape, {}, true); - auto add = std::make_shared(mul, const_add); - ngraph::ResultVector results{std::make_shared(add)}; - function = std::make_shared(results, params, "multiplyAdd"); + auto const_mul = ngraph::builder::makeConstant(element_type, constShape, {}, true); + auto mul = std::make_shared(paramOuts[0], const_mul); + auto const_add = ngraph::builder::makeConstant(element_type, constShape, {}, true); + auto add = std::make_shared(mul, const_add); + ov::ResultVector results{std::make_shared(add)}; + function = std::make_shared(results, params, "multiplyAdd"); } -} // namespace SubgraphTestsDefinitions + +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/src/subgraph/mvn_multiply_add.cpp b/src/tests/functional/shared_test_classes/src/subgraph/mvn_multiply_add.cpp index 2371182175c..9ff6272b9ab 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/mvn_multiply_add.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/mvn_multiply_add.cpp @@ -4,12 +4,16 @@ #include "shared_test_classes/subgraph/mvn_multiply_add.hpp" -namespace SubgraphTestsDefinitions { +#include "ov_models/builders.hpp" +#include "ov_models/utils/ov_helpers.hpp" -std::string MVNMultiplyAdd::getTestCaseName(const testing::TestParamInfo &obj) { - std::pair shapes; - InferenceEngine::SizeVector inputShapes, constantShapes; - InferenceEngine::Precision dataPrecision, axesPrecision; +namespace ov { +namespace test { + +std::string MVNMultiplyAdd::getTestCaseName(const testing::TestParamInfo& obj) { + std::pair shapes; + ov::Shape inputShapes, constantShapes; + ov::element::Type dataPrecision, axesPrecision; std::vector axes; bool normalizeVariance; float eps; @@ -20,8 +24,8 @@ std::string MVNMultiplyAdd::getTestCaseName(const testing::TestParamInfo shapes; - InferenceEngine::SizeVector inputShapes, constantShapes; - InferenceEngine::Precision dataPrecision, axesPrecision; + std::pair shapes; + ov::Shape inputShapes, constantShapes; + ov::element::Type dataType, axesType; std::vector axes; bool normalizeVariance; float eps; std::string epsMode; - std::tie(shapes, dataPrecision, axesPrecision, axes, normalizeVariance, eps, epsMode, targetDevice) = this->GetParam(); + std::tie(shapes, dataType, axesType, axes, normalizeVariance, eps, epsMode, targetDevice) = this->GetParam(); std::tie(inputShapes, constantShapes) = shapes; - auto dataType = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(dataPrecision); - auto axesType = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(axesPrecision); - - ov::ParameterVector param {std::make_shared(dataType, ov::Shape(inputShapes))}; - auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(param)); - auto axesNode = ngraph::builder::makeConstant(axesType, ngraph::Shape{axes.size()}, axes); + ov::ParameterVector param{std::make_shared(dataType, ov::Shape(inputShapes))}; + auto paramOuts = + ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(param)); + auto axesNode = ngraph::builder::makeConstant(axesType, ov::Shape{axes.size()}, axes); auto mvn = ngraph::builder::makeMVN6(paramOuts[0], axesNode, normalizeVariance, eps, epsMode); auto gamma = ngraph::builder::makeConstant(dataType, constantShapes, {}, true); - auto mul = std::make_shared(mvn, gamma); + auto mul = std::make_shared(mvn, gamma); auto beta = ngraph::builder::makeConstant(dataType, constantShapes, {}, true); - auto add = std::make_shared(mul, beta); + auto add = std::make_shared(mul, beta); - ngraph::ResultVector results{std::make_shared(add)}; - function = std::make_shared(results, param, "MVNMultiplyAdd"); + ov::ResultVector results{std::make_shared(add)}; + function = std::make_shared(results, param, "MVNMultiplyAdd"); } -} // namespace SubgraphTestsDefinitions + +} // namespace test +} // namespace ov diff --git a/src/tests/functional/shared_test_classes/src/subgraph/perm_conv_perm_concat.cpp b/src/tests/functional/shared_test_classes/src/subgraph/perm_conv_perm_concat.cpp index b488166297f..e51e30a6caa 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/perm_conv_perm_concat.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/perm_conv_perm_concat.cpp @@ -4,105 +4,97 @@ #include "shared_test_classes/subgraph/perm_conv_perm_concat.hpp" -namespace SubgraphTestsDefinitions { +#include "common_test_utils/data_utils.hpp" +#include "functional_test_utils/skip_tests_config.hpp" +#include "ov_models/builders.hpp" + +namespace ov { +namespace test { + std::string PermConvPermConcat::getTestCaseName(const testing::TestParamInfo& obj) { - InferenceEngine::Precision netPrecision; + ov::element::Type element_type; std::string targetName; - std::array input_shape; - std::array kernel_shape; + ov::Shape input_shape; + ov::Shape kernel_shape; size_t output_channels; - std::map configuration; + ov::AnyMap configuration; - - std::tie(netPrecision, targetName, input_shape, kernel_shape, output_channels, configuration) = obj.param; + std::tie(element_type, targetName, input_shape, kernel_shape, output_channels, configuration) = obj.param; std::ostringstream results; results << "IS=" << ov::test::utils::vec2str(std::vector(input_shape.begin(), input_shape.end())) << "_"; results << "KS=" << ov::test::utils::vec2str(std::vector(kernel_shape.begin(), kernel_shape.end())) << "_"; results << "OC=" << output_channels << "_"; - results << "netPRC=" << netPrecision.name() << "_"; + results << "ET=" << element_type << "_"; results << "targetDevice=" << targetName; for (auto const& configItem : configuration) { - results << "_configItem=" << configItem.first << "_" << configItem.second; + results << "_configItem=" << configItem.first << "_" << configItem.second.as(); } return results.str(); } void PermConvPermConcat::SetUp() { - InferenceEngine::Precision netPrecision; - std::array input_shape; - std::array kernel_shape; + ov::element::Type element_type; + ov::Shape input_shape; + ov::Shape kernel_shape; size_t output_channels; - std::map additional_config; + ov::AnyMap additional_config; - std::tie(netPrecision, targetDevice, input_shape, kernel_shape, output_channels, additional_config) = this->GetParam(); + std::tie(element_type, targetDevice, input_shape, kernel_shape, output_channels, additional_config) = + this->GetParam(); configuration.insert(additional_config.begin(), additional_config.end()); const std::size_t input_dim = std::accumulate(input_shape.begin(), input_shape.end(), 1, std::multiplies()); - auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - std::vector input_dims { 1, input_dim }; + std::vector input_dims{1, input_dim}; std::vector reshape_in_dims = std::vector(input_shape.begin(), input_shape.end()); - std::vector permute_in_order = { 0, 3, 1, 2 }; - std::vector permute_out_order = { 0, 2, 3, 1 }; + std::vector permute_in_order = {0, 3, 1, 2}; + std::vector permute_out_order = {0, 2, 3, 1}; - ov::ParameterVector input_parameter {std::make_shared(ngPrc, ov::Shape(input_dims))}; + ov::ParameterVector input_parameter{std::make_shared(element_type, ov::Shape(input_dims))}; - auto reshape_in_pattern = std::make_shared(ngraph::element::i64, - ngraph::Shape{4}, - reshape_in_dims); - auto reshape_in = std::make_shared(input_parameter[0], reshape_in_pattern, false); + auto reshape_in_pattern = std::make_shared(ov::element::i64, ov::Shape{4}, reshape_in_dims); + auto reshape_in = std::make_shared(input_parameter[0], reshape_in_pattern, false); - auto permute_in_params = std::make_shared(ngraph::element::i64, - ngraph::Shape{4}, - ngraph::Shape{permute_in_order}); - auto permute_in = std::make_shared(reshape_in, permute_in_params); + auto permute_in_params = + std::make_shared(ov::element::i64, ov::Shape{4}, ov::Shape{permute_in_order}); + auto permute_in = std::make_shared(reshape_in, permute_in_params); auto conv_in_shape = permute_in->get_output_shape(0); auto conv_weights_size = output_channels * (conv_in_shape[1]) * kernel_shape[0] * kernel_shape[1]; - auto conv = ngraph::builder::makeConvolution(permute_in, ngPrc, {kernel_shape[0], kernel_shape[1]}, {1, 1}, {0, 0}, {0, 0}, {1, 1}, - ngraph::op::PadType::VALID, output_channels, false, ov::test::utils::generate_float_numbers(conv_weights_size, -0.5f, 0.5f)); + auto conv = + ngraph::builder::makeConvolution(permute_in, + element_type, + {kernel_shape[0], kernel_shape[1]}, + {1, 1}, + {0, 0}, + {0, 0}, + {1, 1}, + ov::op::PadType::VALID, + output_channels, + false, + ov::test::utils::generate_float_numbers(conv_weights_size, -0.5f, 0.5f)); - auto permute_out_params = std::make_shared(ngraph::element::i64, - ngraph::Shape{4}, - permute_out_order); - auto permute_out = std::make_shared(conv, permute_out_params); + auto permute_out_params = std::make_shared(ov::element::i64, ov::Shape{4}, permute_out_order); + auto permute_out = std::make_shared(conv, permute_out_params); auto permute_out_shape = permute_out->get_output_shape(0); - auto concat_const = ngraph::builder::makeConstant(ngPrc, {1, 1, 1, permute_out_shape[3]}, - ov::test::utils::generate_float_numbers(permute_out_shape[3], -10, 10)); + auto concat_const = + ngraph::builder::makeConstant(element_type, + {1, 1, 1, permute_out_shape[3]}, + ov::test::utils::generate_float_numbers(permute_out_shape[3], -10, 10)); auto concat = ngraph::builder::makeConcat({permute_out, concat_const}, 2); - auto reshape_out_pattern = std::make_shared(ngraph::element::i64, - ngraph::Shape{2}, + auto reshape_out_pattern = std::make_shared( + ov::element::i64, + ov::Shape{2}, InferenceEngine::SizeVector({1, (permute_out_shape[2] + 1) * permute_out_shape[3]})); - auto reshape_out = std::make_shared(concat, reshape_out_pattern, false); + auto reshape_out = std::make_shared(concat, reshape_out_pattern, false); - function = std::make_shared(reshape_out, input_parameter, "perm_conv_perm_concat"); + function = std::make_shared(reshape_out, input_parameter, "perm_conv_perm_concat"); } -void PermConvPermConcat::Run() { - SKIP_IF_CURRENT_TEST_IS_DISABLED() - - LoadNetwork(); - - inferRequest = executableNetwork.CreateInferRequest(); - inputs.clear(); - - for (const auto &input : cnnNetwork.getInputsInfo()) { - const auto &info = input.second; - auto tensorDesc = info->getTensorDesc(); - - auto blob = FuncTestUtils::createAndFillBlobFloat(tensorDesc, 2, -1, 100, 111); - - FuncTestUtils::fillInputsBySinValues(blob); - inferRequest.SetBlob(info->name(), blob); - inputs.push_back(blob); - } - inferRequest.Infer(); - - Validate(); -} -} // namespace SubgraphTestsDefinitions +} // namespace test +} // namespace ov