From bcc4d5c85db6f55bee354ca6a7d8de52fb9e6919 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Mon, 11 Dec 2023 14:57:33 +0100 Subject: [PATCH 01/37] use ov::test::SubgraphBaseTest base for LayerTransformation --- .../low_precision_transformations/layer_transformation.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp index 05e5fa6874c289..83480d976d8714 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp @@ -15,7 +15,7 @@ #include #include "low_precision/layer_transformation.hpp" -#include "shared_test_classes/base/layer_test_utils.hpp" +#include "shared_test_classes/base/ov_subgraph.hpp" namespace LayerTestsUtils { @@ -30,7 +30,7 @@ class LayerTransformationParamsNGraphFactory { class LayerTransformationParamsFactory : public LayerTransformationParamsNGraphFactory { }; -class LayerTransformation : virtual public LayerTestsUtils::LayerTestsCommon { +class LayerTransformation : virtual public ov::test::SubgraphBaseTest { protected: LayerTransformation(); From 31cbfa86a88b9aaf9cb936aeb03b65a264c8b698 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Mon, 11 Dec 2023 15:28:52 +0100 Subject: [PATCH 02/37] fix Run -> run --- .../batch_to_space_transformation.hpp | 2 +- .../convolution_backprop_data_transformation.hpp | 2 +- .../convolution_qdq_transformation.hpp | 2 +- .../convolution_transformation.hpp | 2 +- .../elementwise_branch_selection_transformation.hpp | 2 +- .../fake_quantize_transformation.hpp | 2 +- .../fake_quantize_with_dq_not_optimal_transformation.hpp | 2 +- .../group_convolution_transformation.hpp | 2 +- .../groupconvolution_qdq_transformation.hpp | 2 +- .../mat_mul_transformation.hpp | 2 +- .../mat_mul_with_constant_transformation.hpp | 2 +- .../move_fake_quantize_transformation.hpp | 2 +- .../multiply_to_group_convolution_transformation.hpp | 2 +- .../multiply_transformation.hpp | 2 +- .../low_precision_transformations/pad_transformation.hpp | 2 +- .../pull_reshape_through_dequantization_transformation.hpp | 2 +- .../recurrent_cell_transformation.hpp | 2 +- .../reduce_max_transformation.hpp | 2 +- .../reduce_mean_transformation.hpp | 2 +- .../reduce_min_transformation.hpp | 2 +- .../reduce_sum_transformation.hpp | 2 +- .../reshape_transformation.hpp | 2 +- .../shuffle_channels_transformation.hpp | 2 +- .../space_to_batch_transformation.hpp | 2 +- .../batch_to_space_transformation.cpp | 6 +++--- .../convolution_backprop_data_transformation.cpp | 6 +++--- .../convolution_qdq_transformation.cpp | 6 +++--- .../convolution_transformation.cpp | 6 +++--- .../elementwise_branch_selection_transformation.cpp | 6 +++--- .../fake_quantize_transformation.cpp | 6 +++--- .../fake_quantize_with_dq_not_optimal_transformation.cpp | 6 +++--- .../group_convolution_transformation.cpp | 6 +++--- .../groupconvolution_qdq_transformation.cpp | 6 +++--- .../mat_mul_transformation.cpp | 6 +++--- .../mat_mul_with_constant_transformation.cpp | 6 +++--- .../move_fake_quantize_transformation.cpp | 6 +++--- .../multiply_to_group_convolution_transformation.cpp | 6 +++--- .../multiply_transformation.cpp | 6 +++--- .../low_precision_transformations/pad_transformation.cpp | 6 +++--- .../pull_reshape_through_dequantization_transformation.cpp | 6 +++--- .../recurrent_cell_transformation.cpp | 6 +++--- .../reduce_max_transformation.cpp | 6 +++--- .../reduce_mean_transformation.cpp | 6 +++--- .../reduce_min_transformation.cpp | 6 +++--- .../reduce_sum_transformation.cpp | 6 +++--- .../reshape_transformation.cpp | 6 +++--- .../shuffle_channels_transformation.cpp | 6 +++--- .../space_to_batch_transformation.cpp | 6 +++--- 48 files changed, 96 insertions(+), 96 deletions(-) diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/batch_to_space_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/batch_to_space_transformation.hpp index 88e6eb9b90f051..5f3e4e5ee3aefe 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/batch_to_space_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/batch_to_space_transformation.hpp @@ -37,7 +37,7 @@ class BatchToSpaceTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_backprop_data_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_backprop_data_transformation.hpp index 13aa0a4f26260c..260a0f21974627 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_backprop_data_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_backprop_data_transformation.hpp @@ -59,7 +59,7 @@ class ConvolutionBackpropDataTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_qdq_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_qdq_transformation.hpp index 8475b146af9b0f..22f46f3acdb0d1 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_qdq_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_qdq_transformation.hpp @@ -62,7 +62,7 @@ class ConvolutionQDqTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_transformation.hpp index 851c8f57cb4789..b739be806ed140 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_transformation.hpp @@ -40,7 +40,7 @@ class ConvolutionTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/elementwise_branch_selection_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/elementwise_branch_selection_transformation.hpp index e98af3352dae83..256d920b7dea4d 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/elementwise_branch_selection_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/elementwise_branch_selection_transformation.hpp @@ -45,7 +45,7 @@ class ElementwiseBranchSelectionTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp index 1e07645754f014..cd82925b271a7e 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp @@ -34,7 +34,7 @@ class FakeQuantizeTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.hpp index 78557a195a84e2..0133165dbe78df 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.hpp @@ -63,7 +63,7 @@ class FakeQuantizeWithNotOptimalTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp index 09e3d90210414f..fba31ab404bd1f 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp @@ -58,7 +58,7 @@ class GroupConvolutionTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/groupconvolution_qdq_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/groupconvolution_qdq_transformation.hpp index f23036150c0ee5..7a07082a310702 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/groupconvolution_qdq_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/groupconvolution_qdq_transformation.hpp @@ -66,7 +66,7 @@ class GroupConvolutionQDqTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp index 285c599591d7ca..df874642636bcd 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp @@ -38,7 +38,7 @@ class MatMulTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp index 7eaab1f0d93f4b..fcf2860f4b20d7 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp @@ -45,7 +45,7 @@ class MatMulWithConstantTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/move_fake_quantize_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/move_fake_quantize_transformation.hpp index 7b0bdf2e5603bf..38985654d8984d 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/move_fake_quantize_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/move_fake_quantize_transformation.hpp @@ -47,7 +47,7 @@ class MoveFakeQuantizeTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_to_group_convolution_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_to_group_convolution_transformation.hpp index 6bd801816daefa..c6e2df72d195db 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_to_group_convolution_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_to_group_convolution_transformation.hpp @@ -39,7 +39,7 @@ class MultiplyToGroupConvolutionTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp index 06ac05ecb03b46..b719fd849374db 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp @@ -38,7 +38,7 @@ class MultiplyTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/pad_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/pad_transformation.hpp index 17fb3a7663a385..21b182346e918d 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/pad_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/pad_transformation.hpp @@ -35,6 +35,6 @@ class PadTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/pull_reshape_through_dequantization_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/pull_reshape_through_dequantization_transformation.hpp index abceb85983bc8c..62788638edc13d 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/pull_reshape_through_dequantization_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/pull_reshape_through_dequantization_transformation.hpp @@ -50,7 +50,7 @@ class PullReshapeThroughDequantizationTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/recurrent_cell_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/recurrent_cell_transformation.hpp index 6e9e9f375ff62e..a9df8408bc2d7e 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/recurrent_cell_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/recurrent_cell_transformation.hpp @@ -54,7 +54,7 @@ class RecurrentCellTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_max_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_max_transformation.hpp index 9dabccfbdb65f0..32e6dbd001e8e6 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_max_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_max_transformation.hpp @@ -34,6 +34,6 @@ class ReduceMaxTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_mean_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_mean_transformation.hpp index bef0cf1e823528..a918a575870183 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_mean_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_mean_transformation.hpp @@ -46,6 +46,6 @@ class ReduceMeanTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_min_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_min_transformation.hpp index 14a6e3b043902f..b7a508e75b0edb 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_min_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_min_transformation.hpp @@ -34,6 +34,6 @@ class ReduceMinTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_sum_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_sum_transformation.hpp index 0da5e29777f79b..f1ac17bdbf8435 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_sum_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_sum_transformation.hpp @@ -34,6 +34,6 @@ class ReduceSumTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp index 02fa5b75ed802c..0f2d20bd0454f0 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp @@ -36,7 +36,7 @@ class ReshapeTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/shuffle_channels_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/shuffle_channels_transformation.hpp index cd54ec38c3c122..60921241d77968 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/shuffle_channels_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/shuffle_channels_transformation.hpp @@ -37,7 +37,7 @@ class ShuffleChannelsTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/space_to_batch_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/space_to_batch_transformation.hpp index 95884e9e8f1422..9cafb78b401e83 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/space_to_batch_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/space_to_batch_transformation.hpp @@ -37,7 +37,7 @@ class SpaceToBatchTransformation : protected: void SetUp() override; - void Run() override; + void run() override; }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp index 5b0e5997147a86..5e6f42437a591a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp @@ -38,8 +38,8 @@ void BatchToSpaceTransformation::SetUp() { param.crops_end); } -void BatchToSpaceTransformation::Run() { - LayerTestsCommon::Run(); +void BatchToSpaceTransformation::run() { + LayerTransformation::run(); const auto params = std::get<2>(GetParam()); auto expected_type = params.expected_kernel_type; @@ -54,7 +54,7 @@ void BatchToSpaceTransformation::Run() { TEST_P(BatchToSpaceTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp index fd4e9f4fdf1550..3f0a7265b20ff2 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -67,8 +67,8 @@ void ConvolutionBackpropDataTransformation::SetUp() { weights); } -void ConvolutionBackpropDataTransformation::Run() { - LayerTestsCommon::Run(); +void ConvolutionBackpropDataTransformation::run() { + LayerTransformation::run(); const auto inputShape = std::get<1>(GetParam()); if (inputShape.second) { @@ -80,7 +80,7 @@ void ConvolutionBackpropDataTransformation::Run() { TEST_P(ConvolutionBackpropDataTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp index 202576fed9ecee..7826af5087be2b 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp @@ -57,8 +57,8 @@ void ConvolutionQDqTransformation::SetUp() { this->configuration[ov::hint::inference_precision.name()] = "f32"; } -void ConvolutionQDqTransformation::Run() { - LayerTestsCommon::Run(); +void ConvolutionQDqTransformation::run() { + LayerTransformation::run(); const auto params = std::get<4>(GetParam()); const auto actualType = getRuntimePrecisionByType(params.layerName); @@ -67,7 +67,7 @@ void ConvolutionQDqTransformation::Run() { TEST_P(ConvolutionQDqTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp index 8d524a19c8c5a9..dac9dab615d69d 100755 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp @@ -53,8 +53,8 @@ void ConvolutionTransformation::SetUp() { param.fakeQuantizeOnWeights); } -void ConvolutionTransformation::Run() { - LayerTestsCommon::Run(); +void ConvolutionTransformation::run() { + LayerTransformation::run(); const auto params = std::get<4>(GetParam()); const auto actualPrecision = getRuntimePrecisionByType(params.layerName); @@ -67,7 +67,7 @@ void ConvolutionTransformation::Run() { TEST_P(ConvolutionTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp index f21455b9b45c5c..a9ae9ed1eca3e2 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp @@ -70,8 +70,8 @@ void ElementwiseBranchSelectionTransformation::SetUp() { ov::pass::InitNodeInfo().run_on_model(function); } -void ElementwiseBranchSelectionTransformation::Run() { - LayerTestsCommon::Run(); +void ElementwiseBranchSelectionTransformation::run() { + LayerTransformation::run(); const auto params = std::get<3>(GetParam()); const auto elementwiseType = std::get<4>(GetParam()); @@ -115,7 +115,7 @@ void ElementwiseBranchSelectionTransformation::Run() { TEST_P(ElementwiseBranchSelectionTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp index 00cf867321a4b9..f9848d5c3c7d32 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp @@ -52,8 +52,8 @@ void FakeQuantizeTransformation::SetUp() { ov::pass::InitNodeInfo().run_on_model(function); } -void FakeQuantizeTransformation::Run() { - LayerTestsCommon::Run(); +void FakeQuantizeTransformation::run() { + LayerTransformation::run(); const auto params = std::get<4>(GetParam()); const auto actualPrecision = getRuntimePrecisionByType(params.layerName); @@ -67,7 +67,7 @@ void FakeQuantizeTransformation::Run() { TEST_P(FakeQuantizeTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index e2ce31b6ecbe47..129d9fcf7c8764 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -49,8 +49,8 @@ void FakeQuantizeWithNotOptimalTransformation::SetUp() { testValues.dequantizationAfter); } -void FakeQuantizeWithNotOptimalTransformation::Run() { - LayerTestsCommon::Run(); +void FakeQuantizeWithNotOptimalTransformation::run() { + LayerTransformation::run(); const auto params = std::get<4>(GetParam()); const auto actualType = getRuntimePrecisionByType("Convolution"); @@ -58,7 +58,7 @@ void FakeQuantizeWithNotOptimalTransformation::Run() { } TEST_P(FakeQuantizeWithNotOptimalTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp index e2857490ebaae8..a620a0d1c1630d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp @@ -68,8 +68,8 @@ void GroupConvolutionTransformation::SetUp() { addPrecisionPreserved); } -void GroupConvolutionTransformation::Run() { - LayerTestsCommon::Run(); +void GroupConvolutionTransformation::run() { + LayerTransformation::run(); const auto param = std::get<4>(GetParam()); if (!param.layerName.empty()) { @@ -84,7 +84,7 @@ void GroupConvolutionTransformation::Run() { TEST_P(GroupConvolutionTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp index 1ffff8920255fa..35fa5bd9b5547a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -55,8 +55,8 @@ void GroupConvolutionQDqTransformation::SetUp() { {}, {}, {}, param.reshape, {}, "GroupConvolution", param.multiplyAfter); } -void GroupConvolutionQDqTransformation::Run() { - LayerTestsCommon::Run(); +void GroupConvolutionQDqTransformation::run() { + LayerTransformation::run(); const auto params = std::get<4>(GetParam()); const auto actualType = getRuntimePrecision(params.layerName); @@ -65,7 +65,7 @@ void GroupConvolutionQDqTransformation::Run() { TEST_P(GroupConvolutionQDqTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp index 1c0c7ac7a7050a..8728d6acc1d5e0 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp @@ -74,10 +74,10 @@ void MatMulTransformation::SetUp() { ov::pass::InitNodeInfo().run_on_model(function); } -void MatMulTransformation::Run() { +void MatMulTransformation::run() { SKIP_IF_CURRENT_TEST_IS_DISABLED() - LayerTestsCommon::Run(); + LayerTransformation::run(); const auto params = std::get<3>(GetParam()); const auto actualType = getRuntimePrecision(params.expectedKernelName); @@ -86,7 +86,7 @@ void MatMulTransformation::Run() { } TEST_P(MatMulTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp index 5708daf3b43ca4..a4ed87a191daab 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -73,8 +73,8 @@ void MatMulWithConstantTransformation::SetUp() { ov::pass::InitNodeInfo().run_on_model(function); } -void MatMulWithConstantTransformation::Run() { - LayerTestsCommon::Run(); +void MatMulWithConstantTransformation::run() { + LayerTransformation::run(); const auto params = std::get<2>(GetParam()); const auto actualPrecision = getRuntimePrecisionByType(params.layerName); @@ -87,7 +87,7 @@ void MatMulWithConstantTransformation::Run() { TEST_P(MatMulWithConstantTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp index 4ea5038a026036..c5fe45c5bdcbea 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp @@ -61,8 +61,8 @@ void MoveFakeQuantizeTransformation::SetUp() { oneInputWithSplit); } -void MoveFakeQuantizeTransformation::Run() { - LayerTestsCommon::Run(); +void MoveFakeQuantizeTransformation::run() { + LayerTransformation::run(); const auto params = std::get<5>(GetParam()); const auto actualPrecision = getRuntimePrecisionByType(params.layerName); @@ -75,7 +75,7 @@ void MoveFakeQuantizeTransformation::Run() { TEST_P(MoveFakeQuantizeTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp index ae2affdb42e4f4..ae697d8ecab5b8 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp @@ -53,8 +53,8 @@ void MultiplyToGroupConvolutionTransformation::SetUp() { param.parentHasOneConsumer); } -void MultiplyToGroupConvolutionTransformation::Run() { - LayerTestsCommon::Run(); +void MultiplyToGroupConvolutionTransformation::run() { + LayerTransformation::run(); const auto param = std::get<3>(GetParam()); const auto actualPrecision = getRuntimePrecision(param.layerName); @@ -67,7 +67,7 @@ void MultiplyToGroupConvolutionTransformation::Run() { TEST_P(MultiplyToGroupConvolutionTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp index 6aa3f96aeb0871..b290d808f4ce80 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp @@ -69,8 +69,8 @@ void MultiplyTransformation::SetUp() { ov::pass::InitNodeInfo().run_on_model(function); } -void MultiplyTransformation::Run() { - LayerTestsCommon::Run(); +void MultiplyTransformation::run() { + LayerTransformation::run(); const auto params = std::get<3>(GetParam()); @@ -98,7 +98,7 @@ void MultiplyTransformation::Run() { TEST_P(MultiplyTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp index da6e3ba2af3666..ed948960cc7436 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp @@ -47,8 +47,8 @@ void PadTransformation::SetUp() { param.padValue); } -void PadTransformation::Run() { - LayerTestsCommon::Run(); +void PadTransformation::run() { + LayerTransformation::run(); const auto params = std::get<5>(GetParam()); const auto actualPrecision = getRuntimePrecisionByType(params.layerName); @@ -59,7 +59,7 @@ void PadTransformation::Run() { TEST_P(PadTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp index 4b8f6713f8839a..cbc0593a8a4b23 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp @@ -79,8 +79,8 @@ void PullReshapeThroughDequantizationTransformation::SetUp() { "GroupConvolution"); } -void PullReshapeThroughDequantizationTransformation::Run() { - LayerTestsCommon::Run(); +void PullReshapeThroughDequantizationTransformation::run() { + LayerTransformation::run(); const auto params = std::get<5>(GetParam()); const auto actualType = getRuntimePrecision(params.operationName); @@ -89,7 +89,7 @@ void PullReshapeThroughDequantizationTransformation::Run() { TEST_P(PullReshapeThroughDequantizationTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp index c377c370c76597..d2b3cbe529c13e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp @@ -69,8 +69,8 @@ void RecurrentCellTransformation::SetUp() { }); } -void RecurrentCellTransformation::Run() { - LayerTestsCommon::Run(); +void RecurrentCellTransformation::run() { + LayerTransformation::run(); if (!executableNetwork) return; @@ -85,7 +85,7 @@ void RecurrentCellTransformation::Run() { } TEST_P(RecurrentCellTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp index 9980d12ac8199b..67834c20133a63 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp @@ -52,8 +52,8 @@ void ReduceMaxTransformation::SetUp() { dequantizationAfter); } -void ReduceMaxTransformation::Run() { - LayerTestsCommon::Run(); +void ReduceMaxTransformation::run() { + LayerTransformation::run(); const auto params = std::get<4>(GetParam()); const auto actualType = getRuntimePrecision(params.layerName); @@ -62,7 +62,7 @@ void ReduceMaxTransformation::Run() { TEST_P(ReduceMaxTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp index 35f54b7cc8a128..52c361e6ff30b7 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp @@ -60,8 +60,8 @@ void ReduceMeanTransformation::SetUp() { param.dequantizationAfter); } -void ReduceMeanTransformation::Run() { - LayerTestsCommon::Run(); +void ReduceMeanTransformation::run() { + LayerTransformation::run(); const auto params = std::get<4>(GetParam()); const auto actualType = getRuntimePrecision(params.layerName); @@ -70,7 +70,7 @@ void ReduceMeanTransformation::Run() { TEST_P(ReduceMeanTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp index a1b3b9cb24fb28..cfcd4f3457176f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp @@ -52,8 +52,8 @@ void ReduceMinTransformation::SetUp() { dequantizationAfter); } -void ReduceMinTransformation::Run() { - LayerTestsCommon::Run(); +void ReduceMinTransformation::run() { + LayerTransformation::run(); const auto params = std::get<4>(GetParam()); const auto actualType = getRuntimePrecision(params.layerName); @@ -62,7 +62,7 @@ void ReduceMinTransformation::Run() { TEST_P(ReduceMinTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp index 14d9e3cc97f0a6..a991df7350e2a4 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp @@ -52,8 +52,8 @@ void ReduceSumTransformation::SetUp() { dequantizationAfter); } -void ReduceSumTransformation::Run() { - LayerTestsCommon::Run(); +void ReduceSumTransformation::run() { + LayerTransformation::run(); const auto params = std::get<4>(GetParam()); const auto actualType = getRuntimePrecision(params.layerName); @@ -62,7 +62,7 @@ void ReduceSumTransformation::Run() { TEST_P(ReduceSumTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp index 7a45da7385e478..aa0dd1b7588cf5 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp @@ -46,8 +46,8 @@ void ReshapeTransformation::SetUp() { param.fakeQuantize); } -void ReshapeTransformation::Run() { - LayerTestsCommon::Run(); +void ReshapeTransformation::run() { + LayerTransformation::run(); const auto params = std::get<3>(GetParam()); auto actualPrecision = getRuntimePrecisionByType(params.layerType); @@ -60,7 +60,7 @@ void ReshapeTransformation::Run() { TEST_P(ReshapeTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp index b1405b805828e3..de5a85b89c3ae3 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp @@ -47,8 +47,8 @@ void ShuffleChannelsTransformation::SetUp() { param.group); } -void ShuffleChannelsTransformation::Run() { - LayerTestsCommon::Run(); +void ShuffleChannelsTransformation::run() { + LayerTransformation::run(); const auto params = std::get<4>(GetParam()); const auto actualType = getRuntimePrecision(params.layerName); @@ -57,7 +57,7 @@ void ShuffleChannelsTransformation::Run() { TEST_P(ShuffleChannelsTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp index e8887dcf4902da..ae11a41b31f8a4 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp @@ -38,8 +38,8 @@ void SpaceToBatchTransformation::SetUp() { param.pads_end); } -void SpaceToBatchTransformation::Run() { - LayerTestsCommon::Run(); +void SpaceToBatchTransformation::run() { + LayerTransformation::run(); const auto params = std::get<2>(GetParam()); auto expected_type = params.expected_kernel_type; @@ -54,7 +54,7 @@ void SpaceToBatchTransformation::Run() { TEST_P(SpaceToBatchTransformation, CompareWithRefImpl) { SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + run(); }; } // namespace LayerTestsDefinitions From 93e4d3e6af70fcdad61200c7a4530fa6df03fa13 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Mon, 11 Dec 2023 16:11:33 +0100 Subject: [PATCH 03/37] fix LayerTestsCommon::getRuntimeInfo() --- .../elementwise_branch_selection_transformation.cpp | 2 +- .../eliminate_fake_quantize_transformation.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp index a9ae9ed1eca3e2..adf728b79851c8 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp @@ -78,7 +78,7 @@ void ElementwiseBranchSelectionTransformation::run() { std::vector> expectedReorders = params.expectedReorders; if (!expectedReorders.empty()) { - auto rtInfo = LayerTestsCommon::getRuntimeInfo(); + auto rtInfo = LayerTransformation::getRuntimeInfo(); for (auto it : rtInfo) { const auto& typeIt = it.second.find("layerType"); const auto type = typeIt->second.as(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp index 14cb7b9daffe48..855f1d25e02f9b 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp @@ -52,7 +52,7 @@ TEST_P(EliminateFakeQuantizeTransformation, CompareWithRefImpl) { EliminateFakeQuantizeTransformationTestValues testValues; std::tie(targetDevice, testValues) = this->GetParam(); - const auto& rtInfo = LayerTestsCommon::getRuntimeInfo(); + const auto& rtInfo = LayerTransformation::getRuntimeInfo(); auto exist = testValues.expected.exist; auto absent = testValues.expected.absent; From 5d632dcd0099df663d647faa9b8dd69aafffd355 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Tue, 12 Dec 2023 14:40:07 +0100 Subject: [PATCH 04/37] continue fixes --- .../depth_to_space_transformation.cpp | 10 +++++----- .../depth_to_space_transformation.hpp | 1 + .../convolution_transformation.cpp | 2 +- ...antize_and_two_output_branches_with_convolution.cpp | 4 ++-- .../layer_transformation.cpp | 3 +-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp index df4bccfc05931e..58007f088d7a4c 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp @@ -11,9 +11,9 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + // ov::element::f16 }; const std::vector modes = { @@ -21,7 +21,7 @@ const std::vector modes = { ov::op::v0::DepthToSpace::DepthToSpaceMode::DEPTH_FIRST }; -const std::vector inputShapesBS2 = { +const std::vector inputShapesBS2 = { {1, 4, 3, 3}, {2, 16, 5, 4} }; @@ -35,7 +35,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/src/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp index 45b1947bb37c57..b59fef754de46a 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp @@ -8,6 +8,7 @@ #include #include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" +#include "openvino/op/depth_to_space.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp index dac9dab615d69d..c37e35941f43e7 100755 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp @@ -37,7 +37,7 @@ std::string ConvolutionTransformation::getTestCaseName(const testing::TestParamI } void ConvolutionTransformation::SetUp() { - threshold = 0.1f; + rel_threshold = 0.1f; ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp index f4949d770044d9..5cc7f96e838565 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp @@ -36,7 +36,7 @@ std::string FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation::getTe } void FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation::SetUp() { - threshold = 0.1f; + rel_threshold = 0.1f; ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; @@ -52,7 +52,7 @@ void FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation::SetUp() { } TEST_P(FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index e625cc2bdbfe6c..7949506d03de9d 100644 --- a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp +++ b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -34,8 +34,7 @@ ov::pass::low_precision::LayerTransformation::Params LayerTransformationParamsNG } LayerTransformation::LayerTransformation() { - threshold = 0.05; - auto& configuration = GetConfiguration(); + rel_threshold = 0.05; configuration[PluginConfigInternalParams::KEY_LP_TRANSFORMS_MODE] = PluginConfigParams::YES; } From 376eb34eb5afd671eb62149defeaa608f3643a4a Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Thu, 14 Dec 2023 19:52:23 +0100 Subject: [PATCH 05/37] add init_input_shapes; remove GenerateInput --- .../depth_to_space_transformation.cpp | 2 +- .../concat_transformation.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 +- .../mat_mul_transformation.hpp | 2 +- .../mat_mul_with_constant_transformation.hpp | 2 +- .../output_layers.hpp | 2 +- .../output_layers_concat.hpp | 2 +- .../output_layers_concat_multi_channel.hpp | 2 +- .../prelu_transformation.hpp | 2 +- .../relu_transformation.hpp | 2 +- .../split_transformation.hpp | 2 +- .../squeeze_transformation.hpp | 2 +- .../unsqueeze_transformation.hpp | 2 +- .../variadic_split_transformation.hpp | 2 +- .../add_transformation.cpp | 9 +- .../assign_and_read_value_transformation.cpp | 4 +- .../batch_to_space_transformation.cpp | 2 +- .../clamp_transformation.cpp | 4 +- .../concat_transformation.cpp | 13 ++- .../concat_with_child_and_output.cpp | 4 +- ...t_with_different_precision_on_children.cpp | 6 +- ...oncat_with_intermediate_transformation.cpp | 15 ++- ...at_with_neighbors_graph_transformation.cpp | 8 +- .../concat_with_split_transformation.cpp | 9 +- ...nvolution_backprop_data_transformation.cpp | 8 +- .../convolution_qdq_transformation.cpp | 2 + .../convolution_transformation.cpp | 2 + .../convolution_with_incorrect_weights.cpp | 6 +- .../depth_to_space_transformation.cpp | 4 +- ...ntwise_branch_selection_transformation.cpp | 4 +- ...eliminate_fake_quantize_transformation.cpp | 6 +- ...e_quantize_and_avg_pool_transformation.cpp | 6 +- ...e_quantize_and_max_pool_transformation.cpp | 4 +- ...d_two_output_branches_with_convolution.cpp | 2 + ...ize_precision_selection_transformation.cpp | 4 +- .../fake_quantize_transformation.cpp | 4 +- ...ize_with_dq_not_optimal_transformation.cpp | 4 +- .../fully_connected_transformation.cpp | 4 +- .../fuse_convert_transformation.cpp | 4 +- ...antize_to_fake_quantize_transformation.cpp | 4 +- ...uantize_and_scale_shift_transformation.cpp | 4 +- ...ltiply_to_fake_quantize_transformation.cpp | 4 +- ...btract_to_fake_quantize_transformation.cpp | 4 +- .../gather_transformation.cpp | 4 +- .../gemm_transformation.cpp | 4 +- .../group_convolution_transformation.cpp | 4 +- .../groupconvolution_qdq_transformation.cpp | 2 + .../interpolate_transformation.cpp | 6 +- .../mat_mul_transformation.cpp | 6 +- .../mat_mul_with_constant_transformation.cpp | 6 +- .../mat_mul_with_optimized_constant_fq.cpp | 6 +- .../move_fake_quantize_transformation.cpp | 19 ++++ ...ly_to_group_convolution_transformation.cpp | 2 + .../multiply_transformation.cpp | 23 +++- ...ultiply_with_one_parent_transformation.cpp | 6 +- .../mvn_transformation.cpp | 4 +- .../normalize_transformation.cpp | 6 +- .../output_layers_concat.cpp | 14 ++- .../output_layers_concat_multi_channel.cpp | 10 +- ...put_layers_handling_in_transformations.cpp | 7 +- .../pad_transformation.cpp | 4 +- .../prelu_transformation.cpp | 7 +- ..._through_dequantization_transformation.cpp | 2 + .../recurrent_cell_transformation.cpp | 5 +- .../reduce_max_transformation.cpp | 4 +- .../reduce_mean_transformation.cpp | 4 +- .../reduce_min_transformation.cpp | 4 +- .../reduce_sum_transformation.cpp | 4 +- .../relu_transformation.cpp | 6 +- .../reshape_transformation.cpp | 4 +- .../shuffle_channels_transformation.cpp | 2 + .../space_to_batch_transformation.cpp | 4 +- .../split_transformation.cpp | 6 +- .../squeeze_transformation.cpp | 6 +- .../strided_slice_transformation.cpp | 4 +- ...ultiply_to_multiply_add_transformation.cpp | 4 +- .../subtract_transformation.cpp | 4 +- .../transpose_after_matmul_transformation.cpp | 4 +- .../transpose_transformation.cpp | 4 +- .../unsqueeze_transformation.cpp | 6 +- .../variadic_split_transformation.cpp | 6 +- .../layer_transformation.hpp | 19 +++- .../layer_transformation.cpp | 107 +++++++++++++++++- 86 files changed, 447 insertions(+), 90 deletions(-) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp index 58007f088d7a4c..707006f1207921 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp @@ -21,7 +21,7 @@ const std::vector modes = { ov::op::v0::DepthToSpace::DepthToSpaceMode::DEPTH_FIRST }; -const std::vector inputShapesBS2 = { +const std::vector inputShapesBS2 = { {1, 4, 3, 3}, {2, 16, 5, 4} }; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp index da93245b4fe0a4..0d9adc9fbd9926 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp @@ -34,7 +34,7 @@ class ConcatTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp index 4baadf52c0a62d..e2e24fedce4351 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp @@ -31,7 +31,7 @@ class ConcatWithDifferentChildrenTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp index a77069376562b0..1044c9cc2e3a64 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp @@ -25,7 +25,7 @@ class ConcatWithIntermediateTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp index fc55d9f2ec6b4a..501026333ef830 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp @@ -22,7 +22,7 @@ class ConcatWithNeighborsGraphTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp index 43f0491dc89305..148dbf63addce0 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp @@ -29,7 +29,7 @@ class ConcatWithSplitTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp index df874642636bcd..acf379ae885282 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp @@ -34,7 +34,7 @@ class MatMulTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp index fcf2860f4b20d7..173a73ab17abfb 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp @@ -40,7 +40,7 @@ class MatMulWithConstantTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers.hpp index 9f7da614c30462..980e4f172a29c0 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers.hpp @@ -16,7 +16,7 @@ class OutputLayers : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat.hpp index f111bbfa1fc2fd..a8dc8131c28104 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat.hpp @@ -16,7 +16,7 @@ class OutputLayersConcat : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat_multi_channel.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat_multi_channel.hpp index 48c4a33d79f7d6..6fe87b3695aa69 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat_multi_channel.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat_multi_channel.hpp @@ -23,7 +23,7 @@ class OutputLayersConcatMultiChannel : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp index d0256c905685e2..f71262c97b79b1 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp @@ -28,7 +28,7 @@ class PReluTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp index 25219937997769..d0b1279838dc6e 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp @@ -28,7 +28,7 @@ class ReluTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp index 5fede273161e71..289c2d0c050494 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp @@ -28,7 +28,7 @@ class SplitTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; protected: void SetUp() override; }; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp index 0a5579d13d68bd..47f5d3fd80aaf3 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp @@ -32,7 +32,7 @@ class SqueezeTransformation : public testing::WithParamInterface, public LayerTestsUtils::LayerTransformation { public: - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; static std::string getTestCaseName(const testing::TestParamInfo& obj); protected: diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp index 0d726ee4eda42b..87978f84f0219a 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp @@ -30,7 +30,7 @@ class UnsqueezeTransformation : public testing::WithParamInterface, public LayerTestsUtils::LayerTransformation { public: - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; static std::string getTestCaseName(const testing::TestParamInfo& obj); protected: diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp index 11b0b67e1e9ed1..d63bea4ee80f2f 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp @@ -28,7 +28,7 @@ class VariadicSplitTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; + //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; protected: void SetUp() override; }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp index 3faf532bdebfaa..ed31350a73cf20 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp @@ -58,6 +58,13 @@ void AddTransformation::SetUp() { AddTestValues param; std::tie(precision, inputShape, targetDevice, param) = this->GetParam(); + ov::PartialShape inputShape2 = inputShape; + if (param.broadcast) { + inputShape2[2] = 1; + inputShape2[3] = 1; + } + init_input_shapes({ inputShape, inputShape2 }); + function = ngraph::builder::subgraph::AddFunction::getOriginal( precision, inputShape, param.broadcast, param.fakeQuantize1, param.fakeQuantize2); @@ -66,7 +73,7 @@ void AddTransformation::SetUp() { } TEST_P(AddTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp index 2c55bd00187bd6..8cf411f0985938 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp @@ -35,6 +35,8 @@ void AssignAndReadValueTransformation::SetUp() { AssignAndReadValueTransformationParam param; std::tie(netPrecision, inputShape, opset, targetDevice, params, param) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::AssignAndReadValueFunction::getOriginal( netPrecision, inputShape, @@ -43,7 +45,7 @@ void AssignAndReadValueTransformation::SetUp() { } TEST_P(AssignAndReadValueTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp index 5e6f42437a591a..5fc69ace73fd1c 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp @@ -53,7 +53,7 @@ void BatchToSpaceTransformation::run() { } TEST_P(BatchToSpaceTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp index 8f14935ee8ba95..7329d47b1088f2 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp @@ -35,6 +35,8 @@ void ClampTransformation::SetUp() { ClampTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::ClampFunction::getOriginal( netPrecision, inputShape, @@ -44,7 +46,7 @@ void ClampTransformation::SetUp() { } TEST_P(ClampTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp index 392b14b2416587..dd41a01aa6d413 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp @@ -34,6 +34,7 @@ std::string ConcatTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); + std::vector inputs; + if (testValues.input_constant1 == nullptr) { + inputs.push_back(inputShape); + } + if (testValues.input_constant2 == nullptr) { + inputs.push_back(inputShape); + } + init_input_shapes(inputs); + function = ngraph::builder::subgraph::ConcatFunction::getOriginal( precision, inputShape, @@ -63,7 +74,7 @@ void ConcatTransformation::SetUp() { } TEST_P(ConcatTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp index adbef1bcbf7aea..b91fa595006c97 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp @@ -52,12 +52,14 @@ void ConcatWithChildAndOutputTransformation::SetUp() { ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShapes, targetDevice, param, params) = this->GetParam(); + init_input_shapes({ inputShapes, inputShapes }); + function = ngraph::builder::subgraph::ConcatFunction::getOriginalWithChildAndOutput( netPrecision, inputShapes, param.fqOnData1, param.fqOnData2); } TEST_P(ConcatWithChildAndOutputTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp index 0114a1ed06c1aa..df1759770dbdf5 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp @@ -35,6 +35,7 @@ std::string ConcatWithDifferentChildrenTransformation::getTestCaseName(const tes return result.str(); } +#if 0 InferenceEngine::Blob::Ptr ConcatWithDifferentChildrenTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { ngraph::element::Type netPrecision; ngraph::PartialShape inputShapes; @@ -46,6 +47,7 @@ InferenceEngine::Blob::Ptr ConcatWithDifferentChildrenTransformation::GenerateIn const float k = (info.name() == "input1") ? 1.f : (info.name() == "input2" ? 2.f : 3.f); return LayerTransformation::GenerateInput(ngraph::element::u8, info.getTensorDesc(), k); } +#endif void ConcatWithDifferentChildrenTransformation::SetUp() { ngraph::element::Type netPrecision; @@ -54,12 +56,14 @@ void ConcatWithDifferentChildrenTransformation::SetUp() { ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShapes, targetDevice, param, params) = this->GetParam(); + init_input_shapes({ inputShapes, inputShapes }); + function = ngraph::builder::subgraph::ConcatFunction::getOriginalWithDifferentPrecisionOnChildren( netPrecision, inputShapes, param.axis, param.fqOnData1, param.fqOnData2); } TEST_P(ConcatWithDifferentChildrenTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp index 55d9b7b6b2577f..c64e982b72d20c 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp @@ -37,6 +37,7 @@ std::string ConcatWithIntermediateTransformation::getTestCaseName(const testing: return result.str(); } +#if 0 InferenceEngine::Blob::Ptr ConcatWithIntermediateTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; @@ -49,6 +50,7 @@ InferenceEngine::Blob::Ptr ConcatWithIntermediateTransformation::GenerateInput(c const float k = (info.name() == "input1") ? 1.f : (info.name() == "input2" ? 2.f : 3.f); return LayerTransformation::GenerateInput(ngraph::element::u8, info.getTensorDesc(), k); } +#endif /* * FQ FQ @@ -66,6 +68,17 @@ void ConcatWithIntermediateTransformation::SetUp() { bool multichannel; std::tie(ngPrecision, inputShape, targetDevice, trasformationParams, transparentIntermediate, multichannel) = this->GetParam(); + ngraph::PartialShape inputShape1 = inputShape; + if (inputShape1[2].is_static() && transparentIntermediate) { + inputShape1[2] = inputShape1[2].get_length() - 2; + } + + if (inputShape1[3].is_static() && transparentIntermediate) { + inputShape1[3] = inputShape1[3].get_length() - 2; + } + + init_input_shapes({ inputShape1, inputShape }); + function = ngraph::builder::subgraph::ConcatFunction::getOriginalWithIntermediate( ngPrecision, inputShape, @@ -75,7 +88,7 @@ void ConcatWithIntermediateTransformation::SetUp() { } TEST_P(ConcatWithIntermediateTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp index b81799f933e242..2cba32c607f35a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp @@ -26,6 +26,7 @@ std::string ConcatWithNeighborsGraphTransformation::getTestCaseName(const testin return getTestCaseNameByParams(precision, inputShapes, targetDevice, params); } +#if 0 InferenceEngine::Blob::Ptr ConcatWithNeighborsGraphTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; @@ -39,14 +40,17 @@ InferenceEngine::Blob::Ptr ConcatWithNeighborsGraphTransformation::GenerateInput const float k = (info.name() == "input1") ? 1.f : (info.name() == "input2" ? 2.f : 3.f); return LayerTransformation::GenerateInput(ngraph::element::u8, info.getTensorDesc(), k); } +#endif void ConcatWithNeighborsGraphTransformation::SetUp() { - threshold = 2.e-2; + rel_threshold = 2.e-2; ngraph::element::Type ngPrecision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; std::tie(ngPrecision, inputShape, targetDevice, params) = this->GetParam(); + init_input_shapes({ inputShape, inputShape, inputShape }); + function = ngraph::builder::subgraph::ConcatFunction::getOriginalWithNeighbors( ngPrecision, inputShape, @@ -58,7 +62,7 @@ void ConcatWithNeighborsGraphTransformation::SetUp() { } TEST_P(ConcatWithNeighborsGraphTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp index c12ba682644daf..f4e6ed7822e56e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp @@ -32,6 +32,7 @@ std::string ConcatWithSplitTransformation::getTestCaseName(const testing::TestPa return result.str(); } +#if 0 InferenceEngine::Blob::Ptr ConcatWithSplitTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { ngraph::element::Type netPrecision; ngraph::PartialShape inputShapes; @@ -43,6 +44,7 @@ InferenceEngine::Blob::Ptr ConcatWithSplitTransformation::GenerateInput(const In const float k = (info.name() == "input1") ? 1.f : (info.name() == "input2" ? 2.f : 3.f); return LayerTransformation::GenerateInput(ngraph::element::u8, info.getTensorDesc(), k); } +#endif /* * FQ FQ @@ -59,6 +61,11 @@ void ConcatWithSplitTransformation::SetUp() { ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShapes, targetDevice, param, params) = this->GetParam(); + auto inputShape1 = inputShapes; + const size_t numSplit = 2; + inputShape1[1] = inputShape1[1].get_length() / numSplit; + init_input_shapes({ inputShape1, inputShapes }); + function = ngraph::builder::subgraph::ConcatFunction::getOriginalWithSplitedIntermediate( netPrecision, inputShapes, @@ -68,7 +75,7 @@ void ConcatWithSplitTransformation::SetUp() { } TEST_P(ConcatWithSplitTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp index 3f0a7265b20ff2..b4ed01d7519836 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -31,7 +31,7 @@ std::string ConvolutionBackpropDataTransformation::getTestCaseName(const testing } void ConvolutionBackpropDataTransformation::SetUp() { - threshold = 0.1f; + rel_threshold = 0.1f; ngraph::element::Type netPrecision; std::pair inputShapeAndHandling; @@ -40,9 +40,13 @@ void ConvolutionBackpropDataTransformation::SetUp() { ConvolutionBackpropDataTransformationParam param; std::tie(netPrecision, inputShapeAndHandling, outputShape, targetDevice, params, param) = this->GetParam(); + std::shared_ptr weights; const auto inputShape = inputShapeAndHandling.first; + + init_input_shapes(inputShape); + ngraph::Shape weightsShape(4, 1ul); weightsShape[0] = inputShape[1].get_length(); weightsShape[1] = inputShape[1].get_length() / 2; @@ -79,7 +83,7 @@ void ConvolutionBackpropDataTransformation::run() { } TEST_P(ConvolutionBackpropDataTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp index 7826af5087be2b..87d0e253e71beb 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp @@ -42,6 +42,8 @@ void ConvolutionQDqTransformation::SetUp() { ConvolutionQDqTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::FakeQuantizeAndConvolutionFunction::get( netPrecision, inputShape, diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp index c37e35941f43e7..357210e22a3f30 100755 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp @@ -45,6 +45,8 @@ void ConvolutionTransformation::SetUp() { ConvolutionTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::FakeQuantizeAndConvolutionFunction::get( netPrecision, inputShape, diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp index f4d1806ac47a57..4309d9403f40c3 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp @@ -37,7 +37,7 @@ std::string ConvolutionWIthIncorrectWeightsTransformation::getTestCaseName(const } void ConvolutionWIthIncorrectWeightsTransformation::SetUp() { - threshold = 0.1f; + rel_threshold = 0.1f; ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; @@ -45,6 +45,8 @@ void ConvolutionWIthIncorrectWeightsTransformation::SetUp() { ConvolutionWIthIncorrectWeightsParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::ConvolutionFunction::getOriginalWithIncorrectWeights( inputShape, netPrecision, @@ -54,7 +56,7 @@ void ConvolutionWIthIncorrectWeightsTransformation::SetUp() { } TEST_P(ConvolutionWIthIncorrectWeightsTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp index ef1348d619ce46..b53fbe87c97d40 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp @@ -56,6 +56,8 @@ void DepthToSpaceTransformation::SetUp() { size_t blockSize; std::tie(precision, inputShape, targetDevice, mode, blockSize) = this->GetParam(); + init_input_shapes(inputShape); + if (inputShape.rank().is_dynamic() || inputShape.rank().get_length() != 4) { IE_THROW() << "not supported input shape size " << inputShape.rank(); } @@ -64,7 +66,7 @@ void DepthToSpaceTransformation::SetUp() { } TEST_P(DepthToSpaceTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp index adf728b79851c8..e593216bb35618 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp @@ -54,6 +54,8 @@ void ElementwiseBranchSelectionTransformation::SetUp() { std::string elementwiseType; std::tie(precision, inputShape, targetDevice, param, elementwiseType) = this->GetParam(); + init_input_shapes({ inputShape, inputShape }); + function = ngraph::builder::subgraph::AddFunction::getOriginalSubgraphWithConvolutions( precision, inputShape, @@ -114,7 +116,7 @@ void ElementwiseBranchSelectionTransformation::run() { } TEST_P(ElementwiseBranchSelectionTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp index 855f1d25e02f9b..25914d341d2af4 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp @@ -32,6 +32,8 @@ void EliminateFakeQuantizeTransformation::SetUp() { EliminateFakeQuantizeTransformationTestValues testValues; std::tie(targetDevice, testValues) = this->GetParam(); + init_input_shapes(testValues.inputShape); + // Convolution is used in a model as operation with specific precision requirements on data branch // to test the transformation place in LPT pipeline: // markup transformations and FakeQuantize operation decomposition transformation have to handle FakeQuantize as usual @@ -46,8 +48,8 @@ void EliminateFakeQuantizeTransformation::SetUp() { } TEST_P(EliminateFakeQuantizeTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); - Run(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + run(); EliminateFakeQuantizeTransformationTestValues testValues; std::tie(targetDevice, testValues) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp index f8e69d84d4dec0..a1254c653d42b0 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp @@ -28,13 +28,15 @@ std::string FakeQuantizeAndAvgPoolTransformation::getTestCaseName(const testing: } void FakeQuantizeAndAvgPoolTransformation::SetUp() { - threshold = 0.5f; + rel_threshold = 0.5f; ngraph::element::Type precision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; std::tie(precision, inputShape, targetDevice, params, fakeQuantize) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::AvgPoolFunction::getOriginal( precision, inputShape, @@ -44,7 +46,7 @@ void FakeQuantizeAndAvgPoolTransformation::SetUp() { } TEST_P(FakeQuantizeAndAvgPoolTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp index 74725c0c965ac9..d25c7cbfa3c511 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp @@ -34,6 +34,8 @@ void FakeQuantizeAndMaxPoolTransformation::SetUp() { ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; std::tie(precision, inputShape, targetDevice, params, fakeQuantize) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::MaxPoolFunction::getOriginal( precision, inputShape, @@ -43,7 +45,7 @@ void FakeQuantizeAndMaxPoolTransformation::SetUp() { } TEST_P(FakeQuantizeAndMaxPoolTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp index 5cc7f96e838565..9306a484bb340e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp @@ -43,6 +43,8 @@ void FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation::SetUp() { FakeQuantizeAndTwoOutputBranchesWithConvolution testValues; std::tie(netPrecision, inputShape, targetDevice, params, testValues) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::FakeQuantizeAndTwoOutputBranchesWithConvolutionFunction::getOriginal( netPrecision, inputShape, diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp index 8507c678cd9a9b..c39b3560d4d2c1 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp @@ -35,6 +35,8 @@ void FakeQuantizePrecisionSelectionTransformation::SetUp() { FakeQuantizePrecisionSelectionTransformationTestValues testValues; std::tie(netPrecision, inputShape, targetDevice, params, testValues) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::FakeQuantizePrecisionSelectionFunction::getOriginal( netPrecision, inputShape, @@ -48,7 +50,7 @@ void FakeQuantizePrecisionSelectionTransformation::SetUp() { } TEST_P(FakeQuantizePrecisionSelectionTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp index f9848d5c3c7d32..9530eb4029e63a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp @@ -40,6 +40,8 @@ void FakeQuantizeTransformation::SetUp() { bool isConvertOnConstants; std::tie(netPrecision, inputShape, targetDevice, params, testParams, isConvertOnConstants) = this->GetParam(); + init_input_shapes(inputShape); + testParams.fakequantize.addConverts = isConvertOnConstants; function = ngraph::builder::subgraph::FakeQuantizeFunction::getOriginal( @@ -66,7 +68,7 @@ void FakeQuantizeTransformation::run() { } TEST_P(FakeQuantizeTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index 129d9fcf7c8764..d9f3253435e572 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -29,13 +29,15 @@ std::string FakeQuantizeWithNotOptimalTransformation::getTestCaseName(const test } void FakeQuantizeWithNotOptimalTransformation::SetUp() { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); ngraph::PartialShape inputShape; ngraph::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; FakeQuantizeWithNotOptimalTransformationTestValues testValues; std::tie(netPrecision, inputShape, targetDevice, params, testValues) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::FakeQuantizeAndConvolutionFunction::get( netPrecision, inputShape, diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp index 7beabbd522c785..f1c437e7297f7e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp @@ -44,6 +44,8 @@ void FullyConnectedTransformation::SetUp() { ov::pass::low_precision::LayerTransformation::Params params; std::tie(precision, shapes, targetDevice, params) = this->GetParam(); + init_input_shapes({ shapes.inputA, shapes.inputB }); + function = ngraph::builder::subgraph::MatMulFunction::getOriginal( precision, shapes.inputA, @@ -53,7 +55,7 @@ void FullyConnectedTransformation::SetUp() { } TEST_P(FullyConnectedTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp index 595d8b06ebfa53..72cd883d265afc 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp @@ -43,6 +43,8 @@ void FuseConvertTransformation::SetUp() { bool constInput; std::tie(precision, shape, targetDevice, deqOperations, constInput) = this->GetParam(); + init_input_shapes(constInput ? std::vector{ shape } : std::vector{ shape, shape }); + function = ngraph::builder::subgraph::FuseConvertFunction::getWithFQ( shape, precision, @@ -51,7 +53,7 @@ void FuseConvertTransformation::SetUp() { } TEST_P(FuseConvertTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.cpp index b814cb1ec4fecb..9b07ad1864c502 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.cpp @@ -36,6 +36,8 @@ void FuseDequantizeToFakeQuantizeTransformation::SetUp() { FuseDequantizeToFakeQuantizeTransformationTestValues testValues; std::tie(targetDevice, testValues) = this->GetParam(); + init_input_shapes(testValues.inputShape); + function = ngraph::builder::subgraph::FuseFakeQuantizeFunction::getOriginal( testValues.inputShape, testValues.actual.precisionBeforeAdd, @@ -48,7 +50,7 @@ void FuseDequantizeToFakeQuantizeTransformation::SetUp() { } TEST_P(FuseDequantizeToFakeQuantizeTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp index b8525a25817d79..f54defe0b624a6 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp @@ -34,6 +34,8 @@ void FuseFakeQuantizeAndScaleShiftTransformation::SetUp() { ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData; std::tie(netPrecision, inputShape, targetDevice, params, fakeQuantizeOnData) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::FuseFakeQuantizeAndScaleShiftFunction::getOriginal( netPrecision, inputShape, @@ -43,7 +45,7 @@ void FuseFakeQuantizeAndScaleShiftTransformation::SetUp() { } TEST_P(FuseFakeQuantizeAndScaleShiftTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp index 150ddebadddd31..0a3a5a24493fb7 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp @@ -30,6 +30,8 @@ void FuseMultiplyToFakeQuantizeTransformation::SetUp() { FuseMultiplyToFakeQuantizeTransformationTestValues testValues; std::tie(targetDevice, testValues) = this->GetParam(); + init_input_shapes(testValues.inputShape); + function = ngraph::builder::subgraph::FuseMultiplyToFakeQuantizeFunction::get( testValues.inputShape, testValues.actual.fakeQuantizeOnData, @@ -39,7 +41,7 @@ void FuseMultiplyToFakeQuantizeTransformation::SetUp() { } TEST_P(FuseMultiplyToFakeQuantizeTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp index db9fc21b08d74d..e17cbaacae9e0b 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp @@ -30,6 +30,8 @@ void FuseSubtractToFakeQuantizeTransformation::SetUp() { FuseSubtractToFakeQuantizeTransformationTestValues testValues; std::tie(targetDevice, testValues) = this->GetParam(); + init_input_shapes(testValues.inputShape); + function = ngraph::builder::subgraph::FuseSubtractToFakeQuantizeFunction::get( testValues.inputShape, testValues.actual.fakeQuantizeOnData, @@ -39,7 +41,7 @@ void FuseSubtractToFakeQuantizeTransformation::SetUp() { } TEST_P(FuseSubtractToFakeQuantizeTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/gather_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/gather_transformation.cpp index 8858cbdf1f2980..f9c49c012a3fe4 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/gather_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/gather_transformation.cpp @@ -38,6 +38,8 @@ void GatherTransformation::SetUp() { int opset_version; std::tie(precision, targetDevice, testValues, opset_version) = this->GetParam(); + init_input_shapes(testValues.inputShape); + function = ngraph::builder::subgraph::GatherFunction::getOriginal( testValues.inputShape, testValues.gatherIndicesShape, @@ -50,7 +52,7 @@ void GatherTransformation::SetUp() { } TEST_P(GatherTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp index 9b6c8fbe3bb300..37b1c832aee523 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp @@ -37,6 +37,8 @@ void GemmTransformation::SetUp() { ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShape, targetDevice, params) = this->GetParam(); + init_input_shapes({ inputShape, inputShape }); + const float low = 0.f; // params.precisionsOnActivations[0] == ngraph::element::u8 ? 0.f : -128.f; const float high = 255.f; // params.precisionsOnActivations[0] == ngraph::element::u8 ? 255.f : 127.f; @@ -48,7 +50,7 @@ void GemmTransformation::SetUp() { } TEST_P(GemmTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp index a620a0d1c1630d..3f72d179b54cb9 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp @@ -44,7 +44,7 @@ std::string GroupConvolutionTransformation::getTestCaseName(const testing::TestP } void GroupConvolutionTransformation::SetUp() { - threshold = 0.1f; + rel_threshold = 0.1f; ngraph::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; @@ -53,6 +53,8 @@ void GroupConvolutionTransformation::SetUp() { bool addPrecisionPreserved; std::tie(netPrecision, targetDevice, params, inputShapes, param, addPrecisionPreserved) = this->GetParam(); + init_input_shapes(inputShapes.first); + while (param.fakeQuantizeOnData.constantShape.size() > inputShapes.first.size()) { param.fakeQuantizeOnData.constantShape.pop_back(); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp index 35fa5bd9b5547a..85cf43a5164cf0 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -42,6 +42,8 @@ void GroupConvolutionQDqTransformation::SetUp() { GroupConvolutionQDqTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::FakeQuantizeAndConvolutionFunction::get( netPrecision, inputShape, diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp index c3ca18b5bf485c..82af45e34bf920 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp @@ -49,12 +49,14 @@ std::string InterpolateTransformation::getTestCaseName(const testing::TestParamI } void InterpolateTransformation::SetUp() { - SetRefMode(LayerTestsUtils::RefMode::IE); + //SetRefMode(LayerTestsUtils::RefMode::IE); ngraph::element::Type precision; std::pair shapes; interpAttributes attributes; std::tie(precision, shapes, targetDevice, attributes) = this->GetParam(); + init_input_shapes(shapes.first); + ov::op::v0::Interpolate::Attributes interpAttrs; interpAttrs.axes = attributes.axes; interpAttrs.mode = attributes.mode; @@ -67,7 +69,7 @@ void InterpolateTransformation::SetUp() { } TEST_P(InterpolateTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp index 8728d6acc1d5e0..8070b4addf56ff 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp @@ -38,6 +38,7 @@ std::string MatMulTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); + init_input_shapes({ testValues.inputShape1, testValues.inputShape2 }); + function = ngraph::builder::subgraph::MatMulFunction::getOriginal( precision, testValues.inputShape1, @@ -75,7 +79,7 @@ void MatMulTransformation::SetUp() { } void MatMulTransformation::run() { - SKIP_IF_CURRENT_TEST_IS_DISABLED() + //SKIP_IF_CURRENT_TEST_IS_DISABLED() LayerTransformation::run(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp index a4ed87a191daab..0ca11b2a3b7aa0 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -37,6 +37,7 @@ std::string MatMulWithConstantTransformation::getTestCaseName(const testing::Tes return result.str(); } +#if 0 InferenceEngine::Blob::Ptr MatMulWithConstantTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { if ((info.name() != "input1") && (info.name() != "input2")) { IE_THROW() << "unexpected layer name " << info.name(); @@ -56,12 +57,15 @@ InferenceEngine::Blob::Ptr MatMulWithConstantTransformation::GenerateInput(const return FuncTestUtils::createAndFillBlobConsistently(info.getTensorDesc(), high - low, low, 1ul); } +#endif void MatMulWithConstantTransformation::SetUp() { ngraph::element::Type precision; MatMulWithConstantTransformationTestValues testValues; std::tie(precision, targetDevice, testValues) = this->GetParam(); + init_input_shapes(testValues.inputShape); + function = ngraph::builder::subgraph::MatMulFunction::getOriginal( precision, testValues.inputShape, @@ -86,7 +90,7 @@ void MatMulWithConstantTransformation::run() { } TEST_P(MatMulWithConstantTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp index f807061e96c622..209aa66e56b39a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp @@ -40,7 +40,7 @@ std::string MatMulWithOptimizedConstantFq::getTestCaseName( } void MatMulWithOptimizedConstantFq::SetUp() { - threshold = 0.01f; + rel_threshold = 0.01f; ngraph::element::Type precision; std::pair shapes; @@ -48,6 +48,8 @@ void MatMulWithOptimizedConstantFq::SetUp() { MatMulWithOptimizedConstantFakeQuantizeTransformationTestValues param; std::tie(precision, shapes, targetDevice, param) = this->GetParam(); + init_input_shapes({ shapes.first, shapes.second }); + function = ngraph::builder::subgraph::MatMulWithOptimizedConstantFakeQuantizeFunction::getOriginal( precision, shapes.first, @@ -57,7 +59,7 @@ void MatMulWithOptimizedConstantFq::SetUp() { } TEST_P(MatMulWithOptimizedConstantFq, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp index c5fe45c5bdcbea..95c8d95cbc139f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp @@ -44,6 +44,25 @@ void MoveFakeQuantizeTransformation::SetUp() { MoveFakeQuantizeTransformationParam param; std::tie(netPrecision, inputShapes, targetDevice, params, oneInputWithSplit, param) = this->GetParam(); + if (oneInputWithSplit) { + auto newInputShape = inputShapes[0]; + int channels = 0; + bool channelsWasIdentified = false; + for (const auto inputShape : inputShapes) { + if (inputShape[param.axis].is_static()) { + channels += inputShape[param.axis].get_length(); + channelsWasIdentified = true; + } + } + + if (channelsWasIdentified) { + newInputShape[param.axis] = channels; + } + init_input_shapes(newInputShape); + } else { + init_input_shapes(inputShapes); + } + function = ngraph::builder::subgraph::MoveFakeQuantize::get( netPrecision, inputShapes, diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp index ae697d8ecab5b8..f3cb8ef5d8afbd 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp @@ -45,6 +45,8 @@ void MultiplyToGroupConvolutionTransformation::SetUp() { MultiplyToGroupConvolutionTransformationParam param; std::tie(precision, shape, targetDevice, param) = this->GetParam(); + init_input_shapes(shape); + function = ngraph::builder::subgraph::MultiplyToGroupConvolutionFunction::getOriginal( precision, shape, diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp index b290d808f4ce80..f6d517d570b16c 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp @@ -56,6 +56,27 @@ void MultiplyTransformation::SetUp() { MultiplyTestValues param; std::tie(precision, inputShape, targetDevice, param) = this->GetParam(); + auto inputShape1 = inputShape; + if (param.broadcast1) { + inputShape1[2] = 1; + inputShape1[3] = 1; + } + + ngraph::PartialShape inputShape2; + if (param.secondInputIsConstant) { + inputShape2 = {}; + } else { + inputShape2 = inputShape; + if (param.broadcast2) { + inputShape2[2] = 1; + inputShape2[3] = 1; + } + } + init_input_shapes( + param.secondInputIsConstant ? + std::vector{ inputShape1 } : + std::vector{ inputShape1, inputShape2 }); + function = ngraph::builder::subgraph::MultiplyPartialFunction::get( precision, inputShape, @@ -97,7 +118,7 @@ void MultiplyTransformation::run() { } TEST_P(MultiplyTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp index 4c8b6020c8449d..ffc6837a7f990f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp @@ -29,7 +29,7 @@ std::string MultiplyWithOneParentTransformation::getTestCaseName(const testing:: } void MultiplyWithOneParentTransformation::SetUp() { - threshold = 0.01f; + rel_threshold = 0.01f; ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; @@ -37,11 +37,13 @@ void MultiplyWithOneParentTransformation::SetUp() { MultiplyWithOneParentTransformationValues values; std::tie(netPrecision, inputShape, targetDevice, values) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::MultiplyWithOneParentFunction::getOriginal(netPrecision, inputShape, values.fakeQuantize); } TEST_P(MultiplyWithOneParentTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp index e28afed0f47de4..e8fd5bc8ba50fe 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp @@ -43,6 +43,8 @@ void MVNTransformation::SetUp() { bool normalizeVariance; std::tie(precision, shape, targetDevice, reductionAxes, normalizeVariance) = this->GetParam(); + init_input_shapes(shape); + function = ngraph::builder::subgraph::MVNFunction::getOriginal( precision, shape, @@ -51,7 +53,7 @@ void MVNTransformation::SetUp() { } TEST_P(MVNTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp index fda8edf0d18513..04fedcc899d022 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp @@ -44,7 +44,7 @@ std::string NormalizeL2Transformation::getTestCaseName(const testing::TestParamI } void NormalizeL2Transformation::SetUp() { - threshold = 3.e-3; + rel_threshold = 3.e-3; std::pair shapes; ngraph::element::Type precision; std::vector axes; @@ -52,6 +52,8 @@ void NormalizeL2Transformation::SetUp() { bool shift; std::tie(precision, shapes, targetDevice, axes, fuseMultiply, shift) = this->GetParam(); + init_input_shapes(shapes.first); + function = ngraph::builder::subgraph::NormalizeL2Function::getOriginal( precision, shapes, @@ -62,7 +64,7 @@ void NormalizeL2Transformation::SetUp() { } TEST_P(NormalizeL2Transformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp index 95fe14627c70d1..6b192777e10569 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp @@ -32,6 +32,7 @@ std::string OutputLayersConcat::getTestCaseName(const testing::TestParamInfo(low), 1ul); return input; } +#endif /* * FQ1 FQ2 @@ -69,6 +71,16 @@ void OutputLayersConcat::SetUp() { ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShape1, targetDevice, params) = this->GetParam(); + init_input_shapes({ + ov::PartialShape(inputShape1), + ov::PartialShape(std::vector({ + static_cast(inputShape1[0]), + static_cast(inputShape1[1] * 2ul), + static_cast(inputShape1[2]), + static_cast(inputShape1[3]) + })) + }); + auto ngPrecision = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); const auto input1 = std::make_shared(ngPrecision, ngraph::Shape(inputShape1)); @@ -123,7 +135,7 @@ void OutputLayersConcat::SetUp() { } TEST_P(OutputLayersConcat, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp index 732d93ddde145d..6d038025c501a9 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp @@ -40,6 +40,7 @@ std::string OutputLayersConcatMultiChannel::getTestCaseName( return getTestCaseNameByParams(netPrecision, inputShapes, targetDevice, params); } +#if 0 InferenceEngine::Blob::Ptr OutputLayersConcatMultiChannel::GenerateInput(const InferenceEngine::InputInfo &info) const { InferenceEngine::SizeVector inputShape; InferenceEngine::Precision netPrecision; @@ -59,6 +60,7 @@ InferenceEngine::Blob::Ptr OutputLayersConcatMultiChannel::GenerateInput(const I InferenceEngine::Blob::Ptr input = FuncTestUtils::createAndFillBlobConsistently(info.getTensorDesc(), hight - low, static_cast(low), 1ul); return input; } +#endif /* * FQ1 FQ2 @@ -74,13 +76,16 @@ InferenceEngine::Blob::Ptr OutputLayersConcatMultiChannel::GenerateInput(const I */ void OutputLayersConcatMultiChannel::SetUp() { - threshold = 0.05; + rel_threshold = 0.05; InferenceEngine::SizeVector inputShape1; InferenceEngine::Precision netPrecision; ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShape1, targetDevice, params) = this->GetParam(); + const InferenceEngine::SizeVector inputShape2 = { inputShape1[0], inputShape1[1] * 2ul, inputShape1[2], inputShape1[3] }; + init_input_shapes({ov::PartialShape(inputShape1), ov::PartialShape(inputShape1)}); + auto ngPrecision = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); const auto input1 = std::make_shared(ngPrecision, ngraph::Shape(inputShape1)); @@ -90,7 +95,6 @@ void OutputLayersConcatMultiChannel::SetUp() { fakeQuantize1->set_friendly_name("fakeQuantize1"); ASSERT_EQ(4ul, inputShape1.size()) << "unexpected input layout"; - const InferenceEngine::SizeVector inputShape2 = { inputShape1[0], inputShape1[1] * 2ul, inputShape1[2], inputShape1[3] }; const auto input2 = std::make_shared(ngPrecision, ngraph::Shape(inputShape2)); input2->set_friendly_name("input2"); @@ -115,7 +119,7 @@ void OutputLayersConcatMultiChannel::SetUp() { } TEST_P(OutputLayersConcatMultiChannel, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp index ea03aded58c1c8..ae8352d023c2d7 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp @@ -32,6 +32,7 @@ std::string OutputLayers::getTestCaseName(const testing::TestParamInfo(low), 1ul); return input; } +#endif void OutputLayers::SetUp() { InferenceEngine::SizeVector inputShape; InferenceEngine::Precision netPrecision; ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShape, targetDevice, params) = this->GetParam(); + + init_input_shapes(ov::PartialShape(inputShape)); + auto ngPrecision = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); const auto input = std::make_shared(ngPrecision, ngraph::Shape(inputShape)); @@ -91,7 +96,7 @@ void OutputLayers::SetUp() { } TEST_P(OutputLayers, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp index ed948960cc7436..b57266be7f4adb 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp @@ -37,6 +37,8 @@ void PadTransformation::SetUp() { PadTransformationParam param; std::tie(netPrecision, inputShape, mode, targetDevice, params, param) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::PadFunction::get( inputShape, netPrecision, @@ -58,7 +60,7 @@ void PadTransformation::run() { } TEST_P(PadTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp index eb28b5dbf5750c..1fa9cb919d6cd2 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp @@ -31,6 +31,7 @@ std::string PReluTransformation::getTestCaseName(const testing::TestParamInfo(fqOnData.empty() ? -12.5f : fqOnData.outputLowValues[0]), 1ul); } +#endif void PReluTransformation::SetUp() { ngraph::element::Type precision; @@ -52,13 +54,16 @@ void PReluTransformation::SetUp() { PReluTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::PReluFunction::getOriginal(inputShape, precision, testValues.fakeQuantize); ov::pass::InitNodeInfo().run_on_model(function); } TEST_P(PReluTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions + diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp index cbc0593a8a4b23..39e64801070ed6 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp @@ -51,6 +51,8 @@ void PullReshapeThroughDequantizationTransformation::SetUp() { PullReshapeThroughDequantizationTestValues testValues; std::tie(netPrecision, inputShape, targetDevice, params, elementwiseConstantShapes, testValues) = this->GetParam(); + init_input_shapes(inputShape); + // to prevent test cases increasing let's parameterize test by dequantization shape and // initialize values here if (!testValues.dequantizationOnWeights.subtract.empty()) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp index d2b3cbe529c13e..97a055944853ec 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp @@ -45,6 +45,8 @@ void RecurrentCellTransformation::SetUp() { std::tie(precision, activations_shapes, weights_shapes, targetDevice, params, param) = this->GetParam(); + init_input_shapes(activations_shapes); + function = ngraph::builder::subgraph::RecurrentCellFunction::get(precision, activations_shapes, weights_shapes, @@ -72,9 +74,10 @@ void RecurrentCellTransformation::SetUp() { void RecurrentCellTransformation::run() { LayerTransformation::run(); +#if 0 if (!executableNetwork) return; - +#endif const auto params = std::get<5>(GetParam()); const auto actualPrecision = getRuntimePrecisionByType(params.layerName); auto expectedPrecision = params.expectedKernelType; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp index 67834c20133a63..fae8f1a2e5a7af 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp @@ -37,6 +37,8 @@ void ReduceMaxTransformation::SetUp() { ReduceMaxTransformationParam param;; std::tie(netPrecision, inputShape, targetDevice, params, param) = GetParam(); + init_input_shapes(inputShape); + ngraph::builder::subgraph::DequantizationOperations::Convert convert; ngraph::builder::subgraph::DequantizationOperations dequantizationBefore; ngraph::builder::subgraph::DequantizationOperations dequantizationAfter; @@ -61,7 +63,7 @@ void ReduceMaxTransformation::run() { } TEST_P(ReduceMaxTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp index 52c361e6ff30b7..0302dd3cfb8fa6 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp @@ -49,6 +49,8 @@ void ReduceMeanTransformation::SetUp() { ReduceMeanTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::ReduceFunction::get( netPrecision, inputShape, @@ -69,7 +71,7 @@ void ReduceMeanTransformation::run() { } TEST_P(ReduceMeanTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp index cfcd4f3457176f..913af494ea8f4a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp @@ -37,6 +37,8 @@ void ReduceMinTransformation::SetUp() { ReduceMinTransformationParam param;; std::tie(netPrecision, inputShape, targetDevice, params, param) = GetParam(); + init_input_shapes(inputShape); + ngraph::builder::subgraph::DequantizationOperations::Convert convert; ngraph::builder::subgraph::DequantizationOperations dequantizationBefore; ngraph::builder::subgraph::DequantizationOperations dequantizationAfter; @@ -61,7 +63,7 @@ void ReduceMinTransformation::run() { } TEST_P(ReduceMinTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp index a991df7350e2a4..aa9d4212ba80d0 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp @@ -37,6 +37,8 @@ void ReduceSumTransformation::SetUp() { ReduceSumTransformationParam param;; std::tie(netPrecision, inputShape, targetDevice, params, param) = GetParam(); + init_input_shapes(inputShape); + ngraph::builder::subgraph::DequantizationOperations::Convert convert; ngraph::builder::subgraph::DequantizationOperations dequantizationBefore; ngraph::builder::subgraph::DequantizationOperations dequantizationAfter; @@ -61,7 +63,7 @@ void ReduceSumTransformation::run() { } TEST_P(ReduceSumTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp index b0acf0f885852d..6d37367c7e1bb8 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp @@ -31,6 +31,7 @@ std::string ReluTransformation::getTestCaseName(const testing::TestParamInfo(fqOnData.empty() ? -12.5f : fqOnData.outputLowValues[0]), 1ul); } +#endif void ReluTransformation::SetUp() { ngraph::element::Type precision; @@ -52,13 +54,15 @@ void ReluTransformation::SetUp() { ReluTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::ReluFunction::getOriginal(inputShape, precision, testValues.fakeQuantize); ov::pass::InitNodeInfo().run_on_model(function); } TEST_P(ReluTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp index aa0dd1b7588cf5..88048845bdba34 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp @@ -39,6 +39,8 @@ void ReshapeTransformation::SetUp() { ReshapeTransformationParam param; std::tie(netPrecision, targetDevice, params, param) = this->GetParam(); + init_input_shapes(param.inputShape); + function = ngraph::builder::subgraph::ReshapeFunction::getOriginal( param.inputShape, param.reshapeConstValues, @@ -59,7 +61,7 @@ void ReshapeTransformation::run() { } TEST_P(ReshapeTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp index de5a85b89c3ae3..f96ec1793c7bef 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp @@ -39,6 +39,8 @@ void ShuffleChannelsTransformation::SetUp() { ShuffleChannelsTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::ShuffleChannelsFunction::getOriginal( netPrecision, inputShape, diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp index ae11a41b31f8a4..ef53f2c2ad3662 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp @@ -29,6 +29,8 @@ void SpaceToBatchTransformation::SetUp() { SpaceToBatchTransformationParam param; std::tie(input_type, targetDevice, param) = this->GetParam(); + init_input_shapes(param.input_shape); + function = ngraph::builder::subgraph::SpaceToBatchFunction::get( param.input_shape, input_type, @@ -53,7 +55,7 @@ void SpaceToBatchTransformation::run() { } TEST_P(SpaceToBatchTransformation, CompareWithRefImpl) { - SKIP_IF_CURRENT_TEST_IS_DISABLED(); + //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp index 161db8402514fb..4d607bb50fbadd 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp @@ -29,6 +29,7 @@ std::string SplitTransformation::getTestCaseName(const testing::TestParamInfo(fqOnData.empty() ? -12.5f : fqOnData.outputLowValues[0]), 1ul); } +#endif void SplitTransformation::SetUp() { ngraph::element::Type precision; @@ -52,6 +54,8 @@ void SplitTransformation::SetUp() { SplitTransformationParam param; std::tie(precision, inputShape, targetDevice, params, param) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::SplitFunction::getOriginal( precision, inputShape, @@ -61,6 +65,6 @@ void SplitTransformation::SetUp() { } TEST_P(SplitTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp index 4a6a22d4fdcee4..0baeae7088e516 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp @@ -29,6 +29,7 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector& valu return os; } +#if 0 InferenceEngine::Blob::Ptr SqueezeTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { ngraph::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; @@ -45,6 +46,7 @@ InferenceEngine::Blob::Ptr SqueezeTransformation::GenerateInput(const InferenceE static_cast(fqOnData.empty() ? -12.5f : fqOnData.outputLowValues[0]), 1ul); } +#endif std::string SqueezeTransformation::getTestCaseName(const testing::TestParamInfo& obj) { ngraph::element::Type netPrecision; @@ -69,6 +71,8 @@ void SqueezeTransformation::SetUp() { std::tie(netPrecision, targetDevice, params, squeezeParam) = this->GetParam(); + init_input_shapes(squeezeParam.shape); + function = ngraph::builder::subgraph::SqueezeFunction::getOriginal( netPrecision, squeezeParam.shape, @@ -79,7 +83,7 @@ void SqueezeTransformation::SetUp() { } TEST_P(SqueezeTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp index 7208df27695db4..89e1fb166134bc 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp @@ -47,6 +47,8 @@ void StridedSliceTransformation::SetUp() { StridedSliceTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::StridedSliceFunction::getOriginal( netPrecision, inputShape, @@ -62,7 +64,7 @@ void StridedSliceTransformation::SetUp() { } TEST_P(StridedSliceTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp index bfa10aa4b75b29..c7aa4a49b9bf8c 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp @@ -33,6 +33,8 @@ void SubtractMultiplyToMultiplyAddTransformation::SetUp() { SubtractMultiplyToMultiplyAddTransformationTestValues testValues; std::tie(targetDevice, testValues) = this->GetParam(); + init_input_shapes(testValues.inputShape); + function = ngraph::builder::subgraph::SubtractMultiplyToMultiplyAddFunction::getOriginal( testValues.inputShape, testValues.precision, @@ -40,7 +42,7 @@ void SubtractMultiplyToMultiplyAddTransformation::SetUp() { } TEST_P(SubtractMultiplyToMultiplyAddTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp index 1866315bffb0f0..4697f3a64428e9 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp @@ -33,11 +33,13 @@ void SubtractTransformation::SetUp() { ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShape, targetDevice, params) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::SubtractFunction::getOriginal(netPrecision, inputShape); } TEST_P(SubtractTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp index fa466880570f07..18580f6cfdabe0 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -45,11 +45,13 @@ void TransposeAfterMatMulTransformation::SetUp() { bool transposeChannelDim; std::tie(precision, inputShape, targetDevice, params, perTensor, transposeChannelDim) = this->GetParam(); + init_input_shapes({ inputShape, inputShape }); + function = ngraph::builder::subgraph::TransposeAfterMatMulFunction::getOriginal(precision, inputShape); } TEST_P(TransposeAfterMatMulTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_transformation.cpp index ef7fc3ba6f52f0..8c8c9f55ffb29a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_transformation.cpp @@ -35,6 +35,8 @@ void TransposeTransformation::SetUp() { TransposeTransformationTestValues testValues; std::tie(precision, targetDevice, testValues) = this->GetParam(); + init_input_shapes(testValues.inputShape); + function = ngraph::builder::subgraph::TransposeFunction::getOriginal( testValues.inputShape, testValues.transposeConstValues, @@ -43,7 +45,7 @@ void TransposeTransformation::SetUp() { } TEST_P(TransposeTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp index 3eb1626f23daf4..584cfb5422f9f3 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp @@ -29,6 +29,7 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector& valu return os; } +#if 0 InferenceEngine::Blob::Ptr UnsqueezeTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { ngraph::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; @@ -45,6 +46,7 @@ InferenceEngine::Blob::Ptr UnsqueezeTransformation::GenerateInput(const Inferenc static_cast(fqOnData.empty() ? -12.5f : fqOnData.outputLowValues[0]), 1ul); } +#endif std::string UnsqueezeTransformation::getTestCaseName(const testing::TestParamInfo& obj) { ngraph::element::Type netPrecision; @@ -69,6 +71,8 @@ void UnsqueezeTransformation::SetUp() { std::tie(netPrecision, targetDevice, params, unsqueezeParam) = this->GetParam(); + init_input_shapes(unsqueezeParam.shape); + function = ngraph::builder::subgraph::UnsqueezeFunction::getOriginal( netPrecision, unsqueezeParam.shape, @@ -79,7 +83,7 @@ void UnsqueezeTransformation::SetUp() { } TEST_P(UnsqueezeTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp index 4124c033807f4e..de842b7ddf87c1 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp @@ -36,6 +36,7 @@ std::string VariadicSplitTransformation::getTestCaseName(const testing::TestPara return result.str(); } +#if 0 InferenceEngine::Blob::Ptr VariadicSplitTransformation::GenerateInput(const InferenceEngine::InputInfo& info) const { ngraph::element::Type precision; ngraph::PartialShape inputShape; @@ -51,6 +52,7 @@ InferenceEngine::Blob::Ptr VariadicSplitTransformation::GenerateInput(const Infe static_cast(fqOnData.empty() ? -12.5f : fqOnData.outputLowValues[0]), 1ul); } +#endif void VariadicSplitTransformation::SetUp() { ngraph::element::Type precision; @@ -59,6 +61,8 @@ void VariadicSplitTransformation::SetUp() { VariadicSplitTransformationParam param; std::tie(precision, inputShape, targetDevice, params, param) = this->GetParam(); + init_input_shapes(inputShape); + function = ngraph::builder::subgraph::VariadicSplitFunction::getOriginal( precision, inputShape, @@ -68,6 +72,6 @@ void VariadicSplitTransformation::SetUp() { } TEST_P(VariadicSplitTransformation, CompareWithRefImpl) { - Run(); + run(); }; } // namespace LayerTestsDefinitions diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp index 83480d976d8714..032cb8a08ecd5a 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp @@ -33,12 +33,12 @@ class LayerTransformationParamsFactory : public LayerTransformationParamsNGraphF class LayerTransformation : virtual public ov::test::SubgraphBaseTest { protected: LayerTransformation(); - +#if 0 static InferenceEngine::Blob::Ptr GenerateInput( const ngraph::element::Type precision, const InferenceEngine::TensorDesc& tensorDesc, const float k = 1.f); - +#endif static std::pair getQuantizationInterval(const ngraph::element::Type precision); static std::string toString(const ov::pass::low_precision::LayerTransformation::Params& params); @@ -54,6 +54,21 @@ class LayerTransformation : virtual public ov::test::SubgraphBaseTest { const ngraph::PartialShape& inputShapes, const std::string& targetDevice, const ov::pass::low_precision::LayerTransformation::Params& params); + + // get runtime precision by operation friendly name + std::string getRuntimePrecision(const std::string& layerName); + + // get runtime precision by operation type + std::string getRuntimePrecisionByType(const std::string& layerType); + + // get runtime precision by operation friendly name which can be fused + std::string getRuntimePrecisionByFusedName(const std::string& layerName); + + std::map getRuntimeInfo(); + + void init_input_shapes(const ov::PartialShape& shape); + + void init_input_shapes(const std::vector& shapes); }; typedef std::tuple< diff --git a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index 7949506d03de9d..5d2a170e9b77bb 100644 --- a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp +++ b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -37,7 +37,7 @@ LayerTransformation::LayerTransformation() { rel_threshold = 0.05; configuration[PluginConfigInternalParams::KEY_LP_TRANSFORMS_MODE] = PluginConfigParams::YES; } - +#if 0 InferenceEngine::Blob::Ptr LayerTransformation::GenerateInput( const ngraph::element::Type precision, const InferenceEngine::TensorDesc& tensorDesc, @@ -48,6 +48,7 @@ InferenceEngine::Blob::Ptr LayerTransformation::GenerateInput( return FuncTestUtils::createAndFillBlobConsistently(tensorDesc, hight - low, static_cast(low), 1ul); } +#endif std::pair LayerTransformation::getQuantizationInterval(const ngraph::element::Type precision) { const bool unsignedInterval = precision == ngraph::element::u8; @@ -86,4 +87,108 @@ std::string LayerTransformation::getTestCaseNameByParams( return result.str(); } +std::string LayerTransformation::getRuntimePrecision(const std::string& layerName) { + const ov::CompiledModel& execNet = compiledModel; + const std::shared_ptr& function = execNet.get_runtime_model(); + const auto& execFunction = function; + + for (const auto& op : execFunction->get_ops()) { + const auto name = op->get_friendly_name(); + if (name == layerName) { + const auto& rtInfo = op->get_rt_info(); + const auto& it = rtInfo.find("runtimePrecision"); + IE_ASSERT(it != rtInfo.end()) << "Runtime precision is not found for node: " << name; + return it->second.as(); + } + } + + return ""; +} + +std::string LayerTransformation::getRuntimePrecisionByType(const std::string& layerType) { + const ov::CompiledModel& execNet = compiledModel; + const std::shared_ptr& function = execNet.get_runtime_model(); + const auto& execFunction = function; + + for (const auto& op : execFunction->get_ops()) { + const auto& rtInfo = op->get_rt_info(); + const auto& typeIt = rtInfo.find("layerType"); + + IE_ASSERT(typeIt != rtInfo.end()) << "Layer is not found for type: " << layerType; + + auto type = typeIt->second.as(); + if (type == layerType) { + const auto& it = rtInfo.find("runtimePrecision"); + IE_ASSERT(it != rtInfo.end()) << "Runtime precision is not found for node: " << type; + return it->second.as(); + } + } + + return ""; +} + +std::string LayerTransformation::getRuntimePrecisionByFusedName(const std::string& layerName) { + const ov::CompiledModel& execNet = compiledModel; + const std::shared_ptr& function = execNet.get_runtime_model(); + const auto& execFunction = function; + + const auto parse = [](const std::string& originalLayersNames) -> std::set { + std::set names; + + std::string tmp = originalLayersNames; + size_t beginPosition = 0ul; + size_t endPosition; + while ((endPosition = tmp.find(",", beginPosition)) != std::string::npos) { + names.insert(tmp.substr(beginPosition, endPosition - beginPosition)); + beginPosition = endPosition + 1; + } + + names.insert(tmp.substr(beginPosition, endPosition - beginPosition)); + return names; + }; + + for (const auto& op : execFunction->get_ops()) { + const auto& rtInfo = op->get_rt_info(); + + const auto& nameIt = rtInfo.find("originalLayersNames"); + IE_ASSERT(nameIt != rtInfo.end()) << "originalLayersNames is not found for node: " << layerName; + const auto fusedName = parse(nameIt->second.as()); + if (fusedName.find(layerName) == fusedName.end()) { + continue; + } + + const auto& it = rtInfo.find("runtimePrecision"); + IE_ASSERT(it != rtInfo.end()) << "runtimePrecision is not found for node: " << layerName; + const auto rtPrecisionPtr = it->second.as(); + return rtPrecisionPtr; + } + + return ""; +} + +std::map LayerTransformation::getRuntimeInfo() { + const ov::CompiledModel& execNet = compiledModel; + const std::shared_ptr& function = execNet.get_runtime_model(); + + std::map runtimeInfo; + for (const auto& op : function->get_ops()) { + runtimeInfo[op->get_friendly_name()] = op->get_rt_info(); + } + return runtimeInfo; +} + +void LayerTransformation::init_input_shapes(const ov::PartialShape& shape) { + std::pair> input_shapes(shape, { shape.to_shape() }); + SubgraphBaseTest::init_input_shapes({ input_shapes }); +} + +void LayerTransformation::init_input_shapes(const std::vector& shapes) { + std::vector input_shapes; + for (const auto& shape : shapes) { + std::pair> tmp_shapes(shape, { shape.to_shape() }); + input_shapes.push_back(tmp_shapes); + } + SubgraphBaseTest::init_input_shapes(input_shapes); +} + } // namespace LayerTestsUtils From b0edf3eba0710841617161a7f548baa0c455fc0b Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Fri, 15 Dec 2023 18:53:39 +0100 Subject: [PATCH 06/37] change generate FakeQuantize function, but it doesnt work --- .../src/base/utils/generate_inputs.cpp | 44 +++++++++++++++++++ .../include/common_test_utils/data_utils.hpp | 15 +++++++ .../common_test_utils/ov_tensor_utils.hpp | 6 +++ .../common_test_utils/src/ov_tensor_utils.cpp | 44 +++++++++++++++++++ 4 files changed, 109 insertions(+) diff --git a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp index 9c70fc47f3c2ff..2dc25a9e11ce65 100644 --- a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp +++ b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp @@ -2,6 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 // +#include + +#include +#include "ngraph/ops.hpp" #include "shared_test_classes/base/utils/generate_inputs.hpp" #include "openvino/op/ops.hpp" @@ -246,6 +250,8 @@ ov::Tensor generate(const std::shared_ptr& node, return ov::test::utils::create_and_fill_tensor(elemType, targetShape, inGenData); } +bool get_fq_scalar_range(const std::shared_ptr &node, float& min_value, float& max_value); + ov::Tensor generate(const std::shared_ptr& node, size_t port, const ov::element::Type& elemType, @@ -297,6 +303,18 @@ ov::Tensor generate(const std::shared_ptr& node, case 4: return ov::test::utils::create_tensor(elemType, targetShape, outputHighData, outputHighData.size()); default: { +#if 0 + std::cout << "[EMUTEX DEBUG] [generate] node " << node->get_friendly_name() << + " input shape " << node->get_input_shape(0) << + " output shape " << node->get_output_shape(0) << + " targetShape " << node->get_output_shape(0) << std::endl; +#endif + float min_value = {}, max_value = {}; + if (get_fq_scalar_range(node, min_value, max_value)) { +// std::cout << "[EMUTEX DEBUG] [CHECKPOINT]" << std::endl; + return ov::test::utils::create_and_fill_tensor_real_distribution(elemType, targetShape, min_value, max_value, 0); + } + InputGenerateData inGenData; inGenData.range = 10.f; inGenData.resolution = 1.0f; @@ -307,6 +325,32 @@ ov::Tensor generate(const std::shared_ptr& node, } } +bool get_const_scalar_value(const std::shared_ptr& node, float& value) { + auto const_node = ov::as_type_ptr(node); + if (!const_node) + return false; + + auto const_value = const_node->get_vector(); + // check if it is not scalar + if (const_value.size() > 1) + return false; + + value = const_value[0]; + return true; +} + +bool get_fq_scalar_range(const std::shared_ptr &node, float& min_value, float& max_value) { + if (!get_const_scalar_value(node->get_input_node_shared_ptr(1), min_value)) + return false; + + if (!get_const_scalar_value(node->get_input_node_shared_ptr(2), max_value)) + return false; + + //std::cout << "[EMUTEX DEBUG] [get_fq_scalar_range] min_value " << min_value << " max_value " << max_value << std::endl; + + return true; +} + ov::Tensor generate(const std::shared_ptr& node, size_t port, const ov::element::Type& elemType, diff --git a/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp b/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp index 28a26f4d754a12..b757e5ba5179f2 100644 --- a/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp +++ b/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp @@ -204,6 +204,21 @@ void inline fill_data_random(T* pointer, } } +template +void inline fill_data_ptr_real_random_float(T* pointer, + std::size_t size, + const float min, + const float max, + const int seed) { + std::mt19937 gen(seed); + std::uniform_real_distribution dist(min, max); + + for (std::size_t i = 0; i < size; i++) { + pointer[i] = static_cast(dist(gen)); + //std::cout << "pointer[" << i << "] " << pointer[i] << std::endl; + } +} + template void inline fill_data_random_act_dft(T* pointer, std::size_t size, diff --git a/src/tests/test_utils/common_test_utils/include/common_test_utils/ov_tensor_utils.hpp b/src/tests/test_utils/common_test_utils/include/common_test_utils/ov_tensor_utils.hpp index 57f8060e281f02..3c9d97eeb72822 100644 --- a/src/tests/test_utils/common_test_utils/include/common_test_utils/ov_tensor_utils.hpp +++ b/src/tests/test_utils/common_test_utils/include/common_test_utils/ov_tensor_utils.hpp @@ -71,6 +71,12 @@ ov::runtime::Tensor create_and_fill_tensor_consistently(const ov::element::Type const int32_t start_from, const int32_t resolution); +ov::runtime::Tensor create_and_fill_tensor_real_distribution(const ov::element::Type element_type, + const ov::Shape& shape, + const float min, + const float max, + const int seed); + void compare(const ov::Tensor& expected, const ov::Tensor& actual, const double abs_threshold = std::numeric_limits::max(), diff --git a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp index 2377ad37aaa2f4..fd45dfb6ae6f89 100644 --- a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp +++ b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp @@ -218,6 +218,50 @@ ov::runtime::Tensor create_and_fill_tensor_normal_distribution(const ov::element return tensor; } +ov::runtime::Tensor create_and_fill_tensor_real_distribution(const ov::element::Type element_type, + const ov::Shape& shape, + const float min, + const float max, + const int seed) { + auto tensor = ov::runtime::Tensor{element_type, shape}; +#define CASE(X) \ + case X: \ + fill_data_ptr_real_random_float(tensor.data::value_type>(), \ + shape_size(shape), \ + min, \ + max, \ + seed); \ + break; + switch (element_type) { + CASE(ov::element::Type_t::boolean) + CASE(ov::element::Type_t::i8) + CASE(ov::element::Type_t::i16) + CASE(ov::element::Type_t::i32) + CASE(ov::element::Type_t::i64) + CASE(ov::element::Type_t::u8) + CASE(ov::element::Type_t::u16) + CASE(ov::element::Type_t::u32) + CASE(ov::element::Type_t::u64) + CASE(ov::element::Type_t::bf16) + CASE(ov::element::Type_t::f16) + CASE(ov::element::Type_t::f32) + CASE(ov::element::Type_t::f64) + case ov::element::Type_t::u1: + case ov::element::Type_t::i4: + case ov::element::Type_t::u4: + fill_data_ptr_real_random_float(static_cast(tensor.data()), + tensor.get_byte_size(), + min, + max, + seed); + break; + default: + OPENVINO_THROW("Unsupported element type: ", element_type); + } +#undef CASE + return tensor; +} + ov::runtime::Tensor create_and_fill_tensor_consistently(const ov::element::Type element_type, const ov::Shape& shape, const uint32_t range, From f9666a704569488f2405a658a780cf24c028bba1 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Mon, 18 Dec 2023 17:55:04 +0100 Subject: [PATCH 07/37] added thresholds --- .../skip_tests_config.cpp | 2 + .../batch_to_space_transformation.cpp | 2 + .../concat_with_child_and_output.cpp | 2 + ...nvolution_backprop_data_transformation.cpp | 3 +- .../convolution_qdq_transformation.cpp | 3 +- .../convolution_transformation.cpp | 3 +- .../convolution_with_incorrect_weights.cpp | 3 +- ...eliminate_fake_quantize_transformation.cpp | 1 + ...d_two_output_branches_with_convolution.cpp | 4 +- ...ize_precision_selection_transformation.cpp | 2 + .../fake_quantize_transformation.cpp | 2 + ...antize_to_fake_quantize_transformation.cpp | 2 + .../group_convolution_transformation.cpp | 3 +- .../groupconvolution_qdq_transformation.cpp | 3 +- .../mat_mul_with_constant_transformation.cpp | 2 + .../mat_mul_with_optimized_constant_fq.cpp | 3 +- .../move_fake_quantize_transformation.cpp | 2 + .../multiply_transformation.cpp | 2 + ..._through_dequantization_transformation.cpp | 2 +- .../recurrent_cell_transformation.cpp | 2 + .../reduce_sum_transformation.cpp | 2 + .../layer_transformation.cpp | 3 +- .../common_test_utils/src/ov_tensor_utils.cpp | 43 +++++++++++++++++++ 23 files changed, 86 insertions(+), 10 deletions(-) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp index 53f3374a31ca1f..d452c95b185ec2 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp @@ -210,6 +210,8 @@ std::vector disabledTestPatterns() { R"(^smoke_Multinomial(?:Static|Dynamic)+(?:Log)*.*seed_g=0_seed_o=0.*device=CPU.*)", // Issue: 129025 R"(.*smoke_CpuExecNetworkCheck.*StreamsHasHigherPriorityThanLatencyHint.*)", + // Issue: 119648 + R"(.*smoke_LPT/InterpolateTransformation.*)", #if defined(OPENVINO_ARCH_ARM) // Issue: 126177 R"(.*smoke_CompareWithRefs_4D_Bitwise.*/EltwiseLayerCPUTest.*_eltwise_op_type=Bitwise.*_model_type=i32_.*)" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp index 5fc69ace73fd1c..8dbb0d10e8eb76 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp @@ -29,6 +29,8 @@ void BatchToSpaceTransformation::SetUp() { BatchToSpaceTransformationParam param; std::tie(input_type, targetDevice, param) = this->GetParam(); + init_input_shapes(param.input_shape); + function = ngraph::builder::subgraph::BatchToSpaceFunction::get( param.input_shape, input_type, diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp index b91fa595006c97..70ad770669359a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp @@ -46,6 +46,8 @@ std::string ConcatWithChildAndOutputTransformation::getTestCaseName(const testin */ void ConcatWithChildAndOutputTransformation::SetUp() { + rel_threshold = 1.1; + abs_threshold = 1.0e-6; ngraph::element::Type netPrecision; ngraph::PartialShape inputShapes; ConcatWithChildAndOutputTransformationParam param; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp index b4ed01d7519836..9f5a703b328b08 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -31,7 +31,8 @@ std::string ConvolutionBackpropDataTransformation::getTestCaseName(const testing } void ConvolutionBackpropDataTransformation::SetUp() { - rel_threshold = 0.1f; + rel_threshold = 1.0; + abs_threshold = 0.1; ngraph::element::Type netPrecision; std::pair inputShapeAndHandling; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp index 87d0e253e71beb..49458c231f4636 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp @@ -34,7 +34,8 @@ std::string ConvolutionQDqTransformation::getTestCaseName(const testing::TestPar } void ConvolutionQDqTransformation::SetUp() { - // threshold = 0.1f; + rel_threshold = 0.1; + abs_threshold = 12.8; ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp index 357210e22a3f30..f00de4b5709b21 100755 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp @@ -37,7 +37,8 @@ std::string ConvolutionTransformation::getTestCaseName(const testing::TestParamI } void ConvolutionTransformation::SetUp() { - rel_threshold = 0.1f; + rel_threshold = 1.0e+10; + abs_threshold = 1.4; ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp index 4309d9403f40c3..2f0b7a3ea43a55 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp @@ -37,7 +37,8 @@ std::string ConvolutionWIthIncorrectWeightsTransformation::getTestCaseName(const } void ConvolutionWIthIncorrectWeightsTransformation::SetUp() { - rel_threshold = 0.1f; + rel_threshold = 0.1; + abs_threshold = 1.0e-3; ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp index 25914d341d2af4..e4a6e2b9110dde 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp @@ -49,6 +49,7 @@ void EliminateFakeQuantizeTransformation::SetUp() { TEST_P(EliminateFakeQuantizeTransformation, CompareWithRefImpl) { //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + abs_threshold = 2.3; run(); EliminateFakeQuantizeTransformationTestValues testValues; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp index 9306a484bb340e..77e14b6aa8dc6d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp @@ -36,7 +36,9 @@ std::string FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation::getTe } void FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation::SetUp() { - rel_threshold = 0.1f; + rel_threshold = 0.1; + abs_threshold = 0.1; + ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp index c39b3560d4d2c1..b2edaf27a55a53 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp @@ -29,6 +29,8 @@ std::string FakeQuantizePrecisionSelectionTransformation::getTestCaseName(const } void FakeQuantizePrecisionSelectionTransformation::SetUp() { + abs_threshold = 0.01; + ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp index 9530eb4029e63a..e7fa979bf246a2 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp @@ -33,6 +33,8 @@ std::string FakeQuantizeTransformation::getTestCaseName(const testing::TestParam } void FakeQuantizeTransformation::SetUp() { + abs_threshold = 1.0e-3; + ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.cpp index 9b07ad1864c502..a4e167187f28f0 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.cpp @@ -33,6 +33,8 @@ std::string FuseDequantizeToFakeQuantizeTransformation::getTestCaseName(const te } void FuseDequantizeToFakeQuantizeTransformation::SetUp() { + abs_threshold = 0.1; + FuseDequantizeToFakeQuantizeTransformationTestValues testValues; std::tie(targetDevice, testValues) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp index 3f72d179b54cb9..b981c76b87b153 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp @@ -44,7 +44,8 @@ std::string GroupConvolutionTransformation::getTestCaseName(const testing::TestP } void GroupConvolutionTransformation::SetUp() { - rel_threshold = 0.1f; + rel_threshold = 0.1; + abs_threshold = 0.1; ngraph::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp index 85cf43a5164cf0..c646f3ea724101 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -34,7 +34,8 @@ std::string GroupConvolutionQDqTransformation::getTestCaseName(const testing::Te } void GroupConvolutionQDqTransformation::SetUp() { - // threshold = 0.1f; + abs_threshold = 153.7; + ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp index 0ca11b2a3b7aa0..252b545afd012f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -60,6 +60,8 @@ InferenceEngine::Blob::Ptr MatMulWithConstantTransformation::GenerateInput(const #endif void MatMulWithConstantTransformation::SetUp() { + abs_threshold = 1.0e-3; + ngraph::element::Type precision; MatMulWithConstantTransformationTestValues testValues; std::tie(precision, targetDevice, testValues) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp index 209aa66e56b39a..0b22395835e354 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp @@ -40,7 +40,8 @@ std::string MatMulWithOptimizedConstantFq::getTestCaseName( } void MatMulWithOptimizedConstantFq::SetUp() { - rel_threshold = 0.01f; + rel_threshold = 0.01; + abs_threshold = 1.7; ngraph::element::Type precision; std::pair shapes; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp index 95c8d95cbc139f..e7dd576fc96254 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp @@ -37,6 +37,8 @@ std::string MoveFakeQuantizeTransformation::getTestCaseName(testing::TestParamIn } void MoveFakeQuantizeTransformation::SetUp() { + abs_threshold = 1.1; + ngraph::element::Type netPrecision; std::vector inputShapes; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp index f6d517d570b16c..1aa6c0299b519b 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp @@ -51,6 +51,8 @@ std::string MultiplyTransformation::getTestCaseName(const testing::TestParamInfo } void MultiplyTransformation::SetUp() { + abs_threshold = 0.1; + ngraph::element::Type precision; ngraph::PartialShape inputShape; MultiplyTestValues param; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp index 39e64801070ed6..5277350925fe7b 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp @@ -42,7 +42,7 @@ std::string PullReshapeThroughDequantizationTransformation::getTestCaseName(cons } void PullReshapeThroughDequantizationTransformation::SetUp() { - // threshold = 0.1f; + abs_threshold = 1.0e-3; ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp index 97a055944853ec..73383c63848682 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp @@ -37,6 +37,8 @@ std::string RecurrentCellTransformation::getTestCaseName(testing::TestParamInfo< } void RecurrentCellTransformation::SetUp() { + abs_threshold = 1.0e-3; + ngraph::element::Type precision; std::vector activations_shapes; std::vector weights_shapes; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp index aa9d4212ba80d0..b7be98fba17a5b 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp @@ -31,6 +31,8 @@ std::string ReduceSumTransformation::getTestCaseName(const testing::TestParamInf } void ReduceSumTransformation::SetUp() { + abs_threshold = 1.0e-3; + ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index 5d2a170e9b77bb..24639641d1d1e1 100644 --- a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp +++ b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -34,7 +34,8 @@ ov::pass::low_precision::LayerTransformation::Params LayerTransformationParamsNG } LayerTransformation::LayerTransformation() { - rel_threshold = 0.05; + rel_threshold = 1.1; + abs_threshold = 1.0e-4; configuration[PluginConfigInternalParams::KEY_LP_TRANSFORMS_MODE] = PluginConfigParams::YES; } #if 0 diff --git a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp index fd45dfb6ae6f89..b81a0e4d9e38e2 100644 --- a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp +++ b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp @@ -391,6 +391,30 @@ void compare(const ov::Tensor& expected, if (!std::isnan(rel_threshold)) { std::cout << "[ COMPARATION ] abs_threshold: " << abs_threshold << std::endl; } +#if 0 + { + for (size_t i = 0; i < shape_size_cnt; ++i) { + if (actual_data[i] != expected_data[i]) { + std::cout << i << ". " << actual_data[i] << " " << expected_data[i] << " " << actual_data[i] - expected_data[i] + << std::endl; + } + } +#endif +#if 0 + // TODO: debug + std::cout << std::endl << "actual:" << std::endl; + for (size_t i = 0; i < shape_size_cnt; ++i) { + std::cout << actual_data[i] << " "; + } + std::cout << std::endl << std::endl; + + std::cout << std::endl << "expected:" << std::endl; + for (size_t i = 0; i < shape_size_cnt; ++i) { + std::cout << expected_data[i] << " "; + } + std::cout << std::endl << std::endl; + } +#endif Error abs_error(abs_threshold), rel_error(rel_threshold); for (size_t i = 0; i < shape_size_cnt; ++i) { @@ -406,8 +430,18 @@ void compare(const ov::Tensor& expected, out_stream << "Actual value is NAN on coordinate: " << i; throw std::runtime_error(out_stream.str()); } + + if (expected_value == 0.0 || actual_value == 0.0) + continue; + double abs = std::fabs(expected_value - actual_value); double rel = expected_value ? (abs / std::fabs(expected_value)) : abs; + + if (rel >= 1.0 || abs > 1.0e-3) { + std::cout << i << ". rel " << rel << " abs " << abs << " expected_value " << expected_value << " actual_value " << actual_value << std::endl; + //continue; + } + abs_error.update(abs, i); rel_error.update(rel, i); } @@ -424,6 +458,15 @@ void compare(const ov::Tensor& expected, << rel_error.mean << "; rel threshold " << rel_threshold; throw std::runtime_error(out_stream.str()); } +#if 0 + { + std::cout << "\n\t abs_max: " << abs_error.max << "\n\t\t coordinate " << abs_error.max_coordinate + << "; abs errors count " << abs_error.count << "; abs mean " << abs_error.mean << "; abs threshold " + << abs_threshold << "\n\t rel_max: " << rel_error.max << "\n\t\t coordinate " + << rel_error.max_coordinate << "; rel errors count " << rel_error.count << "; rel mean " + << rel_error.mean << "; rel threshold " << rel_threshold << std::endl; + } +#endif } void compare(const ov::Tensor& expected, From 7bb472f21bc325f597c2d41db5eba706e9050520 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Mon, 18 Dec 2023 18:18:35 +0100 Subject: [PATCH 08/37] fix thresholds gpu func tests --- .../functional/shared_tests_instances/skip_tests_config.cpp | 2 ++ .../convolution_backprop_data_transformation.cpp | 2 +- .../fake_quantize_with_dq_not_optimal_transformation.cpp | 1 + .../fuse_convert_transformation.cpp | 1 + .../src/low_precision_transformations/output_layers_concat.cpp | 2 ++ 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/skip_tests_config.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/skip_tests_config.cpp index 70d0ee093e2b26..d24d4ae184c54a 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/skip_tests_config.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/skip_tests_config.cpp @@ -58,6 +58,8 @@ std::vector disabledTestPatterns() { R"(.*CachingSupportCase.*LoadNetworkCacheTestBase.*CompareWithRefImpl.*)", // Issue: 124060 R"(.*smoke_GridSample/GridSampleLayerTest.Inference/.*model_type=f16.*)", + // Issue: 119648 + R"(.*smoke_LPT/InterpolateTransformation.*)", #if defined(_WIN32) R"(.*KernelCachingSupportCase.*CanCreateCacheDirAndDumpBinariesUnicodePath.*)", #endif diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp index 9f5a703b328b08..1af677156cdb4b 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -32,7 +32,7 @@ std::string ConvolutionBackpropDataTransformation::getTestCaseName(const testing void ConvolutionBackpropDataTransformation::SetUp() { rel_threshold = 1.0; - abs_threshold = 0.1; + abs_threshold = 1.0; ngraph::element::Type netPrecision; std::pair inputShapeAndHandling; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index d9f3253435e572..0ceb82221cc796 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -29,6 +29,7 @@ std::string FakeQuantizeWithNotOptimalTransformation::getTestCaseName(const test } void FakeQuantizeWithNotOptimalTransformation::SetUp() { + abs_threshold = 1.0e-3; //SKIP_IF_CURRENT_TEST_IS_DISABLED(); ngraph::PartialShape inputShape; ngraph::element::Type netPrecision; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp index 72cd883d265afc..ac7160c930fb92 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp @@ -37,6 +37,7 @@ std::string FuseConvertTransformation::getTestCaseName(const testing::TestParamI } void FuseConvertTransformation::SetUp() { + abs_threshold = 0.01; ngraph::PartialShape shape; ngraph::element::Type precision; ngraph::builder::subgraph::DequantizationOperations deqOperations; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp index 6b192777e10569..6d7ddbf5de9f03 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp @@ -66,6 +66,8 @@ InferenceEngine::Blob::Ptr OutputLayersConcat::GenerateInput(const InferenceEngi */ void OutputLayersConcat::SetUp() { + abs_threshold = 4.1; + InferenceEngine::SizeVector inputShape1; InferenceEngine::Precision netPrecision; ov::pass::low_precision::LayerTransformation::Params params; From c9f4b47ed2af16a8a652452dfa28bb05d1a726cd Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Tue, 19 Dec 2023 19:42:08 +0100 Subject: [PATCH 09/37] fix cast_vector cpu_func_tests --- .../recurrent_cell_transformation.cpp | 2 +- .../low_precision_transformations/subtract_transformation.cpp | 1 + .../shared_test_classes/src/base/utils/generate_inputs.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp index 73383c63848682..818bfee55b3937 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp @@ -37,7 +37,7 @@ std::string RecurrentCellTransformation::getTestCaseName(testing::TestParamInfo< } void RecurrentCellTransformation::SetUp() { - abs_threshold = 1.0e-3; + abs_threshold = 0.01; ngraph::element::Type precision; std::vector activations_shapes; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp index 4697f3a64428e9..0cf4cd0834f339 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp @@ -28,6 +28,7 @@ std::string SubtractTransformation::getTestCaseName(const testing::TestParamInfo } void SubtractTransformation::SetUp() { + abs_threshold = 0.1; ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp index 2dc25a9e11ce65..234a2993ff15f8 100644 --- a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp +++ b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp @@ -330,7 +330,7 @@ bool get_const_scalar_value(const std::shared_ptr& node, float& value) if (!const_node) return false; - auto const_value = const_node->get_vector(); + auto const_value = const_node->cast_vector(); // check if it is not scalar if (const_value.size() > 1) return false; From 404d62f0f90fe588cb07003bd85dcf9829afa0ec Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Tue, 19 Dec 2023 20:50:56 +0100 Subject: [PATCH 10/37] generate_inputs for non-scalar; fix thresholds --- .../add_transformation.cpp | 2 ++ .../batch_to_space_transformation.cpp | 2 ++ .../clamp_transformation.cpp | 2 ++ .../concat_transformation.cpp | 3 ++ .../concat_with_child_and_output.cpp | 5 +-- ...t_with_different_precision_on_children.cpp | 2 ++ ...oncat_with_intermediate_transformation.cpp | 2 ++ ...at_with_neighbors_graph_transformation.cpp | 3 +- .../concat_with_split_transformation.cpp | 3 ++ ...nvolution_backprop_data_transformation.cpp | 4 +-- .../convolution_with_incorrect_weights.cpp | 2 +- ...e_quantize_and_avg_pool_transformation.cpp | 1 + ...e_quantize_and_max_pool_transformation.cpp | 1 + ...ize_with_dq_not_optimal_transformation.cpp | 3 +- .../fully_connected_transformation.cpp | 2 ++ ...uantize_and_scale_shift_transformation.cpp | 1 + .../gemm_transformation.cpp | 2 ++ .../mat_mul_transformation.cpp | 2 ++ .../mat_mul_with_optimized_constant_fq.cpp | 2 +- .../mvn_transformation.cpp | 1 + .../normalize_transformation.cpp | 4 ++- .../pad_transformation.cpp | 1 + .../reduce_mean_transformation.cpp | 1 + .../reduce_sum_transformation.cpp | 2 +- .../relu_transformation.cpp | 1 + .../space_to_batch_transformation.cpp | 1 + .../split_transformation.cpp | 1 + .../squeeze_transformation.cpp | 1 + .../strided_slice_transformation.cpp | 1 + .../transpose_after_matmul_transformation.cpp | 1 + .../unsqueeze_transformation.cpp | 2 ++ .../variadic_split_transformation.cpp | 1 + .../src/base/utils/generate_inputs.cpp | 31 +++++++++++++++---- 33 files changed, 77 insertions(+), 16 deletions(-) diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp index ed31350a73cf20..685d52db9d632a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp @@ -53,6 +53,8 @@ std::string AddTransformation::getTestCaseName(const testing::TestParamInfo< Add } void AddTransformation::SetUp() { + abs_threshold = 1.1; + rel_threshold = 3; ngraph::element::Type precision; ngraph::PartialShape inputShape; AddTestValues param; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp index 8dbb0d10e8eb76..d2de74faf1cc18 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp @@ -25,6 +25,8 @@ std::string BatchToSpaceTransformation::getTestCaseName(const testing::TestParam } void BatchToSpaceTransformation::SetUp() { + abs_threshold = 0.1; + ngraph::element::Type input_type; BatchToSpaceTransformationParam param; std::tie(input_type, targetDevice, param) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp index 7329d47b1088f2..756d2a2640670d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp @@ -29,6 +29,8 @@ std::string ClampTransformation::getTestCaseName(const testing::TestParamInfo inputShapeAndHandling; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp index 2f0b7a3ea43a55..39350033c860b2 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp @@ -38,7 +38,7 @@ std::string ConvolutionWIthIncorrectWeightsTransformation::getTestCaseName(const void ConvolutionWIthIncorrectWeightsTransformation::SetUp() { rel_threshold = 0.1; - abs_threshold = 1.0e-3; + abs_threshold = 16.1; ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp index a1254c653d42b0..b8287b08f26b99 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp @@ -29,6 +29,7 @@ std::string FakeQuantizeAndAvgPoolTransformation::getTestCaseName(const testing: void FakeQuantizeAndAvgPoolTransformation::SetUp() { rel_threshold = 0.5f; + abs_threshold = 1.0; ngraph::element::Type precision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp index d25c7cbfa3c511..a4b7b181613cca 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp @@ -28,6 +28,7 @@ std::string FakeQuantizeAndMaxPoolTransformation::getTestCaseName(const testing: } void FakeQuantizeAndMaxPoolTransformation::SetUp() { + abs_threshold = 1.0; ngraph::element::Type precision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index 0ceb82221cc796..87e0019d1ff6f8 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -29,7 +29,8 @@ std::string FakeQuantizeWithNotOptimalTransformation::getTestCaseName(const test } void FakeQuantizeWithNotOptimalTransformation::SetUp() { - abs_threshold = 1.0e-3; + abs_threshold = 4; + rel_threshold = 2778; //SKIP_IF_CURRENT_TEST_IS_DISABLED(); ngraph::PartialShape inputShape; ngraph::element::Type netPrecision; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp index f1c437e7297f7e..64423a4c9893c3 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp @@ -39,6 +39,8 @@ std::string FullyConnectedTransformation::getTestCaseName(const testing::TestPar } void FullyConnectedTransformation::SetUp() { + abs_threshold = 0.6; + ngraph::element::Type precision; MatMulShapes shapes; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp index f54defe0b624a6..1322cd390196cd 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp @@ -28,6 +28,7 @@ std::string FuseFakeQuantizeAndScaleShiftTransformation::getTestCaseName(const t } void FuseFakeQuantizeAndScaleShiftTransformation::SetUp() { + abs_threshold = 1.8; ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp index 37b1c832aee523..ab81c7a94c9dac 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp @@ -32,6 +32,8 @@ std::string GemmTransformation::getTestCaseName(const testing::TestParamInfo shapes; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp index e8fd5bc8ba50fe..b61ac53e41bf63 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp @@ -37,6 +37,7 @@ std::string MVNTransformation::getTestCaseName(const testing::TestParamInfo shapes; ngraph::element::Type precision; std::vector axes; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp index b57266be7f4adb..d00d29c4d18785 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp @@ -30,6 +30,7 @@ std::string PadTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp index 4d607bb50fbadd..4b91ad512c4f13 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp @@ -48,6 +48,7 @@ InferenceEngine::Blob::Ptr SplitTransformation::GenerateInput(const InferenceEng #endif void SplitTransformation::SetUp() { + abs_threshold = 0.2; ngraph::element::Type precision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp index 0baeae7088e516..e4d08755f0bddd 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp @@ -65,6 +65,7 @@ std::string SqueezeTransformation::getTestCaseName(const testing::TestParamInfo< return result.str(); } void SqueezeTransformation::SetUp() { + abs_threshold = 0.2; ngraph::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; SqueezeTransformationParam squeezeParam; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp index 89e1fb166134bc..beb6fa2084b118 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp @@ -41,6 +41,7 @@ std::string StridedSliceTransformation::getTestCaseName(const testing::TestParam } void StridedSliceTransformation::SetUp() { + abs_threshold = 0.1; ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp index 18580f6cfdabe0..6d5749cc38c8b5 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -38,6 +38,7 @@ std::string TransposeAfterMatMulTransformation::getTestCaseName(const testing::T } void TransposeAfterMatMulTransformation::SetUp() { + abs_threshold = 0.6; ngraph::element::Type precision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp index 584cfb5422f9f3..226945ce35eb11 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp @@ -65,6 +65,8 @@ std::string UnsqueezeTransformation::getTestCaseName(const testing::TestParamInf return result.str(); } void UnsqueezeTransformation::SetUp() { + abs_threshold = 1.0; + rel_threshold = 31.0; ngraph::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; UnsqueezeTransformationParam unsqueezeParam; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp index de842b7ddf87c1..515648a82b8919 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp @@ -55,6 +55,7 @@ InferenceEngine::Blob::Ptr VariadicSplitTransformation::GenerateInput(const Infe #endif void VariadicSplitTransformation::SetUp() { + abs_threshold = 1.0; ngraph::element::Type precision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp index 234a2993ff15f8..0b23dd20f23442 100644 --- a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp +++ b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp @@ -3,6 +3,8 @@ // #include +#include +#include #include #include "ngraph/ops.hpp" @@ -325,25 +327,42 @@ ov::Tensor generate(const std::shared_ptr& node, } } -bool get_const_scalar_value(const std::shared_ptr& node, float& value) { +using GetItemF = std::function&, float&)>; + +bool get_const_value(const std::shared_ptr& node, float& value, const GetItemF& get_item_func) { auto const_node = ov::as_type_ptr(node); if (!const_node) return false; auto const_value = const_node->cast_vector(); - // check if it is not scalar - if (const_value.size() > 1) + return get_item_func(const_value, value); + + return true; +} + +bool get_min_value(const std::vector& v, float& value) { + const auto it = std::min_element(v.begin(), v.end()); + if (it == v.end()) { return false; + } + value = *it; + return true; +} - value = const_value[0]; +bool get_max_value(const std::vector& v, float& value) { + const auto it = std::max_element(v.begin(), v.end()); + if (it == v.end()) { + return false; + } + value = *it; return true; } bool get_fq_scalar_range(const std::shared_ptr &node, float& min_value, float& max_value) { - if (!get_const_scalar_value(node->get_input_node_shared_ptr(1), min_value)) + if (!get_const_value(node->get_input_node_shared_ptr(1), min_value, get_min_value)) return false; - if (!get_const_scalar_value(node->get_input_node_shared_ptr(2), max_value)) + if (!get_const_value(node->get_input_node_shared_ptr(2), max_value, get_max_value)) return false; //std::cout << "[EMUTEX DEBUG] [get_fq_scalar_range] min_value " << min_value << " max_value " << max_value << std::endl; From 820c8b37c623f8a3676cb01bc28df91f306e235c Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Wed, 20 Dec 2023 14:00:23 +0100 Subject: [PATCH 11/37] fix thresholds --- .../batch_to_space_transformation.cpp | 2 +- .../src/low_precision_transformations/clamp_transformation.cpp | 2 +- .../concat_with_different_precision_on_children.cpp | 2 +- .../src/low_precision_transformations/pad_transformation.cpp | 2 +- .../low_precision_transformations/reduce_max_transformation.cpp | 1 + .../low_precision_transformations/reduce_min_transformation.cpp | 1 + .../shuffle_channels_transformation.cpp | 1 + .../space_to_batch_transformation.cpp | 2 +- .../src/low_precision_transformations/split_transformation.cpp | 2 +- .../strided_slice_transformation.cpp | 2 +- 10 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp index d2de74faf1cc18..78dbf0e3636e27 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp @@ -25,7 +25,7 @@ std::string BatchToSpaceTransformation::getTestCaseName(const testing::TestParam } void BatchToSpaceTransformation::SetUp() { - abs_threshold = 0.1; + abs_threshold = 1.1; ngraph::element::Type input_type; BatchToSpaceTransformationParam param; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp index 756d2a2640670d..ac49c830a030cf 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp @@ -29,7 +29,7 @@ std::string ClampTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp index 4b91ad512c4f13..7ed3efea46e49e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp @@ -48,7 +48,7 @@ InferenceEngine::Blob::Ptr SplitTransformation::GenerateInput(const InferenceEng #endif void SplitTransformation::SetUp() { - abs_threshold = 0.2; + abs_threshold = 1.0; ngraph::element::Type precision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp index beb6fa2084b118..330c580ec79b22 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp @@ -41,7 +41,7 @@ std::string StridedSliceTransformation::getTestCaseName(const testing::TestParam } void StridedSliceTransformation::SetUp() { - abs_threshold = 0.1; + abs_threshold = 1.0; ngraph::element::Type netPrecision; ngraph::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; From 2fbf7c6b6a7ea5f9be62acdfc651d9c2f098206d Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Wed, 20 Dec 2023 16:31:17 +0100 Subject: [PATCH 12/37] cleanup --- .../concat_transformation.hpp | 1 - ...t_with_different_precision_on_children.hpp | 1 - ...oncat_with_intermediate_transformation.hpp | 1 - ...at_with_neighbors_graph_transformation.hpp | 1 - .../concat_with_split_transformation.hpp | 1 - .../mat_mul_transformation.hpp | 1 - .../mat_mul_with_constant_transformation.hpp | 1 - .../output_layers.hpp | 1 - .../output_layers_concat.hpp | 1 - .../output_layers_concat_multi_channel.hpp | 1 - .../prelu_transformation.hpp | 1 - .../relu_transformation.hpp | 1 - .../split_transformation.hpp | 1 - .../squeeze_transformation.hpp | 1 - .../unsqueeze_transformation.hpp | 1 - .../variadic_split_transformation.hpp | 1 - .../batch_to_space_transformation.cpp | 1 - .../concat_transformation.cpp | 13 ---- ...t_with_different_precision_on_children.cpp | 14 ---- ...oncat_with_intermediate_transformation.cpp | 14 ---- ...at_with_neighbors_graph_transformation.cpp | 15 ---- .../concat_with_split_transformation.cpp | 13 ---- ...nvolution_backprop_data_transformation.cpp | 1 - .../mat_mul_transformation.cpp | 21 ----- .../mat_mul_with_constant_transformation.cpp | 21 ----- .../output_layers_concat.cpp | 19 ----- .../output_layers_concat_multi_channel.cpp | 21 ----- ...put_layers_handling_in_transformations.cpp | 16 ---- .../prelu_transformation.cpp | 16 ---- .../relu_transformation.cpp | 16 ---- .../split_transformation.cpp | 17 ----- .../squeeze_transformation.cpp | 18 ----- .../unsqueeze_transformation.cpp | 18 ----- .../variadic_split_transformation.cpp | 17 ----- .../layer_transformation.hpp | 7 +- .../layer_transformation.cpp | 12 --- .../src/base/utils/generate_inputs.cpp | 9 --- .../include/common_test_utils/data_utils.hpp | 2 +- .../common_test_utils/src/ov_tensor_utils.cpp | 76 +++++-------------- 39 files changed, 22 insertions(+), 371 deletions(-) diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp index 0d9adc9fbd9926..38308ea9d75231 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp @@ -34,7 +34,6 @@ class ConcatTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp index e2e24fedce4351..df8a5c60a08862 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp @@ -31,7 +31,6 @@ class ConcatWithDifferentChildrenTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp index 1044c9cc2e3a64..694986f10f1d96 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp @@ -25,7 +25,6 @@ class ConcatWithIntermediateTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp index 501026333ef830..b0cac023f05fe0 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp @@ -22,7 +22,6 @@ class ConcatWithNeighborsGraphTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp index 148dbf63addce0..9d10b00d4511f4 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp @@ -29,7 +29,6 @@ class ConcatWithSplitTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp index acf379ae885282..5e890e75b7b799 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp @@ -34,7 +34,6 @@ class MatMulTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp index 173a73ab17abfb..6166ebd494f6e8 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp @@ -40,7 +40,6 @@ class MatMulWithConstantTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers.hpp index 980e4f172a29c0..543f06724c64bd 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers.hpp @@ -16,7 +16,6 @@ class OutputLayers : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat.hpp index a8dc8131c28104..7bbe793bbc1535 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat.hpp @@ -16,7 +16,6 @@ class OutputLayersConcat : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat_multi_channel.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat_multi_channel.hpp index 6fe87b3695aa69..1793420651e417 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat_multi_channel.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat_multi_channel.hpp @@ -23,7 +23,6 @@ class OutputLayersConcatMultiChannel : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp index f71262c97b79b1..4b6fa1488e1fc2 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp @@ -28,7 +28,6 @@ class PReluTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp index d0b1279838dc6e..00b90be41e184f 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp @@ -28,7 +28,6 @@ class ReluTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override; protected: void SetUp() override; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp index 289c2d0c050494..d2692f1118dc27 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp @@ -28,7 +28,6 @@ class SplitTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; protected: void SetUp() override; }; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp index 47f5d3fd80aaf3..67e212cf218bf2 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp @@ -32,7 +32,6 @@ class SqueezeTransformation : public testing::WithParamInterface, public LayerTestsUtils::LayerTransformation { public: - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; static std::string getTestCaseName(const testing::TestParamInfo& obj); protected: diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp index 87978f84f0219a..8d276fbdf476a0 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp @@ -30,7 +30,6 @@ class UnsqueezeTransformation : public testing::WithParamInterface, public LayerTestsUtils::LayerTransformation { public: - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; static std::string getTestCaseName(const testing::TestParamInfo& obj); protected: diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp index d63bea4ee80f2f..2920c66d357373 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp @@ -28,7 +28,6 @@ class VariadicSplitTransformation : public LayerTestsUtils::LayerTransformation { public: static std::string getTestCaseName(const testing::TestParamInfo& obj); - //InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override; protected: void SetUp() override; }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp index 78dbf0e3636e27..ed575f9e22a740 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp @@ -57,7 +57,6 @@ void BatchToSpaceTransformation::run() { } TEST_P(BatchToSpaceTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp index e4e8e3294c3504..74992de4e96e50 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp @@ -34,19 +34,6 @@ std::string ConcatTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); - - const float k = (info.name() == "input1") ? 1.f : (info.name() == "input2" ? 2.f : 3.f); - return LayerTransformation::GenerateInput(ngraph::element::u8, info.getTensorDesc(), k); -} -#endif - void ConcatTransformation::SetUp() { abs_threshold = 0.1; rel_threshold = 4.2; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp index 900dba4bec4c00..ad6431fb4e1cab 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp @@ -35,20 +35,6 @@ std::string ConcatWithDifferentChildrenTransformation::getTestCaseName(const tes return result.str(); } -#if 0 -InferenceEngine::Blob::Ptr ConcatWithDifferentChildrenTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; - std::string targetDevice; - ConcatWithDifferentChildrenTransformationParam param; - ov::pass::low_precision::LayerTransformation::Params params; - std::tie(netPrecision, inputShapes, targetDevice, param, params) = this->GetParam(); - - const float k = (info.name() == "input1") ? 1.f : (info.name() == "input2" ? 2.f : 3.f); - return LayerTransformation::GenerateInput(ngraph::element::u8, info.getTensorDesc(), k); -} -#endif - void ConcatWithDifferentChildrenTransformation::SetUp() { abs_threshold = 0.1; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp index 317ca8cdc0ddf9..f8c5de748f3e54 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp @@ -37,20 +37,6 @@ std::string ConcatWithIntermediateTransformation::getTestCaseName(const testing: return result.str(); } -#if 0 -InferenceEngine::Blob::Ptr ConcatWithIntermediateTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; - std::string targetDevice; - ov::pass::low_precision::LayerTransformation::Params trasformationParams; - bool transparentIntermediate; - bool multichannel; - std::tie(netPrecision, inputShape, targetDevice, trasformationParams, transparentIntermediate, multichannel) = this->GetParam(); - - const float k = (info.name() == "input1") ? 1.f : (info.name() == "input2" ? 2.f : 3.f); - return LayerTransformation::GenerateInput(ngraph::element::u8, info.getTensorDesc(), k); -} -#endif /* * FQ FQ diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp index e2ce7b2bb734ea..2c71a013005108 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp @@ -26,21 +26,6 @@ std::string ConcatWithNeighborsGraphTransformation::getTestCaseName(const testin return getTestCaseNameByParams(precision, inputShapes, targetDevice, params); } -#if 0 -InferenceEngine::Blob::Ptr ConcatWithNeighborsGraphTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; - std::string targetDevice; - ov::pass::low_precision::LayerTransformation::Params params; - std::tie(netPrecision, inputShape, targetDevice, params) = this->GetParam(); - - if ((info.name() != "input1") && (info.name() != "input2") && (info.name() != "input3")) { - IE_THROW() << "unexpected input name " << info.name(); - } - const float k = (info.name() == "input1") ? 1.f : (info.name() == "input2" ? 2.f : 3.f); - return LayerTransformation::GenerateInput(ngraph::element::u8, info.getTensorDesc(), k); -} -#endif void ConcatWithNeighborsGraphTransformation::SetUp() { rel_threshold = 0.1; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp index 322831420d82d2..aebc593ae27061 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp @@ -32,19 +32,6 @@ std::string ConcatWithSplitTransformation::getTestCaseName(const testing::TestPa return result.str(); } -#if 0 -InferenceEngine::Blob::Ptr ConcatWithSplitTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; - std::string targetDevice; - ConcatWithSplitTransformationParam param; - ov::pass::low_precision::LayerTransformation::Params params; - std::tie(netPrecision, inputShapes, targetDevice, param, params) = this->GetParam(); - - const float k = (info.name() == "input1") ? 1.f : (info.name() == "input2" ? 2.f : 3.f); - return LayerTransformation::GenerateInput(ngraph::element::u8, info.getTensorDesc(), k); -} -#endif /* * FQ FQ diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp index b8d0f9489e0936..51d149e7ef8879 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -84,7 +84,6 @@ void ConvolutionBackpropDataTransformation::run() { } TEST_P(ConvolutionBackpropDataTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp index 0d41f57156a82a..6e6e073f4dd9ee 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp @@ -38,27 +38,6 @@ std::string MatMulTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); - - if ((info.name() != "input1") && (info.name() != "input2")) { - IE_THROW() << "unexpected input name " << info.name(); - } - const float k = (info.name() == "input1") ? 1.f : 2.f; - - const float low = 0.f / k; - const float hight = 255.f / k; - InferenceEngine::Blob::Ptr input = FuncTestUtils::createAndFillBlobConsistently(info.getTensorDesc(), hight - low, static_cast(low), 1ul); - return input; -} -#endif /* * FQ1 FQ2 diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp index 6d038025c501a9..cec968b7b957a9 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp @@ -40,27 +40,6 @@ std::string OutputLayersConcatMultiChannel::getTestCaseName( return getTestCaseNameByParams(netPrecision, inputShapes, targetDevice, params); } -#if 0 -InferenceEngine::Blob::Ptr OutputLayersConcatMultiChannel::GenerateInput(const InferenceEngine::InputInfo &info) const { - InferenceEngine::SizeVector inputShape; - InferenceEngine::Precision netPrecision; - std::string targetDevice; - ov::pass::low_precision::LayerTransformation::Params params; - std::tie(netPrecision, inputShape, targetDevice, params) = this->GetParam(); - - if ((info.name() != "input1") && (info.name() != "input2")) { - IE_THROW() << "unexpected input name " << info.name(); - } - const float k = (info.name() == "input1") ? 1.f : (info.name() == "input2" ? 2.f : 3.f); - - const auto interval = outputLayersHandlingInTransformationsForConcatMultiChannelGetInterval({ ngraph::element::u8, ngraph::element::i8 }); - const float low = interval.first / k; - const float hight = interval.second / k; - - InferenceEngine::Blob::Ptr input = FuncTestUtils::createAndFillBlobConsistently(info.getTensorDesc(), hight - low, static_cast(low), 1ul); - return input; -} -#endif /* * FQ1 FQ2 diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp index ae8352d023c2d7..6bf0f998d94545 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp @@ -32,22 +32,6 @@ std::string OutputLayers::getTestCaseName(const testing::TestParamInfoGetParam(); - - const float k = 1.f; - const float low = 0.f / k; - const float hight = 255.f / k; - - InferenceEngine::Blob::Ptr input = FuncTestUtils::createAndFillBlobConsistently(info.getTensorDesc(), hight - low, static_cast(low), 1ul); - return input; -} -#endif void OutputLayers::SetUp() { InferenceEngine::SizeVector inputShape; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp index 1fa9cb919d6cd2..89a9ebf8a0ffd3 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp @@ -31,22 +31,6 @@ std::string PReluTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); - - const auto fqOnData = testValues.fakeQuantize; - return FuncTestUtils::createAndFillBlobConsistently( - info.getTensorDesc(), - static_cast(fqOnData.empty() ? 25.f : fqOnData.outputHighValues[0] - fqOnData.outputLowValues[0]), - static_cast(fqOnData.empty() ? -12.5f : fqOnData.outputLowValues[0]), - 1ul); -} -#endif void PReluTransformation::SetUp() { ngraph::element::Type precision; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp index c66c89db38dc35..53fdfcfd52e080 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp @@ -31,22 +31,6 @@ std::string ReluTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); - - const auto fqOnData = testValues.fakeQuantize; - return FuncTestUtils::createAndFillBlobConsistently( - info.getTensorDesc(), - static_cast(fqOnData.empty() ? 25.f : fqOnData.outputHighValues[0] - fqOnData.outputLowValues[0]), - static_cast(fqOnData.empty() ? -12.5f : fqOnData.outputLowValues[0]), - 1ul); -} -#endif void ReluTransformation::SetUp() { abs_threshold = 1.0; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp index 7ed3efea46e49e..39665e6de4bf1d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp @@ -29,23 +29,6 @@ std::string SplitTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); - const auto& fqOnData = param.fakeQuantize; - - return FuncTestUtils::createAndFillBlobConsistently( - info.getTensorDesc(), - static_cast(fqOnData.empty() ? 25.f : fqOnData.outputHighValues[0] - fqOnData.outputLowValues[0]), - static_cast(fqOnData.empty() ? -12.5f : fqOnData.outputLowValues[0]), - 1ul); -} -#endif void SplitTransformation::SetUp() { abs_threshold = 1.0; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp index e4d08755f0bddd..a114ef37fa2228 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp @@ -29,24 +29,6 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector& valu return os; } -#if 0 -InferenceEngine::Blob::Ptr SqueezeTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { - ngraph::element::Type netPrecision; - ov::pass::low_precision::LayerTransformation::Params params; - SqueezeTransformationParam squeezeParam; - std::string targetDevice; - - std::tie(netPrecision, targetDevice, params, squeezeParam) = this->GetParam(); - - const ngraph::builder::subgraph::FakeQuantizeOnData& fqOnData = squeezeParam.fakeQuantize; - - return FuncTestUtils::createAndFillBlobConsistently( - info.getTensorDesc(), - static_cast(fqOnData.empty() ? 25.f : fqOnData.outputHighValues[0] - fqOnData.outputLowValues[0]), - static_cast(fqOnData.empty() ? -12.5f : fqOnData.outputLowValues[0]), - 1ul); -} -#endif std::string SqueezeTransformation::getTestCaseName(const testing::TestParamInfo& obj) { ngraph::element::Type netPrecision; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp index 226945ce35eb11..e9cffaed8a4425 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp @@ -29,24 +29,6 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector& valu return os; } -#if 0 -InferenceEngine::Blob::Ptr UnsqueezeTransformation::GenerateInput(const InferenceEngine::InputInfo &info) const { - ngraph::element::Type netPrecision; - ov::pass::low_precision::LayerTransformation::Params params; - UnsqueezeTransformationParam squeezeParam; - std::string targetDevice; - - std::tie(netPrecision, targetDevice, params, squeezeParam) = this->GetParam(); - - const ngraph::builder::subgraph::FakeQuantizeOnData& fqOnData = squeezeParam.fakeQuantize; - - return FuncTestUtils::createAndFillBlobConsistently( - info.getTensorDesc(), - static_cast(fqOnData.empty() ? 25.f : fqOnData.outputHighValues[0] - fqOnData.outputLowValues[0]), - static_cast(fqOnData.empty() ? -12.5f : fqOnData.outputLowValues[0]), - 1ul); -} -#endif std::string UnsqueezeTransformation::getTestCaseName(const testing::TestParamInfo& obj) { ngraph::element::Type netPrecision; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp index 515648a82b8919..dcdddbbdcb44c5 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp @@ -36,23 +36,6 @@ std::string VariadicSplitTransformation::getTestCaseName(const testing::TestPara return result.str(); } -#if 0 -InferenceEngine::Blob::Ptr VariadicSplitTransformation::GenerateInput(const InferenceEngine::InputInfo& info) const { - ngraph::element::Type precision; - ngraph::PartialShape inputShape; - std::string targetDevice; - ov::pass::low_precision::LayerTransformation::Params params; - VariadicSplitTransformationParam param; - std::tie(precision, inputShape, targetDevice, params, param) = this->GetParam(); - const auto& fqOnData = param.fakeQuantize; - - return FuncTestUtils::createAndFillBlobConsistently( - info.getTensorDesc(), - static_cast(fqOnData.empty() ? 25.f : fqOnData.outputHighValues[0] - fqOnData.outputLowValues[0]), - static_cast(fqOnData.empty() ? -12.5f : fqOnData.outputLowValues[0]), - 1ul); -} -#endif void VariadicSplitTransformation::SetUp() { abs_threshold = 1.0; diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp index 032cb8a08ecd5a..eacfbb56947a97 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp @@ -33,12 +33,7 @@ class LayerTransformationParamsFactory : public LayerTransformationParamsNGraphF class LayerTransformation : virtual public ov::test::SubgraphBaseTest { protected: LayerTransformation(); -#if 0 - static InferenceEngine::Blob::Ptr GenerateInput( - const ngraph::element::Type precision, - const InferenceEngine::TensorDesc& tensorDesc, - const float k = 1.f); -#endif + static std::pair getQuantizationInterval(const ngraph::element::Type precision); static std::string toString(const ov::pass::low_precision::LayerTransformation::Params& params); diff --git a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index 24639641d1d1e1..e424a62f18fa0f 100644 --- a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp +++ b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -38,18 +38,6 @@ LayerTransformation::LayerTransformation() { abs_threshold = 1.0e-4; configuration[PluginConfigInternalParams::KEY_LP_TRANSFORMS_MODE] = PluginConfigParams::YES; } -#if 0 -InferenceEngine::Blob::Ptr LayerTransformation::GenerateInput( - const ngraph::element::Type precision, - const InferenceEngine::TensorDesc& tensorDesc, - const float k) { - const auto interval = getQuantizationInterval(precision); - const float low = interval.first / k; - const float hight = interval.second / k; - - return FuncTestUtils::createAndFillBlobConsistently(tensorDesc, hight - low, static_cast(low), 1ul); -} -#endif std::pair LayerTransformation::getQuantizationInterval(const ngraph::element::Type precision) { const bool unsignedInterval = precision == ngraph::element::u8; diff --git a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp index 0b23dd20f23442..00eb72c361484b 100644 --- a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp +++ b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp @@ -305,15 +305,8 @@ ov::Tensor generate(const std::shared_ptr& node, case 4: return ov::test::utils::create_tensor(elemType, targetShape, outputHighData, outputHighData.size()); default: { -#if 0 - std::cout << "[EMUTEX DEBUG] [generate] node " << node->get_friendly_name() << - " input shape " << node->get_input_shape(0) << - " output shape " << node->get_output_shape(0) << - " targetShape " << node->get_output_shape(0) << std::endl; -#endif float min_value = {}, max_value = {}; if (get_fq_scalar_range(node, min_value, max_value)) { -// std::cout << "[EMUTEX DEBUG] [CHECKPOINT]" << std::endl; return ov::test::utils::create_and_fill_tensor_real_distribution(elemType, targetShape, min_value, max_value, 0); } @@ -365,8 +358,6 @@ bool get_fq_scalar_range(const std::shared_ptr &node, if (!get_const_value(node->get_input_node_shared_ptr(2), max_value, get_max_value)) return false; - //std::cout << "[EMUTEX DEBUG] [get_fq_scalar_range] min_value " << min_value << " max_value " << max_value << std::endl; - return true; } diff --git a/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp b/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp index b757e5ba5179f2..aaa515aa2b056e 100644 --- a/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp +++ b/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp @@ -215,7 +215,7 @@ void inline fill_data_ptr_real_random_float(T* pointer, for (std::size_t i = 0; i < size; i++) { pointer[i] = static_cast(dist(gen)); - //std::cout << "pointer[" << i << "] " << pointer[i] << std::endl; + // std::cout << "pointer[" << i << "] " << pointer[i] << std::endl; } } diff --git a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp index b81a0e4d9e38e2..f0b4086ca7f764 100644 --- a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp +++ b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp @@ -219,18 +219,18 @@ ov::runtime::Tensor create_and_fill_tensor_normal_distribution(const ov::element } ov::runtime::Tensor create_and_fill_tensor_real_distribution(const ov::element::Type element_type, - const ov::Shape& shape, - const float min, - const float max, - const int seed) { + const ov::Shape& shape, + const float min, + const float max, + const int seed) { auto tensor = ov::runtime::Tensor{element_type, shape}; -#define CASE(X) \ - case X: \ +#define CASE(X) \ + case X: \ fill_data_ptr_real_random_float(tensor.data::value_type>(), \ - shape_size(shape), \ - min, \ - max, \ - seed); \ + shape_size(shape), \ + min, \ + max, \ + seed); \ break; switch (element_type) { CASE(ov::element::Type_t::boolean) @@ -246,17 +246,13 @@ ov::runtime::Tensor create_and_fill_tensor_real_distribution(const ov::element:: CASE(ov::element::Type_t::f16) CASE(ov::element::Type_t::f32) CASE(ov::element::Type_t::f64) - case ov::element::Type_t::u1: - case ov::element::Type_t::i4: - case ov::element::Type_t::u4: - fill_data_ptr_real_random_float(static_cast(tensor.data()), - tensor.get_byte_size(), - min, - max, - seed); - break; - default: - OPENVINO_THROW("Unsupported element type: ", element_type); + case ov::element::Type_t::u1: + case ov::element::Type_t::i4: + case ov::element::Type_t::u4: + fill_data_ptr_real_random_float(static_cast(tensor.data()), tensor.get_byte_size(), min, max, seed); + break; + default: + OPENVINO_THROW("Unsupported element type: ", element_type); } #undef CASE return tensor; @@ -391,30 +387,6 @@ void compare(const ov::Tensor& expected, if (!std::isnan(rel_threshold)) { std::cout << "[ COMPARATION ] abs_threshold: " << abs_threshold << std::endl; } -#if 0 - { - for (size_t i = 0; i < shape_size_cnt; ++i) { - if (actual_data[i] != expected_data[i]) { - std::cout << i << ". " << actual_data[i] << " " << expected_data[i] << " " << actual_data[i] - expected_data[i] - << std::endl; - } - } -#endif -#if 0 - // TODO: debug - std::cout << std::endl << "actual:" << std::endl; - for (size_t i = 0; i < shape_size_cnt; ++i) { - std::cout << actual_data[i] << " "; - } - std::cout << std::endl << std::endl; - - std::cout << std::endl << "expected:" << std::endl; - for (size_t i = 0; i < shape_size_cnt; ++i) { - std::cout << expected_data[i] << " "; - } - std::cout << std::endl << std::endl; - } -#endif Error abs_error(abs_threshold), rel_error(rel_threshold); for (size_t i = 0; i < shape_size_cnt; ++i) { @@ -438,8 +410,9 @@ void compare(const ov::Tensor& expected, double rel = expected_value ? (abs / std::fabs(expected_value)) : abs; if (rel >= 1.0 || abs > 1.0e-3) { - std::cout << i << ". rel " << rel << " abs " << abs << " expected_value " << expected_value << " actual_value " << actual_value << std::endl; - //continue; + std::cout << i << ". rel " << rel << " abs " << abs << " expected_value " << expected_value + << " actual_value " << actual_value << std::endl; + // continue; } abs_error.update(abs, i); @@ -458,15 +431,6 @@ void compare(const ov::Tensor& expected, << rel_error.mean << "; rel threshold " << rel_threshold; throw std::runtime_error(out_stream.str()); } -#if 0 - { - std::cout << "\n\t abs_max: " << abs_error.max << "\n\t\t coordinate " << abs_error.max_coordinate - << "; abs errors count " << abs_error.count << "; abs mean " << abs_error.mean << "; abs threshold " - << abs_threshold << "\n\t rel_max: " << rel_error.max << "\n\t\t coordinate " - << rel_error.max_coordinate << "; rel errors count " << rel_error.count << "; rel mean " - << rel_error.mean << "; rel threshold " << rel_threshold << std::endl; - } -#endif } void compare(const ov::Tensor& expected, From ec4f7ac6a4ca80930fb5290368ba2d38bbd2e598 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Wed, 20 Dec 2023 16:33:34 +0100 Subject: [PATCH 13/37] cleanup --- .../test_utils/common_test_utils/src/ov_tensor_utils.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp index f0b4086ca7f764..f1c34486fa2a45 100644 --- a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp +++ b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp @@ -409,12 +409,6 @@ void compare(const ov::Tensor& expected, double abs = std::fabs(expected_value - actual_value); double rel = expected_value ? (abs / std::fabs(expected_value)) : abs; - if (rel >= 1.0 || abs > 1.0e-3) { - std::cout << i << ". rel " << rel << " abs " << abs << " expected_value " << expected_value - << " actual_value " << actual_value << std::endl; - // continue; - } - abs_error.update(abs, i); rel_error.update(rel, i); } From d641dda543efedbeb63329b7f973e9c8f55b25df Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Mon, 8 Jan 2024 16:13:56 +0100 Subject: [PATCH 14/37] fix problem with skipped tests and error no model compiled --- .../batch_to_space_transformation.cpp | 1 + .../convolution_backprop_data_transformation.cpp | 1 + .../elementwise_branch_selection_transformation.cpp | 2 +- .../eliminate_fake_quantize_transformation.cpp | 2 +- .../fake_quantize_transformation.cpp | 2 +- .../fake_quantize_with_dq_not_optimal_transformation.cpp | 2 +- .../low_precision_transformations/mat_mul_transformation.cpp | 2 +- .../mat_mul_with_constant_transformation.cpp | 2 +- .../low_precision_transformations/multiply_transformation.cpp | 2 +- .../src/low_precision_transformations/pad_transformation.cpp | 2 +- .../low_precision_transformations/reduce_max_transformation.cpp | 2 +- .../reduce_mean_transformation.cpp | 2 +- .../low_precision_transformations/reduce_min_transformation.cpp | 2 +- .../low_precision_transformations/reduce_sum_transformation.cpp | 2 +- .../low_precision_transformations/reshape_transformation.cpp | 2 +- .../space_to_batch_transformation.cpp | 2 +- .../base/low_precision_transformations/layer_transformation.hpp | 1 + 17 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp index ed575f9e22a740..13a6ef2a1155af 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp @@ -57,6 +57,7 @@ void BatchToSpaceTransformation::run() { } TEST_P(BatchToSpaceTransformation, CompareWithRefImpl) { + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp index 51d149e7ef8879..798c34bfc7fd8e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -84,6 +84,7 @@ void ConvolutionBackpropDataTransformation::run() { } TEST_P(ConvolutionBackpropDataTransformation, CompareWithRefImpl) { + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp index e593216bb35618..7c079939343574 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp @@ -116,7 +116,7 @@ void ElementwiseBranchSelectionTransformation::run() { } TEST_P(ElementwiseBranchSelectionTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp index e4a6e2b9110dde..c5e397911ac627 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp @@ -48,7 +48,7 @@ void EliminateFakeQuantizeTransformation::SetUp() { } TEST_P(EliminateFakeQuantizeTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); abs_threshold = 2.3; run(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp index e7fa979bf246a2..a70b0401c0d997 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp @@ -70,7 +70,7 @@ void FakeQuantizeTransformation::run() { } TEST_P(FakeQuantizeTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index 87e0019d1ff6f8..5b42e46afc1074 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -31,7 +31,7 @@ std::string FakeQuantizeWithNotOptimalTransformation::getTestCaseName(const test void FakeQuantizeWithNotOptimalTransformation::SetUp() { abs_threshold = 4; rel_threshold = 2778; - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); ngraph::PartialShape inputShape; ngraph::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp index 6e6e073f4dd9ee..171930672f5bd9 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp @@ -60,7 +60,7 @@ void MatMulTransformation::SetUp() { } void MatMulTransformation::run() { - //SKIP_IF_CURRENT_TEST_IS_DISABLED() + SKIP_IF_CURRENT_TEST_IS_DISABLED() LayerTransformation::run(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp index 2173e53b7e0979..b64ee60c2eb6a8 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -71,7 +71,7 @@ void MatMulWithConstantTransformation::run() { } TEST_P(MatMulWithConstantTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp index 1aa6c0299b519b..70c0c4af81d53f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp @@ -120,7 +120,7 @@ void MultiplyTransformation::run() { } TEST_P(MultiplyTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp index 843b1c8dec892e..e2d137cdb8c360 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp @@ -61,7 +61,7 @@ void PadTransformation::run() { } TEST_P(PadTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp index 9903d0a9a5785b..cb9099ea9c0649 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp @@ -64,7 +64,7 @@ void ReduceMaxTransformation::run() { } TEST_P(ReduceMaxTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp index a0d6ec286ff608..3c9fdd2af6eacb 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp @@ -72,7 +72,7 @@ void ReduceMeanTransformation::run() { } TEST_P(ReduceMeanTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp index 7963869d9d7d34..eb8676aefa5e10 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp @@ -64,7 +64,7 @@ void ReduceMinTransformation::run() { } TEST_P(ReduceMinTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp index 92936654c0b8eb..e08f3a650ff5e8 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp @@ -65,7 +65,7 @@ void ReduceSumTransformation::run() { } TEST_P(ReduceSumTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp index 88048845bdba34..762bb8d5133e52 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp @@ -61,7 +61,7 @@ void ReshapeTransformation::run() { } TEST_P(ReshapeTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp index dbc91d1ba8fc5b..f776ccc64e9860 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp @@ -56,7 +56,7 @@ void SpaceToBatchTransformation::run() { } TEST_P(SpaceToBatchTransformation, CompareWithRefImpl) { - //SKIP_IF_CURRENT_TEST_IS_DISABLED(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp index eacfbb56947a97..543f4c8b60976d 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp @@ -16,6 +16,7 @@ #include "low_precision/layer_transformation.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" +#include "functional_test_utils/skip_tests_config.hpp" namespace LayerTestsUtils { From 79e0497c5232ddf5e5f6dbaf426e3788433a6d8c Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Mon, 8 Jan 2024 16:25:29 +0100 Subject: [PATCH 15/37] cleanup --- .../interpolate_transformation.cpp | 1 - .../recurrent_cell_transformation.cpp | 4 ---- 2 files changed, 5 deletions(-) diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp index 82af45e34bf920..6a8aa914d4e34f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp @@ -49,7 +49,6 @@ std::string InterpolateTransformation::getTestCaseName(const testing::TestParamI } void InterpolateTransformation::SetUp() { - //SetRefMode(LayerTestsUtils::RefMode::IE); ngraph::element::Type precision; std::pair shapes; interpAttributes attributes; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp index 818bfee55b3937..26e63b888555cd 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp @@ -76,10 +76,6 @@ void RecurrentCellTransformation::SetUp() { void RecurrentCellTransformation::run() { LayerTransformation::run(); -#if 0 - if (!executableNetwork) - return; -#endif const auto params = std::get<5>(GetParam()); const auto actualPrecision = getRuntimePrecisionByType(params.layerName); auto expectedPrecision = params.expectedKernelType; From 7636bcfe24220c864179801c9a4941d063c8cb50 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Mon, 8 Jan 2024 16:57:07 +0100 Subject: [PATCH 16/37] code review fixes: remove InferenceEngine:: --- .../add_transformation.cpp | 5 ++--- .../assign_and_read_value_transformation.cpp | 5 ++--- .../batch_to_space_transformation.cpp | 5 ++--- .../clamp_transformation.cpp | 5 ++--- .../concat_transformation.cpp | 5 ++--- .../concat_with_child_and_output.cpp | 5 ++--- .../concat_with_different_precision_on_children.cpp | 5 ++--- .../concat_with_intermediate_transformation.cpp | 5 ++--- .../concat_with_neighbors_transformation.cpp | 5 ++--- .../concat_with_split_transformation.cpp | 5 ++--- .../convolution_backprop_data_transformation.cpp | 4 ++-- .../convolution_qdq_transformation.cpp | 5 ++--- .../convolution_transformation.cpp | 5 ++--- .../depth_to_space_transformation.cpp | 3 +-- .../elementwise_branch_selection_transformation.cpp | 4 ++-- .../fq_and_avg_pool_transformation.cpp | 4 ++-- .../fq_and_max_pool_transformation.cpp | 4 ++-- .../fq_and_two_output_branches_with_convolution.cpp | 5 ++--- .../fq_precision_selection_transformation.cpp | 5 ++--- .../fq_transformation.cpp | 5 ++--- .../fq_with_dq_not_optimal_transformation.cpp | 6 +++--- .../fully_connected_transformation.cpp | 5 ++--- .../fuse_convert_transformation.cpp | 4 ++-- .../fuse_fq_and_scale_shift_transformation.cpp | 4 ++-- .../gather_transformation.cpp | 4 ++-- .../gemm_transformation.cpp | 5 ++--- .../group_convolution_transformation.cpp | 4 ++-- .../groupconvolution_qdq_transformation.cpp | 5 ++--- .../interpolate_transformation.cpp | 4 ++-- .../mat_mul_transformation.cpp | 5 ++--- .../mat_mul_with_constant_transformation.cpp | 4 +++- .../mat_mul_with_optimized_constant_fq.cpp | 4 ++-- .../move_fake_quantize_transformation.cpp | 5 ++--- .../multiply_to_group_convolution.cpp | 4 ++-- .../multiply_transformation.cpp | 5 ++--- .../multiply_with_one_parent.cpp | 5 ++--- .../mvn_transformation.cpp | 4 ++-- .../normalize_transformation.cpp | 5 ++--- .../low_precision_transformations/output_layers.cpp | 6 +++--- .../output_layers_concat.cpp | 6 +++--- .../output_layers_concat_multi_channel.cpp | 6 +++--- .../pad_transformation.cpp | 5 ++--- .../prelu_transformation.cpp | 4 ++-- .../pull_reshape_through_dequantization.cpp | 5 ++--- .../recurrent_cell_transformation.cpp | 5 ++--- .../reduce_max_transformation.cpp | 5 ++--- .../reduce_mean_transformation.cpp | 4 ++-- .../reduce_min_transformation.cpp | 5 ++--- .../reduce_sum_transformation.cpp | 5 ++--- .../relu_transformation.cpp | 5 ++--- .../reshape_transformation.cpp | 5 ++--- .../shuffle_channels_transformation.cpp | 5 ++--- .../space_to_batch_transformation.cpp | 5 ++--- .../split_transformation.cpp | 5 ++--- .../squeeze_transformation.cpp | 5 ++--- .../strided_slice_transformation.cpp | 5 ++--- .../subtract_transformation.cpp | 6 +++--- .../transpose_after_matmul_transformation.cpp | 5 ++--- .../transpose_transformation.cpp | 5 ++--- .../unsqueeze_transformation.cpp | 5 ++--- .../variadic_split_transformation.cpp | 5 ++--- .../output_layers_concat.cpp | 12 +++++------- .../output_layers_concat_multi_channel.cpp | 12 +++++------- .../output_layers_handling_in_transformations.cpp | 12 +++++------- .../layer_transformation.hpp | 10 +++++----- .../layer_transformation.cpp | 8 ++++---- 66 files changed, 151 insertions(+), 196 deletions(-) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/add_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/add_transformation.cpp index 673c0f82460c92..e8ca048e1fb4fe 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/add_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/add_transformation.cpp @@ -11,9 +11,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - //ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector params = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/assign_and_read_value_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/assign_and_read_value_transformation.cpp index 9304b63da83d9d..c6567dbdf9ea05 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/assign_and_read_value_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/assign_and_read_value_transformation.cpp @@ -12,9 +12,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector opsetVersions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/batch_to_space_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/batch_to_space_transformation.cpp index 4adea1767af5a7..ab49ffa3597f3b 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/batch_to_space_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/batch_to_space_transformation.cpp @@ -10,9 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector params = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp index 7e32d5ddf5363c..e06bfa30f24dc0 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp @@ -12,9 +12,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_transformation.cpp index 43068e06ead893..b035ded218f6dc 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_transformation.cpp @@ -11,9 +11,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector precisions = { + ov::element::f32 }; const std::vector testValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp index ceceaddea51ae6..058f376ec162af 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp @@ -10,9 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp index 28cd434791e9f0..89b41087d5b79d 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp @@ -10,9 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp index 4f57f15313c5d0..07af5859963b5c 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp @@ -11,9 +11,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp index 691509a2536ea3..456a112dba297f 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp @@ -11,9 +11,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector precisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp index b8fe75b2975c21..c098953d4eaa0e 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp @@ -10,9 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp index f8309d5e29939c..b1aedb764c239d 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -10,8 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp index 1ac1eb2b3e65ad..41ecc00ea1cad2 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp @@ -11,9 +11,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp index fdf00c2753ff04..ebbe0e273ae324 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp @@ -11,9 +11,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16, +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp index 707006f1207921..1c0c6bfba80785 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp @@ -12,8 +12,7 @@ using namespace InferenceEngine::details; namespace { const std::vector precisions = { - ov::element::f32, - // ov::element::f16 + ov::element::f32 }; const std::vector modes = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/elementwise_branch_selection_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/elementwise_branch_selection_transformation.cpp index 0f5227dfa69c7b..9ebcd591728874 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/elementwise_branch_selection_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/elementwise_branch_selection_transformation.cpp @@ -11,8 +11,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector elementwiseTypes = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_avg_pool_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_avg_pool_transformation.cpp index 42e3b27fbbd71c..b6f6ab91cd8602 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_avg_pool_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_avg_pool_transformation.cpp @@ -12,8 +12,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32 +const std::vector precisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_max_pool_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_max_pool_transformation.cpp index 4116af8a5cca86..577ddf4a6b4569 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_max_pool_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_max_pool_transformation.cpp @@ -12,8 +12,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32 +const std::vector precisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_two_output_branches_with_convolution.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_two_output_branches_with_convolution.cpp index ee4b7ce29b47ef..64930a8be44aaa 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_two_output_branches_with_convolution.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_two_output_branches_with_convolution.cpp @@ -11,9 +11,8 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_precision_selection_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_precision_selection_transformation.cpp index 80d790854d7b36..a2fb067cab8e8e 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_precision_selection_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_precision_selection_transformation.cpp @@ -12,9 +12,8 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_transformation.cpp index f27e3174a5a1c8..b6feeab81ff3a6 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_transformation.cpp @@ -12,9 +12,8 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_with_dq_not_optimal_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_with_dq_not_optimal_transformation.cpp index 5c8732a5989227..4ee3228f91d5e1 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_with_dq_not_optimal_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_with_dq_not_optimal_transformation.cpp @@ -12,9 +12,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ngraph::element::f16 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp index 6f19bde8288ddf..6cece38ca7421b 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp @@ -11,9 +11,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector shapes = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp index 8ee91f7f161d6d..dd7581174f3160 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp @@ -8,8 +8,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - element::f32 +const std::vector precisions = { + ov::element::f32 }; const std::vector< ngraph::PartialShape > inputAndQuantizationShapes = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_fq_and_scale_shift_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_fq_and_scale_shift_transformation.cpp index 8c23420484e2ad..163a58cdf12b22 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_fq_and_scale_shift_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_fq_and_scale_shift_transformation.cpp @@ -12,8 +12,8 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/gather_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/gather_transformation.cpp index 646b842e5b5013..d1c58593896249 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/gather_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/gather_transformation.cpp @@ -10,8 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector precisions = { - ngraph::element::f32, +const std::vector precisions = { + ov::element::f32 }; const std::vector opset_version = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp index 7b463b61b313bb..1a92960ac0f976 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp @@ -11,9 +11,8 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector dimensions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp index fe5ef5c998addd..943d2265b5f6ac 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp @@ -10,8 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp index 319d5c3cfa626f..5f04f68568e63e 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -13,9 +13,8 @@ using namespace LayerTestsDefinitions; namespace { // clang-format off -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp index 3a0e72401cb58b..f7435aab0e180d 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp @@ -8,8 +8,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32 +const std::vector precisions = { + ov::element::f32 }; const std::vector> shapes = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp index 4dcb9ef2475381..83c70156312d71 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp @@ -10,9 +10,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector precisions = { + ov::element::f32 }; std::vector testValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp index 2aa4269a850d08..45735728e8f29a 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -10,7 +10,9 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { ngraph::element::f32 }; +const std::vector precisions = { + ov::element::f32 +}; //transpose_a = false, transpose_b = true std::vector testValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp index b688a629918151..2c4707bea7d044 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp @@ -10,8 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector params = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/move_fake_quantize_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/move_fake_quantize_transformation.cpp index f32a45256b187d..4c696bcb7bef97 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/move_fake_quantize_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/move_fake_quantize_transformation.cpp @@ -9,9 +9,8 @@ using namespace LayerTestsDefinitions; -const std::vector netPrecisions = { - ngraph::element::f32, - //ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution.cpp index 3dacda4a854636..1e69e012d867c4 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution.cpp @@ -8,8 +8,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - element::f32 +const std::vector precisions = { + ov::element::f32 }; namespace shape4d { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp index 6f43ef6d917b2d..56f113491eea8e 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp @@ -10,9 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - //ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; // If snippets fuse all operations into one subgraph node, diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_with_one_parent.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_with_one_parent.cpp index 36536fab7343ce..50eb68bbfe968e 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_with_one_parent.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_with_one_parent.cpp @@ -10,9 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector values = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp index 4e1d16c17f5713..71074db5cbb68a 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp @@ -8,8 +8,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - element::f32 +const std::vector precisions = { + ov::element::f32 }; const std::vector inputAndQuantizationShapes = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp index fb2c1d4128b07f..7d780b9d1245c1 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp @@ -11,9 +11,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - //ngraph::element::f16 +const std::vector precisions = { + ov::element::f32 }; const std::vector > inputAndQuantizationShapes = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp index 0573b240e1da7c..fff943198c58c0 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp @@ -11,9 +11,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp index 847ac5c32735a3..3f7c7a6af4b409 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp @@ -11,9 +11,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp index 3e2b1c01a99a65..475c5c2c2d0734 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp @@ -11,9 +11,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/pad_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/pad_transformation.cpp index 4d27832332ba60..ef919dc0b97943 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/pad_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/pad_transformation.cpp @@ -12,9 +12,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector inputShapes = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp index 8efea7150bd341..161e3c52c68eb2 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp @@ -11,8 +11,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32 +const std::vector precisions = { + ov::element::f32 }; std::vector testValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization.cpp index 03a1cc11af5aa5..19ee02775300b1 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization.cpp @@ -10,9 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/recurrent_cell_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/recurrent_cell_transformation.cpp index 42d513efad46fd..e2b278a4f5eb2e 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/recurrent_cell_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/recurrent_cell_transformation.cpp @@ -9,9 +9,8 @@ using namespace LayerTestsDefinitions; -const std::vector netPrecisions = { - ngraph::element::f32, - //ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp index f12d44e5195563..ca90bddce69815 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp @@ -12,9 +12,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp index 3e4506bac0fa9a..4ac21b8fa6660e 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp @@ -12,8 +12,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp index 07ef9b458ab632..c2ce9ff382a8f9 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp @@ -12,9 +12,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp index 1f5aec32221848..93a6f95fc8be0e 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp @@ -12,9 +12,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/relu_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/relu_transformation.cpp index 350e1892fc2ec5..9ee573edc3e9ca 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/relu_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/relu_transformation.cpp @@ -11,9 +11,8 @@ using namespace LayerTestsDefinitions; using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector precisions = { + ov::element::f32 }; std::vector testValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp index 1cca68667da319..cb32195d087d53 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp @@ -10,9 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp index eefbdde3c26428..10b33b99146e47 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp @@ -10,9 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector inputShapes = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/space_to_batch_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/space_to_batch_transformation.cpp index f46191ab6a5f77..b610d8498151a9 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/space_to_batch_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/space_to_batch_transformation.cpp @@ -10,9 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector params = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/split_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/split_transformation.cpp index 7ea0b65146b823..39f7ffdefe7377 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/split_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/split_transformation.cpp @@ -13,9 +13,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp index 794ddb29868e49..9af94d93064c9a 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp @@ -11,11 +11,10 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { - const std::vector precisions = { - ngraph::element::f32 + const std::vector precisions = { + ov::element::f32 }; - const std::vector trasformationParamValues = { LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), // LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsI8I8().setUpdatePrecisions(false), diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp index 1f08981510580d..141cc31aa0c709 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp @@ -12,9 +12,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp index 8d7fda0b60767e..768e4911a57a91 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp @@ -11,9 +11,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp index 663efad28b2ce6..53d2c6db762d64 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -11,9 +11,8 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp index 2125ceb013cdd7..e9554599355f7c 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp @@ -10,9 +10,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector precisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector precisions = { + ov::element::f32 }; const std::vector testValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp index 8b03c6c000fdd3..83b61268b52d06 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp @@ -11,11 +11,10 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { - const std::vector precisions = { - ngraph::element::f32 + const std::vector precisions = { + ov::element::f32 }; - const std::vector trasformationParamValues = { LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), // LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsI8I8().setUpdatePrecisions(false), diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp index afc6ca568aa3dc..12c19e0d10cc98 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp @@ -13,9 +13,8 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp index 80175ae893d015..dae92a52931cd5 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp @@ -23,8 +23,8 @@ namespace LayerTestsDefinitions { std::string OutputLayersConcat::getTestCaseName(const testing::TestParamInfo& obj) { - InferenceEngine::Precision netPrecision; - InferenceEngine::SizeVector inputShapes; + ov::element::Type netPrecision; + ov::Shape inputShapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShapes, targetDevice, params) = obj.param; @@ -49,10 +49,10 @@ std::string OutputLayersConcat::getTestCaseName(const testing::TestParamInfoGetParam(); + std::tie(ngPrecision, inputShape1, targetDevice, params) = this->GetParam(); init_input_shapes({ ov::PartialShape(inputShape1), @@ -64,8 +64,6 @@ void OutputLayersConcat::SetUp() { })) }); - auto ngPrecision = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - const auto input1 = std::make_shared(ngPrecision, ngraph::Shape(inputShape1)); input1->set_friendly_name("input1"); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp index cec968b7b957a9..dcd3ae682fae72 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp @@ -31,8 +31,8 @@ std::pair outputLayersHandlingInTransformationsForConcatMultiChann std::string OutputLayersConcatMultiChannel::getTestCaseName( const testing::TestParamInfo& obj) { - InferenceEngine::Precision netPrecision; - InferenceEngine::SizeVector inputShapes; + ov::element::Type netPrecision; + ov::Shape inputShapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShapes, targetDevice, params) = obj.param; @@ -57,16 +57,14 @@ std::string OutputLayersConcatMultiChannel::getTestCaseName( void OutputLayersConcatMultiChannel::SetUp() { rel_threshold = 0.05; - InferenceEngine::SizeVector inputShape1; - InferenceEngine::Precision netPrecision; + ov::Shape inputShape1; + ov::element::Type ngPrecision; ov::pass::low_precision::LayerTransformation::Params params; - std::tie(netPrecision, inputShape1, targetDevice, params) = this->GetParam(); + std::tie(ngPrecision, inputShape1, targetDevice, params) = this->GetParam(); const InferenceEngine::SizeVector inputShape2 = { inputShape1[0], inputShape1[1] * 2ul, inputShape1[2], inputShape1[3] }; init_input_shapes({ov::PartialShape(inputShape1), ov::PartialShape(inputShape1)}); - auto ngPrecision = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - const auto input1 = std::make_shared(ngPrecision, ngraph::Shape(inputShape1)); input1->set_friendly_name("input1"); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp index 6bf0f998d94545..ab779dedfca982 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp @@ -23,8 +23,8 @@ namespace LayerTestsDefinitions { std::string OutputLayers::getTestCaseName(const testing::TestParamInfo& obj) { - InferenceEngine::Precision netPrecision; - InferenceEngine::SizeVector inputShapes; + ov::element::Type netPrecision; + ov::Shape inputShapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShapes, targetDevice, params) = obj.param; @@ -34,15 +34,13 @@ std::string OutputLayers::getTestCaseName(const testing::TestParamInfoGetParam(); + std::tie(ngPrecision, inputShape, targetDevice, params) = this->GetParam(); init_input_shapes(ov::PartialShape(inputShape)); - auto ngPrecision = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); - const auto input = std::make_shared(ngPrecision, ngraph::Shape(inputShape)); input->set_friendly_name("input"); diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp index 543f4c8b60976d..7c72617223a036 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp @@ -40,13 +40,13 @@ class LayerTransformation : virtual public ov::test::SubgraphBaseTest { static std::string toString(const ov::pass::low_precision::LayerTransformation::Params& params); static std::string getTestCaseNameByParams( - const InferenceEngine::Precision precision, - const InferenceEngine::SizeVector& inputShapes, + const ov::element::Type precision, + const ov::Shape& inputShapes, const std::string& targetDevice, const ov::pass::low_precision::LayerTransformation::Params& params); static std::string getTestCaseNameByParams( - const ngraph::element::Type precision, + const ov::element::Type precision, const ngraph::PartialShape& inputShapes, const std::string& targetDevice, const ov::pass::low_precision::LayerTransformation::Params& params); @@ -68,8 +68,8 @@ class LayerTransformation : virtual public ov::test::SubgraphBaseTest { }; typedef std::tuple< - InferenceEngine::Precision, - InferenceEngine::SizeVector, + ov::element::Type, + ov::Shape, std::string, ov::pass::low_precision::LayerTransformation::Params> LayerTransformationParams; diff --git a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index e424a62f18fa0f..5f8407a97741af 100644 --- a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp +++ b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -57,17 +57,17 @@ std::string LayerTransformation::toString(const ov::pass::low_precision::LayerTr } std::string LayerTransformation::getTestCaseNameByParams( - const InferenceEngine::Precision precision, - const InferenceEngine::SizeVector& inputShapes, + const ov::element::Type precision, + const ov::Shape& inputShapes, const std::string& targetDevice, const ov::pass::low_precision::LayerTransformation::Params& params) { std::ostringstream result; - result << precision.name() << "_" << ngraph::Shape(inputShapes) << "_" << targetDevice << "_" << toString(params); + result << precision << "_" << ngraph::Shape(inputShapes) << "_" << targetDevice << "_" << toString(params); return result.str(); } std::string LayerTransformation::getTestCaseNameByParams( - const ngraph::element::Type precision, + const ov::element::Type precision, const ngraph::PartialShape& inputShapes, const std::string& targetDevice, const ov::pass::low_precision::LayerTransformation::Params& params) { From 473674ec509c2efc7494437076ebca98cbe76d5c Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Mon, 8 Jan 2024 17:05:31 +0100 Subject: [PATCH 17/37] cleanup InferenceEngine --- .../concat_with_child_and_output.cpp | 3 --- .../concat_with_different_precision_on_children.cpp | 3 --- .../concat_with_intermediate_transformation.cpp | 3 --- .../concat_with_split_transformation.cpp | 3 --- .../src/low_precision_transformations/output_layers_concat.cpp | 2 +- .../output_layers_concat_multi_channel.cpp | 2 +- 6 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp index e14eb173ad0188..53ec7b1c7d9b67 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp @@ -14,9 +14,6 @@ #include "ov_models/builders.hpp" #include "ov_lpt_models/concat.hpp" -using namespace InferenceEngine; -using namespace InferenceEngine::details; - namespace LayerTestsDefinitions { std::string ConcatWithChildAndOutputTransformation::getTestCaseName(const testing::TestParamInfo& obj) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp index ad6431fb4e1cab..364ee10677cfc3 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp @@ -14,9 +14,6 @@ #include "ov_models/builders.hpp" #include "ov_lpt_models/concat.hpp" -using namespace InferenceEngine; -using namespace InferenceEngine::details; - namespace LayerTestsDefinitions { std::string ConcatWithDifferentChildrenTransformation::getTestCaseName(const testing::TestParamInfo& obj) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp index f8c5de748f3e54..16ca8a3230896c 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp @@ -14,9 +14,6 @@ #include "ov_models/builders.hpp" #include "ov_lpt_models/concat.hpp" -using namespace InferenceEngine; -using namespace InferenceEngine::details; - namespace LayerTestsDefinitions { std::string ConcatWithIntermediateTransformation::getTestCaseName(const testing::TestParamInfo& obj) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp index aebc593ae27061..2015e673b244a6 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp @@ -14,9 +14,6 @@ #include "ov_models/builders.hpp" #include "ov_lpt_models/concat.hpp" -using namespace InferenceEngine; -using namespace InferenceEngine::details; - namespace LayerTestsDefinitions { std::string ConcatWithSplitTransformation::getTestCaseName(const testing::TestParamInfo& obj) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp index dae92a52931cd5..2c1fa5fc1d7cab 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp @@ -73,7 +73,7 @@ void OutputLayersConcat::SetUp() { fakeQuantize1->set_friendly_name("fakeQuantize1"); ASSERT_EQ(4ul, inputShape1.size()) << "unexpected input layout"; - const InferenceEngine::SizeVector inputShape2 = { inputShape1[0], inputShape1[1] * 2ul, inputShape1[2], inputShape1[3] }; + const ov::Shape inputShape2 = { inputShape1[0], inputShape1[1] * 2ul, inputShape1[2], inputShape1[3] }; const auto input2 = std::make_shared(ngPrecision, ngraph::Shape(inputShape2)); input2->set_friendly_name("input2"); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp index dcd3ae682fae72..89237906dfe4e7 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp @@ -62,7 +62,7 @@ void OutputLayersConcatMultiChannel::SetUp() { ov::pass::low_precision::LayerTransformation::Params params; std::tie(ngPrecision, inputShape1, targetDevice, params) = this->GetParam(); - const InferenceEngine::SizeVector inputShape2 = { inputShape1[0], inputShape1[1] * 2ul, inputShape1[2], inputShape1[3] }; + const ov::Shape inputShape2 = { inputShape1[0], inputShape1[1] * 2ul, inputShape1[2], inputShape1[3] }; init_input_shapes({ov::PartialShape(inputShape1), ov::PartialShape(inputShape1)}); const auto input1 = std::make_shared(ngPrecision, ngraph::Shape(inputShape1)); From 95cf4eaa386e9973006e1032efc908f47182eaf7 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Mon, 8 Jan 2024 17:17:40 +0100 Subject: [PATCH 18/37] use ov instead ov ngraph --- .../add_transformation.cpp | 8 ++++---- .../assign_and_read_value_transformation.cpp | 8 ++++---- .../batch_to_space_transformation.cpp | 4 ++-- .../clamp_transformation.cpp | 8 ++++---- .../concat_transformation.cpp | 10 +++++----- .../concat_with_child_and_output.cpp | 8 ++++---- ...t_with_different_precision_on_children.cpp | 8 ++++---- ...oncat_with_intermediate_transformation.cpp | 14 ++++++------- ...at_with_neighbors_graph_transformation.cpp | 14 ++++++------- .../concat_with_split_transformation.cpp | 8 ++++---- ...nvolution_backprop_data_transformation.cpp | 14 ++++++------- .../convolution_qdq_transformation.cpp | 8 ++++---- .../convolution_transformation.cpp | 10 +++++----- .../convolution_with_incorrect_weights.cpp | 8 ++++---- .../depth_to_space_transformation.cpp | 8 ++++---- ...ntwise_branch_selection_transformation.cpp | 8 ++++---- ...e_quantize_and_avg_pool_transformation.cpp | 8 ++++---- ...e_quantize_and_max_pool_transformation.cpp | 8 ++++---- ...d_two_output_branches_with_convolution.cpp | 8 ++++---- ...ize_precision_selection_transformation.cpp | 8 ++++---- .../fake_quantize_transformation.cpp | 10 +++++----- ...ize_with_dq_not_optimal_transformation.cpp | 8 ++++---- .../fully_connected_transformation.cpp | 4 ++-- .../fuse_convert_transformation.cpp | 8 ++++---- ...uantize_and_scale_shift_transformation.cpp | 8 ++++---- .../gather_transformation.cpp | 4 ++-- .../gemm_transformation.cpp | 12 +++++------ .../group_convolution_transformation.cpp | 10 +++++----- .../groupconvolution_qdq_transformation.cpp | 8 ++++---- .../interpolate_transformation.cpp | 8 ++++---- .../mat_mul_transformation.cpp | 8 ++++---- .../mat_mul_with_constant_transformation.cpp | 6 +++--- .../mat_mul_with_optimized_constant_fq.cpp | 8 ++++---- .../move_fake_quantize_transformation.cpp | 10 +++++----- ...ly_to_group_convolution_transformation.cpp | 10 +++++----- .../multiply_transformation.cpp | 18 ++++++++--------- ...ultiply_with_one_parent_transformation.cpp | 8 ++++---- .../mvn_transformation.cpp | 12 +++++------ .../normalize_transformation.cpp | 10 +++++----- .../output_layers_concat.cpp | 20 +++++++++---------- .../output_layers_concat_multi_channel.cpp | 16 +++++++-------- ...put_layers_handling_in_transformations.cpp | 16 +++++++-------- .../pad_transformation.cpp | 8 ++++---- .../prelu_transformation.cpp | 8 ++++---- ..._through_dequantization_transformation.cpp | 12 +++++------ .../recurrent_cell_transformation.cpp | 14 ++++++------- .../reduce_max_transformation.cpp | 8 ++++---- .../reduce_mean_transformation.cpp | 8 ++++---- .../reduce_min_transformation.cpp | 8 ++++---- .../reduce_sum_transformation.cpp | 8 ++++---- .../relu_transformation.cpp | 8 ++++---- .../reshape_transformation.cpp | 4 ++-- .../shuffle_channels_transformation.cpp | 8 ++++---- .../space_to_batch_transformation.cpp | 4 ++-- .../split_transformation.cpp | 8 ++++---- .../squeeze_transformation.cpp | 4 ++-- .../strided_slice_transformation.cpp | 8 ++++---- .../subtract_transformation.cpp | 8 ++++---- .../transpose_after_matmul_transformation.cpp | 8 ++++---- .../transpose_transformation.cpp | 4 ++-- .../unsqueeze_transformation.cpp | 4 ++-- .../variadic_split_transformation.cpp | 8 ++++---- .../layer_transformation.hpp | 6 +++--- 63 files changed, 278 insertions(+), 278 deletions(-) diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp index 685d52db9d632a..d1d0563f5fa818 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp @@ -17,8 +17,8 @@ namespace LayerTestsDefinitions { std::string AddTransformation::getTestCaseName(const testing::TestParamInfo< AddTransformationParams>& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; std::string targetDevice; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); AddTestValues param; @@ -55,8 +55,8 @@ std::string AddTransformation::getTestCaseName(const testing::TestParamInfo< Add void AddTransformation::SetUp() { abs_threshold = 1.1; rel_threshold = 3; - ngraph::element::Type precision; - ngraph::PartialShape inputShape; + ov::element::Type precision; + ov::PartialShape inputShape; AddTestValues param; std::tie(precision, inputShape, targetDevice, param) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp index 8cf411f0985938..167bc7ff3dd66e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp @@ -13,8 +13,8 @@ namespace LayerTestsDefinitions { std::string AssignAndReadValueTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; size_t opset; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; @@ -28,8 +28,8 @@ std::string AssignAndReadValueTransformation::getTestCaseName(const testing::Tes } void AssignAndReadValueTransformation::SetUp() { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; size_t opset; ov::pass::low_precision::LayerTransformation::Params params; AssignAndReadValueTransformationParam param; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp index 13a6ef2a1155af..70e9b415a61efc 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { std::string BatchToSpaceTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type input_type; + ov::element::Type input_type; std::string target_device; BatchToSpaceTransformationParam param; std::tie(input_type, target_device, param) = obj.param; @@ -27,7 +27,7 @@ std::string BatchToSpaceTransformation::getTestCaseName(const testing::TestParam void BatchToSpaceTransformation::SetUp() { abs_threshold = 1.1; - ngraph::element::Type input_type; + ov::element::Type input_type; BatchToSpaceTransformationParam param; std::tie(input_type, targetDevice, param) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp index ac49c830a030cf..9d3b0db707f6a7 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp @@ -13,8 +13,8 @@ namespace LayerTestsDefinitions { std::string ClampTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ClampTransformationParam param;; @@ -31,8 +31,8 @@ std::string ClampTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp index 74992de4e96e50..9026136b6f5076 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp @@ -17,8 +17,8 @@ namespace LayerTestsDefinitions { std::string ConcatTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type precision; - ngraph::PartialShape inputShapes; + ov::element::Type precision; + ov::PartialShape inputShapes; std::string targetDevice; ConcatTransformationTestValues testValues; std::tie(precision, inputShapes, targetDevice, testValues) = obj.param; @@ -38,12 +38,12 @@ void ConcatTransformation::SetUp() { abs_threshold = 0.1; rel_threshold = 4.2; - ngraph::PartialShape inputShape; - ngraph::element::Type precision; + ov::PartialShape inputShape; + ov::element::Type precision; ConcatTransformationTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = this->GetParam(); - std::vector inputs; + std::vector inputs; if (testValues.input_constant1 == nullptr) { inputs.push_back(inputShape); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp index 53ec7b1c7d9b67..d3f57f228d30ff 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp @@ -17,8 +17,8 @@ namespace LayerTestsDefinitions { std::string ConcatWithChildAndOutputTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; std::string targetDevice; ConcatWithChildAndOutputTransformationParam param; ov::pass::low_precision::LayerTransformation::Params params; @@ -46,8 +46,8 @@ void ConcatWithChildAndOutputTransformation::SetUp() { rel_threshold = 5; abs_threshold = 0.1; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; ConcatWithChildAndOutputTransformationParam param; ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShapes, targetDevice, param, params) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp index 364ee10677cfc3..d945f609f06d13 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp @@ -17,8 +17,8 @@ namespace LayerTestsDefinitions { std::string ConcatWithDifferentChildrenTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; std::string targetDevice; ConcatWithDifferentChildrenTransformationParam param; ov::pass::low_precision::LayerTransformation::Params params; @@ -35,8 +35,8 @@ std::string ConcatWithDifferentChildrenTransformation::getTestCaseName(const tes void ConcatWithDifferentChildrenTransformation::SetUp() { abs_threshold = 0.1; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; ConcatWithDifferentChildrenTransformationParam param; ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShapes, targetDevice, param, params) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp index 16ca8a3230896c..2aa5f5846b89f5 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp @@ -17,8 +17,8 @@ namespace LayerTestsDefinitions { std::string ConcatWithIntermediateTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; bool transparentIntermediate; @@ -46,14 +46,14 @@ std::string ConcatWithIntermediateTransformation::getTestCaseName(const testing: void ConcatWithIntermediateTransformation::SetUp() { abs_threshold = 0.1; - ngraph::element::Type ngPrecision; - ngraph::PartialShape inputShape; + ov::element::Type ngPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params trasformationParams; bool transparentIntermediate; bool multichannel; std::tie(ngPrecision, inputShape, targetDevice, trasformationParams, transparentIntermediate, multichannel) = this->GetParam(); - ngraph::PartialShape inputShape1 = inputShape; + ov::PartialShape inputShape1 = inputShape; if (inputShape1[2].is_static() && transparentIntermediate) { inputShape1[2] = inputShape1[2].get_length() - 2; } @@ -68,8 +68,8 @@ void ConcatWithIntermediateTransformation::SetUp() { ngPrecision, inputShape, transparentIntermediate, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 2.f} }); + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 2.f} }); } TEST_P(ConcatWithIntermediateTransformation, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp index 2c71a013005108..55625d534d3f2d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp @@ -17,8 +17,8 @@ namespace LayerTestsDefinitions { std::string ConcatWithNeighborsGraphTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type precision; - ngraph::PartialShape inputShapes; + ov::element::Type precision; + ov::PartialShape inputShapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; std::tie(precision, inputShapes, targetDevice, params) = obj.param; @@ -30,8 +30,8 @@ std::string ConcatWithNeighborsGraphTransformation::getTestCaseName(const testin void ConcatWithNeighborsGraphTransformation::SetUp() { rel_threshold = 0.1; abs_threshold = 0.1; - ngraph::element::Type ngPrecision; - ngraph::PartialShape inputShape; + ov::element::Type ngPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; std::tie(ngPrecision, inputShape, targetDevice, params) = this->GetParam(); @@ -40,9 +40,9 @@ void ConcatWithNeighborsGraphTransformation::SetUp() { function = ngraph::builder::subgraph::ConcatFunction::getOriginalWithNeighbors( ngPrecision, inputShape, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 2.f} }, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 3.f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 2.f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 3.f} }, "concat", ""); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp index 2015e673b244a6..4dbdf9e385879c 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp @@ -17,8 +17,8 @@ namespace LayerTestsDefinitions { std::string ConcatWithSplitTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; std::string targetDevice; ConcatWithSplitTransformationParam param; ov::pass::low_precision::LayerTransformation::Params params; @@ -42,8 +42,8 @@ void ConcatWithSplitTransformation::SetUp() { abs_threshold = 0.1; rel_threshold = 4.2; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; ConcatWithSplitTransformationParam param; ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShapes, targetDevice, param, params) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp index 798c34bfc7fd8e..e68417a5cde97f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -13,9 +13,9 @@ namespace LayerTestsDefinitions { std::string ConvolutionBackpropDataTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - std::pair inputShape; - ngraph::Shape outputShape; + ov::element::Type netPrecision; + std::pair inputShape; + ov::Shape outputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ConvolutionBackpropDataTransformationParam param; @@ -34,9 +34,9 @@ void ConvolutionBackpropDataTransformation::SetUp() { rel_threshold = 3.1; abs_threshold = 800.1; - ngraph::element::Type netPrecision; - std::pair inputShapeAndHandling; - ngraph::Shape outputShape; + ov::element::Type netPrecision; + std::pair inputShapeAndHandling; + ov::Shape outputShape; ov::pass::low_precision::LayerTransformation::Params params; ConvolutionBackpropDataTransformationParam param; std::tie(netPrecision, inputShapeAndHandling, outputShape, targetDevice, params, param) = this->GetParam(); @@ -48,7 +48,7 @@ void ConvolutionBackpropDataTransformation::SetUp() { init_input_shapes(inputShape); - ngraph::Shape weightsShape(4, 1ul); + ov::Shape weightsShape(4, 1ul); weightsShape[0] = inputShape[1].get_length(); weightsShape[1] = inputShape[1].get_length() / 2; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp index 49458c231f4636..b6221364350528 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp @@ -21,8 +21,8 @@ namespace LayerTestsDefinitions { std::string ConvolutionQDqTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ConvolutionQDqTransformationParam param; @@ -37,8 +37,8 @@ void ConvolutionQDqTransformation::SetUp() { rel_threshold = 0.1; abs_threshold = 12.8; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; ConvolutionQDqTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp index f00de4b5709b21..863f7ab7966155 100755 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp @@ -21,8 +21,8 @@ namespace LayerTestsDefinitions { std::string ConvolutionTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ConvolutionTransformationParam param; @@ -40,8 +40,8 @@ void ConvolutionTransformation::SetUp() { rel_threshold = 1.0e+10; abs_threshold = 1.4; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; ConvolutionTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); @@ -62,7 +62,7 @@ void ConvolutionTransformation::run() { const auto params = std::get<4>(GetParam()); const auto actualPrecision = getRuntimePrecisionByType(params.layerName); auto expectedPrecision = params.expectedKernelType; - if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ngraph::element::f16) { + if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; } EXPECT_EQ(actualPrecision, expectedPrecision); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp index 39350033c860b2..76b7a0c7042d78 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp @@ -21,8 +21,8 @@ namespace LayerTestsDefinitions { std::string ConvolutionWIthIncorrectWeightsTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ConvolutionWIthIncorrectWeightsParam param; @@ -40,8 +40,8 @@ void ConvolutionWIthIncorrectWeightsTransformation::SetUp() { rel_threshold = 0.1; abs_threshold = 16.1; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; ConvolutionWIthIncorrectWeightsParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp index b53fbe87c97d40..400a43e4493223 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp @@ -35,8 +35,8 @@ std::string DepthToSpaceTransformation::getTestCaseName(const testing::TestParam {ov::op::v0::DepthToSpace::DepthToSpaceMode::DEPTH_FIRST, "DEPTH_FIRST"}, }; - ngraph::element::Type precision; - ngraph::PartialShape inputShape; + ov::element::Type precision; + ov::PartialShape inputShape; std::string targetDevice; ov::op::v0::DepthToSpace::DepthToSpaceMode mode; size_t blockSize; @@ -50,8 +50,8 @@ std::string DepthToSpaceTransformation::getTestCaseName(const testing::TestParam } void DepthToSpaceTransformation::SetUp() { - ngraph::element::Type precision; - ngraph::PartialShape inputShape; + ov::element::Type precision; + ov::PartialShape inputShape; ov::op::v0::DepthToSpace::DepthToSpaceMode mode; size_t blockSize; std::tie(precision, inputShape, targetDevice, mode, blockSize) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp index 7c079939343574..0cc5702e9cef8c 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp @@ -13,8 +13,8 @@ namespace LayerTestsDefinitions { std::string ElementwiseBranchSelectionTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; std::string targetDevice; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); ElementwiseBranchSelectionTestValues param; @@ -48,8 +48,8 @@ std::string ElementwiseBranchSelectionTransformation::getTestCaseName(const test } void ElementwiseBranchSelectionTransformation::SetUp() { - ngraph::element::Type precision; - ngraph::PartialShape inputShape; + ov::element::Type precision; + ov::PartialShape inputShape; ElementwiseBranchSelectionTestValues param; std::string elementwiseType; std::tie(precision, inputShape, targetDevice, param, elementwiseType) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp index b8287b08f26b99..2fcba26584c214 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp @@ -17,8 +17,8 @@ namespace LayerTestsDefinitions { std::string FakeQuantizeAndAvgPoolTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type precision; - ngraph::PartialShape inputShapes; + ov::element::Type precision; + ov::PartialShape inputShapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; @@ -30,8 +30,8 @@ std::string FakeQuantizeAndAvgPoolTransformation::getTestCaseName(const testing: void FakeQuantizeAndAvgPoolTransformation::SetUp() { rel_threshold = 0.5f; abs_threshold = 1.0; - ngraph::element::Type precision; - ngraph::PartialShape inputShape; + ov::element::Type precision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; std::tie(precision, inputShape, targetDevice, params, fakeQuantize) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp index a4b7b181613cca..83ce10b7818b28 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp @@ -17,8 +17,8 @@ namespace LayerTestsDefinitions { std::string FakeQuantizeAndMaxPoolTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type precision; - ngraph::PartialShape inputShapes; + ov::element::Type precision; + ov::PartialShape inputShapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; @@ -29,8 +29,8 @@ std::string FakeQuantizeAndMaxPoolTransformation::getTestCaseName(const testing: void FakeQuantizeAndMaxPoolTransformation::SetUp() { abs_threshold = 1.0; - ngraph::element::Type precision; - ngraph::PartialShape inputShape; + ov::element::Type precision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; std::tie(precision, inputShape, targetDevice, params, fakeQuantize) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp index 77e14b6aa8dc6d..91628f69d3de1b 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp @@ -21,8 +21,8 @@ namespace LayerTestsDefinitions { std::string FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation::getTestCaseName( const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; FakeQuantizeAndTwoOutputBranchesWithConvolution testValues; @@ -39,8 +39,8 @@ void FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation::SetUp() { rel_threshold = 0.1; abs_threshold = 0.1; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; FakeQuantizeAndTwoOutputBranchesWithConvolution testValues; std::tie(netPrecision, inputShape, targetDevice, params, testValues) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp index b2edaf27a55a53..0c2fc1316b7fc9 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp @@ -16,8 +16,8 @@ namespace LayerTestsDefinitions { std::string FakeQuantizePrecisionSelectionTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; FakeQuantizePrecisionSelectionTransformationTestValues testValues; @@ -31,8 +31,8 @@ std::string FakeQuantizePrecisionSelectionTransformation::getTestCaseName(const void FakeQuantizePrecisionSelectionTransformation::SetUp() { abs_threshold = 0.01; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; FakeQuantizePrecisionSelectionTransformationTestValues testValues; std::tie(netPrecision, inputShape, targetDevice, params, testValues) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp index a70b0401c0d997..c1b81aeed3b9e0 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp @@ -18,8 +18,8 @@ namespace LayerTestsDefinitions { std::string FakeQuantizeTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; FakeQuantizeTransformationParam testParams; @@ -35,8 +35,8 @@ std::string FakeQuantizeTransformation::getTestCaseName(const testing::TestParam void FakeQuantizeTransformation::SetUp() { abs_threshold = 1.0e-3; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; FakeQuantizeTransformationParam testParams; bool isConvertOnConstants; @@ -62,7 +62,7 @@ void FakeQuantizeTransformation::run() { const auto params = std::get<4>(GetParam()); const auto actualPrecision = getRuntimePrecisionByType(params.layerName); auto expectedPrecision = params.expectedKernelType; - if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ngraph::element::f16) { + if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index 5b42e46afc1074..7f7c30c9837a87 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -16,8 +16,8 @@ namespace LayerTestsDefinitions { std::string FakeQuantizeWithNotOptimalTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; FakeQuantizeWithNotOptimalTransformationTestValues testValues; @@ -32,8 +32,8 @@ void FakeQuantizeWithNotOptimalTransformation::SetUp() { abs_threshold = 4; rel_threshold = 2778; SKIP_IF_CURRENT_TEST_IS_DISABLED(); - ngraph::PartialShape inputShape; - ngraph::element::Type netPrecision; + ov::PartialShape inputShape; + ov::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; FakeQuantizeWithNotOptimalTransformationTestValues testValues; std::tie(netPrecision, inputShape, targetDevice, params, testValues) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp index 64423a4c9893c3..6769883d39170b 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp @@ -22,7 +22,7 @@ namespace LayerTestsDefinitions { std::string FullyConnectedTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type precision; + ov::element::Type precision; MatMulShapes shapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; @@ -41,7 +41,7 @@ std::string FullyConnectedTransformation::getTestCaseName(const testing::TestPar void FullyConnectedTransformation::SetUp() { abs_threshold = 0.6; - ngraph::element::Type precision; + ov::element::Type precision; MatMulShapes shapes; ov::pass::low_precision::LayerTransformation::Params params; std::tie(precision, shapes, targetDevice, params) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp index ac7160c930fb92..7291fb9d960102 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp @@ -23,8 +23,8 @@ namespace LayerTestsDefinitions { std::string FuseConvertTransformation::getTestCaseName(const testing::TestParamInfo& obj) { std::string targetDevice; - ngraph::PartialShape shape; - ngraph::element::Type precision; + ov::PartialShape shape; + ov::element::Type precision; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); ngraph::builder::subgraph::DequantizationOperations deqOperations; bool constInput; @@ -38,8 +38,8 @@ std::string FuseConvertTransformation::getTestCaseName(const testing::TestParamI void FuseConvertTransformation::SetUp() { abs_threshold = 0.01; - ngraph::PartialShape shape; - ngraph::element::Type precision; + ov::PartialShape shape; + ov::element::Type precision; ngraph::builder::subgraph::DequantizationOperations deqOperations; bool constInput; std::tie(precision, shape, targetDevice, deqOperations, constInput) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp index 1322cd390196cd..0bacb7b9be746b 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp @@ -15,8 +15,8 @@ namespace LayerTestsDefinitions { std::string FuseFakeQuantizeAndScaleShiftTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData; @@ -29,8 +29,8 @@ std::string FuseFakeQuantizeAndScaleShiftTransformation::getTestCaseName(const t void FuseFakeQuantizeAndScaleShiftTransformation::SetUp() { abs_threshold = 1.8; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData; std::tie(netPrecision, inputShape, targetDevice, params, fakeQuantizeOnData) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/gather_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/gather_transformation.cpp index f9c49c012a3fe4..3592e87fb41e45 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/gather_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/gather_transformation.cpp @@ -16,7 +16,7 @@ namespace LayerTestsDefinitions { std::string GatherTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type precision; + ov::element::Type precision; std::string targetDevice; GatherTransformationTestValues testValues; int opset_version; @@ -33,7 +33,7 @@ std::string GatherTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp index ab81c7a94c9dac..205049d3b60b7f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp @@ -22,8 +22,8 @@ namespace LayerTestsDefinitions { std::string GemmTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShape, targetDevice, params) = obj.param; @@ -34,15 +34,15 @@ std::string GemmTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); init_input_shapes({ inputShape, inputShape }); - const float low = 0.f; // params.precisionsOnActivations[0] == ngraph::element::u8 ? 0.f : -128.f; - const float high = 255.f; // params.precisionsOnActivations[0] == ngraph::element::u8 ? 255.f : 127.f; + const float low = 0.f; // params.precisionsOnActivations[0] == ov::element::u8 ? 0.f : -128.f; + const float high = 255.f; // params.precisionsOnActivations[0] == ov::element::u8 ? 255.f : 127.f; function = ngraph::builder::subgraph::MatMulFunction::getOriginal( netPrecision, diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp index b981c76b87b153..d7647edccd4e37 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp @@ -20,10 +20,10 @@ namespace LayerTestsDefinitions { std::string GroupConvolutionTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; + ov::element::Type netPrecision; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; - std::pair inputShapes; + std::pair inputShapes; GroupConvolutionTransformationParam param; bool addPrecisionPreserved; std::tie(netPrecision, targetDevice, params, inputShapes, param, addPrecisionPreserved) = obj.param; @@ -47,9 +47,9 @@ void GroupConvolutionTransformation::SetUp() { rel_threshold = 0.1; abs_threshold = 0.1; - ngraph::element::Type netPrecision; + ov::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; - std::pair inputShapes; + std::pair inputShapes; GroupConvolutionTransformationParam param; bool addPrecisionPreserved; std::tie(netPrecision, targetDevice, params, inputShapes, param, addPrecisionPreserved) = this->GetParam(); @@ -78,7 +78,7 @@ void GroupConvolutionTransformation::run() { if (!param.layerName.empty()) { const auto actualPrecision = getRuntimePrecisionByType(param.layerName); auto expectedPrecision = param.expectedKernelType; - if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ngraph::element::f16) { + if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; } EXPECT_EQ(actualPrecision, expectedPrecision); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp index c646f3ea724101..aa5a5eaf4c0096 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -21,8 +21,8 @@ namespace LayerTestsDefinitions { std::string GroupConvolutionQDqTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; GroupConvolutionQDqTransformationParam param; @@ -37,8 +37,8 @@ void GroupConvolutionQDqTransformation::SetUp() { abs_threshold = 153.7; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; GroupConvolutionQDqTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp index 6a8aa914d4e34f..fc5106232a47cf 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp @@ -29,8 +29,8 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector& values) } std::string InterpolateTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type precision; - std::pair shapes; + ov::element::Type precision; + std::pair shapes; std::string targetDevice; interpAttributes attributes; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); @@ -49,8 +49,8 @@ std::string InterpolateTransformation::getTestCaseName(const testing::TestParamI } void InterpolateTransformation::SetUp() { - ngraph::element::Type precision; - std::pair shapes; + ov::element::Type precision; + std::pair shapes; interpAttributes attributes; std::tie(precision, shapes, targetDevice, attributes) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp index 171930672f5bd9..088a226240cbbb 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp @@ -20,8 +20,8 @@ namespace LayerTestsDefinitions { std::string MatMulTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type precision; - ngraph::PartialShape inputShape; + ov::element::Type precision; + ov::PartialShape inputShape; std::string targetDevice; MatMulTransformationTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = obj.param; @@ -42,8 +42,8 @@ std::string MatMulTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp index b64ee60c2eb6a8..1776f2f6c65bac 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -20,7 +20,7 @@ namespace LayerTestsDefinitions { std::string MatMulWithConstantTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type precision; + ov::element::Type precision; std::string targetDevice; MatMulWithConstantTransformationTestValues testValues; std::tie(precision, targetDevice, testValues) = obj.param; @@ -41,7 +41,7 @@ std::string MatMulWithConstantTransformation::getTestCaseName(const testing::Tes void MatMulWithConstantTransformation::SetUp() { abs_threshold = 1.0e-3; - ngraph::element::Type precision; + ov::element::Type precision; MatMulWithConstantTransformationTestValues testValues; std::tie(precision, targetDevice, testValues) = this->GetParam(); @@ -64,7 +64,7 @@ void MatMulWithConstantTransformation::run() { const auto params = std::get<2>(GetParam()); const auto actualPrecision = getRuntimePrecisionByType(params.layerName); auto expectedPrecision = params.expectedKernelType; - if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ngraph::element::f16) { + if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; } EXPECT_EQ(actualPrecision, expectedPrecision); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp index e8d0b604597ca5..bd7c4a03e4928e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp @@ -22,8 +22,8 @@ namespace LayerTestsDefinitions { std::string MatMulWithOptimizedConstantFq::getTestCaseName( const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - std::pair shapes; + ov::element::Type netPrecision; + std::pair shapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; MatMulWithOptimizedConstantFakeQuantizeTransformationTestValues param; @@ -43,8 +43,8 @@ void MatMulWithOptimizedConstantFq::SetUp() { rel_threshold = 0.01; abs_threshold = 2.1; - ngraph::element::Type precision; - std::pair shapes; + ov::element::Type precision; + std::pair shapes; ov::pass::low_precision::LayerTransformation::Params params; MatMulWithOptimizedConstantFakeQuantizeTransformationTestValues param; std::tie(precision, shapes, targetDevice, param) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp index e7dd576fc96254..50418183006d58 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp @@ -19,8 +19,8 @@ namespace LayerTestsDefinitions { std::string MoveFakeQuantizeTransformation::getTestCaseName(testing::TestParamInfo obj) { - ngraph::element::Type netPrecision; - std::vector inputShape; + ov::element::Type netPrecision; + std::vector inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; bool oneInputWithSplit; @@ -39,8 +39,8 @@ std::string MoveFakeQuantizeTransformation::getTestCaseName(testing::TestParamIn void MoveFakeQuantizeTransformation::SetUp() { abs_threshold = 1.1; - ngraph::element::Type netPrecision; - std::vector inputShapes; + ov::element::Type netPrecision; + std::vector inputShapes; ov::pass::low_precision::LayerTransformation::Params params; bool oneInputWithSplit; MoveFakeQuantizeTransformationParam param; @@ -88,7 +88,7 @@ void MoveFakeQuantizeTransformation::run() { const auto params = std::get<5>(GetParam()); const auto actualPrecision = getRuntimePrecisionByType(params.layerName); auto expectedPrecision = params.expectedKernelType; - if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ngraph::element::f16) { + if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; } EXPECT_EQ(actualPrecision, expectedPrecision); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp index f3cb8ef5d8afbd..e667eb3885825d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp @@ -23,8 +23,8 @@ namespace LayerTestsDefinitions { std::string MultiplyToGroupConvolutionTransformation::getTestCaseName(const testing::TestParamInfo& obj) { std::string targetDevice; - ngraph::element::Type precision; - ngraph::PartialShape shape; + ov::element::Type precision; + ov::PartialShape shape; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); MultiplyToGroupConvolutionTransformationParam param; std::tie(precision, shape, targetDevice, param) = obj.param; @@ -40,8 +40,8 @@ std::string MultiplyToGroupConvolutionTransformation::getTestCaseName(const test } void MultiplyToGroupConvolutionTransformation::SetUp() { - ngraph::PartialShape shape; - ngraph::element::Type precision; + ov::PartialShape shape; + ov::element::Type precision; MultiplyToGroupConvolutionTransformationParam param; std::tie(precision, shape, targetDevice, param) = this->GetParam(); @@ -61,7 +61,7 @@ void MultiplyToGroupConvolutionTransformation::run() { const auto param = std::get<3>(GetParam()); const auto actualPrecision = getRuntimePrecision(param.layerName); auto expectedPrecision = param.expectedKernelType; - if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ngraph::element::f16) { + if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; } EXPECT_EQ(actualPrecision, expectedPrecision); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp index 70c0c4af81d53f..06484ec7e182de 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp @@ -18,8 +18,8 @@ namespace LayerTestsDefinitions { std::string MultiplyTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type precision; - ngraph::PartialShape inputShapes; + ov::element::Type precision; + ov::PartialShape inputShapes; std::string targetDevice; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); MultiplyTestValues param; @@ -53,8 +53,8 @@ std::string MultiplyTransformation::getTestCaseName(const testing::TestParamInfo void MultiplyTransformation::SetUp() { abs_threshold = 0.1; - ngraph::element::Type precision; - ngraph::PartialShape inputShape; + ov::element::Type precision; + ov::PartialShape inputShape; MultiplyTestValues param; std::tie(precision, inputShape, targetDevice, param) = this->GetParam(); @@ -64,7 +64,7 @@ void MultiplyTransformation::SetUp() { inputShape1[3] = 1; } - ngraph::PartialShape inputShape2; + ov::PartialShape inputShape2; if (param.secondInputIsConstant) { inputShape2 = {}; } else { @@ -97,15 +97,15 @@ void MultiplyTransformation::run() { const auto params = std::get<3>(GetParam()); - auto to_string = [](const ngraph::element::Type& precision) -> std::string { + auto to_string = [](const ov::element::Type& precision) -> std::string { switch (precision) { - case ngraph::element::f32: { + case ov::element::f32: { return "f32"; } - case ngraph::element::i8: { + case ov::element::i8: { return "i8"; } - case ngraph::element::u8: { + case ov::element::u8: { return "u8"; } default: { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp index ffc6837a7f990f..52257fa4bc3770 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp @@ -16,8 +16,8 @@ namespace LayerTestsDefinitions { std::string MultiplyWithOneParentTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; MultiplyWithOneParentTransformationValues values; @@ -31,8 +31,8 @@ std::string MultiplyWithOneParentTransformation::getTestCaseName(const testing:: void MultiplyWithOneParentTransformation::SetUp() { rel_threshold = 0.01f; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; MultiplyWithOneParentTransformationValues values; std::tie(netPrecision, inputShape, targetDevice, values) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp index b61ac53e41bf63..80c0ff7bfdf5b9 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp @@ -23,10 +23,10 @@ namespace LayerTestsDefinitions { std::string MVNTransformation::getTestCaseName(const testing::TestParamInfo& obj) { std::string targetDevice; - ngraph::PartialShape shape; - ngraph::element::Type precision; + ov::PartialShape shape; + ov::element::Type precision; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); - ngraph::AxisSet reductionAxes; + ov::AxisSet reductionAxes; bool normalizeVariance; std::tie(precision, shape, targetDevice, reductionAxes, normalizeVariance) = obj.param; @@ -38,9 +38,9 @@ std::string MVNTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp index 4a92af2d424ea1..b2c6d68589c57e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp @@ -22,8 +22,8 @@ namespace LayerTestsDefinitions { std::string NormalizeL2Transformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - std::pair shapes; + ov::element::Type netPrecision; + std::pair shapes; std::string targetDevice; auto params = LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(); std::vector axes; @@ -47,8 +47,8 @@ void NormalizeL2Transformation::SetUp() { rel_threshold = 0.1; abs_threshold = 0.1; - std::pair shapes; - ngraph::element::Type precision; + std::pair shapes; + ov::element::Type precision; std::vector axes; bool fuseMultiply; bool shift; @@ -59,7 +59,7 @@ void NormalizeL2Transformation::SetUp() { function = ngraph::builder::subgraph::NormalizeL2Function::getOriginal( precision, shapes, - ngraph::element::u8, + ov::element::u8, axes, fuseMultiply, shift); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp index 2c1fa5fc1d7cab..0c47a869a2d025 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp @@ -64,7 +64,7 @@ void OutputLayersConcat::SetUp() { })) }); - const auto input1 = std::make_shared(ngPrecision, ngraph::Shape(inputShape1)); + const auto input1 = std::make_shared(ngPrecision, ov::Shape(inputShape1)); input1->set_friendly_name("input1"); const auto fakeQuantize1 = ov::test::utils::make_fake_quantize( @@ -74,7 +74,7 @@ void OutputLayersConcat::SetUp() { ASSERT_EQ(4ul, inputShape1.size()) << "unexpected input layout"; const ov::Shape inputShape2 = { inputShape1[0], inputShape1[1] * 2ul, inputShape1[2], inputShape1[3] }; - const auto input2 = std::make_shared(ngPrecision, ngraph::Shape(inputShape2)); + const auto input2 = std::make_shared(ngPrecision, ov::Shape(inputShape2)); input2->set_friendly_name("input2"); const auto fakeQuantize2 = ov::test::utils::make_fake_quantize( @@ -83,13 +83,13 @@ void OutputLayersConcat::SetUp() { fakeQuantize2->set_friendly_name("fakeQuantize2"); const std::shared_ptr concat = std::make_shared( - ngraph::OutputVector{ fakeQuantize1->output(0), fakeQuantize2->output(0)}, 1); + ov::OutputVector{ fakeQuantize1->output(0), fakeQuantize2->output(0)}, 1); concat->set_friendly_name("concat"); const float k = 1.f; const auto weights = ov::op::v0::Constant::create( ngPrecision, - ngraph::Shape{ inputShape1[1ul] + inputShape2[1ul], inputShape1[1ul] + inputShape2[1ul], 1ul, 1ul }, + ov::Shape{ inputShape1[1ul] + inputShape2[1ul], inputShape1[1ul] + inputShape2[1ul], 1ul, 1ul }, std::vector((inputShape1[1ul] + inputShape2[1ul]) * (inputShape1[1ul] + inputShape2[1ul]), 1ul)); weights->set_friendly_name("weights"); const auto fakeQuantizeOnWeights = ov::test::utils::make_fake_quantize( @@ -100,19 +100,19 @@ void OutputLayersConcat::SetUp() { const std::shared_ptr convolution = std::make_shared( concat->output(0), fakeQuantizeOnWeights, - ngraph::Strides{ 1ul, 1ul }, - ngraph::CoordinateDiff{ 0, 0 }, - ngraph::CoordinateDiff{ 0, 0 }, - ngraph::Strides{ 1ul, 1ul }); + ov::Strides{ 1ul, 1ul }, + ov::CoordinateDiff{ 0, 0 }, + ov::CoordinateDiff{ 0, 0 }, + ov::Strides{ 1ul, 1ul }); convolution->set_friendly_name("convolution"); - ngraph::ResultVector results { + ov::ResultVector results { std::make_shared(concat), std::make_shared(convolution), std::make_shared(fakeQuantize2) }; - function = std::make_shared(results, ngraph::ParameterVector { input1, input2 }, "OutputLayersHandling"); + function = std::make_shared(results, ov::ParameterVector { input1, input2 }, "OutputLayersHandling"); } TEST_P(OutputLayersConcat, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp index 89237906dfe4e7..23ed1e4f21e7d6 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp @@ -22,8 +22,8 @@ namespace LayerTestsDefinitions { -std::pair outputLayersHandlingInTransformationsForConcatMultiChannelGetInterval(const std::vector& precisions) { - const bool unsignedInterval = std::find(precisions.begin(), precisions.end(), ngraph::element::u8) != precisions.end(); +std::pair outputLayersHandlingInTransformationsForConcatMultiChannelGetInterval(const std::vector& precisions) { + const bool unsignedInterval = std::find(precisions.begin(), precisions.end(), ov::element::u8) != precisions.end(); const float low = unsignedInterval ? 0.f : -128.f; const float hight = unsignedInterval ? 255.f : 127.f; return std::make_pair(low, hight); @@ -65,34 +65,34 @@ void OutputLayersConcatMultiChannel::SetUp() { const ov::Shape inputShape2 = { inputShape1[0], inputShape1[1] * 2ul, inputShape1[2], inputShape1[3] }; init_input_shapes({ov::PartialShape(inputShape1), ov::PartialShape(inputShape1)}); - const auto input1 = std::make_shared(ngPrecision, ngraph::Shape(inputShape1)); + const auto input1 = std::make_shared(ngPrecision, ov::Shape(inputShape1)); input1->set_friendly_name("input1"); const auto fakeQuantize1 = ov::test::utils::make_fake_quantize(input1->output(0), ngPrecision, 256ul, { 1ul }); fakeQuantize1->set_friendly_name("fakeQuantize1"); ASSERT_EQ(4ul, inputShape1.size()) << "unexpected input layout"; - const auto input2 = std::make_shared(ngPrecision, ngraph::Shape(inputShape2)); + const auto input2 = std::make_shared(ngPrecision, ov::Shape(inputShape2)); input2->set_friendly_name("input2"); const auto fakeQuantize2 = ov::test::utils::make_fake_quantize(input2->output(0), ngPrecision, 256ul, { 1ul }); fakeQuantize2->set_friendly_name("fakeQuantize2"); const std::shared_ptr concat = std::make_shared( - ngraph::OutputVector{ fakeQuantize1->output(0), fakeQuantize2->output(0)}, 1); + ov::OutputVector{ fakeQuantize1->output(0), fakeQuantize2->output(0)}, 1); concat->set_friendly_name("concat"); - auto const1 = ov::op::v0::Constant::create(ngPrecision, ngraph::Shape{ 1, 1, 1, 1 }, { 1 }); + auto const1 = ov::op::v0::Constant::create(ngPrecision, ov::Shape{ 1, 1, 1, 1 }, { 1 }); std::shared_ptr convolution = std::make_shared(concat, const1); convolution->set_friendly_name("convolution"); - ngraph::ResultVector results { + ov::ResultVector results { std::make_shared(concat), std::make_shared(convolution), std::make_shared(fakeQuantize2) }; - function = std::make_shared(results, ngraph::ParameterVector { input1, input2 }, "OutputLayersHandling"); + function = std::make_shared(results, ov::ParameterVector { input1, input2 }, "OutputLayersHandling"); } TEST_P(OutputLayersConcatMultiChannel, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp index ab779dedfca982..ab31217178bc27 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp @@ -41,7 +41,7 @@ void OutputLayers::SetUp() { init_input_shapes(ov::PartialShape(inputShape)); - const auto input = std::make_shared(ngPrecision, ngraph::Shape(inputShape)); + const auto input = std::make_shared(ngPrecision, ov::Shape(inputShape)); input->set_friendly_name("input"); const float k = 1.f; @@ -52,7 +52,7 @@ void OutputLayers::SetUp() { const auto weights = ov::op::v0::Constant::create( ngPrecision, - ngraph::Shape{ inputShape[1ul], inputShape[1ul], 1ul, 1ul }, + ov::Shape{ inputShape[1ul], inputShape[1ul], 1ul, 1ul }, std::vector(inputShape[1ul] * inputShape[1ul], 1ul)); weights->set_friendly_name("weights"); const auto fakeQuantizeOnWeights = ov::test::utils::make_fake_quantize( @@ -63,18 +63,18 @@ void OutputLayers::SetUp() { std::shared_ptr convolution = std::make_shared( fakeQuantizeOnActivations, fakeQuantizeOnWeights, - ngraph::Strides{ 1ul, 1ul }, - ngraph::CoordinateDiff{ 0, 0 }, - ngraph::CoordinateDiff{ 0, 0 }, - ngraph::Strides{ 1ul, 1ul }); + ov::Strides{ 1ul, 1ul }, + ov::CoordinateDiff{ 0, 0 }, + ov::CoordinateDiff{ 0, 0 }, + ov::Strides{ 1ul, 1ul }); convolution->set_friendly_name("convolution"); - ngraph::ResultVector results { + ov::ResultVector results { std::make_shared(convolution), std::make_shared(fakeQuantizeOnActivations) }; - function = std::make_shared(results, ngraph::ParameterVector { input }, "OutputLayersHandling"); + function = std::make_shared(results, ov::ParameterVector { input }, "OutputLayersHandling"); } TEST_P(OutputLayers, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp index e2d137cdb8c360..d53081f82a9700 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp @@ -13,8 +13,8 @@ namespace LayerTestsDefinitions { std::string PadTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::op::PadMode padMode; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; @@ -31,8 +31,8 @@ std::string PadTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type precision; - ngraph::PartialShape inputShape; + ov::element::Type precision; + ov::PartialShape inputShape; std::string targetDevice; PReluTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = obj.param; @@ -33,8 +33,8 @@ std::string PReluTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp index 5277350925fe7b..888fb636c6f873 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp @@ -21,11 +21,11 @@ namespace LayerTestsDefinitions { std::string PullReshapeThroughDequantizationTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; - ngraph::Shape elementwiseConstantShapes; + ov::Shape elementwiseConstantShapes; PullReshapeThroughDequantizationTestValues testValues; std::tie(netPrecision, inputShape, targetDevice, params, elementwiseConstantShapes, testValues) = obj.param; @@ -44,10 +44,10 @@ std::string PullReshapeThroughDequantizationTransformation::getTestCaseName(cons void PullReshapeThroughDequantizationTransformation::SetUp() { abs_threshold = 1.0e-3; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; - ngraph::Shape elementwiseConstantShapes; + ov::Shape elementwiseConstantShapes; PullReshapeThroughDequantizationTestValues testValues; std::tie(netPrecision, inputShape, targetDevice, params, elementwiseConstantShapes, testValues) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp index 26e63b888555cd..a8af10ac2f649a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp @@ -19,9 +19,9 @@ namespace LayerTestsDefinitions { std::string RecurrentCellTransformation::getTestCaseName(testing::TestParamInfo obj) { - ngraph::element::Type netPrecision; - std::vector activationsShape; - std::vector weightsShape; + ov::element::Type netPrecision; + std::vector activationsShape; + std::vector weightsShape; std::string targetDevice; RecurrentCellTransformationParam param; ov::pass::low_precision::LayerTransformation::Params params; @@ -39,9 +39,9 @@ std::string RecurrentCellTransformation::getTestCaseName(testing::TestParamInfo< void RecurrentCellTransformation::SetUp() { abs_threshold = 0.01; - ngraph::element::Type precision; - std::vector activations_shapes; - std::vector weights_shapes; + ov::element::Type precision; + std::vector activations_shapes; + std::vector weights_shapes; RecurrentCellTransformationParam param; ov::pass::low_precision::LayerTransformation::Params params; @@ -79,7 +79,7 @@ void RecurrentCellTransformation::run() { const auto params = std::get<5>(GetParam()); const auto actualPrecision = getRuntimePrecisionByType(params.layerName); auto expectedPrecision = params.expectedKernelType; - if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ngraph::element::f16) { + if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; } EXPECT_EQ(actualPrecision, expectedPrecision); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp index cb9099ea9c0649..0c4b4619e78f21 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp @@ -13,8 +13,8 @@ namespace LayerTestsDefinitions { std::string ReduceMaxTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ReduceMaxTransformationParam param;; @@ -32,8 +32,8 @@ std::string ReduceMaxTransformation::getTestCaseName(const testing::TestParamInf void ReduceMaxTransformation::SetUp() { abs_threshold = 1.1; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; ReduceMaxTransformationParam param;; std::tie(netPrecision, inputShape, targetDevice, params, param) = GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp index 3c9fdd2af6eacb..dfdbbe85ab8921 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp @@ -20,8 +20,8 @@ ReduceMeanOperation::ReduceMeanOperation(const std::vector& constantVal } std::string ReduceMeanTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ReduceMeanTransformationParam param; @@ -44,8 +44,8 @@ std::string ReduceMeanTransformation::getTestCaseName(const testing::TestParamIn void ReduceMeanTransformation::SetUp() { abs_threshold = 4.1; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; ReduceMeanTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp index eb8676aefa5e10..e7b44ebf865ec3 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp @@ -13,8 +13,8 @@ namespace LayerTestsDefinitions { std::string ReduceMinTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ReduceMinTransformationParam param;; @@ -32,8 +32,8 @@ std::string ReduceMinTransformation::getTestCaseName(const testing::TestParamInf void ReduceMinTransformation::SetUp() { abs_threshold = 0.1; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; ReduceMinTransformationParam param;; std::tie(netPrecision, inputShape, targetDevice, params, param) = GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp index e08f3a650ff5e8..03f11bfd8f7604 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp @@ -13,8 +13,8 @@ namespace LayerTestsDefinitions { std::string ReduceSumTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ReduceSumTransformationParam param;; @@ -33,8 +33,8 @@ std::string ReduceSumTransformation::getTestCaseName(const testing::TestParamInf void ReduceSumTransformation::SetUp() { abs_threshold = 4.1; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; ReduceSumTransformationParam param;; std::tie(netPrecision, inputShape, targetDevice, params, param) = GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp index 53fdfcfd52e080..8a6cf7ba80aa23 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp @@ -16,8 +16,8 @@ namespace LayerTestsDefinitions { std::string ReluTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type precision; - ngraph::PartialShape inputShape; + ov::element::Type precision; + ov::PartialShape inputShape; std::string targetDevice; ReluTestValues testValues; std::tie(precision, inputShape, targetDevice, testValues) = obj.param; @@ -34,8 +34,8 @@ std::string ReluTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp index 762bb8d5133e52..ec51ae52a6f4ab 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { std::string ReshapeTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; + ov::element::Type netPrecision; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ReshapeTransformationParam param; @@ -34,7 +34,7 @@ std::string ReshapeTransformation::getTestCaseName(const testing::TestParamInfo< } void ReshapeTransformation::SetUp() { - ngraph::element::Type netPrecision; + ov::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; ReshapeTransformationParam param; std::tie(netPrecision, targetDevice, params, param) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp index 2ad2123c5c6889..8db49e1cfe681f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp @@ -19,8 +19,8 @@ namespace LayerTestsDefinitions { std::string ShuffleChannelsTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; ShuffleChannelsTransformationParam param; @@ -34,8 +34,8 @@ std::string ShuffleChannelsTransformation::getTestCaseName(const testing::TestPa void ShuffleChannelsTransformation::SetUp() { abs_threshold = 1.0; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; ShuffleChannelsTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp index f776ccc64e9860..797e0b3f6747c2 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { std::string SpaceToBatchTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type input_type; + ov::element::Type input_type; std::string target_device; SpaceToBatchTransformationParam param; std::tie(input_type, target_device, param) = obj.param; @@ -26,7 +26,7 @@ std::string SpaceToBatchTransformation::getTestCaseName(const testing::TestParam void SpaceToBatchTransformation::SetUp() { abs_threshold = 1.1; - ngraph::element::Type input_type; + ov::element::Type input_type; SpaceToBatchTransformationParam param; std::tie(input_type, targetDevice, param) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp index 39665e6de4bf1d..fedf986fc48163 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp @@ -16,8 +16,8 @@ namespace LayerTestsDefinitions { std::string SplitTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; SplitTransformationParam param; @@ -32,8 +32,8 @@ std::string SplitTransformation::getTestCaseName(const testing::TestParamInfoGetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp index a114ef37fa2228..19d327edd579f2 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp @@ -31,7 +31,7 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector& valu std::string SqueezeTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; + ov::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; std::string targetDevice; SqueezeTransformationParam squeezeParam; @@ -48,7 +48,7 @@ std::string SqueezeTransformation::getTestCaseName(const testing::TestParamInfo< } void SqueezeTransformation::SetUp() { abs_threshold = 0.2; - ngraph::element::Type netPrecision; + ov::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; SqueezeTransformationParam squeezeParam; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp index 330c580ec79b22..7b5fc0c2e3cae0 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp @@ -25,8 +25,8 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector& va } std::string StridedSliceTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; StridedSliceTransformationParam param;; @@ -42,8 +42,8 @@ std::string StridedSliceTransformation::getTestCaseName(const testing::TestParam void StridedSliceTransformation::SetUp() { abs_threshold = 1.0; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; StridedSliceTransformationParam param; std::tie(netPrecision, inputShape, targetDevice, params, param) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp index 0cf4cd0834f339..05540a4e26e221 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp @@ -18,8 +18,8 @@ namespace LayerTestsDefinitions { std::string SubtractTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShapes, targetDevice, params) = obj.param; @@ -29,8 +29,8 @@ std::string SubtractTransformation::getTestCaseName(const testing::TestParamInfo void SubtractTransformation::SetUp() { abs_threshold = 0.1; - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShape; + ov::element::Type netPrecision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; std::tie(netPrecision, inputShape, targetDevice, params) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp index 6d5749cc38c8b5..739a0062cce367 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -22,8 +22,8 @@ namespace LayerTestsDefinitions { std::string TransposeAfterMatMulTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; bool perTensor; @@ -39,8 +39,8 @@ std::string TransposeAfterMatMulTransformation::getTestCaseName(const testing::T void TransposeAfterMatMulTransformation::SetUp() { abs_threshold = 0.6; - ngraph::element::Type precision; - ngraph::PartialShape inputShape; + ov::element::Type precision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; bool perTensor; bool transposeChannelDim; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_transformation.cpp index 8c8c9f55ffb29a..dc25777ada8df9 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_transformation.cpp @@ -16,7 +16,7 @@ namespace LayerTestsDefinitions { std::string TransposeTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type precision; + ov::element::Type precision; std::string targetDevice; TransposeTransformationTestValues testValues; std::tie(precision, targetDevice, testValues) = obj.param; @@ -31,7 +31,7 @@ std::string TransposeTransformation::getTestCaseName(const testing::TestParamInf } void TransposeTransformation::SetUp() { - ngraph::element::Type precision; + ov::element::Type precision; TransposeTransformationTestValues testValues; std::tie(precision, targetDevice, testValues) = this->GetParam(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp index e9cffaed8a4425..786851347d2fe6 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp @@ -31,7 +31,7 @@ inline std::ostream& operator<<(std::ostream& os, const std::vector& valu std::string UnsqueezeTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; + ov::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; std::string targetDevice; UnsqueezeTransformationParam unsqueezeParam; @@ -49,7 +49,7 @@ std::string UnsqueezeTransformation::getTestCaseName(const testing::TestParamInf void UnsqueezeTransformation::SetUp() { abs_threshold = 1.0; rel_threshold = 31.0; - ngraph::element::Type netPrecision; + ov::element::Type netPrecision; ov::pass::low_precision::LayerTransformation::Params params; UnsqueezeTransformationParam unsqueezeParam; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp index dcdddbbdcb44c5..73168ba2bfb561 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp @@ -16,8 +16,8 @@ namespace LayerTestsDefinitions { std::string VariadicSplitTransformation::getTestCaseName(const testing::TestParamInfo& obj) { - ngraph::element::Type netPrecision; - ngraph::PartialShape inputShapes; + ov::element::Type netPrecision; + ov::PartialShape inputShapes; std::string targetDevice; ov::pass::low_precision::LayerTransformation::Params params; VariadicSplitTransformationParam param; @@ -39,8 +39,8 @@ std::string VariadicSplitTransformation::getTestCaseName(const testing::TestPara void VariadicSplitTransformation::SetUp() { abs_threshold = 1.0; - ngraph::element::Type precision; - ngraph::PartialShape inputShape; + ov::element::Type precision; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; VariadicSplitTransformationParam param; std::tie(precision, inputShape, targetDevice, params, param) = this->GetParam(); diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp index 7c72617223a036..4802dec5008eb2 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp @@ -35,7 +35,7 @@ class LayerTransformation : virtual public ov::test::SubgraphBaseTest { protected: LayerTransformation(); - static std::pair getQuantizationInterval(const ngraph::element::Type precision); + static std::pair getQuantizationInterval(const ov::element::Type precision); static std::string toString(const ov::pass::low_precision::LayerTransformation::Params& params); @@ -47,7 +47,7 @@ class LayerTransformation : virtual public ov::test::SubgraphBaseTest { static std::string getTestCaseNameByParams( const ov::element::Type precision, - const ngraph::PartialShape& inputShapes, + const ov::PartialShape& inputShapes, const std::string& targetDevice, const ov::pass::low_precision::LayerTransformation::Params& params); @@ -60,7 +60,7 @@ class LayerTransformation : virtual public ov::test::SubgraphBaseTest { // get runtime precision by operation friendly name which can be fused std::string getRuntimePrecisionByFusedName(const std::string& layerName); - std::map getRuntimeInfo(); + std::map getRuntimeInfo(); void init_input_shapes(const ov::PartialShape& shape); From 2da5c9eda142b99c47674b71013ea2b5da480c7d Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Mon, 8 Jan 2024 17:26:18 +0100 Subject: [PATCH 19/37] code review: use OPENVINO_ASSERT instead of IE_ASSERT --- .../layer_transformation.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index 5f8407a97741af..28ab8cca1e6cc7 100644 --- a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp +++ b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -86,7 +86,7 @@ std::string LayerTransformation::getRuntimePrecision(const std::string& layerNam if (name == layerName) { const auto& rtInfo = op->get_rt_info(); const auto& it = rtInfo.find("runtimePrecision"); - IE_ASSERT(it != rtInfo.end()) << "Runtime precision is not found for node: " << name; + OPENVINO_ASSERT(it != rtInfo.end(), "Runtime precision is not found for node: ", name); return it->second.as(); } } @@ -103,12 +103,12 @@ std::string LayerTransformation::getRuntimePrecisionByType(const std::string& la const auto& rtInfo = op->get_rt_info(); const auto& typeIt = rtInfo.find("layerType"); - IE_ASSERT(typeIt != rtInfo.end()) << "Layer is not found for type: " << layerType; + OPENVINO_ASSERT(typeIt != rtInfo.end(), "Layer is not found for type: ", layerType); auto type = typeIt->second.as(); if (type == layerType) { const auto& it = rtInfo.find("runtimePrecision"); - IE_ASSERT(it != rtInfo.end()) << "Runtime precision is not found for node: " << type; + OPENVINO_ASSERT(it != rtInfo.end(), "Runtime precision is not found for node: ", type); return it->second.as(); } } @@ -140,14 +140,14 @@ std::string LayerTransformation::getRuntimePrecisionByFusedName(const std::strin const auto& rtInfo = op->get_rt_info(); const auto& nameIt = rtInfo.find("originalLayersNames"); - IE_ASSERT(nameIt != rtInfo.end()) << "originalLayersNames is not found for node: " << layerName; + OPENVINO_ASSERT(nameIt != rtInfo.end(), "originalLayersNames is not found for node: ", layerName); const auto fusedName = parse(nameIt->second.as()); if (fusedName.find(layerName) == fusedName.end()) { continue; } const auto& it = rtInfo.find("runtimePrecision"); - IE_ASSERT(it != rtInfo.end()) << "runtimePrecision is not found for node: " << layerName; + OPENVINO_ASSERT(it != rtInfo.end(), "runtimePrecision is not found for node: ", layerName); const auto rtPrecisionPtr = it->second.as(); return rtPrecisionPtr; } From 5879c865eaf4fc8dc5017f67cbfad49e4fe9e8fe Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Mon, 8 Jan 2024 17:28:29 +0100 Subject: [PATCH 20/37] fix gpu func tests InferenceEngine --- .../low_precision_transformations/output_layers.cpp | 4 ++-- .../low_precision_transformations/output_layers_concat.cpp | 4 ++-- .../output_layers_concat_multi_channel.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp index 5273842172f9ac..0c0e7c09afb7d4 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp @@ -11,8 +11,8 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp index 3b2add93d258c4..cdb17ac7a447c1 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp @@ -11,8 +11,8 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp index 70a024b6012fcc..074817c2b9a9ec 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp @@ -11,8 +11,8 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - InferenceEngine::Precision::FP32 +const std::vector netPrecisions = { + ov::element::f32 }; const std::vector trasformationParamValues = { From 84d87603af31f35ce4181f74e698f7147b8a16c3 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Tue, 9 Jan 2024 16:06:14 +0100 Subject: [PATCH 21/37] getTestCaseNameByParams -> get_test_case_name_by_params; some ngraph -> ov --- .../add_transformation.hpp | 8 ++++---- .../assign_and_read_value_transformation.hpp | 4 ++-- .../batch_to_space_transformation.hpp | 4 ++-- .../clamp_transformation.hpp | 4 ++-- .../concat_transformation.hpp | 4 ++-- .../concat_with_child_and_output.hpp | 4 ++-- ...ncat_with_different_precision_on_children.hpp | 4 ++-- .../concat_with_intermediate_transformation.hpp | 4 ++-- ...oncat_with_neighbors_graph_transformation.hpp | 4 ++-- .../concat_with_split_transformation.hpp | 4 ++-- .../convolution_backprop_data_transformation.hpp | 6 +++--- .../convolution_qdq_transformation.hpp | 4 ++-- .../convolution_transformation.hpp | 4 ++-- .../convolution_with_incorrect_weights.hpp | 4 ++-- .../depth_to_space_transformation.hpp | 4 ++-- ...ementwise_branch_selection_transformation.hpp | 4 ++-- .../eliminate_fake_quantize_transformation.hpp | 4 ++-- ...fake_quantize_and_avg_pool_transformation.hpp | 4 ++-- ...fake_quantize_and_max_pool_transformation.hpp | 4 ++-- ..._and_two_output_branches_with_convolution.hpp | 4 ++-- ...antize_precision_selection_transformation.hpp | 10 +++++----- .../fake_quantize_transformation.hpp | 4 ++-- ...antize_with_dq_not_optimal_transformation.hpp | 4 ++-- .../fully_connected_transformation.hpp | 6 +++--- ...equantize_to_fake_quantize_transformation.hpp | 8 ++++---- ...e_quantize_and_scale_shift_transformation.hpp | 4 ++-- ..._multiply_to_fake_quantize_transformation.hpp | 2 +- ..._subtract_to_fake_quantize_transformation.hpp | 2 +- .../gather_transformation.hpp | 6 +++--- .../gemm_transformation.hpp | 4 ++-- .../group_convolution_transformation.hpp | 4 ++-- .../groupconvolution_qdq_transformation.hpp | 4 ++-- .../interpolate_transformation.hpp | 8 ++++---- .../mat_mul_transformation.hpp | 8 ++++---- .../mat_mul_with_constant_transformation.hpp | 4 ++-- .../mat_mul_with_optimized_constant_fq.hpp | 4 ++-- .../move_fake_quantize_transformation.hpp | 4 ++-- .../multiply_transformation.hpp | 6 +++--- .../multiply_with_one_parent_transformation.hpp | 4 ++-- .../normalize_transformation.hpp | 4 ++-- .../pad_transformation.hpp | 4 ++-- .../prelu_transformation.hpp | 4 ++-- ...ape_through_dequantization_transformation.hpp | 10 +++++----- .../recurrent_cell_transformation.hpp | 6 +++--- .../reduce_max_transformation.hpp | 4 ++-- .../reduce_mean_transformation.hpp | 4 ++-- .../reduce_min_transformation.hpp | 4 ++-- .../reduce_sum_transformation.hpp | 4 ++-- .../relu_transformation.hpp | 4 ++-- .../reshape_transformation.hpp | 4 ++-- .../shuffle_channels_transformation.hpp | 4 ++-- .../space_to_batch_transformation.hpp | 4 ++-- .../split_transformation.hpp | 4 ++-- .../squeeze_transformation.hpp | 4 ++-- .../strided_slice_transformation.hpp | 4 ++-- ...t_multiply_to_multiply_add_transformation.hpp | 4 ++-- .../subtract_transformation.hpp | 4 ++-- .../transpose_after_matmul_transformation.hpp | 4 ++-- .../transpose_transformation.hpp | 6 +++--- .../unsqueeze_transformation.hpp | 4 ++-- .../variadic_split_transformation.hpp | 4 ++-- .../add_transformation.cpp | 4 ++-- .../assign_and_read_value_transformation.cpp | 4 ++-- .../clamp_transformation.cpp | 4 ++-- .../concat_transformation.cpp | 4 ++-- .../concat_with_child_and_output.cpp | 4 ++-- ...ncat_with_different_precision_on_children.cpp | 4 ++-- .../concat_with_intermediate_transformation.cpp | 4 ++-- ...oncat_with_neighbors_graph_transformation.cpp | 2 +- .../concat_with_split_transformation.cpp | 2 +- .../convolution_backprop_data_transformation.cpp | 4 ++-- .../convolution_qdq_transformation.cpp | 2 +- .../convolution_transformation.cpp | 4 ++-- .../convolution_with_incorrect_weights.cpp | 4 ++-- .../depth_to_space_transformation.cpp | 4 ++-- ...ementwise_branch_selection_transformation.cpp | 4 ++-- ...fake_quantize_and_avg_pool_transformation.cpp | 2 +- ...fake_quantize_and_max_pool_transformation.cpp | 2 +- ...antize_precision_selection_transformation.cpp | 2 +- .../fake_quantize_transformation.cpp | 4 ++-- ...antize_with_dq_not_optimal_transformation.cpp | 2 +- .../fully_connected_transformation.cpp | 4 ++-- .../fuse_convert_transformation.cpp | 2 +- .../gemm_transformation.cpp | 2 +- .../group_convolution_transformation.cpp | 4 ++-- .../groupconvolution_qdq_transformation.cpp | 2 +- .../interpolate_transformation.cpp | 4 ++-- .../move_fake_quantize_transformation.cpp | 4 ++-- ...tiply_to_group_convolution_transformation.cpp | 4 ++-- .../multiply_transformation.cpp | 4 ++-- .../mvn_transformation.cpp | 4 ++-- .../output_layers_concat.cpp | 2 +- .../output_layers_concat_multi_channel.cpp | 2 +- ...output_layers_handling_in_transformations.cpp | 2 +- .../pad_transformation.cpp | 2 +- ...ape_through_dequantization_transformation.cpp | 4 ++-- .../recurrent_cell_transformation.cpp | 4 ++-- .../reduce_max_transformation.cpp | 4 ++-- .../reduce_mean_transformation.cpp | 4 ++-- .../reduce_min_transformation.cpp | 4 ++-- .../reduce_sum_transformation.cpp | 4 ++-- .../shuffle_channels_transformation.cpp | 4 ++-- .../split_transformation.cpp | 4 ++-- .../squeeze_transformation.cpp | 4 ++-- .../strided_slice_transformation.cpp | 4 ++-- .../subtract_transformation.cpp | 2 +- .../unsqueeze_transformation.cpp | 4 ++-- .../variadic_split_transformation.cpp | 4 ++-- .../layer_transformation.hpp | 10 ++-------- .../layer_transformation.cpp | 16 +++------------- 110 files changed, 224 insertions(+), 240 deletions(-) diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/add_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/add_transformation.hpp index b0466f52aa47b3..59b8550c5fe22a 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/add_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/add_transformation.hpp @@ -16,13 +16,13 @@ class AddTestValues{ ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize1; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize2; bool broadcast; - std::vector precisionOnActivations; - std::vector expectedPrecisions; + std::vector precisionOnActivations; + std::vector expectedPrecisions; }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, AddTestValues > AddTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/assign_and_read_value_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/assign_and_read_value_transformation.hpp index be011e89aaead3..b9a4bd9e71c688 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/assign_and_read_value_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/assign_and_read_value_transformation.hpp @@ -15,8 +15,8 @@ class AssignAndReadValueTransformationParam { }; typedef std::tuple < - ngraph::element::Type, // input precision - ngraph::PartialShape, // input shape + ov::element::Type, // input precision + ov::PartialShape, // input shape size_t, // opset version std::string, // device ov::pass::low_precision::LayerTransformation::Params, // transformation params diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/batch_to_space_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/batch_to_space_transformation.hpp index 5f3e4e5ee3aefe..a05c52c5ce8ebf 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/batch_to_space_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/batch_to_space_transformation.hpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { class BatchToSpaceTransformationParam { public: - ngraph::PartialShape input_shape; + ov::PartialShape input_shape; std::vector block_shape; std::vector crops_begin; std::vector crops_end; @@ -24,7 +24,7 @@ class BatchToSpaceTransformationParam { }; typedef std::tuple< - ngraph::element::Type, + ov::element::Type, std::string, BatchToSpaceTransformationParam > BatchToSpaceTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/clamp_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/clamp_transformation.hpp index 50d687b1bd88aa..2462a1ea35ccb6 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/clamp_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/clamp_transformation.hpp @@ -18,8 +18,8 @@ class ClampTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, ClampTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp index 38308ea9d75231..383bd5fa4bbdcc 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_transformation.hpp @@ -24,8 +24,8 @@ class ConcatTransformationTestValues { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ConcatTransformationTestValues> ConcatTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_child_and_output.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_child_and_output.hpp index 96d57afe7ad62d..e350b0be317b49 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_child_and_output.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_child_and_output.hpp @@ -18,8 +18,8 @@ class ConcatWithChildAndOutputTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, // target device: CPU, GPU ConcatWithChildAndOutputTransformationParam, ov::pass::low_precision::LayerTransformation::Params // transformation parameters diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp index df8a5c60a08862..6d46bac97a8f08 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_different_precision_on_children.hpp @@ -19,8 +19,8 @@ class ConcatWithDifferentChildrenTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, // target device: CPU, GPU ConcatWithDifferentChildrenTransformationParam, ov::pass::low_precision::LayerTransformation::Params // transformation parameters diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp index 694986f10f1d96..7ee3f5d5ac0593 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_intermediate_transformation.hpp @@ -12,8 +12,8 @@ namespace LayerTestsDefinitions { typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, // target device: CPU, GPU ov::pass::low_precision::LayerTransformation::Params, // transformation parameters bool, // transparent intermediate diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp index b0cac023f05fe0..ea04d0e074cd79 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_neighbors_graph_transformation.hpp @@ -12,8 +12,8 @@ namespace LayerTestsDefinitions { typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params> ConcatNeighboringGraphTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp index 9d10b00d4511f4..3384d3be810510 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/concat_with_split_transformation.hpp @@ -18,8 +18,8 @@ class ConcatWithSplitTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ConcatWithSplitTransformationParam, ov::pass::low_precision::LayerTransformation::Params> ConcatWithSplitTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_backprop_data_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_backprop_data_transformation.hpp index 260a0f21974627..6ef505f9fb2317 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_backprop_data_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_backprop_data_transformation.hpp @@ -42,9 +42,9 @@ class ConvolutionBackpropDataTransformationParam { }; typedef std::tuple< - ngraph::element::Type, // netPrecision - std::pair, // input shape and shape support flag - ngraph::Shape, // outputShape + ov::element::Type, // netPrecision + std::pair, // input shape and shape support flag + ov::Shape, // outputShape std::string, // targetDevice ov::pass::low_precision::LayerTransformation::Params, ConvolutionBackpropDataTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_qdq_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_qdq_transformation.hpp index 22f46f3acdb0d1..23c2ff21deda39 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_qdq_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_qdq_transformation.hpp @@ -46,8 +46,8 @@ inline std::ostream& operator<<(std::ostream& out, const ConvolutionQDqTransform } typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, ConvolutionQDqTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_transformation.hpp index b739be806ed140..2558b6948b3f88 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_transformation.hpp @@ -24,8 +24,8 @@ class ConvolutionTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::Shape, + ov::element::Type, + ov::Shape, std::string, ov::pass::low_precision::LayerTransformation::Params, ConvolutionTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_with_incorrect_weights.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_with_incorrect_weights.hpp index 9f919e5cdd5195..dd79d53053ee0f 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_with_incorrect_weights.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/convolution_with_incorrect_weights.hpp @@ -21,8 +21,8 @@ class ConvolutionWIthIncorrectWeightsParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::Shape, + ov::element::Type, + ov::Shape, std::string, ov::pass::low_precision::LayerTransformation::Params, ConvolutionWIthIncorrectWeightsParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp index b59fef754de46a..1061832ee35d24 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/depth_to_space_transformation.hpp @@ -13,8 +13,8 @@ namespace LayerTestsDefinitions { typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::op::v0::DepthToSpace::DepthToSpaceMode, size_t> DepthToSpaceTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/elementwise_branch_selection_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/elementwise_branch_selection_transformation.hpp index 256d920b7dea4d..2ec87aee0b9874 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/elementwise_branch_selection_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/elementwise_branch_selection_transformation.hpp @@ -30,8 +30,8 @@ class ElementwiseBranchSelectionTestValues{ }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ElementwiseBranchSelectionTestValues, std::string diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/eliminate_fake_quantize_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/eliminate_fake_quantize_transformation.hpp index bc49cae1cb5755..5141b21798b048 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/eliminate_fake_quantize_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/eliminate_fake_quantize_transformation.hpp @@ -19,7 +19,7 @@ class EliminateFakeQuantizeTransformationTestValues { public: class Actual { public: - ngraph::element::Type precisionBefore; + ov::element::Type precisionBefore; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData1; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData2; }; @@ -31,7 +31,7 @@ class EliminateFakeQuantizeTransformationTestValues { size_t int8_convolutions; }; - ngraph::PartialShape inputShape; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; Actual actual; Expected expected; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_avg_pool_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_avg_pool_transformation.hpp index 27140d9bd07c54..5705bb0821ae27 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_avg_pool_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_avg_pool_transformation.hpp @@ -13,8 +13,8 @@ namespace LayerTestsDefinitions { typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, ngraph::builder::subgraph::FakeQuantizeOnData> FakeQuantizeAndAvgPoolTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_max_pool_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_max_pool_transformation.hpp index 499e4bd686b887..2a31898b978304 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_max_pool_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_max_pool_transformation.hpp @@ -13,8 +13,8 @@ namespace LayerTestsDefinitions { typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, ngraph::builder::subgraph::FakeQuantizeOnData> FakeQuantizeAndMaxPoolTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.hpp index e17076acb062c6..4872d1b477fc9c 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.hpp @@ -21,8 +21,8 @@ class FakeQuantizeAndTwoOutputBranchesWithConvolution { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, FakeQuantizeAndTwoOutputBranchesWithConvolution diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_precision_selection_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_precision_selection_transformation.hpp index fa4077ece6cd44..f9c04f0d21cfd0 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_precision_selection_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_precision_selection_transformation.hpp @@ -26,7 +26,7 @@ inline std::ostream& operator<<(std::ostream& out, const FakeQuantizePrecisionSe class FakeQuantizePrecisionSelectionTransformationExpectedValues { public: - ngraph::element::Type fakeQuantizeOnDataOutPrecision; + ov::element::Type fakeQuantizeOnDataOutPrecision; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData; ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; }; @@ -37,8 +37,8 @@ inline std::ostream& operator<<(std::ostream& out, const FakeQuantizePrecisionSe class FakeQuantizePrecisionSelectionTransformationTestValues { public: - std::vector precisionsOnActivations; - std::vector precisionsOnActivationForLimitedOperation; + std::vector precisionsOnActivations; + std::vector precisionsOnActivationForLimitedOperation; bool operationBeforeLimitedOperationIsPrecisionTransparent; FakeQuantizePrecisionSelectionTransformationActualValues actual; FakeQuantizePrecisionSelectionTransformationExpectedValues expected; @@ -49,8 +49,8 @@ inline std::ostream& operator<<(std::ostream& out, const FakeQuantizePrecisionSe } typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, FakeQuantizePrecisionSelectionTransformationTestValues> FakeQuantizeTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp index cd82925b271a7e..7240f8d9e32e6b 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_transformation.hpp @@ -19,8 +19,8 @@ class FakeQuantizeTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, FakeQuantizeTransformationParam, diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.hpp index 0133165dbe78df..cf2fe6802800e7 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.hpp @@ -49,8 +49,8 @@ inline std::ostream& operator<<(std::ostream& out, const FakeQuantizeWithNotOpti // ngraph::builder::subgraph::FakeQuantizeOnData typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, FakeQuantizeWithNotOptimalTransformationTestValues> FakeQuantizeTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp index f598aeed560f67..c4cacbfe3b81c3 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp @@ -11,14 +11,14 @@ class MatMulShapes { public: - ngraph::PartialShape inputA; - ngraph::PartialShape inputB; + ov::PartialShape inputA; + ov::PartialShape inputB; bool transposeA; bool transposeB; }; typedef std::tuple< - ngraph::element::Type, + ov::element::Type, MatMulShapes, std::string, ov::pass::low_precision::LayerTransformation::Params> FullyConnectedTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.hpp index 2c16fea5538e8c..d221443f429ccc 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.hpp @@ -18,15 +18,15 @@ class FuseDequantizeToFakeQuantizeTransformationTestValues { public: class Actual { public: - ngraph::element::Type precisionBeforeAdd; + ov::element::Type precisionBeforeAdd; ngraph::builder::subgraph::Add add; - ngraph::element::Type precisionBeforeDequantization; + ov::element::Type precisionBeforeDequantization; ngraph::builder::subgraph::DequantizationOperations dequantization; - ngraph::element::Type precisionAfterDequantization; + ov::element::Type precisionAfterDequantization; ngraph::builder::subgraph::FakeQuantizeOnDataWithConstant fakeQuantizeOnData; }; - ngraph::PartialShape inputShape; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; Actual actual; }; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.hpp index 14e98de6a43844..29c11ed750a86f 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.hpp @@ -12,8 +12,8 @@ namespace LayerTestsDefinitions { typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, ngraph::builder::subgraph::FakeQuantizeOnData> FuseFakeQuantizeAndScaleShiftTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp index 9153c8cdf6d6f3..ea2093c360aa2f 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp @@ -22,7 +22,7 @@ class FuseMultiplyToFakeQuantizeTransformationTestValues { ngraph::builder::subgraph::DequantizationOperations dequantization; }; - ngraph::PartialShape inputShape; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; Actual actual; }; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp index e6128bb9ebf44f..977e261caa66d1 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp @@ -22,7 +22,7 @@ class FuseSubtractToFakeQuantizeTransformationTestValues { ngraph::builder::subgraph::DequantizationOperations dequantization; }; - ngraph::PartialShape inputShape; + ov::PartialShape inputShape; ov::pass::low_precision::LayerTransformation::Params params; Actual actual; }; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/gather_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/gather_transformation.hpp index 1dee4f8157940e..d297d20762277e 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/gather_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/gather_transformation.hpp @@ -14,18 +14,18 @@ namespace LayerTestsDefinitions { class GatherTransformationTestValues { public: - ngraph::PartialShape inputShape; + ov::PartialShape inputShape; std::vector gatherIndicesShape; std::vector gatherIndicesValues; std::vector axis; int64_t batch_dims; ov::pass::low_precision::LayerTransformation::Params params; - ngraph::element::Type precisionBeforeFq; + ov::element::Type precisionBeforeFq; ngraph::builder::subgraph::FakeQuantizeOnData fqOnData; }; typedef std::tuple< - ngraph::element::Type, + ov::element::Type, std::string, GatherTransformationTestValues, int> GatherTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/gemm_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/gemm_transformation.hpp index 231f7bae9c85ff..b3b0fd28593f04 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/gemm_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/gemm_transformation.hpp @@ -12,8 +12,8 @@ namespace LayerTestsDefinitions { typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params> GemmTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp index fba31ab404bd1f..f6da842fd7f630 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/group_convolution_transformation.hpp @@ -41,10 +41,10 @@ class GroupConvolutionTransformationParam { }; typedef std::tuple< - ngraph::element::Type, + ov::element::Type, std::string, ov::pass::low_precision::LayerTransformation::Params, - std::pair, + std::pair, GroupConvolutionTransformationParam, bool // add precision preserved operation > GroupConvolutionTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/groupconvolution_qdq_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/groupconvolution_qdq_transformation.hpp index 7a07082a310702..f2ca698b9cb6f3 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/groupconvolution_qdq_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/groupconvolution_qdq_transformation.hpp @@ -50,8 +50,8 @@ inline std::ostream& operator<<(std::ostream& out, const GroupConvolutionQDqTran } typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, GroupConvolutionQDqTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/interpolate_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/interpolate_transformation.hpp index fd731780c13782..c66ba47b65881e 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/interpolate_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/interpolate_transformation.hpp @@ -13,7 +13,7 @@ namespace LayerTestsDefinitions { class interpAttributes { public: - ngraph::AxisSet axes; + ov::AxisSet axes; std::string mode; bool align_corners; bool antialias; @@ -24,7 +24,7 @@ class interpAttributes { interpAttributes() = default; - interpAttributes(const ngraph::AxisSet& axes, + interpAttributes(const ov::AxisSet& axes, const std::string& mode, const bool& align_corners, const bool& antialias, @@ -36,8 +36,8 @@ class interpAttributes { }; typedef std::tuple< - ngraph::element::Type, - std::pair, + ov::element::Type, + std::pair, std::string, interpAttributes> InterpolateTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp index 5e890e75b7b799..2a6f49591ab2b9 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_transformation.hpp @@ -15,17 +15,17 @@ namespace LayerTestsDefinitions { class MatMulTransformationTestValues { public: - ngraph::Shape inputShape1; + ov::Shape inputShape1; ngraph::builder::subgraph::FakeQuantizeOnData fqOnData1; - ngraph::Shape inputShape2; + ov::Shape inputShape2; ngraph::builder::subgraph::FakeQuantizeOnData fqOnData2; std::string expectedKernelName; std::string expectedRuntimePrecision; }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, MatMulTransformationTestValues> MatMulTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp index 6166ebd494f6e8..c005df22247de1 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_constant_transformation.hpp @@ -19,7 +19,7 @@ namespace LayerTestsDefinitions { class MatMulWithConstantTransformationTestValues { public: - ngraph::PartialShape inputShape; + ov::PartialShape inputShape; ngraph::builder::subgraph::FakeQuantizeOnDataWithConstant fqOnData; ngraph::builder::subgraph::Constant weights; @@ -31,7 +31,7 @@ class MatMulWithConstantTransformationTestValues { }; typedef std::tuple< - ngraph::element::Type, + ov::element::Type, std::string, MatMulWithConstantTransformationTestValues> MatMulWithConstantTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_optimized_constant_fq.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_optimized_constant_fq.hpp index 55b5f35f2b101f..ecddcb1a3ba2d8 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_optimized_constant_fq.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/mat_mul_with_optimized_constant_fq.hpp @@ -19,8 +19,8 @@ class MatMulWithOptimizedConstantFakeQuantizeTransformationTestValues { }; typedef std::tuple< - ngraph::element::Type, - std::pair, + ov::element::Type, + std::pair, std::string, MatMulWithOptimizedConstantFakeQuantizeTransformationTestValues > MatMulWithOptimizedConstantFakeQuantizeTransformationTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/move_fake_quantize_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/move_fake_quantize_transformation.hpp index 38985654d8984d..2e4ee88ec43c99 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/move_fake_quantize_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/move_fake_quantize_transformation.hpp @@ -30,8 +30,8 @@ class MoveFakeQuantizeTransformationParam { }; typedef std::tuple < - ngraph::element::Type, - std::vector, + ov::element::Type, + std::vector, std::string, ov::pass::low_precision::LayerTransformation::Params, bool, diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp index b719fd849374db..f79ce40f645604 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_transformation.hpp @@ -19,13 +19,13 @@ class MultiplyTestValues { bool broadcast2; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize2; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeAfter; - ngraph::element::Type expectedPrecisions; + ov::element::Type expectedPrecisions; bool secondInputIsConstant; }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, MultiplyTestValues > MultiplyTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_with_one_parent_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_with_one_parent_transformation.hpp index 0f5bcc77779bcd..529046f07be87c 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_with_one_parent_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/multiply_with_one_parent_transformation.hpp @@ -18,8 +18,8 @@ class MultiplyWithOneParentTransformationValues { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, MultiplyWithOneParentTransformationValues > MultiplyWithOneParentTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/normalize_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/normalize_transformation.hpp index 3c3bd8dd29461e..deaf0a630bbdb3 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/normalize_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/normalize_transformation.hpp @@ -13,8 +13,8 @@ namespace LayerTestsDefinitions { typedef std::tuple < - ngraph::element::Type, - std::pair, + ov::element::Type, + std::pair, std::string, std::vector, bool, diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/pad_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/pad_transformation.hpp index 21b182346e918d..4028d4ef0b0b9e 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/pad_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/pad_transformation.hpp @@ -19,8 +19,8 @@ class PadTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, ov::op::PadMode, std::string, ov::pass::low_precision::LayerTransformation::Params, diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp index 4b6fa1488e1fc2..0377e34675a084 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/prelu_transformation.hpp @@ -18,8 +18,8 @@ class PReluTestValues { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, PReluTestValues> PReluTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/pull_reshape_through_dequantization_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/pull_reshape_through_dequantization_transformation.hpp index 62788638edc13d..43270feebfed0c 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/pull_reshape_through_dequantization_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/pull_reshape_through_dequantization_transformation.hpp @@ -19,7 +19,7 @@ namespace LayerTestsDefinitions { class PullReshapeThroughDequantizationTestValues { public: - ngraph::element::Type precisionBeforeDequantization; + ov::element::Type precisionBeforeDequantization; ngraph::builder::subgraph::FakeQuantizeOnDataWithConstant fakeQuantizeOnData; ngraph::builder::subgraph::DequantizationOperations dequantizationOnActivations; ngraph::builder::subgraph::Constant weights; @@ -28,18 +28,18 @@ class PullReshapeThroughDequantizationTestValues { ngraph::builder::subgraph::DequantizationOperations::Multiply multiply; ngraph::builder::subgraph::Transpose transpose; ngraph::builder::subgraph::Reshape reshape2; - ngraph::element::Type precisionAfterOperation; + ov::element::Type precisionAfterOperation; ngraph::builder::subgraph::DequantizationOperations dequantizationAfter; std::string operationName; std::string expectedKernelType; }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, - ngraph::Shape, + ov::Shape, PullReshapeThroughDequantizationTestValues> PullReshapeThroughDequantizationParams; class PullReshapeThroughDequantizationTransformation : diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/recurrent_cell_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/recurrent_cell_transformation.hpp index a9df8408bc2d7e..6f64a37f727368 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/recurrent_cell_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/recurrent_cell_transformation.hpp @@ -37,9 +37,9 @@ class RecurrentCellTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - std::vector, - std::vector, + ov::element::Type, + std::vector, + std::vector, std::string, ov::pass::low_precision::LayerTransformation::Params, RecurrentCellTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_max_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_max_transformation.hpp index 32e6dbd001e8e6..f68742e0e164cf 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_max_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_max_transformation.hpp @@ -19,8 +19,8 @@ class ReduceMaxTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, ReduceMaxTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_mean_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_mean_transformation.hpp index a918a575870183..1200fcc1ed0175 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_mean_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_mean_transformation.hpp @@ -31,8 +31,8 @@ class ReduceMeanTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, ReduceMeanTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_min_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_min_transformation.hpp index b7a508e75b0edb..a412c3c07cb30a 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_min_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_min_transformation.hpp @@ -19,8 +19,8 @@ class ReduceMinTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, ReduceMinTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_sum_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_sum_transformation.hpp index f1ac17bdbf8435..7c36cc5658f444 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_sum_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/reduce_sum_transformation.hpp @@ -19,8 +19,8 @@ class ReduceSumTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, ReduceSumTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp index 00b90be41e184f..8f95935d3d5651 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/relu_transformation.hpp @@ -18,8 +18,8 @@ class ReluTestValues { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ReluTestValues> ReluTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp index 0f2d20bd0454f0..119c2b86723041 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/reshape_transformation.hpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { class ReshapeTransformationParam { public: - ngraph::PartialShape inputShape; + ov::PartialShape inputShape; std::vector reshapeConstValues; ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; std::string layerType; @@ -22,7 +22,7 @@ class ReshapeTransformationParam { }; typedef std::tuple< - ngraph::element::Type, + ov::element::Type, std::string, ov::pass::low_precision::LayerTransformation::Params, ReshapeTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/shuffle_channels_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/shuffle_channels_transformation.hpp index 60921241d77968..ed379426535bcb 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/shuffle_channels_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/shuffle_channels_transformation.hpp @@ -22,8 +22,8 @@ class ShuffleChannelsTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, ShuffleChannelsTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/space_to_batch_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/space_to_batch_transformation.hpp index 9cafb78b401e83..6de5eca158b70f 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/space_to_batch_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/space_to_batch_transformation.hpp @@ -14,7 +14,7 @@ namespace LayerTestsDefinitions { class SpaceToBatchTransformationParam { public: - ngraph::PartialShape input_shape; + ov::PartialShape input_shape; std::vector block_shape; std::vector pads_begin; std::vector pads_end; @@ -24,7 +24,7 @@ class SpaceToBatchTransformationParam { }; typedef std::tuple< - ngraph::element::Type, + ov::element::Type, std::string, SpaceToBatchTransformationParam > SpaceToBatchTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp index d2692f1118dc27..97d5b1464dc448 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/split_transformation.hpp @@ -16,8 +16,8 @@ class SplitTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, SplitTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp index 67e212cf218bf2..5db76a7e028668 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/squeeze_transformation.hpp @@ -16,13 +16,13 @@ class SqueezeTransformationParam { public: ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; std::vector squeezeAxes; - ngraph::PartialShape shape; + ov::PartialShape shape; }; std::string stringifySqueezeArgs(const std::vector& axes); typedef std::tuple< - ngraph::element::Type, + ov::element::Type, std::string, ov::pass::low_precision::LayerTransformation::Params, SqueezeTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/strided_slice_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/strided_slice_transformation.hpp index 13d255ef575e63..695e47c2edd9d0 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/strided_slice_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/strided_slice_transformation.hpp @@ -23,8 +23,8 @@ class StridedSliceTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, StridedSliceTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.hpp index 2ac54b9b98a7c3..decc2bce66f069 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.hpp @@ -14,8 +14,8 @@ namespace LayerTestsDefinitions { class SubtractMultiplyToMultiplyAddTransformationTestValues { public: - ngraph::PartialShape inputShape; - ngraph::element::Type precision; + ov::PartialShape inputShape; + ov::element::Type precision; ngraph::builder::subgraph::FakeQuantizeOnData fqOnData; }; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/subtract_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/subtract_transformation.hpp index 803d330c65b587..90abaf00531305 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/subtract_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/subtract_transformation.hpp @@ -12,8 +12,8 @@ namespace LayerTestsDefinitions { typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params > SubtractTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/transpose_after_matmul_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/transpose_after_matmul_transformation.hpp index ee96f953344ebc..86801d31d514a0 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/transpose_after_matmul_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/transpose_after_matmul_transformation.hpp @@ -12,8 +12,8 @@ namespace LayerTestsDefinitions { typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, bool, diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/transpose_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/transpose_transformation.hpp index 52e164d05f96d4..2f27b7ec8cb87f 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/transpose_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/transpose_transformation.hpp @@ -14,15 +14,15 @@ namespace LayerTestsDefinitions { class TransposeTransformationTestValues { public: - ngraph::PartialShape inputShape; + ov::PartialShape inputShape; std::vector transposeConstValues; ov::pass::low_precision::LayerTransformation::Params params; - ngraph::element::Type precisionBeforeFq; + ov::element::Type precisionBeforeFq; ngraph::builder::subgraph::FakeQuantizeOnData fqOnData; }; typedef std::tuple< - ngraph::element::Type, + ov::element::Type, std::string, TransposeTransformationTestValues> TransposeTransformationParams; diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp index 8d276fbdf476a0..d66018cd13bf86 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/unsqueeze_transformation.hpp @@ -16,11 +16,11 @@ class UnsqueezeTransformationParam { public: ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; std::vector unsqueezeAxes; - ngraph::PartialShape shape; + ov::PartialShape shape; }; typedef std::tuple< - ngraph::element::Type, + ov::element::Type, std::string, ov::pass::low_precision::LayerTransformation::Params, UnsqueezeTransformationParam diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp index 2920c66d357373..069014107bc73f 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/variadic_split_transformation.hpp @@ -16,8 +16,8 @@ class VariadicSplitTransformationParam { }; typedef std::tuple< - ngraph::element::Type, - ngraph::PartialShape, + ov::element::Type, + ov::PartialShape, std::string, ov::pass::low_precision::LayerTransformation::Params, VariadicSplitTransformationParam diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp index d1d0563f5fa818..c223fbfa970580 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp @@ -25,8 +25,8 @@ std::string AddTransformation::getTestCaseName(const testing::TestParamInfo< Add std::tie(netPrecision, inputShapes, targetDevice, param) = obj.param; std::ostringstream result; - result << getTestCaseNameByParams(netPrecision, inputShapes, targetDevice, params) << - (param.broadcast ? "_broadcast" : ""); + result << get_test_case_name_by_params(netPrecision, inputShapes, targetDevice, params) << + (param.broadcast ? "_broadcast" : ""); for (const auto& elem : param.precisionOnActivations) { result << "_" << elem << "_"; } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp index 167bc7ff3dd66e..3fb5d7b70a5e10 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp @@ -22,8 +22,8 @@ std::string AssignAndReadValueTransformation::getTestCaseName(const testing::Tes std::tie(netPrecision, inputShape, opset, targetDevice, params, param) = obj.param; std::ostringstream result; - result << getTestCaseNameByParams(netPrecision, inputShape, targetDevice, params) << "_" << - param.fakeQuantize << "_" << opset; + result << get_test_case_name_by_params(netPrecision, inputShape, targetDevice, params) << "_" << + param.fakeQuantize << "_" << opset; return result.str(); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp index 9d3b0db707f6a7..60090516826e0a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp @@ -21,8 +21,8 @@ std::string ClampTransformation::getTestCaseName(const testing::TestParamInfo std::string { if (fqOnData.empty()) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp index 2fcba26584c214..ad5c845a9a8c20 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp @@ -24,7 +24,7 @@ std::string FakeQuantizeAndAvgPoolTransformation::getTestCaseName(const testing: ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; std::tie(precision, inputShapes, targetDevice, params, fakeQuantize) = obj.param; - return getTestCaseNameByParams(precision, inputShapes, targetDevice, params); + return get_test_case_name_by_params(precision, inputShapes, targetDevice, params); } void FakeQuantizeAndAvgPoolTransformation::SetUp() { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp index 83ce10b7818b28..31b54e0c9bfb94 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp @@ -24,7 +24,7 @@ std::string FakeQuantizeAndMaxPoolTransformation::getTestCaseName(const testing: ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; std::tie(precision, inputShapes, targetDevice, params, fakeQuantize) = obj.param; - return getTestCaseNameByParams(precision, inputShapes, targetDevice, params); + return get_test_case_name_by_params(precision, inputShapes, targetDevice, params); } void FakeQuantizeAndMaxPoolTransformation::SetUp() { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp index 0c2fc1316b7fc9..547936b3bc0589 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp @@ -24,7 +24,7 @@ std::string FakeQuantizePrecisionSelectionTransformation::getTestCaseName(const std::tie(netPrecision, inputShape, targetDevice, params, testValues) = obj.param; std::ostringstream result; - result << getTestCaseNameByParams(netPrecision, inputShape, targetDevice, params) << "_" << testValues; + result << get_test_case_name_by_params(netPrecision, inputShape, targetDevice, params) << "_" << testValues; return result.str(); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp index c1b81aeed3b9e0..4670d57c968c41 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp @@ -27,8 +27,8 @@ std::string FakeQuantizeTransformation::getTestCaseName(const testing::TestParam std::tie(netPrecision, inputShape, targetDevice, params, testParams, isConvertOnConstants) = obj.param; std::ostringstream result; - result << getTestCaseNameByParams(netPrecision, inputShape, targetDevice, params) << "_" << - isConvertOnConstants << "_" << testParams.fakequantize; + result << get_test_case_name_by_params(netPrecision, inputShape, targetDevice, params) << "_" << + isConvertOnConstants << "_" << testParams.fakequantize; return result.str(); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index 7f7c30c9837a87..197a39fdcc228e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -24,7 +24,7 @@ std::string FakeQuantizeWithNotOptimalTransformation::getTestCaseName(const test std::tie(netPrecision, inputShapes, targetDevice, params, testValues) = obj.param; std::ostringstream result; - result << getTestCaseNameByParams(netPrecision, inputShapes, targetDevice, params) << "_" << testValues; + result << get_test_case_name_by_params(netPrecision, inputShapes, targetDevice, params) << "_" << testValues; return result.str(); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp index 6769883d39170b..8247ca506a5f04 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp @@ -30,8 +30,8 @@ std::string FullyConnectedTransformation::getTestCaseName(const testing::TestPar std::ostringstream result; result << - getTestCaseNameByParams(precision, shapes.inputA, targetDevice, params) << - shapes.inputB << "_" << + get_test_case_name_by_params(precision, shapes.inputA, targetDevice, params) << + shapes.inputB << "_" << shapes.transposeA << "_" << shapes.transposeB; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp index 7291fb9d960102..ce69b07cdcaf41 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp @@ -31,7 +31,7 @@ std::string FuseConvertTransformation::getTestCaseName(const testing::TestParamI std::tie(precision, shape, targetDevice, deqOperations, constInput) = obj.param; std::ostringstream result; - result << getTestCaseNameByParams(precision, shape, targetDevice, params) << + result << get_test_case_name_by_params(precision, shape, targetDevice, params) << "_" << deqOperations << "_" << constInput; return result.str(); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp index 205049d3b60b7f..d295ee72603c4c 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp @@ -28,7 +28,7 @@ std::string GemmTransformation::getTestCaseName(const testing::TestParamInfo Date: Tue, 9 Jan 2024 16:17:05 +0100 Subject: [PATCH 22/37] code review: cleanups --- .../layer_transformation.cpp | 9 +++------ .../src/base/utils/generate_inputs.cpp | 2 -- .../include/common_test_utils/data_utils.hpp | 1 - 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index 5f641f46bc6c7e..faf35c65237e3b 100644 --- a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp +++ b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -68,8 +68,7 @@ std::string LayerTransformation::get_test_case_name_by_params( std::string LayerTransformation::getRuntimePrecision(const std::string& layerName) { const ov::CompiledModel& execNet = compiledModel; - const std::shared_ptr& function = execNet.get_runtime_model(); - const auto& execFunction = function; + const std::shared_ptr& execFunction = execNet.get_runtime_model(); for (const auto& op : execFunction->get_ops()) { const auto name = op->get_friendly_name(); @@ -86,8 +85,7 @@ std::string LayerTransformation::getRuntimePrecision(const std::string& layerNam std::string LayerTransformation::getRuntimePrecisionByType(const std::string& layerType) { const ov::CompiledModel& execNet = compiledModel; - const std::shared_ptr& function = execNet.get_runtime_model(); - const auto& execFunction = function; + const std::shared_ptr& execFunction = execNet.get_runtime_model(); for (const auto& op : execFunction->get_ops()) { const auto& rtInfo = op->get_rt_info(); @@ -108,8 +106,7 @@ std::string LayerTransformation::getRuntimePrecisionByType(const std::string& la std::string LayerTransformation::getRuntimePrecisionByFusedName(const std::string& layerName) { const ov::CompiledModel& execNet = compiledModel; - const std::shared_ptr& function = execNet.get_runtime_model(); - const auto& execFunction = function; + const std::shared_ptr& execFunction = execNet.get_runtime_model(); const auto parse = [](const std::string& originalLayersNames) -> std::set { std::set names; diff --git a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp index 00eb72c361484b..b25a37c69713f4 100644 --- a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp +++ b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp @@ -329,8 +329,6 @@ bool get_const_value(const std::shared_ptr& node, float& value, const auto const_value = const_node->cast_vector(); return get_item_func(const_value, value); - - return true; } bool get_min_value(const std::vector& v, float& value) { diff --git a/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp b/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp index aaa515aa2b056e..a64ae64f01e9e7 100644 --- a/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp +++ b/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp @@ -215,7 +215,6 @@ void inline fill_data_ptr_real_random_float(T* pointer, for (std::size_t i = 0; i < size; i++) { pointer[i] = static_cast(dist(gen)); - // std::cout << "pointer[" << i << "] " << pointer[i] << std::endl; } } From 849c10e15fe2b77ba456295416e89b11a28ed05d Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Tue, 9 Jan 2024 18:37:23 +0100 Subject: [PATCH 23/37] code review: fix headers --- .../src/low_precision_transformations/add_transformation.cpp | 3 +-- .../batch_to_space_transformation.cpp | 3 +-- .../low_precision_transformations/concat_transformation.cpp | 3 +-- .../concat_with_child_and_output.cpp | 3 +-- .../concat_with_different_precision_on_children.cpp | 3 +-- .../concat_with_intermediate_transformation.cpp | 3 +-- .../concat_with_neighbors_graph_transformation.cpp | 3 +-- .../concat_with_split_transformation.cpp | 3 +-- .../convolution_qdq_transformation.cpp | 1 - .../convolution_transformation.cpp | 1 - .../convolution_with_incorrect_weights.cpp | 1 - .../depth_to_space_transformation.cpp | 3 +-- .../elementwise_branch_selection_transformation.cpp | 2 +- .../eliminate_fake_quantize_transformation.cpp | 2 +- .../fake_quantize_and_avg_pool_transformation.cpp | 3 +-- .../fake_quantize_and_max_pool_transformation.cpp | 3 +-- .../fake_quantize_and_two_output_branches_with_convolution.cpp | 1 - .../fake_quantize_precision_selection_transformation.cpp | 3 +-- .../fake_quantize_transformation.cpp | 3 +-- .../fake_quantize_with_dq_not_optimal_transformation.cpp | 3 +-- .../fully_connected_transformation.cpp | 1 - .../fuse_convert_transformation.cpp | 1 - .../fuse_dequantize_to_fake_quantize_transformation.cpp | 2 +- .../fuse_fake_quantize_and_scale_shift_transformation.cpp | 3 +-- .../fuse_multiply_to_fake_quantize_transformation.cpp | 2 +- .../fuse_subtract_to_fake_quantize_transformation.cpp | 2 +- .../low_precision_transformations/gather_transformation.cpp | 3 +-- .../src/low_precision_transformations/gemm_transformation.cpp | 1 - .../group_convolution_transformation.cpp | 1 - .../groupconvolution_qdq_transformation.cpp | 1 - .../interpolate_transformation.cpp | 3 +-- .../low_precision_transformations/mat_mul_transformation.cpp | 3 +-- .../mat_mul_with_constant_transformation.cpp | 3 +-- .../mat_mul_with_optimized_constant_fq.cpp | 1 - .../move_fake_quantize_transformation.cpp | 1 - .../multiply_to_group_convolution_transformation.cpp | 1 - .../low_precision_transformations/multiply_transformation.cpp | 3 +-- .../multiply_with_one_parent_transformation.cpp | 1 - .../src/low_precision_transformations/mvn_transformation.cpp | 1 - .../low_precision_transformations/normalize_transformation.cpp | 1 - .../src/low_precision_transformations/output_layers_concat.cpp | 1 - .../output_layers_concat_multi_channel.cpp | 1 - .../output_layers_handling_in_transformations.cpp | 1 - .../src/low_precision_transformations/prelu_transformation.cpp | 3 +-- .../pull_reshape_through_dequantization_transformation.cpp | 1 - .../recurrent_cell_transformation.cpp | 1 - .../src/low_precision_transformations/relu_transformation.cpp | 3 +-- .../low_precision_transformations/reshape_transformation.cpp | 3 +-- .../shuffle_channels_transformation.cpp | 1 - .../space_to_batch_transformation.cpp | 3 +-- .../src/low_precision_transformations/split_transformation.cpp | 3 +-- .../low_precision_transformations/squeeze_transformation.cpp | 3 +-- .../subtract_multiply_to_multiply_add_transformation.cpp | 3 +-- .../low_precision_transformations/subtract_transformation.cpp | 3 +-- .../transpose_after_matmul_transformation.cpp | 1 - .../low_precision_transformations/transpose_transformation.cpp | 3 +-- .../low_precision_transformations/unsqueeze_transformation.cpp | 3 +-- .../variadic_split_transformation.cpp | 3 +-- .../low_precision_transformations/layer_transformation.hpp | 2 +- .../low_precision_transformations/layer_transformation.cpp | 2 +- 60 files changed, 38 insertions(+), 91 deletions(-) diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp index c223fbfa970580..afcb3053933f4a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/add.hpp" #include "ov_models/subgraph_builders.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp index 70e9b415a61efc..7c1910204f423f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp @@ -6,9 +6,8 @@ #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/batch_to_space.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp index 2f2b386eb49420..c5a87037f349fa 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_models/subgraph_builders.hpp" #include "ov_lpt_models/concat.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp index 7fa513eb89f401..ce6005c5328e8d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_child_and_output.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_models/builders.hpp" #include "ov_lpt_models/concat.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp index c32c0f0d2d4e5a..9312eeaedd5504 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_different_precision_on_children.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_models/builders.hpp" #include "ov_lpt_models/concat.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp index d6a5ba86c3107f..6a75449709eed6 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_intermediate_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_models/builders.hpp" #include "ov_lpt_models/concat.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp index 86ed873928c760..65bfa89181328d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_models/builders.hpp" #include "ov_lpt_models/concat.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp index 59e63258f07750..c7e59167aad0cb 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/concat_with_split_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_models/builders.hpp" #include "ov_lpt_models/concat.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp index 94382bce406068..69267810a95313 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp index c9a8786fada799..1b702e4d0c8466 100755 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp index ca50a5aa4afcb8..f40dd478fdc3e5 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_with_incorrect_weights.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp index 21b2a9deefb88d..e26a63028a48eb 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" @@ -21,7 +20,7 @@ #include #include #include -#include +#include "transformations/init_node_info.hpp" #include #include diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp index 0798b2874cb103..82202e31e53e12 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/add.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp index c5e397911ac627..05349cc040999b 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include "transformations/init_node_info.hpp" #include "openvino/util/common_util.hpp" #include "ov_lpt_models/fuse_fake_quantize.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp index ad5c845a9a8c20..9697080a247e08 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -//#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/common/fake_quantize_on_data.hpp" #include "ov_lpt_models/avg_pool.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp index 31b54e0c9bfb94..1e2a07bef51b15 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -//#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/common/fake_quantize_on_data.hpp" #include "ov_lpt_models/max_pool.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp index 91628f69d3de1b..e751ce1ba18240 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp index 547936b3bc0589..21213476d721f7 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp @@ -9,9 +9,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp index 4670d57c968c41..41b6fe0425ff5f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "low_precision/fuse_subtract_to_fake_quantize.hpp" #include "low_precision/fuse_multiply_to_fake_quantize.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index 197a39fdcc228e..3e17a494524d6a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/fake_quantize_and_convolution.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp index 8247ca506a5f04..802e9fe2e0acd3 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp index ce69b07cdcaf41..3cc6532cae5652 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_convert_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.cpp index a4e167187f28f0..087b3f2a515a46 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/fuse_fake_quantize.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp index 0bacb7b9be746b..e8943eeed5b2fc 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp index 0a3a5a24493fb7..bb21a147a11b38 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/fuse_multiply_to_fake_quantize.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp index e17cbaacae9e0b..fc4e077b9d2b58 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/fuse_subtract_to_fake_quantize.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/gather_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/gather_transformation.cpp index 3592e87fb41e45..7a0db9bcca4dfa 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/gather_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/gather_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/gather.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp index d295ee72603c4c..130685f1bc2f5a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/gemm_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp index 1261296a0ab736..42b8ffc564ba6a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp index 7cf7b3904cb9ba..a161c04393a401 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp index 4d0747896b6128..950886b65a1230 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/interpolate_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/interpolate.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp index 088a226240cbbb..3ed0c7765a6425 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp @@ -9,10 +9,9 @@ #include #include #include -#include #include "ngraph/op/op.hpp" -#include +#include "transformations/init_node_info.hpp" #include "low_precision_transformations/mat_mul_transformation.hpp" #include "ov_models/subgraph_builders.hpp" #include "ov_lpt_models/mat_mul.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp index 1776f2f6c65bac..4ceba572a65500 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -9,10 +9,9 @@ #include #include #include -#include #include "ngraph/op/op.hpp" -#include +#include "transformations/init_node_info.hpp" #include "low_precision_transformations/mat_mul_transformation.hpp" #include "ov_models/subgraph_builders.hpp" #include "ov_lpt_models/mat_mul.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp index bd7c4a03e4928e..51b130d463df22 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp index 6bd0d63a51fc7f..de31be2e812feb 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "shared_test_classes/base/layer_test_utils.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp index b250d9d7d8081f..36f697f9254813 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp index e758399c699a8a..700872c88ee57f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp @@ -8,8 +8,7 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/multiply_partial_function.hpp" #include "ov_models/subgraph_builders.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp index 52257fa4bc3770..3588d9b54977b5 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_with_one_parent_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "ov_lpt_models/multiply_with_one_parent.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp index f823094a816c63..9dc6735efc664d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mvn_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp index b2c6d68589c57e..f430aef1a9c9ba 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp index e284354451c3c2..9908346881f580 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp index 7e53af700c7c1f..11c386afa40093 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_concat_multi_channel.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp index aab4b06704e39f..737c0c8bd364af 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/output_layers_handling_in_transformations.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp index 1341fe7a3bc82b..b798285eb3068d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/prelu.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp index 253fde3ed86772..95ea125539886a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp index 28b0441b144874..820d7820c05597 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "shared_test_classes/base/layer_test_utils.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp index 8a6cf7ba80aa23..ab7fe4cfed7457 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/relu.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp index ec51ae52a6f4ab..faedda3137adb0 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp @@ -6,9 +6,8 @@ #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/reshape.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp index b90db3c39cb148..642cfd1ae3d5f0 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp index 797e0b3f6747c2..df51d016887f5e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp @@ -6,9 +6,8 @@ #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/space_to_batch.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp index 033912ae1ad37c..297e186bb4bd05 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/split_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "low_precision/split.hpp" #include "ov_lpt_models/split.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp index 3703426b10c5d9..7be301b2da2865 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp @@ -7,10 +7,9 @@ #include #include #include -#include #include "ngraph/op/op.hpp" -#include +#include "transformations/init_node_info.hpp" #include "low_precision_transformations/squeeze_transformation.hpp" #include "ov_models/subgraph_builders.hpp" #include "ov_lpt_models/squeeze.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp index c7aa4a49b9bf8c..ed10cac15c6fc9 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/subtract_multiply_to_multiply_add.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp index 4f046a4f30f893..8c0c341611d249 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/subtract_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/subtract.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp index 739a0062cce367..859216d8942370 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -9,7 +9,6 @@ #include #include -#include #include "common_test_utils/common_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_transformation.cpp index dc25777ada8df9..116d54e37751e4 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "ov_lpt_models/transpose.hpp" namespace LayerTestsDefinitions { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp index 5c7281d6acf997..d0213351751dab 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp @@ -7,10 +7,9 @@ #include #include #include -#include #include "ngraph/op/op.hpp" -#include +#include "transformations/init_node_info.hpp" #include "low_precision_transformations/unsqueeze_transformation.hpp" #include "ov_models/subgraph_builders.hpp" #include "ov_lpt_models/unsqueeze.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp index eed6fc540d70f4..ea410a89e677d7 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/variadic_split_transformation.cpp @@ -8,9 +8,8 @@ #include #include #include -#include -#include +#include "transformations/init_node_info.hpp" #include "low_precision/variadic_split.hpp" #include "ov_lpt_models/variadic_split.hpp" diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp index 16d2ea571ed115..5098322fa80c38 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp @@ -35,7 +35,7 @@ class LayerTransformation : virtual public ov::test::SubgraphBaseTest { protected: LayerTransformation(); - static std::pair getQuantizationInterval(const ov::element::Type precision); + static std::pair getQuantizationInterval(ov::element::Type precision); static std::string toString(const ov::pass::low_precision::LayerTransformation::Params& params); diff --git a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index faf35c65237e3b..28c02f67ef9c97 100644 --- a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp +++ b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -39,7 +39,7 @@ LayerTransformation::LayerTransformation() { configuration[PluginConfigInternalParams::KEY_LP_TRANSFORMS_MODE] = PluginConfigParams::YES; } -std::pair LayerTransformation::getQuantizationInterval(const ngraph::element::Type precision) { +std::pair LayerTransformation::getQuantizationInterval(ngraph::element::Type precision) { const bool unsignedInterval = precision == ngraph::element::u8; const float low = unsignedInterval ? 0.f : -128.f; const float hight = unsignedInterval ? 255.f : 127.f; From 3eca1f7e6631e16c1c329af938830cc04f2c442a Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Tue, 9 Jan 2024 18:43:24 +0100 Subject: [PATCH 24/37] fix ngraph -> ov --- .../layer_transformation.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index 28c02f67ef9c97..a2649aee3b5d6c 100644 --- a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp +++ b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -39,8 +39,8 @@ LayerTransformation::LayerTransformation() { configuration[PluginConfigInternalParams::KEY_LP_TRANSFORMS_MODE] = PluginConfigParams::YES; } -std::pair LayerTransformation::getQuantizationInterval(ngraph::element::Type precision) { - const bool unsignedInterval = precision == ngraph::element::u8; +std::pair LayerTransformation::getQuantizationInterval(ov::element::Type precision) { + const bool unsignedInterval = precision == ov::element::u8; const float low = unsignedInterval ? 0.f : -128.f; const float hight = unsignedInterval ? 255.f : 127.f; return std::make_pair(low, hight); @@ -142,11 +142,11 @@ std::string LayerTransformation::getRuntimePrecisionByFusedName(const std::strin return ""; } -std::map LayerTransformation::getRuntimeInfo() { +std::map LayerTransformation::getRuntimeInfo() { const ov::CompiledModel& execNet = compiledModel; const std::shared_ptr& function = execNet.get_runtime_model(); - std::map runtimeInfo; + std::map runtimeInfo; for (const auto& op : function->get_ops()) { runtimeInfo[op->get_friendly_name()] = op->get_rt_info(); } From 8738749f31f139df1a48356f525196ccfbe16725 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Tue, 9 Jan 2024 19:07:01 +0100 Subject: [PATCH 25/37] rename camel style to snake --- .../batch_to_space_transformation.cpp | 2 +- .../convolution_backprop_data_transformation.cpp | 2 +- .../convolution_qdq_transformation.cpp | 2 +- .../convolution_transformation.cpp | 2 +- ...elementwise_branch_selection_transformation.cpp | 5 +++-- .../eliminate_fake_quantize_transformation.cpp | 2 +- .../fake_quantize_transformation.cpp | 2 +- ...quantize_with_dq_not_optimal_transformation.cpp | 2 +- .../group_convolution_transformation.cpp | 2 +- .../groupconvolution_qdq_transformation.cpp | 2 +- .../mat_mul_transformation.cpp | 2 +- .../mat_mul_with_constant_transformation.cpp | 2 +- .../move_fake_quantize_transformation.cpp | 2 +- ...ultiply_to_group_convolution_transformation.cpp | 2 +- .../multiply_transformation.cpp | 2 +- .../normalize_transformation.cpp | 10 +++++----- .../pad_transformation.cpp | 2 +- ...shape_through_dequantization_transformation.cpp | 2 +- .../recurrent_cell_transformation.cpp | 2 +- .../reduce_max_transformation.cpp | 2 +- .../reduce_mean_transformation.cpp | 2 +- .../reduce_min_transformation.cpp | 2 +- .../reduce_sum_transformation.cpp | 2 +- .../reshape_transformation.cpp | 6 +++--- .../shuffle_channels_transformation.cpp | 2 +- .../space_to_batch_transformation.cpp | 2 +- .../transpose_after_matmul_transformation.cpp | 4 ++-- .../layer_transformation.hpp | 12 ++++++------ .../layer_transformation.cpp | 14 +++++++------- 29 files changed, 49 insertions(+), 48 deletions(-) diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp index 7c1910204f423f..e221666dc1808e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/batch_to_space_transformation.cpp @@ -51,7 +51,7 @@ void BatchToSpaceTransformation::run() { expected_type = "f16"; } - const auto actual_type = getRuntimePrecisionByType(params.layer_type); + const auto actual_type = get_runtime_precision_by_type(params.layer_type); EXPECT_EQ(actual_type, expected_type); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp index 3fdb59e938dc3c..67ca9cc8fc46af 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -78,7 +78,7 @@ void ConvolutionBackpropDataTransformation::run() { const auto inputShape = std::get<1>(GetParam()); if (inputShape.second) { const auto params = std::get<5>(GetParam()); - const auto actualType = getRuntimePrecision(params.layerName); + const auto actualType = get_runtime_precision(params.layerName); EXPECT_EQ(actualType, params.expectedKernelType); } } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp index 69267810a95313..1ff7b6cf06f6f5 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_qdq_transformation.cpp @@ -63,7 +63,7 @@ void ConvolutionQDqTransformation::run() { LayerTransformation::run(); const auto params = std::get<4>(GetParam()); - const auto actualType = getRuntimePrecisionByType(params.layerName); + const auto actualType = get_runtime_precision_by_type(params.layerName); EXPECT_EQ(actualType, params.expectedKernelType); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp index 1b702e4d0c8466..0bdda925817f3f 100755 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/convolution_transformation.cpp @@ -59,7 +59,7 @@ void ConvolutionTransformation::run() { LayerTransformation::run(); const auto params = std::get<4>(GetParam()); - const auto actualPrecision = getRuntimePrecisionByType(params.layerName); + const auto actualPrecision = get_runtime_precision_by_type(params.layerName); auto expectedPrecision = params.expectedKernelType; if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp index 82202e31e53e12..a21727902d6c64 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp @@ -80,7 +80,7 @@ void ElementwiseBranchSelectionTransformation::run() { std::vector> expectedReorders = params.expectedReorders; if (!expectedReorders.empty()) { - auto rtInfo = LayerTransformation::getRuntimeInfo(); + auto rtInfo = LayerTransformation::get_runtime_info(); for (auto it : rtInfo) { const auto& typeIt = it.second.find("layerType"); const auto type = typeIt->second.as(); @@ -110,7 +110,8 @@ void ElementwiseBranchSelectionTransformation::run() { } for (auto it : params.expectedPrecisions) { - const auto actualPrecision = getRuntimePrecisionByFusedName(it.first == "eltwise" ? elementwiseType : it.first); + const auto actualPrecision = get_runtime_precision_by_fused_name( + it.first == "eltwise" ? elementwiseType : it.first); ASSERT_EQ(it.second, actualPrecision) << "actual precision for operation '" << it.first << "' is not correct"; } } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp index 05349cc040999b..9485fea4293053 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/eliminate_fake_quantize_transformation.cpp @@ -55,7 +55,7 @@ TEST_P(EliminateFakeQuantizeTransformation, CompareWithRefImpl) { EliminateFakeQuantizeTransformationTestValues testValues; std::tie(targetDevice, testValues) = this->GetParam(); - const auto& rtInfo = LayerTransformation::getRuntimeInfo(); + const auto& rtInfo = LayerTransformation::get_runtime_info(); auto exist = testValues.expected.exist; auto absent = testValues.expected.absent; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp index 41b6fe0425ff5f..500b732490f997 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp @@ -59,7 +59,7 @@ void FakeQuantizeTransformation::run() { LayerTransformation::run(); const auto params = std::get<4>(GetParam()); - const auto actualPrecision = getRuntimePrecisionByType(params.layerName); + const auto actualPrecision = get_runtime_precision_by_type(params.layerName); auto expectedPrecision = params.expectedKernelType; if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index 3e17a494524d6a..412580276aff63 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -56,7 +56,7 @@ void FakeQuantizeWithNotOptimalTransformation::run() { LayerTransformation::run(); const auto params = std::get<4>(GetParam()); - const auto actualType = getRuntimePrecisionByType("Convolution"); + const auto actualType = get_runtime_precision_by_type("Convolution"); EXPECT_EQ(actualType, params.expectedPrecision); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp index 42b8ffc564ba6a..6462255744ab1d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/group_convolution_transformation.cpp @@ -75,7 +75,7 @@ void GroupConvolutionTransformation::run() { const auto param = std::get<4>(GetParam()); if (!param.layerName.empty()) { - const auto actualPrecision = getRuntimePrecisionByType(param.layerName); + const auto actualPrecision = get_runtime_precision_by_type(param.layerName); auto expectedPrecision = param.expectedKernelType; if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp index a161c04393a401..9678ecfdff3850 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -61,7 +61,7 @@ void GroupConvolutionQDqTransformation::run() { LayerTransformation::run(); const auto params = std::get<4>(GetParam()); - const auto actualType = getRuntimePrecision(params.layerName); + const auto actualType = get_runtime_precision(params.layerName); EXPECT_EQ(actualType, params.expectedKernelType); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp index 3ed0c7765a6425..a96e8b464f7c07 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp @@ -64,7 +64,7 @@ void MatMulTransformation::run() { LayerTransformation::run(); const auto params = std::get<3>(GetParam()); - const auto actualType = getRuntimePrecision(params.expectedKernelName); + const auto actualType = get_runtime_precision(params.expectedKernelName); EXPECT_EQ(actualType, params.expectedRuntimePrecision); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp index 4ceba572a65500..cfaeb282a38322 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -61,7 +61,7 @@ void MatMulWithConstantTransformation::run() { LayerTransformation::run(); const auto params = std::get<2>(GetParam()); - const auto actualPrecision = getRuntimePrecisionByType(params.layerName); + const auto actualPrecision = get_runtime_precision_by_type(params.layerName); auto expectedPrecision = params.expectedKernelType; if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp index de31be2e812feb..b68e336dffcaa9 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/move_fake_quantize_transformation.cpp @@ -85,7 +85,7 @@ void MoveFakeQuantizeTransformation::run() { LayerTransformation::run(); const auto params = std::get<5>(GetParam()); - const auto actualPrecision = getRuntimePrecisionByType(params.layerName); + const auto actualPrecision = get_runtime_precision_by_type(params.layerName); auto expectedPrecision = params.expectedKernelType; if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp index 36f697f9254813..edfb371e2d3363 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_to_group_convolution_transformation.cpp @@ -58,7 +58,7 @@ void MultiplyToGroupConvolutionTransformation::run() { LayerTransformation::run(); const auto param = std::get<3>(GetParam()); - const auto actualPrecision = getRuntimePrecision(param.layerName); + const auto actualPrecision = get_runtime_precision(param.layerName); auto expectedPrecision = param.expectedKernelType; if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp index 700872c88ee57f..cec8ccdace32bb 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp @@ -114,7 +114,7 @@ void MultiplyTransformation::run() { }; const auto expectedFqPrecision = to_string(params.expectedPrecisions); - const auto actualFqPrecision = getRuntimePrecision("multiply"); + const auto actualFqPrecision = get_runtime_precision("multiply"); EXPECT_EQ(expectedFqPrecision, actualFqPrecision); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp index f430aef1a9c9ba..27f1b24c6c6ce6 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/normalize_transformation.cpp @@ -32,11 +32,11 @@ std::string NormalizeL2Transformation::getTestCaseName(const testing::TestParamI std::ostringstream result; result << netPrecision << "_" << - shapes.first << "_" << - shapes.second << "_" << - targetDevice << "_" << - toString(params) << "_" << - "_axes" << axes.size() << + shapes.first << "_" << + shapes.second << "_" << + targetDevice << "_" << + to_string(params) << "_" << + "_axes" << axes.size() << (fuseMultiply ? "_multiply" : "") << (shift ? "_shift" : ""); return result.str(); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp index 0c05b7797661f5..0b31e24767c3cb 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp @@ -54,7 +54,7 @@ void PadTransformation::run() { LayerTransformation::run(); const auto params = std::get<5>(GetParam()); - const auto actualPrecision = getRuntimePrecisionByType(params.layerName); + const auto actualPrecision = get_runtime_precision_by_type(params.layerName); const auto expectedPrecision = params.expectedKernelType; EXPECT_EQ(actualPrecision, expectedPrecision); diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp index 95ea125539886a..a0215a4ddb3ba8 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp @@ -84,7 +84,7 @@ void PullReshapeThroughDequantizationTransformation::run() { LayerTransformation::run(); const auto params = std::get<5>(GetParam()); - const auto actualType = getRuntimePrecision(params.operationName); + const auto actualType = get_runtime_precision(params.operationName); EXPECT_EQ(actualType, params.expectedKernelType); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp index 820d7820c05597..ac9efa3ea2a1ae 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp @@ -76,7 +76,7 @@ void RecurrentCellTransformation::run() { LayerTransformation::run(); const auto params = std::get<5>(GetParam()); - const auto actualPrecision = getRuntimePrecisionByType(params.layerName); + const auto actualPrecision = get_runtime_precision_by_type(params.layerName); auto expectedPrecision = params.expectedKernelType; if (expectedPrecision == "FP32" && std::get<0>(GetParam()) == ov::element::f16) { expectedPrecision = "FP16"; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp index 141765c8d2567e..1ea7467ac7113c 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp @@ -59,7 +59,7 @@ void ReduceMaxTransformation::run() { LayerTransformation::run(); const auto params = std::get<4>(GetParam()); - const auto actualType = getRuntimePrecision(params.layerName); + const auto actualType = get_runtime_precision(params.layerName); EXPECT_EQ(actualType, params.expectedKernelType); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp index c91aa68f3c8d26..08f5302e6d716b 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp @@ -67,7 +67,7 @@ void ReduceMeanTransformation::run() { LayerTransformation::run(); const auto params = std::get<4>(GetParam()); - const auto actualType = getRuntimePrecision(params.layerName); + const auto actualType = get_runtime_precision(params.layerName); EXPECT_EQ(actualType, params.expectedKernelType); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp index bb03c262bc36b1..4468f451bd5b54 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp @@ -59,7 +59,7 @@ void ReduceMinTransformation::run() { LayerTransformation::run(); const auto params = std::get<4>(GetParam()); - const auto actualType = getRuntimePrecision(params.layerName); + const auto actualType = get_runtime_precision(params.layerName); EXPECT_EQ(actualType, params.expectedKernelType); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp index 0e833d89cdd283..0f2a859a1760c7 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp @@ -60,7 +60,7 @@ void ReduceSumTransformation::run() { LayerTransformation::run(); const auto params = std::get<4>(GetParam()); - const auto actualType = getRuntimePrecision(params.layerName); + const auto actualType = get_runtime_precision(params.layerName); EXPECT_EQ(actualType, params.expectedKernelType); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp index faedda3137adb0..5addda86377624 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reshape_transformation.cpp @@ -20,8 +20,8 @@ std::string ReshapeTransformation::getTestCaseName(const testing::TestParamInfo< std::tie(netPrecision, targetDevice, params, param) = obj.param; std::ostringstream result; - result << netPrecision << "_" << targetDevice << "_" << toString(params) << - "_" << param.inputShape << "_" << param.fakeQuantize << "_{"; + result << netPrecision << "_" << targetDevice << "_" << to_string(params) << + "_" << param.inputShape << "_" << param.fakeQuantize << "_{"; for (size_t i = 0; i < param.reshapeConstValues.size(); ++i) { result << param.reshapeConstValues[i]; if (i != (param.reshapeConstValues.size() - 1ul)) { @@ -51,7 +51,7 @@ void ReshapeTransformation::run() { LayerTransformation::run(); const auto params = std::get<3>(GetParam()); - auto actualPrecision = getRuntimePrecisionByType(params.layerType); + auto actualPrecision = get_runtime_precision_by_type(params.layerType); const auto expectedPrecision = params.expectedKernelType; if ((expectedPrecision == "FP32") && (actualPrecision == "FP16")) { actualPrecision = "FP32"; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp index 642cfd1ae3d5f0..f8897324b32054 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/shuffle_channels_transformation.cpp @@ -53,7 +53,7 @@ void ShuffleChannelsTransformation::run() { LayerTransformation::run(); const auto params = std::get<4>(GetParam()); - const auto actualType = getRuntimePrecision(params.layerName); + const auto actualType = get_runtime_precision(params.layerName); EXPECT_EQ(actualType, params.expectedKernelType); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp index df51d016887f5e..2136c6ca9aa7da 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/space_to_batch_transformation.cpp @@ -50,7 +50,7 @@ void SpaceToBatchTransformation::run() { expected_type = "f16"; } - const auto actual_type = getRuntimePrecisionByType(params.layer_type); + const auto actual_type = get_runtime_precision_by_type(params.layer_type); EXPECT_EQ(actual_type, expected_type); } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp index 859216d8942370..2339e6b2d11865 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -30,8 +30,8 @@ std::string TransposeAfterMatMulTransformation::getTestCaseName(const testing::T std::tie(netPrecision, inputShapes, targetDevice, params, perTensor, transposeChannelDim) = obj.param; std::ostringstream result; - result << netPrecision << "_" << targetDevice << "_" << toString(params) << - (perTensor ? "_perTensor" : "_perChannel") << + result << netPrecision << "_" << targetDevice << "_" << to_string(params) << + (perTensor ? "_perTensor" : "_perChannel") << (transposeChannelDim ? "_transposeChannelDim" : "_notTransposeChannelDim"); return result.str(); } diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp index 5098322fa80c38..6e780dc2c30c44 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp @@ -35,9 +35,9 @@ class LayerTransformation : virtual public ov::test::SubgraphBaseTest { protected: LayerTransformation(); - static std::pair getQuantizationInterval(ov::element::Type precision); + static std::pair get_quantization_interval(ov::element::Type precision); - static std::string toString(const ov::pass::low_precision::LayerTransformation::Params& params); + static std::string to_string(const ov::pass::low_precision::LayerTransformation::Params& params); static std::string get_test_case_name_by_params( ov::element::Type precision, @@ -46,15 +46,15 @@ class LayerTransformation : virtual public ov::test::SubgraphBaseTest { const ov::pass::low_precision::LayerTransformation::Params& params); // get runtime precision by operation friendly name - std::string getRuntimePrecision(const std::string& layerName); + std::string get_runtime_precision(const std::string& layerName); // get runtime precision by operation type - std::string getRuntimePrecisionByType(const std::string& layerType); + std::string get_runtime_precision_by_type(const std::string& layerType); // get runtime precision by operation friendly name which can be fused - std::string getRuntimePrecisionByFusedName(const std::string& layerName); + std::string get_runtime_precision_by_fused_name(const std::string& layerName); - std::map getRuntimeInfo(); + std::map get_runtime_info(); void init_input_shapes(const ov::PartialShape& shape); diff --git a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index a2649aee3b5d6c..1f72a1c519fa56 100644 --- a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp +++ b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -39,14 +39,14 @@ LayerTransformation::LayerTransformation() { configuration[PluginConfigInternalParams::KEY_LP_TRANSFORMS_MODE] = PluginConfigParams::YES; } -std::pair LayerTransformation::getQuantizationInterval(ov::element::Type precision) { +std::pair LayerTransformation::get_quantization_interval(ov::element::Type precision) { const bool unsignedInterval = precision == ov::element::u8; const float low = unsignedInterval ? 0.f : -128.f; const float hight = unsignedInterval ? 255.f : 127.f; return std::make_pair(low, hight); } -std::string LayerTransformation::toString(const ov::pass::low_precision::LayerTransformation::Params& params) { +std::string LayerTransformation::to_string(const ov::pass::low_precision::LayerTransformation::Params& params) { using namespace ov::pass::low_precision; std::ostringstream result; result << @@ -62,11 +62,11 @@ std::string LayerTransformation::get_test_case_name_by_params( const std::string& targetDevice, const ov::pass::low_precision::LayerTransformation::Params& params) { std::ostringstream result; - result << precision << "_" << inputShapes << "_" << targetDevice << "_" << toString(params); + result << precision << "_" << inputShapes << "_" << targetDevice << "_" << to_string(params); return result.str(); } -std::string LayerTransformation::getRuntimePrecision(const std::string& layerName) { +std::string LayerTransformation::get_runtime_precision(const std::string& layerName) { const ov::CompiledModel& execNet = compiledModel; const std::shared_ptr& execFunction = execNet.get_runtime_model(); @@ -83,7 +83,7 @@ std::string LayerTransformation::getRuntimePrecision(const std::string& layerNam return ""; } -std::string LayerTransformation::getRuntimePrecisionByType(const std::string& layerType) { +std::string LayerTransformation::get_runtime_precision_by_type(const std::string& layerType) { const ov::CompiledModel& execNet = compiledModel; const std::shared_ptr& execFunction = execNet.get_runtime_model(); @@ -104,7 +104,7 @@ std::string LayerTransformation::getRuntimePrecisionByType(const std::string& la return ""; } -std::string LayerTransformation::getRuntimePrecisionByFusedName(const std::string& layerName) { +std::string LayerTransformation::get_runtime_precision_by_fused_name(const std::string& layerName) { const ov::CompiledModel& execNet = compiledModel; const std::shared_ptr& execFunction = execNet.get_runtime_model(); @@ -142,7 +142,7 @@ std::string LayerTransformation::getRuntimePrecisionByFusedName(const std::strin return ""; } -std::map LayerTransformation::getRuntimeInfo() { +std::map LayerTransformation::get_runtime_info() { const ov::CompiledModel& execNet = compiledModel; const std::shared_ptr& function = execNet.get_runtime_model(); From 4af671d25b85219efc18b594b7b1089753f78a00 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Wed, 10 Jan 2024 15:30:35 +0100 Subject: [PATCH 26/37] remove/fix ngraph includes --- .../eliminate_fake_quantize_transformation.hpp | 1 - .../fully_connected_transformation.hpp | 1 - ...fuse_dequantize_to_fake_quantize_transformation.hpp | 1 - .../fuse_multiply_to_fake_quantize_transformation.hpp | 1 - .../fuse_subtract_to_fake_quantize_transformation.hpp | 1 - .../assign_and_read_value_transformation.cpp | 1 - .../clamp_transformation.cpp | 1 - .../depth_to_space_transformation.cpp | 10 +++++----- .../mat_mul_transformation.cpp | 1 - .../mat_mul_with_constant_transformation.cpp | 1 - .../pad_transformation.cpp | 1 - .../reduce_max_transformation.cpp | 1 - .../reduce_mean_transformation.cpp | 1 - .../reduce_min_transformation.cpp | 1 - .../reduce_sum_transformation.cpp | 1 - .../squeeze_transformation.cpp | 1 - .../strided_slice_transformation.cpp | 1 - .../unsqueeze_transformation.cpp | 1 - .../src/base/utils/generate_inputs.cpp | 2 -- 19 files changed, 5 insertions(+), 24 deletions(-) diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/eliminate_fake_quantize_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/eliminate_fake_quantize_transformation.hpp index 5141b21798b048..76bf6127799b42 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/eliminate_fake_quantize_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/eliminate_fake_quantize_transformation.hpp @@ -7,7 +7,6 @@ #include #include -#include #include "ov_lpt_models/common/add.hpp" #include "ov_lpt_models/common/fake_quantize_on_data.hpp" #include "ov_lpt_models/common/dequantization_operations.hpp" diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp index c4cacbfe3b81c3..224fa417a3e9ce 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fully_connected_transformation.hpp @@ -6,7 +6,6 @@ #include #include -#include #include "shared_test_classes/base/low_precision_transformations/layer_transformation.hpp" class MatMulShapes { diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.hpp index d221443f429ccc..590958687a440b 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_dequantize_to_fake_quantize_transformation.hpp @@ -6,7 +6,6 @@ #include -#include #include "ov_lpt_models/common/add.hpp" #include "ov_lpt_models/common/fake_quantize_on_data.hpp" #include "ov_lpt_models/common/dequantization_operations.hpp" diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp index ea2093c360aa2f..dea9f20c799c9b 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.hpp @@ -6,7 +6,6 @@ #include -#include #include "ov_lpt_models/common/add.hpp" #include "ov_lpt_models/common/fake_quantize_on_data.hpp" #include "ov_lpt_models/common/dequantization_operations.hpp" diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp index 977e261caa66d1..9cb05fe3610fd8 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.hpp @@ -6,7 +6,6 @@ #include -#include #include "ov_lpt_models/common/add.hpp" #include "ov_lpt_models/common/fake_quantize_on_data.hpp" #include "ov_lpt_models/common/dequantization_operations.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp index 3fb5d7b70a5e10..83a63907427896 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/assign_and_read_value_transformation.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "ov_lpt_models/assign_and_read_value.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp index 60090516826e0a..c6eb973f776160 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "ov_lpt_models/clamp.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp index e26a63028a48eb..6c4c4d7a80ed1f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp @@ -17,12 +17,12 @@ #include "ov_models/pass/convert_prc.hpp" #include "ov_models/builders.hpp" -#include -#include -#include +#include "transformations/utils/utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/pass/constant_folding.hpp" #include "transformations/init_node_info.hpp" -#include -#include +#include "transformations/common_optimizations/depth_to_space_fusion.hpp" +#include "openvino/op/depth_to_space.hpp" #include "ov_lpt_models/depth_to_space.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp index a96e8b464f7c07..a8e6b09d0bc40e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp @@ -10,7 +10,6 @@ #include #include -#include "ngraph/op/op.hpp" #include "transformations/init_node_info.hpp" #include "low_precision_transformations/mat_mul_transformation.hpp" #include "ov_models/subgraph_builders.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp index cfaeb282a38322..05db8b42ed8e4f 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -10,7 +10,6 @@ #include #include -#include "ngraph/op/op.hpp" #include "transformations/init_node_info.hpp" #include "low_precision_transformations/mat_mul_transformation.hpp" #include "ov_models/subgraph_builders.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp index 0b31e24767c3cb..279bf12252d7b7 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/pad_transformation.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "ov_lpt_models/pad.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp index 1ea7467ac7113c..d919f18466e0b3 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_max_transformation.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "ov_lpt_models/reduce.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp index 08f5302e6d716b..0ea01a9a51aa6d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_mean_transformation.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "ov_lpt_models/reduce.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp index 4468f451bd5b54..af2552960ce113 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_min_transformation.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "ov_lpt_models/reduce.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp index 0f2a859a1760c7..3ad7869fd08d89 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/reduce_sum_transformation.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "ov_lpt_models/reduce.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp index 7be301b2da2865..8e90915913bd3a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp @@ -8,7 +8,6 @@ #include #include -#include "ngraph/op/op.hpp" #include "transformations/init_node_info.hpp" #include "low_precision_transformations/squeeze_transformation.hpp" #include "ov_models/subgraph_builders.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp index d8b6130618b57d..d8e96595f2cf78 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/strided_slice_transformation.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "ov_lpt_models/strided_slice.hpp" diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp index d0213351751dab..ee23959645ea1e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp @@ -8,7 +8,6 @@ #include #include -#include "ngraph/op/op.hpp" #include "transformations/init_node_info.hpp" #include "low_precision_transformations/unsqueeze_transformation.hpp" #include "ov_models/subgraph_builders.hpp" diff --git a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp index b25a37c69713f4..fab2b7c892581e 100644 --- a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp +++ b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp @@ -6,8 +6,6 @@ #include #include -#include -#include "ngraph/ops.hpp" #include "shared_test_classes/base/utils/generate_inputs.hpp" #include "openvino/op/ops.hpp" From a589658b9dbe72de51ab0f30debeb4fb8fe395ef Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Wed, 10 Jan 2024 15:43:51 +0100 Subject: [PATCH 27/37] use static_partial_shapes_to_test_representation --- .../low_precision_transformations/layer_transformation.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index 1f72a1c519fa56..880062dccec9e4 100644 --- a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp +++ b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -159,11 +159,7 @@ void LayerTransformation::init_input_shapes(const ov::PartialShape& shape) { } void LayerTransformation::init_input_shapes(const std::vector& shapes) { - std::vector input_shapes; - for (const auto& shape : shapes) { - std::pair> tmp_shapes(shape, { shape.to_shape() }); - input_shapes.push_back(tmp_shapes); - } + auto input_shapes = ov::test::static_partial_shapes_to_test_representation(shapes); SubgraphBaseTest::init_input_shapes(input_shapes); } From af2cf3fdf8b6f4d08248394e2ee3011931ea0c74 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Wed, 10 Jan 2024 15:50:10 +0100 Subject: [PATCH 28/37] move generate_inputs.cpp aux functions to anon namespace --- .../src/base/utils/generate_inputs.cpp | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp index fab2b7c892581e..329b1400aba166 100644 --- a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp +++ b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp @@ -250,7 +250,46 @@ ov::Tensor generate(const std::shared_ptr& node, return ov::test::utils::create_and_fill_tensor(elemType, targetShape, inGenData); } -bool get_fq_scalar_range(const std::shared_ptr &node, float& min_value, float& max_value); +namespace { +using GetItemF = std::function&, float&)>; + +bool get_const_value(const std::shared_ptr& node, float& value, const GetItemF& get_item_func) { + auto const_node = ov::as_type_ptr(node); + if (!const_node) + return false; + + auto const_value = const_node->cast_vector(); + return get_item_func(const_value, value); +} + +bool get_min_value(const std::vector& v, float& value) { + const auto it = std::min_element(v.begin(), v.end()); + if (it == v.end()) { + return false; + } + value = *it; + return true; +} + +bool get_max_value(const std::vector& v, float& value) { + const auto it = std::max_element(v.begin(), v.end()); + if (it == v.end()) { + return false; + } + value = *it; + return true; +} + +bool get_fq_scalar_range(const std::shared_ptr &node, float& min_value, float& max_value) { + if (!get_const_value(node->get_input_node_shared_ptr(1), min_value, get_min_value)) + return false; + + if (!get_const_value(node->get_input_node_shared_ptr(2), max_value, get_max_value)) + return false; + + return true; +} +} // namespace ov::Tensor generate(const std::shared_ptr& node, size_t port, @@ -318,45 +357,6 @@ ov::Tensor generate(const std::shared_ptr& node, } } -using GetItemF = std::function&, float&)>; - -bool get_const_value(const std::shared_ptr& node, float& value, const GetItemF& get_item_func) { - auto const_node = ov::as_type_ptr(node); - if (!const_node) - return false; - - auto const_value = const_node->cast_vector(); - return get_item_func(const_value, value); -} - -bool get_min_value(const std::vector& v, float& value) { - const auto it = std::min_element(v.begin(), v.end()); - if (it == v.end()) { - return false; - } - value = *it; - return true; -} - -bool get_max_value(const std::vector& v, float& value) { - const auto it = std::max_element(v.begin(), v.end()); - if (it == v.end()) { - return false; - } - value = *it; - return true; -} - -bool get_fq_scalar_range(const std::shared_ptr &node, float& min_value, float& max_value) { - if (!get_const_value(node->get_input_node_shared_ptr(1), min_value, get_min_value)) - return false; - - if (!get_const_value(node->get_input_node_shared_ptr(2), max_value, get_max_value)) - return false; - - return true; -} - ov::Tensor generate(const std::shared_ptr& node, size_t port, const ov::element::Type& elemType, From 11d9b90e6a0cf70d3044d917bf9afcf92aec31d2 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Thu, 11 Jan 2024 13:27:01 +0100 Subject: [PATCH 29/37] code review fix --- src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp index f1c34486fa2a45..ecc6d4f4c1aa3e 100644 --- a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp +++ b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp @@ -403,9 +403,6 @@ void compare(const ov::Tensor& expected, throw std::runtime_error(out_stream.str()); } - if (expected_value == 0.0 || actual_value == 0.0) - continue; - double abs = std::fabs(expected_value - actual_value); double rel = expected_value ? (abs / std::fabs(expected_value)) : abs; From ab541a224f48e3c5cf0d6b7cfd0343d96172b8fd Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Thu, 11 Jan 2024 13:27:14 +0100 Subject: [PATCH 30/37] ci fixes --- .../fake_quantize_with_dq_not_optimal_transformation.cpp | 1 + .../fully_connected_transformation.cpp | 1 + .../recurrent_cell_transformation.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index 412580276aff63..9beaad990b66ed 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -61,6 +61,7 @@ void FakeQuantizeWithNotOptimalTransformation::run() { } TEST_P(FakeQuantizeWithNotOptimalTransformation, CompareWithRefImpl) { + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp index 802e9fe2e0acd3..37f5a3bd11ee93 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp @@ -56,6 +56,7 @@ void FullyConnectedTransformation::SetUp() { } TEST_P(FullyConnectedTransformation, CompareWithRefImpl) { + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp index ac9efa3ea2a1ae..7d261aaf48ace8 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/recurrent_cell_transformation.cpp @@ -85,6 +85,7 @@ void RecurrentCellTransformation::run() { } TEST_P(RecurrentCellTransformation, CompareWithRefImpl) { + SKIP_IF_CURRENT_TEST_IS_DISABLED(); run(); }; From a483ccea4f1d5d6125129b5df6dfcacc6efc63a3 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Thu, 11 Jan 2024 18:24:17 +0100 Subject: [PATCH 31/37] code review: refactor get_runtime_precision methods --- .../layer_transformation.cpp | 87 ++++++++----------- 1 file changed, 36 insertions(+), 51 deletions(-) diff --git a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp index 880062dccec9e4..cacdd7df76badb 100644 --- a/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp +++ b/src/tests/functional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp @@ -66,80 +66,65 @@ std::string LayerTransformation::get_test_case_name_by_params( return result.str(); } -std::string LayerTransformation::get_runtime_precision(const std::string& layerName) { - const ov::CompiledModel& execNet = compiledModel; +namespace { +template +std::string find_node_by_runtime_precision(const ov::CompiledModel& execNet, IsNodeF is_node_f) { const std::shared_ptr& execFunction = execNet.get_runtime_model(); for (const auto& op : execFunction->get_ops()) { - const auto name = op->get_friendly_name(); - if (name == layerName) { - const auto& rtInfo = op->get_rt_info(); - const auto& it = rtInfo.find("runtimePrecision"); - OPENVINO_ASSERT(it != rtInfo.end(), "Runtime precision is not found for node: ", name); - return it->second.as(); - } + if (!is_node_f(op)) + continue; + const ov::RTMap& rtInfo = op->get_rt_info(); + const auto& it = rtInfo.find("runtimePrecision"); + OPENVINO_ASSERT(it != rtInfo.end(), "Runtime precision is not found for node: ", op->get_friendly_name()); + return it->second.as(); } return ""; } +} // namespace -std::string LayerTransformation::get_runtime_precision_by_type(const std::string& layerType) { - const ov::CompiledModel& execNet = compiledModel; - const std::shared_ptr& execFunction = execNet.get_runtime_model(); +std::string LayerTransformation::get_runtime_precision(const std::string& layerName) { + auto is_node_f = [layerName](const std::shared_ptr& op) { + return op->get_friendly_name() == layerName; + }; + return find_node_by_runtime_precision(compiledModel, is_node_f); +} - for (const auto& op : execFunction->get_ops()) { +std::string LayerTransformation::get_runtime_precision_by_type(const std::string& layerType) { + auto is_node_f = [layerType](const std::shared_ptr& op) { const auto& rtInfo = op->get_rt_info(); const auto& typeIt = rtInfo.find("layerType"); OPENVINO_ASSERT(typeIt != rtInfo.end(), "Layer is not found for type: ", layerType); + return typeIt->second.as() == layerType; + }; + return find_node_by_runtime_precision(compiledModel, is_node_f); +} - auto type = typeIt->second.as(); - if (type == layerType) { - const auto& it = rtInfo.find("runtimePrecision"); - OPENVINO_ASSERT(it != rtInfo.end(), "Runtime precision is not found for node: ", type); - return it->second.as(); - } +namespace { +bool has_layer(const std::string& names, const std::string& layer_name) { + size_t beginPosition = 0ul; + size_t endPosition; + while ((endPosition = names.find(',', beginPosition)) != std::string::npos) { + if (names.substr(beginPosition, endPosition - beginPosition) == layer_name) + return true; + beginPosition = endPosition + 1; } - return ""; + return names.substr(beginPosition, endPosition - beginPosition) == layer_name; } +} // namespace std::string LayerTransformation::get_runtime_precision_by_fused_name(const std::string& layerName) { - const ov::CompiledModel& execNet = compiledModel; - const std::shared_ptr& execFunction = execNet.get_runtime_model(); - - const auto parse = [](const std::string& originalLayersNames) -> std::set { - std::set names; - - std::string tmp = originalLayersNames; - size_t beginPosition = 0ul; - size_t endPosition; - while ((endPosition = tmp.find(",", beginPosition)) != std::string::npos) { - names.insert(tmp.substr(beginPosition, endPosition - beginPosition)); - beginPosition = endPosition + 1; - } - - names.insert(tmp.substr(beginPosition, endPosition - beginPosition)); - return names; - }; - - for (const auto& op : execFunction->get_ops()) { + auto is_node_f = [layerName](const std::shared_ptr& op) { const auto& rtInfo = op->get_rt_info(); const auto& nameIt = rtInfo.find("originalLayersNames"); OPENVINO_ASSERT(nameIt != rtInfo.end(), "originalLayersNames is not found for node: ", layerName); - const auto fusedName = parse(nameIt->second.as()); - if (fusedName.find(layerName) == fusedName.end()) { - continue; - } - - const auto& it = rtInfo.find("runtimePrecision"); - OPENVINO_ASSERT(it != rtInfo.end(), "runtimePrecision is not found for node: ", layerName); - const auto rtPrecisionPtr = it->second.as(); - return rtPrecisionPtr; - } - - return ""; + return has_layer(nameIt->second.as(), layerName); + }; + return find_node_by_runtime_precision(compiledModel, is_node_f); } std::map LayerTransformation::get_runtime_info() { From bf9967a2840be509a6a3ce0708ed2ec976a3776b Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Thu, 11 Jan 2024 19:18:45 +0100 Subject: [PATCH 32/37] refactor get_fq_scalar_range --- .../src/base/utils/generate_inputs.cpp | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp index 329b1400aba166..6a982171cc6bcd 100644 --- a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp +++ b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp @@ -251,39 +251,33 @@ ov::Tensor generate(const std::shared_ptr& node, } namespace { -using GetItemF = std::function&, float&)>; - +template bool get_const_value(const std::shared_ptr& node, float& value, const GetItemF& get_item_func) { auto const_node = ov::as_type_ptr(node); if (!const_node) return false; auto const_value = const_node->cast_vector(); - return get_item_func(const_value, value); -} - -bool get_min_value(const std::vector& v, float& value) { - const auto it = std::min_element(v.begin(), v.end()); - if (it == v.end()) { - return false; - } - value = *it; - return true; -} -bool get_max_value(const std::vector& v, float& value) { - const auto it = std::max_element(v.begin(), v.end()); - if (it == v.end()) { + const auto it = get_item_func(const_value); + if (it == const_value.end()) { return false; } value = *it; return true; } +using Vec = std::vector; bool get_fq_scalar_range(const std::shared_ptr &node, float& min_value, float& max_value) { + auto get_min_value = [](const Vec& v) { + return std::min_element(v.begin(), v.end()); + }; if (!get_const_value(node->get_input_node_shared_ptr(1), min_value, get_min_value)) return false; + auto get_max_value = [](const Vec& v) { + return std::max_element(v.begin(), v.end()); + }; if (!get_const_value(node->get_input_node_shared_ptr(2), max_value, get_max_value)) return false; From 2822678706e73eda7e72a95f986c28f5378b7c56 Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Wed, 17 Jan 2024 15:22:03 +0100 Subject: [PATCH 33/37] fixes after rebase --- .../add_transformation.cpp | 1 - .../concat_transformation.cpp | 1 - ...oncat_with_intermediate_transformation.cpp | 1 - .../concat_with_neighbors_transformation.cpp | 1 - .../depth_to_space_transformation.cpp | 1 - ...ntwise_branch_selection_transformation.cpp | 1 - ...eliminate_fake_quantize_transformation.cpp | 1 - .../fq_and_avg_pool_transformation.cpp | 1 - .../fq_and_max_pool_transformation.cpp | 1 - .../fully_connected_transformation.cpp | 1 - .../fuse_convert_transformation.cpp | 1 - .../fuse_dequantize_to_fq_transformation.cpp | 1 - .../fuse_multiply_to_fq_transformation.cpp | 1 - .../fuse_subtract_to_fq_transformation.cpp | 1 - .../interpolate_transformation.cpp | 1 - .../mat_mul_transformation.cpp | 1 - .../mat_mul_with_constant_transformation.cpp | 1 - .../multiply_to_group_convolution.cpp | 1 - .../mvn_transformation.cpp | 1 - .../normalize_transformation.cpp | 1 - .../output_layers.cpp | 2 +- .../output_layers_concat.cpp | 2 +- .../output_layers_concat_multi_channel.cpp | 2 +- .../prelu_transformation.cpp | 1 - .../relu_transformation.cpp | 1 - .../add_transformation.cpp | 57 +++--- .../assign_and_read_value_transformation.cpp | 14 +- .../batch_to_space_transformation.cpp | 10 +- .../clamp_transformation.cpp | 16 +- .../concat_transformation.cpp | 33 ++- .../concat_with_child_and_output.cpp | 24 +-- ...t_with_different_precision_on_children.cpp | 28 +-- ...oncat_with_intermediate_transformation.cpp | 9 +- ...at_with_neighbors_graph_transformation.cpp | 9 +- .../concat_with_split_transformation.cpp | 24 +-- ...nvolution_backprop_data_transformation.cpp | 54 ++--- .../convolution_qdq_transformation.cpp | 82 ++++---- .../convolution_transformation.cpp | 54 ++--- .../depth_to_space_transformation.cpp | 11 +- ...ntwise_branch_selection_transformation.cpp | 39 ++-- ...eliminate_fake_quantize_transformation.cpp | 13 +- .../fq_and_avg_pool_transformation.cpp | 9 +- .../fq_and_max_pool_transformation.cpp | 9 +- ...d_two_output_branches_with_convolution.cpp | 8 +- .../fq_precision_selection_transformation.cpp | 20 +- .../fq_transformation.cpp | 8 +- .../fq_with_dq_not_optimal_transformation.cpp | 72 +++---- .../fully_connected_transformation.cpp | 7 +- .../fuse_convert_transformation.cpp | 7 +- .../fuse_dequantize_to_fq_transformation.cpp | 51 +++-- ...fuse_fq_and_scale_shift_transformation.cpp | 8 +- .../fuse_multiply_to_fq_transformation.cpp | 1 - .../fuse_subtract_to_fq_transformation.cpp | 1 - .../gather_transformation.cpp | 12 +- .../gemm_transformation.cpp | 8 +- .../group_convolution_transformation.cpp | 54 ++--- .../groupconvolution_qdq_transformation.cpp | 190 +++++++++--------- .../interpolate_transformation.cpp | 9 +- .../mat_mul_transformation.cpp | 25 ++- .../mat_mul_with_constant_transformation.cpp | 29 ++- .../mat_mul_with_optimized_constant_fq.cpp | 12 +- .../move_fake_quantize_transformation.cpp | 28 +-- ...ly_to_group_convolution_transformation.cpp | 13 +- .../multiply_transformation.cpp | 68 +++---- ...ultiply_with_one_parent_transformation.cpp | 10 +- .../mvn_transformation.cpp | 3 +- .../normalize_transformation.cpp | 9 +- .../output_layers.cpp | 2 +- .../output_layers_concat.cpp | 2 +- .../output_layers_concat_multi_channel.cpp | 2 +- .../pad_transformation.cpp | 20 +- .../prelu_transformation.cpp | 17 +- .../pull_reshape_through_dequantization.cpp | 38 ++-- .../recurrent_cell_transformation.cpp | 46 ++--- .../reduce_max_transformation.cpp | 24 +-- .../reduce_mean_transformation.cpp | 24 +-- .../reduce_min_transformation.cpp | 24 +-- .../reduce_sum_transformation.cpp | 20 +- .../relu_transformation.cpp | 17 +- .../reshape_transformation.cpp | 34 ++-- .../shuffle_channels_transformation.cpp | 20 +- .../space_to_batch_transformation.cpp | 10 +- .../split_transformation.cpp | 20 +- .../squeeze_transformation.cpp | 14 +- .../strided_slice_transformation.cpp | 18 +- .../subtract_multiply_to_multiply_add.cpp | 16 +- .../subtract_transformation.cpp | 8 +- .../transpose_after_matmul_transformation.cpp | 8 +- .../transpose_transformation.cpp | 12 +- .../unsqueeze_transformation.cpp | 16 +- .../variadic_split_transformation.cpp | 20 +- .../output_layers_concat_multi_channel.hpp | 4 +- 92 files changed, 784 insertions(+), 828 deletions(-) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/add_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/add_transformation.cpp index e8ca048e1fb4fe..2798e6441d64fd 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/add_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/add_transformation.cpp @@ -8,7 +8,6 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector netPrecisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_transformation.cpp index b035ded218f6dc..b107e68669b005 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_transformation.cpp @@ -8,7 +8,6 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp index 07af5859963b5c..169addf4fa8051 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp @@ -8,7 +8,6 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector netPrecisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp index 456a112dba297f..48862426e0dced 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp @@ -8,7 +8,6 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp index 1c0c6bfba80785..363b11f62c6e42 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp @@ -8,7 +8,6 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/elementwise_branch_selection_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/elementwise_branch_selection_transformation.cpp index 9ebcd591728874..f6001604033c55 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/elementwise_branch_selection_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/elementwise_branch_selection_transformation.cpp @@ -8,7 +8,6 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector netPrecisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/eliminate_fake_quantize_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/eliminate_fake_quantize_transformation.cpp index c7fdc231cff28b..41177df7cc51cb 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/eliminate_fake_quantize_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/eliminate_fake_quantize_transformation.cpp @@ -8,7 +8,6 @@ #include using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_avg_pool_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_avg_pool_transformation.cpp index b6f6ab91cd8602..7feb4ce5537911 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_avg_pool_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_avg_pool_transformation.cpp @@ -9,7 +9,6 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_max_pool_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_max_pool_transformation.cpp index 577ddf4a6b4569..c954184ef6ff31 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_max_pool_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_max_pool_transformation.cpp @@ -9,7 +9,6 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp index 6cece38ca7421b..f7efaf173eb2a0 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp @@ -8,7 +8,6 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector netPrecisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp index dd7581174f3160..207fa8c07722bc 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp @@ -5,7 +5,6 @@ #include "low_precision_transformations/fuse_convert_transformation.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_dequantize_to_fq_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_dequantize_to_fq_transformation.cpp index 9fc00f6521dd42..baf3927a029f2c 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_dequantize_to_fq_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_dequantize_to_fq_transformation.cpp @@ -7,7 +7,6 @@ #include using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp index d422d30037470a..a7382b7bbbed12 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp @@ -7,7 +7,6 @@ #include using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; using namespace ngraph; namespace { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp index 298cfa4d215978..ac184ce486828c 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp @@ -7,7 +7,6 @@ #include using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; using namespace ngraph; namespace { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp index f7435aab0e180d..94b3016055d832 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp @@ -5,7 +5,6 @@ #include "low_precision_transformations/interpolate_transformation.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp index 83c70156312d71..25fa68253b5172 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp @@ -7,7 +7,6 @@ #include "low_precision_transformations/mat_mul_transformation.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp index 45735728e8f29a..0236b7c4d76d28 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -7,7 +7,6 @@ #include "low_precision_transformations/mat_mul_with_constant_transformation.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution.cpp index 1e69e012d867c4..850e4f0bf5927f 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution.cpp @@ -5,7 +5,6 @@ #include "low_precision_transformations/multiply_to_group_convolution_transformation.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp index 71074db5cbb68a..a2f9a9b82fe404 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp @@ -5,7 +5,6 @@ #include "low_precision_transformations/mvn_transformation.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp index 7d780b9d1245c1..af7ae7ddc32c20 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp @@ -8,7 +8,6 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp index fff943198c58c0..230fad2785a858 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp @@ -26,7 +26,7 @@ const std::vector trasformationParamValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, OutputLayers, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), + ::testing::Values(ov::Shape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues)), OutputLayers::getTestCaseName); diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp index 3f7c7a6af4b409..7355f55cad7d5a 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp @@ -25,7 +25,7 @@ const std::vector trasformationParamValues = { INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_LPT, OutputLayersConcat, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), + ::testing::Values(ov::Shape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues)), OutputLayersConcat::getTestCaseName); diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp index 475c5c2c2d0734..2a4f1440b232d1 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp @@ -26,7 +26,7 @@ const std::vector trasformationParamValues = { INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_LPT, OutputLayersConcatMultiChannel, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), + ::testing::Values(ov::Shape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_CPU), ::testing::ValuesIn(trasformationParamValues)), OutputLayersConcatMultiChannel::getTestCaseName); diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp index 161e3c52c68eb2..854026354cca24 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp @@ -8,7 +8,6 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/relu_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/relu_transformation.cpp index 9ee573edc3e9ca..1884e56c210d56 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/relu_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/relu_transformation.cpp @@ -8,7 +8,6 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/add_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/add_transformation.cpp index 7f13a10b36e2fa..f2a6c3cc7b99c6 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/add_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/add_transformation.cpp @@ -8,62 +8,61 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector params = { { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 255.f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { -12.8f }, { 12.7f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 255.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { -12.8f }, { 12.7f } }, false, - {ngraph::element::i8}, {ngraph::element::f32, ngraph::element::i8} + {ov::element::i8}, {ngraph::element::f32, ngraph::element::i8} }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -128.f }, { 127.f }, { -128.f }, { 127.f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -128.f }, { 127.f }, { -128.f }, { 127.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, false, - {ngraph::element::i8}, {ngraph::element::f32, ngraph::element::i8} + {ov::element::i8}, {ngraph::element::f32, ngraph::element::i8} }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { -128.f }, { 127.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { -128.f }, { 127.f } }, true, - {ngraph::element::i8}, {ngraph::element::i8, ngraph::element::f32} + {ov::element::i8}, {ngraph::element::i8, ngraph::element::f32} }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -128.f }, { 127.f }, { -12.8f }, { 12.7f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 255.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -128.f }, { 127.f }, { -12.8f }, { 12.7f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 255.f } }, true, - {ngraph::element::i8}, {ngraph::element::i8, ngraph::element::f32} + {ov::element::i8}, {ngraph::element::i8, ngraph::element::f32} }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 255.f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { -12.7f }, { 12.8f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 255.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { -12.7f }, { 12.8f } }, false, - {ngraph::element::u8}, {ngraph::element::f32, ngraph::element::u8} + {ov::element::u8}, {ngraph::element::f32, ngraph::element::u8} }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -128.f }, { 127.f }, { -128.f }, { 127.f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -128.f }, { 127.f }, { -128.f }, { 127.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, false, - {ngraph::element::u8}, {ngraph::element::f32, ngraph::element::u8} + {ov::element::u8}, {ngraph::element::f32, ngraph::element::u8} }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { -127.f }, { 128.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { -127.f }, { 128.f } }, true, - {ngraph::element::u8}, {ngraph::element::u8, ngraph::element::f32} + {ov::element::u8}, {ngraph::element::u8, ngraph::element::f32} }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -128.f }, { 127.f }, { -12.8f }, { 12.7f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 255.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -128.f }, { 127.f }, { -12.8f }, { 12.7f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 255.f } }, true, - {ngraph::element::u8}, {ngraph::element::u8, ngraph::element::f32} + {ov::element::u8}, {ngraph::element::u8, ngraph::element::f32} }, { {}, {}, false }, { {}, {}, true }, }; @@ -71,7 +70,7 @@ const std::vector params = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, AddTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(params)), AddTransformation::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/assign_and_read_value_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/assign_and_read_value_transformation.cpp index 8d60739c8a7d67..1c7127995a8a18 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/assign_and_read_value_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/assign_and_read_value_transformation.cpp @@ -12,9 +12,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + // ov::element::f16 }; const std::vector opsetVersions = { @@ -30,22 +30,22 @@ const std::vector trasform const std::vector params{ // u8 { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 12.8f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 12.8f } }, }, // u16 { - { 65536ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 12.8f } }, + { 65536ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 12.8f } }, }, // u32 { - { 4294967296ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 12.8f } }, + { 4294967296ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 12.8f } }, }, }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, AssignAndReadValueTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::ValuesIn(opsetVersions), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/batch_to_space_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/batch_to_space_transformation.cpp index 2c8dfda5f94a6f..e593417704066a 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/batch_to_space_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/batch_to_space_transformation.cpp @@ -10,16 +10,16 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector params = { { { 4, 3, 50, 86 }, { 1, 1, 2, 2 }, { 0, 0, 0, 0 }, { 0, 0, 0, 1 }, - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, "batch_to_space", "u8" }, @@ -28,7 +28,7 @@ const std::vector params = { { 1, 1, 2, 2 }, { 0, 0, 0, 0 }, { 0, 0, 0, 1 }, { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { 0.f, 0.f, 0.f }, { 255.f, 255.f/2.f, 255.f/3.f }, { 0.f, 0.f, 0.f }, diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp index dc0e8b43fe5485..9b4f5419b23bc6 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp @@ -12,9 +12,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -27,7 +27,7 @@ const std::vector trasform const std::vector params = { // tensor quantization { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, { {}, {{0.f, 0.f, 0.f}}, @@ -38,7 +38,7 @@ const std::vector params = { }, // tensor quantization { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { -12.8f }, { 12.7f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { -12.8f }, { 12.7f } }, { {}, {{0.f, 0.f, 0.f}}, @@ -50,7 +50,7 @@ const std::vector params = { // per-channel quantization with the same values { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -64,7 +64,7 @@ const std::vector params = { { { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { -127.f, 0.f, 128.f / 2.f }, { 128.f / 4.f, 128.f / 2.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -79,7 +79,7 @@ const std::vector params = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, ClampTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_transformation.cpp index ebeeb2a2d6017c..683feecd9683bf 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_transformation.cpp @@ -8,49 +8,48 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + ov::element::f16 }; const std::vector testValues = { // U8 { {}, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, {}, {}, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, {} }, // I8 { {}, - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, {}, {}, - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, {} }, // mixed { {}, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, {}, {}, - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, {} }, // FQ with unexpected quantizationLevels { {}, - { 16ul, ngraph::Shape({}), {0.f}, {15.f}, {0.f}, {1.5f} }, + { 16ul, ov::Shape({}), {0.f}, {15.f}, {0.f}, {1.5f} }, {}, {}, - { 16ul, ngraph::Shape({}), {0.f}, {15.f}, {0.f}, {1.5f} }, + { 16ul, ov::Shape({}), {0.f}, {15.f}, {0.f}, {1.5f} }, {} }, }; @@ -58,7 +57,7 @@ const std::vector testValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(testValues)), ConcatTransformation::getTestCaseName); @@ -67,15 +66,15 @@ INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatTransformation, namespace concat_transformation_mixed { -const std::vector precisions = { - ngraph::element::f16 +const std::vector precisions = { + ov::element::f16 }; const std::vector testValues = { // mixed dequantization: FP32 & FP16 { {}, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, {}, std::make_shared(ov::element::u8, ov::Shape{1, 3, 16, 16}, std::vector(3 * 16 * 16, 1.0)), {}, @@ -90,7 +89,7 @@ const std::vector testValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(testValues)), ConcatTransformation::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp index 6bf9daea59e6b4..be8a2a69c43254 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp @@ -10,9 +10,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -22,30 +22,30 @@ const std::vector trasform const std::vector testValues = { // U8 { - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 2.f} } + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 2.f} } }, // I8 { - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f / 2.f}, {1.27f / 2.f} } + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f / 2.f}, {1.27f / 2.f} } }, // mixed: U8 + I8 { - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} } + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} } }, // mixed: I8 + U8 { - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} } + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} } } }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithChildAndOutputTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 6, 10, 10 })), + ::testing::Values(ov::PartialShape({ 1, 6, 10, 10 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(testValues), ::testing::ValuesIn(trasformationParamValues)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp index 31da220ecab561..51a2eb9bec65e5 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp @@ -10,9 +10,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -23,39 +23,39 @@ const std::vector testValues = { // U8 { 1, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 2.f} } + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 2.f} } }, // U8 and unsupported concat axis { 2, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 2.f} } + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 2.f} } }, // I8 { 1, - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f / 2.f}, {1.27f / 2.f} } + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f / 2.f}, {1.27f / 2.f} } }, // mixed: U8 + I8 { 1, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} } + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} } }, // mixed: I8 + U8 { 1, - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} } + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} } } }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithDifferentChildrenTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), + ::testing::Values(ov::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(testValues), ::testing::ValuesIn(trasformationParamValues)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp index 8a440e8c824682..a48d6dbac5f747 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp @@ -8,12 +8,11 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -29,7 +28,7 @@ const std::vector multiChannelValues = { /*true,*/ false }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithIntermediateTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(transparentIntermediateValues), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp index 1d39bf69a873fd..7f2e0a22eab328 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp @@ -8,12 +8,11 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -26,7 +25,7 @@ const std::vector trasform INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithNeighborsGraphTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues)), ConcatWithNeighborsGraphTransformation::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp index e220a6ec552b4a..29a8a58c00c625 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp @@ -10,9 +10,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -25,30 +25,30 @@ const std::vector trasform const std::vector testValues = { // U8 { - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 2.f} } + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f / 2.f} } }, // I8 { - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} } + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} } }, // mixed: U8 + I8 { - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} } + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} } }, // mixed: I8 + U8 { - { 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} } + { 256ul, ov::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} }, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} } } }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithSplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 6, 10, 10 })), + ::testing::Values(ov::PartialShape({ 1, 6, 10, 10 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(testValues), ::testing::ValuesIn(trasformationParamValues)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp index c10197eb8009e3..50b24fb99285fc 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -10,9 +10,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -22,92 +22,92 @@ const std::vector trasform const std::vector params = { // FQ on weights { - {256ul, ngraph::Shape{1, 1, 1, 1}, { 0.f }, { 25.5f }, { 0.f }, { 25.5f }}, - {255ul, ngraph::Shape{1, 1, 1, 1}, { -12.7f }, { 12.7f }, { -12.7f }, { 12.7f }}, + {256ul, ov::Shape{1, 1, 1, 1}, { 0.f }, { 25.5f }, { 0.f }, { 25.5f }}, + {255ul, ov::Shape{1, 1, 1, 1}, { -12.7f }, { 12.7f }, { -12.7f }, { 12.7f }}, "convolutionBackpropData_original", "U8" }, // FQ on weights { - {256ul, ngraph::Shape{}, { 0.f }, { 25.5f }, { 0.f }, { 25.5f }}, - {255ul, ngraph::Shape{}, { -12.7f }, { 12.7f }, { -12.7f }, { 12.7f }}, + {256ul, ov::Shape{}, { 0.f }, { 25.5f }, { 0.f }, { 25.5f }}, + {255ul, ov::Shape{}, { -12.7f }, { 12.7f }, { -12.7f }, { 12.7f }}, "convolutionBackpropData_original", "U8" }, // FQ on weights { - {256ul, ngraph::Shape{1, 1, 1, 1}, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f }}, - {255ul, ngraph::Shape{1, 1, 1, 1}, { -12.7f }, { 12.7f }, { -12.7f }, { 12.7f }}, + {256ul, ov::Shape{1, 1, 1, 1}, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f }}, + {255ul, ov::Shape{1, 1, 1, 1}, { -12.7f }, { 12.7f }, { -12.7f }, { 12.7f }}, "convolutionBackpropData_original", "I8" }, // FQ on weights // with zero point { - {256ul, ngraph::Shape{1, 1, 1, 1}, { 0.f }, { 255.f }, { -12.7f }, { 12.8f }}, - {255ul, ngraph::Shape{1, 1, 1, 1}, { 0.f }, { 254.f }, { -127.f }, { 127.f }}, + {256ul, ov::Shape{1, 1, 1, 1}, { 0.f }, { 255.f }, { -12.7f }, { 12.8f }}, + {255ul, ov::Shape{1, 1, 1, 1}, { 0.f }, { 254.f }, { -127.f }, { 127.f }}, "", "" }, // without zero point { - {256ul, ngraph::Shape{1, 1, 1, 1}, { 0.f }, { 255.f }, { 0.f }, { 25.5f }}, - {255ul, ngraph::Shape{1, 1, 1, 1}, { 0.f }, { 254.f }, { 0.f }, { 25.4f }}, + {256ul, ov::Shape{1, 1, 1, 1}, { 0.f }, { 255.f }, { 0.f }, { 25.5f }}, + {255ul, ov::Shape{1, 1, 1, 1}, { 0.f }, { 254.f }, { 0.f }, { 25.4f }}, "", "" }, // TODO: check fails in CI // // with incorrect zero point on activations // { -// {256ul, ngraph::Shape{1, 1, 1, 1}, { 5.f }, { 6.f }, { 5.f }, { 6.f }}, -// {255ul, ngraph::Shape{1, 1, 1, 1}, { 0.f }, { 254.f }, { 0.f }, { 25.4f }}, +// {256ul, ov::Shape{1, 1, 1, 1}, { 5.f }, { 6.f }, { 5.f }, { 6.f }}, +// {255ul, ov::Shape{1, 1, 1, 1}, { 0.f }, { 254.f }, { 0.f }, { 25.4f }}, // "", // "" // }, // // with incorrect zero point on weights // { -// {256ul, ngraph::Shape{1, 1, 1, 1}, { 0.f }, { 255.f }, { 0.f }, { 25.5f }}, -// {255ul, ngraph::Shape{1, 1, 1, 1}, { 5.f }, { 6.f }, { 5.f }, { 6.f }}, +// {256ul, ov::Shape{1, 1, 1, 1}, { 0.f }, { 255.f }, { 0.f }, { 25.5f }}, +// {255ul, ov::Shape{1, 1, 1, 1}, { 5.f }, { 6.f }, { 5.f }, { 6.f }}, // "", // "" // }, // QDq on weights // with zero point { - {256ul, ngraph::Shape{1, 1, 1, 1}, { 0.f }, { 255.f }, { -12.7f }, { 12.8f }}, - {{ngraph::element::f32}, { {12.f}, ngraph::element::f32, {}, false }, { {4.f}, ngraph::element::f32, {}, false }}, + {256ul, ov::Shape{1, 1, 1, 1}, { 0.f }, { 255.f }, { -12.7f }, { 12.8f }}, + {{ov::element::f32}, { {12.f}, ngraph::element::f32, {}, false }, { {4.f}, ngraph::element::f32, {}, false }}, "", "" }, // without zero point { - {256ul, ngraph::Shape{1, 1, 1, 1}, { 0.f }, { 255.f }, { 0.f }, { 25.5f }}, - {{ngraph::element::f32}, {}, { {4.f}, ngraph::element::f32, {}, false }}, + {256ul, ov::Shape{1, 1, 1, 1}, { 0.f }, { 255.f }, { 0.f }, { 25.5f }}, + {{ov::element::f32}, {}, { {4.f}, ngraph::element::f32, {}, false }}, "", "" }, // with incorrect zero point on activations { - {256ul, ngraph::Shape{1, 1, 1, 1}, { 5.f }, { 6.f }, { 5.f }, { 6.f }}, - {{ngraph::element::f32}, { {12.f}, ngraph::element::f32, {}, false }, { {4.f}, ngraph::element::f32, {}, false }}, + {256ul, ov::Shape{1, 1, 1, 1}, { 5.f }, { 6.f }, { 5.f }, { 6.f }}, + {{ov::element::f32}, { {12.f}, ngraph::element::f32, {}, false }, { {4.f}, ngraph::element::f32, {}, false }}, "", "" }, // with incorrect zero point on weights { - {256ul, ngraph::Shape{1, 1, 1, 1}, { 0.f }, { 255.f }, { -12.7f }, { 12.8f }}, - {{ngraph::element::f32}, { {1000.f}, ngraph::element::f32, {}, false }, { {4.f}, ngraph::element::f32, {}, false }}, + {256ul, ov::Shape{1, 1, 1, 1}, { 0.f }, { 255.f }, { -12.7f }, { 12.8f }}, + {{ov::element::f32}, { {1000.f}, ngraph::element::f32, {}, false }, { {4.f}, ngraph::element::f32, {}, false }}, "", "" } }; -const std::vector> inputShapes = { +const std::vector> inputShapes = { {{ 1, 8, 16, 16 }, false}, {{ 1, 32, 16, 16 }, true} }; -const std::vector outputShapes = { +const std::vector outputShapes = { { 16, 16 } }; diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp index 522ed21b2b550b..b4878fd7e60b05 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp @@ -11,9 +11,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -57,20 +57,20 @@ const std::vector para // \ / // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - {ngraph::element::f32}, - { {128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::u8, true }, - { {0.1f}, ngraph::element::f32, {}, false } + {ov::element::f32}, + { {128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::u8, true }, + { {0.1f}, ov::element::f32, {}, false } }, - { std::vector{ 15.f }, ngraph::element::f32}, - { 255ul, ngraph::Shape({ 1, 1, 1, 1 }), { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ngraph::element::f32 }, - { ngraph::element::i8, false }, + { std::vector{ 15.f }, ov::element::f32}, + { 255ul, ov::Shape({ 1, 1, 1, 1 }), { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ov::element::f32 }, + { ov::element::i8, false }, { - { ngraph::element::f32, false }, - { {-128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::i8, true }, - { {0.2f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {-128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::i8, true }, + { {0.2f}, ov::element::f32, {}, false } }, "Convolution", "U8" @@ -111,20 +111,20 @@ const std::vector para // \ / // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - {ngraph::element::f32}, + {ov::element::f32}, {}, - { {0.1f}, ngraph::element::f32, {}, false } + { {0.1f}, ov::element::f32, {}, false } }, - { std::vector{ 15.f }, ngraph::element::f32}, - { 255ul, ngraph::Shape({ 1, 1, 1, 1 }), { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ngraph::element::f32 }, - { ngraph::element::i8, false }, + { std::vector{ 15.f }, ov::element::f32}, + { 255ul, ov::Shape({ 1, 1, 1, 1 }), { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ov::element::f32 }, + { ov::element::i8, false }, { - { ngraph::element::f32, false }, + { ov::element::f32, false }, {}, - { {0.2f}, ngraph::element::f32, {}, false } + { {0.2f}, ov::element::f32, {}, false } }, "Convolution", "U8" @@ -162,20 +162,20 @@ const std::vector para // \ / // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - { ngraph::element::f32, false }, - { {128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::u8, true }, - { {0.1f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::u8, true }, + { {0.1f}, ov::element::f32, {}, false } }, - {{0.5f}, ngraph::element::i8}, + {{0.5f}, ov::element::i8}, {}, {}, { - { ngraph::element::f32, false }, - { {128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::u8, true }, - { {0.2f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::u8, true }, + { {0.2f}, ov::element::f32, {}, false } }, "Convolution", "FP32" @@ -213,27 +213,27 @@ const std::vector para // \ / // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - { ngraph::element::f32, false }, - { {128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::u8, true }, - { {0.1f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::u8, true }, + { {0.1f}, ov::element::f32, {}, false } }, - {{0.5f}, ngraph::element::i8}, + {{0.5f}, ov::element::i8}, {}, {}, { - { ngraph::element::f32, false }, + { ov::element::f32, false }, {}, - { {0.2f}, ngraph::element::f32, {}, false } + { {0.2f}, ov::element::f32, {}, false } }, "Convolution", "U8" }, }; -const std::vector shapes = { +const std::vector shapes = { { 1, 3, 4, 4 }, { 4, 3, 4, 4 } }; diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp index d5d76692c3531a..9ce9e78c962aff 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp @@ -11,9 +11,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -22,7 +22,7 @@ const std::vector trasform const std::vector params = { { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, false, {}, false, @@ -32,40 +32,40 @@ const std::vector params { {}, false, - { 255ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -12.7f }, { 12.7f } }, + { 255ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -12.7f }, { 12.7f } }, false, "Convolution", "FP32" }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, false, - { 255ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -12.7f }, { 12.7f } }, + { 255ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -12.7f }, { 12.7f } }, false, "Convolution", "U8" }, { - { 256ul, ngraph::Shape {}, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape {}, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, false, - { 255ul, ngraph::Shape {}, { 0.f }, { 254.f }, { -12.7f }, { 12.7f } }, + { 255ul, ov::Shape {}, { 0.f }, { 254.f }, { -12.7f }, { 12.7f } }, false, "Convolution", "U8" }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { -12.75f }, { 6.375f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { -12.75f }, { 6.375f } }, true, - { 255ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -12.7f }, { 12.7f } }, + { 255ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -12.7f }, { 12.7f } }, false, "Convolution", "U8" }, { - { 256ul, ngraph::Shape { 1 }, { 0.f }, { 255.f }, { -18.7f }, { 18.8f } }, + { 256ul, ov::Shape { 1 }, { 0.f }, { 255.f }, { -18.7f }, { 18.8f } }, true, { - 255ul, ngraph::Shape { 6, 1, 1, 1 }, { -0.6f }, { 0.6f }, + 255ul, ov::Shape { 6, 1, 1, 1 }, { -0.6f }, { 0.6f }, { -1.52806e-39f, -0.2, -0.3, -0.3, -0.2, -0.1 }, { 1.52806e-39f, 0.2, 0.3, 0.3, 0.2, 0.1 } }, false, @@ -73,10 +73,10 @@ const std::vector params "U8" }, { - { 256ul, ngraph::Shape { 1 }, { 0.f }, { 255.f }, { -18.7f }, { 18.8f } }, + { 256ul, ov::Shape { 1 }, { 0.f }, { 255.f }, { -18.7f }, { 18.8f } }, true, { - 255ul, ngraph::Shape { 6, 1, 1, 1 }, { -0.6f }, { 0.6f }, + 255ul, ov::Shape { 6, 1, 1, 1 }, { -0.6f }, { 0.6f }, { -1.52806e-39f, -1.52806e-39f, -1.52806e-39f, -1.52806e-39f, -1.52806e-39f, -1.52806e-39f }, { 1.52806e-39f, 1.52806e-39f, 1.52806e-39f, 1.52806e-39f, 1.52806e-39f, 1.52806e-39f } }, @@ -86,27 +86,27 @@ const std::vector params }, // not supported quantization level on data { - { 65536ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 65536ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, false, - { 255ul, ngraph::Shape{1, 1, 1, 1}, {0.f}, {254.f}, {-12.7f}, {12.7f}}, + { 255ul, ov::Shape{1, 1, 1, 1}, {0.f}, {254.f}, {-12.7f}, {12.7f}}, false, "Convolution", "FP32" }, // not supported quantization level on data & weights { - { 65536ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 65536ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, false, - { 65536ul, ngraph::Shape{1, 1, 1, 1}, {0.f}, {254.f}, {-12.7f}, {12.7f}}, + { 65536ul, ov::Shape{1, 1, 1, 1}, {0.f}, {254.f}, {-12.7f}, {12.7f}}, false, "Convolution", "FP32" }, // not supported quantization level on weights { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, false, - { 65536ul, ngraph::Shape{1, 1, 1, 1}, {0.f}, {254.f}, {-12.7f}, {12.7f}}, + { 65536ul, ov::Shape{1, 1, 1, 1}, {0.f}, {254.f}, {-12.7f}, {12.7f}}, false, "Convolution", "FP32" @@ -116,7 +116,7 @@ const std::vector params INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConvolutionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ov::Shape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), @@ -125,14 +125,14 @@ INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConvolutionTransformation, const std::vector incorrectWeightsParams = { // incorrect weights { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, - { 255ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 255ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, false }, // correct weights { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, - { 255ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 255ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, true } }; @@ -140,7 +140,7 @@ const std::vector i INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConvolutionWIthIncorrectWeightsTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), + ::testing::Values(ov::Shape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(incorrectWeightsParams)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp index 5449287a2dbb46..5bb0ddabe1a887 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp @@ -8,12 +8,11 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + ov::element::f16 }; const std::vector modes = { @@ -21,7 +20,7 @@ const std::vector modes = { ov::op::v0::DepthToSpace::DepthToSpaceMode::DEPTH_FIRST }; -const std::vector inputShapesBS2 = { +const std::vector inputShapesBS2 = { {1, 4, 3, 3}, {2, 16, 5, 4} }; @@ -35,7 +34,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/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/elementwise_branch_selection_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/elementwise_branch_selection_transformation.cpp index f8f1151fac0cfa..6039991ce0ef80 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/elementwise_branch_selection_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/elementwise_branch_selection_transformation.cpp @@ -8,11 +8,10 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, +const std::vector netPrecisions = { + ov::element::f32, }; const std::vector elementwiseTypes = { @@ -23,24 +22,24 @@ const std::vector elementwiseTypes = { const std::vector params = { { { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, { {}, - { std::vector(9, 1.f), ngraph::element::i8, {3, 3, 1, 1} }, - { {ngraph::element::f32}, {}, {std::vector(3, 1.f), ngraph::element::f32, {3, 1, 1, 1}} } + { std::vector(9, 1.f), ov::element::i8, {3, 3, 1, 1} }, + { {ov::element::f32}, {}, {std::vector(3, 1.f), ngraph::element::f32, {3, 1, 1, 1}} } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, { {}, - { std::vector(9, 1.f), ngraph::element::i8, {3, 3, 1, 1} }, - { {ngraph::element::f32}, {}, {std::vector(3, 1.f), ngraph::element::f32, {3, 1, 1, 1}} } + { std::vector(9, 1.f), ov::element::i8, {3, 3, 1, 1} }, + { {ov::element::f32}, {}, {std::vector(3, 1.f), ngraph::element::f32, {3, 1, 1, 1}} } }, {} }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, {}, // GPU doesn't returns Reorders in performance counters { {"convolution1", "U8"}, @@ -50,24 +49,24 @@ const std::vector p }, { { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, { {}, - { std::vector(9, 1.f), ngraph::element::i8, {3, 3, 1, 1} }, - { {ngraph::element::f32}, {}, {std::vector(3, 1.f), ngraph::element::f32, {3, 1, 1, 1}} } + { std::vector(9, 1.f), ov::element::i8, {3, 3, 1, 1} }, + { {ov::element::f32}, {}, {std::vector(3, 1.f), ngraph::element::f32, {3, 1, 1, 1}} } }, {} }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, { {}, - { std::vector(9, 1.f), ngraph::element::i8, {3, 3, 1, 1} }, - { {ngraph::element::f32}, {}, {std::vector(3, 1.f), ngraph::element::f32, {3, 1, 1, 1}} } + { std::vector(9, 1.f), ov::element::i8, {3, 3, 1, 1} }, + { {ov::element::f32}, {}, {std::vector(3, 1.f), ngraph::element::f32, {3, 1, 1, 1}} } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, {}, // GPU doesn't returns Reorders in performance counters { {"convolution1", "U8"}, @@ -80,7 +79,7 @@ const std::vector p INSTANTIATE_TEST_SUITE_P(smoke_LPT, ElementwiseBranchSelectionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(params), ::testing::ValuesIn(elementwiseTypes)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/eliminate_fake_quantize_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/eliminate_fake_quantize_transformation.cpp index 636782ba93ff1a..ba4b05d8479a0b 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/eliminate_fake_quantize_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/eliminate_fake_quantize_transformation.cpp @@ -7,7 +7,6 @@ #include using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector testValues = { @@ -15,9 +14,9 @@ const std::vector testValues = { {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { - ngraph::element::f32, - { 256ul, {}, { 0.f }, { 255.f / 2.f }, { 0.f }, { 255.f / 2.f }, ngraph::element::f32 }, - { 256ul, {}, { 0.f }, { 255.f / 2.f }, { 0.f }, { 255.f / 2.f }, ngraph::element::f32 } + ov::element::f32, + { 256ul, {}, { 0.f }, { 255.f / 2.f }, { 0.f }, { 255.f / 2.f }, ov::element::f32 }, + { 256ul, {}, { 0.f }, { 255.f / 2.f }, { 0.f }, { 255.f / 2.f }, ov::element::f32 } }, { { "fakeQuantize1" }, @@ -29,9 +28,9 @@ const std::vector testValues = { {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { - ngraph::element::f32, - { 256ul, {}, { 0.f }, { 255.f / 2.f }, { 0.f }, { 255.f / 2.f }, ngraph::element::f32 }, - { 256ul, {}, { 0.f }, { 255.f / 2.1f }, { 0.f }, { 255.f / 2.1f }, ngraph::element::f32 } + ov::element::f32, + { 256ul, {}, { 0.f }, { 255.f / 2.f }, { 0.f }, { 255.f / 2.f }, ov::element::f32 }, + { 256ul, {}, { 0.f }, { 255.f / 2.1f }, { 0.f }, { 255.f / 2.1f }, ov::element::f32 } }, { { "fakeQuantize1", "fakeQuantize2" }, // not fused diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_avg_pool_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_avg_pool_transformation.cpp index 7b29143e4bc6d8..a0732fd163e9cb 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_avg_pool_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_avg_pool_transformation.cpp @@ -9,12 +9,11 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -30,7 +29,7 @@ const std::vector fakeQuantizes = INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndAvgPoolTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), + ::testing::Values(ov::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizes)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_max_pool_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_max_pool_transformation.cpp index 2a83be0a515026..223c6404949a5a 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_max_pool_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_max_pool_transformation.cpp @@ -9,12 +9,11 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -30,7 +29,7 @@ const std::vector fakeQuantizes = INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndMaxPoolTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), + ::testing::Values(ov::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizes)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_two_output_branches_with_convolution.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_two_output_branches_with_convolution.cpp index f3d389a94af34e..c267457e71434d 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_two_output_branches_with_convolution.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_and_two_output_branches_with_convolution.cpp @@ -11,9 +11,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -31,7 +31,7 @@ const std::vector testValues = INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), + ::testing::Values(ov::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(testValues)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_precision_selection_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_precision_selection_transformation.cpp index 853719aabd3854..92b387fba06189 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_precision_selection_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_precision_selection_transformation.cpp @@ -12,9 +12,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -23,22 +23,22 @@ const std::vector trasformationParamValues = { const std::vector testValues = { { - { ngraph::element::u8, ngraph::element::i8 }, - { ngraph::element::u8 }, + { ov::element::u8, ngraph::element::i8 }, + { ov::element::u8 }, true, { { 256ul, { }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, { 255ul, { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -12.7f }, { 12.7f } } }, { - ngraph::element::u8, + ov::element::u8, { 256ul, { }, { 0.f }, { 2.55f }, { 0.f }, { 255.f } }, { } }, }, { - { ngraph::element::u8, ngraph::element::i8 }, - { ngraph::element::i8 }, + { ov::element::u8, ngraph::element::i8 }, + { ov::element::i8 }, // INT8 is not available for limited operation (Convolution) false, { @@ -47,7 +47,7 @@ const std::vector testVa }, { // original precision is used - ngraph::element::u8, + ov::element::u8, // FakeQuantize has to select the first available: U8, not limited operation required I8 but this fact doesn't affect { 256ul, { }, { 0.f }, { 25.5f }, { 0.f }, { 255.f } }, // FakeQuantize on weights is not changed @@ -60,7 +60,7 @@ const std::vector testVa INSTANTIATE_TEST_SUITE_P(DISABLED_LPT, FakeQuantizePrecisionSelectionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), + ::testing::Values(ov::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(testValues)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_transformation.cpp index 560cbf0629b30c..4c11b9e73df348 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_transformation.cpp @@ -12,9 +12,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector isConvertOnConstants = { @@ -68,7 +68,7 @@ const std::vector fakeQuantizeOnDataValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 32, 72, 48 })), + ::testing::Values(ov::PartialShape({ 1, 32, 72, 48 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizeOnDataValues), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_with_dq_not_optimal_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_with_dq_not_optimal_transformation.cpp index a771177d4bd71b..1c7f50e49ec413 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_with_dq_not_optimal_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_with_dq_not_optimal_transformation.cpp @@ -12,9 +12,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16, +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16, }; const std::vector trasformationParamValues = { @@ -24,77 +24,77 @@ const std::vector trasformationParamValues = { const std::vector fakeQuantizeOnDataValues = { { - { 256ul, {{ 1, 1, 1, 1 }}, { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ngraph::element::f32 }, - { ngraph::element::i8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ov::element::f32 }, + { ov::element::i8, false }, { - { ngraph::element::f32, false }, - { {-128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::i8, true }, - { {0.1f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {-128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::i8, true }, + { {0.1f}, ov::element::f32, {}, false } }, - {{5.f}, ngraph::element::i8}, + {{5.f}, ov::element::i8}, {}, {}, { - { ngraph::element::f32, false }, - { {127.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::i8, true }, - { {0.3f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {127.f}, ov::element::f32, {}, false, 1ul, ngraph::element::i8, true }, + { {0.3f}, ov::element::f32, {}, false } }, {}, "I8" }, { - { 256ul, {{ 1, 1, 1, 1 }}, { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ngraph::element::f32 }, - { ngraph::element::i8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ov::element::f32 }, + { ov::element::i8, false }, { - { ngraph::element::f32, false }, + { ov::element::f32, false }, {}, - { {0.1f}, ngraph::element::f32, {}, false } + { {0.1f}, ov::element::f32, {}, false } }, - {{5.f}, ngraph::element::i8}, + {{5.f}, ov::element::i8}, {}, {}, { - { ngraph::element::f32, false }, + { ov::element::f32, false }, {}, - { {0.3f}, ngraph::element::f32, {}, false } + { {0.3f}, ov::element::f32, {}, false } }, {}, "I8" }, { - { 256ul, {{ 1, 1, 1, 1 }}, { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ngraph::element::f32 }, - { ngraph::element::i8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ov::element::f32 }, + { ov::element::i8, false }, { - { ngraph::element::f32, false }, + { ov::element::f32, false }, { }, - { {0.1f}, ngraph::element::f32, {}, false } + { {0.1f}, ov::element::f32, {}, false } }, - {{5.f}, ngraph::element::i8}, + {{5.f}, ov::element::i8}, {}, {}, { - { ngraph::element::f32, false }, - { {127.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::i8, true }, - { {0.3f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {127.f}, ov::element::f32, {}, false, 1ul, ngraph::element::i8, true }, + { {0.3f}, ov::element::f32, {}, false } }, {}, "I8" }, { - { 256ul, {{ 1, 1, 1, 1 }}, { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ngraph::element::f32 }, - { ngraph::element::i8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ov::element::f32 }, + { ov::element::i8, false }, { - { ngraph::element::f32, false }, - { {-128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::i8, true }, - { {0.1f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {-128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::i8, true }, + { {0.1f}, ov::element::f32, {}, false } }, - {{5.f}, ngraph::element::i8}, + {{5.f}, ov::element::i8}, {}, {}, { - { ngraph::element::f32, false }, + { ov::element::f32, false }, { }, - { {0.3f}, ngraph::element::f32, {}, false } + { {0.3f}, ov::element::f32, {}, false } }, {}, "I8" @@ -104,7 +104,7 @@ const std::vector fakeQuanti INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeWithNotOptimalTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizeOnDataValues)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp index e8238c9b37006e..7d103e1e489ea0 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp @@ -8,12 +8,11 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector shapes = { diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp index ddf986e39bec66..2ab1df46b9394b 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp @@ -5,7 +5,6 @@ #include "low_precision_transformations/fuse_convert_transformation.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { @@ -13,18 +12,18 @@ const std::vector precisions = { // element::f16 // TODO: temporarily commented due to failing in GPU Plugin on constant folding stage }; -const std::vectorinputAndQuantizationShapes = { +const std::vectorinputAndQuantizationShapes = { { 1, 4, 16, 16 }, }; const std::vector deqOperations = { { - { ngraph::element::f32 }, + { ov::element::f32 }, {1.f}, {0.45f} }, { - { ngraph::element::f32 }, + { ov::element::f32 }, {}, {0.45f} } diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_dequantize_to_fq_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_dequantize_to_fq_transformation.cpp index 71daf75a837958..69c8ffe19e56ba 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_dequantize_to_fq_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_dequantize_to_fq_transformation.cpp @@ -7,7 +7,6 @@ #include using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { @@ -18,11 +17,11 @@ const std::vector testValu {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { - ngraph::element::f32, + ov::element::f32, { }, - ngraph::element::f32, + ov::element::f32, { {}, {}, { 0.01f } }, - ngraph::element::f32, + ov::element::f32, { 256ul, {}, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } } } }, @@ -31,11 +30,11 @@ const std::vector testValu {128, 3}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { - ngraph::element::f32, + ov::element::f32, { }, - ngraph::element::f32, - { {}, {}, { {0.01f, 0.1f, 1.f}, ngraph::element::f32, {1, 3} } }, - ngraph::element::f32, + ov::element::f32, + { {}, {}, { {0.01f, 0.1f, 1.f}, ov::element::f32, {1, 3} } }, + ov::element::f32, { 256ul, {}, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } } } }, @@ -44,11 +43,11 @@ const std::vector testValu {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { - ngraph::element::f32, + ov::element::f32, { }, - ngraph::element::f32, + ov::element::f32, { {}, {}, { {0.01f, 0.f, 0.01f} } }, - ngraph::element::f32, + ov::element::f32, { 256ul, {}, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } } } }, @@ -57,11 +56,11 @@ const std::vector testValu {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { - ngraph::element::f32, + ov::element::f32, { }, - ngraph::element::f32, + ov::element::f32, { {}, { -128 }, { 0.01f } }, - ngraph::element::f32, + ov::element::f32, { 256ul, {}, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } } } }, @@ -70,11 +69,11 @@ const std::vector testValu {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { - ngraph::element::f32, + ov::element::f32, { }, - ngraph::element::u8, - { {ngraph::element::f32}, { -128 }, { 0.01f } }, - ngraph::element::f32, + ov::element::u8, + { {ov::element::f32}, { -128 }, { 0.01f } }, + ov::element::f32, { 256ul, {}, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } } } }, @@ -83,11 +82,11 @@ const std::vector testValu {1, 3, 16, 16}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), { - ngraph::element::f32, - { {128}, ngraph::element::f32 }, - ngraph::element::u8, - { {ngraph::element::f32}, { -128 }, { 0.01f } }, - ngraph::element::f32, + ov::element::f32, + { {128}, ov::element::f32 }, + ov::element::u8, + { {ov::element::f32}, { -128 }, { 0.01f } }, + ov::element::f32, { 256ul, {}, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } } } }, @@ -98,9 +97,9 @@ const std::vector testValu { { }, { }, - ngraph::element::i32, - { {ngraph::element::f32}, {}, {} }, - ngraph::element::f32, + ov::element::i32, + { {ov::element::f32}, {}, {} }, + ov::element::f32, { 256ul, {}, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } } } }, diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_fq_and_scale_shift_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_fq_and_scale_shift_transformation.cpp index 9b663476240a41..2ef74064a6f987 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_fq_and_scale_shift_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_fq_and_scale_shift_transformation.cpp @@ -12,9 +12,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -37,7 +37,7 @@ const std::vector fakeQuantizeOnD INSTANTIATE_TEST_SUITE_P(smoke_LPT, FuseFakeQuantizeAndScaleShiftTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 9, 9 })), + ::testing::Values(ov::PartialShape({ 1, 3, 9, 9 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(fakeQuantizeOnDataValues)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp index ada9eac0594b47..3e32be579b72eb 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp @@ -7,7 +7,6 @@ #include using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; using namespace ngraph; namespace { diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp index bff2d8d91a67db..972d05adc80150 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp @@ -7,7 +7,6 @@ #include using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; using namespace ngraph; namespace { diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/gather_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/gather_transformation.cpp index 540c84ece088cf..dbd5e3476a7a58 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/gather_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/gather_transformation.cpp @@ -10,9 +10,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector precisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + ov::element::f16 }; const std::vector opset_version = { @@ -28,7 +28,7 @@ const std::vector testValues = { {0}, std::int64_t{0}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), - ngraph::element::f32, + ov::element::f32, {256, {}, {0.f}, {25.5f}, {12.5f}, {25.5f + 12.5f}} }, // U8: per-channel quantization @@ -39,7 +39,7 @@ const std::vector testValues = { {0}, std::int64_t{0}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), - ngraph::element::f32, + ov::element::f32, { 256, {1, 3, 1}, @@ -57,7 +57,7 @@ const std::vector testValues = { {0}, std::int64_t{0}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), - ngraph::element::f32, + ov::element::f32, {256, {}, {0.f}, {25.5f}, {12.5f}, {25.5f + 12.5f}} }, }; diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp index d225f91e9cafbf..ba30b2c85c84c1 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp @@ -11,12 +11,12 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; -const std::vector dimensions = { +const std::vector dimensions = { {1, 3, 16, 16} }; diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp index d5b86e0f2ba257..f2005374e12032 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp @@ -10,9 +10,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -21,7 +21,7 @@ const std::vector trasform const std::vector addPrecisionPreserved = { true, false }; -const std::vector> inputShapes = { +const std::vector> inputShapes = { {{ 1, 6, 24, 24 }, { 1, 24, 18, 18 }} }; @@ -30,8 +30,8 @@ const std::vector pa { 3ul, -1, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, - { 255ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, + { 255ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, true, "Convolution", "U8" @@ -40,8 +40,8 @@ const std::vector pa { 3ul, 0, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, - { 255ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, + { 255ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, true, "Convolution", "U8" @@ -50,8 +50,8 @@ const std::vector pa { 3ul, 1, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, - { 255ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, + { 255ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, true, "Convolution", "U8" @@ -68,15 +68,15 @@ const std::vector pa { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f }, { 25.5f, 25.5f, 25.5f / 2.f, 25.5f / 2.f, 25.5f / 4.f, 25.5f / 4.f } }, - { 255ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, + { 255ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, true, }, // group convolution, per-channel weights quantization { 3ul, -1, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, - { 255ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, + { 255ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, false, "", "" @@ -94,7 +94,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_LPT, GroupConvolutionTransformation, GroupConvolutionTransformation::getTestCaseName); namespace test_values_4d { -const std::vector> inputShapes = { +const std::vector> inputShapes = { {{ 1, 6, 24, 24 }, { 1, 24, 18, 18 }}, }; @@ -103,8 +103,8 @@ const std::vector pa { 3ul, -1, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, - { 255ul, ngraph::Shape { 3, 8, 1, 1, 1 }, { -127.f }, { 127.f }, { -127.f }, { 127.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, + { 255ul, ov::Shape { 3, 8, 1, 1, 1 }, { -127.f }, { 127.f }, { -127.f }, { 127.f } }, false, "Convolution", "U8" @@ -113,8 +113,8 @@ const std::vector pa { 3ul, -1, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, - { 255ul, ngraph::Shape { 3, 8, 1, 1, 1 }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, + { 255ul, ov::Shape { 3, 8, 1, 1, 1 }, {-127.f, -12.7f, -1.27f, -127.f, -12.7f, -1.27f, -127.f, -12.7f, -127.f, -12.7f, -1.27f, -127.f, -12.7f, -1.27f, -127.f, -12.7f, -127.f, -12.7f, -1.27f, -127.f, -12.7f, -1.27f, -127.f, -12.7f}, @@ -146,7 +146,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_LPT, GroupConvolutionTransformation, } // namespace test_values_4d namespace test_values_3d { -const std::vector> inputShapes = { +const std::vector> inputShapes = { {{ 1, 6, 24 }, { 1, 24, 18 }}, }; @@ -155,8 +155,8 @@ const std::vector pa { 3ul, -1, - { 256ul, ngraph::Shape { 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, - { 255ul, ngraph::Shape { 3, 8, 1, 1 }, { -127.f }, { 127.f }, { -127.f }, { 127.f } }, + { 256ul, ov::Shape { 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, + { 255ul, ov::Shape { 3, 8, 1, 1 }, { -127.f }, { 127.f }, { -127.f }, { 127.f } }, false, "Convolution", "U8" @@ -165,8 +165,8 @@ const std::vector pa { 3ul, -1, - { 256ul, ngraph::Shape { 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, - { 255ul, ngraph::Shape { 3, 8, 1, 1 }, + { 256ul, ov::Shape { 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, + { 255ul, ov::Shape { 3, 8, 1, 1 }, {-127.f, -12.7f, -1.27f, -127.f, -12.7f, -1.27f, -127.f, -12.7f, -127.f, -12.7f, -1.27f, -127.f, -12.7f, -1.27f, -127.f, -12.7f, -127.f, -12.7f, -1.27f, -127.f, -12.7f, -1.27f, -127.f, -12.7f}, @@ -198,7 +198,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_LPT, GroupConvolutionTransformation, } // namespace test_values_3d namespace depthwise { -const std::vector> inputShapes = { +const std::vector> inputShapes = { {{ 1, 6, 24, 24 }, { 1, 6, 18, 18 }} }; @@ -207,8 +207,8 @@ const std::vector pa { 6ul, -1, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, - { 255ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, + { 255ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, true, }, // depthwise convolution, per-channel quantization @@ -223,7 +223,7 @@ const std::vector pa { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f }, { 25.5f, 25.5f, 25.5f / 2.f, 25.5f / 2.f, 25.5f / 4.f, 25.5f / 4.f } }, - { 255ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, + { 255ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 254.f }, { -127.f }, { 127.f } }, true, } }; diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp index ce9ed2b6e73da8..1dadc68802c98a 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -13,9 +13,9 @@ using namespace LayerTestsDefinitions; namespace { // clang-format off -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + // ov::element::f16 }; const std::vector trasformationParamValues = { @@ -63,20 +63,20 @@ const std::vector // \ / // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - {ngraph::element::f32}, - { {128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::u8, true }, - { {0.1f}, ngraph::element::f32, {}, false } + {ov::element::f32}, + { {128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::u8, true }, + { {0.1f}, ov::element::f32, {}, false } }, - { std::vector(4, 15.f), ngraph::element::f32, {6, 2, 5, 5} }, - { 255ul, ngraph::Shape({ 1, 1, 1, 1 }), { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ngraph::element::f32 }, - { ngraph::element::i8, false }, + { std::vector(4, 15.f), ov::element::f32, {6, 2, 5, 5} }, + { 255ul, ov::Shape({ 1, 1, 1, 1 }), { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ov::element::f32 }, + { ov::element::i8, false }, { - { ngraph::element::f32, false }, - { {-128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::i8, true }, - { {0.2f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {-128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::i8, true }, + { {0.2f}, ov::element::f32, {}, false } }, { {3, 2, 2, 5, 5} }, "output_original", @@ -127,20 +127,20 @@ const std::vector // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - {ngraph::element::f32}, - { {128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::u8, true }, - { {0.1f}, ngraph::element::f32, {}, false } + {ov::element::f32}, + { {128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::u8, true }, + { {0.1f}, ov::element::f32, {}, false } }, - { std::vector(4, 15.f), ngraph::element::f32, {6, 2, 5, 5} }, - { 255ul, ngraph::Shape({ 1, 1, 1, 1 }), { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ngraph::element::f32 }, - { ngraph::element::i8, false }, + { std::vector(4, 15.f), ov::element::f32, {6, 2, 5, 5} }, + { 255ul, ov::Shape({ 1, 1, 1, 1 }), { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ov::element::f32 }, + { ov::element::i8, false }, { - { ngraph::element::f32, false }, - { {-128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::i8, true }, - { {0.2f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {-128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::i8, true }, + { {0.2f}, ov::element::f32, {}, false } }, { {3, 2, 2, 5, 5} }, "output_original", @@ -179,20 +179,20 @@ const std::vector // \ / // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - {ngraph::element::f32}, + {ov::element::f32}, {}, - { {0.1f}, ngraph::element::f32, {}, false } + { {0.1f}, ov::element::f32, {}, false } }, - { std::vector(4, 15.f), ngraph::element::f32, {6, 2, 5, 5} }, - { 255ul, ngraph::Shape({ 1, 1, 1, 1 }), { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ngraph::element::f32 }, - { ngraph::element::i8, false }, + { std::vector(4, 15.f), ov::element::f32, {6, 2, 5, 5} }, + { 255ul, ov::Shape({ 1, 1, 1, 1 }), { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ov::element::f32 }, + { ov::element::i8, false }, { - { ngraph::element::f32, false }, + { ov::element::f32, false }, {}, - { {0.2f}, ngraph::element::f32, {}, false } + { {0.2f}, ov::element::f32, {}, false } }, { {3, 2, 2, 5, 5} }, "output_original", @@ -234,20 +234,20 @@ const std::vector // \ / // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - {ngraph::element::f32}, + {ov::element::f32}, {}, - { {0.1f}, ngraph::element::f32, {}, false } + { {0.1f}, ov::element::f32, {}, false } }, - { std::vector(4, 15.f), ngraph::element::f32, {6, 2, 5, 5}}, - { 255ul, ngraph::Shape({ 1, 1, 1, 1 }), { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ngraph::element::f32 }, - { ngraph::element::i8, false }, + { std::vector(4, 15.f), ov::element::f32, {6, 2, 5, 5}}, + { 255ul, ov::Shape({ 1, 1, 1, 1 }), { 0.f }, { 25.5f }, { -128.f }, { 127.f }, ov::element::f32 }, + { ov::element::i8, false }, { - { ngraph::element::f32, false }, + { ov::element::f32, false }, {}, - { {0.2f}, ngraph::element::f32, {}, false } + { {0.2f}, ov::element::f32, {}, false } }, { {3, 2, 2, 5, 5} }, "output_original", @@ -291,20 +291,20 @@ const std::vector // \ / // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - { ngraph::element::f32, false }, - { {128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::u8, true }, - { {0.1f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::u8, true }, + { {0.1f}, ov::element::f32, {}, false } }, - { std::vector(4, 15.f), ngraph::element::i8, {6, 2, 5, 5} }, + { std::vector(4, 15.f), ov::element::i8, {6, 2, 5, 5} }, {}, {}, { - { ngraph::element::f32, false }, - { {127.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::i8, true }, - { {0.2f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {127.f}, ov::element::f32, {}, false, 1ul, ngraph::element::i8, true }, + { {0.2f}, ov::element::f32, {}, false } }, { {3, 2, 2, 5, 5} }, "output_original", @@ -351,20 +351,20 @@ const std::vector // \ / // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - { ngraph::element::f32, false }, - { {128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::u8, true }, - { {0.1f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::u8, true }, + { {0.1f}, ov::element::f32, {}, false } }, - { std::vector(4, 15.f), ngraph::element::i8, {6, 2, 5, 5} }, + { std::vector(4, 15.f), ov::element::i8, {6, 2, 5, 5} }, {}, {}, { - { ngraph::element::f32, false }, - { {127.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::i8, true }, - { {0.2f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {127.f}, ov::element::f32, {}, false, 1ul, ngraph::element::i8, true }, + { {0.2f}, ov::element::f32, {}, false } }, { {3, 2, 2, 5, 5} }, "output_original", @@ -411,20 +411,20 @@ const std::vector // \ / // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - { ngraph::element::f32, false }, - { {128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::u8, true }, - { {0.1f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::u8, true }, + { {0.1f}, ov::element::f32, {}, false } }, - { std::vector(4, 15.f), ngraph::element::i8, {3, 2, 2, 5, 5} }, + { std::vector(4, 15.f), ov::element::i8, {3, 2, 2, 5, 5} }, {}, {}, { - { ngraph::element::f32, false }, - { {126.f, 127.f, 126.f, 127.f, 126.f, 127.f}, ngraph::element::f32, {3, 2, 1, 1, 1}, false, 1ul, ngraph::element::i8, true }, - { {0.1f, 0.2f, 0.1f, 0.2f, 0.1f, 0.2f}, ngraph::element::f32, {3, 2, 1, 1, 1}, false } + { ov::element::f32, false }, + { {126.f, 127.f, 126.f, 127.f, 126.f, 127.f}, ov::element::f32, {3, 2, 1, 1, 1}, false, 1ul, ngraph::element::i8, true }, + { {0.1f, 0.2f, 0.1f, 0.2f, 0.1f, 0.2f}, ov::element::f32, {3, 2, 1, 1, 1}, false } }, {}, "output_original", @@ -468,20 +468,20 @@ const std::vector // '\' / // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - { ngraph::element::f32, false }, - { {128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::u8, true }, - { {0.1f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::u8, true }, + { {0.1f}, ov::element::f32, {}, false } }, - { std::vector(4, 15.f), ngraph::element::i8, {6, 2, 5, 5} }, + { std::vector(4, 15.f), ov::element::i8, {6, 2, 5, 5} }, {}, {}, { - { ngraph::element::f32, false }, + { ov::element::f32, false }, {}, - { {0.2f}, ngraph::element::f32, {}, false } + { {0.2f}, ov::element::f32, {}, false } }, { {3, 2, 2, 5, 5} }, "output_original", @@ -525,20 +525,20 @@ const std::vector // '\' / // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - { ngraph::element::f32, false }, - { {128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::u8, true }, - { {0.1f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::u8, true }, + { {0.1f}, ov::element::f32, {}, false } }, - { std::vector(4, 15.f), ngraph::element::i8, {3, 2, 2, 5, 5} }, + { std::vector(4, 15.f), ov::element::i8, {3, 2, 2, 5, 5} }, {}, {}, { - { ngraph::element::f32, false }, + { ov::element::f32, false }, {}, - { {0.1f, 0.2f, 0.1f, 0.2f, 0.1f, 0.2f}, ngraph::element::f32, {3, 2, 1, 1, 1}, false } + { {0.1f, 0.2f, 0.1f, 0.2f, 0.1f, 0.2f}, ov::element::f32, {3, 2, 1, 1, 1}, false } }, {}, "output_original", @@ -585,20 +585,20 @@ const std::vector // '\' / // Multiply { - { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ngraph::element::f32 }, - { ngraph::element::u8, false }, + { 256ul, {{ 1, 1, 1, 1 }}, { -12.8f }, { 12.7f }, { 0.f }, { 255.f }, ov::element::f32 }, + { ov::element::u8, false }, { - { ngraph::element::f32, false }, - { {128.f}, ngraph::element::f32, {}, false, 1ul, ngraph::element::u8, true }, - { {0.1f}, ngraph::element::f32, {}, false } + { ov::element::f32, false }, + { {128.f}, ov::element::f32, {}, false, 1ul, ngraph::element::u8, true }, + { {0.1f}, ov::element::f32, {}, false } }, - { std::vector(4, 15.f), ngraph::element::i8, {6, 2, 5, 5} }, + { std::vector(4, 15.f), ov::element::i8, {6, 2, 5, 5} }, {}, {}, { - { ngraph::element::f32, false }, + { ov::element::f32, false }, {}, - { {0.2f}, ngraph::element::f32, {}, false } + { {0.2f}, ov::element::f32, {}, false } }, { {3, 2, 2, 5, 5} }, "output_original", @@ -607,7 +607,7 @@ const std::vector }, }; -const std::vector shapes = { +const std::vector shapes = { { 1, 6, 24, 24 } }; diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp index cd15b4c6996da9..5d15afc56e3052 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp @@ -5,15 +5,14 @@ #include "low_precision_transformations/interpolate_transformation.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + ov::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/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp index cb35532ca9a38a..db4497767ca2d5 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp @@ -7,45 +7,44 @@ #include "low_precision_transformations/mat_mul_transformation.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + ov::element::f16 }; std::vector testValues = { { { 1, 4, 12, 2 }, - { 256ul, ngraph::Shape({}), {0.f}, {25.5f}, {0.f}, {25.5f} }, + { 256ul, ov::Shape({}), {0.f}, {25.5f}, {0.f}, {25.5f} }, { 1, 4, 2, 12 }, - { 256ul, ngraph::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} } + { 256ul, ov::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} } }, { { 1, 4, 12, 2 }, - { 256ul, ngraph::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, + { 256ul, ov::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, { 1, 4, 2, 12 }, - { 256ul, ngraph::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} } + { 256ul, ov::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} } }, { { 1, 1, 1, 4, 12, 2 }, - { 256ul, ngraph::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, + { 256ul, ov::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, { 1, 1, 1, 4, 2, 12 }, - { 256ul, ngraph::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, + { 256ul, ov::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, }, { { 12 }, - { 256ul, ngraph::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, + { 256ul, ov::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, { 12 }, - { 256ul, ngraph::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, + { 256ul, ov::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, } }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, MatMulTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::PartialShape({ 1, 384, 1024 })), + ::testing::Values(ov::PartialShape({ 1, 384, 1024 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(testValues)), MatMulTransformation::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp index 4514aa15bdc8db..cd5c4cd682d24c 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -7,12 +7,11 @@ #include "low_precision_transformations/mat_mul_with_constant_transformation.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + ov::element::f16 }; //transpose_a = false, transpose_b = true @@ -20,7 +19,7 @@ std::vector testValues = { { { 2, 3, 4 }, { 256ul, {{1, 3, 1}, {1, 3, 1}, {1, 3, 1}, {1, 3, 1}}, {0.f, 0.f, 0.f}, {255.f, 25.5f, 2.55f}, {0.f, 0.f, 0.f}, {255.f, 25.5f, 2.55f} }, - { std::vector(4 * 2, 2.f), ngraph::element::f32, ngraph::Shape{ 2, 4 } }, + { std::vector(4 * 2, 2.f), ov::element::f32, ov::Shape{ 2, 4 } }, { 256ul, {{2, 1}, {2, 1}, {2, 1}, {2, 1}}, {-128.f, -12.8f}, {127.f, 12.7f}, {-128.f, -12.8f}, {127.f, 12.7f} }, { {}, {}, {} }, "FullyConnected", @@ -29,16 +28,16 @@ std::vector testValues = { { { 2, 3, 4 }, { 256ul, {{1, 3, 1}, {1, 3, 1}, {1, 3, 1}, {1, 3, 1}}, {0.f, 0.f, 0.f}, {255.f, 25.5f, 2.f}, {0.f, 0.f, 0.f}, {255.f, 25.5f, 2.f} }, - { std::vector(4 * 2, 2.f), ngraph::element::i8, ngraph::Shape{ 2, 4 } }, + { std::vector(4 * 2, 2.f), ov::element::i8, ov::Shape{ 2, 4 } }, {}, - { ngraph::element::f32, {}, {0.1f} }, + { ov::element::f32, {}, {0.1f} }, "FullyConnected", "U8" }, { { 1, 3, 4 }, { 256ul, {{1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}}, {-10.5f}, {4.5f}, {-10.5f}, {4.5f} }, - { std::vector(4 * 2, 2.f), ngraph::element::f32, ngraph::Shape{ 2, 4 } }, + { std::vector(4 * 2, 2.f), ov::element::f32, ov::Shape{ 2, 4 } }, { 256ul, {{2, 1}, {2, 1}, {2, 1}, {2, 1}}, {-128.f, -12.8f}, {127.f, 12.7f}, {-128.f, -12.8f}, {127.f, 12.7f} }, { {}, {}, {} }, "FullyConnected", @@ -47,7 +46,7 @@ std::vector testValues = { { { 1, 1, 3, 4 }, { 256ul, {{1, 3, 1}, {1, 3, 1}, {1, 3, 1}, {1, 3, 1}}, {0.f, 0.f, 0.f}, {25.f, 24.f, 25.f}, {0.f, 0.f, 0.f}, {25.f, 24.f, 25.f} }, - { std::vector(4 * 2, 2.f), ngraph::element::f32, ngraph::Shape{ 2, 4 } }, + { std::vector(4 * 2, 2.f), ov::element::f32, ov::Shape{ 2, 4 } }, { 256ul, {{2, 1}, {2, 1}, {2, 1}, {2, 1}}, {-128.f, -12.8f}, {127.f, 12.7f}, {-128.f, -12.8f}, {127.f, 12.7f} }, { {}, {}, {} }, "FullyConnected", @@ -56,16 +55,16 @@ std::vector testValues = { { { 1, 1, 3, 4 }, { 256ul, {{1, 3, 1}, {1, 3, 1}, {1, 3, 1}, {1, 3, 1}}, {0.f, 0.f, 0.f}, {25.f, 24.f, 25.f}, {0.f, 0.f, 0.f}, {25.f, 24.f, 25.f} }, - { std::vector(4 * 2, 2.f), ngraph::element::i8, ngraph::Shape{ 2, 4 } }, + { std::vector(4 * 2, 2.f), ov::element::i8, ov::Shape{ 2, 4 } }, {}, - { ngraph::element::f32, {}, {{0.1f, 0.01}, ngraph::element::f32, ngraph::Shape{ 2, 1 }} }, + { ov::element::f32, {}, {{0.1f, 0.01}, ngraph::element::f32, ov::Shape{ 2, 1 }} }, "FullyConnected", "U8" }, { { 1, 3, 4 }, { 256ul, {{1}, {1}, {1}, {1}}, {0.f}, {255.f}, {0.f}, {25.5f} }, - { std::vector(4 * 4, 2.f), ngraph::element::f32, ngraph::Shape{ 4, 4 } }, + { std::vector(4 * 4, 2.f), ov::element::f32, ov::Shape{ 4, 4 } }, { 256ul, {{1}, {1}, {1}, {1}}, {-128.f}, {127.f}, {-128.f}, {127.f} }, { {}, {}, {} }, "FullyConnected", @@ -74,7 +73,7 @@ std::vector testValues = { { { 2, 3 }, { 256ul, {{2, 1}, {2, 1}, {2, 1}, {2, 1}}, {-10.f, -5.f}, {5.f, 5.f}, {-10.f, -5.f}, {5.f, 5.f} }, - { std::vector{1, 2, 3, 4, 5, 6}, ngraph::element::f32, ngraph::Shape{ 2, 3 } }, + { std::vector{1, 2, 3, 4, 5, 6}, ov::element::f32, ov::Shape{ 2, 3 } }, { 256ul, {{1}, {1}, {1}, {1}}, {-128.f}, {127.f}, {-12.8f}, {12.7f} }, { {}, {}, {} }, "FullyConnected", @@ -83,9 +82,9 @@ std::vector testValues = { { { 2, 3 }, { 256ul, {{2, 1}, {2, 1}, {2, 1}, {2, 1}}, {-10.f, -5.f}, {5.f, 5.f}, {-10.f, -5.f}, {5.f, 5.f} }, - { std::vector{1, 2, 3, 4, 5, 6}, ngraph::element::i8, ngraph::Shape{ 2, 3 } }, + { std::vector{1, 2, 3, 4, 5, 6}, ov::element::i8, ov::Shape{ 2, 3 } }, {}, - { ngraph::element::f32, {}, {0.1f} }, + { ov::element::f32, {}, {0.1f} }, "FullyConnected", "U8" } diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp index 2556ad7d4fea93..e6ac3542231af5 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fq.cpp @@ -10,19 +10,19 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector params = { { - { 256ul, ngraph::Shape { 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, - { 255ul, ngraph::Shape { 1 }, { -12.7f }, { 12.7f }, { -12.7f }, { 12.7f } } + { 256ul, ov::Shape { 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, + { 255ul, ov::Shape { 1 }, { -12.7f }, { 12.7f }, { -12.7f }, { 12.7f } } }, }; -const std::vector> inputShapes = { +const std::vector> inputShapes = { {{ 1, 16 }, { 10, 16 }}, {{ 1, 16 }, { 16, 10 }} }; diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/move_fake_quantize_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/move_fake_quantize_transformation.cpp index 69b83bc34b2c38..16aef709783034 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/move_fake_quantize_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/move_fake_quantize_transformation.cpp @@ -10,9 +10,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -58,9 +58,9 @@ const std::vector pa 3, "", { 256ul, {}, {0.f}, {2.55f}, {0.f}, {255.f} }, - { ngraph::element::u8 }, + { ov::element::u8 }, { - { ngraph::element::f32 }, + { ov::element::f32 }, {}, { 0.01f } }, @@ -73,9 +73,9 @@ const std::vector pa 3, "relu", { 256ul, {}, {0.f}, {2.55f}, {0.f}, {255.f} }, - { ngraph::element::u8 }, + { ov::element::u8 }, { - { ngraph::element::f32 }, + { ov::element::f32 }, {}, { 0.01f } }, @@ -111,11 +111,11 @@ const std::vector pa {0.f, 0.f, 0.f}, {255.f, 255.f, 255.f} }, - { ngraph::element::u8 }, + { ov::element::u8 }, { - { ngraph::element::f32 }, + { ov::element::f32 }, {}, - { {0.01f, 0.01f, 0.01f}, ngraph::element::f32, {1, 3, 1, 1} } + { {0.01f, 0.01f, 0.01f}, ov::element::f32, {1, 3, 1, 1} } }, "Concat", "U8", @@ -133,10 +133,10 @@ const std::vector pa {0.f, 0.f, 0.f}, {255.f, 255.f, 255.f} }, - { ngraph::element::u8 }, + { ov::element::u8 }, { - { ngraph::element::f32 }, - { {0.01f, 0.01f, 0.01f}, ngraph::element::f32, {1, 3, 1, 1} }, + { ov::element::f32 }, + { {0.01f, 0.01f, 0.01f}, ov::element::f32, {1, 3, 1, 1} }, { 0.01f } }, "Concat", @@ -145,7 +145,7 @@ const std::vector pa }, }; -const std::vector> shapes = { +const std::vector> shapes = { {{ 1, 1, 16, 16 }, { 1, 1, 16, 16 }, { 1, 1, 16, 16 }}, {{ 4, 1, 16, 16 }, { 4, 1, 16, 16 }, { 4, 1, 16, 16 }} }; diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp index cd936affef58d6..1a98bd811c6f3d 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp @@ -5,7 +5,6 @@ #include "low_precision_transformations/multiply_to_group_convolution_transformation.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { @@ -13,14 +12,14 @@ const std::vector precisions = { }; namespace shape4d { -const std::vector inputShapes = { +const std::vector inputShapes = { { 1ul, 3ul, 16ul, 16ul }, { 4ul, 3ul, 16ul, 16ul } }; const std::vector params = { { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, {{1.f, 2.f, 3.f}, element::f32, Shape{1, 3, 1, 1}}, "output/GroupConvolution", "U8", @@ -28,7 +27,7 @@ const std::vector params = { }, // zero point { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, {{1.f, 2.f, 3.f}, element::f32, Shape{1, 3, 1, 1}}, "output/GroupConvolution", "I8", @@ -36,7 +35,7 @@ const std::vector params = { }, // zero point { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f / 2.f }, { -1.28f }, { 1.27f / 2.f} }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f / 2.f }, { -1.28f }, { 1.27f / 2.f} }, {{1.f, 2.f, 3.f}, element::f32, Shape{1, 3, 1, 1}}, "output/GroupConvolution", "U8", @@ -45,14 +44,14 @@ const std::vector params = { // Multiply => GroupConvolution optimizations { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, {{3.f}, element::f32, Shape{1, 1, 1, 1}}, "output/GroupConvolution", "", false }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, {{3.f}, element::f32, Shape{1, 1, 1, 1}}, "output/GroupConvolution", "", diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp index 0141463b3fc63e..62af0f771aec0f 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp @@ -10,83 +10,83 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - //ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + //ov::element::f16 }; const std::vector params = { { false, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, false, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, - ngraph::element::undefined, // ngraph::element::i8 + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, + ov::element::undefined, // ngraph::element::i8 false }, { false, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, false, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, - ngraph::element::undefined, // ngraph::element::u8 + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + ov::element::undefined, // ngraph::element::u8 false }, { true, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, false, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, - ngraph::element::undefined, //ngraph::element::u8 + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + ov::element::undefined, //ngraph::element::u8 false }, { true, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, false, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, - ngraph::element::undefined, // ngraph::element::i8 + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, + ov::element::undefined, // ngraph::element::i8 false }, { false, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, true, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, - ngraph::element::undefined, // ngraph::element::i8 + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -1.28f }, { 1.27f } }, + ov::element::undefined, // ngraph::element::i8 false }, { false, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -128.f }, { 1.27f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -1.28f }, { 1.27f }, { -128.f }, { 1.27f } }, false, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, - ngraph::element::undefined, // ngraph::element::u8 + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + ov::element::undefined, // ngraph::element::u8 false }, { false, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, true, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -1.27f }, { 1.28f }, { -1.27f }, { 1.28f } }, - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, - ngraph::element::undefined, // ngraph::element::u8 + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -1.27f }, { 1.28f }, { -1.27f }, { 1.28f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + ov::element::undefined, // ngraph::element::u8 false }, - { false, {}, false, {}, {}, ngraph::element::undefined /* ngraph::element::f32 */, false }, - { true, {}, true, {}, {}, ngraph::element::undefined /* ngraph::element::f32 */, false }, + { false, {}, false, {}, {}, ov::element::undefined /* ngraph::element::f32 */, false }, + { true, {}, true, {}, {}, ov::element::undefined /* ngraph::element::f32 */, false }, }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, MultiplyTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(params)), MultiplyTransformation::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp index 9f08b9e643f5ad..c1721e17b1dcc0 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp @@ -10,21 +10,21 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector values = { { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 255.f } } + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 255.f } } } }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, MultiplyWithOneParentTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(values)), MultiplyWithOneParentTransformation::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp index e0fe95dbd1456a..d758eaa531edc2 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp @@ -5,7 +5,6 @@ #include "low_precision_transformations/mvn_transformation.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { const std::vector precisions = { @@ -13,7 +12,7 @@ namespace { element::f16 }; - const std::vector inputAndQuantizationShapes = { + const std::vector inputAndQuantizationShapes = { { 1ul, 4ul, 16ul, 16ul }, }; diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp index 5032af2f2ababd..07cba7b268502f 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp @@ -8,15 +8,14 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + ov::element::f16 }; -const std::vector > inputAndQuantizationShapes = { +const std::vector > inputAndQuantizationShapes = { { { 1ul, 4ul, 16ul, 16ul }, { 1ul } }, { { 1ul, 4ul, 16ul, 16ul }, { 1ul, 4ul, 1ul, 1ul } }, }; diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp index 0c0e7c09afb7d4..eb4c668fa3bb18 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers.cpp @@ -22,7 +22,7 @@ const std::vector trasformationParamValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, OutputLayers, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), + ::testing::Values(ov::Shape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues)), OutputLayers::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp index cdb17ac7a447c1..680937c777416c 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat.cpp @@ -22,7 +22,7 @@ const std::vector trasformationParamValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, OutputLayersConcat, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), + ::testing::Values(ov::Shape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues)), OutputLayersConcat::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp index 074817c2b9a9ec..a2a171d469a4e2 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/output_layers_concat_multi_channel.cpp @@ -22,7 +22,7 @@ const std::vector trasformationParamValues = { INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_LPT, OutputLayersConcatMultiChannel, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), + ::testing::Values(ov::Shape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues)), OutputLayersConcatMultiChannel::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/pad_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/pad_transformation.cpp index 52c847feb354d8..bb6e91c4a170d0 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/pad_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/pad_transformation.cpp @@ -12,12 +12,12 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; -const std::vector inputShapes = { +const std::vector inputShapes = { { 1, 3, 16, 16}, }; @@ -37,7 +37,7 @@ const std::vector padModes = { const std::vector params = { // tensor quantization { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 12.8f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 12.8f } }, { 0, 0, 1, 1 }, { 0, 0, 1, 1 }, }, @@ -45,7 +45,7 @@ const std::vector params = { { { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { -127.f, 0.f, 128.f / 2.f }, { 128.f / 4.f, 128.f / 2.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -72,17 +72,17 @@ namespace testCasesForConstantMode { const std::vector params = { // tensor quantization { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { -2.f }, { 10.5f }, { -2.f }, { 10.5f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { -2.f }, { 10.5f }, { -2.f }, { 10.5f } }, { 0, 0, 1, 1 }, { 0, 0, 1, 1 }, }, { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { -2.f }, { 10.5f }, { -2.f }, { 10.5f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { -2.f }, { 10.5f }, { -2.f }, { 10.5f } }, { 0, 0, -1, 1 }, { 0, 0, 1, -1 }, }, { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { -2.f }, { 10.5f }, { -2.f }, { 10.5f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { -2.f }, { 10.5f }, { -2.f }, { 10.5f } }, { 0, 0, -1, -1 }, { 0, 0, -1, -1 }, }, @@ -110,7 +110,7 @@ const std::vector modesWithoutConstant = { const std::vector params = { // tensor quantization { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { -2.f }, { 10.5f }, { -2.f }, { 10.5f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { -2.f }, { 10.5f }, { -2.f }, { 10.5f } }, { 0, 0, 1, 1 }, { 0, 0, 1, 1 }, }, diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp index e3e600a368c704..5986b40640f3ad 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp @@ -8,27 +8,26 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + ov::element::f16 }; std::vector testValues = { { {}, false}, - { { 256ul, ngraph::Shape({}), {0.f}, {25.5f}, {0.f}, {25.5f} }, false }, - { { 256ul, ngraph::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, true }, - { { 256ul, ngraph::Shape({}), {12.75f}, {25.5f}, {12.75f}, {25.5f} }, true }, - { { 256ul, ngraph::Shape({}), {-12.8f / 2.f}, {12.7f}, {-12.8f / 2.f}, {12.7f} }, true } + { { 256ul, ov::Shape({}), {0.f}, {25.5f}, {0.f}, {25.5f} }, false }, + { { 256ul, ov::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, true }, + { { 256ul, ov::Shape({}), {12.75f}, {25.5f}, {12.75f}, {25.5f} }, true }, + { { 256ul, ov::Shape({}), {-12.8f / 2.f}, {12.7f}, {-12.8f / 2.f}, {12.7f} }, true } }; // PRelu in low precision is not supported in GPU INSTANTIATE_TEST_SUITE_P(DISABLED_LPT, PReluTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(testValues)), PReluTransformation::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization.cpp index 394ffbb1ff5cde..371eec0faaeba5 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization.cpp @@ -10,9 +10,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - // ngraph::element::f16 // TODO: enable f16 test inference (change ngraph function + fp32 to fp16 replacements) +const std::vector netPrecisions = { + ov::element::f32, + // ov::element::f16 // TODO: enable f16 test inference (change ngraph function + fp32 to fp16 replacements) }; const std::vector trasformationParamValues = { @@ -22,52 +22,52 @@ const std::vector trasform const std::vector params = { { - ngraph::element::f32, + ov::element::f32, { 256ul, {{ 1, 1, 1, 1 }, { 1, 1, 1, 1 }, { 1, 1, 1, 1 }, { 1, 1, 1, 1 }}, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, {}, - { std::vector{ 2.f }, ngraph::element::i8, {9, 16}}, + { std::vector{ 2.f }, ov::element::i8, {9, 16}}, { - { ngraph::element::f32, false }, + { ov::element::f32, false }, {}, - { {0.03f}, ngraph::element::f32, {/* from parameter */}, false } + { {0.03f}, ov::element::f32, {/* from parameter */}, false } }, { {3, 3, 16, 1} }, - { {2}, ngraph::element::f32, {1, 1, 16, 1}, false }, + { {2}, ov::element::f32, {1, 1, 16, 1}, false }, { {2, 3, 0, 1} }, { {16, 1, 1, 3, 3} }, - ngraph::element::f32, + ov::element::f32, {}, "output_original", "U8" }, { - ngraph::element::f32, + ov::element::f32, { 256ul, {{ 1, 1, 1, 1 }, { 1, 1, 1, 1 }, { 1, 1, 1, 1 }, { 1, 1, 1, 1 }}, { 0.f }, { 25.5f }, { 0.f }, { 25.5f } }, {}, - { std::vector{ 2.f }, ngraph::element::i8, {9, 16}}, + { std::vector{ 2.f }, ov::element::i8, {9, 16}}, { - { ngraph::element::f32, false }, - { {127.0f}, ngraph::element::f32, {/* from parameter */}, false}, - { {0.03f}, ngraph::element::f32, {/* from parameter */}, false } + { ov::element::f32, false }, + { {127.0f}, ov::element::f32, {/* from parameter */}, false}, + { {0.03f}, ov::element::f32, {/* from parameter */}, false } }, { {3, 3, 16, 1} }, - { {2}, ngraph::element::f32, {1, 1, 16, 1}, false }, + { {2}, ov::element::f32, {1, 1, 16, 1}, false }, { {2, 3, 0, 1} }, { {16, 1, 1, 3, 3} }, - ngraph::element::f32, + ov::element::f32, {}, "output_original", "FP32" } }; -const std::vector inputShapes = { +const std::vector inputShapes = { { 1, 16, 9, 9 }, { 4, 16, 9, 9 } }; -const std::vector dequantizationOnWeightElementwiseConstantShapes = { - { ngraph::Shape({1, 16}) } +const std::vector dequantizationOnWeightElementwiseConstantShapes = { + { ov::Shape({1, 16}) } }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, PullReshapeThroughDequantizationTransformation, diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/recurrent_cell_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/recurrent_cell_transformation.cpp index 87a11b0cb764b9..09e1e954e0a786 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/recurrent_cell_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/recurrent_cell_transformation.cpp @@ -9,9 +9,9 @@ using namespace LayerTestsDefinitions; -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -25,17 +25,17 @@ const std::vector param { // X {256ul, {}, {0.f}, {2.55f}, {0.f}, {255.f}}, - {ngraph::element::u8}, + {ov::element::u8}, { - {ngraph::element::f32}, + {ov::element::f32}, {}, {0.01f}, }, // H {256ul, {}, {0.f}, {2.55f}, {0.f}, {255.f}}, - {ngraph::element::u8}, + {ov::element::u8}, { - {ngraph::element::f32}, + {ov::element::f32}, {}, {0.01f}, }, @@ -55,17 +55,17 @@ const std::vector param { // X {256ul, {}, {0.f}, {2.55f}, {0.f}, {255.f}}, - {ngraph::element::u8}, + {ov::element::u8}, { - {ngraph::element::f32}, + {ov::element::f32}, {}, {0.01f}, }, // H {256ul, {}, {0.f}, {2.55f}, {0.f}, {255.f}}, - {ngraph::element::u8}, + {ov::element::u8}, { - {ngraph::element::f32}, + {ov::element::f32}, {}, {0.01f}, }, @@ -83,8 +83,8 @@ const std::vector param } }; -const std::vector> activations_shapes = {{{1, 1, 16}, {1, 1, 128}, {1, 1, 128}}}; -const std::vector> weights_shapes = {{{1, 512, 16}, {1, 512, 128}, {1, 512}}}; +const std::vector> activations_shapes = {{{1, 1, 16}, {1, 1, 128}, {1, 1, 128}}}; +const std::vector> weights_shapes = {{{1, 512, 16}, {1, 512, 128}, {1, 512}}}; // Quantized Recurrent models are not supported by GPU yet. Keep tests for future INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_LPT, RecurrentCellTransformation, @@ -105,17 +105,17 @@ const std::vector param { // X {256ul, {}, {0.f}, {2.55f}, {0.f}, {255.f}}, - {ngraph::element::u8}, + {ov::element::u8}, { - {ngraph::element::f32}, + {ov::element::f32}, {}, {0.01f}, }, // H {256ul, {}, {0.f}, {2.55f}, {0.f}, {255.f}}, - {ngraph::element::u8}, + {ov::element::u8}, { - {ngraph::element::f32}, + {ov::element::f32}, {}, {0.01f}, }, @@ -135,17 +135,17 @@ const std::vector param { // X {256ul, {}, {0.f}, {2.55f}, {0.f}, {255.f}}, - {ngraph::element::u8}, + {ov::element::u8}, { - {ngraph::element::f32}, + {ov::element::f32}, {}, {0.01f}, }, // H {256ul, {}, {0.f}, {2.55f}, {0.f}, {255.f}}, - {ngraph::element::u8}, + {ov::element::u8}, { - {ngraph::element::f32}, + {ov::element::f32}, {}, {0.01f}, }, @@ -163,8 +163,8 @@ const std::vector param } }; -const std::vector> activations_shapes = {{{1, 2, 3}, {1, 2, 3}, {}}}; -const std::vector> weights_shapes = {{{1, 9, 3}, {1, 9, 3}, {1, 9}}}; +const std::vector> activations_shapes = {{{1, 2, 3}, {1, 2, 3}, {}}}; +const std::vector> weights_shapes = {{{1, 9, 3}, {1, 9, 3}, {1, 9}}}; // Quantized Recurrent models are not supported by GPU yet. Keep tests for future INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_LPT, RecurrentCellTransformation, diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp index 0413b20fad4135..d467f8151a58cb 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp @@ -12,9 +12,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -23,28 +23,28 @@ const std::vector trasform const std::vector params = { { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, { 2, 3 }, true, }, { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, { 2, 3 }, false, }, { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, { 1 }, true, }, { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, { 1 }, false, }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -55,7 +55,7 @@ const std::vector params = }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -66,7 +66,7 @@ const std::vector params = }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -77,7 +77,7 @@ const std::vector params = }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -91,7 +91,7 @@ const std::vector params = INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMaxTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), + ::testing::Values(ov::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp index b6db9007b2c3e3..383cf580b87909 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp @@ -12,9 +12,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -23,28 +23,28 @@ const std::vector trasform const std::vector params = { { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, {}, {}, {{2, 3}, true}, {} }, { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, {}, {}, {{2, 3}, false}, {} }, { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, {}, {}, {{ 1 }, true}, {} }, { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, {}, {}, {{ 1 }, false}, @@ -52,7 +52,7 @@ const std::vector params = }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -65,7 +65,7 @@ const std::vector params = }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -78,7 +78,7 @@ const std::vector params = }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -91,7 +91,7 @@ const std::vector params = }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -107,7 +107,7 @@ const std::vector params = INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMeanTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), + ::testing::Values(ov::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp index bbe489493f5df5..2a5a83a75bd412 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp @@ -12,9 +12,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -23,28 +23,28 @@ const std::vector trasform const std::vector params = { { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, { 2, 3 }, true, }, { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, { 2, 3 }, false, }, { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, { 1 }, true, }, { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, { 1 }, false, }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -55,7 +55,7 @@ const std::vector params = }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -66,7 +66,7 @@ const std::vector params = }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -77,7 +77,7 @@ const std::vector params = }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -91,7 +91,7 @@ const std::vector params = INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMinTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), + ::testing::Values(ov::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp index 74b7d26ee7ffd6..3ea1f9568d2e56 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp @@ -12,9 +12,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -23,18 +23,18 @@ const std::vector trasform const std::vector params = { { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 127.f } }, { 2, 3 }, true, }, { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 2.f }, { 10.f }, { 2.f }, { 10.f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 2.f }, { 10.f }, { 2.f }, { 10.f } }, { 2, 3 }, false, }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -45,7 +45,7 @@ const std::vector params = }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -56,7 +56,7 @@ const std::vector params = }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -67,7 +67,7 @@ const std::vector params = }, { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -81,7 +81,7 @@ const std::vector params = INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceSumTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 10, 10 })), + ::testing::Values(ov::PartialShape({ 1, 3, 10, 10 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/relu_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/relu_transformation.cpp index 637f45d05ad5ff..f509677c9ce446 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/relu_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/relu_transformation.cpp @@ -8,26 +8,25 @@ #include "common_test_utils/test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace InferenceEngine::details; namespace { -const std::vector precisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + ov::element::f16 }; std::vector testValues = { { {}, false}, - { { 256ul, ngraph::Shape({}), {0.f}, {25.5f}, {0.f}, {25.5f} }, false }, - { { 256ul, ngraph::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, true }, - { { 256ul, ngraph::Shape({}), {12.75f}, {25.5f}, {12.75f}, {25.5f} }, true }, - { { 256ul, ngraph::Shape({}), {-12.8f / 2.f}, {12.7f}, {-12.8f / 2.f}, {12.7f} }, true } + { { 256ul, ov::Shape({}), {0.f}, {25.5f}, {0.f}, {25.5f} }, false }, + { { 256ul, ov::Shape({}), {-12.8f}, {12.7f}, {-12.8f}, {12.7f} }, true }, + { { 256ul, ov::Shape({}), {12.75f}, {25.5f}, {12.75f}, {25.5f} }, true }, + { { 256ul, ov::Shape({}), {-12.8f / 2.f}, {12.7f}, {-12.8f / 2.f}, {12.7f} }, true } }; INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReluTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(testValues)), ReluTransformation::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp index a73e60027140cf..a50b1739cdf92f 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp @@ -10,9 +10,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -24,7 +24,7 @@ const std::vector params = { { { 1, 3, 32 }, { 1, 3, 4, 8 }, - { 256ul, ngraph::Shape{ 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape{ 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, "Reshape", "U8" }, @@ -32,7 +32,7 @@ const std::vector params = { { { 1, 3, 32 }, { -1 }, - { 256ul, ngraph::Shape{}, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape{}, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, "Reshape", "U8" }, @@ -40,7 +40,7 @@ const std::vector params = { { { 1, 3, 16, 16 }, { 1, 3, 256 }, - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, "Reshape", "U8" }, @@ -48,7 +48,7 @@ const std::vector params = { { { 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 } }, + { 256ul, ov::Shape{ 1, 3, 1, 1 }, { 0.f }, { 255.f }, { 0.f, 0.f, 0.f }, { 255.f, 25.5f, 2.55f } }, "Reshape", "U8" }, @@ -56,7 +56,7 @@ const std::vector params = { { { 1, 3, 4, 8 }, { 1, -1 }, - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, "Reshape", "U8" }, @@ -64,7 +64,7 @@ const std::vector params = { { { 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 } }, + { 256ul, ov::Shape{ 1, 1, 1, 1}, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, "Reshape", "U8" }, @@ -74,7 +74,7 @@ const std::vector params = { { 1, -1 }, { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { 0.f, 0.f, 0.f }, { 255.f, 255.f / 2.f, 255.f / 3.f }, { 0.f, 0.f, 0.f }, @@ -89,7 +89,7 @@ const std::vector params = { { 1, 3, -1 }, { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { 0.f, 0.f, 0.f }, { 255.f, 255.f / 2.f, 255.f / 3.f }, { 0.f, 0.f, 0.f }, @@ -105,7 +105,7 @@ const std::vector params = { { 1, -1, 8 }, { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { 0.f, 0.f, 0.f }, { 255.f, 255.f / 2.f, 255.f / 3.f }, { 0.f, 0.f, 0.f }, @@ -118,7 +118,7 @@ const std::vector params = { { { 1, 3, 16, 16 }, { 1, 1, 48, 16 }, - { 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + { 256ul, ov::Shape{ 1, 3, 1, 1 }, { 0.f, 0.f, 0.f }, { 255.f, 255.f, 255.f }, { 0.f, 0.f, 0.f }, { 255.f, 25.5f, 2.55f } }, "Reshape", @@ -128,7 +128,7 @@ const std::vector params = { { { 1, 3, 16 }, { 1, 1, 6, 8 }, - { 256ul, ngraph::Shape{ 1, 3, 1 }, + { 256ul, ov::Shape{ 1, 3, 1 }, { 0.f, 0.f, 0.f }, { 255.f, 255.f, 255.f }, { 0.f, 0.f, 0.f }, { 255.f, 25.5f, 2.55f } }, "Reshape", @@ -138,7 +138,7 @@ const std::vector params = { { { 1, 3, 2, 4 }, { 1, 1, 24 }, - { 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + { 256ul, ov::Shape{ 1, 3, 1, 1 }, { 0.f, 0.f, 0.f }, { 255.f, 255.f, 255.f }, { 0.f, 0.f, 0.f }, { 255.f, 25.5f, 2.55f } }, "Reshape", @@ -148,7 +148,7 @@ const std::vector params = { { { 1, 3, 2, 4, 2 }, { 1, 1, 48 }, - { 256ul, ngraph::Shape{ 1, 3, 1, 1, 1 }, + { 256ul, ov::Shape{ 1, 3, 1, 1, 1 }, { 0.f, 0.f, 0.f }, { 255.f, 255.f, 255.f }, { 0.f, 0.f, 0.f }, { 255.f, 25.5f, 2.55f } }, "Reshape", @@ -158,7 +158,7 @@ const std::vector params = { { { 1, 3, 2, 4, 2 }, { 1, 1, 3, 16 }, - { 256ul, ngraph::Shape{ 1, 3, 1, 1, 1 }, + { 256ul, ov::Shape{ 1, 3, 1, 1, 1 }, { 0.f, 0.f, 0.f }, { 255.f, 255.f, 255.f }, { 0.f, 0.f, 0.f }, { 255.f, 25.5f, 2.55f } }, "Reshape", diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp index bceaf8fd31f6dc..87b7f57adddc0b 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp @@ -10,12 +10,12 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; -const std::vector inputShapes = { +const std::vector inputShapes = { { 1, 3, 16, 16 } }; @@ -25,19 +25,19 @@ const std::vector trasform const std::vector params = { { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, 0, 1, }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, -3, 1, }, { { 256ul, - ngraph::Shape { 1, 3, 1, 1 }, + ov::Shape { 1, 3, 1, 1 }, { 0.f }, { 25.5f }, { 0.f, 0.f, 0.f }, @@ -49,7 +49,7 @@ const std::vector par { { 256ul, - ngraph::Shape { 1, 3, 1, 1 }, + ov::Shape { 1, 3, 1, 1 }, { 0.f }, { 25.5f }, { -4.f, -3.f, 0.f }, @@ -59,14 +59,14 @@ const std::vector par 1, }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { 0.f }, { 25.5f } }, 2, 4, }, { { 256ul, - ngraph::Shape { 1, 3, 1, 1 }, + ov::Shape { 1, 3, 1, 1 }, { 0.f }, { 25.5f }, { 0.f, 0.f, 0.f }, diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/space_to_batch_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/space_to_batch_transformation.cpp index ca9ef9f1dda658..0a5a4f35cb881d 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/space_to_batch_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/space_to_batch_transformation.cpp @@ -10,16 +10,16 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector params = { { { 1, 3, 100, 171 }, { 1, 1, 2, 2 }, { 0, 0, 2, 2 }, { 0, 0, 2, 3 }, - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 2.55f }, { 0.f }, { 2.55f } }, "space_to_batch", "u8" }, @@ -28,7 +28,7 @@ const std::vector params = { { 1, 1, 2, 2 }, { 0, 0, 2, 2 }, { 0, 0, 2, 3 }, { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { 0.f, 0.f, 0.f }, { 255.f, 255.f/2.f, 255.f/3.f }, { 0.f, 0.f, 0.f }, diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/split_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/split_transformation.cpp index 8f28760f2c70ce..d9f621f442e965 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/split_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/split_transformation.cpp @@ -13,9 +13,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -28,18 +28,18 @@ const std::vector trasform const std::vector params = { // tensor quantization, split second dimension { - { 256ul, ngraph::Shape{ }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f / 2.f } }, + { 256ul, ov::Shape{ }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f / 2.f } }, 2, 2ul }, // tensor quantization, split third dimension { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { 0.f }, { 25.5f } }, -1, 2ul }, // per-channel quantization with the same values, split second dimension { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -50,7 +50,7 @@ const std::vector params = { // per-channel quantization with the same values, per-channel split { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -62,7 +62,7 @@ const std::vector params = { { { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { -127.f, 0.f, 128.f / 2.f }, { 128.f / 4.f, 128.f / 2.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -74,7 +74,7 @@ const std::vector params = { { { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { -127.f, 0.f, 128.f / 2.f }, { 128.f / 4.f, 128.f / 2.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -87,7 +87,7 @@ const std::vector params = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, SplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp index adf09280b3b296..936801c2ed45b8 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp @@ -11,9 +11,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { - const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 + const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; @@ -25,22 +25,22 @@ namespace { const std::vector params = { { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, { 3 }, { 1, 3, 5, 1} }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, { 2, 3 }, { 1, 1, 1, 1 } }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, { 3 }, { 1, 64, 32, 1 } }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, { 2.0, 3.0 }, { 1, 32, 1, 1 } } diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp index 0c24c71f76ec72..195c95dc8bdf19 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp @@ -12,9 +12,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -24,7 +24,7 @@ const std::vector trasform const std::vector params = { // channel slice, tensor quantization { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 12.8f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 12.8f } }, { 0, 0, 0, 0 }, // begin { 1, 2, 1, 1 }, // end { 1, 1, 1, 1 }, // strided @@ -36,7 +36,7 @@ const std::vector params }, // special dimension slice, tensor quantization { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 12.8f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { 0.f }, { 12.8f } }, { 0, 0, 0, 0 }, { 1, 3, 20, 24 }, { 1, 1, 1, 1 }, @@ -50,7 +50,7 @@ const std::vector params { { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { 0.f, 0.f, 0.f }, { 255.f, 25.5f, 2.55f }, { 0.f, 0.f, 0.f }, @@ -69,7 +69,7 @@ const std::vector params { { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { 0.f, 0.f, 0.f }, { 255.f, 25.5f, 2.55f }, { 0.f, 0.f, 0.f }, @@ -88,7 +88,7 @@ const std::vector params { { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { 0.f, 0.f, 0.f }, { 255.f, 25.5f, 2.55f }, { 0.f, 0.f, 0.f }, @@ -108,7 +108,7 @@ const std::vector params INSTANTIATE_TEST_SUITE_P(smoke_LPT, StridedSliceTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 24, 24 })), + ::testing::Values(ov::PartialShape({ 1, 3, 24, 24 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/subtract_multiply_to_multiply_add.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/subtract_multiply_to_multiply_add.cpp index 2e52efdedd04e7..6064605844c4bd 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/subtract_multiply_to_multiply_add.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/subtract_multiply_to_multiply_add.cpp @@ -14,16 +14,16 @@ const std::vector testVal // U8: Multiply {} => Multiply (ScaleShift) { {1, 3, 16, 16}, - ngraph::element::f32, - { 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, + ov::element::f32, + { 256ul, ov::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} }, }, // U8: Multiply { 1x3x1x1 } => Multiply + Add (ScaleShift) { {1, 3, 16, 16}, - ngraph::element::f32, + ov::element::f32, { 256ul, - ngraph::Shape({1, 3, 1, 1}), + ov::Shape({1, 3, 1, 1}), {0.f, 0.f, 0.f}, {2.55f, 2.55f / 2.f, 2.55f / 3.f}, {0.f, 0.f, 0.f}, @@ -33,10 +33,10 @@ const std::vector testVal // U8: Subtract + Multiply { 1x3x1x1 } => Multiply + Add (ScaleShift) { {1, 3, 16, 16}, - ngraph::element::f32, + ov::element::f32, { 256ul, - ngraph::Shape({1, 3, 1, 1}), + ov::Shape({1, 3, 1, 1}), {2.55f / 2, 2.55f / 4.f, 2.55f / 6.f}, {2.55f, 2.55f / 2.f, 2.55f / 3.f}, {2.55f / 2, 2.55f / 4.f, 2.55f / 6.f}, @@ -45,10 +45,10 @@ const std::vector testVal }, { {1, 3, 16, 16}, - ngraph::element::f32, + ov::element::f32, { 256ul, - ngraph::Shape({1}), + ov::Shape({1}), {2.55f / 2}, {2.55f}, {2.55f / 2}, diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp index 985c2f9de0e1d0..0ee661031da3b1 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp @@ -11,9 +11,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -23,7 +23,7 @@ const std::vector trasformationParamValues = { INSTANTIATE_TEST_SUITE_P(smoke_LPT, SubtractTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues)), SubtractTransformation::getTestCaseName); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp index f82e9de2ad2b00..6d57c9a2c6d445 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -11,9 +11,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -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::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(perTensorValues), diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp index 8d33c5cea8a374..87f77078ef1a30 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp @@ -10,9 +10,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector precisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector precisions = { + ov::element::f32, + ov::element::f16 }; const std::vector testValues = { @@ -21,7 +21,7 @@ const std::vector testValues = { { 1, 1000, 1, 1}, { 0, 2, 3, 1}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), - ngraph::element::f32, + ov::element::f32, {256, {}, {0.f}, {25.5f}, {12.5f}, {25.5f + 12.5f}} }, // U8: per-channel quantization @@ -29,7 +29,7 @@ const std::vector testValues = { { 1, 3, 1, 1}, { 0, 2, 3, 1}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), - ngraph::element::f32, + ov::element::f32, { 256, {1, 3, 1, 1}, @@ -44,7 +44,7 @@ const std::vector testValues = { { 1, 1000, 1, 1, 3, 4}, { 0, 2, 1, 3, 5, 4}, LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8(), - ngraph::element::f32, + ov::element::f32, {256, {}, {0.f}, {25.5f}, {12.5f}, {25.5f + 12.5f}} }, }; diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp index d7665bfc1fbd30..72ddfeba696e4d 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp @@ -11,9 +11,9 @@ using namespace LayerTestsDefinitions; using namespace ov::pass::low_precision; namespace { - const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 + const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; @@ -25,27 +25,27 @@ namespace { const std::vector params = { { - { 256ul, ngraph::Shape { 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, + { 256ul, ov::Shape { 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, { 3.0 }, { 3, 3, 5} }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { -12.8f }, { 12.7f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { 0.f }, { 255.f }, { -12.8f }, { 12.7f } }, { 3.0 }, { 3, 3, 3, 5 } }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, { 3.0 }, { 3, 4, 5, 6 } }, { - { 256ul, ngraph::Shape { 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, + { 256ul, ov::Shape { 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, { 2.0, 3.0 }, { 3, 4 } }, { - { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, + { 256ul, ov::Shape { 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { -12.8f }, { 12.7f } }, { 4.0 }, { 46, 128, 2, 3 } } diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp index 2861447c881f03..03dfec34fc1ca2 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp @@ -13,9 +13,9 @@ using namespace LayerTestsDefinitions; namespace { -const std::vector netPrecisions = { - ngraph::element::f32, - ngraph::element::f16 +const std::vector netPrecisions = { + ov::element::f32, + ov::element::f16 }; const std::vector trasformationParamValues = { @@ -28,13 +28,13 @@ const std::vector trasform const std::vector params{ // tensor quantization, split second dimension { - { 256ul, ngraph::Shape{ }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f / 2.f } }, + { 256ul, ov::Shape{ }, { 0.f }, { 25.5f }, { 0.f }, { 25.5f / 2.f } }, 2, std::vector{9, 7} }, // tensor quantization, split third dimension { - { 256ul, ngraph::Shape{ 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { 0.f }, { 25.5f } }, + { 256ul, ov::Shape{ 1, 1, 1, 1 }, { -12.8f }, { 12.7f }, { 0.f }, { 25.5f } }, -1, std::vector{15, 1} }, @@ -42,7 +42,7 @@ const std::vector param { { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { -127.f, 0.f, 128.f / 2.f }, { 128.f / 4.f, 128.f / 2.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -55,7 +55,7 @@ const std::vector param { { 256ul, - ngraph::Shape{ 1, 3, 1, 1 }, + ov::Shape{ 1, 3, 1, 1 }, { -127.f, 0.f, 128.f / 2.f }, { 128.f / 4.f, 128.f / 2.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -67,7 +67,7 @@ const std::vector param // per-channel quantization with the same values, per-channel split { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -79,7 +79,7 @@ const std::vector param // per-channel quantization with the same values, split third dimension { { - 256ul, ngraph::Shape{ 1, 3, 1, 1 }, + 256ul, ov::Shape{ 1, 3, 1, 1 }, { -127.f, -127.f, -127.f }, { 128.f, 128.f, 128.f }, { 0.f, 0.f, 0.f }, @@ -93,7 +93,7 @@ const std::vector param INSTANTIATE_TEST_SUITE_P(smoke_LPT, VariadicSplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), - ::testing::Values(ngraph::PartialShape({ 1, 3, 16, 16 })), + ::testing::Values(ov::PartialShape({ 1, 3, 16, 16 })), ::testing::Values(ov::test::utils::DEVICE_GPU), ::testing::ValuesIn(trasformationParamValues), ::testing::ValuesIn(params)), diff --git a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat_multi_channel.hpp b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat_multi_channel.hpp index 1793420651e417..12a133d0825435 100644 --- a/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat_multi_channel.hpp +++ b/src/tests/functional/plugin/shared/include/low_precision_transformations/output_layers_concat_multi_channel.hpp @@ -12,8 +12,8 @@ namespace LayerTestsDefinitions { typedef std::tuple< - InferenceEngine::Precision, - InferenceEngine::SizeVector, + ov::element::Type, + ov::Shape, std::string, ov::pass::low_precision::LayerTransformation::Params, bool> OutputLayersHandlingInTransformationsParams; From 7a15cb8547fb1ca3517fcd6a173811a8bc402a1a Mon Sep 17 00:00:00 2001 From: Evgeny Kotov Date: Wed, 17 Jan 2024 16:59:11 +0100 Subject: [PATCH 34/37] add windows failures to skip list --- .../shared_tests_instances/skip_tests_config.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp index d452c95b185ec2..0e6363426825a3 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp @@ -212,6 +212,19 @@ std::vector disabledTestPatterns() { R"(.*smoke_CpuExecNetworkCheck.*StreamsHasHigherPriorityThanLatencyHint.*)", // Issue: 119648 R"(.*smoke_LPT/InterpolateTransformation.*)", + // Issue: 129931 + R"(smoke_FQLayerDQBias_4D_dynamic/FQLayerDQBias.*)", + R"(smoke_FQLayerDQBias_4D_static/FQLayerDQBias.*)", + R"(smoke_LPT/ConvolutionTransformation.*)", + R"(smoke_LPT/ConvolutionWIthIncorrectWeightsTransformation.*)", + R"(smoke_LPT/EliminateFakeQuantizeTransformation.*)", + R"(smoke_LPT/FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation.*)", + R"(smoke_LPT/FakeQuantizePrecisionSelectionTransformation.*)", + R"(smoke_LPT/GroupConvolutionTransformation.*)", + R"(smoke_LPT/MatMulTransformation.*)", + R"(smoke_LPT/MatMulWithOptimizedConstantFq.*)", + R"(smoke_QuantizedConvolutionBatchNorm/QuantizedConvolutionBatchNorm.*)", + R"(smoke_QuantizedConvolutionBatchNormTransposeOnWeights/QuantizedConvolutionBatchNorm.*)", #if defined(OPENVINO_ARCH_ARM) // Issue: 126177 R"(.*smoke_CompareWithRefs_4D_Bitwise.*/EltwiseLayerCPUTest.*_eltwise_op_type=Bitwise.*_model_type=i32_.*)" From 47313f64eedbf51141d62e564f274cf77cb85707 Mon Sep 17 00:00:00 2001 From: Ivan Tikhonov Date: Thu, 18 Jan 2024 12:17:28 +0400 Subject: [PATCH 35/37] Apply suggestions from code review Co-authored-by: Evgenya Nugmanova --- .../fq_with_dq_not_optimal_transformation.cpp | 2 +- .../fuse_multiply_to_fq_transformation.cpp | 1 - .../fuse_subtract_to_fq_transformation.cpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_with_dq_not_optimal_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_with_dq_not_optimal_transformation.cpp index 4ee3228f91d5e1..6a7f581c03a699 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_with_dq_not_optimal_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fq_with_dq_not_optimal_transformation.cpp @@ -14,7 +14,7 @@ using namespace ov::pass::low_precision; namespace { const std::vector netPrecisions = { ov::element::f32, - ngraph::element::f16 + ov::element::f16 }; const std::vector trasformationParamValues = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp index a7382b7bbbed12..61e49894cd7f30 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp @@ -7,7 +7,6 @@ #include using namespace LayerTestsDefinitions; -using namespace ngraph; namespace { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp index ac184ce486828c..0c2633c9825110 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp @@ -7,7 +7,6 @@ #include using namespace LayerTestsDefinitions; -using namespace ngraph; namespace { From a7a23374842eff95918097cf396abe02cf2333e2 Mon Sep 17 00:00:00 2001 From: Ivan Tikhonov Date: Thu, 18 Jan 2024 12:18:09 +0400 Subject: [PATCH 36/37] Update src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp Co-authored-by: Evgenya Nugmanova --- .../fuse_multiply_to_fq_transformation.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp index 3e32be579b72eb..d370d3b57a83a4 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fq_transformation.cpp @@ -7,7 +7,6 @@ #include using namespace LayerTestsDefinitions; -using namespace ngraph; namespace { const std::vector testValues = { From 11166b73327711a63cface509817123f6eab514f Mon Sep 17 00:00:00 2001 From: Ivan Tikhonov Date: Thu, 18 Jan 2024 12:18:19 +0400 Subject: [PATCH 37/37] Update src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp Co-authored-by: Evgenya Nugmanova --- .../fuse_subtract_to_fq_transformation.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp index 972d05adc80150..e506ef4a6630a6 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fq_transformation.cpp @@ -7,7 +7,6 @@ #include using namespace LayerTestsDefinitions; -using namespace ngraph; namespace { const std::vector testValues = {