From 2ff5d1fab13a167e6f7098303ea41d5fcfa6e8c5 Mon Sep 17 00:00:00 2001 From: Vladislav Golubev Date: Fri, 9 Jul 2021 14:55:20 +0300 Subject: [PATCH] [LPT] Plugin tests: added the ability to add test-cases with dynamic shapes (#6436) --- .../add_transformation.cpp | 2 +- .../clamp_transformation.cpp | 2 +- .../concat_transformation.cpp | 2 +- .../concat_with_child_and_output.cpp | 2 +- ...t_with_different_precision_on_children.cpp | 2 +- ...oncat_with_intermediate_transformation.cpp | 2 +- .../concat_with_neighbors_transformation.cpp | 2 +- .../concat_with_split_transformation.cpp | 2 +- ...nvolution_backprop_data_transformation.cpp | 2 +- .../convolution_qdq_transformation.cpp | 2 +- .../depth_to_space_transformation.cpp | 4 ++-- ...e_quantize_and_avg_pool_transformation.cpp | 2 +- ...e_quantize_and_max_pool_transformation.cpp | 2 +- ...d_two_output_branches_with_convolution.cpp | 2 +- ...ize_precision_selection_transformation.cpp | 2 +- .../fake_quantize_transformation.cpp | 2 +- ...ize_with_dq_not_optimal_transformation.cpp | 2 +- .../fully_connected_transformation.cpp | 12 +++++----- .../fuse_convert_transformation.cpp | 4 ++-- ...uantize_and_scale_shift_transformation.cpp | 2 +- .../fuse_fake_quantize_transformation.cpp | 14 +++++------ ...ltiply_to_fake_quantize_transformation.cpp | 4 ++-- ...btract_to_fake_quantize_transformation.cpp | 4 ++-- .../gemm_transformation.cpp | 2 +- .../group_convolution_transformation.cpp | 24 +++++++++---------- .../groupconvolution_qdq_transformation.cpp | 2 +- .../interpolate_transformation.cpp | 2 +- .../mat_mul_transformation.cpp | 2 +- ..._constant_fake_quantize_transformation.cpp | 6 ++--- ...ly_to_group_convolution_transformation.cpp | 4 ++-- .../multiply_transformation.cpp | 2 +- ...ultiply_with_one_parent_transformation.cpp | 2 +- .../mvn_transformation.cpp | 4 ++-- .../normalize_transformation.cpp | 6 ++--- .../prelu_transformation.cpp | 2 +- ..._through_dequantization_transformation.cpp | 2 +- .../reduce_max_transformation.cpp | 2 +- .../reduce_mean_transformation.cpp | 2 +- .../reduce_min_transformation.cpp | 2 +- .../reduce_sum_transformation.cpp | 2 +- .../relu_transformation.cpp | 2 +- .../reshape_transformation.cpp | 8 +++---- .../shuffle_channels_transformation.cpp | 2 +- .../split_transformation.cpp | 2 +- .../strided_slice_transformation.cpp | 2 +- .../subtract_transformation.cpp | 2 +- .../transpose_after_matmul_transformation.cpp | 2 +- .../transpose_transformation.cpp | 4 ++-- .../variadic_split_transformation.cpp | 2 +- .../add_transformation.cpp | 2 +- .../clamp_transformation.cpp | 2 +- .../concat_transformation.cpp | 2 +- .../concat_with_child_and_output.cpp | 2 +- ...t_with_different_precision_on_children.cpp | 2 +- ...oncat_with_intermediate_transformation.cpp | 2 +- ...at_with_neighbors_graph_transformation.cpp | 2 +- .../concat_with_split_transformation.cpp | 2 +- ...nvolution_backprop_data_transformation.cpp | 2 +- .../convolution_qdq_transformation.cpp | 2 +- .../depth_to_space_transformation.cpp | 4 ++-- ...e_quantize_and_avg_pool_transformation.cpp | 2 +- ...e_quantize_and_max_pool_transformation.cpp | 2 +- ...d_two_output_branches_with_convolution.cpp | 2 +- ...ize_precision_selection_transformation.cpp | 2 +- .../fake_quantize_transformation.cpp | 2 +- ...ize_with_dq_not_optimal_transformation.cpp | 2 +- .../fully_connected_transformation.cpp | 12 +++++----- .../fuse_convert_transformation.cpp | 4 ++-- ...uantize_and_scale_shift_transformation.cpp | 2 +- .../fuse_fake_quantize_transformation.cpp | 14 +++++------ ...ltiply_to_fake_quantize_transformation.cpp | 4 ++-- ...btract_to_fake_quantize_transformation.cpp | 4 ++-- .../gemm_transformation.cpp | 2 +- .../group_convolution_transformation.cpp | 12 +++++----- .../groupconvolution_qdq_transformation.cpp | 2 +- .../interpolate_transformation.cpp | 2 +- .../mat_mul_transformation.cpp | 2 +- ..._constant_fake_quantize_transformation.cpp | 6 ++--- ...ly_to_group_convolution_transformation.cpp | 4 ++-- .../multiply_transformation.cpp | 2 +- ...ultiply_with_one_parent_transformation.cpp | 2 +- .../mvn_transformation.cpp | 4 ++-- .../normalize_transformation.cpp | 6 ++--- .../prelu_transformation.cpp | 2 +- ..._through_dequantization_transformation.cpp | 2 +- .../reduce_max_transformation.cpp | 2 +- .../reduce_mean_transformation.cpp | 2 +- .../reduce_min_transformation.cpp | 2 +- .../reduce_sum_transformation.cpp | 2 +- .../relu_transformation.cpp | 2 +- .../reshape_transformation.cpp | 8 +++---- .../shuffle_channels_transformation.cpp | 2 +- .../split_transformation.cpp | 2 +- .../strided_slice_transformation.cpp | 2 +- .../subtract_transformation.cpp | 2 +- .../transpose_after_matmul_transformation.cpp | 2 +- .../transpose_transformation.cpp | 4 ++-- .../variadic_split_transformation.cpp | 2 +- .../add_transformation.hpp | 2 +- .../clamp_transformation.hpp | 2 +- .../concat_transformation.hpp | 2 +- .../concat_with_child_and_output.hpp | 2 +- ...t_with_different_precision_on_children.hpp | 2 +- ...oncat_with_intermediate_transformation.hpp | 2 +- ...at_with_neighbors_graph_transformation.hpp | 2 +- .../concat_with_split_transformation.hpp | 2 +- ...nvolution_backprop_data_transformation.hpp | 2 +- .../convolution_qdq_transformation.hpp | 2 +- .../depth_to_space_transformation.hpp | 2 +- ...e_quantize_and_avg_pool_transformation.hpp | 2 +- ...e_quantize_and_max_pool_transformation.hpp | 2 +- ...d_two_output_branches_with_convolution.hpp | 2 +- ...ize_precision_selection_transformation.hpp | 2 +- .../fake_quantize_transformation.hpp | 2 +- ...ize_with_dq_not_optimal_transformation.hpp | 2 +- .../fully_connected_transformation.hpp | 4 ++-- .../fuse_convert_transformation.hpp | 2 +- ...uantize_and_scale_shift_transformation.hpp | 2 +- .../fuse_fake_quantize_transformation.hpp | 2 +- ...ltiply_to_fake_quantize_transformation.hpp | 2 +- ...btract_to_fake_quantize_transformation.hpp | 2 +- .../gemm_transformation.hpp | 2 +- .../group_convolution_transformation.hpp | 2 +- .../groupconvolution_qdq_transformation.hpp | 2 +- .../interpolate_transformation.hpp | 2 +- .../mat_mul_transformation.hpp | 2 +- .../mat_mul_with_constant_transformation.hpp | 2 +- ..._constant_fake_quantize_transformation.hpp | 2 +- ...ly_to_group_convolution_transformation.hpp | 2 +- .../multiply_transformation.hpp | 2 +- ...ultiply_with_one_parent_transformation.hpp | 2 +- .../mvn_transformation.hpp | 2 +- .../normalize_transformation.hpp | 2 +- .../prelu_transformation.hpp | 2 +- ..._through_dequantization_transformation.hpp | 2 +- .../reduce_max_transformation.hpp | 2 +- .../reduce_mean_transformation.hpp | 2 +- .../reduce_min_transformation.hpp | 2 +- .../reduce_sum_transformation.hpp | 2 +- .../relu_transformation.hpp | 2 +- .../reshape_transformation.hpp | 2 +- .../shuffle_channels_transformation.hpp | 2 +- .../split_transformation.hpp | 2 +- .../squeeze_transformation.hpp | 2 +- .../strided_slice_transformation.hpp | 2 +- ...ultiply_to_multiply_add_transformation.hpp | 2 +- .../subtract_transformation.hpp | 2 +- .../transpose_after_matmul_transformation.hpp | 2 +- .../transpose_transformation.hpp | 2 +- .../unsqueeze_transformation.hpp | 2 +- .../variadic_split_transformation.hpp | 2 +- .../add_transformation.cpp | 6 ++--- .../clamp_transformation.cpp | 6 ++--- .../concat_transformation.cpp | 8 +++---- .../concat_with_child_and_output.cpp | 4 ++-- ...t_with_different_precision_on_children.cpp | 8 +++---- ...oncat_with_intermediate_transformation.cpp | 8 +++---- ...at_with_neighbors_graph_transformation.cpp | 8 +++---- .../concat_with_split_transformation.cpp | 6 ++--- ...nvolution_backprop_data_transformation.cpp | 12 ++++++---- .../convolution_qdq_transformation.cpp | 4 ++-- .../convolution_transformation.cpp | 6 ++--- .../convolution_with_incorrect_weights.cpp | 6 ++--- .../depth_to_space_transformation.cpp | 10 ++++---- ...e_quantize_and_avg_pool_transformation.cpp | 6 ++--- ...e_quantize_and_max_pool_transformation.cpp | 6 ++--- ...d_two_output_branches_with_convolution.cpp | 6 ++--- ...ize_precision_selection_transformation.cpp | 6 ++--- .../fake_quantize_transformation.cpp | 4 ++-- ...ize_with_dq_not_optimal_transformation.cpp | 4 ++-- .../fuse_convert_transformation.cpp | 4 ++-- ...uantize_and_scale_shift_transformation.cpp | 6 ++--- .../gemm_transformation.cpp | 6 ++--- .../groupconvolution_qdq_transformation.cpp | 4 ++-- .../interpolate_transformation.cpp | 6 ++--- .../mat_mul_transformation.cpp | 6 ++--- ..._constant_fake_quantize_transformation.cpp | 8 +++---- ...ly_to_group_convolution_transformation.cpp | 4 ++-- .../multiply_transformation.cpp | 6 ++--- ...ultiply_with_one_parent_transformation.cpp | 6 ++--- .../mvn_transformation.cpp | 6 ++--- .../normalize_transformation.cpp | 6 ++--- .../prelu_transformation.cpp | 8 +++---- ..._through_dequantization_transformation.cpp | 4 ++-- .../reduce_max_transformation.cpp | 4 ++-- .../reduce_mean_transformation.cpp | 4 ++-- .../reduce_min_transformation.cpp | 4 ++-- .../reduce_sum_transformation.cpp | 4 ++-- .../relu_transformation.cpp | 8 +++---- .../shuffle_channels_transformation.cpp | 4 ++-- .../split_transformation.cpp | 8 +++---- .../strided_slice_transformation.cpp | 6 ++--- .../subtract_transformation.cpp | 4 ++-- .../transpose_after_matmul_transformation.cpp | 6 ++--- .../variadic_split_transformation.cpp | 8 +++---- .../layer_transformation.hpp | 2 +- .../layer_transformation.cpp | 2 +- .../lpt_ngraph_functions/add_function.hpp | 2 +- .../avg_pool_function.hpp | 2 +- .../lpt_ngraph_functions/clamp_function.hpp | 2 +- .../lpt_ngraph_functions/concat_function.hpp | 4 ++-- .../convolution_backprop_data_function.hpp | 2 +- .../convolution_function.hpp | 2 +- .../depth_to_space_function.hpp | 2 +- ...fake_quantize_and_convolution_function.hpp | 2 +- ...put_branches_with_convolution_function.hpp | 2 +- .../fake_quantize_function.hpp | 2 +- ..._quantize_precision_selection_function.hpp | 2 +- .../fuse_convert_function.hpp | 2 +- ...fake_quantize_and_scale_shift_function.hpp | 2 +- .../fuse_fake_quantize_function.hpp | 2 +- .../group_convolution_function.hpp | 2 +- .../interpolate_function.hpp | 2 +- .../lpt_ngraph_functions/mat_mul_function.hpp | 8 +++---- ...imized_constant_fake_quantize_function.hpp | 4 ++-- .../max_pool_function.hpp | 2 +- .../multiply_function.hpp | 2 +- ...multiply_to_group_convolution_function.hpp | 2 +- .../multiply_with_one_parent_function.hpp | 2 +- .../lpt_ngraph_functions/mvn_function.hpp | 2 +- .../normalize_l2_function.hpp | 2 +- .../lpt_ngraph_functions/prelu_function.hpp | 2 +- .../lpt_ngraph_functions/reduce_function.hpp | 2 +- .../lpt_ngraph_functions/relu_function.hpp | 2 +- .../lpt_ngraph_functions/reshape_function.hpp | 2 +- .../shuffle_channels_function.hpp | 2 +- .../lpt_ngraph_functions/split_function.hpp | 2 +- .../lpt_ngraph_functions/squeeze_function.hpp | 2 +- .../strided_slice_function.hpp | 2 +- .../subtract_function.hpp | 2 +- ...ract_multiply_to_multiply_add_function.hpp | 2 +- .../transpose_after_mat_mul_function.hpp | 2 +- .../transpose_function.hpp | 2 +- .../unsqueeze_function.hpp | 2 +- .../variadic_split_function.hpp | 2 +- .../lpt_ngraph_functions/src/add_function.cpp | 4 ++-- .../src/avg_pool_function.cpp | 4 ++-- .../src/clamp_function.cpp | 2 +- .../src/concat_function.cpp | 12 +++++----- .../convolution_backprop_data_function.cpp | 2 +- .../src/convolution_function.cpp | 8 +++---- .../src/depth_to_space_function.cpp | 2 +- ...fake_quantize_and_convolution_function.cpp | 8 +++---- ...put_branches_with_convolution_function.cpp | 8 +++---- .../src/fake_quantize_function.cpp | 4 ++-- ..._quantize_precision_selection_function.cpp | 8 +++---- .../src/fuse_convert_function.cpp | 8 +++---- ...fake_quantize_and_scale_shift_function.cpp | 4 ++-- .../src/fuse_fake_quantize_function.cpp | 4 ++-- .../src/group_convolution_function.cpp | 6 ++--- .../src/interpolate_function.cpp | 2 +- .../src/mat_mul_function.cpp | 16 ++++++------- ...imized_constant_fake_quantize_function.cpp | 8 +++---- .../src/max_pool_function.cpp | 4 ++-- .../src/multiply_function.cpp | 4 ++-- ...multiply_to_group_convolution_function.cpp | 4 ++-- .../src/multiply_with_one_parent_function.cpp | 4 ++-- .../lpt_ngraph_functions/src/mvn_function.cpp | 2 +- .../src/normalize_l2_function.cpp | 9 ++++--- .../src/prelu_function.cpp | 6 ++--- .../src/relu_function.cpp | 6 ++--- .../src/reshape_function.cpp | 6 ++--- .../src/shuffle_channels_function.cpp | 2 +- .../src/split_function.cpp | 2 +- .../src/squeeze_function.cpp | 4 ++-- .../src/strided_slice_function.cpp | 2 +- .../src/subtract_function.cpp | 9 +++---- ...ract_multiply_to_multiply_add_function.cpp | 11 ++++----- .../src/transpose_after_mat_mul_function.cpp | 2 +- .../src/transpose_function.cpp | 6 ++--- .../src/unsqueeze_function.cpp | 4 ++-- .../src/variadic_split_function.cpp | 2 +- 272 files changed, 493 insertions(+), 496 deletions(-) diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp index f575a6cc2ec..c2d0c9ccf0c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp @@ -71,7 +71,7 @@ const std::vector params = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, AddTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(params)), AddTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp index 6f45a17b352..8b9a1c407c6 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp @@ -79,7 +79,7 @@ const std::vector params{ INSTANTIATE_TEST_SUITE_P(smoke_LPT, ClampTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp index 60d5e1ff730..ffd5c2b1d43 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp @@ -44,7 +44,7 @@ const std::vector testValues = { }, }; -const std::vector shapes = { +const std::vector shapes = { ngraph::Shape({ 1, 3, 16, 16 }), ngraph::Shape({ 4, 3, 16, 16 }) }; diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp index 0141d37d23a..205e23656e4 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp @@ -45,7 +45,7 @@ const std::vector testValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithChildAndOutputTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 6, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 6, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(testValues), ::testing::ValuesIn(trasformationParamValues)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp index dc7d9936e6a..64b6b0b4d2a 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp @@ -48,7 +48,7 @@ const std::vector multiChannel = { true/*, false*/ }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithDifferentChildrenTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 6, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 6, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(testValues), ::testing::ValuesIn(trasformationParamValues), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp index 8c24e9cec20..0033b65b1c3 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp @@ -26,7 +26,7 @@ const std::vector tras const std::vector transparentIntermediateValues = { true, false }; const std::vector multiChannelValues = { /*true,*/ false }; -const std::vector shapes = { +const std::vector shapes = { { 1, 3, 16, 16 }, { 4, 3, 16, 16 } }; diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp index a0724e1bfe6..8d41c2b4086 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp @@ -23,7 +23,7 @@ const std::vector tras LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8() }; -const std::vector shapes = { +const std::vector shapes = { { 1, 3, 16, 16 }, { 4, 3, 16, 16 } }; diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp index f6d2f1c16b7..47dfa3385f6 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp @@ -48,7 +48,7 @@ const std::vector testValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithSplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 6, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 6, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(testValues), ::testing::ValuesIn(trasformationParamValues)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp index 180ef107e02..2aa5610a922 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -100,7 +100,7 @@ const std::vector> inputShapes = { +const std::vector> inputShapes = { {{ 1, 8, 16, 16 }, true} }; diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp index 5cb46fc2ee8..61050800444 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp @@ -233,7 +233,7 @@ const std::vector para }, }; -const std::vector shapes = { +const std::vector shapes = { { 1, 3, 4, 4 }, { 4, 3, 4, 4 } }; diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp index d9057f66a92..e016bb04786 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp @@ -22,7 +22,7 @@ const std::vector modes = { DepthToSpace::DepthToSpaceMode::DEPTH_FIRST }; -const std::vector inputShapesBS2 = { +const std::vector inputShapesBS2 = { {1, 4, 3, 3}, {2, 16, 5, 4} }; @@ -36,7 +36,7 @@ const auto DepthToSpaceBS2 = ::testing::Combine( INSTANTIATE_TEST_SUITE_P(LPT_BS2, DepthToSpaceTransformation, DepthToSpaceBS2, DepthToSpaceTransformation::getTestCaseName); -const std::vector inputShapesBS3 = { +const std::vector inputShapesBS3 = { {1, 9, 3, 3}, {2, 27, 5, 4} }; diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp index d0f2b614f43..b4d81223f58 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp @@ -29,7 +29,7 @@ const std::vector fakeQuantizes = INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndAvgPoolTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), + ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizes)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp index 78df11d2f78..f0e626509dc 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp @@ -29,7 +29,7 @@ const std::vector fakeQuantizes = INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndMaxPoolTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), + ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizes)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp index adb79c659ec..2df5b908a0b 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp @@ -31,7 +31,7 @@ const std::vector testValues = INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), + ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(testValues)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp index f2e7df2acde..efced0be774 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp @@ -59,7 +59,7 @@ const std::vector testVa INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizePrecisionSelectionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), + ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(testValues)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp index 69ce1065c20..52cf2b24ba7 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp @@ -62,7 +62,7 @@ const std::vector fakeQuantizeOnDataValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), + ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizeOnDataValues)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index af1a82dcd41..792323057f1 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -104,7 +104,7 @@ const std::vector fakeQuanti INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeWithNotOptimalTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizeOnDataValues)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp index a285b41a536..26125f65ba4 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp @@ -18,20 +18,20 @@ const std::vector netPrecisions = { const std::vector shapes = { { - ngraph::Shape{ 1, 16 }, - ngraph::Shape{ 16, 8 }, + ngraph::PartialShape{ 1, 16 }, + ngraph::PartialShape{ 16, 8 }, false, false }, { - ngraph::Shape{ 1, 16 }, - ngraph::Shape{ 8, 16 }, + ngraph::PartialShape{ 1, 16 }, + ngraph::PartialShape{ 8, 16 }, false, true }, { - ngraph::Shape{ 16, 1 }, - ngraph::Shape{ 16, 8 }, + ngraph::PartialShape{ 16, 1 }, + ngraph::PartialShape{ 16, 8 }, true, false }, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp index 8082ecfe96d..d8c5370b37b 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp @@ -12,8 +12,8 @@ const std::vector precisions = { element::f32 }; -const std::vector< ngraph::Shape > inputAndQuantizationShapes = { - Shape{ 1, 4, 16, 16 }, +const std::vector< ngraph::PartialShape > inputAndQuantizationShapes = { + { 1, 4, 16, 16 }, }; const std::vector deqOperations = { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp index 8d4b127eb48..791be4c2c5a 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp @@ -36,7 +36,7 @@ const std::vector fakeQuantizeOnD INSTANTIATE_TEST_SUITE_P(smoke_LPT, FuseFakeQuantizeAndScaleShiftTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 9, 9 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 9, 9 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizeOnDataValues)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp index d1d38ed94d7..cf04e0e5b3c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp @@ -14,7 +14,7 @@ namespace { const std::vector testValues = { // 1) Multiply { - ngraph::Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { ngraph::element::f32, @@ -26,7 +26,7 @@ const std::vector testValues = { } }, { - ngraph::Shape{128, 3}, + {128, 3}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { ngraph::element::f32, @@ -39,7 +39,7 @@ const std::vector testValues = { }, // 1) Multiply by zero { - ngraph::Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { ngraph::element::f32, @@ -52,7 +52,7 @@ const std::vector testValues = { }, // 1) Subtract + Multiply { - ngraph::Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { ngraph::element::f32, @@ -65,7 +65,7 @@ const std::vector testValues = { }, // 1) Convert + Subtract + Multiply { - ngraph::Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { ngraph::element::f32, @@ -78,7 +78,7 @@ const std::vector testValues = { }, // 1) Convert + Subtract + Multiply 2) Add { - ngraph::Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { ngraph::element::f32, @@ -91,7 +91,7 @@ const std::vector testValues = { }, // issue #40611 for FP32 { - ngraph::Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { { }, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp index 81674818d6b..25a9d1c74d8 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp @@ -14,7 +14,7 @@ namespace { const std::vector testValues = { { - Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { { 256ul, {}, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, @@ -22,7 +22,7 @@ const std::vector testValues } }, { - Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { { 256ul, {}, { -1.28f }, { 1.27f }, { 10.f }, { 2.55f } }, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp index 4a65f1eb27b..cfac0fe5fd7 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp @@ -14,7 +14,7 @@ namespace { const std::vector testValues = { { - Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { { 256ul, {}, { 0.f }, { 2.55f }, { 10.f }, { 255.f } }, @@ -22,7 +22,7 @@ const std::vector testValues } }, { - Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { { 256ul, {}, { -1.28f }, { 1.27f }, { 0.f }, { 255.f } }, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp index 242df59cfff..4aef2c749c4 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp @@ -16,7 +16,7 @@ const std::vector netPrecisions = { // ngraph::element::f16 }; -const std::vector dimensions = { +const std::vector dimensions = { { 1, 3, 16, 16 } }; diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp index d8a81076d61..cc62ec4db63 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp @@ -23,8 +23,8 @@ const std::vector tras const std::vector params = { // group convolution, tensor quantization { - ngraph::Shape{ 1, 6, 24, 24 }, - ngraph::Shape{ 1, 24, 18, 18 }, + { 1, 6, 24, 24 }, + { 1, 24, 18, 18 }, 3ul, -1, { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, @@ -34,8 +34,8 @@ const std::vector pa }, // group convolution, tensor quantization { - ngraph::Shape{ 1, 6, 24, 24 }, - ngraph::Shape{ 1, 24, 18, 18 }, + { 1, 6, 24, 24 }, + { 1, 24, 18, 18 }, 3ul, 0, { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, @@ -45,8 +45,8 @@ const std::vector pa }, // group convolution, tensor quantization { - ngraph::Shape{ 1, 6, 24, 24 }, - ngraph::Shape{ 1, 24, 18, 18 }, + { 1, 6, 24, 24 }, + { 1, 24, 18, 18 }, 3ul, 1, { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, @@ -56,8 +56,8 @@ const std::vector pa }, // group convolution, per-channel quantization { - ngraph::Shape{ 1, 6, 24, 24 }, - ngraph::Shape{ 1, 24, 18, 18 }, + { 1, 6, 24, 24 }, + { 1, 24, 18, 18 }, 3ul, -1, { @@ -72,8 +72,8 @@ const std::vector pa }, // depth-wise convolution, tensor quantization { - ngraph::Shape{ 1, 6, 24, 24 }, - ngraph::Shape{ 1, 6, 18, 18 }, + { 1, 6, 24, 24 }, + { 1, 6, 18, 18 }, 6ul, -1, { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, @@ -81,8 +81,8 @@ const std::vector pa }, // depth-wise convolution, per-channel quantization { - ngraph::Shape{ 1, 6, 24, 24 }, - ngraph::Shape{ 1, 6, 18, 18 }, + { 1, 6, 24, 24 }, + { 1, 6, 18, 18 }, 6ul, -1, { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp index 74c60def9fc..8a80f2b13b1 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -488,7 +488,7 @@ const std::vector }, }; -const std::vector shapes = { +const std::vector shapes = { { 1, 4, 7, 7 } }; diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp index 7954fac1a23..769d78abf72 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp @@ -12,7 +12,7 @@ const std::vector precisions = { ngraph::element::f32 }; -const std::vector> shapes = { +const std::vector> shapes = { {{1, 4, 16, 16}, {32, 32}}, {{1, 2, 48, 80}, {50, 60}}, }; diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp index 2df46fe0bfc..a3c782b39d0 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp @@ -45,7 +45,7 @@ std::vector testValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, MatMulTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::Shape({ 1, 384, 1024 })), + ::testing::Values(ngraph::PartialShape({ 1, 384, 1024 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(testValues)), MatMulTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp index 76ec3422c06..dfad0664275 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp @@ -21,9 +21,9 @@ const std::vector> inputShapes = { - std::pair({ 1, 16 }, { 10, 16 }), - std::pair({ 1, 16 }, { 16, 10 }) +const std::vector> inputShapes = { + {{ 1, 16 }, { 10, 16 }}, + {{ 1, 16 }, { 16, 10 }} }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, MatMulWithOptimizedConstantFakeQuantizeTransformation, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp index 39dc081f402..10f45879810 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp @@ -12,8 +12,8 @@ const std::vector precisions = { element::f32 }; -const std::vector< ngraph::Shape > inputShapes = { - Shape{ 1ul, 4ul, 16ul, 16ul }, Shape{ 1ul, 4ul, 16ul, 16ul, 16ul } +const std::vector< ngraph::PartialShape > inputShapes = { + { 1ul, 4ul, 16ul, 16ul }, { 1ul, 4ul, 16ul, 16ul, 16ul } }; const std::vector fqOnData = { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp index 8f791dc2e7c..de85a663877 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp @@ -70,7 +70,7 @@ const std::vector params = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, MultiplyTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(params)), MultiplyTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp index 2c790eb7023..0b483c5fecf 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp @@ -24,7 +24,7 @@ const std::vector values = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, MultiplyWithOneParentTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(values)), MultiplyWithOneParentTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp index 505fffa8d54..1051ef8d15b 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp @@ -12,8 +12,8 @@ const std::vector precisions = { element::f32 }; -const std::vector< ngraph::Shape > inputAndQuantizationShapes = { - Shape{ 1ul, 4ul, 16ul, 16ul }, +const std::vector inputAndQuantizationShapes = { + { 1ul, 4ul, 16ul, 16ul }, }; const std::vector reductionAxes = { { 2, 3 }, { 1, 2, 3 } }; diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp index 6a88af8938d..c1a8a31dd3e 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp @@ -16,9 +16,9 @@ const std::vector precisions = { //ngraph::element::f16 }; -const std::vector > inputAndQuantizationShapes = { - { ngraph::Shape({ 1ul, 4ul, 16ul, 16ul }), ngraph::Shape({ 1ul }) }, - { ngraph::Shape({ 1ul, 4ul, 16ul, 16ul }), ngraph::Shape({ 1ul, 4ul, 1ul, 1ul }) }, +const std::vector > inputAndQuantizationShapes = { + { { 1ul, 4ul, 16ul, 16ul }, { 1ul } }, + { { 1ul, 4ul, 16ul, 16ul }, { 1ul, 4ul, 1ul, 1ul } }, }; const std::vector> axes = { diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp index bb35f882e62..43878ff0fc5 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp @@ -26,7 +26,7 @@ std::vector testValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, PReluTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(testValues)), PReluTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp index 0d8ca9c2284..6c064b4e70e 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp @@ -61,7 +61,7 @@ const std::vector params = { } }; -const std::vector inputShapes = { +const std::vector inputShapes = { { 1, 16, 9, 9 }, { 4, 16, 9, 9 } }; diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp index a24ef762ea5..ec5a659c72b 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp @@ -107,7 +107,7 @@ const std::vector params = INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMaxTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp index 7c6d1b60c6b..d77121a8e5c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp @@ -107,7 +107,7 @@ const std::vector params = INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMeanTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp index af56b057a33..0e92bfdc7a8 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp @@ -107,7 +107,7 @@ const std::vector params = INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMinTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp index cf767b71e4d..a7ca938ddbe 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp @@ -93,7 +93,7 @@ const std::vector params = INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceSumTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp index 460d050f6aa..e618aa4719d 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp @@ -27,7 +27,7 @@ std::vector testValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReluTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(testValues)), ReluTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp index 599b3de32e6..c8de61e3fd4 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp @@ -24,28 +24,28 @@ const std::vector tras const std::vector params = { // 3D -> 4D { - ngraph::Shape{ 1, 3, 32 }, + { 1, 3, 32 }, { 1, 3, 4, 8 }, { 256ul, ngraph::Shape{ 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, true }, // 4D -> 3D { - ngraph::Shape{ 1, 3, 16, 16 }, + { 1, 3, 16, 16 }, { 1, 3, 256 }, { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, true }, // 4D -> 3D { - ngraph::Shape{ 1, 3, 16, 16 }, + { 1, 3, 16, 16 }, { 0, 3, -1 }, { 256ul, ngraph::Shape{ 1, 3, 1, 1 }, { 0.f }, { 255.f }, { 0.f, 0.f, 0.f }, { 255.f, 25.5f, 2.55f } }, true }, // 4D -> 2D { - ngraph::Shape{ 1, 3, 4, 8 }, + { 1, 3, 4, 8 }, { 1, -1 }, { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, true diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp index 2a214de6d3a..c086cdb5767 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp @@ -15,7 +15,7 @@ const std::vector netPrecisions = { // ngraph::element::f16 }; -const std::vector inputShapes = { +const std::vector inputShapes = { { 1, 3, 16, 16 }, { 4, 3, 16, 16 } }; diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp index 56f3c7e2f25..6170a5c77af 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp @@ -87,7 +87,7 @@ const std::vector params = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, SplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp index a66106064a1..f184a6e7658 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp @@ -92,7 +92,7 @@ const std::vector params INSTANTIATE_TEST_SUITE_P(smoke_LPT, StridedSliceTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 24, 24 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 24, 24 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp index 3a5d5d6a32f..e2a82110508 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp @@ -25,7 +25,7 @@ const std::vector trasformationParamValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, SubtractTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues)), SubtractTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp index 98eb3cdde77..4057c6bdd58 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -29,7 +29,7 @@ const std::vector transposeChannelDimValues = { true, false }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, TransposeAfterMatMulTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(perTensorValues), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp index 390daa853c2..fb62c214a78 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp @@ -18,7 +18,7 @@ const std::vector precisions = { const std::vector testValues = { // U8: per-tensor quantization { - ngraph::Shape({ 1, 1000, 1, 1}), + { 1, 1000, 1, 1}, { 0, 2, 3, 1}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), ngraph::element::f32, @@ -26,7 +26,7 @@ const std::vector testValues = { }, // U8: per-channel quantization { - ngraph::Shape({ 1, 3, 1, 1}), + { 1, 3, 1, 1}, { 0, 2, 3, 1}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), ngraph::element::f32, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp index 247dce33444..55924de077a 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp @@ -93,7 +93,7 @@ const std::vector param INSTANTIATE_TEST_SUITE_P(smoke_LPT, VariadicSplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp index 7b51e051339..905103d681e 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp @@ -71,7 +71,7 @@ const std::vector params = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, AddTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(params)), AddTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp index 408cbb55071..59ba772fcca 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp @@ -79,7 +79,7 @@ const std::vector params = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, ClampTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp index f22eb9f63a1..f7dab096215 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp @@ -42,7 +42,7 @@ const std::vector testValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(testValues)), ConcatTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp index f53eb289438..841b2871b39 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp @@ -45,7 +45,7 @@ const std::vector testValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithChildAndOutputTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 6, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 6, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(testValues), ::testing::ValuesIn(trasformationParamValues)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp index d7605440afe..71913315cfb 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp @@ -48,7 +48,7 @@ const std::vector multiChannel = { true/*, false*/ }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithDifferentChildrenTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(testValues), ::testing::ValuesIn(trasformationParamValues), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp index 00f5467b33c..13b0791ba90 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp @@ -29,7 +29,7 @@ const std::vector multiChannelValues = { /*true,*/ false }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithIntermediateTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(transparentIntermediateValues), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp index 2dc3a2b4fde..90790ca04b9 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp @@ -26,7 +26,7 @@ const std::vector tras INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithNeighborsGraphTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues)), ConcatWithNeighborsGraphTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp index 2c969a1775f..418cf879fb8 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp @@ -48,7 +48,7 @@ const std::vector testValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithSplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 6, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 6, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(testValues), ::testing::ValuesIn(trasformationParamValues)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp index e656b6f3ff5..32adecae944 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -102,7 +102,7 @@ const std::vector> inputShapes = { +const std::vector> inputShapes = { {{ 1, 8, 16, 16 }, false}, {{ 1, 32, 16, 16 }, true} }; diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp index bb1bd0cb8dc..b629703ae6d 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp @@ -233,7 +233,7 @@ const std::vector para }, }; -const std::vector shapes = { +const std::vector shapes = { { 1, 3, 4, 4 }, { 4, 3, 4, 4 } }; diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp index 85e076155cc..3cc179973b3 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp @@ -22,7 +22,7 @@ const std::vector modes = { DepthToSpace::DepthToSpaceMode::DEPTH_FIRST }; -const std::vector inputShapesBS2 = { +const std::vector inputShapesBS2 = { {1, 4, 3, 3}, {2, 16, 5, 4} }; @@ -36,7 +36,7 @@ const auto DepthToSpaceBS2 = ::testing::Combine( INSTANTIATE_TEST_SUITE_P(LPT_BS2, DepthToSpaceTransformation, DepthToSpaceBS2, DepthToSpaceTransformation::getTestCaseName); -const std::vector inputShapesBS3 = { +const std::vector inputShapesBS3 = { {1, 9, 3, 3}, {2, 27, 5, 4} }; diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp index ea2587340ff..0341ccf8357 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp @@ -30,7 +30,7 @@ const std::vector fakeQuantizes = INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndAvgPoolTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), + ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizes)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp index ba1bc5bb20a..8a2e17bb04b 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp @@ -30,7 +30,7 @@ const std::vector fakeQuantizes = INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndMaxPoolTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), + ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizes)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp index fa47c845378..77571dc66f0 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp @@ -31,7 +31,7 @@ const std::vector testValues = INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), + ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(testValues)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp index 2b67ce0720c..86354110d54 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp @@ -60,7 +60,7 @@ const std::vector testVa INSTANTIATE_TEST_SUITE_P(DISABLED_LPT, FakeQuantizePrecisionSelectionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), + ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(testValues)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp index fe2ae3c55d6..7cb9d409e9e 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp @@ -62,7 +62,7 @@ const std::vector fakeQuantizeOnDataValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), + ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizeOnDataValues)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index 6e780a94ed2..f7b5f76aa32 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -104,7 +104,7 @@ const std::vector fakeQuanti INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeWithNotOptimalTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizeOnDataValues)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp index 45bf73121d2..b486eca6282 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp @@ -18,20 +18,20 @@ const std::vector netPrecisions = { const std::vector shapes = { { - ngraph::Shape{ 1, 16 }, - ngraph::Shape{ 16, 8 }, + { 1, 16 }, + { 16, 8 }, false, false }, { - ngraph::Shape{ 1, 16 }, - ngraph::Shape{ 8, 16 }, + { 1, 16 }, + { 8, 16 }, false, true }, { - ngraph::Shape{ 16, 1 }, - ngraph::Shape{ 16, 8 }, + { 16, 1 }, + { 16, 8 }, true, false }, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp index 537f95363e1..9a1fdd7526b 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp @@ -13,8 +13,8 @@ const std::vector precisions = { // element::f16 // TODO: temporarily commented due to failing in GPU Plugin on constant folding stage }; -const std::vector< ngraph::Shape > inputAndQuantizationShapes = { - Shape{ 1, 4, 16, 16 }, +const std::vectorinputAndQuantizationShapes = { + { 1, 4, 16, 16 }, }; const std::vector deqOperations = { diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp index f78feda5ce6..36c09e796a4 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp @@ -37,7 +37,7 @@ const std::vector fakeQuantizeOnD INSTANTIATE_TEST_SUITE_P(smoke_LPT, FuseFakeQuantizeAndScaleShiftTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 9, 9 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 9, 9 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizeOnDataValues)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp index 07b0f0a8ad8..fa3c80cdca6 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp @@ -13,7 +13,7 @@ namespace { const std::vector testValues = { // 1) Multiply { - ngraph::Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { ngraph::element::f32, @@ -26,7 +26,7 @@ const std::vector testValues = { }, // 1) Multiply with different input and output shape { - ngraph::Shape{128, 3}, + {128, 3}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { ngraph::element::f32, @@ -39,7 +39,7 @@ const std::vector testValues = { }, // 1) Multiply by zero { - ngraph::Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { ngraph::element::f32, @@ -52,7 +52,7 @@ const std::vector testValues = { }, // 1) Subtract + Multiply { - ngraph::Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { ngraph::element::f32, @@ -65,7 +65,7 @@ const std::vector testValues = { }, // 1) Convert + Subtract + Multiply { - ngraph::Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { ngraph::element::f32, @@ -78,7 +78,7 @@ const std::vector testValues = { }, // 1) Convert + Subtract + Multiply 2) Add { - ngraph::Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { ngraph::element::f32, @@ -91,7 +91,7 @@ const std::vector testValues = { }, // issue #40611 for FP32 { - ngraph::Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { { }, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp index 58fee1528c2..6e328d0d9cc 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp @@ -13,7 +13,7 @@ using namespace ngraph; namespace { const std::vector testValues = { { - Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { { 256ul, {}, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, @@ -21,7 +21,7 @@ namespace { } }, { - Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { { 256ul, {}, { -1.28f }, { 1.27f }, { 10.f }, { 2.55f } }, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp index 0b25acfc569..5762ca291de 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp @@ -13,7 +13,7 @@ using namespace ngraph; namespace { const std::vector testValues = { { - Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { { 256ul, {}, { 0.f }, { 2.55f }, { 10.f }, { 255.f } }, @@ -21,7 +21,7 @@ namespace { } }, { - Shape{1, 3, 16, 16}, + {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { { 256ul, {}, { -1.28f }, { 1.27f }, { 0.f }, { 255.f } }, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp index cd2b40ceb26..5708e2e6476 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp @@ -16,7 +16,7 @@ const std::vector netPrecisions = { ngraph::element::f16 }; -const std::vector dimensions = { +const std::vector dimensions = { {1, 3, 16, 16} }; diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp index 18325c824f4..9a404a11b89 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp @@ -23,7 +23,7 @@ const std::vector tras const std::vector params = { // group convolution, tensor quantization { - ngraph::Shape{ 1, 6, 24, 24 }, + { 1, 6, 24, 24 }, ngraph::Shape{ 1, 24, 18, 18 }, 3ul, -1, @@ -34,7 +34,7 @@ const std::vector pa }, // group convolution, tensor quantization { - ngraph::Shape{ 1, 6, 24, 24 }, + { 1, 6, 24, 24 }, ngraph::Shape{ 1, 24, 18, 18 }, 3ul, 0, @@ -45,7 +45,7 @@ const std::vector pa }, // group convolution, tensor quantization { - ngraph::Shape{ 1, 6, 24, 24 }, + { 1, 6, 24, 24 }, ngraph::Shape{ 1, 24, 18, 18 }, 3ul, 1, @@ -56,7 +56,7 @@ const std::vector pa }, // group convolution, per-channel quantization { - ngraph::Shape{ 1, 6, 24, 24 }, + { 1, 6, 24, 24 }, ngraph::Shape{ 1, 24, 18, 18 }, 3ul, -1, @@ -72,7 +72,7 @@ const std::vector pa }, // depthwise convolution, tensor quantization { - ngraph::Shape{ 1, 6, 24, 24 }, + { 1, 6, 24, 24 }, ngraph::Shape{ 1, 6, 18, 18 }, 6ul, -1, @@ -81,7 +81,7 @@ const std::vector pa }, // depthwise convolution, per-channel quantization { - ngraph::Shape{ 1, 6, 24, 24 }, + { 1, 6, 24, 24 }, ngraph::Shape{ 1, 6, 18, 18 }, 6ul, -1, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp index b95d0e7f8c6..4f5977a99a5 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -488,7 +488,7 @@ const std::vector }, }; -const std::vector shapes = { +const std::vector shapes = { { 1, 4, 7, 7 } }; diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp index 33135bb451a..82a785cc02d 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp @@ -13,7 +13,7 @@ const std::vector precisions = { ngraph::element::f16 }; -const std::vector> shapes = { +const std::vector> shapes = { {{1, 4, 16, 16}, {32, 32}}, {{1, 2, 48, 80}, {50, 60}}, }; diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp index 6d0df41c7f4..868fd742059 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp @@ -33,7 +33,7 @@ std::vector testValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, MatMulTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::Shape({ 1, 384, 1024 })), + ::testing::Values(ngraph::PartialShape({ 1, 384, 1024 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(testValues)), MatMulTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp index 8759d2903bc..1fb29134b4c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp @@ -22,9 +22,9 @@ const std::vector> inputShapes = { - std::pair({ 1, 16 }, { 10, 16 }), - std::pair({ 1, 16 }, { 16, 10 }) +const std::vector> inputShapes = { + {{ 1, 16 }, { 10, 16 }}, + {{ 1, 16 }, { 16, 10 }} }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, MatMulWithOptimizedConstantFakeQuantizeTransformation, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp index 4f60cc1a3bb..cee4583f67a 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp @@ -13,8 +13,8 @@ const std::vector precisions = { element::f16 }; -const std::vector< ngraph::Shape > inputShapes = { - Shape{ 1ul, 4ul, 16ul, 16ul }, Shape{ 1ul, 4ul, 16ul, 16ul, 16ul } +const std::vectorinputShapes = { + { 1ul, 4ul, 16ul, 16ul }, { 1ul, 4ul, 16ul, 16ul, 16ul } }; const std::vector fqOnData = { diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp index 6c294cb6d9c..815f096e85c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp @@ -70,7 +70,7 @@ const std::vector params = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, MultiplyTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(params)), MultiplyTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp index 083b4e8357b..99a9436995c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp @@ -24,7 +24,7 @@ const std::vector values = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, MultiplyWithOneParentTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(values)), MultiplyWithOneParentTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp index da5fbff9e91..8b23929625a 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp @@ -13,8 +13,8 @@ namespace { element::f16 }; - const std::vector inputAndQuantizationShapes = { - Shape{ 1ul, 4ul, 16ul, 16ul }, + const std::vector inputAndQuantizationShapes = { + { 1ul, 4ul, 16ul, 16ul }, }; const std::vector reductionAxes = { { 2, 3 }, { 1, 2, 3 } }; diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp index fe30318107a..9ceb37d6b5b 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp @@ -16,9 +16,9 @@ const std::vector precisions = { ngraph::element::f16 }; -const std::vector > inputAndQuantizationShapes = { - { ngraph::Shape({ 1ul, 4ul, 16ul, 16ul }), ngraph::Shape({ 1ul }) }, - { ngraph::Shape({ 1ul, 4ul, 16ul, 16ul }), ngraph::Shape({ 1ul, 4ul, 1ul, 1ul }) }, +const std::vector > inputAndQuantizationShapes = { + { { 1ul, 4ul, 16ul, 16ul }, { 1ul } }, + { { 1ul, 4ul, 16ul, 16ul }, { 1ul, 4ul, 1ul, 1ul } }, }; const std::vector> axes = { diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp index aea8e1be969..ceb5294a4ff 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp @@ -28,7 +28,7 @@ std::vector testValues = { INSTANTIATE_TEST_SUITE_P(DISABLED_LPT, PReluTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(testValues)), PReluTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp index 04c82dfaff6..9ad74ec60e0 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp @@ -61,7 +61,7 @@ const std::vector params = { } }; -const std::vector inputShapes = { +const std::vector inputShapes = { { 1, 16, 9, 9 }, { 4, 16, 9, 9 } }; diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp index f53880f5df7..d3f24e78f99 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp @@ -91,7 +91,7 @@ const std::vector params = INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMaxTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp index 5b343f98747..3b5ead6568f 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp @@ -91,7 +91,7 @@ const std::vector params = INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMeanTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp index 89aeb83f875..1b1252c6dbf 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp @@ -91,7 +91,7 @@ const std::vector params = INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMinTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp index 46cd094fcc1..d2cd0bff4c5 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp @@ -81,7 +81,7 @@ const std::vector params = INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceSumTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp index a1d65bbf658..3621e570e23 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp @@ -27,7 +27,7 @@ std::vector testValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReluTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(testValues)), ReluTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp index a8d40ca957f..5dc8a212412 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp @@ -24,28 +24,28 @@ const std::vector tras const std::vector params = { // 3D -> 4D { - ngraph::Shape{ 1, 3, 32 }, + { 1, 3, 32 }, { 1, 3, 4, 8 }, { 256ul, ngraph::Shape{ 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, true }, // 4D -> 3D { - ngraph::Shape{ 1, 3, 16, 16 }, + { 1, 3, 16, 16 }, { 1, 3, 256 }, { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, true }, // 4D -> 3D { - ngraph::Shape{ 1, 3, 16, 16 }, + { 1, 3, 16, 16 }, { 0, 3, -1 }, { 256ul, ngraph::Shape{ 1, 3, 1, 1 }, { 0.f }, { 255.f }, { 0.f, 0.f, 0.f }, { 255.f, 25.5f, 2.55f } }, true }, // 4D -> 2D { - ngraph::Shape{ 1, 3, 4, 8 }, + { 1, 3, 4, 8 }, { 1, -1 }, { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, true diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp index 19a0cfbd015..2cbeedd9de1 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp @@ -15,7 +15,7 @@ const std::vector netPrecisions = { ngraph::element::f16 }; -const std::vector inputShapes = { +const std::vector inputShapes = { { 1, 3, 16, 16 } }; diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp index 18535a437da..5e0e56c0306 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp @@ -87,7 +87,7 @@ const std::vector params = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, SplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp index 477fb83a158..5ca38dd35f5 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp @@ -89,7 +89,7 @@ const std::vector params INSTANTIATE_TEST_SUITE_P(smoke_LPT, StridedSliceTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 24, 24 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 24, 24 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp index f58f01d8fc5..004dba7eb22 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp @@ -23,7 +23,7 @@ const std::vector trasformationParamValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, SubtractTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues)), SubtractTransformation::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp index 7377d54b6cd..4b7147c0f7e 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -27,7 +27,7 @@ const std::vector transposeChannelDimValues = { true, false }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, TransposeAfterMatMulTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(perTensorValues), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp index b1913f592d1..90a78c92b43 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp @@ -18,7 +18,7 @@ const std::vector precisions = { const std::vector testValues = { // U8: per-tensor quantization { - ngraph::Shape({ 1, 1000, 1, 1}), + { 1, 1000, 1, 1}, { 0, 2, 3, 1}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), ngraph::element::f32, @@ -26,7 +26,7 @@ const std::vector testValues = { }, // U8: per-channel quantization { - ngraph::Shape({ 1, 3, 1, 1}), + { 1, 3, 1, 1}, { 0, 2, 3, 1}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), ngraph::element::f32, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp index 95f4e4487aa..3cdded43eb6 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp @@ -93,7 +93,7 @@ const std::vector param INSTANTIATE_TEST_SUITE_P(smoke_LPT, VariadicSplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/add_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/add_transformation.hpp index 1908d91413d..37151d0b1ba 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/add_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/add_transformation.hpp @@ -22,7 +22,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, AddTestValues > AddTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/clamp_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/clamp_transformation.hpp index de7b31c9558..e11672d4973 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/clamp_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/clamp_transformation.hpp @@ -19,7 +19,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, ClampTransformationParam diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp index 093944bf956..11aeb6701dd 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp @@ -20,7 +20,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ConcatTransformationTestValues> ConcatTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_child_and_output.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_child_and_output.hpp index 4c96976db6f..2ae292c8002 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_child_and_output.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_child_and_output.hpp @@ -19,7 +19,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, // target device: CPU, GPU ConcatWithChildAndOutputTransformationParam, ngraph::pass::low_precision::LayerTransformation::Params // transformation parameters diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp index 50ea25c73d2..385ba9216df 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp @@ -19,7 +19,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, // target device: CPU, GPU ConcatWithDifferentChildrenTransformationParam, ngraph::pass::low_precision::LayerTransformation::Params, // transformation parameters diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp index c560455b1c0..a0881a3950a 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp @@ -13,7 +13,7 @@ namespace LayerTestsDefinitions { typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, // target device: CPU, GPU ngraph::pass::low_precision::LayerTransformation::Params, // transformation parameters bool, // transparent intermediate diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp index f3235572fb3..c77dd2cb490 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp @@ -13,7 +13,7 @@ namespace LayerTestsDefinitions { typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params> ConcatNeighboringGraphTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp index f1d973410c5..2dfd8560650 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp @@ -19,7 +19,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ConcatWithSplitTransformationParam, ngraph::pass::low_precision::LayerTransformation::Params> ConcatWithSplitTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_backprop_data_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_backprop_data_transformation.hpp index 8b690e2df2e..738854ae315 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_backprop_data_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_backprop_data_transformation.hpp @@ -43,7 +43,7 @@ public: typedef std::tuple< ngraph::element::Type, // netPrecision - std::pair, // input shape and shape support flag + std::pair, // input shape and shape support flag ngraph::Shape, // outputShape std::string, // targetDevice ngraph::pass::low_precision::LayerTransformation::Params, diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_qdq_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_qdq_transformation.hpp index c3e7ea4c9e1..371349f7d55 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_qdq_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/convolution_qdq_transformation.hpp @@ -47,7 +47,7 @@ inline std::ostream& operator<<(std::ostream& out, const ConvolutionQDqTransform typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, ConvolutionQDqTransformationParam diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp index d634e062e12..8b385dca96e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp @@ -13,7 +13,7 @@ namespace LayerTestsDefinitions { typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::opset1::DepthToSpace::DepthToSpaceMode, size_t> DepthToSpaceTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_avg_pool_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_avg_pool_transformation.hpp index d7967203b7c..ed182705f2d 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_avg_pool_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_avg_pool_transformation.hpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, ngraph::builder::subgraph::FakeQuantizeOnData> FakeQuantizeAndAvgPoolTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_max_pool_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_max_pool_transformation.hpp index 3644960ef1e..29a85a20d26 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_max_pool_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_max_pool_transformation.hpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, ngraph::builder::subgraph::FakeQuantizeOnData> FakeQuantizeAndMaxPoolTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.hpp index be686035361..03a75530d23 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.hpp @@ -22,7 +22,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, FakeQuantizeAndTwoOutputBranchesWithConvolution diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_precision_selection_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_precision_selection_transformation.hpp index 9b99e2f6f09..8f0da855be7 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_precision_selection_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_precision_selection_transformation.hpp @@ -50,7 +50,7 @@ inline std::ostream& operator<<(std::ostream& out, const FakeQuantizePrecisionSe typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, FakeQuantizePrecisionSelectionTransformationTestValues> FakeQuantizeTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp index f2b82386c5e..c43672edd57 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp @@ -20,7 +20,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, FakeQuantizeTransformationParam> FakeQuantizeTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.hpp index 7978fc26da6..10521951e6c 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.hpp @@ -50,7 +50,7 @@ inline std::ostream& operator<<(std::ostream& out, const FakeQuantizeWithNotOpti // ngraph::builder::subgraph::FakeQuantizeOnData typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, FakeQuantizeWithNotOptimalTransformationTestValues> FakeQuantizeTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp index 4e4d56bc01c..8e273f825de 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp @@ -11,8 +11,8 @@ class MatMulShapes { public: - ngraph::Shape inputA; - ngraph::Shape inputB; + ngraph::PartialShape inputA; + ngraph::PartialShape inputB; bool transposeA; bool transposeB; }; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_convert_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_convert_transformation.hpp index cacacd09bd9..9e87a6ecb09 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_convert_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_convert_transformation.hpp @@ -17,7 +17,7 @@ namespace LayerTestsDefinitions { typedef std::tuple < element::Type, - Shape, + PartialShape, std::string, ngraph::builder::subgraph::DequantizationOperations, bool> FuseConvertTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.hpp index 4b5ce627f6e..0d5036bb8e7 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.hpp @@ -13,7 +13,7 @@ namespace LayerTestsDefinitions { typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, ngraph::builder::subgraph::FakeQuantizeOnData> FuseFakeQuantizeAndScaleShiftTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_transformation.hpp index 84679690d53..0ef83d52947 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_transformation.hpp @@ -26,7 +26,7 @@ public: ngraph::builder::subgraph::FakeQuantizeOnDataWithConstant fakeQuantizeOnData; }; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; Actual actual; }; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp index 21d5024e8bb..d1ce8a01e5b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp @@ -22,7 +22,7 @@ public: ngraph::builder::subgraph::DequantizationOperations dequantization; }; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; Actual actual; }; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp index 3dab656bcca..6c88512ea9b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp @@ -22,7 +22,7 @@ public: ngraph::builder::subgraph::DequantizationOperations dequantization; }; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; Actual actual; }; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/gemm_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/gemm_transformation.hpp index 90eb782daac..0e54077bb83 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/gemm_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/gemm_transformation.hpp @@ -13,7 +13,7 @@ namespace LayerTestsDefinitions { typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params> GemmTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp index b7d92417182..506763418d8 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp @@ -15,7 +15,7 @@ namespace LayerTestsDefinitions { class GroupConvolutionTransformationParam { public: - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::Shape outputShape; size_t group; int groupCalculationDimention; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/groupconvolution_qdq_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/groupconvolution_qdq_transformation.hpp index 6caa548bc72..99dffb4714f 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/groupconvolution_qdq_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/groupconvolution_qdq_transformation.hpp @@ -51,7 +51,7 @@ inline std::ostream& operator<<(std::ostream& out, const GroupConvolutionQDqTran typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, GroupConvolutionQDqTransformationParam diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/interpolate_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/interpolate_transformation.hpp index 6a643ee2650..83311f46929 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/interpolate_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/interpolate_transformation.hpp @@ -37,7 +37,7 @@ public: typedef std::tuple< ngraph::element::Type, - std::pair, + std::pair, std::string, interpAttributes> InterpolateTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp index 65022a7bbaf..37f8d88151b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp @@ -25,7 +25,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, MatMulTransformationTestValues> MatMulTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp index ed0ef0e9967..6c058727d69 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp @@ -19,7 +19,7 @@ namespace LayerTestsDefinitions { class MatMulWithConstantTransformationTestValues { public: - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::builder::subgraph::FakeQuantizeOnDataWithConstant fqOnData; ngraph::builder::subgraph::Constant weights; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.hpp index 71d175006ce..ddb24903d3f 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.hpp @@ -20,7 +20,7 @@ public: typedef std::tuple< ngraph::element::Type, - std::pair, + std::pair, std::string, MatMulWithOptimizedConstantFakeQuantizeTransformationTestValues > MatMulWithOptimizedConstantFakeQuantizeTransformationTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_to_group_convolution_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_to_group_convolution_transformation.hpp index ee49b11d892..29827eeb0d9 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_to_group_convolution_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_to_group_convolution_transformation.hpp @@ -17,7 +17,7 @@ namespace LayerTestsDefinitions { typedef std::tuple < element::Type, - Shape, + PartialShape, std::string, builder::subgraph::FakeQuantizeOnData> MultiplyToGroupConvolutionTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp index 63d4d527f13..db868f7438e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp @@ -23,7 +23,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, MultiplyTestValues > MultiplyTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_with_one_parent_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_with_one_parent_transformation.hpp index a2dea7f9ec6..4fa9d821e30 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_with_one_parent_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/multiply_with_one_parent_transformation.hpp @@ -19,7 +19,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, MultiplyWithOneParentTransformationValues > MultiplyWithOneParentTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mvn_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mvn_transformation.hpp index 6bb4fdcaf92..ac01efe9895 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mvn_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/mvn_transformation.hpp @@ -16,7 +16,7 @@ namespace LayerTestsDefinitions { typedef std::tuple < element::Type, - Shape, + PartialShape, std::string, AxisSet, bool> MVNTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/normalize_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/normalize_transformation.hpp index 8edae228202..fefecb17bec 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/normalize_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/normalize_transformation.hpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { typedef std::tuple < ngraph::element::Type, - std::pair, + std::pair, std::string, std::vector, bool, diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp index a46ffef511e..493edfe3182 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp @@ -19,7 +19,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, PReluTestValues> PReluTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/pull_reshape_through_dequantization_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/pull_reshape_through_dequantization_transformation.hpp index 61292175942..198a879ff30 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/pull_reshape_through_dequantization_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/pull_reshape_through_dequantization_transformation.hpp @@ -36,7 +36,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, ngraph::Shape, diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_max_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_max_transformation.hpp index 7a14601aebe..911b3d13f4f 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_max_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_max_transformation.hpp @@ -20,7 +20,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, ReduceMaxTransformationParam diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_mean_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_mean_transformation.hpp index 1e4e79c9551..5ea34628530 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_mean_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_mean_transformation.hpp @@ -19,7 +19,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, ReduceMeanTransformationParam diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_min_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_min_transformation.hpp index 74a2d90fc14..a52e4df34eb 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_min_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_min_transformation.hpp @@ -20,7 +20,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, ReduceMinTransformationParam diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_sum_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_sum_transformation.hpp index 4bb6e8ea38d..ec7af415c10 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_sum_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reduce_sum_transformation.hpp @@ -20,7 +20,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, ReduceSumTransformationParam diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp index 064aedd1c84..5155fd8f32b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp @@ -19,7 +19,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ReluTestValues> ReluTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp index 47d8a1876fd..912066a6e35 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { class ReshapeTransformationParam { public: - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::vector reshapeConstValues; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; bool isTransformed; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/shuffle_channels_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/shuffle_channels_transformation.hpp index 217eb2f7ea9..8439211c839 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/shuffle_channels_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/shuffle_channels_transformation.hpp @@ -23,7 +23,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, ShuffleChannelsTransformationParam diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp index 6598bdfb59b..adcae0a25d8 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp @@ -17,7 +17,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, SplitTransformationParam diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp index b8aa50a11ce..4ddb1178f1e 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp @@ -16,7 +16,7 @@ class SqueezeTransformationParam { public: ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; std::vector squeezeAxes; - ngraph::Shape shape; + ngraph::PartialShape shape; }; std::string stringifySqueezeArgs(const std::vector& axes); diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/strided_slice_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/strided_slice_transformation.hpp index 321a5bb3716..c2e769e1b04 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/strided_slice_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/strided_slice_transformation.hpp @@ -24,7 +24,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, StridedSliceTransformationParam diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.hpp index 2a1cc62a91e..19fa50096be 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.hpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { class SubtractMultiplyToMultiplyAddTransformationTestValues { public: - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::element::Type precision; ngraph::builder::subgraph::FakeQuantizeOnData fqOnData; }; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_transformation.hpp index 5743a49d885..43a58471a94 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/subtract_transformation.hpp @@ -13,7 +13,7 @@ namespace LayerTestsDefinitions { typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params > SubtractTransformationParams; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_after_matmul_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_after_matmul_transformation.hpp index 6c73e0198ff..f2258619b7f 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_after_matmul_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_after_matmul_transformation.hpp @@ -13,7 +13,7 @@ namespace LayerTestsDefinitions { typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, bool, diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_transformation.hpp index 8701bdc2b2d..6e26c6d6e7b 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/transpose_transformation.hpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { class TransposeTransformationTestValues { public: - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::vector transposeConstValues; ngraph::pass::low_precision::LayerTransformation::Params params; ngraph::element::Type precisionBeforeFq; diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp index 416640b06df..3abee33a5b1 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp @@ -16,7 +16,7 @@ class UnsqueezeTransformationParam { public: ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; std::vector unsqueezeAxes; - ngraph::Shape shape; + ngraph::PartialShape shape; }; typedef std::tuple< diff --git a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp index 44205e2c703..5f4665940fd 100644 --- a/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp +++ b/inference-engine/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp @@ -17,7 +17,7 @@ public: typedef std::tuple< ngraph::element::Type, - ngraph::Shape, + ngraph::PartialShape, std::string, ngraph::pass::low_precision::LayerTransformation::Params, VariadicSplitTransformationParam diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp index cffa033cc1b..2448bf7984f 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp @@ -18,7 +18,7 @@ namespace LayerTestsDefinitions { std::string AddTransformation::getTestCaseName(testing::TestParamInfo< AddTransformationParams> obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); AddTestValues param; @@ -50,7 +50,7 @@ std::string AddTransformation::getTestCaseName(testing::TestParamInfo< AddTransf void AddTransformation::SetUp() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; AddTestValues param; std::tie(precision, inputShape, targetDevice, param) = this->GetParam(); @@ -64,7 +64,7 @@ void AddTransformation::SetUp() { void AddTransformation::validate() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; AddTestValues param; std::tie(precision, inputShape, targetDevice, param) = this->GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp index 7c0a07aeb0d..d23da32cc56 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { std::string ClampTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ClampTransformationParam param;; @@ -30,7 +30,7 @@ std::string ClampTransformation::getTestCaseName(testing::TestParamInfoGetParam(); @@ -47,7 +47,7 @@ void ClampTransformation::SetUp() { void ClampTransformation::validate() { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ClampTransformationParam param; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp index 0b4d3bfb1d9..a2e6f85c705 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp @@ -18,7 +18,7 @@ namespace LayerTestsDefinitions { std::string ConcatTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type precision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ConcatTransformationTestValues testValues; std::tie(precision, inputShapes, targetDevice, testValues) = obj.param; @@ -31,7 +31,7 @@ std::string ConcatTransformation::getTestCaseName(testing::TestParamInfoGetParam(); @@ -63,7 +63,7 @@ void ConcatTransformation::SetUp() { void ConcatTransformation::validate() { ngraph::element::Type precision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ConcatTransformationTestValues testValues; std::tie(precision, inputShapes, targetDevice, testValues) = GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp index 0d3bf4acfef..debf6671ec0 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp @@ -21,7 +21,7 @@ namespace LayerTestsDefinitions { std::string ConcatWithChildAndOutputTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ConcatWithChildAndOutputTransformationParam param; ngraph::pass::low_precision::LayerTransformation::Params params; @@ -47,7 +47,7 @@ std::string ConcatWithChildAndOutputTransformation::getTestCaseName(testing::Tes void ConcatWithChildAndOutputTransformation::SetUp() { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; ConcatWithChildAndOutputTransformationParam param; ngraph::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShapes, targetDevice, param, params) = this->GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp index 7688d4e7a8b..c74d9740871 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp @@ -21,7 +21,7 @@ namespace LayerTestsDefinitions { std::string ConcatWithDifferentChildrenTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ConcatWithDifferentChildrenTransformationParam param; ngraph::pass::low_precision::LayerTransformation::Params params; @@ -38,7 +38,7 @@ std::string ConcatWithDifferentChildrenTransformation::getTestCaseName(testing:: InferenceEngine::Blob::Ptr ConcatWithDifferentChildrenTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ConcatWithDifferentChildrenTransformationParam param; ngraph::pass::low_precision::LayerTransformation::Params params; @@ -51,7 +51,7 @@ InferenceEngine::Blob::Ptr ConcatWithDifferentChildrenTransformation::GenerateIn void ConcatWithDifferentChildrenTransformation::SetUp() { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; ConcatWithDifferentChildrenTransformationParam param; ngraph::pass::low_precision::LayerTransformation::Params params; bool multiChannel; @@ -65,7 +65,7 @@ void ConcatWithDifferentChildrenTransformation::SetUp() { void ConcatWithDifferentChildrenTransformation::validate() { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ConcatWithDifferentChildrenTransformationParam param; ngraph::pass::low_precision::LayerTransformation::Params params; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp index 2bf15a14c32..12f3bf17565 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp @@ -21,7 +21,7 @@ namespace LayerTestsDefinitions { std::string ConcatWithIntermediateTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; bool transparentIntermediate; @@ -39,7 +39,7 @@ std::string ConcatWithIntermediateTransformation::getTestCaseName(testing::TestP InferenceEngine::Blob::Ptr ConcatWithIntermediateTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { ngraph::element::Type netPrecision; - InferenceEngine::SizeVector inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params trasformationParams; bool transparentIntermediate; @@ -60,7 +60,7 @@ InferenceEngine::Blob::Ptr ConcatWithIntermediateTransformation::GenerateInput(c void ConcatWithIntermediateTransformation::SetUp() { ngraph::element::Type ngPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params trasformationParams; bool transparentIntermediate; bool multichannel; @@ -78,7 +78,7 @@ void ConcatWithIntermediateTransformation::SetUp() { void ConcatWithIntermediateTransformation::validate() { ngraph::element::Type netPrecision; - InferenceEngine::SizeVector inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; bool transparentIntermediate; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp index 912982c2ea6..2c7c1a100fa 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp @@ -18,7 +18,7 @@ namespace LayerTestsDefinitions { std::string ConcatWithNeighborsGraphTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type precision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; std::tie(precision, inputShapes, targetDevice, params) = obj.param; @@ -28,7 +28,7 @@ std::string ConcatWithNeighborsGraphTransformation::getTestCaseName(testing::Tes InferenceEngine::Blob::Ptr ConcatWithNeighborsGraphTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShape, targetDevice, params) = this->GetParam(); @@ -43,7 +43,7 @@ InferenceEngine::Blob::Ptr ConcatWithNeighborsGraphTransformation::GenerateInput void ConcatWithNeighborsGraphTransformation::SetUp() { threshold = 2.e-2; ngraph::element::Type ngPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; std::tie(ngPrecision, inputShape, targetDevice, params) = this->GetParam(); @@ -61,7 +61,7 @@ void ConcatWithNeighborsGraphTransformation::SetUp() { void ConcatWithNeighborsGraphTransformation::validate() { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShape, targetDevice, params) = this->GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp index 3c67dd1b729..728656b4e28 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp @@ -21,7 +21,7 @@ namespace LayerTestsDefinitions { std::string ConcatWithSplitTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ConcatWithSplitTransformationParam param; ngraph::pass::low_precision::LayerTransformation::Params params; @@ -34,7 +34,7 @@ std::string ConcatWithSplitTransformation::getTestCaseName(testing::TestParamInf InferenceEngine::Blob::Ptr ConcatWithSplitTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ConcatWithSplitTransformationParam param; ngraph::pass::low_precision::LayerTransformation::Params params; @@ -54,7 +54,7 @@ InferenceEngine::Blob::Ptr ConcatWithSplitTransformation::GenerateInput(const In void ConcatWithSplitTransformation::SetUp() { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; ConcatWithSplitTransformationParam param; ngraph::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShapes, targetDevice, param, params) = this->GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp index c8d15a5702e..913ec3e39a6 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { std::string ConvolutionBackpropDataTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - std::pair inputShape; + std::pair inputShape; ngraph::Shape outputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; @@ -34,7 +34,7 @@ void ConvolutionBackpropDataTransformation::SetUp() { threshold = 0.1f; ngraph::element::Type netPrecision; - std::pair inputShapeAndHandling; + std::pair inputShapeAndHandling; ngraph::Shape outputShape; ngraph::pass::low_precision::LayerTransformation::Params params; ConvolutionBackpropDataTransformationParam param; @@ -43,14 +43,18 @@ void ConvolutionBackpropDataTransformation::SetUp() { std::shared_ptr weights; const auto inputShape = inputShapeAndHandling.first; + ngraph::Shape weightsShape(4, 1ul); + weightsShape[0] = inputShape[1].get_length(); + weightsShape[1] = inputShape[1].get_length() / 2; + if (!param.fakeQuantizeOnWeights.empty()) { weights = ngraph::builder::subgraph::ConvolutionBackpropDataFunction::getWeights( - ngraph::Shape{inputShape[1], inputShape[1] / 2, 1, 1}, + weightsShape, netPrecision, param.fakeQuantizeOnWeights); } else { weights = ngraph::builder::subgraph::ConvolutionBackpropDataFunction::getWeights( - ngraph::Shape{inputShape[1], inputShape[1] / 2, 1, 1}, + weightsShape, netPrecision, param.dequantizationOnWeights); } diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp index a55cc05d284..d90427b904b 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp @@ -22,7 +22,7 @@ namespace LayerTestsDefinitions { std::string ConvolutionQDqTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ConvolutionQDqTransformationParam param; @@ -37,7 +37,7 @@ void ConvolutionQDqTransformation::SetUp() { // threshold = 0.1f; ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; ConvolutionQDqTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp index f6e0a544fde..221a7cd8a2a 100755 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp @@ -22,7 +22,7 @@ namespace LayerTestsDefinitions { std::string ConvolutionTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ConvolutionTransformationParam param; @@ -39,7 +39,7 @@ void ConvolutionTransformation::SetUp() { threshold = 0.1f; ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; ConvolutionTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); @@ -68,7 +68,7 @@ void ConvolutionTransformation::Run() { void ConvolutionTransformation::validate() { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ConvolutionTransformationParam param; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp index 63087b13a43..89d05397da3 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp @@ -22,7 +22,7 @@ namespace LayerTestsDefinitions { std::string ConvolutionWIthIncorrectWeightsTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ConvolutionWIthIncorrectWeightsParam param; @@ -40,7 +40,7 @@ void ConvolutionWIthIncorrectWeightsTransformation::SetUp() { threshold = 0.1f; ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; ConvolutionWIthIncorrectWeightsParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); @@ -57,7 +57,7 @@ void ConvolutionWIthIncorrectWeightsTransformation::SetUp() { void ConvolutionWIthIncorrectWeightsTransformation::validate() { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ConvolutionWIthIncorrectWeightsParam param; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp index f3169ba9c60..28df2617b6a 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp @@ -39,7 +39,7 @@ std::string DepthToSpaceTransformation::getTestCaseName(testing::TestParamInfoGetParam(); - if (inputShape.size() != 4ul) { - IE_THROW() << "not supported input shape size " << inputShape.size(); + if (inputShape.rank().is_dynamic() || inputShape.rank().get_length() != 4) { + IE_THROW() << "not supported input shape size " << inputShape.rank(); } function = ngraph::builder::subgraph::DepthToSpaceFunction::getOriginal(precision, inputShape, mode, blockSize); @@ -71,7 +71,7 @@ void DepthToSpaceTransformation::SetUp() { void DepthToSpaceTransformation::validate() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; DepthToSpace::DepthToSpaceMode mode; size_t blockSize; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp index 368a0265dff..de0e5715300 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp @@ -18,7 +18,7 @@ namespace LayerTestsDefinitions { std::string FakeQuantizeAndAvgPoolTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type precision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; @@ -30,7 +30,7 @@ std::string FakeQuantizeAndAvgPoolTransformation::getTestCaseName(testing::TestP void FakeQuantizeAndAvgPoolTransformation::SetUp() { threshold = 0.5f; ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; std::tie(precision, inputShape, targetDevice, params, fakeQuantize) = this->GetParam(); @@ -46,7 +46,7 @@ void FakeQuantizeAndAvgPoolTransformation::SetUp() { void FakeQuantizeAndAvgPoolTransformation::validate() { ngraph::element::Type precision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp index eda5c291126..f71a4a6bba9 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp @@ -18,7 +18,7 @@ namespace LayerTestsDefinitions { std::string FakeQuantizeAndMaxPoolTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type precision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; @@ -29,7 +29,7 @@ std::string FakeQuantizeAndMaxPoolTransformation::getTestCaseName(testing::TestP void FakeQuantizeAndMaxPoolTransformation::SetUp() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; std::tie(precision, inputShape, targetDevice, params, fakeQuantize) = this->GetParam(); @@ -45,7 +45,7 @@ void FakeQuantizeAndMaxPoolTransformation::SetUp() { void FakeQuantizeAndMaxPoolTransformation::validate() { ngraph::element::Type precision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp index 6c1d90e537d..1ee2255a1ad 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp @@ -22,7 +22,7 @@ namespace LayerTestsDefinitions { std::string FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation::getTestCaseName( testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; FakeQuantizeAndTwoOutputBranchesWithConvolution testValues; @@ -38,7 +38,7 @@ std::string FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation::getTe void FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation::SetUp() { threshold = 0.1f; ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; FakeQuantizeAndTwoOutputBranchesWithConvolution testValues; std::tie(netPrecision, inputShape, targetDevice, params, testValues) = this->GetParam(); @@ -55,7 +55,7 @@ void FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation::SetUp() { void FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation::validate() { ngraph::element::Type precision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; FakeQuantizeAndTwoOutputBranchesWithConvolution testValues; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp index bb2acd8bd64..321da6f49bb 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp @@ -17,7 +17,7 @@ namespace LayerTestsDefinitions { std::string FakeQuantizePrecisionSelectionTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; FakeQuantizePrecisionSelectionTransformationTestValues testValues; @@ -30,7 +30,7 @@ std::string FakeQuantizePrecisionSelectionTransformation::getTestCaseName(testin void FakeQuantizePrecisionSelectionTransformation::SetUp() { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; FakeQuantizePrecisionSelectionTransformationTestValues testValues; std::tie(netPrecision, inputShape, targetDevice, params, testValues) = this->GetParam(); @@ -50,7 +50,7 @@ void FakeQuantizePrecisionSelectionTransformation::SetUp() { void FakeQuantizePrecisionSelectionTransformation::validate() { ngraph::element::Type precision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; FakeQuantizePrecisionSelectionTransformationTestValues param; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp index 4f14e33a757..25d5f3760dd 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp @@ -19,7 +19,7 @@ namespace LayerTestsDefinitions { std::string FakeQuantizeTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; FakeQuantizeTransformationParam testParams; @@ -32,7 +32,7 @@ std::string FakeQuantizeTransformation::getTestCaseName(testing::TestParamInfoGetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index 9667650a641..4f726d8e217 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -17,7 +17,7 @@ namespace LayerTestsDefinitions { std::string FakeQuantizeWithNotOptimalTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; FakeQuantizeWithNotOptimalTransformationTestValues testValues; @@ -29,7 +29,7 @@ std::string FakeQuantizeWithNotOptimalTransformation::getTestCaseName(testing::T } void FakeQuantizeWithNotOptimalTransformation::SetUp() { - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::element::Type netPrecision; ngraph::pass::low_precision::LayerTransformation::Params params; FakeQuantizeWithNotOptimalTransformationTestValues testValues; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp index 84ddf440f32..0682f617127 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp @@ -23,7 +23,7 @@ namespace LayerTestsDefinitions { std::string FuseConvertTransformation::getTestCaseName(testing::TestParamInfo obj) { std::string targetDevice; - ngraph::Shape shape; + ngraph::PartialShape shape; ngraph::element::Type precision; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); ngraph::builder::subgraph::DequantizationOperations deqOperations; @@ -37,7 +37,7 @@ std::string FuseConvertTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData; @@ -29,7 +29,7 @@ std::string FuseFakeQuantizeAndScaleShiftTransformation::getTestCaseName(testing void FuseFakeQuantizeAndScaleShiftTransformation::SetUp() { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData; std::tie(netPrecision, inputShape, targetDevice, params, fakeQuantizeOnData) = this->GetParam(); @@ -45,7 +45,7 @@ void FuseFakeQuantizeAndScaleShiftTransformation::SetUp() { void FuseFakeQuantizeAndScaleShiftTransformation::validate() { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp index aabc93f115a..0657458f6be 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp @@ -23,7 +23,7 @@ namespace LayerTestsDefinitions { std::string GemmTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShape, targetDevice, params) = obj.param; @@ -33,7 +33,7 @@ std::string GemmTransformation::getTestCaseName(testing::TestParamInfoGetParam(); @@ -51,7 +51,7 @@ void GemmTransformation::SetUp() { void GemmTransformation::validate() { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShape, targetDevice, params) = this->GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp index 454581e8b8a..40c4afae04f 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -22,7 +22,7 @@ namespace LayerTestsDefinitions { std::string GroupConvolutionQDqTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; GroupConvolutionQDqTransformationParam param; @@ -37,7 +37,7 @@ void GroupConvolutionQDqTransformation::SetUp() { // threshold = 0.1f; ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; GroupConvolutionQDqTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp index 983e8ddb642..5df9c905c9e 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp @@ -30,7 +30,7 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector& values) std::string InterpolateTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type precision; - std::pair shapes; + std::pair shapes; std::string targetDevice; interpAttributes attributes; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); @@ -51,7 +51,7 @@ std::string InterpolateTransformation::getTestCaseName(testing::TestParamInfo shapes; + std::pair shapes; interpAttributes attributes; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); std::tie(precision, shapes, targetDevice, attributes) = this->GetParam(); @@ -71,7 +71,7 @@ void InterpolateTransformation::SetUp() { void InterpolateTransformation::validate() { ngraph::element::Type precision; - std::pair shapes; + std::pair shapes; std::string targetDevice; interpAttributes attributes; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp index 60a785ac920..cba7e5c048a 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp @@ -21,7 +21,7 @@ namespace LayerTestsDefinitions { std::string MatMulTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; MatMulTransformationTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = obj.param; @@ -60,7 +60,7 @@ InferenceEngine::Blob::Ptr MatMulTransformation::GenerateInput(const InferenceEn void MatMulTransformation::SetUp() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; MatMulTransformationTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = this->GetParam(); @@ -77,7 +77,7 @@ void MatMulTransformation::SetUp() { void MatMulTransformation::validate() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; MatMulTransformationTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = this->GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp index da706b482f7..6aa6de62656 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp @@ -23,7 +23,7 @@ namespace LayerTestsDefinitions { std::string MatMulWithOptimizedConstantFakeQuantizeTransformation::getTestCaseName( testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - std::pair shapes; + std::pair shapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; MatMulWithOptimizedConstantFakeQuantizeTransformationTestValues param; @@ -32,7 +32,7 @@ std::string MatMulWithOptimizedConstantFakeQuantizeTransformation::getTestCaseNa std::ostringstream result; result << netPrecision << "_" << - CommonTestUtils::vec2str(shapes.first) << "_" << CommonTestUtils::vec2str(shapes.second) << "_" << + shapes.first << "_" << shapes.second << "_" << targetDevice << "_" << param.fqOnData << "_" << param.fqOnWeights; @@ -43,7 +43,7 @@ void MatMulWithOptimizedConstantFakeQuantizeTransformation::SetUp() { threshold = 0.01f; ngraph::element::Type precision; - std::pair shapes; + std::pair shapes; ngraph::pass::low_precision::LayerTransformation::Params params; MatMulWithOptimizedConstantFakeQuantizeTransformationTestValues param; std::tie(precision, shapes, targetDevice, param) = this->GetParam(); @@ -60,7 +60,7 @@ void MatMulWithOptimizedConstantFakeQuantizeTransformation::SetUp() { void MatMulWithOptimizedConstantFakeQuantizeTransformation::validate() { ngraph::element::Type precision; - std::pair shapes; + std::pair shapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; MatMulWithOptimizedConstantFakeQuantizeTransformationTestValues param; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp index 6ef2bb26eb4..f9d62e4e172 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp @@ -24,7 +24,7 @@ namespace LayerTestsDefinitions { std::string MultiplyToGroupConvolutionTransformation::getTestCaseName(testing::TestParamInfo obj) { std::string targetDevice; ngraph::element::Type precision; - ngraph::Shape shape; + ngraph::PartialShape shape; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); builder::subgraph::FakeQuantizeOnData fqOnData; std::tie(precision, shape, targetDevice, fqOnData) = obj.param; @@ -35,7 +35,7 @@ std::string MultiplyToGroupConvolutionTransformation::getTestCaseName(testing::T } void MultiplyToGroupConvolutionTransformation::SetUp() { - ngraph::Shape shape; + ngraph::PartialShape shape; ngraph::element::Type precision; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); builder::subgraph::FakeQuantizeOnData fqOnData; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp index b2e9e9bdf59..48c0ea0f042 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp @@ -19,7 +19,7 @@ namespace LayerTestsDefinitions { std::string MultiplyTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type precision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); MultiplyTestValues param; @@ -51,7 +51,7 @@ std::string MultiplyTransformation::getTestCaseName(testing::TestParamInfoGetParam(); @@ -68,7 +68,7 @@ void MultiplyTransformation::SetUp() { void MultiplyTransformation::validate() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; MultiplyTestValues param; std::tie(precision, inputShape, targetDevice, param) = this->GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp index ab16aa4c14b..34a78299be7 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp @@ -17,14 +17,14 @@ namespace LayerTestsDefinitions { std::string MultiplyWithOneParentTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; MultiplyWithOneParentTransformationValues values; std::tie(netPrecision, inputShape, targetDevice, values) = obj.param; std::ostringstream result; - result << netPrecision << "_" << CommonTestUtils::vec2str(inputShape); + result << netPrecision << "_" << inputShape; return result.str(); } @@ -32,7 +32,7 @@ void MultiplyWithOneParentTransformation::SetUp() { threshold = 0.01f; ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; MultiplyWithOneParentTransformationValues values; std::tie(netPrecision, inputShape, targetDevice, values) = this->GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp index 6c7afd6f970..383f0a62a12 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp @@ -23,7 +23,7 @@ namespace LayerTestsDefinitions { std::string MVNTransformation::getTestCaseName(testing::TestParamInfo obj) { std::string targetDevice; - ngraph::Shape shape; + ngraph::PartialShape shape; ngraph::element::Type precision; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); ngraph::AxisSet reductionAxes; @@ -37,7 +37,7 @@ std::string MVNTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - std::pair shapes; + std::pair shapes; std::string targetDevice; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); std::vector axes; @@ -45,7 +45,7 @@ std::string NormalizeL2Transformation::getTestCaseName(testing::TestParamInfo shapes; + std::pair shapes; ngraph::element::Type precision; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); std::vector axes; @@ -66,7 +66,7 @@ void NormalizeL2Transformation::SetUp() { void NormalizeL2Transformation::validate() { ngraph::element::Type precision; - std::pair shapes; + std::pair shapes; std::string targetDevice; std::vector axes; bool fuseMultiply; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp index 125de3e4ff0..56bbbe8a5ae 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp @@ -17,7 +17,7 @@ namespace LayerTestsDefinitions { std::string PReluTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; PReluTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = obj.param; @@ -33,7 +33,7 @@ std::string PReluTransformation::getTestCaseName(testing::TestParamInfoGetParam(); @@ -48,7 +48,7 @@ InferenceEngine::Blob::Ptr PReluTransformation::GenerateInput(const InferenceEng void PReluTransformation::SetUp() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; PReluTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = this->GetParam(); @@ -60,7 +60,7 @@ void PReluTransformation::SetUp() { void PReluTransformation::validate() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; PReluTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = this->GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp index fa9cdeeba90..2824a2adc3c 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp @@ -22,7 +22,7 @@ namespace LayerTestsDefinitions { std::string PullReshapeThroughDequantizationTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ngraph::Shape elementwiseConstantShapes; @@ -45,7 +45,7 @@ void PullReshapeThroughDequantizationTransformation::SetUp() { // threshold = 0.1f; ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; ngraph::Shape elementwiseConstantShapes; PullReshapeThroughDequantizationTestValues testValues; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp index b458d5055d9..3c7830a2c49 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { std::string ReduceMaxTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ReduceMaxTransformationParam param;; @@ -32,7 +32,7 @@ std::string ReduceMaxTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ReduceMeanTransformationParam param;; @@ -32,7 +32,7 @@ std::string ReduceMeanTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ReduceMinTransformationParam param;; @@ -32,7 +32,7 @@ std::string ReduceMinTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ReduceSumTransformationParam param;; @@ -32,7 +32,7 @@ std::string ReduceSumTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ReluTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = obj.param; @@ -33,7 +33,7 @@ std::string ReluTransformation::getTestCaseName(testing::TestParamInfoGetParam(); @@ -48,7 +48,7 @@ InferenceEngine::Blob::Ptr ReluTransformation::GenerateInput(const InferenceEngi void ReluTransformation::SetUp() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ReluTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = this->GetParam(); @@ -60,7 +60,7 @@ void ReluTransformation::SetUp() { void ReluTransformation::validate() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ReluTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = this->GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp index 06d502a69d8..476f30b6ad1 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp @@ -20,7 +20,7 @@ namespace LayerTestsDefinitions { std::string ShuffleChannelsTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; ShuffleChannelsTransformationParam param; @@ -34,7 +34,7 @@ std::string ShuffleChannelsTransformation::getTestCaseName(testing::TestParamInf void ShuffleChannelsTransformation::SetUp() { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; ShuffleChannelsTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp index 7c9eb6e8379..95316108aa9 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp @@ -17,7 +17,7 @@ namespace LayerTestsDefinitions { std::string SplitTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; SplitTransformationParam param; @@ -31,7 +31,7 @@ std::string SplitTransformation::getTestCaseName(testing::TestParamInfoGetParam(); @@ -64,7 +64,7 @@ void SplitTransformation::SetUp() { void SplitTransformation::validate() { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; SplitTransformationParam param; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp index a0c4d48a9c2..9712ebf0121 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp @@ -26,7 +26,7 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector& va std::string StridedSliceTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; StridedSliceTransformationParam param;; @@ -42,7 +42,7 @@ std::string StridedSliceTransformation::getTestCaseName(testing::TestParamInfoGetParam(); @@ -65,7 +65,7 @@ void StridedSliceTransformation::SetUp() { void StridedSliceTransformation::validate() { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; StridedSliceTransformationParam param; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp index afb24897f82..55841cc8760 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp @@ -19,7 +19,7 @@ namespace LayerTestsDefinitions { std::string SubtractTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShapes, targetDevice, params) = obj.param; @@ -29,7 +29,7 @@ std::string SubtractTransformation::getTestCaseName(testing::TestParamInfoGetParam(); diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp index d6682af481b..7135ab31f31 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -23,7 +23,7 @@ namespace LayerTestsDefinitions { std::string TransposeAfterMatMulTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; bool perTensor; @@ -39,7 +39,7 @@ std::string TransposeAfterMatMulTransformation::getTestCaseName(testing::TestPar void TransposeAfterMatMulTransformation::SetUp() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; bool perTensor; bool transposeChannelDim; @@ -52,7 +52,7 @@ void TransposeAfterMatMulTransformation::SetUp() { void TransposeAfterMatMulTransformation::validate() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; bool perTensor; diff --git a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp index 5c5444ee0fd..10ed9808061 100644 --- a/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp @@ -17,7 +17,7 @@ namespace LayerTestsDefinitions { std::string VariadicSplitTransformation::getTestCaseName(testing::TestParamInfo obj) { ngraph::element::Type netPrecision; - ngraph::Shape inputShapes; + ngraph::PartialShape inputShapes; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; VariadicSplitTransformationParam param; @@ -38,7 +38,7 @@ std::string VariadicSplitTransformation::getTestCaseName(testing::TestParamInfo< InferenceEngine::Blob::Ptr VariadicSplitTransformation::GenerateInput(const InferenceEngine::InputInfo& info) const { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; VariadicSplitTransformationParam param; @@ -54,7 +54,7 @@ InferenceEngine::Blob::Ptr VariadicSplitTransformation::GenerateInput(const Infe void VariadicSplitTransformation::SetUp() { ngraph::element::Type precision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; ngraph::pass::low_precision::LayerTransformation::Params params; VariadicSplitTransformationParam param; std::tie(precision, inputShape, targetDevice, params, param) = this->GetParam(); @@ -71,7 +71,7 @@ void VariadicSplitTransformation::SetUp() { void VariadicSplitTransformation::validate() { ngraph::element::Type netPrecision; - ngraph::Shape inputShape; + ngraph::PartialShape inputShape; std::string targetDevice; ngraph::pass::low_precision::LayerTransformation::Params params; VariadicSplitTransformationParam param; diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp index 298c03f4e30..942e836d828 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp @@ -57,7 +57,7 @@ protected: static std::string getTestCaseNameByParams( const ngraph::element::Type precision, - const ngraph::Shape& inputShapes, + const ngraph::PartialShape& inputShapes, const std::string& targetDevice, const ngraph::pass::low_precision::LayerTransformation::Params& params); }; diff --git a/inference-engine/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp b/inference-engine/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index 3a6dd4dc4ea..a3e110a9f97 100644 --- a/inference-engine/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp +++ b/inference-engine/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -103,7 +103,7 @@ std::string LayerTransformation::getTestCaseNameByParams( std::string LayerTransformation::getTestCaseNameByParams( const ngraph::element::Type precision, - const ngraph::Shape& inputShapes, + const ngraph::PartialShape& inputShapes, const std::string& targetDevice, const ngraph::pass::low_precision::LayerTransformation::Params& params) { std::ostringstream result; diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/add_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/add_function.hpp index aa9cb1e0e71..b0b4e9ad693 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/add_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/add_function.hpp @@ -71,7 +71,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const bool broadcast, const ngraph::builder::subgraph::FakeQuantizeOnData& fqOnData1, const ngraph::builder::subgraph::FakeQuantizeOnData& fqOnData2); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/avg_pool_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/avg_pool_function.hpp index c48330a806c..3b411e3621f 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/avg_pool_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/avg_pool_function.hpp @@ -27,7 +27,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type originalFunctionPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantizeOnData); static std::shared_ptr getReference( diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/clamp_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/clamp_function.hpp index c09cf4b60dd..e48f1aa0575 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/clamp_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/clamp_function.hpp @@ -27,7 +27,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type originalFunctionPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize, const double clampLowConst, const double clampHighConst); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/concat_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/concat_function.hpp index 21b3289d513..e3456ad2a4b 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/concat_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/concat_function.hpp @@ -19,7 +19,7 @@ class ConcatFunction { public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantize1, const FakeQuantizeOnData& fakeQuantize2); @@ -31,7 +31,7 @@ public: static std::shared_ptr getOriginalWithChildAndOutput( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantize1, const FakeQuantizeOnData& fakeQuantize2); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/convolution_backprop_data_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/convolution_backprop_data_function.hpp index e276c15cc9e..77fd6d53cb9 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/convolution_backprop_data_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/convolution_backprop_data_function.hpp @@ -29,7 +29,7 @@ public: const std::shared_ptr& value = nullptr); static std::shared_ptr get( const element::Type netPrecision, - const Shape& inputShape, + const PartialShape& inputShape, const Shape& outputShape, const builder::subgraph::FakeQuantizeOnData& fqOnData, const std::shared_ptr& weights); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/convolution_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/convolution_function.hpp index 85ec80922a4..0bff29ac9c3 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/convolution_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/convolution_function.hpp @@ -34,7 +34,7 @@ public: bool isCrorrect); static std::shared_ptr getOriginalWithIncorrectWeights( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, ngraph::element::Type precision, ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights, ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/depth_to_space_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/depth_to_space_function.hpp index 6eb90026e19..2c24f740f7a 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/depth_to_space_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/depth_to_space_function.hpp @@ -21,7 +21,7 @@ class DepthToSpaceFunction { public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::opset1::DepthToSpace::DepthToSpaceMode mode, const size_t blockSize); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_and_convolution_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_and_convolution_function.hpp index a0c8718a5f3..8823779f613 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_and_convolution_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_and_convolution_function.hpp @@ -25,7 +25,7 @@ public: // TODO: move to ConvolutionFunction static std::shared_ptr get( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantizeOnData, const FakeQuantizeOnWeights& fakeQuantizeOnWeights); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_and_two_output_branches_with_convolution_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_and_two_output_branches_with_convolution_function.hpp index 74c471a04b7..49f613818f8 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_and_two_output_branches_with_convolution_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_and_two_output_branches_with_convolution_function.hpp @@ -20,7 +20,7 @@ class FakeQuantizeAndTwoOutputBranchesWithConvolutionFunction { public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fqOnData, const FakeQuantizeOnWeights fqOnWeights1, FakeQuantizeOnWeights fqOnWeights2); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_function.hpp index 3c2cda0e7fd..d1a212490da 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_function.hpp @@ -25,7 +25,7 @@ public: static std::shared_ptr getOriginalWithMaxPool( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantizeOnData); static std::shared_ptr getReference( diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_precision_selection_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_precision_selection_function.hpp index f0775e4a383..18422faaf62 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_precision_selection_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fake_quantize_precision_selection_function.hpp @@ -35,7 +35,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ActualValues& values); static std::shared_ptr getReference( diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fuse_convert_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fuse_convert_function.hpp index 22d37e27962..0530422e097 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fuse_convert_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fuse_convert_function.hpp @@ -23,7 +23,7 @@ public: const bool constInput); static std::shared_ptr getWithFQ( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::element::Type inputPrecision, const ngraph::builder::subgraph::DequantizationOperations& dequantization, const bool constInput); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fuse_fake_quantize_and_scale_shift_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fuse_fake_quantize_and_scale_shift_function.hpp index 30c28261f01..2ac798cc0f2 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fuse_fake_quantize_and_scale_shift_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fuse_fake_quantize_and_scale_shift_function.hpp @@ -17,7 +17,7 @@ class FuseFakeQuantizeAndScaleShiftFunction { public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantizeOnData); }; diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fuse_fake_quantize_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fuse_fake_quantize_function.hpp index 9cb401132c5..4de97eb813b 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fuse_fake_quantize_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/fuse_fake_quantize_function.hpp @@ -46,7 +46,7 @@ public: const FakeQuantizeOnDataWithConstant& fqOnData); static std::shared_ptr get( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const std::vector& branches, const ngraph::element::Type precisionFqOnData, const FakeQuantizeOnData& fqOnData); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/group_convolution_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/group_convolution_function.hpp index dd9d8ae32a9..e4f4499e26c 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/group_convolution_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/group_convolution_function.hpp @@ -29,7 +29,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::Shape& outputShape, const size_t groupCount, const int groupCalculationDimention, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/interpolate_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/interpolate_function.hpp index 5ba5d38eeeb..b0fff2eedc4 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/interpolate_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/interpolate_function.hpp @@ -23,7 +23,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::Shape& outputShape, const ngraph::op::InterpolateAttrs& interpAttrs); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/mat_mul_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/mat_mul_function.hpp index 89bf9d29125..803eedaccae 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/mat_mul_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/mat_mul_function.hpp @@ -19,14 +19,14 @@ class MatMulFunction { public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape inputShape, + const ngraph::PartialShape inputShape, const float low, const float high); static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape inputShape1, - const ngraph::Shape inputShape2, + const ngraph::PartialShape inputShape1, + const ngraph::PartialShape inputShape2, const bool transpose1, const bool transpose2); @@ -75,7 +75,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnDataWithConstant& fqOnData, const Constant& weights, const FakeQuantizeOnDataWithConstant& fqOnWeights, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/mat_mul_with_optimized_constant_fake_quantize_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/mat_mul_with_optimized_constant_fake_quantize_function.hpp index e77c1e1d1cc..80b311b16a9 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/mat_mul_with_optimized_constant_fake_quantize_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/mat_mul_with_optimized_constant_fake_quantize_function.hpp @@ -16,8 +16,8 @@ class MatMulWithOptimizedConstantFakeQuantizeFunction { public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape1, - const ngraph::Shape& inputShape2, + const ngraph::PartialShape& inputShape1, + const ngraph::PartialShape& inputShape2, const FakeQuantizeOnData& fqOnData, const FakeQuantizeOnData& fqOnWeights); }; diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/max_pool_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/max_pool_function.hpp index 268c23f9e14..330aa690401 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/max_pool_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/max_pool_function.hpp @@ -18,7 +18,7 @@ class MaxPoolFunction { public: static std::shared_ptr getOriginal( const ngraph::element::Type originalFunctionPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantizeOnData); static std::shared_ptr get( diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/multiply_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/multiply_function.hpp index 0a4087f8c36..96c1b387e34 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/multiply_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/multiply_function.hpp @@ -45,7 +45,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const bool broadcast, const ngraph::builder::subgraph::FakeQuantizeOnData& fqOnData1, const ngraph::builder::subgraph::FakeQuantizeOnData& fqOnData2); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/multiply_to_group_convolution_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/multiply_to_group_convolution_function.hpp index 060ec7309f2..0c366a5637f 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/multiply_to_group_convolution_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/multiply_to_group_convolution_function.hpp @@ -25,7 +25,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fqOnData); static std::shared_ptr getReference( diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/multiply_with_one_parent_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/multiply_with_one_parent_function.hpp index 3aab5f89747..49dcc4f56c2 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/multiply_with_one_parent_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/multiply_with_one_parent_function.hpp @@ -16,7 +16,7 @@ class MultiplyWithOneParentFunction { public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantize); }; diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/mvn_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/mvn_function.hpp index cba5c68893d..6fe7c6b2f79 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/mvn_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/mvn_function.hpp @@ -25,7 +25,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const AxisSet& reductionAxes, const bool& normalizeVariance); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/normalize_l2_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/normalize_l2_function.hpp index 41fdd7917d2..d37d2ddfd54 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/normalize_l2_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/normalize_l2_function.hpp @@ -21,7 +21,7 @@ class NormalizeL2Function { public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const std::pair& shapes, + const std::pair& shapes, const ngraph::element::Type precisionOnActivation, const std::vector& axes, const bool fuseMultiply, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/prelu_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/prelu_function.hpp index a098b4c8b17..d1bf93feac3 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/prelu_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/prelu_function.hpp @@ -20,7 +20,7 @@ public: const ngraph::builder::subgraph::DequantizationOperations& dequantization); static std::shared_ptr getOriginal( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::element::Type precisionBeforeFq, const FakeQuantizeOnData& fqOnData); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/reduce_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/reduce_function.hpp index deba5d14a34..c9f9162b8d6 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/reduce_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/reduce_function.hpp @@ -54,7 +54,7 @@ public: template static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::builder::subgraph::FakeQuantizeOnData& fqOnData, const std::vector& constantValues, const bool keepDims) { diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/relu_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/relu_function.hpp index d343899d5db..56b05246342 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/relu_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/relu_function.hpp @@ -20,7 +20,7 @@ public: const ngraph::builder::subgraph::DequantizationOperations& dequantization); static std::shared_ptr getOriginal( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::element::Type precisionBeforeFq, const FakeQuantizeOnData& fqOnData); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/reshape_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/reshape_function.hpp index 17ef54ed450..44d817051bd 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/reshape_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/reshape_function.hpp @@ -23,7 +23,7 @@ public: const ngraph::builder::subgraph::DequantizationOperations& dequantization); static std::shared_ptr getOriginal( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const std::vector& reshapeConstValues, const ngraph::element::Type precisionBeforeFq, const FakeQuantizeOnData& fqOnData); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/shuffle_channels_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/shuffle_channels_function.hpp index 0d9cc65fec9..8d1a87c11a9 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/shuffle_channels_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/shuffle_channels_function.hpp @@ -26,7 +26,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type inputPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::builder::subgraph::FakeQuantizeOnData& fqOnData, const std::int64_t axis, const std::int64_t group); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/split_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/split_function.hpp index 73b1ef7dfd8..4300fdd172c 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/split_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/split_function.hpp @@ -30,7 +30,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type originalFunctionPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize, const int64_t splitedAxis, const size_t numSplit); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/squeeze_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/squeeze_function.hpp index dddf8e6802d..13f68240343 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/squeeze_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/squeeze_function.hpp @@ -22,7 +22,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type originalFunctionPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantizeOnData, const std::vector& axes); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/strided_slice_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/strided_slice_function.hpp index 3c048da6044..aaead6e245a 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/strided_slice_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/strided_slice_function.hpp @@ -32,7 +32,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type inputPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::builder::subgraph::FakeQuantizeOnData& fakeQuantize, const std::vector& begin, const std::vector& end, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/subtract_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/subtract_function.hpp index 2de725ca64e..c849d46b3f3 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/subtract_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/subtract_function.hpp @@ -19,7 +19,7 @@ class SubtractFunction { public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape); + const ngraph::PartialShape& inputShape); }; } // namespace subgraph diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/subtract_multiply_to_multiply_add_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/subtract_multiply_to_multiply_add_function.hpp index b88da01c183..4617455d674 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/subtract_multiply_to_multiply_add_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/subtract_multiply_to_multiply_add_function.hpp @@ -26,7 +26,7 @@ public: const ngraph::element::Type precisionAfterDequantization); static std::shared_ptr getOriginal( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::element::Type precision, const ngraph::builder::subgraph::FakeQuantizeOnData& fqOnData); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/transpose_after_mat_mul_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/transpose_after_mat_mul_function.hpp index e8a13074078..544444b7e2a 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/transpose_after_mat_mul_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/transpose_after_mat_mul_function.hpp @@ -19,7 +19,7 @@ class TransposeAfterMatMulFunction { public: static std::shared_ptr getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape); + const ngraph::PartialShape& inputShape); }; } // namespace subgraph diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/transpose_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/transpose_function.hpp index c61e67756e9..51de8537d7b 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/transpose_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/transpose_function.hpp @@ -23,7 +23,7 @@ public: const ngraph::builder::subgraph::DequantizationOperations& dequantization); static std::shared_ptr getOriginal( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const std::vector& transposeConstValues, const ngraph::element::Type precisionBeforeFq, const FakeQuantizeOnData& fqOnData); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/unsqueeze_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/unsqueeze_function.hpp index 2e450e56192..bc472fbad6d 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/unsqueeze_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/unsqueeze_function.hpp @@ -22,7 +22,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type originalFunctionPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantizeOnData, const std::vector& axes); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/variadic_split_function.hpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/variadic_split_function.hpp index 51bde4c9815..01bef64c4bf 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/variadic_split_function.hpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/variadic_split_function.hpp @@ -28,7 +28,7 @@ public: static std::shared_ptr getOriginal( const ngraph::element::Type originalFunctionPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize, const int64_t splitedAxis, const std::vector& splitLengths); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/add_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/add_function.cpp index 56aadb2a249..438af17ff92 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/add_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/add_function.cpp @@ -152,11 +152,11 @@ std::shared_ptr AddFunction::getOriginal( std::shared_ptr AddFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const bool broadcast, const ngraph::builder::subgraph::FakeQuantizeOnData& fqOnData1, const ngraph::builder::subgraph::FakeQuantizeOnData& fqOnData2) { - ngraph::Shape inputShape2 = inputShape; + ngraph::PartialShape inputShape2 = inputShape; if (broadcast) { inputShape2[2] = 1; diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/avg_pool_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/avg_pool_function.cpp index cf22df3b01b..ea3bccd1322 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/avg_pool_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/avg_pool_function.cpp @@ -62,9 +62,9 @@ std::shared_ptr AvgPoolFunction::getOriginal( std::shared_ptr AvgPoolFunction::getOriginal( const ngraph::element::Type originalFunctionPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantizeOnData) { - const auto input = std::make_shared(originalFunctionPrecision, ngraph::Shape(inputShape)); + const auto input = std::make_shared(originalFunctionPrecision, inputShape); const auto fakeQuantize = ngraph::builder::makeFakeQuantize( input, originalFunctionPrecision, fakeQuantizeOnData.quantizationLevel, fakeQuantizeOnData.constantShape, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/clamp_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/clamp_function.cpp index d61d9dbc359..cddaa740283 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/clamp_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/clamp_function.cpp @@ -33,7 +33,7 @@ std::shared_ptr ClampFunction::getOriginal( std::shared_ptr ClampFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize, const double clampLowConst, const double clampHighConst) { diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/concat_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/concat_function.cpp index 257f5535095..1b5a9d863a3 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/concat_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/concat_function.cpp @@ -20,15 +20,15 @@ using namespace ngraph::pass; std::shared_ptr ConcatFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fqOnData1, const FakeQuantizeOnData& fqOnData2) { const auto input1 = std::make_shared(precision, inputShape); input1->set_friendly_name("input1"); const auto fakeQuantize1 = makeFakeQuantize(input1, precision, fqOnData1); - const std::vector inputShape2 = inputShape; - const auto input2 = std::make_shared(precision, ngraph::Shape(inputShape2)); + const auto inputShape2 = inputShape; + const auto input2 = std::make_shared(precision, inputShape2); input2->set_friendly_name("input2"); const auto fakeQuantize2 = makeFakeQuantize(input2, precision, fqOnData2); @@ -79,7 +79,7 @@ std::shared_ptr ConcatFunction::getOriginal( std::shared_ptr ConcatFunction::getOriginalWithChildAndOutput( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fqOnData1, const FakeQuantizeOnData& fqOnData2) { const auto input1 = std::make_shared(precision, inputShape); @@ -87,8 +87,8 @@ std::shared_ptr ConcatFunction::getOriginalWithChildAndOutput( const auto fakeQuantize1 = makeFakeQuantize(input1, precision, fqOnData1); std::shared_ptr res1; - const std::vector inputShape2 = inputShape; - const auto input2 = std::make_shared(precision, ngraph::Shape(inputShape2)); + const auto inputShape2 = inputShape; + const auto input2 = std::make_shared(precision, inputShape2); input2->set_friendly_name("input2"); const auto fakeQuantize2 = makeFakeQuantize(input2, precision, fqOnData2); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_backprop_data_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_backprop_data_function.cpp index 8e78c677819..2e841c399d9 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_backprop_data_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_backprop_data_function.cpp @@ -24,7 +24,7 @@ namespace subgraph { std::shared_ptr ConvolutionBackpropDataFunction::get( const element::Type netPrecision, - const Shape& inputShape, + const PartialShape& inputShape, const Shape& outputShape, const builder::subgraph::FakeQuantizeOnData& fqOnData, const std::shared_ptr& weights) { diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_function.cpp index ea42797a427..2295010e12b 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_function.cpp @@ -122,20 +122,20 @@ std::shared_ptr ConvolutionFunction::getOriginalWithIncorrectW } std::shared_ptr ConvolutionFunction::getOriginalWithIncorrectWeights( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, ngraph::element::Type precision, ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights, ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData, bool isCorrect) { - const auto input = std::make_shared(precision, ngraph::Shape(inputShape)); + const auto input = std::make_shared(precision, inputShape); const auto fqOnData = fakeQuantizeOnData.empty() ? nullptr : ngraph::builder::makeFakeQuantize( input, precision, fakeQuantizeOnData.quantizationLevel, fakeQuantizeOnData.constantShape, fakeQuantizeOnData.inputLowValues, fakeQuantizeOnData.inputHighValues, fakeQuantizeOnData.outputLowValues, fakeQuantizeOnData.outputHighValues); - const size_t inputChannelsCount = inputShape[1]; - const size_t outputChannelsCount = 2 * inputShape[1]; + const size_t inputChannelsCount = inputShape[1].get_length(); + const size_t outputChannelsCount = 2 * inputShape[1].get_length(); const auto weights = ngraph::opset1::Constant::create( precision, ngraph::Shape{ outputChannelsCount, inputChannelsCount, 1, 1 }, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/depth_to_space_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/depth_to_space_function.cpp index 8eb721f23df..6ec71836c8e 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/depth_to_space_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/depth_to_space_function.cpp @@ -13,7 +13,7 @@ namespace subgraph { std::shared_ptr DepthToSpaceFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::opset1::DepthToSpace::DepthToSpaceMode mode, const size_t blockSize) { const float low = 0.f; diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_convolution_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_convolution_function.cpp index a70b40ff74d..88b70645bd7 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_convolution_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_convolution_function.cpp @@ -16,19 +16,19 @@ namespace subgraph { // TODO: remove, reuse mode extended method std::shared_ptr FakeQuantizeAndConvolutionFunction::get( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fqOnData, const FakeQuantizeOnWeights& fqOnWeights) { - const auto input = std::make_shared(precision, ngraph::Shape(inputShape)); + const auto input = std::make_shared(precision, inputShape); const auto fakeQuantizeOnActivations = fqOnData.empty() ? nullptr : ngraph::builder::makeFakeQuantize( input, precision, fqOnData.quantizationLevel, fqOnData.constantShape, fqOnData.inputLowValues, fqOnData.inputHighValues, fqOnData.outputLowValues, fqOnData.outputHighValues); - const size_t inputChannelsCount = inputShape[1]; - const size_t outputChannelsCount = 2 * inputShape[1]; + const size_t inputChannelsCount = inputShape[1].get_length(); + const size_t outputChannelsCount = 2 * inputShape[1].get_length(); const auto weights = ngraph::opset1::Constant::create( precision, ngraph::Shape{ outputChannelsCount, inputChannelsCount, 1, 1 }, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_two_output_branches_with_convolution_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_two_output_branches_with_convolution_function.cpp index 650e88b698c..c2283e33fd4 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_two_output_branches_with_convolution_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_two_output_branches_with_convolution_function.cpp @@ -16,12 +16,12 @@ namespace subgraph { std::shared_ptr createConvolution( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const std::shared_ptr& parent, const FakeQuantizeOnWeights& fqOnWeights, bool typeRelaxed) { - const size_t inputChannelsCount = inputShape[1]; - const size_t outputChannelsCount = 2 * inputShape[1]; + const size_t inputChannelsCount = inputShape[1].get_length(); + const size_t outputChannelsCount = 2 * inputShape[1].get_length(); const auto weights = ngraph::opset1::Constant::create( precision, ngraph::Shape{ outputChannelsCount, inputChannelsCount, 1, 1 }, @@ -56,7 +56,7 @@ std::shared_ptr createConvolution( std::shared_ptr FakeQuantizeAndTwoOutputBranchesWithConvolutionFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fqOnData, const FakeQuantizeOnWeights fqOnWeights1, FakeQuantizeOnWeights fqOnWeights2) { diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_function.cpp index 40554f46d65..e7ab4fe73ba 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_function.cpp @@ -22,9 +22,9 @@ using namespace ngraph::pass; std::shared_ptr FakeQuantizeFunction::getOriginalWithMaxPool( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantizeOnData) { - const auto input = std::make_shared(precision, ngraph::Shape(inputShape)); + const auto input = std::make_shared(precision, inputShape); input->set_friendly_name("input"); const auto fakeQuantize = ngraph::builder::makeFakeQuantize( diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_precision_selection_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_precision_selection_function.cpp index 20c71967588..cb645f11401 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_precision_selection_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_precision_selection_function.cpp @@ -18,9 +18,9 @@ using namespace ngraph::pass; std::shared_ptr FakeQuantizePrecisionSelectionFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ActualValues& values) { - const auto input = std::make_shared(precision, ngraph::Shape(inputShape)); + const auto input = std::make_shared(precision, inputShape); input->set_friendly_name("input"); std::shared_ptr parent = input; @@ -48,8 +48,8 @@ std::shared_ptr FakeQuantizePrecisionSelectionFunction::getOri std::make_shared(element::f32, Shape{}, std::vector{ 0.01 })), element::f32); - const size_t inputChannelsCount = inputShape[1]; - const size_t outputChannelsCount = 2 * inputShape[1]; + const size_t inputChannelsCount = inputShape[1].get_length(); + const size_t outputChannelsCount = 2 * inputShape[1].get_length(); const auto weights = ngraph::opset1::Constant::create( precision, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_convert_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_convert_function.cpp index f4f4721267b..09f6577e6cc 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_convert_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_convert_function.cpp @@ -40,18 +40,18 @@ std::shared_ptr FuseConvertFunction::get( } std::shared_ptr FuseConvertFunction::getWithFQ( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::element::Type inputPrecision, const ngraph::builder::subgraph::DequantizationOperations& dequantization, const bool constInput) { std::shared_ptr parent; std::shared_ptr input1; if (constInput) { - parent = std::make_shared(inputPrecision, inputShape, std::vector{ 128.f }); + parent = std::make_shared(inputPrecision, inputShape.to_shape(), std::vector{ 128.f }); } else { input1 = std::make_shared( inputPrecision, - ngraph::Shape(inputShape)); + inputShape); parent = input1; } auto deqStructure = dequantization; @@ -60,7 +60,7 @@ std::shared_ptr FuseConvertFunction::getWithFQ( std::shared_ptr input2 = std::make_shared( inputPrecision, - ngraph::Shape(inputShape)); + inputShape); const auto fakeQuantizeOnActivations = ngraph::builder::makeFakeQuantize( input2, inputPrecision, 256ul, { 1ul }, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_fake_quantize_and_scale_shift_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_fake_quantize_and_scale_shift_function.cpp index 6bb28eff007..48126da8baf 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_fake_quantize_and_scale_shift_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_fake_quantize_and_scale_shift_function.cpp @@ -15,9 +15,9 @@ using namespace ngraph::pass; std::shared_ptr FuseFakeQuantizeAndScaleShiftFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantizeOnData) { - const auto input = std::make_shared(precision, ngraph::Shape(inputShape)); + const auto input = std::make_shared(precision, inputShape); input->set_friendly_name("input"); const std::shared_ptr fakeQuantize = ngraph::builder::makeFakeQuantize( diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_fake_quantize_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_fake_quantize_function.cpp index 0ba9bdc5fd9..9befe458858 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_fake_quantize_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_fake_quantize_function.cpp @@ -86,7 +86,7 @@ std::shared_ptr FuseFakeQuantizeFunction::getOriginal( } std::shared_ptr FuseFakeQuantizeFunction::get( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const std::vector& branches, const ngraph::element::Type precisionFqOnData, const FakeQuantizeOnData& fqOnData) { @@ -101,7 +101,7 @@ std::shared_ptr FuseFakeQuantizeFunction::get( ngraph::ParameterVector inputs; std::vector> lastDequantizations; for (const Branch& branch : branches) { - const auto input = std::make_shared(branch.precisionBeforeDequantization, ngraph::Shape(inputShape)); + const auto input = std::make_shared(branch.precisionBeforeDequantization, inputShape); inputs.push_back(input); const std::shared_ptr lastDequantization = makeDequantization(input, branch.dequantization); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/group_convolution_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/group_convolution_function.cpp index 5d41f680410..6946e6219b1 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/group_convolution_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/group_convolution_function.cpp @@ -129,13 +129,13 @@ std::shared_ptr GroupConvolutionFunction::getOriginal( std::shared_ptr GroupConvolutionFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::Shape& outputShape, const size_t groupCount, const int groupCalculationDimention, const FakeQuantizeOnData& fakeQuantizeOnData, const FakeQuantizeOnWeights& fakeQuantizeOnWeights) { - const auto input = std::make_shared(precision, ngraph::Shape(inputShape)); + const auto input = std::make_shared(precision, inputShape); std::shared_ptr fakeQuantizeOnActivations; if (fakeQuantizeOnData.empty()) { @@ -154,7 +154,7 @@ std::shared_ptr GroupConvolutionFunction::getOriginal( //const size_t groupCount = 3ul; const size_t outputChannelsCount = outputShape[1]; const size_t kernelSize = 5ul; - const size_t inputChannelsCount = inputShape[1]; + const size_t inputChannelsCount = inputShape[1].get_length(); std::vector weightsValues = { 1.f }; std::shared_ptr weights = createWeightsOriginal( diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/interpolate_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/interpolate_function.cpp index ba4491cb5d0..96a6782441d 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/interpolate_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/interpolate_function.cpp @@ -30,7 +30,7 @@ std::shared_ptr InterpolateFunction::getOriginal( std::shared_ptr InterpolateFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::Shape& outputShape, const ngraph::op::InterpolateAttrs& interpAttrs) { float k = 50.f; diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_function.cpp index e4e6c55472c..a1004ad01c9 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_function.cpp @@ -19,16 +19,16 @@ namespace subgraph { std::shared_ptr MatMulFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape inputShape, + const ngraph::PartialShape inputShape, const float low, const float high) { - const auto input1 = std::make_shared(precision, ngraph::Shape(inputShape)); + const auto input1 = std::make_shared(precision, inputShape); const auto fakeQuantize1 = ngraph::builder::makeFakeQuantize( input1, precision, 256ul, { 1ul }, { low / 4.f }, { high / 4.f }, { low / 4.f }, { high / 4.f }); fakeQuantize1->set_friendly_name("fakeQuantize1"); - const auto input2 = std::make_shared(precision, ngraph::Shape(inputShape)); + const auto input2 = std::make_shared(precision, inputShape); const auto fakeQuantize2 = ngraph::builder::makeFakeQuantize( input2, precision, 256ul, { 1ul }, { low / 8.f }, { high / 8.f }, { low / 8.f }, { high / 8.f }); @@ -51,12 +51,12 @@ std::shared_ptr MatMulFunction::getOriginal( std::shared_ptr MatMulFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape inputShape1, - const ngraph::Shape inputShape2, + const ngraph::PartialShape inputShape1, + const ngraph::PartialShape inputShape2, const bool transpose1, const bool transpose2) { const auto paramNode = std::make_shared(precision, inputShape1); - const std::vector constShapes(inputShape1.size(), 1ul); + const std::vector constShapes(inputShape1.rank().get_length(), 1ul); const auto fakeQuantizeOnAcitvations = ngraph::builder::makeFakeQuantize( paramNode, precision, 256ul, constShapes, { 0.f }, { 255.f / 4.f }, { 0.f }, { 255.f / 4.f }); @@ -64,7 +64,7 @@ std::shared_ptr MatMulFunction::getOriginal( auto weightsConst = std::make_shared( precision, - inputShape2, + inputShape2.to_shape(), std::vector({ 1.f })); const auto fakeQuantizeOnWeights = ngraph::builder::makeFakeQuantize( weightsConst, precision, 256ul, { 1ul, 1ul }, @@ -298,7 +298,7 @@ std::shared_ptr MatMulFunction::getReference( std::shared_ptr MatMulFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnDataWithConstant& fqOnData, const Constant& weights, const FakeQuantizeOnDataWithConstant& fqOnWeights, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_with_optimized_constant_fake_quantize_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_with_optimized_constant_fake_quantize_function.cpp index 066eeb8226b..2522a2a1876 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_with_optimized_constant_fake_quantize_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_with_optimized_constant_fake_quantize_function.cpp @@ -13,11 +13,11 @@ namespace subgraph { std::shared_ptr MatMulWithOptimizedConstantFakeQuantizeFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape1, - const ngraph::Shape& inputShape2, + const ngraph::PartialShape& inputShape1, + const ngraph::PartialShape& inputShape2, const FakeQuantizeOnData& fqOnData, const FakeQuantizeOnData& fqOnWeights) { - const auto input = std::make_shared(precision, ngraph::Shape(inputShape1)); + const auto input = std::make_shared(precision, inputShape1); const auto lowConstantOnActivations = std::make_shared(precision, fqOnData.constantShape, fqOnData.inputLowValues); const auto highConstantOnActivations = std::make_shared(precision, fqOnData.constantShape, fqOnData.inputHighValues); @@ -29,7 +29,7 @@ std::shared_ptr MatMulWithOptimizedConstantFakeQuantizeFunctio highConstantOnActivations, fqOnWeights.quantizationLevel); - const ngraph::Shape weightsShape = { inputShape2[0], inputShape1[1] }; + const ngraph::Shape weightsShape = { static_cast(inputShape2[0].get_length()), static_cast(inputShape1[1].get_length()) }; const std::vector weigths(weightsShape[0] * weightsShape[1], 10.f); const auto weightsConst = std::make_shared(precision, weightsShape, weigths); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/max_pool_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/max_pool_function.cpp index 3a010e011d8..8132d4cfec2 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/max_pool_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/max_pool_function.cpp @@ -16,9 +16,9 @@ namespace subgraph { std::shared_ptr MaxPoolFunction::getOriginal( const ngraph::element::Type originalFunctionPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantizeOnData) { - const auto input = std::make_shared(originalFunctionPrecision, ngraph::Shape(inputShape)); + const auto input = std::make_shared(originalFunctionPrecision, inputShape); const auto fakeQuantize = ngraph::builder::makeFakeQuantize( input, originalFunctionPrecision, fakeQuantizeOnData.quantizationLevel, fakeQuantizeOnData.constantShape, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_function.cpp index af50d3717e7..1d36d0f8e35 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_function.cpp @@ -94,11 +94,11 @@ std::shared_ptr MultiplyFunction::get( std::shared_ptr MultiplyFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const bool broadcast, const ngraph::builder::subgraph::FakeQuantizeOnData& fq1, const ngraph::builder::subgraph::FakeQuantizeOnData& fq2) { - ngraph::Shape inputShape2 = inputShape; + auto inputShape2 = inputShape; if (broadcast) { inputShape2[2] = 1; diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_to_group_convolution_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_to_group_convolution_function.cpp index 4ae1873092f..e86d74ee7c7 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_to_group_convolution_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_to_group_convolution_function.cpp @@ -37,13 +37,13 @@ std::shared_ptr MultiplyToGroupConvolutionFunction::getOrigina std::shared_ptr MultiplyToGroupConvolutionFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fqOnData) { const auto input = std::make_shared(precision, inputShape); const auto fakeQuantizeOnActivations = makeFakeQuantize(input, precision, fqOnData); const auto reshape = std::make_shared( fakeQuantizeOnActivations, - std::make_shared(element::i32, Shape{ inputShape.size() }, inputShape), + std::make_shared(element::i32, Shape{ static_cast(inputShape.rank().get_length()) }, inputShape.to_shape()), true); reshape->set_friendly_name("output"); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_with_one_parent_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_with_one_parent_function.cpp index f23b0e6d66f..9cbeb8f2abd 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_with_one_parent_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_with_one_parent_function.cpp @@ -13,9 +13,9 @@ namespace subgraph { std::shared_ptr MultiplyWithOneParentFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fqOnData) { - const auto input = std::make_shared(precision, ngraph::Shape(inputShape)); + const auto input = std::make_shared(precision, inputShape); const auto fakeQuantize = ngraph::builder::makeFakeQuantize( input, precision, fqOnData.quantizationLevel, fqOnData.constantShape, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/mvn_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/mvn_function.cpp index 5820582492f..b18ce655711 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/mvn_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/mvn_function.cpp @@ -45,7 +45,7 @@ std::shared_ptr MVNFunction::getOriginal( std::shared_ptr MVNFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const AxisSet& reductionAxes, const bool& normalizeVariance) { float k = 50.f; diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_l2_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_l2_function.cpp index cd0a05e1371..693a042115d 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_l2_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_l2_function.cpp @@ -16,7 +16,7 @@ namespace subgraph { std::shared_ptr NormalizeL2Function::getOriginal( const ngraph::element::Type precision, - const std::pair& shapes, + const std::pair& shapes, const ngraph::element::Type precisionOnActivation, const std::vector& axes, const bool fuseMultiply, @@ -43,8 +43,11 @@ std::shared_ptr NormalizeL2Function::getOriginal( ngraph::ResultVector results; if (fuseMultiply) { - const auto multiplyConst = std::make_shared( - precision, ngraph::Shape{ shapes.first[0], shapes.first[1], 1ul, 1ul }, std::vector{ 2.f }); + ngraph::Shape constantShape(4ul, 1ul); + constantShape[0] = shapes.first[0].get_length(); + constantShape[1] = shapes.first[1].get_length(); + + const auto multiplyConst = std::make_shared(precision, constantShape, std::vector{ 2.f }); multiplyConst->set_friendly_name("multiplyConst"); const auto multiply = std::make_shared(normalizeL2->output(0), multiplyConst); multiply->set_friendly_name("output"); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/prelu_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/prelu_function.cpp index f962d60e010..aefbfe3c0cf 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/prelu_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/prelu_function.cpp @@ -32,12 +32,10 @@ std::shared_ptr PReluFunction::getOriginal( } std::shared_ptr PReluFunction::getOriginal( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::element::Type precisionBeforeFq, const FakeQuantizeOnData& fqOnData) { - const std::shared_ptr input = std::make_shared( - precisionBeforeFq, - ngraph::Shape(inputShape)); + const auto input = std::make_shared(precisionBeforeFq, inputShape); const std::shared_ptr quantizationOp = fqOnData.empty() ? std::dynamic_pointer_cast(input) : diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/relu_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/relu_function.cpp index 4a3c5a0e341..f7690715879 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/relu_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/relu_function.cpp @@ -30,12 +30,10 @@ std::shared_ptr ReluFunction::getOriginal( } std::shared_ptr ReluFunction::getOriginal( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::element::Type precisionBeforeFq, const FakeQuantizeOnData& fqOnData) { - const std::shared_ptr input = std::make_shared( - precisionBeforeFq, - ngraph::Shape(inputShape)); + const auto input = std::make_shared(precisionBeforeFq, inputShape); const std::shared_ptr quantizationOp = fqOnData.empty() ? std::dynamic_pointer_cast(input) : diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/reshape_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/reshape_function.cpp index a425d0ddfa1..e03dae4b27a 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/reshape_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/reshape_function.cpp @@ -31,13 +31,11 @@ std::shared_ptr ReshapeFunction::getOriginal( } std::shared_ptr ReshapeFunction::getOriginal( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const std::vector& reshapeConstValues, const ngraph::element::Type precisionBeforeFq, const FakeQuantizeOnData& fqOnData) { - const auto input = std::make_shared( - precisionBeforeFq, - ngraph::Shape(inputShape)); + const auto input = std::make_shared(precisionBeforeFq, inputShape); const std::shared_ptr quantizationOp = fqOnData.empty() ? std::dynamic_pointer_cast(input) : diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/shuffle_channels_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/shuffle_channels_function.cpp index ab77765b47b..7884372138c 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/shuffle_channels_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/shuffle_channels_function.cpp @@ -35,7 +35,7 @@ std::shared_ptr ShuffleChannelsFunction::getOriginal( std::shared_ptr ShuffleChannelsFunction::getOriginal( const ngraph::element::Type inputPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::builder::subgraph::FakeQuantizeOnData& fqOnData, const std::int64_t axis, const std::int64_t group) { diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/split_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/split_function.cpp index 641555d9718..044c490c3c6 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/split_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/split_function.cpp @@ -48,7 +48,7 @@ std::shared_ptr SplitFunction::getOriginal( std::shared_ptr SplitFunction::getOriginal( const ngraph::element::Type originalFunctionPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize, int64_t splitedAxis, size_t numSplit) { const auto input = std::make_shared(originalFunctionPrecision, inputShape); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/squeeze_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/squeeze_function.cpp index d584f2c64c6..3799349f773 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/squeeze_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/squeeze_function.cpp @@ -33,10 +33,10 @@ std::shared_ptr SqueezeFunction::getOriginal( std::shared_ptr SqueezeFunction::getOriginal( const ngraph::element::Type originalFunctionPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantizeOnData, const std::vector& axes) { - const auto input = std::make_shared(originalFunctionPrecision, ngraph::Shape(inputShape)); + const auto input = std::make_shared(originalFunctionPrecision, inputShape); const auto fakeQuantize = fakeQuantizeOnData.empty() ? nullptr : diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/strided_slice_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/strided_slice_function.cpp index b12019355c1..aa2e5421b62 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/strided_slice_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/strided_slice_function.cpp @@ -54,7 +54,7 @@ std::shared_ptr StridedSliceFunction::getOriginal( std::shared_ptr StridedSliceFunction::getOriginal( const ngraph::element::Type inputPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::builder::subgraph::FakeQuantizeOnData& fakeQuantize, const std::vector& begin, const std::vector& end, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/subtract_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/subtract_function.cpp index c90d774a042..cf2726ac776 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/subtract_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/subtract_function.cpp @@ -16,18 +16,19 @@ namespace builder { namespace subgraph { std::shared_ptr SubtractFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape) { + const ngraph::PartialShape& inputShape) { const float k = 50.f; - const auto input = std::make_shared(precision, ngraph::Shape(inputShape)); + const auto input = std::make_shared(precision, inputShape); const auto fakeQuantizeOnActivations = ngraph::builder::makeFakeQuantize( input, precision, 256ul, { 1ul }, { 0.f }, { 255.f / k }, { 0.f }, { 255.f / k }); + const size_t channelsValue = inputShape[1].get_length(); const auto weights = ngraph::opset1::Constant::create( precision, - ngraph::Shape{ inputShape[1], inputShape[1], 1, 1 }, - std::vector(inputShape[1] * inputShape[1], 1)); + ngraph::Shape{ channelsValue, channelsValue, 1, 1 }, + std::vector(channelsValue * channelsValue, 1)); const auto convolution = std::make_shared( fakeQuantizeOnActivations == nullptr ? input : fakeQuantizeOnActivations, diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/subtract_multiply_to_multiply_add_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/subtract_multiply_to_multiply_add_function.cpp index 9317d199be2..d34ed6198fb 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/subtract_multiply_to_multiply_add_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/subtract_multiply_to_multiply_add_function.cpp @@ -30,13 +30,10 @@ std::shared_ptr SubtractMultiplyToMultiplyAddFunction::getOrig } std::shared_ptr SubtractMultiplyToMultiplyAddFunction::getOriginal( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::element::Type precision, const ngraph::builder::subgraph::FakeQuantizeOnData& fqOnData) { - const std::shared_ptr input = std::make_shared( - precision, - ngraph::Shape(inputShape)); - + const auto input = std::make_shared(precision, inputShape); const std::shared_ptr fq = makeFakeQuantize(input, precision, fqOnData); const std::shared_ptr reshape1 = std::make_shared( @@ -44,12 +41,12 @@ std::shared_ptr SubtractMultiplyToMultiplyAddFunction::getOrig std::make_shared( ngraph::element::i64, Shape({ 3 }), - std::vector({ static_cast(inputShape[0]), static_cast(inputShape[1]), -1 })), + std::vector({ inputShape[0].get_length(), inputShape[1].get_length(), -1 })), false); const std::shared_ptr reshape2 = std::make_shared( reshape1, - std::make_shared(ngraph::element::i64, Shape({ 4 }), inputShape), + std::make_shared(ngraph::element::i64, Shape({ 4 }), inputShape.to_shape()), false); ngraph::ResultVector results{ std::make_shared(reshape2) }; diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/transpose_after_mat_mul_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/transpose_after_mat_mul_function.cpp index 4e698c7908b..250f5de0c07 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/transpose_after_mat_mul_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/transpose_after_mat_mul_function.cpp @@ -16,7 +16,7 @@ namespace builder { namespace subgraph { std::shared_ptr TransposeAfterMatMulFunction::getOriginal( const ngraph::element::Type precision, - const ngraph::Shape& inputShape) { + const ngraph::PartialShape& inputShape) { const auto input1 = std::make_shared(precision, inputShape); input1->set_friendly_name("input1"); diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/transpose_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/transpose_function.cpp index ea02fbe0beb..892cb19f231 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/transpose_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/transpose_function.cpp @@ -30,13 +30,11 @@ std::shared_ptr TransposeFunction::getOriginal( } std::shared_ptr TransposeFunction::getOriginal( - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const std::vector& transposeConstValues, const ngraph::element::Type precisionBeforeFq, const FakeQuantizeOnData& fqOnData) { - const std::shared_ptr input = std::make_shared( - precisionBeforeFq, - ngraph::Shape(inputShape)); + const auto input = std::make_shared(precisionBeforeFq, inputShape); const std::shared_ptr quantizationOp = fqOnData.empty() ? std::dynamic_pointer_cast(input) : diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/unsqueeze_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/unsqueeze_function.cpp index b272acf01e2..7b292871794 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/unsqueeze_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/unsqueeze_function.cpp @@ -33,10 +33,10 @@ namespace subgraph { std::shared_ptr UnsqueezeFunction::getOriginal( const ngraph::element::Type originalFunctionPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const FakeQuantizeOnData& fakeQuantizeOnData, const std::vector& axes) { - const auto input = std::make_shared(originalFunctionPrecision, ngraph::Shape(inputShape)); + const auto input = std::make_shared(originalFunctionPrecision, inputShape); const auto fakeQuantize = fakeQuantizeOnData.empty() ? nullptr : diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/variadic_split_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/variadic_split_function.cpp index c60acbbb237..a9ffe853d8e 100644 --- a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/variadic_split_function.cpp +++ b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/variadic_split_function.cpp @@ -37,7 +37,7 @@ namespace subgraph { std::shared_ptr VariadicSplitFunction::getOriginal( const ngraph::element::Type originalFunctionPrecision, - const ngraph::Shape& inputShape, + const ngraph::PartialShape& inputShape, const ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize, const int64_t splitedAxis, const std::vector& splitLengths) {