From 8ef3834fe9dcea2f306d3b35d7a154d5061d0e58 Mon Sep 17 00:00:00 2001 From: Vitaliy Urusovskij Date: Thu, 7 Dec 2023 14:34:11 +0400 Subject: [PATCH] `ngraph` leftovers in CPU shared single_layer and subgraph (#21499) tests --- .../single_layer_tests/binary_convolution.cpp | 4 +-- .../single_layer_tests/comparison.cpp | 28 +++++++++---------- .../single_layer_tests/convolution.cpp | 10 +++---- .../deformable_convolution.cpp | 10 +++---- .../single_layer_tests/eltwise.cpp | 6 ++-- .../single_layer_tests/gru_sequence.cpp | 1 - .../single_layer_tests/is_inf.cpp | 2 +- .../single_layer_tests/matrix_nms.cpp | 8 +++--- .../single_layer_tests/mvn.cpp | 4 +-- .../single_layer_tests/softmax.cpp | 12 ++++---- .../quantized_convolution_backprop_data.cpp | 2 +- 11 files changed, 43 insertions(+), 44 deletions(-) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/binary_convolution.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/binary_convolution.cpp index da2df80eb7dda0..31c13e56b02baa 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/binary_convolution.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/binary_convolution.cpp @@ -36,7 +36,7 @@ const auto binConv2DParams_ExplicitPadding = ::testing::Combine( ::testing::ValuesIn(padsEnd), ::testing::ValuesIn(dilations), ::testing::ValuesIn(numOutChannels), - ::testing::Values(ngraph::op::PadType::EXPLICIT), + ::testing::Values(ov::op::PadType::EXPLICIT), ::testing::ValuesIn(padValues)); const auto binConv2DParams_ValidPadding = ::testing::Combine( @@ -46,7 +46,7 @@ const auto binConv2DParams_ValidPadding = ::testing::Combine( ::testing::Values(std::vector({0, 0})), ::testing::ValuesIn(dilations), ::testing::ValuesIn(numOutChannels), - ::testing::Values(ngraph::op::PadType::VALID), + ::testing::Values(ov::op::PadType::VALID), ::testing::ValuesIn(padValues)); INSTANTIATE_TEST_SUITE_P( diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/comparison.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/comparison.cpp index 0b68b33e2074a9..22a4d9a9740d89 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/comparison.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/comparison.cpp @@ -37,18 +37,18 @@ std::vector model_type = { ov::element::boolean, }; -std::vector comparisonOpTypes = { - ngraph::helpers::ComparisonTypes::EQUAL, - ngraph::helpers::ComparisonTypes::NOT_EQUAL, - ngraph::helpers::ComparisonTypes::GREATER, - ngraph::helpers::ComparisonTypes::GREATER_EQUAL, - ngraph::helpers::ComparisonTypes::LESS, - ngraph::helpers::ComparisonTypes::LESS_EQUAL, +std::vector comparisonOpTypes = { + ov::test::utils::ComparisonTypes::EQUAL, + ov::test::utils::ComparisonTypes::NOT_EQUAL, + ov::test::utils::ComparisonTypes::GREATER, + ov::test::utils::ComparisonTypes::GREATER_EQUAL, + ov::test::utils::ComparisonTypes::LESS, + ov::test::utils::ComparisonTypes::LESS_EQUAL, }; -std::vector secondInputTypes = { - ngraph::helpers::InputLayerType::CONSTANT, - ngraph::helpers::InputLayerType::PARAMETER, +std::vector secondInputTypes = { + ov::test::utils::InputLayerType::CONSTANT, + ov::test::utils::InputLayerType::PARAMETER, }; std::map additional_config = {}; @@ -81,15 +81,15 @@ std::vector> input_shapes_is_ops_static = { {{2, 17, 3, 4}, {1}} }; -std::vector comparisonOpTypesIs = { - ngraph::helpers::ComparisonTypes::IS_FINITE, - ngraph::helpers::ComparisonTypes::IS_NAN +std::vector comparisonOpTypesIs = { + ov::test::utils::ComparisonTypes::IS_FINITE, + ov::test::utils::ComparisonTypes::IS_NAN }; const auto ComparisonTestParamsIs = ::testing::Combine( ::testing::ValuesIn(ov::test::static_shapes_to_test_representation(input_shapes_is_ops_static)), ::testing::ValuesIn(comparisonOpTypesIs), - ::testing::Values(ngraph::helpers::InputLayerType::CONSTANT), + ::testing::Values(ov::test::utils::InputLayerType::CONSTANT), ::testing::Values(ov::element::f32), ::testing::Values(ov::test::utils::DEVICE_CPU), ::testing::Values(additional_config)); diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp index 3bfe2fb06b814d..3a885a08f8d459 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp @@ -64,13 +64,13 @@ const auto conv2DParams_ExplicitPadding = ::testing::Combine( ::testing::ValuesIn(kernels), ::testing::ValuesIn(strides), ::testing::ValuesIn(padBegins), ::testing::ValuesIn(padEnds), ::testing::ValuesIn(dilations), ::testing::ValuesIn(numOutChannels), - ::testing::Values(ngraph::op::PadType::EXPLICIT)); + ::testing::Values(ov::op::PadType::EXPLICIT)); const auto conv2DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(kernels), ::testing::ValuesIn(strides), ::testing::Values(std::vector({0, 0})), ::testing::Values(std::vector({0, 0})), ::testing::ValuesIn(dilations), ::testing::ValuesIn(numOutChannels), - ::testing::Values(ngraph::op::PadType::VALID)); + ::testing::Values(ov::op::PadType::VALID)); INSTANTIATE_TEST_SUITE_P( smoke_Convolution2D_ExplicitPadding, ConvolutionLayerTest, @@ -103,7 +103,7 @@ const auto conv2DParams_WeightLayout = ::testing::Combine(::testing::Values(kern ::testing::Values(padEnds), ::testing::Values(dilations), ::testing::Values(numOutChannels), - ::testing::Values(ngraph::op::PadType::EXPLICIT)); + ::testing::Values(ov::op::PadType::EXPLICIT)); INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_SpecificWeightLayout, ConvolutionLayerTest, ::testing::Combine(conv2DParams_WeightLayout, @@ -124,13 +124,13 @@ const auto conv3DParams_ExplicitPadding = ::testing::Combine( ::testing::ValuesIn(kernels3d), ::testing::ValuesIn(strides3d), ::testing::ValuesIn(paddings3d), ::testing::ValuesIn(paddings3d), ::testing::ValuesIn(dilations3d), ::testing::ValuesIn(numOutChannels3D), - ::testing::Values(ngraph::op::PadType::EXPLICIT)); + ::testing::Values(ov::op::PadType::EXPLICIT)); const auto conv3DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(kernels3d), ::testing::ValuesIn(strides3d), ::testing::Values(std::vector({0, 0, 0})), ::testing::Values(std::vector({0, 0, 0})), ::testing::ValuesIn(dilations3d), ::testing::ValuesIn(numOutChannels3D), - ::testing::Values(ngraph::op::PadType::VALID)); + ::testing::Values(ov::op::PadType::VALID)); INSTANTIATE_TEST_SUITE_P( smoke_Convolution3D_ExplicitPadding, ConvolutionLayerTest, diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/deformable_convolution.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/deformable_convolution.cpp index 8192ab595e5fc7..89b793f8bf7551 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/deformable_convolution.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/deformable_convolution.cpp @@ -166,7 +166,7 @@ const auto deformableConv2DParams_SingleTestCase = ::testing::Combine( ::testing::ValuesIn(groups), ::testing::ValuesIn(single_deform_groups), ::testing::ValuesIn(numOutChannels), - ::testing::Values(ngraph::op::PadType::EXPLICIT), + ::testing::Values(ov::op::PadType::EXPLICIT), ::testing::ValuesIn(with_bilinear_interpolation_pad)); INSTANTIATE_TEST_SUITE_P( @@ -215,7 +215,7 @@ INSTANTIATE_TEST_SUITE_P( ::testing::ValuesIn(std::vector {2}), // gr. ::testing::ValuesIn(std::vector {2}), // def. gr. ::testing::ValuesIn(numOutChannels), - ::testing::Values(ngraph::op::PadType::EXPLICIT), + ::testing::Values(ov::op::PadType::EXPLICIT), ::testing::ValuesIn(with_bilinear_interpolation_pad)), ::testing::Values(false), ::testing::ValuesIn(netPrecisions), @@ -234,7 +234,7 @@ INSTANTIATE_TEST_SUITE_P( ::testing::ValuesIn(std::vector {2}), // gr. ::testing::ValuesIn(std::vector {2}), // def. gr. ::testing::ValuesIn(numOutChannels), - ::testing::Values(ngraph::op::PadType::EXPLICIT), + ::testing::Values(ov::op::PadType::EXPLICIT), ::testing::ValuesIn(with_bilinear_interpolation_pad)), ::testing::Values(true), ::testing::ValuesIn(netPrecisions), @@ -266,7 +266,7 @@ INSTANTIATE_TEST_SUITE_P( ::testing::ValuesIn(std::vector {4}), // gr. ::testing::ValuesIn(std::vector {1}), // def. gr. ::testing::ValuesIn(numOutChannels), - ::testing::Values(ngraph::op::PadType::EXPLICIT), + ::testing::Values(ov::op::PadType::EXPLICIT), ::testing::ValuesIn(with_bilinear_interpolation_pad)), ::testing::Values(false), ::testing::ValuesIn(netPrecisions), @@ -285,7 +285,7 @@ INSTANTIATE_TEST_SUITE_P( ::testing::ValuesIn(std::vector {4}), // gr. ::testing::ValuesIn(std::vector {1}), // def. gr. ::testing::ValuesIn(numOutChannels), - ::testing::Values(ngraph::op::PadType::EXPLICIT), + ::testing::Values(ov::op::PadType::EXPLICIT), ::testing::ValuesIn(with_bilinear_interpolation_pad)), ::testing::Values(true), ::testing::ValuesIn(netPrecisions), diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/eltwise.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/eltwise.cpp index f8a80efe1f6223..ff7e75adf0f264 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -40,12 +40,12 @@ std::vector> in_shapes_static_check_collapse = { }; std::vector> in_shapes_dynamic = { - {{{ngraph::Dimension(1, 10), 200}, {{2, 200}, {1, 200}}}, - {{ngraph::Dimension(1, 10), 200}, {{2, 200}, {5, 200}}}}, + {{{ov::Dimension(1, 10), 200}, {{2, 200}, {1, 200}}}, + {{ov::Dimension(1, 10), 200}, {{2, 200}, {5, 200}}}}, }; std::vector> in_shapes_dynamic_large_upper_bound = { - {{{ngraph::Dimension(1, 1000000000000), 200}, {{2, 200}, {5, 200}}}}, + {{{ov::Dimension(1, 1000000000000), 200}, {{2, 200}, {5, 200}}}}, }; std::vector model_types = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp index 36a35d7bffd819..3745268569552d 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp @@ -3,7 +3,6 @@ // #include -#include #include "single_op_tests/gru_sequence.hpp" #include "common_test_utils/test_constants.hpp" #include "common_test_utils/test_enums.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/is_inf.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/is_inf.cpp index 74bec47ba16896..ce45353ab90e50 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/is_inf.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/is_inf.cpp @@ -28,7 +28,7 @@ std::vector> input_shapes_static = { }; std::vector> input_shapes_dynamic = { - {{{ngraph::Dimension(1, 10), 200}, {{2, 200}, {1, 200}}}} + {{{ov::Dimension(1, 10), 200}, {{2, 200}, {1, 200}}}} }; std::vector model_types = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/matrix_nms.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/matrix_nms.cpp index 9dff6869e3272f..90fadce0861ae9 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/matrix_nms.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/matrix_nms.cpp @@ -18,14 +18,14 @@ const std::vector> inStaticShapeParams = { const std::vector> inDynamicShapeParams = { // num_batches, num_boxes, 4 - {{{ngraph::Dimension::dynamic(), ngraph::Dimension::dynamic(), 4}, + {{{ov::Dimension::dynamic(), ov::Dimension::dynamic(), 4}, {{1, 10, 4}, {2, 100, 4}}}, // num_batches, num_classes, num_boxes - {{ngraph::Dimension::dynamic(), ngraph::Dimension::dynamic(), ngraph::Dimension::dynamic()}, + {{ov::Dimension::dynamic(), ov::Dimension::dynamic(), ov::Dimension::dynamic()}, {{1, 3, 10}, {2, 5, 100}}}}, - {{{ngraph::Dimension(1, 10), ngraph::Dimension(1, 100), 4}, + {{{ov::Dimension(1, 10), ov::Dimension(1, 100), 4}, {{1, 10, 4}, {2, 100, 4}}}, - {{{ngraph::Dimension(1, 10), ngraph::Dimension(1, 100), ngraph::Dimension(1, 100)}}, + {{{ov::Dimension(1, 10), ov::Dimension(1, 100), ov::Dimension(1, 100)}}, {{1, 3, 10}, {2, 5, 100}}}} }; diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/mvn.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/mvn.cpp index 9daa95881ec134..8da9c1249f823e 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/mvn.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/mvn.cpp @@ -12,7 +12,7 @@ using ov::test::Mvn1LayerTest; using ov::test::Mvn6LayerTest; const std::vector empty_across_channels = {{}}; -const std::vector empty_reduction_axes = {{}}; +const std::vector empty_reduction_axes = {{}}; const std::vector> input_shapes_static = { {{8}}, @@ -69,7 +69,7 @@ const std::vector> input_shapes_reduction_axes_static = { const auto MvnReductionAxes = ::testing::Combine( ::testing::ValuesIn(ov::test::static_shapes_to_test_representation(input_shapes_reduction_axes_static)), ::testing::Values(ov::element::f32), - ::testing::ValuesIn(std::vector{{1, 2, 3}, {2, 3}}), + ::testing::ValuesIn(std::vector{{1, 2, 3}, {2, 3}}), ::testing::ValuesIn(empty_across_channels), ::testing::ValuesIn(normalize_variance), ::testing::ValuesIn(epsilon), diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp index 5838096b20eed0..ff058cecf6fc35 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp @@ -22,10 +22,10 @@ const std::vector inputStaticShape2D = { }; const std::vector inputDynamicShape2D = { - {{ngraph::Dimension::dynamic(), 10}, {{1, 10}, {2, 10}, {10, 10}}}, - {{ngraph::Dimension(1, 10), 10}, {{1, 10}, {2, 10}, {10, 10}}}, - {{10, ngraph::Dimension::dynamic()}, {{10, 1}, {10, 5}, {10, 10}}}, - {{ngraph::Dimension::dynamic(), ngraph::Dimension::dynamic()}, {{1, 10}, {2, 10}, {10, 10}}} + {{ov::Dimension::dynamic(), 10}, {{1, 10}, {2, 10}, {10, 10}}}, + {{ov::Dimension(1, 10), 10}, {{1, 10}, {2, 10}, {10, 10}}}, + {{10, ov::Dimension::dynamic()}, {{10, 1}, {10, 5}, {10, 10}}}, + {{ov::Dimension::dynamic(), ov::Dimension::dynamic()}, {{1, 10}, {2, 10}, {10, 10}}} }; const std::vector axis2D = { @@ -73,8 +73,8 @@ const std::vector inputStaticShape4D = { }; const std::vector inputDynamicShape4D = { - {{ngraph::Dimension::dynamic(), 100, ngraph::Dimension(1, 10), 1}, {{1, 100, 1, 1}, {100, 100, 5, 1}}}, - {{ngraph::Dimension::dynamic(), ngraph::Dimension::dynamic(), ngraph::Dimension::dynamic(), ngraph::Dimension::dynamic()}, + {{ov::Dimension::dynamic(), 100, ov::Dimension(1, 10), 1}, {{1, 100, 1, 1}, {100, 100, 5, 1}}}, + {{ov::Dimension::dynamic(), ov::Dimension::dynamic(), ov::Dimension::dynamic(), ov::Dimension::dynamic()}, {{1, 100, 1, 1}, {50, 100, 4, 1}, {2, 100, 10, 1}}}, }; diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp index 0a4d6d2e6e23b4..fe5bc52f776990 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp @@ -34,7 +34,7 @@ const auto quantConvBackpropData2DParams = ::testing::Combine( ::testing::ValuesIn(padEnds2D), ::testing::ValuesIn(dilations2D), ::testing::ValuesIn(numOutChannels), - ::testing::Values(ngraph::op::PadType::AUTO), + ::testing::Values(ov::op::PadType::AUTO), ::testing::ValuesIn(levels), ::testing::ValuesIn(granularity) );