diff --git a/src/bindings/python/src/pyopenvino/core/offline_transformations.cpp b/src/bindings/python/src/pyopenvino/core/offline_transformations.cpp index 5a1ec14c83d..17a879c72b5 100644 --- a/src/bindings/python/src/pyopenvino/core/offline_transformations.cpp +++ b/src/bindings/python/src/pyopenvino/core/offline_transformations.cpp @@ -59,7 +59,7 @@ void regmodule_offline_transformations(py::module m) { "apply_pot_transformations", [](std::shared_ptr model, std::string device) { ov::pass::Manager manager; - manager.register_pass(std::move(device)); + manager.register_pass(std::move(device)); manager.run_passes(model); }, py::arg("model"), @@ -79,7 +79,7 @@ void regmodule_offline_transformations(py::module m) { "apply_pruning_transformation", [](std::shared_ptr model) { ov::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(model); }, py::arg("model")); @@ -87,7 +87,7 @@ void regmodule_offline_transformations(py::module m) { m_offline_transformations.def( "apply_make_stateful_transformation", [](std::shared_ptr model, const std::map& param_res_names) { - ngraph::pass::Manager manager; + ov::pass::Manager manager; manager.register_pass(param_res_names); manager.run_passes(model); }, @@ -108,8 +108,8 @@ void regmodule_offline_transformations(py::module m) { "compress_quantize_weights_transformation", [](std::shared_ptr model) { ov::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(model); }, py::arg("model")); diff --git a/src/bindings/python/src/pyopenvino/test_utils/test_utils.cpp b/src/bindings/python/src/pyopenvino/test_utils/test_utils.cpp index dafa30ca457..4011d271ed9 100644 --- a/src/bindings/python/src/pyopenvino/test_utils/test_utils.cpp +++ b/src/bindings/python/src/pyopenvino/test_utils/test_utils.cpp @@ -6,7 +6,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" namespace py = pybind11; diff --git a/src/common/low_precision_transformations/include/low_precision/align_quantization_parameters.hpp b/src/common/low_precision_transformations/include/low_precision/align_quantization_parameters.hpp index 20b46b69346..1059d85f5a0 100644 --- a/src/common/low_precision_transformations/include/low_precision/align_quantization_parameters.hpp +++ b/src/common/low_precision_transformations/include/low_precision/align_quantization_parameters.hpp @@ -29,7 +29,7 @@ class LP_TRANSFORMATIONS_API AlignQuantizationParameters; * [AlignQuantizationParameters](@ref openvino_docs_OV_UG_lpt_AlignQuantizationParameters) page * in the Inference Engine Developer Guide. */ -class ngraph::pass::low_precision::AlignQuantizationParameters : public ngraph::pass::FunctionPass { +class ngraph::pass::low_precision::AlignQuantizationParameters : public ov::pass::ModelPass { public: OPENVINO_RTTI("AlignQuantizationParameters", "0"); AlignQuantizationParameters(const std::vector defaultPrecisions = ngraph::pass::low_precision::precision_set::int8_support); diff --git a/src/common/low_precision_transformations/include/low_precision/base_matcher_pass.hpp b/src/common/low_precision_transformations/include/low_precision/base_matcher_pass.hpp index b75f437e33f..99daa1403a7 100644 --- a/src/common/low_precision_transformations/include/low_precision/base_matcher_pass.hpp +++ b/src/common/low_precision_transformations/include/low_precision/base_matcher_pass.hpp @@ -17,7 +17,7 @@ class LP_TRANSFORMATIONS_API BaseMatcherPass; } // namespace pass } // namespace ngraph -class LP_TRANSFORMATIONS_API ngraph::pass::low_precision::BaseMatcherPass : public ngraph::pass::MatcherPass { +class LP_TRANSFORMATIONS_API ngraph::pass::low_precision::BaseMatcherPass : public ov::pass::MatcherPass { public: BaseMatcherPass(const AttributeParameters& params = AttributeParameters()); AttributeParameters params; diff --git a/src/common/low_precision_transformations/include/low_precision/create_precisions_dependent_attribute.hpp b/src/common/low_precision_transformations/include/low_precision/create_precisions_dependent_attribute.hpp index fb7b51464f7..0ca7a394a38 100644 --- a/src/common/low_precision_transformations/include/low_precision/create_precisions_dependent_attribute.hpp +++ b/src/common/low_precision_transformations/include/low_precision/create_precisions_dependent_attribute.hpp @@ -38,7 +38,7 @@ class CreatePrecisionsDependentAttribute; * in the Inference Engine Developer Guide. */ template -class ngraph::pass::low_precision::CreatePrecisionsDependentAttribute : public ngraph::pass::MatcherPass { +class ngraph::pass::low_precision::CreatePrecisionsDependentAttribute : public ov::pass::MatcherPass { public: CreatePrecisionsDependentAttribute() { auto operation = pattern::wrap_type(); diff --git a/src/common/low_precision_transformations/include/low_precision/markup_can_be_quantized.hpp b/src/common/low_precision_transformations/include/low_precision/markup_can_be_quantized.hpp index 2bd138978d9..ca2ed97531b 100644 --- a/src/common/low_precision_transformations/include/low_precision/markup_can_be_quantized.hpp +++ b/src/common/low_precision_transformations/include/low_precision/markup_can_be_quantized.hpp @@ -28,7 +28,7 @@ class LP_TRANSFORMATIONS_API MarkupCanBeQuantized; * [MarkupCanBeQuantized](@ref openvino_docs_OV_UG_lpt_MarkupCanBeQuantized) page * in the Inference Engine Developer Guide. */ -class ngraph::pass::low_precision::MarkupCanBeQuantized : public ngraph::pass::FunctionPass { +class ngraph::pass::low_precision::MarkupCanBeQuantized : public ov::pass::ModelPass { public: OPENVINO_RTTI("MarkupCanBeQuantized", "0"); MarkupCanBeQuantized(const std::vector defaultPrecisions = { ngraph::element::u8, ngraph::element::i8 }); diff --git a/src/common/low_precision_transformations/include/low_precision/markup_quantization_granularity.hpp b/src/common/low_precision_transformations/include/low_precision/markup_quantization_granularity.hpp index 098da265cee..f94a30901a5 100644 --- a/src/common/low_precision_transformations/include/low_precision/markup_quantization_granularity.hpp +++ b/src/common/low_precision_transformations/include/low_precision/markup_quantization_granularity.hpp @@ -32,7 +32,7 @@ class LP_TRANSFORMATIONS_API MarkupQuantizationGranularity; * [MarkupPerTensorQuantization](@ref openvino_docs_OV_UG_lpt_MarkupPerTensorQuantization) page * in the Inference Engine Developer Guide. */ -class ngraph::pass::low_precision::MarkupQuantizationGranularity : public ngraph::pass::FunctionPass { +class ngraph::pass::low_precision::MarkupQuantizationGranularity : public ov::pass::ModelPass { public: class PerTensorQuantization { public: diff --git a/src/common/low_precision_transformations/include/low_precision/propagate_shared_value.hpp b/src/common/low_precision_transformations/include/low_precision/propagate_shared_value.hpp index 797250f5ada..9d0f1880f4e 100644 --- a/src/common/low_precision_transformations/include/low_precision/propagate_shared_value.hpp +++ b/src/common/low_precision_transformations/include/low_precision/propagate_shared_value.hpp @@ -36,7 +36,7 @@ class LP_TRANSFORMATIONS_API PropagateSharedValue; * in the Inference Engine Developer Guide. */ template -class ngraph::pass::low_precision::PropagateSharedValue : public ngraph::pass::FunctionPass { +class ngraph::pass::low_precision::PropagateSharedValue : public ov::pass::ModelPass { public: bool run_on_model(const std::shared_ptr& f) override { OV_ITT_SCOPE(FIRST_INFERENCE, itt::domains::LPT_LT, "PropagateSharedValue"); diff --git a/src/common/low_precision_transformations/include/low_precision/propagate_through_precision_preserved.hpp b/src/common/low_precision_transformations/include/low_precision/propagate_through_precision_preserved.hpp index f30ba75eb6e..d3fe955170c 100644 --- a/src/common/low_precision_transformations/include/low_precision/propagate_through_precision_preserved.hpp +++ b/src/common/low_precision_transformations/include/low_precision/propagate_through_precision_preserved.hpp @@ -36,7 +36,7 @@ class PropagateThroughPrecisionPreserved; * in the Inference Engine Developer Guide. */ template -class ngraph::pass::low_precision::PropagateThroughPrecisionPreserved : public ngraph::pass::MatcherPass { +class ngraph::pass::low_precision::PropagateThroughPrecisionPreserved : public ov::pass::MatcherPass { public: PropagateThroughPrecisionPreserved(const std::vector& defaultPrecisions = precision_set::int8_support) { ngraph::graph_rewrite_callback callback = [&](pattern::Matcher& m) { diff --git a/src/common/low_precision_transformations/include/low_precision/propagate_to_input.hpp b/src/common/low_precision_transformations/include/low_precision/propagate_to_input.hpp index 55602efe3cb..caffaf05ebc 100644 --- a/src/common/low_precision_transformations/include/low_precision/propagate_to_input.hpp +++ b/src/common/low_precision_transformations/include/low_precision/propagate_to_input.hpp @@ -35,7 +35,7 @@ class PropagateToInput; * in the Inference Engine Developer Guide. */ template -class ngraph::pass::low_precision::PropagateToInput : public ngraph::pass::MatcherPass { +class ngraph::pass::low_precision::PropagateToInput : public ov::pass::MatcherPass { public: PropagateToInput(const std::vector& defaultPrecisions = { ngraph::element::u8, ngraph::element::i8 }) { ngraph::graph_rewrite_callback callback = [&](pattern::Matcher& m) { diff --git a/src/common/low_precision_transformations/include/low_precision/pull_reshape_through_dequantization.hpp b/src/common/low_precision_transformations/include/low_precision/pull_reshape_through_dequantization.hpp index 1f94b1213de..cf00a50c094 100644 --- a/src/common/low_precision_transformations/include/low_precision/pull_reshape_through_dequantization.hpp +++ b/src/common/low_precision_transformations/include/low_precision/pull_reshape_through_dequantization.hpp @@ -28,7 +28,7 @@ class LP_TRANSFORMATIONS_API PullReshapeThroughDequantization; * [PullReshapeThroughDequantization](@ref openvino_docs_OV_UG_lpt_PullReshapeThroughDequantization) page * in the Inference Engine Developer Guide. */ -class ngraph::pass::low_precision::PullReshapeThroughDequantization : public ngraph::pass::MatcherPass { +class ngraph::pass::low_precision::PullReshapeThroughDequantization : public ov::pass::MatcherPass { public: OPENVINO_RTTI("PullReshapeThroughDequantization", "0"); PullReshapeThroughDequantization(const std::vector& inputPrecisions = {}); diff --git a/src/common/low_precision_transformations/include/low_precision/pull_transpose_through_dequantization.hpp b/src/common/low_precision_transformations/include/low_precision/pull_transpose_through_dequantization.hpp index fa2aef17d2a..5ab4258fa67 100644 --- a/src/common/low_precision_transformations/include/low_precision/pull_transpose_through_dequantization.hpp +++ b/src/common/low_precision_transformations/include/low_precision/pull_transpose_through_dequantization.hpp @@ -28,7 +28,7 @@ class LP_TRANSFORMATIONS_API PullTransposeThroughDequantization; * [PullTransposeThroughDequantization](@ref openvino_docs_OV_UG_lpt_PullTransposeThroughDequantization) page * in the Inference Engine Developer Guide. */ -class ngraph::pass::low_precision::PullTransposeThroughDequantization : public ngraph::pass::MatcherPass { +class ngraph::pass::low_precision::PullTransposeThroughDequantization : public ov::pass::MatcherPass { public: OPENVINO_RTTI("PullTransposeThroughDequantization", "0"); PullTransposeThroughDequantization(const std::vector& inputPrecisions = {}); diff --git a/src/common/low_precision_transformations/src/align_quantization_intervals.cpp b/src/common/low_precision_transformations/src/align_quantization_intervals.cpp index a9ad45c3c2d..fdfdb52ea16 100644 --- a/src/common/low_precision_transformations/src/align_quantization_intervals.cpp +++ b/src/common/low_precision_transformations/src/align_quantization_intervals.cpp @@ -22,7 +22,7 @@ bool ngraph::pass::low_precision::AlignQuantizationIntervals::run_on_model(const RUN_ON_FUNCTION_SCOPE(AlignQuantizationIntervals); ov::pass::Manager manager; manager.set_per_pass_validation(false); - std::shared_ptr intervalsAlignment = manager.register_pass(); + std::shared_ptr intervalsAlignment = manager.register_pass(); intervalsAlignment->add_matcher>( AttributeParameters(ngraph::element::f32, defaultPrecisions)); intervalsAlignment->add_matcher>(defaultPrecisions); diff --git a/src/common/low_precision_transformations/src/align_quantization_parameters.cpp b/src/common/low_precision_transformations/src/align_quantization_parameters.cpp index c2d1eb53ccb..01a0edf9309 100644 --- a/src/common/low_precision_transformations/src/align_quantization_parameters.cpp +++ b/src/common/low_precision_transformations/src/align_quantization_parameters.cpp @@ -23,7 +23,7 @@ bool ngraph::pass::low_precision::AlignQuantizationParameters::run_on_model(cons RUN_ON_FUNCTION_SCOPE(AlignQuantizationParameters); ov::pass::Manager manager; manager.set_per_pass_validation(false); - std::shared_ptr propagation = manager.register_pass(); + std::shared_ptr propagation = manager.register_pass(); propagation->add_matcher>(); propagation->add_matcher>(); propagation->add_matcher>(); diff --git a/src/common/low_precision_transformations/src/low_precision.cpp b/src/common/low_precision_transformations/src/low_precision.cpp index 3eb6ddb3202..7ca3b64775c 100644 --- a/src/common/low_precision_transformations/src/low_precision.cpp +++ b/src/common/low_precision_transformations/src/low_precision.cpp @@ -97,7 +97,7 @@ ngraph::pass::low_precision::LowPrecision::LowPrecision( using namespace ngraph::pass::low_precision; template -void make_matcher_type_relaxed(ngraph::pass::GraphRewrite* transformation) { +void make_matcher_type_relaxed(ov::pass::GraphRewrite* transformation) { MATCHER_SCOPE(TypeRelaxedReplacer); using namespace ngraph; @@ -187,7 +187,7 @@ MarkupOptimizations::MarkupOptimizations( bool ngraph::pass::low_precision::MarkupOptimizations::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(MarkupOptimizations); - ngraph::pass::Manager markup(get_pass_config()); + ov::pass::Manager markup(get_pass_config()); markup.set_per_pass_validation(false); markup.register_pass(params.defaultPrecisions); if (!precisionRestrictions.empty()) { @@ -214,9 +214,9 @@ bool ngraph::pass::low_precision::LowPrecision::run_on_model(const std::shared_p OV_ITT_SCOPE(FIRST_INFERENCE, itt::domains::LPT_LT, "LowPrecision"); auto passConfig = get_pass_config(); - ngraph::pass::Manager manager(passConfig); + ov::pass::Manager manager(passConfig); - auto prerequisites = manager.register_pass(); + auto prerequisites = manager.register_pass(); const std::vector supportedTypes = {ngraph::element::i8, ngraph::element::u8}; ADD_MATCHER(prerequisites, PullReshapeThroughDequantization, supportedTypes) ADD_MATCHER(prerequisites, PullTransposeThroughDequantization, supportedTypes) @@ -232,7 +232,7 @@ bool ngraph::pass::low_precision::LowPrecision::run_on_model(const std::shared_p quantizationRestrictions, attributeParams); - std::shared_ptr common = manager.register_pass(); + std::shared_ptr common = manager.register_pass(); ADD_MATCHER(common, AddTransformation, params) ADD_MATCHER(common, AssignAndReadValueTransformation, f, params) @@ -269,7 +269,7 @@ bool ngraph::pass::low_precision::LowPrecision::run_on_model(const std::shared_p ADD_MATCHER(common, UnsqueezeTransformation, params) ADD_MATCHER(common, VariadicSplitTransformation, params) - std::shared_ptr cleanup = manager.register_pass(); + std::shared_ptr cleanup = manager.register_pass(); ADD_MATCHER(cleanup, EliminateFakeQuantizeTransformation, params) ADD_MATCHER(cleanup, FoldConvertTransformation, params) ADD_MATCHER(cleanup, FuseConvertTransformation, params) diff --git a/src/common/low_precision_transformations/src/markup_avg_pool_precision_preserved.cpp b/src/common/low_precision_transformations/src/markup_avg_pool_precision_preserved.cpp index d54c213a5c1..e52a33d4edc 100644 --- a/src/common/low_precision_transformations/src/markup_avg_pool_precision_preserved.cpp +++ b/src/common/low_precision_transformations/src/markup_avg_pool_precision_preserved.cpp @@ -21,7 +21,7 @@ bool ngraph::pass::low_precision::MarkupAvgPoolPrecisionPreserved::run_on_model( RUN_ON_FUNCTION_SCOPE(MarkupAvgPoolPrecisionPreserved); ov::pass::Manager manager; manager.set_per_pass_validation(false); - std::shared_ptr markupAvgPoolPrecision = manager.register_pass(); + std::shared_ptr markupAvgPoolPrecision = manager.register_pass(); markupAvgPoolPrecision->add_matcher>(); markupAvgPoolPrecision->add_matcher>(defaultPrecisions); markupAvgPoolPrecision->add_matcher>(defaultPrecisions); diff --git a/src/common/low_precision_transformations/src/propagate_precisions.cpp b/src/common/low_precision_transformations/src/propagate_precisions.cpp index 3ea044135f5..b02292129ca 100644 --- a/src/common/low_precision_transformations/src/propagate_precisions.cpp +++ b/src/common/low_precision_transformations/src/propagate_precisions.cpp @@ -23,7 +23,7 @@ bool ngraph::pass::low_precision::PropagatePrecisions::run_on_model(const std::s RUN_ON_FUNCTION_SCOPE(PropagatePrecisions); ov::pass::Manager manager; manager.set_per_pass_validation(false); - std::shared_ptr precisionsPropagation = manager.register_pass(); + std::shared_ptr precisionsPropagation = manager.register_pass(); precisionsPropagation->add_matcher>(params, AttributeSource::OutputPort); precisionsPropagation->add_matcher>(params.defaultPrecisions); precisionsPropagation->add_matcher>(params.defaultPrecisions); diff --git a/src/common/low_precision_transformations/tests/add_transformation.cpp b/src/common/low_precision_transformations/tests/add_transformation.cpp index 73ebe4d86e7..6efb1611b7f 100644 --- a/src/common/low_precision_transformations/tests/add_transformation.cpp +++ b/src/common/low_precision_transformations/tests/add_transformation.cpp @@ -12,7 +12,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/add_function.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/align_concat_quantization_parameters_transformation.cpp b/src/common/low_precision_transformations/tests/align_concat_quantization_parameters_transformation.cpp index d26ed2304f7..1ef9e711262 100644 --- a/src/common/low_precision_transformations/tests/align_concat_quantization_parameters_transformation.cpp +++ b/src/common/low_precision_transformations/tests/align_concat_quantization_parameters_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/align_concat_quantization_parameters_function.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/assign_and_read_value_transformation.cpp b/src/common/low_precision_transformations/tests/assign_and_read_value_transformation.cpp index 050c6f1a9e3..ec5a2006b7f 100644 --- a/src/common/low_precision_transformations/tests/assign_and_read_value_transformation.cpp +++ b/src/common/low_precision_transformations/tests/assign_and_read_value_transformation.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/assign_and_read_value_function.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/avg_pool_transformation.cpp b/src/common/low_precision_transformations/tests/avg_pool_transformation.cpp index a0f0660b4cf..50a3ba15c24 100644 --- a/src/common/low_precision_transformations/tests/avg_pool_transformation.cpp +++ b/src/common/low_precision_transformations/tests/avg_pool_transformation.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/avg_pool_function.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/avg_pool_with_child_transformation.cpp b/src/common/low_precision_transformations/tests/avg_pool_with_child_transformation.cpp index 62a8dc794cf..1ad7a4505b3 100644 --- a/src/common/low_precision_transformations/tests/avg_pool_with_child_transformation.cpp +++ b/src/common/low_precision_transformations/tests/avg_pool_with_child_transformation.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/avg_pool_function.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/clamp_transformation.cpp b/src/common/low_precision_transformations/tests/clamp_transformation.cpp index 4f3e8a72b53..a87d78e74e1 100644 --- a/src/common/low_precision_transformations/tests/clamp_transformation.cpp +++ b/src/common/low_precision_transformations/tests/clamp_transformation.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/clamp_function.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/compose_fake_quantize_transformation.cpp b/src/common/low_precision_transformations/tests/compose_fake_quantize_transformation.cpp index 27d31c7595f..c6b5bace96a 100644 --- a/src/common/low_precision_transformations/tests/compose_fake_quantize_transformation.cpp +++ b/src/common/low_precision_transformations/tests/compose_fake_quantize_transformation.cpp @@ -14,7 +14,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/compose_fake_quantize_function.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" diff --git a/src/common/low_precision_transformations/tests/concat_selection_with_intermediate_transformation.cpp b/src/common/low_precision_transformations/tests/concat_selection_with_intermediate_transformation.cpp index 120edc5df7f..ed13ba51b8e 100644 --- a/src/common/low_precision_transformations/tests/concat_selection_with_intermediate_transformation.cpp +++ b/src/common/low_precision_transformations/tests/concat_selection_with_intermediate_transformation.cpp @@ -16,7 +16,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/concat_function.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/concat_transformation.cpp b/src/common/low_precision_transformations/tests/concat_transformation.cpp index ab862de7b41..2e8426be5b3 100644 --- a/src/common/low_precision_transformations/tests/concat_transformation.cpp +++ b/src/common/low_precision_transformations/tests/concat_transformation.cpp @@ -11,7 +11,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/concat_function.hpp" #include "lpt_ngraph_functions/common/builders.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/concat_with_different_precision_on_children.cpp b/src/common/low_precision_transformations/tests/concat_with_different_precision_on_children.cpp index c1429b4f06a..46fe37416a1 100644 --- a/src/common/low_precision_transformations/tests/concat_with_different_precision_on_children.cpp +++ b/src/common/low_precision_transformations/tests/concat_with_different_precision_on_children.cpp @@ -15,7 +15,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/concat_function.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/concat_with_fq_tranformation.cpp b/src/common/low_precision_transformations/tests/concat_with_fq_tranformation.cpp index 3ab60870666..75dc9c4b55f 100644 --- a/src/common/low_precision_transformations/tests/concat_with_fq_tranformation.cpp +++ b/src/common/low_precision_transformations/tests/concat_with_fq_tranformation.cpp @@ -17,7 +17,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/builders.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" diff --git a/src/common/low_precision_transformations/tests/concat_with_intermediate_precision_selection_transformation.cpp b/src/common/low_precision_transformations/tests/concat_with_intermediate_precision_selection_transformation.cpp index 0ee5811d065..4e5ef6ef7a2 100644 --- a/src/common/low_precision_transformations/tests/concat_with_intermediate_precision_selection_transformation.cpp +++ b/src/common/low_precision_transformations/tests/concat_with_intermediate_precision_selection_transformation.cpp @@ -17,7 +17,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/concat_function.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/concat_with_intermediate_reshape_transformation.cpp b/src/common/low_precision_transformations/tests/concat_with_intermediate_reshape_transformation.cpp index 733e235d2fd..1fcd70c78b4 100644 --- a/src/common/low_precision_transformations/tests/concat_with_intermediate_reshape_transformation.cpp +++ b/src/common/low_precision_transformations/tests/concat_with_intermediate_reshape_transformation.cpp @@ -15,7 +15,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/concat_function.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/concat_with_intermediate_transformation.cpp b/src/common/low_precision_transformations/tests/concat_with_intermediate_transformation.cpp index aa0d9b9d22c..a1feb52f121 100644 --- a/src/common/low_precision_transformations/tests/concat_with_intermediate_transformation.cpp +++ b/src/common/low_precision_transformations/tests/concat_with_intermediate_transformation.cpp @@ -16,7 +16,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/concat_function.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/concat_with_intermediate_with_constant_transformation.cpp b/src/common/low_precision_transformations/tests/concat_with_intermediate_with_constant_transformation.cpp index ee730b4d825..2df1ec27b26 100644 --- a/src/common/low_precision_transformations/tests/concat_with_intermediate_with_constant_transformation.cpp +++ b/src/common/low_precision_transformations/tests/concat_with_intermediate_with_constant_transformation.cpp @@ -17,7 +17,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/concat_function.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/concat_with_neighbors_transformation.cpp b/src/common/low_precision_transformations/tests/concat_with_neighbors_transformation.cpp index e2bd7451be7..a375a9ddf43 100644 --- a/src/common/low_precision_transformations/tests/concat_with_neighbors_transformation.cpp +++ b/src/common/low_precision_transformations/tests/concat_with_neighbors_transformation.cpp @@ -23,7 +23,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/concat_function.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/concat_with_not_quantized_parent_transformation.cpp b/src/common/low_precision_transformations/tests/concat_with_not_quantized_parent_transformation.cpp index eca08c60695..d36caba1141 100644 --- a/src/common/low_precision_transformations/tests/concat_with_not_quantized_parent_transformation.cpp +++ b/src/common/low_precision_transformations/tests/concat_with_not_quantized_parent_transformation.cpp @@ -24,7 +24,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/concat_function.hpp" #include "lpt_ngraph_functions/common/builders.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" diff --git a/src/common/low_precision_transformations/tests/concat_with_reshape_at_the_end_transformation.cpp b/src/common/low_precision_transformations/tests/concat_with_reshape_at_the_end_transformation.cpp index 375179de840..33318e0787b 100644 --- a/src/common/low_precision_transformations/tests/concat_with_reshape_at_the_end_transformation.cpp +++ b/src/common/low_precision_transformations/tests/concat_with_reshape_at_the_end_transformation.cpp @@ -17,7 +17,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/concat_function.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/concat_with_split_transformation.cpp b/src/common/low_precision_transformations/tests/concat_with_split_transformation.cpp index 79f8fd9cc66..e274e6692ae 100644 --- a/src/common/low_precision_transformations/tests/concat_with_split_transformation.cpp +++ b/src/common/low_precision_transformations/tests/concat_with_split_transformation.cpp @@ -23,7 +23,7 @@ #include #include "low_precision/common/precisions_restriction.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/concat_function.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/concat_with_strided_slice_transformation.cpp b/src/common/low_precision_transformations/tests/concat_with_strided_slice_transformation.cpp index b67199ef831..4c7af044339 100644 --- a/src/common/low_precision_transformations/tests/concat_with_strided_slice_transformation.cpp +++ b/src/common/low_precision_transformations/tests/concat_with_strided_slice_transformation.cpp @@ -17,7 +17,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/concat_function.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/convert_subtract_constant_transformation.cpp b/src/common/low_precision_transformations/tests/convert_subtract_constant_transformation.cpp index 5ab3dfaab19..14b0b1b490c 100644 --- a/src/common/low_precision_transformations/tests/convert_subtract_constant_transformation.cpp +++ b/src/common/low_precision_transformations/tests/convert_subtract_constant_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/fake_quantize_and_convolution_function.hpp" diff --git a/src/common/low_precision_transformations/tests/convolution_backprop_data_transformation.cpp b/src/common/low_precision_transformations/tests/convolution_backprop_data_transformation.cpp index 37d4cad933d..15b66b41acb 100644 --- a/src/common/low_precision_transformations/tests/convolution_backprop_data_transformation.cpp +++ b/src/common/low_precision_transformations/tests/convolution_backprop_data_transformation.cpp @@ -15,7 +15,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/convolution_backprop_data_function.hpp" diff --git a/src/common/low_precision_transformations/tests/convolution_qdq_transformation.cpp b/src/common/low_precision_transformations/tests/convolution_qdq_transformation.cpp index fed1b783ae3..8513edac8e1 100644 --- a/src/common/low_precision_transformations/tests/convolution_qdq_transformation.cpp +++ b/src/common/low_precision_transformations/tests/convolution_qdq_transformation.cpp @@ -14,7 +14,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/fake_quantize_and_convolution_function.hpp" diff --git a/src/common/low_precision_transformations/tests/convolution_transformation.cpp b/src/common/low_precision_transformations/tests/convolution_transformation.cpp index 93719144fb1..d68abc6768c 100644 --- a/src/common/low_precision_transformations/tests/convolution_transformation.cpp +++ b/src/common/low_precision_transformations/tests/convolution_transformation.cpp @@ -14,7 +14,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/convolution_function.hpp" diff --git a/src/common/low_precision_transformations/tests/convolution_with_incorrect_weights.cpp b/src/common/low_precision_transformations/tests/convolution_with_incorrect_weights.cpp index 31d7a9877b2..30e6781e933 100644 --- a/src/common/low_precision_transformations/tests/convolution_with_incorrect_weights.cpp +++ b/src/common/low_precision_transformations/tests/convolution_with_incorrect_weights.cpp @@ -12,7 +12,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" diff --git a/src/common/low_precision_transformations/tests/depth_to_space_transformation.cpp b/src/common/low_precision_transformations/tests/depth_to_space_transformation.cpp index 9e382a01e73..57c1da03659 100644 --- a/src/common/low_precision_transformations/tests/depth_to_space_transformation.cpp +++ b/src/common/low_precision_transformations/tests/depth_to_space_transformation.cpp @@ -14,7 +14,7 @@ #include #include "low_precision/depth_to_space.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/depth_to_space_function.hpp" diff --git a/src/common/low_precision_transformations/tests/elementwise_with_multi_parent_dequantization_transformation.cpp b/src/common/low_precision_transformations/tests/elementwise_with_multi_parent_dequantization_transformation.cpp index bb246d871da..0fb524641c4 100644 --- a/src/common/low_precision_transformations/tests/elementwise_with_multi_parent_dequantization_transformation.cpp +++ b/src/common/low_precision_transformations/tests/elementwise_with_multi_parent_dequantization_transformation.cpp @@ -14,7 +14,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include diff --git a/src/common/low_precision_transformations/tests/eliminate_fake_quantize_transformation.cpp b/src/common/low_precision_transformations/tests/eliminate_fake_quantize_transformation.cpp index c1c8032c62a..53ca84358e1 100644 --- a/src/common/low_precision_transformations/tests/eliminate_fake_quantize_transformation.cpp +++ b/src/common/low_precision_transformations/tests/eliminate_fake_quantize_transformation.cpp @@ -5,7 +5,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "low_precision/eliminate_fake_quantize.hpp" #include "low_precision/fake_quantize.hpp" diff --git a/src/common/low_precision_transformations/tests/fake_quantize_and_two_output_branches_with_convolution.cpp b/src/common/low_precision_transformations/tests/fake_quantize_and_two_output_branches_with_convolution.cpp index 6e78bd58b6d..7d1579e05e4 100644 --- a/src/common/low_precision_transformations/tests/fake_quantize_and_two_output_branches_with_convolution.cpp +++ b/src/common/low_precision_transformations/tests/fake_quantize_and_two_output_branches_with_convolution.cpp @@ -14,7 +14,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_weights.hpp" diff --git a/src/common/low_precision_transformations/tests/fake_quantize_on_weights_with_unsupported_child.cpp b/src/common/low_precision_transformations/tests/fake_quantize_on_weights_with_unsupported_child.cpp index d71a04afc1a..a903bf9bb35 100644 --- a/src/common/low_precision_transformations/tests/fake_quantize_on_weights_with_unsupported_child.cpp +++ b/src/common/low_precision_transformations/tests/fake_quantize_on_weights_with_unsupported_child.cpp @@ -15,7 +15,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/fake_quantize_on_weights_and_unsupported_child_function.hpp" diff --git a/src/common/low_precision_transformations/tests/fake_quantize_precision_selection_transformation.cpp b/src/common/low_precision_transformations/tests/fake_quantize_precision_selection_transformation.cpp index 102550a91be..2c55db412cc 100644 --- a/src/common/low_precision_transformations/tests/fake_quantize_precision_selection_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fake_quantize_precision_selection_transformation.cpp @@ -15,7 +15,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/fake_quantize_precision_selection_function.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/fake_quantize_transformation.cpp b/src/common/low_precision_transformations/tests/fake_quantize_transformation.cpp index 821449024d9..1a795f87a80 100644 --- a/src/common/low_precision_transformations/tests/fake_quantize_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fake_quantize_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/fake_quantize_function.hpp" diff --git a/src/common/low_precision_transformations/tests/fake_quantize_with_dq_not_optimal_transformation.cpp b/src/common/low_precision_transformations/tests/fake_quantize_with_dq_not_optimal_transformation.cpp index 40f8e06f199..b0beed26c69 100644 --- a/src/common/low_precision_transformations/tests/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -14,7 +14,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/fake_quantize_and_convolution_function.hpp" diff --git a/src/common/low_precision_transformations/tests/fake_quantize_with_dynamic_intervals_transformation.cpp b/src/common/low_precision_transformations/tests/fake_quantize_with_dynamic_intervals_transformation.cpp index 1ea0ff6e48e..7b8f379ba8a 100644 --- a/src/common/low_precision_transformations/tests/fake_quantize_with_dynamic_intervals_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fake_quantize_with_dynamic_intervals_transformation.cpp @@ -12,7 +12,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" using namespace testing; diff --git a/src/common/low_precision_transformations/tests/fold_convert_transformation.cpp b/src/common/low_precision_transformations/tests/fold_convert_transformation.cpp index 1325327919b..fc81f373de6 100644 --- a/src/common/low_precision_transformations/tests/fold_convert_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fold_convert_transformation.cpp @@ -14,7 +14,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include diff --git a/src/common/low_precision_transformations/tests/fold_fake_quantize_in_transformations.cpp b/src/common/low_precision_transformations/tests/fold_fake_quantize_in_transformations.cpp index f7944717e64..25d167cdc1e 100644 --- a/src/common/low_precision_transformations/tests/fold_fake_quantize_in_transformations.cpp +++ b/src/common/low_precision_transformations/tests/fold_fake_quantize_in_transformations.cpp @@ -10,7 +10,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "low_precision/network_helper.hpp" #include "lpt_ngraph_functions/common/builders.hpp" diff --git a/src/common/low_precision_transformations/tests/fuse_convert_transformation.cpp b/src/common/low_precision_transformations/tests/fuse_convert_transformation.cpp index 48e0fba7fcb..ab6b269cfd7 100644 --- a/src/common/low_precision_transformations/tests/fuse_convert_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fuse_convert_transformation.cpp @@ -13,7 +13,7 @@ #include #include "low_precision/fuse_convert.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/fuse_convert_function.hpp" diff --git a/src/common/low_precision_transformations/tests/fuse_dequantize_to_fake_quantize_transformation.cpp b/src/common/low_precision_transformations/tests/fuse_dequantize_to_fake_quantize_transformation.cpp index 5ed1333b1c4..bdfcb3520d2 100644 --- a/src/common/low_precision_transformations/tests/fuse_dequantize_to_fake_quantize_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fuse_dequantize_to_fake_quantize_transformation.cpp @@ -12,7 +12,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/add.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/fuse_fake_quantize_with_multi_inputs_transformation.cpp b/src/common/low_precision_transformations/tests/fuse_fake_quantize_with_multi_inputs_transformation.cpp index d9a345caef2..f9ad0b51bb8 100644 --- a/src/common/low_precision_transformations/tests/fuse_fake_quantize_with_multi_inputs_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fuse_fake_quantize_with_multi_inputs_transformation.cpp @@ -16,7 +16,7 @@ #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/fuse_fake_quantize_function.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/fuse_multiply_to_fake_quantize_transformation.cpp b/src/common/low_precision_transformations/tests/fuse_multiply_to_fake_quantize_transformation.cpp index e61b5affe44..413eda9c844 100644 --- a/src/common/low_precision_transformations/tests/fuse_multiply_to_fake_quantize_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fuse_multiply_to_fake_quantize_transformation.cpp @@ -13,7 +13,7 @@ #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/fuse_multiply_to_fake_quantize_function.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/fuse_subtract_to_fake_quantize_transformation.cpp b/src/common/low_precision_transformations/tests/fuse_subtract_to_fake_quantize_transformation.cpp index 85982344652..9023f78d12c 100644 --- a/src/common/low_precision_transformations/tests/fuse_subtract_to_fake_quantize_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fuse_subtract_to_fake_quantize_transformation.cpp @@ -13,7 +13,7 @@ #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/fuse_subtract_to_fake_quantize_function.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/gather_transformation.cpp b/src/common/low_precision_transformations/tests/gather_transformation.cpp index 090c63c01c1..d3355eec623 100644 --- a/src/common/low_precision_transformations/tests/gather_transformation.cpp +++ b/src/common/low_precision_transformations/tests/gather_transformation.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/gather_function.hpp" diff --git a/src/common/low_precision_transformations/tests/get_dequantization_below_transformation.cpp b/src/common/low_precision_transformations/tests/get_dequantization_below_transformation.cpp index a6609828a20..c02a3bea236 100644 --- a/src/common/low_precision_transformations/tests/get_dequantization_below_transformation.cpp +++ b/src/common/low_precision_transformations/tests/get_dequantization_below_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/get_dequantization_function.hpp" #include #include "low_precision/network_helper.hpp" diff --git a/src/common/low_precision_transformations/tests/get_dequantization_test.cpp b/src/common/low_precision_transformations/tests/get_dequantization_test.cpp index 5c0f1ada86f..8853e484f90 100644 --- a/src/common/low_precision_transformations/tests/get_dequantization_test.cpp +++ b/src/common/low_precision_transformations/tests/get_dequantization_test.cpp @@ -8,7 +8,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "low_precision/network_helper.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/get_dequantization_transformation.cpp b/src/common/low_precision_transformations/tests/get_dequantization_transformation.cpp index f7218df1117..5e37ae95084 100644 --- a/src/common/low_precision_transformations/tests/get_dequantization_transformation.cpp +++ b/src/common/low_precision_transformations/tests/get_dequantization_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/get_dequantization_function.hpp" #include #include "low_precision/network_helper.hpp" diff --git a/src/common/low_precision_transformations/tests/group_convolution_transformation.cpp b/src/common/low_precision_transformations/tests/group_convolution_transformation.cpp index 3c9ef0d3b6d..d9539ade735 100644 --- a/src/common/low_precision_transformations/tests/group_convolution_transformation.cpp +++ b/src/common/low_precision_transformations/tests/group_convolution_transformation.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_weights.hpp" diff --git a/src/common/low_precision_transformations/tests/interpolate_transformation.cpp b/src/common/low_precision_transformations/tests/interpolate_transformation.cpp index bd549376e7c..3083151609c 100644 --- a/src/common/low_precision_transformations/tests/interpolate_transformation.cpp +++ b/src/common/low_precision_transformations/tests/interpolate_transformation.cpp @@ -15,7 +15,7 @@ #include #include "low_precision/interpolate.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/interpolate_function.hpp" diff --git a/src/common/low_precision_transformations/tests/lpt_avoid_shapeof_propagation_test.cpp b/src/common/low_precision_transformations/tests/lpt_avoid_shapeof_propagation_test.cpp index bab6871d377..f90ab8c4844 100644 --- a/src/common/low_precision_transformations/tests/lpt_avoid_shapeof_propagation_test.cpp +++ b/src/common/low_precision_transformations/tests/lpt_avoid_shapeof_propagation_test.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "low_precision/add.hpp" #include "low_precision/avg_pool.hpp" #include "low_precision/clamp.hpp" diff --git a/src/common/low_precision_transformations/tests/lpt_public_methods_test.cpp b/src/common/low_precision_transformations/tests/lpt_public_methods_test.cpp index cb57d77524c..3b6716c5452 100644 --- a/src/common/low_precision_transformations/tests/lpt_public_methods_test.cpp +++ b/src/common/low_precision_transformations/tests/lpt_public_methods_test.cpp @@ -10,7 +10,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/low_precision_transformations/tests/mark_dequantization_subgraph_transformation.cpp b/src/common/low_precision_transformations/tests/mark_dequantization_subgraph_transformation.cpp index c0bb3d43d6e..b30ebe7c1d1 100644 --- a/src/common/low_precision_transformations/tests/mark_dequantization_subgraph_transformation.cpp +++ b/src/common/low_precision_transformations/tests/mark_dequantization_subgraph_transformation.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace ov; diff --git a/src/common/low_precision_transformations/tests/markup_bias_transformation.cpp b/src/common/low_precision_transformations/tests/markup_bias_transformation.cpp index baefc9d3bc8..510bd06af4b 100644 --- a/src/common/low_precision_transformations/tests/markup_bias_transformation.cpp +++ b/src/common/low_precision_transformations/tests/markup_bias_transformation.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/markup_bias_function.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/mat_mul_transformation.cpp b/src/common/low_precision_transformations/tests/mat_mul_transformation.cpp index 928a7b31ef5..10880b1b67e 100644 --- a/src/common/low_precision_transformations/tests/mat_mul_transformation.cpp +++ b/src/common/low_precision_transformations/tests/mat_mul_transformation.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/mat_mul_function.hpp" diff --git a/src/common/low_precision_transformations/tests/mat_mul_with_constant_transformation.cpp b/src/common/low_precision_transformations/tests/mat_mul_with_constant_transformation.cpp index a9663fbc0ea..ff32c5a75ce 100644 --- a/src/common/low_precision_transformations/tests/mat_mul_with_constant_transformation.cpp +++ b/src/common/low_precision_transformations/tests/mat_mul_with_constant_transformation.cpp @@ -10,7 +10,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/constant.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/max_pool_transformation.cpp b/src/common/low_precision_transformations/tests/max_pool_transformation.cpp index 66a04b1fbe8..1a4c1d9c040 100644 --- a/src/common/low_precision_transformations/tests/max_pool_transformation.cpp +++ b/src/common/low_precision_transformations/tests/max_pool_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/max_pool_function.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/move_dequantization_after_transformation.cpp b/src/common/low_precision_transformations/tests/move_dequantization_after_transformation.cpp index 05ae2e872df..489972b884a 100644 --- a/src/common/low_precision_transformations/tests/move_dequantization_after_transformation.cpp +++ b/src/common/low_precision_transformations/tests/move_dequantization_after_transformation.cpp @@ -15,7 +15,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/move_dequantization_after_function.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/move_fake_quantize_transformation.cpp b/src/common/low_precision_transformations/tests/move_fake_quantize_transformation.cpp index 0d3253cf825..4439a99e2b3 100644 --- a/src/common/low_precision_transformations/tests/move_fake_quantize_transformation.cpp +++ b/src/common/low_precision_transformations/tests/move_fake_quantize_transformation.cpp @@ -15,7 +15,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "low_precision/move_fake_quantize.hpp" #include "lpt_ngraph_functions/common/builders.hpp" diff --git a/src/common/low_precision_transformations/tests/multiply_to_group_convolution_transformation.cpp b/src/common/low_precision_transformations/tests/multiply_to_group_convolution_transformation.cpp index 38ad990be6a..ae13c2d0c6e 100644 --- a/src/common/low_precision_transformations/tests/multiply_to_group_convolution_transformation.cpp +++ b/src/common/low_precision_transformations/tests/multiply_to_group_convolution_transformation.cpp @@ -14,7 +14,7 @@ #include #include "low_precision/multiply_to_group_convolution.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/multiply_to_group_convolution_function.hpp" diff --git a/src/common/low_precision_transformations/tests/multiply_transformation.cpp b/src/common/low_precision_transformations/tests/multiply_transformation.cpp index 4e14c014628..31544759323 100644 --- a/src/common/low_precision_transformations/tests/multiply_transformation.cpp +++ b/src/common/low_precision_transformations/tests/multiply_transformation.cpp @@ -16,7 +16,7 @@ #include "low_precision/multiply.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/multiply_function.hpp" diff --git a/src/common/low_precision_transformations/tests/mvn_transformation.cpp b/src/common/low_precision_transformations/tests/mvn_transformation.cpp index 4bc4523ce8d..52efb24903c 100644 --- a/src/common/low_precision_transformations/tests/mvn_transformation.cpp +++ b/src/common/low_precision_transformations/tests/mvn_transformation.cpp @@ -14,7 +14,7 @@ #include #include "low_precision/mvn.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/mvn_function.hpp" diff --git a/src/common/low_precision_transformations/tests/normalize_dequantization_transformation.cpp b/src/common/low_precision_transformations/tests/normalize_dequantization_transformation.cpp index a8c22306e93..a6d919cf1e0 100644 --- a/src/common/low_precision_transformations/tests/normalize_dequantization_transformation.cpp +++ b/src/common/low_precision_transformations/tests/normalize_dequantization_transformation.cpp @@ -14,7 +14,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/normalize_dequantization_function.hpp" diff --git a/src/common/low_precision_transformations/tests/normalize_l2_transformation.cpp b/src/common/low_precision_transformations/tests/normalize_l2_transformation.cpp index a30add0387f..23e4816aafa 100644 --- a/src/common/low_precision_transformations/tests/normalize_l2_transformation.cpp +++ b/src/common/low_precision_transformations/tests/normalize_l2_transformation.cpp @@ -14,7 +14,7 @@ #include "simple_low_precision_transformer.hpp" #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/normalize_l2_function.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/pad_transformation.cpp b/src/common/low_precision_transformations/tests/pad_transformation.cpp index 4fc95a3b8be..786724c2ca7 100644 --- a/src/common/low_precision_transformations/tests/pad_transformation.cpp +++ b/src/common/low_precision_transformations/tests/pad_transformation.cpp @@ -11,7 +11,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/pad_function.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/prelu_transformation.cpp b/src/common/low_precision_transformations/tests/prelu_transformation.cpp index bbcb6dbe361..a645704a070 100644 --- a/src/common/low_precision_transformations/tests/prelu_transformation.cpp +++ b/src/common/low_precision_transformations/tests/prelu_transformation.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/prelu_function.hpp" diff --git a/src/common/low_precision_transformations/tests/pull_reshape_through_dequantization_transformation.cpp b/src/common/low_precision_transformations/tests/pull_reshape_through_dequantization_transformation.cpp index 87e898eea29..9f43ae1f9c4 100644 --- a/src/common/low_precision_transformations/tests/pull_reshape_through_dequantization_transformation.cpp +++ b/src/common/low_precision_transformations/tests/pull_reshape_through_dequantization_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/fake_quantize_and_convolution_function.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/pull_transpose_through_dequantization_transformation.cpp b/src/common/low_precision_transformations/tests/pull_transpose_through_dequantization_transformation.cpp index b83ee16a03f..b6d312f1361 100644 --- a/src/common/low_precision_transformations/tests/pull_transpose_through_dequantization_transformation.cpp +++ b/src/common/low_precision_transformations/tests/pull_transpose_through_dequantization_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/fake_quantize_and_convolution_function.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/quantization_granularity_restriction_test.cpp b/src/common/low_precision_transformations/tests/quantization_granularity_restriction_test.cpp index 5c30813ba1f..dd4c06fef92 100644 --- a/src/common/low_precision_transformations/tests/quantization_granularity_restriction_test.cpp +++ b/src/common/low_precision_transformations/tests/quantization_granularity_restriction_test.cpp @@ -14,7 +14,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/convolution_function.hpp" using namespace testing; diff --git a/src/common/low_precision_transformations/tests/recurrent_cell_transformation.cpp b/src/common/low_precision_transformations/tests/recurrent_cell_transformation.cpp index 148c09830f8..7303e9734f2 100644 --- a/src/common/low_precision_transformations/tests/recurrent_cell_transformation.cpp +++ b/src/common/low_precision_transformations/tests/recurrent_cell_transformation.cpp @@ -17,7 +17,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/builders.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" diff --git a/src/common/low_precision_transformations/tests/reduce_max_transformation.cpp b/src/common/low_precision_transformations/tests/reduce_max_transformation.cpp index 5f948bcd541..6f91d37e39f 100644 --- a/src/common/low_precision_transformations/tests/reduce_max_transformation.cpp +++ b/src/common/low_precision_transformations/tests/reduce_max_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include diff --git a/src/common/low_precision_transformations/tests/reduce_mean_transformation.cpp b/src/common/low_precision_transformations/tests/reduce_mean_transformation.cpp index 2d456ebc2fc..0742b44f450 100644 --- a/src/common/low_precision_transformations/tests/reduce_mean_transformation.cpp +++ b/src/common/low_precision_transformations/tests/reduce_mean_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include diff --git a/src/common/low_precision_transformations/tests/reduce_min_transformation.cpp b/src/common/low_precision_transformations/tests/reduce_min_transformation.cpp index 3a06267e632..90aa35868b7 100644 --- a/src/common/low_precision_transformations/tests/reduce_min_transformation.cpp +++ b/src/common/low_precision_transformations/tests/reduce_min_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include diff --git a/src/common/low_precision_transformations/tests/reduce_sum_transformation.cpp b/src/common/low_precision_transformations/tests/reduce_sum_transformation.cpp index 658d830ef8a..ecd9d23dbd6 100644 --- a/src/common/low_precision_transformations/tests/reduce_sum_transformation.cpp +++ b/src/common/low_precision_transformations/tests/reduce_sum_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include diff --git a/src/common/low_precision_transformations/tests/reduce_transformation.hpp b/src/common/low_precision_transformations/tests/reduce_transformation.hpp index 357184e2c4d..a7dfcb14f38 100644 --- a/src/common/low_precision_transformations/tests/reduce_transformation.hpp +++ b/src/common/low_precision_transformations/tests/reduce_transformation.hpp @@ -12,7 +12,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/reduce_function.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/relu_transformation.cpp b/src/common/low_precision_transformations/tests/relu_transformation.cpp index c35f7bd5ef8..a7cdf5a5564 100644 --- a/src/common/low_precision_transformations/tests/relu_transformation.cpp +++ b/src/common/low_precision_transformations/tests/relu_transformation.cpp @@ -14,7 +14,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/relu_function.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/reshape_transformation.cpp b/src/common/low_precision_transformations/tests/reshape_transformation.cpp index 199ccbcc330..e29e698b8d2 100644 --- a/src/common/low_precision_transformations/tests/reshape_transformation.cpp +++ b/src/common/low_precision_transformations/tests/reshape_transformation.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/reshape_function.hpp" diff --git a/src/common/low_precision_transformations/tests/round_transformation.cpp b/src/common/low_precision_transformations/tests/round_transformation.cpp index a4a8a397145..5385cd57fdb 100644 --- a/src/common/low_precision_transformations/tests/round_transformation.cpp +++ b/src/common/low_precision_transformations/tests/round_transformation.cpp @@ -7,7 +7,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "low_precision/network_helper.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/separate_in_standalone_branch_transformation.cpp b/src/common/low_precision_transformations/tests/separate_in_standalone_branch_transformation.cpp index 5c34d14c69a..38b40411c0b 100644 --- a/src/common/low_precision_transformations/tests/separate_in_standalone_branch_transformation.cpp +++ b/src/common/low_precision_transformations/tests/separate_in_standalone_branch_transformation.cpp @@ -14,7 +14,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/common/builders.hpp" #include "lpt_ngraph_functions/mat_mul_function.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/shuffle_channels_transformation.cpp b/src/common/low_precision_transformations/tests/shuffle_channels_transformation.cpp index 89e1bba51f8..21e02419036 100644 --- a/src/common/low_precision_transformations/tests/shuffle_channels_transformation.cpp +++ b/src/common/low_precision_transformations/tests/shuffle_channels_transformation.cpp @@ -12,7 +12,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/shuffle_channels_function.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/split_transformation.cpp b/src/common/low_precision_transformations/tests/split_transformation.cpp index 33cc7833381..716d6d02ce3 100644 --- a/src/common/low_precision_transformations/tests/split_transformation.cpp +++ b/src/common/low_precision_transformations/tests/split_transformation.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/split_function.hpp" diff --git a/src/common/low_precision_transformations/tests/squeeze_transformation.cpp b/src/common/low_precision_transformations/tests/squeeze_transformation.cpp index 4e532f3619c..d06639f0d6c 100644 --- a/src/common/low_precision_transformations/tests/squeeze_transformation.cpp +++ b/src/common/low_precision_transformations/tests/squeeze_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/squeeze_function.hpp" diff --git a/src/common/low_precision_transformations/tests/strided_slice_transformation.cpp b/src/common/low_precision_transformations/tests/strided_slice_transformation.cpp index 3e5a2e59a78..be0b5590297 100644 --- a/src/common/low_precision_transformations/tests/strided_slice_transformation.cpp +++ b/src/common/low_precision_transformations/tests/strided_slice_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "low_precision/strided_slice.hpp" diff --git a/src/common/low_precision_transformations/tests/subgraph/src/fq_decomposition_with_shared_constants.cpp b/src/common/low_precision_transformations/tests/subgraph/src/fq_decomposition_with_shared_constants.cpp index 858d41e87d7..2d550ad313e 100644 --- a/src/common/low_precision_transformations/tests/subgraph/src/fq_decomposition_with_shared_constants.cpp +++ b/src/common/low_precision_transformations/tests/subgraph/src/fq_decomposition_with_shared_constants.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/builders.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" diff --git a/src/common/low_precision_transformations/tests/transformations_after_split_transformation.cpp b/src/common/low_precision_transformations/tests/transformations_after_split_transformation.cpp index 71d1535ee78..d80dc63c745 100644 --- a/src/common/low_precision_transformations/tests/transformations_after_split_transformation.cpp +++ b/src/common/low_precision_transformations/tests/transformations_after_split_transformation.cpp @@ -40,7 +40,7 @@ #include "low_precision/multiply_to_group_convolution.hpp" #include "lpt_ngraph_functions/transformations_after_split_function.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" diff --git a/src/common/low_precision_transformations/tests/transformer_is_function_quantized.cpp b/src/common/low_precision_transformations/tests/transformer_is_function_quantized.cpp index 6692bb0ef26..f5cbdd4225f 100644 --- a/src/common/low_precision_transformations/tests/transformer_is_function_quantized.cpp +++ b/src/common/low_precision_transformations/tests/transformer_is_function_quantized.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_weights.hpp" #include "lpt_ngraph_functions/convolution_function.hpp" diff --git a/src/common/low_precision_transformations/tests/transpose_transformation.cpp b/src/common/low_precision_transformations/tests/transpose_transformation.cpp index a5d985b1cca..f88971bebae 100644 --- a/src/common/low_precision_transformations/tests/transpose_transformation.cpp +++ b/src/common/low_precision_transformations/tests/transpose_transformation.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/transpose_function.hpp" diff --git a/src/common/low_precision_transformations/tests/unsqueeze_transformation.cpp b/src/common/low_precision_transformations/tests/unsqueeze_transformation.cpp index dd55e796448..d4525c3c6fe 100644 --- a/src/common/low_precision_transformations/tests/unsqueeze_transformation.cpp +++ b/src/common/low_precision_transformations/tests/unsqueeze_transformation.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "simple_low_precision_transformer.hpp" #include "lpt_ngraph_functions/unsqueeze_function.hpp" diff --git a/src/common/low_precision_transformations/tests/variadic_split_transformation.cpp b/src/common/low_precision_transformations/tests/variadic_split_transformation.cpp index 863e954efa1..f091f451109 100644 --- a/src/common/low_precision_transformations/tests/variadic_split_transformation.cpp +++ b/src/common/low_precision_transformations/tests/variadic_split_transformation.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "layer_transformation.hpp" #include "lpt_ngraph_functions/common/dequantization_operations.hpp" #include "lpt_ngraph_functions/variadic_split_function.hpp" diff --git a/src/common/offline_transformations/include/compress_quantize_weights.hpp b/src/common/offline_transformations/include/compress_quantize_weights.hpp index 7b74677e7c8..62119cd907c 100644 --- a/src/common/offline_transformations/include/compress_quantize_weights.hpp +++ b/src/common/offline_transformations/include/compress_quantize_weights.hpp @@ -4,16 +4,16 @@ #pragma once -#include +#include "openvino/pass/graph_rewrite.hpp" -namespace ngraph { +namespace ov { namespace pass { class CompressQuantizeWeights; class ZeroPointOptimizer; } // namespace pass -} // namespace ngraph +} // namespace ov /* CompressQuantizeWeights transformation goal is to pre-quantize data to minimize runtime calculations with constant @@ -58,7 +58,7 @@ class ZeroPointOptimizer; Such constant data packing reduces IR size (.bin file size) in offline transformations. With that we can skip same calculations in the runtime and make loading of such sub-graphs to the plugin faster. */ -class ngraph::pass::CompressQuantizeWeights : public ngraph::pass::MatcherPass { +class ov::pass::CompressQuantizeWeights : public ov::pass::MatcherPass { public: OPENVINO_RTTI("CompressQuantizeWeights", "0"); CompressQuantizeWeights(); @@ -85,7 +85,7 @@ public: | v */ -class ngraph::pass::ZeroPointOptimizer : public ngraph::pass::MatcherPass { +class ov::pass::ZeroPointOptimizer : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ZeroPointOptimizer"); ZeroPointOptimizer(); diff --git a/src/common/offline_transformations/include/mask_attribute.hpp b/src/common/offline_transformations/include/mask_attribute.hpp index 18ee0cf29e9..293cf401245 100644 --- a/src/common/offline_transformations/include/mask_attribute.hpp +++ b/src/common/offline_transformations/include/mask_attribute.hpp @@ -13,11 +13,10 @@ #include #include -#include -#include #include #include +#include "openvino/core/node.hpp" #include "openvino/util/log.hpp" namespace ov { @@ -38,7 +37,7 @@ public: Mask() = default; - explicit Mask(const ngraph::PartialShape& shape) : std::vector(shape.rank().get_length()) {} + explicit Mask(const ov::PartialShape& shape) : std::vector(shape.rank().get_length()) {} explicit Mask(const size_t& size) : std::vector(size) {} @@ -183,7 +182,7 @@ public: } /* - Function copies values from mask, + ov::Model copies values from mask, except mask[axis], where it selects values from mask[axis] set that are within [split_start, split_end) range param: mask - input mask. diff --git a/src/common/offline_transformations/include/pot_transformations.hpp b/src/common/offline_transformations/include/pot_transformations.hpp index 5da9f9ca10a..ab8b5b69b9b 100644 --- a/src/common/offline_transformations/include/pot_transformations.hpp +++ b/src/common/offline_transformations/include/pot_transformations.hpp @@ -5,28 +5,29 @@ #pragma once #include -#include #include -namespace ngraph { +#include "openvino/pass/graph_rewrite.hpp" + +namespace ov { namespace pass { class POTTransformations; } // namespace pass -} // namespace ngraph +} // namespace ov /** - * @brief This transformation is an entry point for nGraph transformations that will be + * @brief This transformation is an entry point for OpenVINO transformations that will be * executed inside POT. */ -class ngraph::pass::POTTransformations : public ngraph::pass::FunctionPass { +class ov::pass::POTTransformations : public ov::pass::ModelPass { std::string m_device; public: OPENVINO_RTTI("POTTransformations", "0"); explicit POTTransformations(std::string device) : m_device(std::move(device)) {} - bool run_on_model(const std::shared_ptr&) override; + bool run_on_model(const std::shared_ptr&) override; }; diff --git a/src/common/offline_transformations/include/pruning.hpp b/src/common/offline_transformations/include/pruning.hpp index 873c16ac528..a2ced8aaf6a 100644 --- a/src/common/offline_transformations/include/pruning.hpp +++ b/src/common/offline_transformations/include/pruning.hpp @@ -5,11 +5,12 @@ #pragma once #include -#include -#include #include -namespace ngraph { +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/manager.hpp" + +namespace ov { namespace pass { class InitConstMask; @@ -20,13 +21,13 @@ class ShrinkWeights; class Pruning; } // namespace pass -} // namespace ngraph +} // namespace ov /** * @ingroup ie_transformation_common_api * @brief Initialising masks for pruned operations */ -class ngraph::pass::InitMasks : public ngraph::pass::GraphRewrite { +class ov::pass::InitMasks : public ov::pass::GraphRewrite { public: OPENVINO_RTTI("InitMasks", "0"); InitMasks(); @@ -38,11 +39,11 @@ public: * masks according to results that are bases on `condition` lambda function. * Works for Constant with floating point type (f16, f32, f64). */ -class ngraph::pass::InitConstMask : public ngraph::pass::MatcherPass { +class ov::pass::InitConstMask : public ov::pass::MatcherPass { public: OPENVINO_RTTI("InitConstMask", "0"); explicit InitConstMask( - const ngraph::AxisSet& dims, + const ov::AxisSet& dims, const std::function& condition = [](const double& value) { return value == 0; }); @@ -53,7 +54,7 @@ public: * @brief Contains several MatcherPasses that initialize and propagate * masks from Constant operation to the network output. */ -class ngraph::pass::PropagateMasks : public ngraph::pass::GraphRewrite { +class ov::pass::PropagateMasks : public ov::pass::GraphRewrite { public: OPENVINO_RTTI("PropagateMasks", "0"); PropagateMasks(); @@ -64,18 +65,18 @@ public: * @brief Based on masks in Constant operation it inserts Gather operations * to shrink them. After this pass execution ConstantFolding is required. */ -class ngraph::pass::ShrinkWeights : public ngraph::pass::FunctionPass { +class ov::pass::ShrinkWeights : public ov::pass::ModelPass { public: OPENVINO_RTTI("ShrinkWeights", "0"); - bool run_on_model(const std::shared_ptr&) override; + bool run_on_model(const std::shared_ptr&) override; }; /** * @ingroup ie_transformation_common_api * @brief This is just a sequence of passes that performs pruning transformations pipeline */ -class ngraph::pass::Pruning : public ngraph::pass::FunctionPass { +class ov::pass::Pruning : public ov::pass::ModelPass { public: OPENVINO_RTTI("Pruning", "0"); - bool run_on_model(const std::shared_ptr&) override; + bool run_on_model(const std::shared_ptr&) override; }; diff --git a/src/common/offline_transformations/src/compress_quantize_weigths.cpp b/src/common/offline_transformations/src/compress_quantize_weigths.cpp index 8c0faa85a84..f8ff0d9d9f8 100644 --- a/src/common/offline_transformations/src/compress_quantize_weigths.cpp +++ b/src/common/offline_transformations/src/compress_quantize_weigths.cpp @@ -2,42 +2,42 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include -#include -#include +#include "compress_quantize_weights.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/rt_info/decompression.hpp" -static bool has_dequantization_subgraph(const std::shared_ptr& first_convert) { +static bool has_dequantization_subgraph(const std::shared_ptr& first_convert) { auto first_convert_users = first_convert->get_users(); const auto second_convert = std::find_if(first_convert_users.begin(), first_convert_users.end(), - [](const std::shared_ptr& n) -> bool { - return ov::is_type(n); + [](const std::shared_ptr& n) -> bool { + return ov::is_type(n); }); if (second_convert == first_convert_users.end()) return false; auto convert_or_subtract_users = (*second_convert)->get_users(); const auto subtract = std::find_if(convert_or_subtract_users.begin(), convert_or_subtract_users.end(), - [](const std::shared_ptr& n) -> bool { - return ov::is_type(n); + [](const std::shared_ptr& n) -> bool { + return ov::is_type(n); }); if (subtract != convert_or_subtract_users.end()) { convert_or_subtract_users = (*subtract)->get_users(); } const auto multiply = std::find_if(convert_or_subtract_users.begin(), convert_or_subtract_users.end(), - [](const std::shared_ptr& n) -> bool { - return ov::is_type(n); + [](const std::shared_ptr& n) -> bool { + return ov::is_type(n); }); return multiply != convert_or_subtract_users.end(); } -ngraph::pass::CompressQuantizeWeights::CompressQuantizeWeights() { +ov::pass::CompressQuantizeWeights::CompressQuantizeWeights() { auto weights_const_pattern = pattern::wrap_type(); auto weigths_convert_pattern = pattern::wrap_type({weights_const_pattern}); OutputVector weights_options{weights_const_pattern, weigths_convert_pattern}; @@ -49,7 +49,7 @@ ngraph::pass::CompressQuantizeWeights::CompressQuantizeWeights() { auto fq_pattern = pattern::wrap_type( {weights_pattern, input_low_pattern, input_high_pattern, output_low_pattern, output_high_pattern}); - ngraph::matcher_pass_callback callback = [=](pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { auto fq = std::dynamic_pointer_cast(m.get_match_root()); if (!fq) return false; @@ -84,7 +84,7 @@ ngraph::pass::CompressQuantizeWeights::CompressQuantizeWeights() { copy_runtime_info(first_convert, new_weights); // preserve dequantization subgraph for LP transformations auto weights_users = new_weights->get_users(); - if (weights_users.size() == 1 && ov::is_type(weights_users[0])) { + if (weights_users.size() == 1 && ov::is_type(weights_users[0])) { ov::pass::disable_constant_folding(weights_users[0]); } return true; @@ -105,9 +105,10 @@ ngraph::pass::CompressQuantizeWeights::CompressQuantizeWeights() { The FakeQuantize result is converted to low precision type and then constant folded */ std::shared_ptr new_output_low = - op::Constant::create(input_type, Shape{}, {-static_cast(levels / 2)}); + op::v0::Constant::create(input_type, Shape{}, {-static_cast(levels / 2)}); std::shared_ptr new_output_high = - std::make_shared(new_output_low, op::Constant::create(input_type, Shape{}, {levels - 1})); + std::make_shared(new_output_low, + op::v0::Constant::create(input_type, Shape{}, {levels - 1})); const auto& weights_const = pattern_value_map.at(weights_const_pattern); Output input_low = pattern_value_map.at(input_low_pattern); Output input_high = pattern_value_map.at(input_high_pattern); @@ -174,7 +175,7 @@ ngraph::pass::CompressQuantizeWeights::CompressQuantizeWeights() { OPENVINO_SUPPRESS_DEPRECATED_END scale = constant; } - auto zero = op::Constant::create(scale->get_output_element_type(0), Shape{}, {0}); + auto zero = op::v0::Constant::create(scale->get_output_element_type(0), Shape{}, {0}); auto scale_eq_zero = std::make_shared(scale, zero); // shift equals to input_low - output_low / scale // for positions where scale == 0, we put zero as shift @@ -206,17 +207,17 @@ ngraph::pass::CompressQuantizeWeights::CompressQuantizeWeights() { return true; }; - auto m = std::make_shared(fq_pattern, "CompressQuantizeWeights"); + auto m = std::make_shared(fq_pattern, "CompressQuantizeWeights"); this->register_matcher(m, callback); } -ngraph::pass::ZeroPointOptimizer::ZeroPointOptimizer() { +ov::pass::ZeroPointOptimizer::ZeroPointOptimizer() { auto weights_pattern = pattern::wrap_type(); auto zero_point_pattern = pattern::wrap_type(); auto convert_pattern = pattern::wrap_type({weights_pattern}); auto sub_pattern = pattern::wrap_type({convert_pattern, zero_point_pattern}); - ngraph::matcher_pass_callback callback = [=](pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_value_map = m.get_pattern_value_map(); auto convert = pattern_value_map.at(convert_pattern).get_node_shared_ptr(); auto sub = pattern_value_map.at(sub_pattern).get_node_shared_ptr(); @@ -290,6 +291,6 @@ ngraph::pass::ZeroPointOptimizer::ZeroPointOptimizer() { return true; }; - auto m = std::make_shared(sub_pattern, "ZeroPointOptimizer"); + auto m = std::make_shared(sub_pattern, "ZeroPointOptimizer"); this->register_matcher(m, callback); } diff --git a/src/common/offline_transformations/src/pot_transformations.cpp b/src/common/offline_transformations/src/pot_transformations.cpp index c08a53ebd4d..a8ad061a96c 100644 --- a/src/common/offline_transformations/src/pot_transformations.cpp +++ b/src/common/offline_transformations/src/pot_transformations.cpp @@ -5,14 +5,15 @@ #include "pot_transformations.hpp" #include -#include -#include -#include -#include -#include -bool ngraph::pass::POTTransformations::run_on_model(const std::shared_ptr& f) { - ngraph::pass::Manager manager(get_pass_config()); +#include "openvino/pass/manager.hpp" +#include "transformations/op_conversions/bidirectional_sequences_decomposition.hpp" +#include "transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp" +#include "transformations/op_conversions/gru_cell_decomposition.hpp" +#include "transformations/op_conversions/lstm_cell_decomposition.hpp" + +bool ov::pass::POTTransformations::run_on_model(const std::shared_ptr& f) { + ov::pass::Manager manager(get_pass_config()); manager.register_pass(); manager.register_pass(); manager.register_pass(); diff --git a/src/common/offline_transformations/src/pruning/init_const_mask.cpp b/src/common/offline_transformations/src/pruning/init_const_mask.cpp index 6a7187312f5..fcf9255a800 100644 --- a/src/common/offline_transformations/src/pruning/init_const_mask.cpp +++ b/src/common/offline_transformations/src/pruning/init_const_mask.cpp @@ -3,16 +3,16 @@ // #include -#include -#include -#include -#include #include "mask_attribute.hpp" +#include "ngraph/coordinate_transform.hpp" +#include "openvino/op/log.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "pruning.hpp" -ngraph::pass::InitConstMask::InitConstMask(const ngraph::AxisSet& dims, - const std::function& condition) { +ov::pass::InitConstMask::InitConstMask(const ov::AxisSet& dims, + const std::function& condition) { auto constant = pattern::wrap_type( pattern::type_matches_any({element::i8, element::u8, element::f16, element::f32, element::f64})); @@ -28,7 +28,7 @@ ngraph::pass::InitConstMask::InitConstMask(const ngraph::AxisSet& dims, for (const auto& dim : dims) { if (dim >= shape.size()) { - OPENVINO_DEBUG << "[WARNING] Attemt to initialize masks on " << dim + OPENVINO_DEBUG << "[WARNING] Attempt to initialize masks on " << dim << " dimension which is out of shape " << shape << " for node (" << const_node->get_friendly_name() << ")"; continue; @@ -42,15 +42,15 @@ ngraph::pass::InitConstMask::InitConstMask(const ngraph::AxisSet& dims, end[dim] = value + 1; bool skip_dim_value = false; - NGRAPH_SUPPRESS_DEPRECATED_START - CoordinateTransform iter(shape, begin, end); + OPENVINO_SUPPRESS_DEPRECATED_START + ngraph::CoordinateTransform iter(shape, begin, end); for (const Coordinate& coord : iter) { if (!condition(values.at(iter.index(coord)))) { skip_dim_value = true; break; } } - NGRAPH_SUPPRESS_DEPRECATED_END + OPENVINO_SUPPRESS_DEPRECATED_END if (!skip_dim_value) { mask->at(dim).insert(value); } diff --git a/src/common/offline_transformations/src/pruning/init_masks.cpp b/src/common/offline_transformations/src/pruning/init_masks.cpp index c2fa9b2262f..10b4bce709f 100644 --- a/src/common/offline_transformations/src/pruning/init_masks.cpp +++ b/src/common/offline_transformations/src/pruning/init_masks.cpp @@ -2,15 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include - #include "mask_attribute.hpp" +#include "openvino/core/validation_util.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "openvino/util/log.hpp" #include "pruning.hpp" -namespace ngraph { +namespace ov { namespace pass { namespace init_masks { @@ -19,16 +18,16 @@ class InitMatMulMask; } // namespace init_masks } // namespace pass -} // namespace ngraph +} // namespace ov -class ngraph::pass::init_masks::InitConvMask : public MatcherPass { +class ov::pass::init_masks::InitConvMask : public MatcherPass { public: InitConvMask() { auto input = pattern::any_input(); auto weights = pattern::any_input(); auto conv = pattern::wrap_type({input, weights}); - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto& m_output = pattern_map.at(conv); @@ -37,11 +36,11 @@ public: NodeVector weights_calculation_nodes; auto cur_node = m_output.get_node()->get_input_node_shared_ptr(1); - while (!ngraph::is_type(cur_node) && cur_node->inputs().size()) { + while (!ov::is_type(cur_node) && cur_node->inputs().size()) { weights_calculation_nodes.push_back(cur_node); cur_node = cur_node->get_input_node_shared_ptr(0); } - if (!ngraph::is_type(cur_node)) { + if (!ov::is_type(cur_node)) { OPENVINO_DEBUG << "Can't find Constant weights for Convolution: " << m_output.get_node()->get_friendly_name() << std::endl; return false; @@ -52,19 +51,19 @@ public: return true; }; - auto m = std::make_shared(conv, "ConvolutionInitMask"); + auto m = std::make_shared(conv, "ConvolutionInitMask"); register_matcher(m, callback); } }; -class ngraph::pass::init_masks::InitMatMulMask : public MatcherPass { +class ov::pass::init_masks::InitMatMulMask : public MatcherPass { public: InitMatMulMask() { auto a = pattern::any_input(); auto b = pattern::any_input(); auto matmul_pattern = pattern::wrap_type({a, b}); - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto& matmul = std::dynamic_pointer_cast(pattern_map.at(matmul_pattern).get_node_shared_ptr()); @@ -83,9 +82,9 @@ public: auto dim_order = std::vector(input_size); std::iota(dim_order.begin(), dim_order.end(), 0); - while (!ngraph::is_type(cur_node) && cur_node->inputs().size()) { + while (!ov::is_type(cur_node) && cur_node->inputs().size()) { weights_calculation_nodes.push_back(cur_node); - if (ngraph::is_type(cur_node)) { + if (ov::is_type(cur_node)) { OPENVINO_SUPPRESS_DEPRECATED_START const auto forward_order = get_constant_from_source(cur_node->get_input_node_shared_ptr(1)); OPENVINO_SUPPRESS_DEPRECATED_END @@ -100,7 +99,7 @@ public: } dim_order = new_order; } else { - if (ngraph::is_type(cur_node) || ngraph::is_type(cur_node)) { + if (ov::is_type(cur_node) || ov::is_type(cur_node)) { OPENVINO_DEBUG << "Can't init mask for MatMul: " << matmul->get_friendly_name() << " because of node " << cur_node->get_friendly_name() << " in the way from weights to Matmul" << std::endl; @@ -109,7 +108,7 @@ public: } cur_node = cur_node->get_input_node_shared_ptr(0); } - if (!ngraph::is_type(cur_node)) { + if (!ov::is_type(cur_node)) { OPENVINO_DEBUG << "Can't find Constant weights for MatMul: " << matmul->get_friendly_name() << std::endl; return false; @@ -129,12 +128,12 @@ public: return true; }; - auto m = std::make_shared(matmul_pattern, "MatMulInitMask"); + auto m = std::make_shared(matmul_pattern, "MatMulInitMask"); register_matcher(m, callback); } }; -ngraph::pass::InitMasks::InitMasks() { +ov::pass::InitMasks::InitMasks() { add_matcher(); add_matcher(); } diff --git a/src/common/offline_transformations/src/pruning/mask_attribute.cpp b/src/common/offline_transformations/src/pruning/mask_attribute.cpp index 3089ea07f18..0067a2b710c 100644 --- a/src/common/offline_transformations/src/pruning/mask_attribute.cpp +++ b/src/common/offline_transformations/src/pruning/mask_attribute.cpp @@ -5,9 +5,10 @@ #include "mask_attribute.hpp" #include -#include #include +#include "openvino/core/node.hpp" + namespace ov { Mask::Ptr getMask(const Output& output) { diff --git a/src/common/offline_transformations/src/pruning/propagate_masks.cpp b/src/common/offline_transformations/src/pruning/propagate_masks.cpp index ebc82d00d2d..3a820fd192a 100644 --- a/src/common/offline_transformations/src/pruning/propagate_masks.cpp +++ b/src/common/offline_transformations/src/pruning/propagate_masks.cpp @@ -5,23 +5,22 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "mask_attribute.hpp" +#include "ngraph/coordinate_transform.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" +#include "openvino/op/gelu.hpp" +#include "openvino/op/max_pool.hpp" +#include "openvino/op/shape_of.hpp" +#include "openvino/op/softmax.hpp" +#include "openvino/op/util/pad_base.hpp" +#include "openvino/opsets/opset10.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "openvino/util/log.hpp" #include "pruning.hpp" -namespace ngraph { +namespace ov { namespace pass { namespace mask_propagation { @@ -41,7 +40,7 @@ class Concat; } // namespace mask_propagation } // namespace pass -} // namespace ngraph +} // namespace ov namespace ov { namespace pass { @@ -54,23 +53,23 @@ class Split; } // namespace pass } // namespace ov -static ngraph::Shape broadcast_shape_to_rank(ngraph::Shape shape_to_broadcast, int64_t dst_rank) { +static ov::Shape broadcast_shape_to_rank(ov::Shape shape_to_broadcast, int64_t dst_rank) { auto initial_rank = static_cast(shape_to_broadcast.size()); auto num_of_broadcased_dims = dst_rank - initial_rank; std::vector dims(num_of_broadcased_dims, 1); dims.insert(dims.end(), shape_to_broadcast.begin(), shape_to_broadcast.end()); - auto new_shape = ngraph::Shape(dims); + auto new_shape = ov::Shape(dims); return new_shape; } -class ngraph::pass::mask_propagation::MatMul : public MatcherPass { +class ov::pass::mask_propagation::MatMul : public MatcherPass { public: MatMul() { auto a = pattern::any_input(pattern::has_static_shape()); auto b = pattern::any_input(pattern::has_static_shape()); auto matmul = pattern::wrap_type({a, b}); - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto& m_a = pattern_map.at(a); const auto& m_b = pattern_map.at(b); @@ -194,19 +193,19 @@ public: return true; }; - auto m = std::make_shared(matmul, "MatMulMaskPropagation"); + auto m = std::make_shared(matmul, "MatMulMaskPropagation"); register_matcher(m, callback); } }; -class ngraph::pass::mask_propagation::Convolution : public MatcherPass { +class ov::pass::mask_propagation::Convolution : public MatcherPass { public: Convolution() { auto input = pattern::any_input(); auto weights = pattern::any_input(pattern::has_static_shape()); auto conv = pattern::wrap_type({input, weights}); - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto& m_weights = pattern_map.at(weights); const auto& m_output = pattern_map.at(conv); @@ -273,19 +272,19 @@ public: return true; }; - auto m = std::make_shared(conv, "ConvolutionMaskPropagation"); + auto m = std::make_shared(conv, "ConvolutionMaskPropagation"); register_matcher(m, callback); } }; -class ngraph::pass::mask_propagation::GroupConvolution : public MatcherPass { +class ov::pass::mask_propagation::GroupConvolution : public MatcherPass { public: GroupConvolution() { auto input = pattern::any_input(pattern::has_static_dim(1)); auto weights = pattern::any_input(pattern::has_static_shape()); auto group_conv = pattern::wrap_type({input, weights}); - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto& m_weights = pattern_map.at(weights); const auto& m_output = pattern_map.at(group_conv); @@ -307,7 +306,7 @@ public: auto weights_mask = getMask(m_weights); if (!weights_mask) { // Setting mask only if weights are constant - if (ngraph::is_type(m_output.get_node_shared_ptr())) { + if (ov::is_type(m_output.get_node_shared_ptr())) { weights_mask = std::make_shared(weights_shape.size()); setMask(m_weights, weights_mask); } else { @@ -358,12 +357,12 @@ public: return true; }; - auto m = std::make_shared(group_conv, "GroupConvolutionMaskPropagation"); + auto m = std::make_shared(group_conv, "GroupConvolutionMaskPropagation"); register_matcher(m, callback); } }; -class ngraph::pass::mask_propagation::GroupConvolutionReshape : public MatcherPass { +class ov::pass::mask_propagation::GroupConvolutionReshape : public MatcherPass { public: GroupConvolutionReshape() { auto input = pattern::any_input(pattern::has_static_shape()); @@ -373,7 +372,7 @@ public: auto gconv = pattern::wrap_type({pattern::any_input(), reshape}, pattern::has_static_shape()); - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto& m_shape = pattern_map.at(shape); const auto& m_output = pattern_map.at(reshape); @@ -450,12 +449,12 @@ public: return false; }; - auto m = std::make_shared(gconv, "GroupConvolutionReshapeMaskPropagation"); + auto m = std::make_shared(gconv, "GroupConvolutionReshapeMaskPropagation"); register_matcher(m, callback); } }; -class ngraph::pass::mask_propagation::Elementwise : public MatcherPass { +class ov::pass::mask_propagation::Elementwise : public MatcherPass { public: Elementwise() { auto input = pattern::any_input(); @@ -466,7 +465,7 @@ public: pattern::has_static_rank()); // TODO: add Div, Power support - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto& m_output = pattern_map.at(eltwise); // Inputs are taken in deterministic way @@ -486,7 +485,7 @@ public: return false; } // Case when input masks should be united instead of intersection - bool union_eltwise_type = ngraph::is_type(m_output.get_node_shared_ptr()); + bool union_eltwise_type = ov::is_type(m_output.get_node_shared_ptr()); using dims_set = std::set; auto input_shape_broadcasted_dims = dims_set(); @@ -625,25 +624,25 @@ public: return true; }; - auto m = std::make_shared(eltwise, "ElementwiseMaskPropagation"); + auto m = std::make_shared(eltwise, "ElementwiseMaskPropagation"); register_matcher(m, callback); } private: - static ngraph::AxisSet get_axis_set(const ov::Shape shape) { - ngraph::AxisSet ret_val; + static ov::AxisSet get_axis_set(const ov::Shape shape) { + ov::AxisSet ret_val; if (shape.size()) { - ret_val = ngraph::AxisSet(); + ret_val = ov::AxisSet(); for (size_t i = 0; i < shape.size(); ++i) ret_val.insert(i); } else { - ret_val = ngraph::AxisSet({0, 1, 2, 3}); + ret_val = ov::AxisSet({0, 1, 2, 3}); } return ret_val; } }; -class ngraph::pass::mask_propagation::FakeQuantize : public MatcherPass { +class ov::pass::mask_propagation::FakeQuantize : public MatcherPass { public: FakeQuantize() { auto input = pattern::any_input(pattern::has_static_shape()); @@ -653,7 +652,7 @@ public: auto output_high = pattern::any_input(pattern::has_static_shape()); auto fake_quantize = pattern::wrap_type({input, input_low, input_high, output_low, output_high}); - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto& m_input = pattern_map.at(input); const auto& m_input_low = pattern_map.at(input_low); @@ -714,17 +713,17 @@ public: if (!fq_node) return false; size_t idx = 0; - if (fq_node->get_auto_broadcast() != ngraph::op::AutoBroadcastType::NONE) { + if (fq_node->get_auto_broadcast() != ov::op::AutoBroadcastType::NONE) { for (const auto& node : fq_params_nodes) { - auto const_node = std::dynamic_pointer_cast(node); + auto const_node = std::dynamic_pointer_cast(node); if (!const_node) OPENVINO_THROW("Unexpected operation type."); auto new_shape = broadcast_shape_to_rank(const_node->get_shape(), m_input.get_partial_shape().rank().get_length()); - auto new_const = std::make_shared(*const_node, new_shape); + auto new_const = std::make_shared(*const_node, new_shape); new_const->set_friendly_name(const_node->get_friendly_name()); - ngraph::copy_runtime_info(const_node, new_const); - ngraph::replace_node(const_node, new_const); + ov::copy_runtime_info(const_node, new_const); + ov::replace_node(const_node, new_const); fq_params_nodes[idx++] = new_const; } } @@ -750,17 +749,17 @@ public: return true; }; - auto m = std::make_shared(fake_quantize, "FakeQuantizeMaskPropagation"); + auto m = std::make_shared(fake_quantize, "FakeQuantizeMaskPropagation"); register_matcher(m, callback); } }; -class ngraph::pass::mask_propagation::Concat : public MatcherPass { +class ov::pass::mask_propagation::Concat : public MatcherPass { public: Concat() { auto concat = pattern::wrap_type(pattern::has_static_shape()); - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto& m_output = pattern_map.at(concat); auto concat_ptr = std::dynamic_pointer_cast(m_output.get_node_shared_ptr()); @@ -852,12 +851,12 @@ public: return true; }; - auto m = std::make_shared(concat, "ConcatMaskPropagation"); + auto m = std::make_shared(concat, "ConcatMaskPropagation"); register_matcher(m, callback); } }; -class ngraph::pass::mask_propagation::PassThrough : public MatcherPass { +class ov::pass::mask_propagation::PassThrough : public MatcherPass { public: PassThrough() { auto unary_op = pattern::wrap_type(); - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto& m_output = pattern_map.at(unary_op); const auto& m_input = m_output.get_node_shared_ptr()->input_value(0); @@ -894,12 +893,12 @@ public: return true; }; - auto m = std::make_shared(unary_op, "PassThroughMaskPropagation"); + auto m = std::make_shared(unary_op, "PassThroughMaskPropagation"); register_matcher(m, callback); } }; -class ngraph::pass::mask_propagation::Reduce : public MatcherPass { +class ov::pass::mask_propagation::Reduce : public MatcherPass { public: Reduce() { auto inputs = pattern::any_input(); @@ -907,7 +906,7 @@ public: auto pooling_by_reduce = pattern::wrap_type({inputs, weights}); - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto m_weights = pattern_map.at(weights); const auto& m_input = pattern_map.at(inputs); @@ -948,7 +947,7 @@ public: return true; }; - auto m = std::make_shared(pooling_by_reduce, "PassThroughReduceMaskPropagation"); + auto m = std::make_shared(pooling_by_reduce, "PassThroughReduceMaskPropagation"); register_matcher(m, callback); } }; @@ -1015,7 +1014,7 @@ struct ChannelsMap { /* Returns coordinate iterator through all values of given channel * on unsquized_shape_dim dimension according to unsquized_shape shape. */ -NGRAPH_SUPPRESS_DEPRECATED_START +OPENVINO_SUPPRESS_DEPRECATED_START static ngraph::CoordinateTransform get_channel_iter(const ov::Shape unsquized_shape, const size_t unsquized_shape_dim, const size_t channel) { @@ -1026,7 +1025,7 @@ static ngraph::CoordinateTransform get_channel_iter(const ov::Shape unsquized_sh ngraph::CoordinateTransform iter(unsquized_shape, begin, end); return iter; } -NGRAPH_SUPPRESS_DEPRECATED_END +OPENVINO_SUPPRESS_DEPRECATED_END /* Maps squzed_mask_dim mask dimension to vector of masks for unsquized_dims. * Using dims_attrs and unsquized_shape for channel iteration. @@ -1057,7 +1056,7 @@ static ChannelsMap map_channels(const std::set squized_mask_dim, ch %= dims_attrs[unsquized_dim].dim; // Start iterating through chanel - NGRAPH_SUPPRESS_DEPRECATED_START + OPENVINO_SUPPRESS_DEPRECATED_START auto iter = get_channel_iter(unsquized_shape, unsquized_shift, ch); for (const auto& coord : iter) { const auto idx = iter.index(coord); @@ -1066,7 +1065,7 @@ static ChannelsMap map_channels(const std::set squized_mask_dim, squized_mask_dim_copy.erase(idx); } } - NGRAPH_SUPPRESS_DEPRECATED_END + OPENVINO_SUPPRESS_DEPRECATED_END if (cur_ch_elems.size() != dims_attrs[unsquized_dim].elems_inner_dims * dims_attrs[unsquized_dim].elems_outer_dims) { suspicious_elems.insert(cur_ch_elems.begin(), cur_ch_elems.end()); @@ -1116,14 +1115,14 @@ static std::vector collect_dims_attrs(const std::vector dims return dims_attrs; } -class ngraph::pass::mask_propagation::Reshape : public MatcherPass { +class ov::pass::mask_propagation::Reshape : public MatcherPass { public: Reshape() { auto inputs = pattern::any_input(pattern::has_static_shape()); auto weights = pattern::any_input(); auto reshape = pattern::wrap_type({inputs, weights}, pattern::has_static_shape()); - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto m_weights = pattern_map.at(weights); const auto& m_input = pattern_map.at(inputs); @@ -1250,11 +1249,11 @@ public: for (const auto out_dim : dims_map[in_dim]) { const auto unsquized_shift = out_dim - dims_map[in_dim][0]; for (const auto ch : weights_mask_row->at(out_dim)) { - NGRAPH_SUPPRESS_DEPRECATED_START + OPENVINO_SUPPRESS_DEPRECATED_START auto iter = get_channel_iter(dims_shape[in_dim], unsquized_shift, ch); for (const auto& coord : iter) cur_mask->at(in_dim).insert(iter.index(coord)); - NGRAPH_SUPPRESS_DEPRECATED_END + OPENVINO_SUPPRESS_DEPRECATED_END } } } @@ -1323,11 +1322,11 @@ public: for (const auto in_dim : dims_map[out_dim]) { const auto unsquized_shift = in_dim - dims_map[out_dim][0]; for (const auto ch : input_mask_row->at(in_dim)) { - NGRAPH_SUPPRESS_DEPRECATED_START + OPENVINO_SUPPRESS_DEPRECATED_START auto iter = get_channel_iter(dims_shape[out_dim], unsquized_shift, ch); for (const auto& coord : iter) cur_mask->at(out_dim).insert(iter.index(coord)); - NGRAPH_SUPPRESS_DEPRECATED_END + OPENVINO_SUPPRESS_DEPRECATED_END } } } @@ -1367,18 +1366,18 @@ public: return true; }; - auto m = std::make_shared(reshape, "ReshapeMaskPropagation"); + auto m = std::make_shared(reshape, "ReshapeMaskPropagation"); register_matcher(m, callback); } }; -class ngraph::pass::mask_propagation::Transpose : public MatcherPass { +class ov::pass::mask_propagation::Transpose : public MatcherPass { public: Transpose() { auto input = pattern::any_input(); auto weights = pattern::any_input(); auto transpose = pattern::wrap_type({input, weights}); - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto& m_input = pattern_map.at(input); const auto& m_weights = pattern_map.at(weights); @@ -1438,7 +1437,7 @@ public: return true; }; - auto m = std::make_shared(transpose, "TransposePropagation"); + auto m = std::make_shared(transpose, "TransposePropagation"); register_matcher(m, callback); } }; @@ -1483,19 +1482,18 @@ class ov::pass::mask_propagation::VariadicSplit : public MatcherPass { public: VariadicSplit() { auto input_pattern = pattern::any_input(pattern::has_static_rank()); - auto axis_pattern = pattern::wrap_type(); - auto split_lengths_pattern = pattern::wrap_type(); + auto axis_pattern = pattern::wrap_type(); + auto split_lengths_pattern = pattern::wrap_type(); auto split_pattern = - pattern::wrap_type({input_pattern, axis_pattern, split_lengths_pattern}); + pattern::wrap_type({input_pattern, axis_pattern, split_lengths_pattern}); matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); - auto axis_node = as_type(pattern_map.at(axis_pattern).get_node()); + auto axis_node = as_type(pattern_map.at(axis_pattern).get_node()); const auto& input = pattern_map.at(input_pattern); const auto input_mask = ov::getMask(input); auto split = pattern_map.at(split_pattern).get_node(); - auto split_lengths_const = - as_type(pattern_map.at(split_lengths_pattern).get_node()); + auto split_lengths_const = as_type(pattern_map.at(split_lengths_pattern).get_node()); if (!axis_node) return false; @@ -1551,12 +1549,12 @@ class ov::pass::mask_propagation::Split : public MatcherPass { public: Split() { auto input_pattern = pattern::any_input(pattern::has_static_rank()); - auto axis_pattern = pattern::wrap_type(); - auto split_pattern = pattern::wrap_type({input_pattern, axis_pattern}); + auto axis_pattern = pattern::wrap_type(); + auto split_pattern = pattern::wrap_type({input_pattern, axis_pattern}); matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); - auto axis_node = as_type(pattern_map.at(axis_pattern).get_node()); + auto axis_node = as_type(pattern_map.at(axis_pattern).get_node()); const auto& input = pattern_map.at(input_pattern); const auto input_mask = ov::getMask(input); @@ -1597,12 +1595,12 @@ public: } }; -class ngraph::pass::mask_propagation::StopPropagation : public MatcherPass { +class ov::pass::mask_propagation::StopPropagation : public MatcherPass { public: StopPropagation() { auto any_node = pattern::any_input(); - ngraph::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); const auto& m_output = pattern_map.at(any_node); const auto& node = m.get_match_root(); @@ -1638,7 +1636,7 @@ public: if (any_input_with_masks) { // Set mask to stop op first input tensor to prevent mask rewriting for // nodes which share output tensor with previous node. - if (ngraph::is_type(m_output.get_node_shared_ptr())) + if (ov::is_type(m_output.get_node_shared_ptr())) setMask(*m_output.get_node()->inputs().begin(), output_mask); else setMask(m_output, output_mask); @@ -1646,27 +1644,27 @@ public: return true; }; - auto m = std::make_shared(any_node, "StopMaskPropagation"); + auto m = std::make_shared(any_node, "StopMaskPropagation"); register_matcher(m, callback); } }; -class ngraph::pass::mask_propagation::SkipPropagation : public MatcherPass { +class ov::pass::mask_propagation::SkipPropagation : public MatcherPass { public: SkipPropagation() { // Skip mask propagation for ShapeOf operation to prevent this opearation to be // processed as stop op. auto node = pattern::wrap_type(); - ngraph::matcher_pass_callback callback = [](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [](ov::pass::pattern::Matcher& m) { return true; }; - auto m = std::make_shared(node, "SkipPropagation"); + auto m = std::make_shared(node, "SkipPropagation"); register_matcher(m, callback); } }; -ngraph::pass::PropagateMasks::PropagateMasks() { +ov::pass::PropagateMasks::PropagateMasks() { add_matcher(); add_matcher(); add_matcher(); diff --git a/src/common/offline_transformations/src/pruning/pruning.cpp b/src/common/offline_transformations/src/pruning/pruning.cpp index ab6d7fc115b..115c3e7458e 100644 --- a/src/common/offline_transformations/src/pruning/pruning.cpp +++ b/src/common/offline_transformations/src/pruning/pruning.cpp @@ -5,13 +5,13 @@ #include "pruning.hpp" #include -#include -#include -#include #include "mask_attribute.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/visualize_tree.hpp" +#include "openvino/util/log.hpp" -bool ngraph::pass::Pruning::run_on_model(const std::shared_ptr& f) { +bool ov::pass::Pruning::run_on_model(const std::shared_ptr& f) { Manager manager(get_pass_config()); // Initialize masks only for Convolutions/GroupConvolutions weights (needed to init mask in source Constant of diff --git a/src/common/offline_transformations/src/pruning/shrink_weights.cpp b/src/common/offline_transformations/src/pruning/shrink_weights.cpp index 1021147131f..93242b4fc76 100644 --- a/src/common/offline_transformations/src/pruning/shrink_weights.cpp +++ b/src/common/offline_transformations/src/pruning/shrink_weights.cpp @@ -3,13 +3,14 @@ // #include -#include -#include -#include -#include -#include #include "mask_attribute.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/manager.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "openvino/util/log.hpp" #include "pruning.hpp" template @@ -27,7 +28,7 @@ static bool not_empty_mask(ov::Mask::Ptr mask) { } static bool is_static_reshape_op(std::shared_ptr node) { - auto reshape_node = std::dynamic_pointer_cast(node); + auto reshape_node = std::dynamic_pointer_cast(node); if (!reshape_node) return false; @@ -83,8 +84,8 @@ static bool maybe_adopt_reshape_node(std::shared_ptr reshape, ov::Mask if (all_zeros) return true; - const auto sub_const = ngraph::opset6::Constant::create(shape.get_element_type(), {mask->size()}, sub_const_vector); - const auto sub = std::make_shared(shape, sub_const); + const auto sub_const = ov::opset6::Constant::create(shape.get_element_type(), {mask->size()}, sub_const_vector); + const auto sub = std::make_shared(shape, sub_const); consumers.begin()->replace_source_output(sub); copy_runtime_info(shape.get_node_shared_ptr(), {sub_const, sub}); @@ -94,7 +95,7 @@ static bool maybe_adopt_reshape_node(std::shared_ptr reshape, ov::Mask } static bool handle_variadic_split(const std::shared_ptr& split) { - const auto axis_node = ngraph::as_type(split->get_input_node_ptr(1)); + const auto axis_node = ov::as_type(split->get_input_node_ptr(1)); if (!axis_node) return false; @@ -109,7 +110,7 @@ static bool handle_variadic_split(const std::shared_ptr& split) { if (input_shape[axis].is_dynamic()) return false; - const auto split_lengths_node = ngraph::as_type(split->get_input_node_ptr(2)); + const auto split_lengths_node = ov::as_type(split->get_input_node_ptr(2)); if (!split_lengths_node) return false; const auto split_lengths = split_lengths_node->cast_vector(); @@ -136,16 +137,16 @@ static bool handle_variadic_split(const std::shared_ptr& split) { return true; const auto& split_lengths_type = split_lengths_node->get_output_element_type(0); - const auto sub_const = ngraph::opset6::Constant::create(split_lengths_type, {sub_values.size()}, sub_values); - const auto sub = std::make_shared(split->input_value(2), sub_const); + const auto sub_const = ov::opset6::Constant::create(split_lengths_type, {sub_values.size()}, sub_values); + const auto sub = std::make_shared(split->input_value(2), sub_const); copy_runtime_info(split->get_input_source_output(2).get_node_shared_ptr(), {sub_const, sub}); split->input(2).replace_source_output(sub); return true; } -static std::shared_ptr handle_split(const std::shared_ptr& split) { - const auto axis_node = ngraph::as_type(split->get_input_node_ptr(1)); +static std::shared_ptr handle_split(const std::shared_ptr& split) { + const auto axis_node = ov::as_type(split->get_input_node_ptr(1)); if (!axis_node) return nullptr; @@ -178,18 +179,17 @@ static std::shared_ptr handle_split(const std::shared_ptr(split->input_value(0), - split->input_value(1), - split_lengths_node); + ov::opset6::Constant::create(ov::element::i64, {split_lengths.size()}, split_lengths); + auto var_split = + std::make_shared(split->input_value(0), split->input_value(1), split_lengths_node); var_split->set_friendly_name(split->get_friendly_name()); - ngraph::copy_runtime_info(split, var_split); - ngraph::replace_node(split, var_split); + ov::copy_runtime_info(split, var_split); + ov::replace_node(split, var_split); return var_split; } -bool ngraph::pass::ShrinkWeights::run_on_model(const std::shared_ptr& f) { +bool ov::pass::ShrinkWeights::run_on_model(const std::shared_ptr& f) { int64_t reduced_weights_count{0}; int64_t total_weights_count{0}; for (const auto& node : f->get_ordered_ops()) { @@ -259,8 +259,8 @@ bool ngraph::pass::ShrinkWeights::run_on_model(const std::shared_ptrget_element_type(), const_node->get_shape(), new_const_value); new_const->set_friendly_name(const_node->get_friendly_name()); - ngraph::copy_runtime_info(const_node, new_const); - ngraph::replace_node(const_node, new_const); + ov::copy_runtime_info(const_node, new_const); + ov::replace_node(const_node, new_const); OPENVINO_DEBUG << "Adjust value in (" << const_node->get_friendly_name() << "): " << vec_to_str(value) << " to " << vec_to_str(new_const_value); @@ -319,7 +319,7 @@ bool ngraph::pass::ShrinkWeights::run_on_model(const std::shared_ptr +#include #include "snippets/op/subgraph.hpp" #include "snippets_helpers.hpp" diff --git a/src/common/snippets/tests/include/pass/collapse_subgraph.hpp b/src/common/snippets/tests/include/pass/collapse_subgraph.hpp index 37f4924889a..478310cc4e4 100644 --- a/src/common/snippets/tests/include/pass/collapse_subgraph.hpp +++ b/src/common/snippets/tests/include/pass/collapse_subgraph.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include namespace ov { namespace test { diff --git a/src/common/snippets/tests/include/pass/mha_tokenization.hpp b/src/common/snippets/tests/include/pass/mha_tokenization.hpp index c1be616f972..3f4ac0de2f8 100644 --- a/src/common/snippets/tests/include/pass/mha_tokenization.hpp +++ b/src/common/snippets/tests/include/pass/mha_tokenization.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include "snippets/pass/tokenization.hpp" diff --git a/src/common/snippets/tests/src/lowering_utils.cpp b/src/common/snippets/tests/src/lowering_utils.cpp index ba470146690..64b63eab9e5 100644 --- a/src/common/snippets/tests/src/lowering_utils.cpp +++ b/src/common/snippets/tests/src/lowering_utils.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "lowering_utils.hpp" #include "snippets/pass/tokenization.hpp" #include "snippets/pass/collapse_subgraph.hpp" diff --git a/src/common/snippets/tests/src/pass/fake_quantize_decomposition_test.cpp b/src/common/snippets/tests/src/pass/fake_quantize_decomposition_test.cpp index 7ac52ed8215..05e3c2586a6 100644 --- a/src/common/snippets/tests/src/pass/fake_quantize_decomposition_test.cpp +++ b/src/common/snippets/tests/src/pass/fake_quantize_decomposition_test.cpp @@ -4,7 +4,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "snippets/pass/common_optimizations.hpp" #include "snippets/op/subgraph.hpp" #include "fake_quantize_function.hpp" diff --git a/src/common/snippets/tests/src/pass/movebroadcast.cpp b/src/common/snippets/tests/src/pass/movebroadcast.cpp index 3818c1bc6bd..c6dc8712074 100644 --- a/src/common/snippets/tests/src/pass/movebroadcast.cpp +++ b/src/common/snippets/tests/src/pass/movebroadcast.cpp @@ -12,7 +12,7 @@ #include "transformations/init_node_info.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/snippets/tests/src/pass/softmax_reshape_elimination.cpp b/src/common/snippets/tests/src/pass/softmax_reshape_elimination.cpp index 3dc46496d88..0f191adb5ac 100644 --- a/src/common/snippets/tests/src/pass/softmax_reshape_elimination.cpp +++ b/src/common/snippets/tests/src/pass/softmax_reshape_elimination.cpp @@ -12,7 +12,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/snippets/tests/src/precomp.hpp b/src/common/snippets/tests/src/precomp.hpp index 84796af1345..b783522d287 100644 --- a/src/common/snippets/tests/src/precomp.hpp +++ b/src/common/snippets/tests/src/precomp.hpp @@ -6,7 +6,7 @@ #include #include "openvino/core/node.hpp" -#include +#include #include #include diff --git a/src/common/transformations/src/itt.hpp b/src/common/transformations/src/itt.hpp index 7b4edafdc04..b392de8d349 100644 --- a/src/common/transformations/src/itt.hpp +++ b/src/common/transformations/src/itt.hpp @@ -11,7 +11,7 @@ #include "openvino/cc/selective_build.h" #include "openvino/itt.hpp" -#include "openvino/cc/ngraph/itt.hpp" +#include "openvino/cc/pass/itt.hpp" namespace ov { namespace pass { diff --git a/src/common/transformations/src/transformations/common_optimizations/fused_names_cleanup.cpp b/src/common/transformations/src/transformations/common_optimizations/fused_names_cleanup.cpp index 6252b19171d..c3f602ebcac 100644 --- a/src/common/transformations/src/transformations/common_optimizations/fused_names_cleanup.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/fused_names_cleanup.cpp @@ -4,7 +4,7 @@ #include "transformations/common_optimizations/fused_names_cleanup.hpp" -#include "openvino/cc/ngraph/itt.hpp" +#include "openvino/cc/pass/itt.hpp" #include "transformations/rt_info/fused_names_attribute.hpp" bool ov::pass::FusedNamesCleanup::run_on_model(const std::shared_ptr& f) { diff --git a/src/common/transformations/tests/common_optimizations/adaptive_pool_to_reduce.cpp b/src/common/transformations/tests/common_optimizations/adaptive_pool_to_reduce.cpp index dc94a3b0546..00091ffc3ba 100644 --- a/src/common/transformations/tests/common_optimizations/adaptive_pool_to_reduce.cpp +++ b/src/common/transformations/tests/common_optimizations/adaptive_pool_to_reduce.cpp @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/adaptive_pool_to_reduce.hpp" + #include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/opsets/opset10.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/add_fake_quantize_fusion.cpp b/src/common/transformations/tests/common_optimizations/add_fake_quantize_fusion.cpp index 1ac856c8641..ed3a6db8aa5 100644 --- a/src/common/transformations/tests/common_optimizations/add_fake_quantize_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/add_fake_quantize_fusion.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/add_fake_quantize_fusion.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/align_eltwise_input_ranks.cpp b/src/common/transformations/tests/common_optimizations/align_eltwise_input_ranks.cpp index 6d76bed52e9..152db47e157 100644 --- a/src/common/transformations/tests/common_optimizations/align_eltwise_input_ranks.cpp +++ b/src/common/transformations/tests/common_optimizations/align_eltwise_input_ranks.cpp @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/align_eltwise_input_ranks.hpp" + #include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/opsets/opset8.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/align_mixed_fp32_fp16_types_test.cpp b/src/common/transformations/tests/common_optimizations/align_mixed_fp32_fp16_types_test.cpp index a8e1bf403ff..bd874644e4d 100644 --- a/src/common/transformations/tests/common_optimizations/align_mixed_fp32_fp16_types_test.cpp +++ b/src/common/transformations/tests/common_optimizations/align_mixed_fp32_fp16_types_test.cpp @@ -6,11 +6,10 @@ #include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset10.hpp" +#include "openvino/pass/manager.hpp" #include "transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp" using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/augru_cell_fusion.cpp b/src/common/transformations/tests/common_optimizations/augru_cell_fusion.cpp index 9e45f8b14de..40d224d37dd 100644 --- a/src/common/transformations/tests/common_optimizations/augru_cell_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/augru_cell_fusion.cpp @@ -8,7 +8,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/op/parameter.hpp" #include "openvino/opsets/opset9.hpp" #include "ov_ops/augru_cell.hpp" diff --git a/src/common/transformations/tests/common_optimizations/batch_to_space_fusion.cpp b/src/common/transformations/tests/common_optimizations/batch_to_space_fusion.cpp index bd61a904a48..c9971fbb904 100644 --- a/src/common/transformations/tests/common_optimizations/batch_to_space_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/batch_to_space_fusion.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/batch_to_space_fusion.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/binarize_weights.cpp b/src/common/transformations/tests/common_optimizations/binarize_weights.cpp index 20b45eb8b82..9edf9cf0129 100644 --- a/src/common/transformations/tests/common_optimizations/binarize_weights.cpp +++ b/src/common/transformations/tests/common_optimizations/binarize_weights.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/binarize_weights.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/broadcast_elementwise_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/broadcast_elementwise_fusion_test.cpp index 0cdebd7a5bc..ea6331b63c5 100644 --- a/src/common/transformations/tests/common_optimizations/broadcast_elementwise_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/broadcast_elementwise_fusion_test.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/broadcast_elementwise_fusion.hpp" + #include #include #include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/broadcast_transition_test.cpp b/src/common/transformations/tests/common_optimizations/broadcast_transition_test.cpp index 71d83dbf5cd..de9109cfb69 100644 --- a/src/common/transformations/tests/common_optimizations/broadcast_transition_test.cpp +++ b/src/common/transformations/tests/common_optimizations/broadcast_transition_test.cpp @@ -2,14 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/broadcast_transition.hpp" + #include #include -#include #include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/opsets/opset10.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/clamp_fusion.cpp b/src/common/transformations/tests/common_optimizations/clamp_fusion.cpp index d65e230d4c2..28cd0c86f63 100644 --- a/src/common/transformations/tests/common_optimizations/clamp_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/clamp_fusion.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/clamp_fusion.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/compress_float_constants_test.cpp b/src/common/transformations/tests/common_optimizations/compress_float_constants_test.cpp index 7898c42ca5c..2d256b5df6e 100644 --- a/src/common/transformations/tests/common_optimizations/compress_float_constants_test.cpp +++ b/src/common/transformations/tests/common_optimizations/compress_float_constants_test.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/core/model.hpp" #include "openvino/opsets/opset8.hpp" #include "openvino/pass/manager.hpp" diff --git a/src/common/transformations/tests/common_optimizations/concat_reduce_fusion.cpp b/src/common/transformations/tests/common_optimizations/concat_reduce_fusion.cpp index 57b4da66d2b..634701a3fda 100644 --- a/src/common/transformations/tests/common_optimizations/concat_reduce_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/concat_reduce_fusion.cpp @@ -2,17 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/concat_reduce_fusion.hpp" + #include -#include -#include -#include -#include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" #include "openvino/op/add.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/maximum.hpp" @@ -21,6 +16,11 @@ #include "openvino/op/reduce_min.hpp" #include "openvino/op/squeeze.hpp" #include "openvino/op/unsqueeze.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/nop_elimination.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/conv_to_binary_conv.cpp b/src/common/transformations/tests/common_optimizations/conv_to_binary_conv.cpp index 553b42ac734..059774f9f13 100644 --- a/src/common/transformations/tests/common_optimizations/conv_to_binary_conv.cpp +++ b/src/common/transformations/tests/common_optimizations/conv_to_binary_conv.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/conv_to_binary_conv.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/convert_compression_only_to_legacy_test.cpp b/src/common/transformations/tests/common_optimizations/convert_compression_only_to_legacy_test.cpp index c0ee13e8c67..45b9a00fbf1 100644 --- a/src/common/transformations/tests/common_optimizations/convert_compression_only_to_legacy_test.cpp +++ b/src/common/transformations/tests/common_optimizations/convert_compression_only_to_legacy_test.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/core/model.hpp" #include "openvino/opsets/opset8.hpp" #include "openvino/pass/manager.hpp" diff --git a/src/common/transformations/tests/common_optimizations/convert_convertlike.cpp b/src/common/transformations/tests/common_optimizations/convert_convertlike.cpp index 20ec0b2f1c8..ab239bf5d5a 100644 --- a/src/common/transformations/tests/common_optimizations/convert_convertlike.cpp +++ b/src/common/transformations/tests/common_optimizations/convert_convertlike.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_convertlike.hpp" + #include #include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/convert_divide.cpp b/src/common/transformations/tests/common_optimizations/convert_divide.cpp index 6b37cd1885b..2eb1597022e 100644 --- a/src/common/transformations/tests/common_optimizations/convert_divide.cpp +++ b/src/common/transformations/tests/common_optimizations/convert_divide.cpp @@ -2,22 +2,23 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_divide.hpp" + #include #include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/mark_precision_sensitive_shapeof_subgraphs.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/convert_nms_gather_path_to_unsigned_test.cpp b/src/common/transformations/tests/common_optimizations/convert_nms_gather_path_to_unsigned_test.cpp index 548787f18f9..54b7f208bc0 100644 --- a/src/common/transformations/tests/common_optimizations/convert_nms_gather_path_to_unsigned_test.cpp +++ b/src/common/transformations/tests/common_optimizations/convert_nms_gather_path_to_unsigned_test.cpp @@ -2,16 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp" + #include -#include -#include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" -#include "ngraph/pass/visualize_tree.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/convert_quantize_dequantize.cpp b/src/common/transformations/tests/common_optimizations/convert_quantize_dequantize.cpp index 43f4f90fac2..0875298fe89 100644 --- a/src/common/transformations/tests/common_optimizations/convert_quantize_dequantize.cpp +++ b/src/common/transformations/tests/common_optimizations/convert_quantize_dequantize.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/convert_quantize_dequantize.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/convolution_to_group_convolution_fusion.cpp b/src/common/transformations/tests/common_optimizations/convolution_to_group_convolution_fusion.cpp index 7d59bf06bf0..315808c7282 100644 --- a/src/common/transformations/tests/common_optimizations/convolution_to_group_convolution_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/convolution_to_group_convolution_fusion.cpp @@ -2,13 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/convolution_to_group_convolution_fusion.hpp" + #include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/opsets/opset10.hpp" +#include "openvino/pass/manager.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/depth_to_space_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/depth_to_space_fusion_test.cpp index bf19d958fa7..d5b8b587ab8 100644 --- a/src/common/transformations/tests/common_optimizations/depth_to_space_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/depth_to_space_fusion_test.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/depth_to_space_fusion.hpp" + #include #include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/dilated_convolution_converter.cpp b/src/common/transformations/tests/common_optimizations/dilated_convolution_converter.cpp index 586dc8095e0..0ca92054751 100644 --- a/src/common/transformations/tests/common_optimizations/dilated_convolution_converter.cpp +++ b/src/common/transformations/tests/common_optimizations/dilated_convolution_converter.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/dilated_convolution_converter.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/dimension_tracking.cpp b/src/common/transformations/tests/common_optimizations/dimension_tracking.cpp index 145d780d48d..4db696f0e7e 100644 --- a/src/common/transformations/tests/common_optimizations/dimension_tracking.cpp +++ b/src/common/transformations/tests/common_optimizations/dimension_tracking.cpp @@ -2,22 +2,23 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/dimension_tracking.hpp" + #include #include -#include -#include -#include #include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "ngraph_functions/subgraph_builders.hpp" #include "openvino/core/dimension_tracker.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/divide_fusion.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/disable_shapeof_constant_folding_tests.cpp b/src/common/transformations/tests/common_optimizations/disable_shapeof_constant_folding_tests.cpp index 63dbf43e94e..8e22712e53e 100644 --- a/src/common/transformations/tests/common_optimizations/disable_shapeof_constant_folding_tests.cpp +++ b/src/common/transformations/tests/common_optimizations/disable_shapeof_constant_folding_tests.cpp @@ -5,15 +5,15 @@ #include #include -#include -#include -#include -#include #include #include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/disable_shapeof_constant_folding.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/divide_fusion.cpp b/src/common/transformations/tests/common_optimizations/divide_fusion.cpp index 065758e9949..002dfa7a40b 100644 --- a/src/common/transformations/tests/common_optimizations/divide_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/divide_fusion.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/divide_fusion.hpp" + #include #include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/dropout_with_random_uniform_replacer_test.cpp b/src/common/transformations/tests/common_optimizations/dropout_with_random_uniform_replacer_test.cpp index 51eee20647a..45ab3e44429 100644 --- a/src/common/transformations/tests/common_optimizations/dropout_with_random_uniform_replacer_test.cpp +++ b/src/common/transformations/tests/common_optimizations/dropout_with_random_uniform_replacer_test.cpp @@ -2,17 +2,18 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/dropout_with_random_uniform_replacer.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/eliminate_duplicate_ti_inputs.cpp b/src/common/transformations/tests/common_optimizations/eliminate_duplicate_ti_inputs.cpp index 6da4f9c0279..e597b55a6d0 100644 --- a/src/common/transformations/tests/common_optimizations/eliminate_duplicate_ti_inputs.cpp +++ b/src/common/transformations/tests/common_optimizations/eliminate_duplicate_ti_inputs.cpp @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/eliminate_duplicate_ti_inputs.hpp" + #include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/opsets/opset10.hpp" using namespace testing; using namespace std; diff --git a/src/common/transformations/tests/common_optimizations/eliminate_split_test.cpp b/src/common/transformations/tests/common_optimizations/eliminate_split_test.cpp index 6e375d409f2..1a16befe56f 100644 --- a/src/common/transformations/tests/common_optimizations/eliminate_split_test.cpp +++ b/src/common/transformations/tests/common_optimizations/eliminate_split_test.cpp @@ -4,12 +4,12 @@ #include -#include -#include #include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/op/parameter.hpp" +#include "openvino/opsets/opset8.hpp" +#include "transformations/common_optimizations/nop_elimination.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/eliminate_unsqueeze_gather.cpp b/src/common/transformations/tests/common_optimizations/eliminate_unsqueeze_gather.cpp index 64925b5a7fc..de0657c6bce 100644 --- a/src/common/transformations/tests/common_optimizations/eliminate_unsqueeze_gather.cpp +++ b/src/common/transformations/tests/common_optimizations/eliminate_unsqueeze_gather.cpp @@ -2,15 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include -#include +#include "transformations/common_optimizations/eliminate_unsqueeze_gather.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "common_test_utils/test_common.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "openvino/op/parameter.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/shared_ops_optimization.hpp" +#include "transformations/common_optimizations/simplify_shape_of_sub_graph.hpp" using namespace ov; using namespace ov::op; diff --git a/src/common/transformations/tests/common_optimizations/flush_fp32_subnormals_to_zero_test.cpp b/src/common/transformations/tests/common_optimizations/flush_fp32_subnormals_to_zero_test.cpp index e7ad2139c51..b2eeda611fd 100644 --- a/src/common/transformations/tests/common_optimizations/flush_fp32_subnormals_to_zero_test.cpp +++ b/src/common/transformations/tests/common_optimizations/flush_fp32_subnormals_to_zero_test.cpp @@ -2,15 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/flush_fp32_subnormals_to_zero.hpp" + #include -#include -#include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset10.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/fold_subgraph_empty_inputs_test.cpp b/src/common/transformations/tests/common_optimizations/fold_subgraph_empty_inputs_test.cpp index 2d3ac7f251c..603fe46180c 100644 --- a/src/common/transformations/tests/common_optimizations/fold_subgraph_empty_inputs_test.cpp +++ b/src/common/transformations/tests/common_optimizations/fold_subgraph_empty_inputs_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/fold_subgraph_empty_inputs.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/fq_mul_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/fq_mul_fusion_test.cpp index c213ffe4721..61f43c937be 100644 --- a/src/common/transformations/tests/common_optimizations/fq_mul_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/fq_mul_fusion_test.cpp @@ -2,21 +2,22 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/fq_mul_fusion.hpp" + #include -#include #include -#include -#include -#include -#include -#include #include #include "common_test_utils/common_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" #include "functional_test_utils/plugin_cache.hpp" +#include "ie_core.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/fq_reshape_fusion.cpp b/src/common/transformations/tests/common_optimizations/fq_reshape_fusion.cpp index e5cabaced04..8e92a5e3f77 100644 --- a/src/common/transformations/tests/common_optimizations/fq_reshape_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/fq_reshape_fusion.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/fq_reshape_fusion.hpp" + #include -#include #include #include -#include -#include -#include #include -#include -#include #include "cnn_network_ngraph_impl.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/fused_names_cleanup.cpp b/src/common/transformations/tests/common_optimizations/fused_names_cleanup.cpp index 166d211f3bb..0d80c5cd8f1 100644 --- a/src/common/transformations/tests/common_optimizations/fused_names_cleanup.cpp +++ b/src/common/transformations/tests/common_optimizations/fused_names_cleanup.cpp @@ -4,16 +4,16 @@ #define _USE_MATH_DEFINES +#include "transformations/common_optimizations/fused_names_cleanup.hpp" + #include -#include -#include -#include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset9.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/gelu_fusion.cpp b/src/common/transformations/tests/common_optimizations/gelu_fusion.cpp index 9dd8f55f953..7c5311307d7 100644 --- a/src/common/transformations/tests/common_optimizations/gelu_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/gelu_fusion.cpp @@ -4,23 +4,24 @@ #define _USE_MATH_DEFINES +#include "transformations/common_optimizations/gelu_fusion.hpp" + #include #include #include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/opsets/opset9.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/convert_precision.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/gru_cell_fusion.cpp b/src/common/transformations/tests/common_optimizations/gru_cell_fusion.cpp index bb60054a54b..7858ab76269 100644 --- a/src/common/transformations/tests/common_optimizations/gru_cell_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/gru_cell_fusion.cpp @@ -8,7 +8,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/opsets/opset9.hpp" using namespace std; diff --git a/src/common/transformations/tests/common_optimizations/hsigmoid_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/hsigmoid_fusion_test.cpp index 3b28ec41e26..71651a4a920 100644 --- a/src/common/transformations/tests/common_optimizations/hsigmoid_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/hsigmoid_fusion_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/hsigmoid_fusion.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/hswish_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/hswish_fusion_test.cpp index 5baa3fb08f6..f09deddae6e 100644 --- a/src/common/transformations/tests/common_optimizations/hswish_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/hswish_fusion_test.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/hswish_fusion.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/manager.hpp" #include "transformations/common_optimizations/hsigmoid_fusion.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/interpolate_sequence_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/interpolate_sequence_fusion_test.cpp index 09e6b04e3e1..cbe57135481 100644 --- a/src/common/transformations/tests/common_optimizations/interpolate_sequence_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/interpolate_sequence_fusion_test.cpp @@ -2,19 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/interpolate_sequence_fusion.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/leaky_relu_fusion.cpp b/src/common/transformations/tests/common_optimizations/leaky_relu_fusion.cpp index 6c98cf09ad0..c1f6a46c2c9 100644 --- a/src/common/transformations/tests/common_optimizations/leaky_relu_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/leaky_relu_fusion.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/leaky_relu_fusion.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/lin_op_sequence_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/lin_op_sequence_fusion_test.cpp index ef2cfbabc18..71c16dea124 100644 --- a/src/common/transformations/tests/common_optimizations/lin_op_sequence_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/lin_op_sequence_fusion_test.cpp @@ -2,24 +2,25 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/lin_op_sequence_fusion.hpp" + #include #include #include #include -#include -#include -#include -#include #include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/pass/manager.hpp" +#include "openvino/pass/visualize_tree.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/low_latency_v2_test.cpp b/src/common/transformations/tests/common_optimizations/low_latency_v2_test.cpp index d63b98ca3d7..7e91f4fbe29 100644 --- a/src/common/transformations/tests/common_optimizations/low_latency_v2_test.cpp +++ b/src/common/transformations/tests/common_optimizations/low_latency_v2_test.cpp @@ -5,16 +5,16 @@ #include #include -#include -#include -#include -#include #include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/pass/low_latency.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/control_flow/unroll_tensor_iterator.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/mark_precision_sensitive_shapeof_subgraphs_test.cpp b/src/common/transformations/tests/common_optimizations/mark_precision_sensitive_shapeof_subgraphs_test.cpp index d6ab83f2465..30c4b3048c2 100644 --- a/src/common/transformations/tests/common_optimizations/mark_precision_sensitive_shapeof_subgraphs_test.cpp +++ b/src/common/transformations/tests/common_optimizations/mark_precision_sensitive_shapeof_subgraphs_test.cpp @@ -7,15 +7,15 @@ #include #include -#include -#include #include -#include -#include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/opsets/opset10.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" #include "transformations/rt_info/disable_fp16_compression.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/mark_subgraph_to_keep_in_mixed_precision_test.cpp b/src/common/transformations/tests/common_optimizations/mark_subgraph_to_keep_in_mixed_precision_test.cpp index b432f75f93b..59033d5d8f0 100644 --- a/src/common/transformations/tests/common_optimizations/mark_subgraph_to_keep_in_mixed_precision_test.cpp +++ b/src/common/transformations/tests/common_optimizations/mark_subgraph_to_keep_in_mixed_precision_test.cpp @@ -4,7 +4,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/opsets/opset10.hpp" #include "openvino/opsets/opset2.hpp" #include "openvino/pass/manager.hpp" diff --git a/src/common/transformations/tests/common_optimizations/matmul_const_transposes_extraction.cpp b/src/common/transformations/tests/common_optimizations/matmul_const_transposes_extraction.cpp index 4bf43893a0b..e29d99a5165 100644 --- a/src/common/transformations/tests/common_optimizations/matmul_const_transposes_extraction.cpp +++ b/src/common/transformations/tests/common_optimizations/matmul_const_transposes_extraction.cpp @@ -2,15 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/matmul_const_transposes_extraction.hpp" + #include -#include -#include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/matmul_multiply_fusion.cpp b/src/common/transformations/tests/common_optimizations/matmul_multiply_fusion.cpp index 31b443c3b15..3c0a5f9a417 100644 --- a/src/common/transformations/tests/common_optimizations/matmul_multiply_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/matmul_multiply_fusion.cpp @@ -2,14 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/matmul_multiply_fusion.hpp" + #include -#include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/mish_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/mish_fusion_test.cpp index 60859dc6b58..61d236a6355 100644 --- a/src/common/transformations/tests/common_optimizations/mish_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/mish_fusion_test.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/mish_fusion.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/softplus_to_mish_fusion.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/moc_transformations.cpp b/src/common/transformations/tests/common_optimizations/moc_transformations.cpp index 2e90bd5de67..ab5af2bfacc 100644 --- a/src/common/transformations/tests/common_optimizations/moc_transformations.cpp +++ b/src/common/transformations/tests/common_optimizations/moc_transformations.cpp @@ -2,10 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/moc_transformations.hpp" + #include #include -#include #include "openvino/core/model.hpp" #include "openvino/opsets/opset12.hpp" diff --git a/src/common/transformations/tests/common_optimizations/mul_fake_quantize_fusion.cpp b/src/common/transformations/tests/common_optimizations/mul_fake_quantize_fusion.cpp index 34aa546e229..e49c1824933 100644 --- a/src/common/transformations/tests/common_optimizations/mul_fake_quantize_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/mul_fake_quantize_fusion.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/mul_fake_quantize_fusion.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/mvn_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/mvn_fusion_test.cpp index 831ccaf2f63..4885de0b55a 100644 --- a/src/common/transformations/tests/common_optimizations/mvn_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/mvn_fusion_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/mvn_fusion.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/nearest_neighbor_upsampling_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/nearest_neighbor_upsampling_fusion_test.cpp index db461ae8118..9217a5e75c7 100644 --- a/src/common/transformations/tests/common_optimizations/nearest_neighbor_upsampling_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/nearest_neighbor_upsampling_fusion_test.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/nearest_neighbor_upsampling_fusion.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "openvino/pass/visualize_tree.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/ngraph_fq_transpose_test.cpp b/src/common/transformations/tests/common_optimizations/ngraph_fq_transpose_test.cpp index 50216db8ac7..bc22bb54f74 100644 --- a/src/common/transformations/tests/common_optimizations/ngraph_fq_transpose_test.cpp +++ b/src/common/transformations/tests/common_optimizations/ngraph_fq_transpose_test.cpp @@ -7,20 +7,20 @@ #include #include #include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/op/constant.hpp" +#include "openvino/op/fake_quantize.hpp" #include "openvino/op/sigmoid.hpp" +#include "openvino/op/transpose.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/pull_transpose_through_fq.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/nonzero_horizontal_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/nonzero_horizontal_fusion_test.cpp index 3ab1e15b9f3..6a7bca0feff 100644 --- a/src/common/transformations/tests/common_optimizations/nonzero_horizontal_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/nonzero_horizontal_fusion_test.cpp @@ -2,14 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/nonzero_horizontal_fusion.hpp" + #include #include -#include #include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/opsets/opset10.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/nop_elimination.cpp b/src/common/transformations/tests/common_optimizations/nop_elimination.cpp index 4014397167b..0513db08d82 100644 --- a/src/common/transformations/tests/common_optimizations/nop_elimination.cpp +++ b/src/common/transformations/tests/common_optimizations/nop_elimination.cpp @@ -2,28 +2,29 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/nop_elimination.hpp" + #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include -#include -#include -#include -#include #include "common_test_utils/common_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "ngraph_functions/builders.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset10.hpp" +#include "openvino/opsets/opset9.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/rt_info/fused_names_attribute.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace std; diff --git a/src/common/transformations/tests/common_optimizations/normalize_l2_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/normalize_l2_fusion_test.cpp index 58d81080b2f..45a2f548afe 100644 --- a/src/common/transformations/tests/common_optimizations/normalize_l2_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/normalize_l2_fusion_test.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/normalize_l2_fusion.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/optimize_strided_slice_test.cpp b/src/common/transformations/tests/common_optimizations/optimize_strided_slice_test.cpp index 79a31314d47..6a7c4d56590 100644 --- a/src/common/transformations/tests/common_optimizations/optimize_strided_slice_test.cpp +++ b/src/common/transformations/tests/common_optimizations/optimize_strided_slice_test.cpp @@ -2,25 +2,26 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/optimize_strided_slice.hpp" + #include #include #include #include -#include -#include -#include -#include -#include #include #include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" #include "openvino/core/partial_shape.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/pad_fusion.cpp b/src/common/transformations/tests/common_optimizations/pad_fusion.cpp index 5f8918387df..cc76b81642d 100644 --- a/src/common/transformations/tests/common_optimizations/pad_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/pad_fusion.cpp @@ -2,22 +2,22 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/pad_fusion.hpp" + #include -#include #include -#include #include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/core/model.hpp" +#include "openvino/op/pad.hpp" #include "openvino/opsets/opset12.hpp" #include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/nop_elimination.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/preprocessing_fusion_tests.cpp b/src/common/transformations/tests/common_optimizations/preprocessing_fusion_tests.cpp index fa279ae4d31..20801c2a182 100644 --- a/src/common/transformations/tests/common_optimizations/preprocessing_fusion_tests.cpp +++ b/src/common/transformations/tests/common_optimizations/preprocessing_fusion_tests.cpp @@ -5,20 +5,20 @@ #include #include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "openvino/core/model.hpp" +#include "openvino/core/preprocess/pre_post_process.hpp" #include "openvino/opsets/opset12.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/serialize.hpp" +#include "transformations/common_optimizations/moc_transformations.hpp" +#include "transformations/common_optimizations/ric_fusion.hpp" +#include "transformations/common_optimizations/transpose_sinking.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/pull_through_reduce_test.cpp b/src/common/transformations/tests/common_optimizations/pull_through_reduce_test.cpp index 349f5b39a03..a516e966090 100644 --- a/src/common/transformations/tests/common_optimizations/pull_through_reduce_test.cpp +++ b/src/common/transformations/tests/common_optimizations/pull_through_reduce_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/pull_through_reduce.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset9.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/push_constant_to_subgraphs.cpp b/src/common/transformations/tests/common_optimizations/push_constant_to_subgraphs.cpp index 0dd3f7a1a08..839d7dea342 100644 --- a/src/common/transformations/tests/common_optimizations/push_constant_to_subgraphs.cpp +++ b/src/common/transformations/tests/common_optimizations/push_constant_to_subgraphs.cpp @@ -2,11 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset10.hpp" +#include "transformations/common_optimizations/push_constant_to_subgraph.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/random_uniform_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/random_uniform_fusion_test.cpp index 6ce7d86f52b..3d8bb05930a 100644 --- a/src/common/transformations/tests/common_optimizations/random_uniform_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/random_uniform_fusion_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/random_uniform_fusion.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/reduce_merge.cpp b/src/common/transformations/tests/common_optimizations/reduce_merge.cpp index e46576abe7d..a9ae6506e14 100644 --- a/src/common/transformations/tests/common_optimizations/reduce_merge.cpp +++ b/src/common/transformations/tests/common_optimizations/reduce_merge.cpp @@ -2,14 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/reduce_merge.hpp" + #include -#include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset9.hpp" +#include "openvino/pass/manager.hpp" using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/reduce_reshape_fusion_tests.cpp b/src/common/transformations/tests/common_optimizations/reduce_reshape_fusion_tests.cpp index 106d7838e88..6bc4e678ec9 100644 --- a/src/common/transformations/tests/common_optimizations/reduce_reshape_fusion_tests.cpp +++ b/src/common/transformations/tests/common_optimizations/reduce_reshape_fusion_tests.cpp @@ -5,16 +5,16 @@ #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset9.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/reduce_reshape_fusion.hpp" +#include "transformations/common_optimizations/transpose_to_reshape.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace std; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/relu_fake_quantize_fusion.cpp b/src/common/transformations/tests/common_optimizations/relu_fake_quantize_fusion.cpp index 38bda7fdbcd..866b21dcb03 100644 --- a/src/common/transformations/tests/common_optimizations/relu_fake_quantize_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/relu_fake_quantize_fusion.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/relu_fake_quantize_fusion.hpp" + #include #include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/remove_concat_zero_dim_input_test.cpp b/src/common/transformations/tests/common_optimizations/remove_concat_zero_dim_input_test.cpp index f020d307be5..d0c30243016 100644 --- a/src/common/transformations/tests/common_optimizations/remove_concat_zero_dim_input_test.cpp +++ b/src/common/transformations/tests/common_optimizations/remove_concat_zero_dim_input_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/remove_concat_zero_dim_input.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/remove_multi_subgraph_op_dangling_params_tests.cpp b/src/common/transformations/tests/common_optimizations/remove_multi_subgraph_op_dangling_params_tests.cpp index e52d6ca217d..e58947f38ab 100644 --- a/src/common/transformations/tests/common_optimizations/remove_multi_subgraph_op_dangling_params_tests.cpp +++ b/src/common/transformations/tests/common_optimizations/remove_multi_subgraph_op_dangling_params_tests.cpp @@ -5,16 +5,16 @@ #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/remove_concat_zero_dim_input.hpp" +#include "transformations/common_optimizations/remove_multi_subgraph_op_dangling_params.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/reshape_prelu_test.cpp b/src/common/transformations/tests/common_optimizations/reshape_prelu_test.cpp index 23463ef2204..c5d30ac2c8d 100644 --- a/src/common/transformations/tests/common_optimizations/reshape_prelu_test.cpp +++ b/src/common/transformations/tests/common_optimizations/reshape_prelu_test.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/reshape_prelu.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/pass/manager.hpp" +#include "ov_ops/type_relaxed.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/reshape_sequence_fusion.cpp b/src/common/transformations/tests/common_optimizations/reshape_sequence_fusion.cpp index 7e0c099da03..ba123af81b0 100644 --- a/src/common/transformations/tests/common_optimizations/reshape_sequence_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/reshape_sequence_fusion.cpp @@ -2,16 +2,17 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/reshape_sequence_fusion.hpp" + #include #include -#include -#include #include #include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset6.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/reverse_shape_and_type_infer.cpp b/src/common/transformations/tests/common_optimizations/reverse_shape_and_type_infer.cpp index 6dc801ee475..f550b92ea07 100644 --- a/src/common/transformations/tests/common_optimizations/reverse_shape_and_type_infer.cpp +++ b/src/common/transformations/tests/common_optimizations/reverse_shape_and_type_infer.cpp @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/reverse_shape_and_type_infer.hpp" + #include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/opsets/opset10.hpp" #include "openvino/opsets/opset12.hpp" using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/select_with_one_value_condition_test.cpp b/src/common/transformations/tests/common_optimizations/select_with_one_value_condition_test.cpp index 0c49dad0461..dedf18ee06c 100644 --- a/src/common/transformations/tests/common_optimizations/select_with_one_value_condition_test.cpp +++ b/src/common/transformations/tests/common_optimizations/select_with_one_value_condition_test.cpp @@ -6,7 +6,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/opsets/opset10.hpp" using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/sequence_fusion.cpp b/src/common/transformations/tests/common_optimizations/sequence_fusion.cpp index 645ce18d922..2582975ccba 100644 --- a/src/common/transformations/tests/common_optimizations/sequence_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/sequence_fusion.cpp @@ -8,7 +8,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/opsets/opset3.hpp" #include "openvino/opsets/opset9.hpp" #include "ov_ops/augru_cell.hpp" diff --git a/src/common/transformations/tests/common_optimizations/shared_ops_optimization.cpp b/src/common/transformations/tests/common_optimizations/shared_ops_optimization.cpp index 1dd93874cdd..698973740e0 100644 --- a/src/common/transformations/tests/common_optimizations/shared_ops_optimization.cpp +++ b/src/common/transformations/tests/common_optimizations/shared_ops_optimization.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2018-2023 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/shared_ops_optimization.hpp" + #include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/parameter.hpp" diff --git a/src/common/transformations/tests/common_optimizations/shuffle_channels_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/shuffle_channels_fusion_test.cpp index d3e545d3919..f8dae816e46 100644 --- a/src/common/transformations/tests/common_optimizations/shuffle_channels_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/shuffle_channels_fusion_test.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/shuffle_channels_fusion.hpp" + #include #include -#include -#include -#include #include -#include -#include #include "common_test_utils/common_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" namespace { using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/simplify_second_input_of_reshape_test.cpp b/src/common/transformations/tests/common_optimizations/simplify_second_input_of_reshape_test.cpp index 276a9e78795..7431174daaa 100644 --- a/src/common/transformations/tests/common_optimizations/simplify_second_input_of_reshape_test.cpp +++ b/src/common/transformations/tests/common_optimizations/simplify_second_input_of_reshape_test.cpp @@ -5,13 +5,13 @@ #include #include -#include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/simplify_shape_of_sub_graph.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/simplify_shape_of_sub_graph.cpp b/src/common/transformations/tests/common_optimizations/simplify_shape_of_sub_graph.cpp index 6769b34fc33..7c09340b375 100644 --- a/src/common/transformations/tests/common_optimizations/simplify_shape_of_sub_graph.cpp +++ b/src/common/transformations/tests/common_optimizations/simplify_shape_of_sub_graph.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/simplify_shape_of_sub_graph.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/skip_gather_before_transpose_and_reshape_test.cpp b/src/common/transformations/tests/common_optimizations/skip_gather_before_transpose_and_reshape_test.cpp index d088474ba28..3535e9250c0 100644 --- a/src/common/transformations/tests/common_optimizations/skip_gather_before_transpose_and_reshape_test.cpp +++ b/src/common/transformations/tests/common_optimizations/skip_gather_before_transpose_and_reshape_test.cpp @@ -2,17 +2,18 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/skip_gather_before_transpose_and_reshape.hpp" + #include #include -#include -#include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/softmax_fusion.cpp b/src/common/transformations/tests/common_optimizations/softmax_fusion.cpp index c2b86ca5aa1..42fef042146 100644 --- a/src/common/transformations/tests/common_optimizations/softmax_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/softmax_fusion.cpp @@ -2,16 +2,16 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/softmax_fusion.hpp" + #include -#include -#include -#include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/manager.hpp" +#include "openvino/pass/serialize.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/softplus_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/softplus_fusion_test.cpp index 6ea43efa0ed..dbec848af67 100644 --- a/src/common/transformations/tests/common_optimizations/softplus_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/softplus_fusion_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/softplus_fusion.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/space_to_batch_fusion.cpp b/src/common/transformations/tests/common_optimizations/space_to_batch_fusion.cpp index 5ce8a005326..5d2c13b8939 100644 --- a/src/common/transformations/tests/common_optimizations/space_to_batch_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/space_to_batch_fusion.cpp @@ -2,21 +2,22 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/space_to_batch_fusion.hpp" + #include #include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/op/pad.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/split_concat_pair_to_interpolate_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/split_concat_pair_to_interpolate_fusion_test.cpp index 4817d9faadb..059d662a0e4 100644 --- a/src/common/transformations/tests/common_optimizations/split_concat_pair_to_interpolate_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/split_concat_pair_to_interpolate_fusion_test.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "openvino/pass/visualize_tree.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/split_squeeze_concat_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/split_squeeze_concat_fusion_test.cpp index 6829430fd79..d5e23376c66 100644 --- a/src/common/transformations/tests/common_optimizations/split_squeeze_concat_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/split_squeeze_concat_fusion_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/split_squeeze_concat_fusion.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/strides_optimization.cpp b/src/common/transformations/tests/common_optimizations/strides_optimization.cpp index 581b2885433..6b24813fab7 100644 --- a/src/common/transformations/tests/common_optimizations/strides_optimization.cpp +++ b/src/common/transformations/tests/common_optimizations/strides_optimization.cpp @@ -2,15 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/strides_optimization.hpp" + #include -#include -#include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/subtract_fusion.cpp b/src/common/transformations/tests/common_optimizations/subtract_fusion.cpp index e1896d05534..39e261a9f49 100644 --- a/src/common/transformations/tests/common_optimizations/subtract_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/subtract_fusion.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/subtract_fusion.hpp" + #include #include -#include -#include -#include #include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/divide_fusion.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/swish_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/swish_fusion_test.cpp index a54c53a3d88..341b572d10d 100644 --- a/src/common/transformations/tests/common_optimizations/swish_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/swish_fusion_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/swish_fusion.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/transpose_reshape_elimination_for_matmul.cpp b/src/common/transformations/tests/common_optimizations/transpose_reshape_elimination_for_matmul.cpp index 8111eea20d1..6071554e0c3 100644 --- a/src/common/transformations/tests/common_optimizations/transpose_reshape_elimination_for_matmul.cpp +++ b/src/common/transformations/tests/common_optimizations/transpose_reshape_elimination_for_matmul.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/op_conversions/einsum_decomposition.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/transpose_sinking_test.cpp b/src/common/transformations/tests/common_optimizations/transpose_sinking_test.cpp index e6f376690f4..0aa8b8b06e5 100644 --- a/src/common/transformations/tests/common_optimizations/transpose_sinking_test.cpp +++ b/src/common/transformations/tests/common_optimizations/transpose_sinking_test.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/transpose_sinking.hpp" + #include #include -#include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "ngraph_functions/utils/ngraph_helpers.hpp" +#include "openvino/core/model.hpp" +#include "openvino/core/preprocess/pre_post_process.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/transpose_to_reshape_test.cpp b/src/common/transformations/tests/common_optimizations/transpose_to_reshape_test.cpp index b86f7893535..89006f26348 100644 --- a/src/common/transformations/tests/common_optimizations/transpose_to_reshape_test.cpp +++ b/src/common/transformations/tests/common_optimizations/transpose_to_reshape_test.cpp @@ -2,23 +2,24 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/transpose_to_reshape.hpp" + #include #include #include #include -#include -#include #include #include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset3.hpp" +#include "transformations/common_optimizations/transpose_sinking.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/common_optimizations/weights_dequantize_to_fake_quantize.cpp b/src/common/transformations/tests/common_optimizations/weights_dequantize_to_fake_quantize.cpp index b0aab6ea4d8..5ef8239896f 100644 --- a/src/common/transformations/tests/common_optimizations/weights_dequantize_to_fake_quantize.cpp +++ b/src/common/transformations/tests/common_optimizations/weights_dequantize_to_fake_quantize.cpp @@ -2,18 +2,18 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/weights_dequantize_to_fake_quantize.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/common_optimizations/wrap_interpolate_into_transposes_test.cpp b/src/common/transformations/tests/common_optimizations/wrap_interpolate_into_transposes_test.cpp index 0e8ba7fcd16..4d92ad3a5be 100644 --- a/src/common/transformations/tests/common_optimizations/wrap_interpolate_into_transposes_test.cpp +++ b/src/common/transformations/tests/common_optimizations/wrap_interpolate_into_transposes_test.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/wrap_interpolate_into_transposes.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "openvino/pass/visualize_tree.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/const_folding_for_if.cpp b/src/common/transformations/tests/const_folding_for_if.cpp index da00ec86346..017cdc0aa04 100644 --- a/src/common/transformations/tests/const_folding_for_if.cpp +++ b/src/common/transformations/tests/const_folding_for_if.cpp @@ -4,16 +4,15 @@ #include -#include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" #include "openvino/opsets/opset1.hpp" #include "openvino/opsets/opset5.hpp" #include "openvino/opsets/opset8.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace std; using namespace ov; diff --git a/src/common/transformations/tests/const_folding_prior_box.cpp b/src/common/transformations/tests/const_folding_prior_box.cpp index b9d10128298..347414edda7 100644 --- a/src/common/transformations/tests/const_folding_prior_box.cpp +++ b/src/common/transformations/tests/const_folding_prior_box.cpp @@ -5,18 +5,18 @@ #include #include -#include -#include -#include -#include -#include -#include #include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" #include "functional_test_utils/skip_tests_config.hpp" +#include "openvino/core/model.hpp" +#include "openvino/op/ops.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/control_flow/unroll_if_test.cpp b/src/common/transformations/tests/control_flow/unroll_if_test.cpp index 9d43aa18fcd..1ffff85410b 100644 --- a/src/common/transformations/tests/control_flow/unroll_if_test.cpp +++ b/src/common/transformations/tests/control_flow/unroll_if_test.cpp @@ -2,16 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/control_flow/unroll_if.hpp" + #include #include -#include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/op/add.hpp" #include "openvino/op/if.hpp" #include "openvino/op/logical_not.hpp" @@ -19,6 +16,10 @@ #include "openvino/op/split.hpp" #include "openvino/op/subtract.hpp" #include "openvino/op/variadic_split.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/push_constant_to_subgraph.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/control_flow/unroll_loop_test.cpp b/src/common/transformations/tests/control_flow/unroll_loop_test.cpp index ad6e5eede72..084ec4d9916 100644 --- a/src/common/transformations/tests/control_flow/unroll_loop_test.cpp +++ b/src/common/transformations/tests/control_flow/unroll_loop_test.cpp @@ -5,17 +5,17 @@ #include #include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/control_flow/unroll_tensor_iterator.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/control_flow/unroll_tensor_iterator_test.cpp b/src/common/transformations/tests/control_flow/unroll_tensor_iterator_test.cpp index 4b8ea46a78d..75e58c57121 100644 --- a/src/common/transformations/tests/control_flow/unroll_tensor_iterator_test.cpp +++ b/src/common/transformations/tests/control_flow/unroll_tensor_iterator_test.cpp @@ -2,22 +2,23 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/control_flow/unroll_tensor_iterator.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/make_stateful_test.cpp b/src/common/transformations/tests/make_stateful_test.cpp index 771d913df4e..27fdc3e80a9 100644 --- a/src/common/transformations/tests/make_stateful_test.cpp +++ b/src/common/transformations/tests/make_stateful_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "openvino/pass/make_stateful.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/offline_transformations/pruning_test.cpp b/src/common/transformations/tests/offline_transformations/pruning_test.cpp index 7ad89bc79e3..92b99842cdc 100644 --- a/src/common/transformations/tests/offline_transformations/pruning_test.cpp +++ b/src/common/transformations/tests/offline_transformations/pruning_test.cpp @@ -2,27 +2,28 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "pruning.hpp" + #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "inference_engine.hpp" +#include "mask_attribute.hpp" +#include "ngraph/coordinate_transform.hpp" +#include "openvino/core/model.hpp" +#include "openvino/op/util/attr_types.hpp" +#include "openvino/op/util/pad_base.hpp" +#include "openvino/opsets/opset10.hpp" #include "openvino/opsets/opset12.hpp" +#include "openvino/pass/manager.hpp" +#include "openvino/pass/serialize.hpp" +#include "openvino/pass/visualize_tree.hpp" +#include "openvino/util/env_util.hpp" +#include "transformations/init_node_info.hpp" #define VISUALIZE_TESTS_TREE false #define VISUALIZE_TREE_ROOT "/tmp/" @@ -50,12 +51,12 @@ Output create_constant_with_zeros(const Shape& shape, const Mask& mask) { Coordinate coord_end(shape); coord_end[dim] = dim_value + 1; - NGRAPH_SUPPRESS_DEPRECATED_START + OPENVINO_SUPPRESS_DEPRECATED_START ngraph::CoordinateTransform iter(shape, coord_begin, coord_end); for (const Coordinate& coord : iter) { values[iter.index(coord)] = 0; } - NGRAPH_SUPPRESS_DEPRECATED_END + OPENVINO_SUPPRESS_DEPRECATED_END } } return std::make_shared(element::f32, shape, values); @@ -77,8 +78,8 @@ class TransformationTestsBoolParamF : public TransformationTestsF, public testin // // { // pass::Manager m; -// m.register_pass(); -// m.register_pass(); +// m.register_pass(); +// m.register_pass(); // } // // VisualizeTree modifier helps to print Masks and mark nodes with masks // auto modifier = [](const Node& node, std::vector& attributes) { @@ -110,7 +111,7 @@ class TransformationTestsBoolParamF : public TransformationTestsF, public testin // { // pass::Manager m; // m.register_pass(std::string(VISUALIZE_TREE_ROOT) + "PruneIRTest_with_masks.svg", -// modifier); m.register_pass(); +// modifier); m.register_pass(); // m.register_pass(std::string(VISUALIZE_TREE_ROOT) + // "PruneIRTest_with_masks_after_shrink.svg", modifier); // } @@ -127,7 +128,7 @@ class TransformationTestsBoolParamF : public TransformationTestsF, public testin TEST(TransformationTests, InitMasksOI) { Shape weights_shape{6, 3, 3, 3}; auto weights = opset10::Constant::create(element::f32, weights_shape, {0}); - ngraph::pass::InitConstMask({0, 1}).apply(weights); + ov::pass::InitConstMask({0, 1}).apply(weights); compare_masks(*getMask(weights->output(0)), {{0, 1, 2, 3, 4, 5}, {0, 1, 2}, {}, {}}); } @@ -136,15 +137,15 @@ TEST(TransformationTests, InitMasksOutputChannel) { Shape input_shape{1, 3, 64, 64}; Shape weights_shape{6, 3, 3, 3}; std::vector values(shape_size(weights_shape), 1); - NGRAPH_SUPPRESS_DEPRECATED_START + OPENVINO_SUPPRESS_DEPRECATED_START ngraph::CoordinateTransform iter(weights_shape, {0, 1, 0, 0}, {6, 2, 3, 3}); for (const Coordinate& coord : iter) { values[iter.index(coord)] = 0; } - NGRAPH_SUPPRESS_DEPRECATED_END + OPENVINO_SUPPRESS_DEPRECATED_END auto weights = std::make_shared(element::f32, weights_shape, values); - ngraph::pass::InitConstMask({1}).apply(weights); + ov::pass::InitConstMask({1}).apply(weights); compare_masks(*getMask(weights->output(0)), {{}, {1}, {}, {}}); } @@ -164,7 +165,7 @@ TEST(TransformationTests, TestInitMasks) { auto f = std::make_shared(NodeVector{conv}, ParameterVector{input}); pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(f); compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), {{1, 2, 3}, {}, {}, {}}); @@ -173,7 +174,7 @@ TEST(TransformationTests, TestInitMasks) { TEST(TransformationTests, InitMasksNegative) { Shape weights_shape{6, 3, 3, 3}; auto weights = opset10::Constant::create(element::f32, weights_shape, {0.5}); - ngraph::pass::InitConstMask({0, 1, 2, 3}).apply(weights); + ov::pass::InitConstMask({0, 1, 2, 3}).apply(weights); compare_masks(*getMask(weights->output(0)), {{}, {}, {}, {}}); } @@ -192,8 +193,8 @@ TEST(TransformationTests, PropagateMasksNegative) { auto f = std::make_shared(NodeVector{conv}, ParameterVector{input}); pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); compare_masks(*getMask(weights->output(0)), {{}, {}, {}, {}}); @@ -272,8 +273,8 @@ TEST_F(TransformationTestsF, PropagateMasksBasic) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PropagateMasksBasic.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights->output(0)), Mask({{1, 2, 3}, {}, {}, {}})); @@ -288,7 +289,7 @@ TEST_F(TransformationTestsF, PropagateMasksBasic) { compare_masks(*getMask(weights2.get_node_shared_ptr()->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); compare_masks(*getMask(conv2->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -358,8 +359,8 @@ TEST_F(TransformationTestsF, PropagateMasksDynamicConvolution) { { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -371,7 +372,7 @@ TEST_F(TransformationTestsF, PropagateMasksDynamicConvolution) { compare_masks(*getMask(weights2->output(0)), Mask({{}, {2}, {}, {}})); compare_masks(*getMask(conv2->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -407,7 +408,7 @@ TEST(TransformationTests, PropagateMasksDynamicReshape) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PropagateMasksDynamicReshape.svg").run_on_model(model); pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); compare_masks(*getMask(weights->output(0)), Mask({{}, {}, {}, {}})); @@ -452,8 +453,8 @@ TEST(TransformationTests, PropagateMasksDynamicGroupConvolution) { .run_on_model(f); pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); } @@ -490,8 +491,8 @@ TEST(TransformationTests, PropagateMasksEmpty) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PropagateMasksEmpty.svg").run_on_model(f); pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); compare_masks(*getMask(weights->output(0)), Mask({{}, {}, {}, {}})); @@ -586,8 +587,8 @@ TEST_F(TransformationTestsF, PropagateMaskPassThrough) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PropagateMaskPassThrough.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights_const_1.get_node_shared_ptr()->output(0)), Mask({{1, 2, 3}, {}, {}, {}})); @@ -596,7 +597,7 @@ TEST_F(TransformationTestsF, PropagateMaskPassThrough) { compare_masks(*getMask(clamp->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); compare_masks(*getMask(max_pool->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -677,8 +678,8 @@ TEST_F(TransformationTestsF, NegativePad12PropagateMaskPassThrough) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PropagateMaskPassThrough.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights_const_1.get_node_shared_ptr()->output(0)), Mask({{1, 2, 3}, {}, {}, {}})); @@ -687,7 +688,7 @@ TEST_F(TransformationTestsF, NegativePad12PropagateMaskPassThrough) { compare_masks(*getMask(clamp->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); compare_masks(*getMask(max_pool->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -829,8 +830,8 @@ TEST_F(TransformationTestsF, PropagateMasksHardDependencies) { .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights1.get_node_shared_ptr()->output(0)), Mask({{2}, {}, {}, {}})); @@ -855,7 +856,7 @@ TEST_F(TransformationTestsF, PropagateMasksHardDependencies) { // compare_masks(*getMask(weights2), Mask({{}, {0, 1, 2, 3, 4, 5}, {}, {}})); // compare_masks(*getMask(conv2), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -980,8 +981,8 @@ TEST_F(TransformationTestsF, PropagateMasksQuantizedGroupConvolution) { .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -1001,7 +1002,7 @@ TEST_F(TransformationTestsF, PropagateMasksQuantizedGroupConvolution) { compare_masks(*getMask(weights_2->output(0)), Mask({{}, {0, 1, 2, 3, 4}, {}, {}})); compare_masks(*getMask(conv2->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -1146,8 +1147,8 @@ TEST_F(TransformationTestsF, PropagateMasksQuantizedGroupConvolutionWithShapeOf) .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -1168,7 +1169,7 @@ TEST_F(TransformationTestsF, PropagateMasksQuantizedGroupConvolutionWithShapeOf) compare_masks(*getMask(weights_2->output(0)), Mask({{}, {0, 1, 2, 3}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -1282,8 +1283,8 @@ TEST_F(TransformationTestsF, PropagateMasksFakeQuantizePerTensor) { // Masks for fq input parammeters didn't saved after // ShrinkWeights pass so pruning transformation is splitted // on propagation and shrinking passes - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } pass::Manager m; @@ -1305,7 +1306,7 @@ TEST_F(TransformationTestsF, PropagateMasksFakeQuantizePerTensor) { compare_masks(*getMask(weights_2->output(0)), Mask({{}, {0, 1, 2, 3, 4}, {}, {}})); compare_masks(*getMask(conv2->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -1363,7 +1364,7 @@ TEST(TransformationTests, PropagateMasksFakeQuantizePerTensor1DScale) { { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -1483,8 +1484,8 @@ TEST_F(TransformationTestsF, PropagateMasksFakeQuantizePerChannel) { // Masks for fq input parammeters didn't saved after // ShrinkWeights pass so pruning transformation is splitted // on propagation and shrinking passes - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights_1->output(0)), Mask({{0, 1, 2, 3, 4}, {}, {}, {}})); @@ -1509,7 +1510,7 @@ TEST_F(TransformationTestsF, PropagateMasksFakeQuantizePerChannel) { compare_masks(*getMask(fq->input(3).get_source_output()), Mask({{}, {0, 1, 2, 3, 4}, {}, {}})); compare_masks(*getMask(fq->input(4).get_source_output()), Mask({{}, {0, 1, 2, 3, 4}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -1622,8 +1623,8 @@ TEST_F(TransformationTestsF, TestConcatMaskPropagation) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "TestConcatMaskPropagation.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights_1.get_node_shared_ptr()->output(0)), Mask({{0, 1, 2, 3}, {}, {}, {}})); @@ -1639,7 +1640,7 @@ TEST_F(TransformationTestsF, TestConcatMaskPropagation) { compare_masks(*getMask(weights_out_conv.get_node_shared_ptr()->output(0)), Mask({{}, {0, 1, 2, 3, 15, 16, 17, 18, 28, 29, 30, 31}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -1764,8 +1765,8 @@ TEST_F(TransformationTestsF, TestConcatMaskPropagationUp) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "TestConcatMaskPropagationUp.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights_1.get_node_shared_ptr()->output(0)), Mask({{0, 1, 2, 3}, {}, {}, {}})); @@ -1785,7 +1786,7 @@ TEST_F(TransformationTestsF, TestConcatMaskPropagationUp) { compare_masks(*getMask(weights_out_conv.get_node_shared_ptr()->output(0)), Mask({{}, {0, 1, 2, 3, 15, 16, 17, 18, 28, 29, 30, 31}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -1834,8 +1835,8 @@ TEST(TransformationTests, TestConcatMaskPropagationUpEmpty) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "TestConcatMaskPropagationUpEmpty.svg").run_on_model(f); pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); compare_masks(*getMask(weights_1.get_node_shared_ptr()->output(0)), Mask({{}, {}, {}, {}})); @@ -1936,8 +1937,8 @@ TEST_F(TransformationTestsF, PruneConvIsClosingAndInGroup) { } { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{1, 2, 3}, {}, {}, {}})); @@ -1953,7 +1954,7 @@ TEST_F(TransformationTestsF, PruneConvIsClosingAndInGroup) { compare_masks(*getMask(weights_end_conv.get_node_shared_ptr()->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); compare_masks(*getMask(end_conv->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -2009,7 +2010,7 @@ TEST(TransformationTests, PruneBranchingStopOp) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PruneBranchingStopOp.svg").run_on_model(model); pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{}, {}, {}, {}})); @@ -2064,7 +2065,7 @@ TEST(TransformationTests, PruneStopOpUp) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PruneStopOpUp.svg").run_on_model(model); pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{}, {}, {}, {}})); @@ -2131,8 +2132,8 @@ TEST_F(TransformationTestsF, PruneReducelayerUp) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PruneReducelayerUp.svg").run_on_model(model); pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{1, 2, 3}, {}, {}, {}})); @@ -2141,7 +2142,7 @@ TEST_F(TransformationTestsF, PruneReducelayerUp) { compare_masks(*getMask(conv_1_weights.get_node_shared_ptr()->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); compare_masks(*getMask(conv_1->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -2227,8 +2228,8 @@ TEST_F(TransformationTestsF, PruneReduceLayerDown) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PruneReduceLayerDown.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{1, 2, 3}, {}, {}, {}})); @@ -2243,7 +2244,7 @@ TEST_F(TransformationTestsF, PruneReduceLayerDown) { compare_masks(*getMask(weights_end_conv.get_node_shared_ptr()->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); compare_masks(*getMask(end_conv->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -2278,7 +2279,7 @@ TEST(TransformationTests, PruneStopReducelayerUp) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PruneStopReducelayerUp.svg").run_on_model(model); pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{}, {}, {}, {}})); @@ -2334,7 +2335,7 @@ TEST(TransformationTests, PruneStopReduceLayerDown) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PruneStopReduceLayerDown.svg").run_on_model(model); pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{}, {}, {}, {}})); @@ -2408,8 +2409,8 @@ TEST_F(TransformationTestsF, MaskPropagationReshapeUp) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "MaskPropagationReshapeUp.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{1, 2, 3}, {}, {}, {}})); @@ -2418,7 +2419,7 @@ TEST_F(TransformationTestsF, MaskPropagationReshapeUp) { compare_masks(*getMask(conv_1_weights.get_node_shared_ptr()->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); compare_masks(*getMask(conv_1->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -2519,8 +2520,8 @@ TEST_P(TransformationTestsBoolParamF, MaskPropagationReshapeUpWithShapeOf) { } { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{1, 2, 3}, {}, {}, {}})); @@ -2529,7 +2530,7 @@ TEST_P(TransformationTestsBoolParamF, MaskPropagationReshapeUpWithShapeOf) { compare_masks(*getMask(conv_1_weights.get_node_shared_ptr()->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); compare_masks(*getMask(conv_1->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -2630,8 +2631,8 @@ TEST_F(TransformationTestsF, MaskPropagationReshapeUpShapeSubGraph) { .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{1, 2, 3}, {}, {}, {}})); @@ -2640,7 +2641,7 @@ TEST_F(TransformationTestsF, MaskPropagationReshapeUpShapeSubGraph) { compare_masks(*getMask(conv_1_weights.get_node_shared_ptr()->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); compare_masks(*getMask(conv_1->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -2721,8 +2722,8 @@ TEST_F(TransformationTestsF, MaskPropagationReshapeExtend) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "MaskPropagationReshapeExtend.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{2, 3}, {}, {}, {}})); @@ -2737,7 +2738,7 @@ TEST_F(TransformationTestsF, MaskPropagationReshapeExtend) { compare_masks(*getMask(conv_1_weights.get_node_shared_ptr()->output(0)), Mask({{}, {2, 3}, {}, {}})); compare_masks(*getMask(conv_1->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -2827,8 +2828,8 @@ TEST_F(DISABLED_TransformationTestsF, MaskPropagationReshapeDownMul) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "MaskPropagationReshapeDownMul.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{1, 2, 3}, {}, {}, {}})); @@ -2841,7 +2842,7 @@ TEST_F(DISABLED_TransformationTestsF, MaskPropagationReshapeDownMul) { compare_masks(*getMask(last_conv_weights.get_node_shared_ptr()->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); compare_masks(*getMask(last_conv->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -2930,8 +2931,8 @@ TEST_F(TransformationTestsF, MaskPropagationReshapeDownAdd) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "MaskPropagationReshapeDownAdd.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{1, 2, 3}, {}, {}, {}})); @@ -2944,7 +2945,7 @@ TEST_F(TransformationTestsF, MaskPropagationReshapeDownAdd) { compare_masks(*getMask(last_conv_weights.get_node_shared_ptr()->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); compare_masks(*getMask(last_conv->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -2978,8 +2979,8 @@ TEST(TransformationTests, MaskPropagationStopReshapeUp) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "MaskPropagationStopReshapeUp.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{}, {}, {}, {}})); @@ -2989,7 +2990,7 @@ TEST(TransformationTests, MaskPropagationStopReshapeUp) { compare_masks(*getMask(conv_1->output(0)), Mask({{}, {}, {}, {}})); { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); } } @@ -3035,8 +3036,8 @@ TEST(TransformationTests, MaskPropagationStopReshapeDown) { .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{}, {}, {}, {}})); @@ -3049,7 +3050,7 @@ TEST(TransformationTests, MaskPropagationStopReshapeDown) { compare_masks(*getMask(last_conv->output(0)), Mask({{}, {}, {}, {}})); { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); } } @@ -3093,8 +3094,8 @@ TEST_F(TransformationTestsF, MaskPropagationReshapeUnsqueezeUp) { .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(right_weights.get_node_shared_ptr()->output(0)), Mask({{}, {2, 3, 4, 5}})); @@ -3107,7 +3108,7 @@ TEST_F(TransformationTestsF, MaskPropagationReshapeUnsqueezeUp) { compare_masks(*getMask(mul_left_up->output(0)), Mask({{}, {1, 2}})); compare_masks(*getMask(mul_left->output(0)), Mask({{}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -3155,8 +3156,8 @@ TEST_F(TransformationTestsF, MaskPropagationReshapeUnsqueezeDown) { .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -3171,7 +3172,7 @@ TEST_F(TransformationTestsF, MaskPropagationReshapeUnsqueezeDown) { compare_masks(*getMask(left_weights.get_node_shared_ptr()->output(0)), Mask({{1, 2}, {}})); compare_masks(*getMask(mul_left->output(0)), Mask({{}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -3216,7 +3217,7 @@ TEST(TransformationTests, MaskPropagationWrongDimsElementwise) { .run_on_model(model); pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{}, {}, {}, {}})); @@ -3327,8 +3328,8 @@ TEST_F(TransformationTestsF, PruneSEBlock) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PruneSEBlock.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(first_conv_weights.get_node_shared_ptr()->output(0)), Mask({{1, 2, 3}, {}, {}, {}})); @@ -3343,7 +3344,7 @@ TEST_F(TransformationTestsF, PruneSEBlock) { compare_masks(*getMask(weights_end_conv.get_node_shared_ptr()->output(0)), Mask({{}, {1, 2, 3}, {}, {}})); compare_masks(*getMask(end_conv->output(0)), Mask({{}, {}, {}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -3418,8 +3419,8 @@ TEST_F(TransformationTestsF, PropagateMasksLinear) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PropagateMasksLinear.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{0, 1, 2}, {}, {}, {}})); @@ -3444,7 +3445,7 @@ TEST_F(TransformationTestsF, PropagateMasksLinear) { compare_masks(*getMask(weights_last_linear.get_node_shared_ptr()->output(0)), Mask{{0, 1, 2}, {}}); compare_masks(*getMask(last_linear->output(0)), Mask{{}, {}}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -3470,8 +3471,8 @@ TEST(TransformationTests, MaskPropagationMatMulStopEmptyABranch) { .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(right_weights.get_node_shared_ptr()->output(0)), Mask({{}, {}})); @@ -3484,7 +3485,7 @@ TEST(TransformationTests, MaskPropagationMatMulStopEmptyABranch) { compare_masks(*getMask(mul_left->output(0)), Mask({{}, {}, {}})); { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); } } @@ -3537,7 +3538,7 @@ TEST(TransformationTests, PruneLinearUp) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PruneLinearUp.svg").run_on_model(model); pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{}, {}, {}, {}})); @@ -3594,7 +3595,7 @@ TEST(TransformationTests, PruneConvUpShort) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PruneConvUpShort.svg").run_on_model(model); pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{}, {}, {}, {}})); @@ -3669,8 +3670,8 @@ TEST_F(TransformationTestsF, MaskPropagationLinearOuterDims) { .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(right_weights.get_node_shared_ptr()->output(0)), Mask({{}, {2, 3, 4, 5}})); @@ -3705,7 +3706,7 @@ TEST_F(TransformationTestsF, MaskPropagationLinearOuterDims) { compare_masks(*getMask(last_mul_const.get_node_shared_ptr()->output(0)), ref_last_mul_mask); compare_masks(*getMask(last_mul->output(0)), Mask({{}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -3748,8 +3749,8 @@ TEST(TransformationTests, MaskPropagationStopLinearOuterDims) { .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(right_weights.get_node_shared_ptr()->output(0)), Mask({{}, {}})); @@ -3770,7 +3771,7 @@ TEST(TransformationTests, MaskPropagationStopLinearOuterDims) { compare_masks(*getMask(last_mul->output(0)), Mask({{}, {}})); { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); } } @@ -3839,8 +3840,8 @@ TEST_F(TransformationTestsF, PruneMasksMatMulColsStopRowsUp) { .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{}, {}, {}, {}})); @@ -3854,7 +3855,7 @@ TEST_F(TransformationTestsF, PruneMasksMatMulColsStopRowsUp) { compare_masks(*getMask(weights_last_linear.get_node_shared_ptr()->output(0)), Mask{{0, 1, 2}, {}}); compare_masks(*getMask(last_linear->output(0)), Mask{{}, {}, {}}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -3928,8 +3929,8 @@ TEST_F(TransformationTestsF, PruneMasksMatMulRowsStopColsUp) { .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{0, 1, 2}, {}, {}, {}})); @@ -3943,7 +3944,7 @@ TEST_F(TransformationTestsF, PruneMasksMatMulRowsStopColsUp) { compare_masks(*getMask(weights_last_linear.get_node_shared_ptr()->output(0)), Mask{{}, {0, 1, 2}}); compare_masks(*getMask(last_linear->output(0)), Mask{{}, {}, {}}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -4023,8 +4024,8 @@ TEST_F(TransformationTestsF, PropagateFlattenUp) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PropagateFlattenUp.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{1, 2}, {}, {}, {}})); @@ -4046,7 +4047,7 @@ TEST_F(TransformationTestsF, PropagateFlattenUp) { compare_masks(*getMask(weights_linear.get_node_shared_ptr()->output(0)), Mask(linear_ref_mask)); compare_masks(*getMask(linear->output(0)), Mask{{}, {}}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -4097,8 +4098,8 @@ TEST_F(TransformationTestsF, PropagateFlattenDown) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PropagateFlattenDown.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } auto weights_mask = getMask(weights.get_node_shared_ptr()->output(0)); @@ -4117,7 +4118,7 @@ TEST_F(TransformationTestsF, PropagateFlattenDown) { compare_masks(*getMask(linear_const.get_node_shared_ptr()->output(0)), linear_mask); compare_masks(*getMask(linear->output(0)), {{}, {}}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -4155,8 +4156,8 @@ TEST_F(TransformationTestsF, PropagateMasksTranspose) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PropagateMasksTranspose.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{1, 2, 3}, {}})); @@ -4165,7 +4166,7 @@ TEST_F(TransformationTestsF, PropagateMasksTranspose) { compare_masks(*getMask(relu->output(0)), Mask({{}, {1, 2, 3}})); compare_masks(*getMask(last_mul->output(0)), Mask{{}, {}}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -4228,8 +4229,8 @@ TEST_F(TransformationTestsF, PropagateMasksTransposeComplex) { .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(weights.get_node_shared_ptr()->output(0)), Mask({{}, {1, 2, 3}, {}, {}, {}})); @@ -4238,7 +4239,7 @@ TEST_F(TransformationTestsF, PropagateMasksTransposeComplex) { compare_masks(*getMask(last_mul_weights), Mask{{1, 2, 3}, {}}); compare_masks(*getMask(last_mul->output(0)), Mask{{}, {}, {}, {}, {}}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -4267,8 +4268,8 @@ TEST(TransformationTests, PropagateMasksTransposeStop) { pass::VisualizeTree(std::string(VISUALIZE_TREE_ROOT) + "PropagateMasksTransposeStop.svg").run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } check_mask_is_not_exist(getMask(weights.get_node_shared_ptr()->output(0))); @@ -4278,7 +4279,7 @@ TEST(TransformationTests, PropagateMasksTransposeStop) { compare_masks(*getMask(last_mul->output(0)), Mask{{}, {}, {}, {}}); { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); } } @@ -4393,8 +4394,8 @@ TEST_F(DISABLED_TransformationTestsF, PropagateMasksBroadcastedEltwiseWithInputs } { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(right_weights.get_node_shared_ptr()->output(0)), Mask({{}, {2, 3, 4, 5}})); @@ -4437,7 +4438,7 @@ TEST_F(DISABLED_TransformationTestsF, PropagateMasksBroadcastedEltwiseWithInputs compare_masks(*getMask(last_mul_const.get_node_shared_ptr()->output(0)), ref_last_mul_mask); compare_masks(*getMask(last_mul->output(0)), Mask({{}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -4570,8 +4571,8 @@ TEST_F(TransformationTestsF, PropagateMasksBroadcastedEltwise) { } { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } compare_masks(*getMask(right_weights.get_node_shared_ptr()->output(0)), Mask({{}, {2, 3, 4, 5}})); @@ -4617,7 +4618,7 @@ TEST_F(TransformationTestsF, PropagateMasksBroadcastedEltwise) { compare_masks(*getMask(last_mul_const.get_node_shared_ptr()->output(0)), ref_last_mul_mask); compare_masks(*getMask(last_mul->output(0)), Mask({{}, {}})); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -4732,8 +4733,8 @@ TEST_F(TransformationTestsF, MaskPropagationComplexReshape) { } { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -4801,7 +4802,7 @@ TEST_F(TransformationTestsF, MaskPropagationComplexReshape) { } }; - manager.register_pass(); + manager.register_pass(); manager.register_pass( std::string(VISUALIZE_TREE_ROOT) + "MaskPropagationComplexReshapeWithMasks.svg", modifier); @@ -4924,8 +4925,8 @@ TEST_P(TransformationTestsBoolParamF, MaskPropagationReshapedPassThroughP) { } { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -4992,7 +4993,7 @@ TEST_P(TransformationTestsBoolParamF, MaskPropagationReshapedPassThroughP) { } }; - manager.register_pass(); + manager.register_pass(); auto postfix = (add_shape_of) ? "True" : "False"; manager.register_pass( std::string(VISUALIZE_TREE_ROOT) + "MaskPropagationReverseFlattenWithMasks" + postfix + ".svg", @@ -5049,8 +5050,8 @@ TEST_P(TransformationTestsBoolParamF, MaskPropagationBroadcastedSameRankEltwiseS } { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -5061,7 +5062,7 @@ TEST_P(TransformationTestsBoolParamF, MaskPropagationBroadcastedSameRankEltwiseS compare_masks(*getMask(mult->output(0)), Mask{{1, 2, 3}, {}}); compare_masks(*getMask(mul_last->output(0)), Mask{{}, {}, {}}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -5096,8 +5097,8 @@ TEST(TransformationTests, MaskPropagationBroadcastedEltwiseInputAndWeightsBroadc } { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -5114,7 +5115,7 @@ TEST(TransformationTests, MaskPropagationBroadcastedEltwiseInputAndWeightsBroadc { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); } } @@ -5146,8 +5147,8 @@ TEST(TransformationTests, MaskPropagationBroadcastedEltwiseWrongBroadcastingMode } { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -5161,7 +5162,7 @@ TEST(TransformationTests, MaskPropagationBroadcastedEltwiseWrongBroadcastingMode { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); } } @@ -5209,8 +5210,8 @@ TEST_F(TransformationTestsF, MaskPropagationMatMulWithSeveralOutputs) { .run_on_model(model); { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -5221,7 +5222,7 @@ TEST_F(TransformationTestsF, MaskPropagationMatMulWithSeveralOutputs) { compare_masks(*getMask(right_matmul_weights), Mask{{1, 2}, {}}); compare_masks(*getMask(right_matmul), Mask{{}, {}}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); } @@ -5240,7 +5241,7 @@ TEST(TransformationTests, CheckReshapeWithNoConstInShape) { .run_on_model(model); pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -5324,7 +5325,7 @@ TEST_F(TransformationTestsF, PruningWithVariadicSplitOnSecondAxis) { model_ref = std::make_shared(NodeVector{conv2, conv3, conv4}, ParameterVector{input}); } - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES); comparator.enable(FunctionsComparator::CmpValues::ATTRIBUTES); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); @@ -5406,7 +5407,7 @@ TEST_F(TransformationTestsF, PruningWithVariadicSplitOnFirstAxis) { model_ref = std::make_shared(OutputVector{conv2, conv3, conv4}, ParameterVector{input}); } - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES); comparator.enable(FunctionsComparator::CmpValues::ATTRIBUTES); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); @@ -5450,8 +5451,8 @@ TEST(TransformationTests, VariadicSplitMaskPropagationSplitOnSecondAxis) { { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -5469,7 +5470,7 @@ TEST(TransformationTests, VariadicSplitMaskPropagationSplitOnSecondAxis) { { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); // create reference function @@ -5553,8 +5554,8 @@ TEST(TransformationTests, VariadicSplitMaskPropagationSplitOnFirstAxis) { { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -5572,7 +5573,7 @@ TEST(TransformationTests, VariadicSplitMaskPropagationSplitOnFirstAxis) { { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); // create reference function @@ -5640,8 +5641,8 @@ TEST(TransformationTests, VariadicSplitMaskPropagationInvalidateMaskOnFirstAndTh { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -5655,7 +5656,7 @@ TEST(TransformationTests, VariadicSplitMaskPropagationInvalidateMaskOnFirstAndTh { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); // create reference function @@ -5762,7 +5763,7 @@ TEST_F(TransformationTestsF, PruningWithSplitOnSecondAxis) { model_ref = std::make_shared(NodeVector{conv2, conv3, conv4}, ParameterVector{input}); } - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES); comparator.enable(FunctionsComparator::CmpValues::ATTRIBUTES); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); @@ -5838,7 +5839,7 @@ TEST_F(TransformationTestsF, PruningWithSplitOnFirstAxis) { model_ref = std::make_shared(NodeVector{conv2, conv3, conv4}, ParameterVector{input}); } - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES); comparator.enable(FunctionsComparator::CmpValues::ATTRIBUTES); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); @@ -5879,8 +5880,8 @@ TEST(TransformationTests, SplitMaskPropagationSplitOnSecondAxis) { { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -5898,7 +5899,7 @@ TEST(TransformationTests, SplitMaskPropagationSplitOnSecondAxis) { { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); auto input = std::make_shared(element::f32, PartialShape{1, 3, 8, 8}); @@ -5977,8 +5978,8 @@ TEST(TransformationTests, SplitMaskPropagationSplitOnFirstAxis) { { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -5996,7 +5997,7 @@ TEST(TransformationTests, SplitMaskPropagationSplitOnFirstAxis) { { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); auto input = std::make_shared(element::f32, PartialShape{6, 3, 8, 8}); @@ -6059,8 +6060,8 @@ TEST(TransformationTests, SplitMaskPropagationInvalidateMaskOnFirstAndThirdOutpu { pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); } @@ -6074,7 +6075,7 @@ TEST(TransformationTests, SplitMaskPropagationInvalidateMaskOnFirstAndThirdOutpu { pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); // create reference function @@ -6139,7 +6140,7 @@ TEST_F(TransformationTestsF, PruningReshapeNegativeOne) { model_ref = std::make_shared(OutputVector{matmul3}, ParameterVector{input}); } - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES); comparator.enable(FunctionsComparator::CmpValues::ATTRIBUTES); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); @@ -6196,7 +6197,7 @@ TEST_F(TransformationTestsF, PruningReshapeNegativeOneNonConstantShape) { model_ref = std::make_shared(OutputVector{matmul3}, ParameterVector{input}); } - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES); comparator.enable(FunctionsComparator::CmpValues::ATTRIBUTES); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); diff --git a/src/common/transformations/tests/op_conversions/batch_norm_decompositoin.cpp b/src/common/transformations/tests/op_conversions/batch_norm_decompositoin.cpp index 87958b3fe22..432647f3ef4 100644 --- a/src/common/transformations/tests/op_conversions/batch_norm_decompositoin.cpp +++ b/src/common/transformations/tests/op_conversions/batch_norm_decompositoin.cpp @@ -5,15 +5,15 @@ #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset5.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/op_conversions/batch_norm_decomposition.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/batch_to_space_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/batch_to_space_decomposition_test.cpp index bd9efa1b630..5b89c46d15a 100644 --- a/src/common/transformations/tests/op_conversions/batch_to_space_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/batch_to_space_decomposition_test.cpp @@ -5,20 +5,20 @@ #include #include -#include -#include -#include -#include #include #include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset10.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/op_conversions/convert_batch_to_space.hpp" +#include "transformations/op_conversions/convert_space_to_batch.hpp" +#include "transformations/utils/utils.hpp" using namespace std; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/bidirectional_sequences_decomposition.cpp b/src/common/transformations/tests/op_conversions/bidirectional_sequences_decomposition.cpp index 05a36a5af50..a5dc59409ef 100644 --- a/src/common/transformations/tests/op_conversions/bidirectional_sequences_decomposition.cpp +++ b/src/common/transformations/tests/op_conversions/bidirectional_sequences_decomposition.cpp @@ -2,21 +2,22 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/bidirectional_sequences_decomposition.hpp" + #include #include -#include -#include -#include #include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_broadcast3_test.cpp b/src/common/transformations/tests/op_conversions/convert_broadcast3_test.cpp index 55a09481314..90f6acef9ca 100644 --- a/src/common/transformations/tests/op_conversions/convert_broadcast3_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_broadcast3_test.cpp @@ -2,26 +2,27 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_broadcast3.hpp" + #include #include #include #include -#include -#include -#include -#include -#include -#include #include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "openvino/pass/visualize_tree.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_broadcast_to_tiles_test.cpp b/src/common/transformations/tests/op_conversions/convert_broadcast_to_tiles_test.cpp index affc5039361..9e359567caf 100644 --- a/src/common/transformations/tests/op_conversions/convert_broadcast_to_tiles_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_broadcast_to_tiles_test.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_broadcast_to_tiles.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_deformable_conv_v8_to_v1_test.cpp b/src/common/transformations/tests/op_conversions/convert_deformable_conv_v8_to_v1_test.cpp index d2a5a7aa0f2..e3bc49c0576 100644 --- a/src/common/transformations/tests/op_conversions/convert_deformable_conv_v8_to_v1_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_deformable_conv_v8_to_v1_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_deformable_conv_v8_to_v1.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_gather_0d_test.cpp b/src/common/transformations/tests/op_conversions/convert_gather_0d_test.cpp index f147ce5a07b..2e1fad8ada5 100644 --- a/src/common/transformations/tests/op_conversions/convert_gather_0d_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_gather_0d_test.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_gather_0d.hpp" + #include #include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_gather_downgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_gather_downgrade_test.cpp index 5b7ba7ff190..9f8447b9c77 100644 --- a/src/common/transformations/tests/op_conversions/convert_gather_downgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_gather_downgrade_test.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_gather_downgrade.hpp" + #include #include -#include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_gather_upgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_gather_upgrade_test.cpp index 303ac23cef1..c818abcb1e5 100644 --- a/src/common/transformations/tests/op_conversions/convert_gather_upgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_gather_upgrade_test.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_gather_upgrade.hpp" + #include #include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/op/constant.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_interpolate11_downgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_interpolate11_downgrade_test.cpp index 7002ef05820..4971f013607 100644 --- a/src/common/transformations/tests/op_conversions/convert_interpolate11_downgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_interpolate11_downgrade_test.cpp @@ -2,16 +2,17 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_interpolate11_downgrade.hpp" + #include #include -#include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/opsets/opset11.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_interpolate1_to_interpolate4_test.cpp b/src/common/transformations/tests/op_conversions/convert_interpolate1_to_interpolate4_test.cpp index 144a2e7c840..8252265fec3 100644 --- a/src/common/transformations/tests/op_conversions/convert_interpolate1_to_interpolate4_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_interpolate1_to_interpolate4_test.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_interpolate1_to_interpolate4.hpp" + #include #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_matrix_nms_to_matrix_nms_ie_internal.cpp b/src/common/transformations/tests/op_conversions/convert_matrix_nms_to_matrix_nms_ie_internal.cpp index 8947567d903..1fa886900d4 100644 --- a/src/common/transformations/tests/op_conversions/convert_matrix_nms_to_matrix_nms_ie_internal.cpp +++ b/src/common/transformations/tests/op_conversions/convert_matrix_nms_to_matrix_nms_ie_internal.cpp @@ -5,21 +5,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "ov_ops/nms_static_shape_ie.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_maxpool_downgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_maxpool_downgrade_test.cpp index 2d36e6a9179..828ccf8d240 100644 --- a/src/common/transformations/tests/op_conversions/convert_maxpool_downgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_maxpool_downgrade_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_maxpool_downgrade.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_maxpool_upgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_maxpool_upgrade_test.cpp index abc8b80fc0e..b31156dfaf1 100644 --- a/src/common/transformations/tests/op_conversions/convert_maxpool_upgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_maxpool_upgrade_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_maxpool_upgrade.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie_internal.cpp b/src/common/transformations/tests/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie_internal.cpp index 9ca051001f8..55295a1c358 100644 --- a/src/common/transformations/tests/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie_internal.cpp +++ b/src/common/transformations/tests/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie_internal.cpp @@ -5,19 +5,19 @@ #include #include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset9.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "ov_ops/multiclass_nms_ie_internal.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_multiclass_nms_upgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_multiclass_nms_upgrade_test.cpp index 42a4b7659c5..a7febbfa035 100644 --- a/src/common/transformations/tests/op_conversions/convert_multiclass_nms_upgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_multiclass_nms_upgrade_test.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_multiclass_nms_upgrade.hpp" + #include #include -#include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/opsets/opset9.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_mvn1_to_mvn6_test.cpp b/src/common/transformations/tests/op_conversions/convert_mvn1_to_mvn6_test.cpp index 91d4de0b9e9..cb7ecf4d706 100644 --- a/src/common/transformations/tests/op_conversions/convert_mvn1_to_mvn6_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_mvn1_to_mvn6_test.cpp @@ -2,19 +2,20 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_mvn1_to_mvn6.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset2.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_nms9_to_nms_ie_internal_test.cpp b/src/common/transformations/tests/op_conversions/convert_nms9_to_nms_ie_internal_test.cpp index 372612e7d57..5b07a27006e 100644 --- a/src/common/transformations/tests/op_conversions/convert_nms9_to_nms_ie_internal_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_nms9_to_nms_ie_internal_test.cpp @@ -2,22 +2,23 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_nms9_to_nms_ie_internal.hpp" + #include #include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset9.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "ov_ops/nms_ie_internal.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/op_conversions/convert_previous_nms_to_nms_9.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_nms_to_nms_ie_internal_test.cpp b/src/common/transformations/tests/op_conversions/convert_nms_to_nms_ie_internal_test.cpp index 796f30fb950..e6e495949e6 100644 --- a/src/common/transformations/tests/op_conversions/convert_nms_to_nms_ie_internal_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_nms_to_nms_ie_internal_test.cpp @@ -2,25 +2,26 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_nms_to_nms_ie_internal.hpp" + #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "ov_ops/nms_ie_internal.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/op_conversions/convert_previous_nms_to_nms_5.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_pad12_downgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_pad12_downgrade_test.cpp index 87584624099..9f8f5aaa2b0 100644 --- a/src/common/transformations/tests/op_conversions/convert_pad12_downgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_pad12_downgrade_test.cpp @@ -2,16 +2,17 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_pad12_downgrade.hpp" + #include #include -#include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset12.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_pad_to_group_conv.cpp b/src/common/transformations/tests/op_conversions/convert_pad_to_group_conv.cpp index 672c7c7a0af..f3e7d6f6cbf 100644 --- a/src/common/transformations/tests/op_conversions/convert_pad_to_group_conv.cpp +++ b/src/common/transformations/tests/op_conversions/convert_pad_to_group_conv.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_pad_to_group_conv.hpp" + #include #include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/core/model.hpp" +#include "openvino/op/pad.hpp" #include "openvino/opsets/opset12.hpp" #include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_5.cpp b/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_5.cpp index 9a1229e6fd8..c9e874ab2f4 100644 --- a/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_5.cpp +++ b/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_5.cpp @@ -2,22 +2,23 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_previous_nms_to_nms_5.hpp" + #include #include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_9.cpp b/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_9.cpp index 0bc5b01380c..8668097e0af 100644 --- a/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_9.cpp +++ b/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_9.cpp @@ -2,23 +2,24 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_previous_nms_to_nms_9.hpp" + #include #include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/opsets/opset9.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_prior_box_v8_to_v0_test.cpp b/src/common/transformations/tests/op_conversions/convert_prior_box_v8_to_v0_test.cpp index d5a91c9b473..26b885ad9b8 100644 --- a/src/common/transformations/tests/op_conversions/convert_prior_box_v8_to_v0_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_prior_box_v8_to_v0_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_prior_box_v8_to_v0.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_reduce_to_pooling_test.cpp b/src/common/transformations/tests/op_conversions/convert_reduce_to_pooling_test.cpp index 393ea4aeb24..33268c2c92e 100644 --- a/src/common/transformations/tests/op_conversions/convert_reduce_to_pooling_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_reduce_to_pooling_test.cpp @@ -2,23 +2,24 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_reduce_to_pooling.hpp" + #include #include #include #include -#include -#include -#include #include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_roi_align_v3_to_v9_test.cpp b/src/common/transformations/tests/op_conversions/convert_roi_align_v3_to_v9_test.cpp index b98f0de9e05..443e3cc2126 100644 --- a/src/common/transformations/tests/op_conversions/convert_roi_align_v3_to_v9_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_roi_align_v3_to_v9_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_roi_align_v3_to_v9.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/opsets/opset9.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_roi_align_v9_to_v3_test.cpp b/src/common/transformations/tests/op_conversions/convert_roi_align_v9_to_v3_test.cpp index 4b51b43a8de..eb710cdf0ee 100644 --- a/src/common/transformations/tests/op_conversions/convert_roi_align_v9_to_v3_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_roi_align_v9_to_v3_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_roi_align_v9_to_v3.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/opsets/opset9.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_scatter_elements_to_scatter_test.cpp b/src/common/transformations/tests/op_conversions/convert_scatter_elements_to_scatter_test.cpp index 48ce4d34eda..ce79a93ad17 100644 --- a/src/common/transformations/tests/op_conversions/convert_scatter_elements_to_scatter_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_scatter_elements_to_scatter_test.cpp @@ -2,24 +2,25 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_scatter_elements_to_scatter.hpp" + #include #include #include #include -#include -#include -#include -#include #include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_scatter_elements_update12_downgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_scatter_elements_update12_downgrade_test.cpp index dfa1d43ef8a..ae5b9e5881e 100644 --- a/src/common/transformations/tests/op_conversions/convert_scatter_elements_update12_downgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_scatter_elements_update12_downgrade_test.cpp @@ -2,16 +2,17 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_scatter_elements_update12_downgrade.hpp" + #include #include -#include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/opsets/opset12.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_sequences_to_ti_test.cpp b/src/common/transformations/tests/op_conversions/convert_sequences_to_ti_test.cpp index bfe336ed890..e140087c2dd 100644 --- a/src/common/transformations/tests/op_conversions/convert_sequences_to_ti_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_sequences_to_ti_test.cpp @@ -5,16 +5,16 @@ #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_shapeof3.cpp b/src/common/transformations/tests/op_conversions/convert_shapeof3.cpp index f0ec3f6f0b1..9395b7085c1 100644 --- a/src/common/transformations/tests/op_conversions/convert_shapeof3.cpp +++ b/src/common/transformations/tests/op_conversions/convert_shapeof3.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_shapeof3.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_shuffle_channels3_test.cpp b/src/common/transformations/tests/op_conversions/convert_shuffle_channels3_test.cpp index 1c9e6059869..38992e1f72d 100644 --- a/src/common/transformations/tests/op_conversions/convert_shuffle_channels3_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_shuffle_channels3_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_shuffle_channels3.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset2.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_softmax_downgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_softmax_downgrade_test.cpp index e7d1cc85e0b..d615944a0f2 100644 --- a/src/common/transformations/tests/op_conversions/convert_softmax_downgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_softmax_downgrade_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_softmax_downgrade.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_softmax_upgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_softmax_upgrade_test.cpp index de959a1c7d1..29ac5dc861a 100644 --- a/src/common/transformations/tests/op_conversions/convert_softmax_upgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_softmax_upgrade_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_softmax_upgrade.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_subtract.cpp b/src/common/transformations/tests/op_conversions/convert_subtract.cpp index b05a38730a2..e9457e56087 100644 --- a/src/common/transformations/tests/op_conversions/convert_subtract.cpp +++ b/src/common/transformations/tests/op_conversions/convert_subtract.cpp @@ -2,13 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_subtract.hpp" + #include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "transformations/low_precision/mark_dequantization_subgraph.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_ti_to_sequences_test.cpp b/src/common/transformations/tests/op_conversions/convert_ti_to_sequences_test.cpp index 1712fc3a031..524e3735948 100644 --- a/src/common/transformations/tests/op_conversions/convert_ti_to_sequences_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_ti_to_sequences_test.cpp @@ -2,20 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_ti_to_sequences.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/convert_topk11_downgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_topk11_downgrade_test.cpp index f1994e75852..ee20b832bdb 100644 --- a/src/common/transformations/tests/op_conversions/convert_topk11_downgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_topk11_downgrade_test.cpp @@ -2,16 +2,17 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_topk11_downgrade.hpp" + #include #include -#include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/opsets/opset11.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_topk3_test.cpp b/src/common/transformations/tests/op_conversions/convert_topk3_test.cpp index c8d8f8ab225..b8cd0863671 100644 --- a/src/common/transformations/tests/op_conversions/convert_topk3_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_topk3_test.cpp @@ -2,21 +2,22 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_topk3.hpp" + #include #include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset2.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/convert_xor_to_logical_xor.cpp b/src/common/transformations/tests/op_conversions/convert_xor_to_logical_xor.cpp index 0e8f0e1feed..e1316c52ebc 100644 --- a/src/common/transformations/tests/op_conversions/convert_xor_to_logical_xor.cpp +++ b/src/common/transformations/tests/op_conversions/convert_xor_to_logical_xor.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_xor_to_logical_xor.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset10.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/detection_output_downgrade_test.cpp b/src/common/transformations/tests/op_conversions/detection_output_downgrade_test.cpp index 996b9d8c1a8..979975fc5f7 100644 --- a/src/common/transformations/tests/op_conversions/detection_output_downgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/detection_output_downgrade_test.cpp @@ -7,16 +7,16 @@ #include #include -#include -#include -#include -#include -#include -#include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "functional_test_utils/skip_tests_config.hpp" +#include "openvino/core/model.hpp" +#include "openvino/op/util/detection_output_base.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" #include "transformations/init_node_info.hpp" using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/detection_output_upgrade_test.cpp b/src/common/transformations/tests/op_conversions/detection_output_upgrade_test.cpp index 6f525b475c3..9ad0b8823d7 100644 --- a/src/common/transformations/tests/op_conversions/detection_output_upgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/detection_output_upgrade_test.cpp @@ -7,14 +7,14 @@ #include #include -#include -#include -#include -#include -#include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" #include "transformations/init_node_info.hpp" using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/eye_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/eye_decomposition_test.cpp index 2e0dbeaf66a..43a1f64d87a 100644 --- a/src/common/transformations/tests/op_conversions/eye_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/eye_decomposition_test.cpp @@ -7,7 +7,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/core/model.hpp" #include "openvino/op/constant.hpp" diff --git a/src/common/transformations/tests/op_conversions/fq_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/fq_decomposition_test.cpp index dc91cc82ae5..2d2d8598631 100644 --- a/src/common/transformations/tests/op_conversions/fq_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/fq_decomposition_test.cpp @@ -2,18 +2,18 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/fq_decomposition.hpp" + #include -#include -#include -#include -#include -#include -#include -#include - #include "common_test_utils/common_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/gather_normalize_negative_indices_test.cpp b/src/common/transformations/tests/op_conversions/gather_normalize_negative_indices_test.cpp index cb4740bd7e9..8f71da2a336 100644 --- a/src/common/transformations/tests/op_conversions/gather_normalize_negative_indices_test.cpp +++ b/src/common/transformations/tests/op_conversions/gather_normalize_negative_indices_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/gather_normalize_negative_indices.hpp" + #include #include -#include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/core/validation_util.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/gelu7_downgrade.cpp b/src/common/transformations/tests/op_conversions/gelu7_downgrade.cpp index 720b7a89211..8f7739031fa 100644 --- a/src/common/transformations/tests/op_conversions/gelu7_downgrade.cpp +++ b/src/common/transformations/tests/op_conversions/gelu7_downgrade.cpp @@ -2,16 +2,16 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/gelu7_downgrade.hpp" + #include -#include -#include -#include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset2.hpp" +#include "openvino/opsets/opset7.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/group_normalization_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/group_normalization_decomposition_test.cpp index 42fba452003..30f6b499305 100644 --- a/src/common/transformations/tests/op_conversions/group_normalization_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/group_normalization_decomposition_test.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/core/model.hpp" #include "openvino/opsets/opset12.hpp" #include "openvino/pass/manager.hpp" diff --git a/src/common/transformations/tests/op_conversions/hsigmoid_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/hsigmoid_decomposition_test.cpp index dd8eb192436..f3c74f40c69 100644 --- a/src/common/transformations/tests/op_conversions/hsigmoid_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/hsigmoid_decomposition_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/hsigmoid_decomposition.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/hswish_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/hswish_decomposition_test.cpp index 52133ffa36f..6dee023a121 100644 --- a/src/common/transformations/tests/op_conversions/hswish_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/hswish_decomposition_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/hswish_decomposition.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/log_softmax_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/log_softmax_decomposition_test.cpp index dd8d87c7b14..67d007c891d 100644 --- a/src/common/transformations/tests/op_conversions/log_softmax_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/log_softmax_decomposition_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/log_softmax_decomposition.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/mvn6_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/mvn6_decomposition_test.cpp index 557b978a167..360acab8202 100644 --- a/src/common/transformations/tests/op_conversions/mvn6_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/mvn6_decomposition_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/mvn6_decomposition.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/ngraph_depth_to_space_transform_test.cpp b/src/common/transformations/tests/op_conversions/ngraph_depth_to_space_transform_test.cpp index 405486333bb..5ead8439f70 100644 --- a/src/common/transformations/tests/op_conversions/ngraph_depth_to_space_transform_test.cpp +++ b/src/common/transformations/tests/op_conversions/ngraph_depth_to_space_transform_test.cpp @@ -7,18 +7,18 @@ #include #include #include -#include -#include -#include -#include #include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/op/depth_to_space.hpp" +#include "openvino/op/space_to_depth.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/op_conversions/convert_depth_to_space.hpp" +#include "transformations/op_conversions/convert_space_to_depth.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/ngraph_mode_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/ngraph_mode_decomposition_test.cpp index 28834253475..b656c201ae3 100644 --- a/src/common/transformations/tests/op_conversions/ngraph_mode_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/ngraph_mode_decomposition_test.cpp @@ -7,18 +7,18 @@ #include #include #include -#include -#include -#include -#include -#include #include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/op/constant.hpp" +#include "openvino/op/mod.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/op_conversions/convert_mod.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/normalize_l2_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/normalize_l2_decomposition_test.cpp index 34b0d1f3488..2739bce3c4b 100644 --- a/src/common/transformations/tests/op_conversions/normalize_l2_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/normalize_l2_decomposition_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/normalize_l2_decomposition.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/reduce_l1_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/reduce_l1_decomposition_test.cpp index a7f3292a6cc..406e06047a4 100644 --- a/src/common/transformations/tests/op_conversions/reduce_l1_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/reduce_l1_decomposition_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/reduce_l1_decomposition.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/reduce_l2_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/reduce_l2_decomposition_test.cpp index 101118afa33..77855a96539 100644 --- a/src/common/transformations/tests/op_conversions/reduce_l2_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/reduce_l2_decomposition_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/reduce_l2_decomposition.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/simplify_ctc_greedy_decoder_seq_len_test.cpp b/src/common/transformations/tests/op_conversions/simplify_ctc_greedy_decoder_seq_len_test.cpp index 683f9640167..1503105879a 100644 --- a/src/common/transformations/tests/op_conversions/simplify_ctc_greedy_decoder_seq_len_test.cpp +++ b/src/common/transformations/tests/op_conversions/simplify_ctc_greedy_decoder_seq_len_test.cpp @@ -2,17 +2,18 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/op_conversions/softplus_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/softplus_decomposition_test.cpp index dcde5cd063c..b06bb97e5ce 100644 --- a/src/common/transformations/tests/op_conversions/softplus_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/softplus_decomposition_test.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/softplus_decomposition.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/softsign_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/softsign_decomposition_test.cpp index 509546ab78b..e96fa65055d 100644 --- a/src/common/transformations/tests/op_conversions/softsign_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/softsign_decomposition_test.cpp @@ -2,16 +2,17 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/softsign_decomposition.hpp" + #include #include -#include -#include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset9.hpp" +#include "transformations/init_node_info.hpp" using namespace ov; using namespace testing; diff --git a/src/common/transformations/tests/op_conversions/unique_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/unique_decomposition_test.cpp index 71a6c622527..900bfcbb71c 100644 --- a/src/common/transformations/tests/op_conversions/unique_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/unique_decomposition_test.cpp @@ -7,13 +7,13 @@ #include #include -#include -#include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/core/model.hpp" +#include "openvino/opsets/opset10.hpp" +#include "openvino/pass/manager.hpp" using namespace std; using namespace ov; diff --git a/src/common/transformations/tests/prelu_fusion.cpp b/src/common/transformations/tests/prelu_fusion.cpp index 3407d397b9e..e7007bd5293 100644 --- a/src/common/transformations/tests/prelu_fusion.cpp +++ b/src/common/transformations/tests/prelu_fusion.cpp @@ -4,17 +4,18 @@ #define _USE_MATH_DEFINES +#include "transformations/common_optimizations/prelu_fusion.hpp" + #include #include #include -#include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset10.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/smart_reshape/broadcast_const_range_replacement.cpp b/src/common/transformations/tests/smart_reshape/broadcast_const_range_replacement.cpp index d88f930a92a..412438578ec 100644 --- a/src/common/transformations/tests/smart_reshape/broadcast_const_range_replacement.cpp +++ b/src/common/transformations/tests/smart_reshape/broadcast_const_range_replacement.cpp @@ -2,16 +2,17 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/smart_reshape/broadcast_const_range_replacement.hpp" + #include #include -#include -#include #include #include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/smart_reshape/lstm_states_broadcast.cpp b/src/common/transformations/tests/smart_reshape/lstm_states_broadcast.cpp index 339a41f2944..574236dad5e 100644 --- a/src/common/transformations/tests/smart_reshape/lstm_states_broadcast.cpp +++ b/src/common/transformations/tests/smart_reshape/lstm_states_broadcast.cpp @@ -4,7 +4,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/core/model.hpp" #include "openvino/opsets/opset9.hpp" diff --git a/src/common/transformations/tests/smart_reshape/reshape_sinking.cpp b/src/common/transformations/tests/smart_reshape/reshape_sinking.cpp index 84626d345c7..edd7597f064 100644 --- a/src/common/transformations/tests/smart_reshape/reshape_sinking.cpp +++ b/src/common/transformations/tests/smart_reshape/reshape_sinking.cpp @@ -4,7 +4,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/core/model.hpp" #include "openvino/opsets/opset9.hpp" diff --git a/src/common/transformations/tests/smart_reshape/shape_of_const_folding.cpp b/src/common/transformations/tests/smart_reshape/shape_of_const_folding.cpp index 9d92374d81e..43126366e5e 100644 --- a/src/common/transformations/tests/smart_reshape/shape_of_const_folding.cpp +++ b/src/common/transformations/tests/smart_reshape/shape_of_const_folding.cpp @@ -6,7 +6,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/op/shape_of.hpp" #include "openvino/opsets/opset10.hpp" diff --git a/src/common/transformations/tests/smart_reshape/sr_mimicking_sbs.cpp b/src/common/transformations/tests/smart_reshape/sr_mimicking_sbs.cpp index 77c7679a703..5b11259cbaf 100644 --- a/src/common/transformations/tests/smart_reshape/sr_mimicking_sbs.cpp +++ b/src/common/transformations/tests/smart_reshape/sr_mimicking_sbs.cpp @@ -5,10 +5,9 @@ #include #include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" using namespace ov; diff --git a/src/common/transformations/tests/smart_reshape/sr_proposal_scales.cpp b/src/common/transformations/tests/smart_reshape/sr_proposal_scales.cpp index c2509f8a934..5e8088a9f23 100644 --- a/src/common/transformations/tests/smart_reshape/sr_proposal_scales.cpp +++ b/src/common/transformations/tests/smart_reshape/sr_proposal_scales.cpp @@ -5,11 +5,10 @@ #include #include -#include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset5.hpp" using namespace ov; diff --git a/src/common/transformations/tests/smart_reshape/sr_reshape_1d.cpp b/src/common/transformations/tests/smart_reshape/sr_reshape_1d.cpp index 9fedda8853a..bad3962e3fd 100644 --- a/src/common/transformations/tests/smart_reshape/sr_reshape_1d.cpp +++ b/src/common/transformations/tests/smart_reshape/sr_reshape_1d.cpp @@ -5,10 +5,9 @@ #include #include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" using namespace ov; diff --git a/src/common/transformations/tests/smart_reshape/sr_strided_slice_squeeze.cpp b/src/common/transformations/tests/smart_reshape/sr_strided_slice_squeeze.cpp index 6b89f4e3b2f..002dc860dff 100644 --- a/src/common/transformations/tests/smart_reshape/sr_strided_slice_squeeze.cpp +++ b/src/common/transformations/tests/smart_reshape/sr_strided_slice_squeeze.cpp @@ -5,10 +5,9 @@ #include #include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" using namespace ov; diff --git a/src/common/transformations/tests/smart_reshape/sr_sub_graph_ops.cpp b/src/common/transformations/tests/smart_reshape/sr_sub_graph_ops.cpp index cd93c753ec6..9ff6aa84ca7 100644 --- a/src/common/transformations/tests/smart_reshape/sr_sub_graph_ops.cpp +++ b/src/common/transformations/tests/smart_reshape/sr_sub_graph_ops.cpp @@ -5,10 +5,9 @@ #include #include -#include -#include - -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" using namespace ov; diff --git a/src/common/transformations/tests/transpose_sinking/ts_binary_test.cpp b/src/common/transformations/tests/transpose_sinking/ts_binary_test.cpp index 16c67c0acbc..09f424f6434 100644 --- a/src/common/transformations/tests/transpose_sinking/ts_binary_test.cpp +++ b/src/common/transformations/tests/transpose_sinking/ts_binary_test.cpp @@ -6,7 +6,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/frontend/manager.hpp" #include "openvino/opsets/opset10.hpp" diff --git a/src/common/transformations/tests/transpose_sinking/ts_common_test.cpp b/src/common/transformations/tests/transpose_sinking/ts_common_test.cpp index 4bcfc42736b..9a00aa9773e 100644 --- a/src/common/transformations/tests/transpose_sinking/ts_common_test.cpp +++ b/src/common/transformations/tests/transpose_sinking/ts_common_test.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/opsets/opset10.hpp" #include "openvino/pass/manager.hpp" diff --git a/src/common/transformations/tests/transpose_sinking/ts_concat_test.cpp b/src/common/transformations/tests/transpose_sinking/ts_concat_test.cpp index 0e1694eb494..48a5c6ab00d 100644 --- a/src/common/transformations/tests/transpose_sinking/ts_concat_test.cpp +++ b/src/common/transformations/tests/transpose_sinking/ts_concat_test.cpp @@ -6,7 +6,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/frontend/manager.hpp" #include "openvino/opsets/opset10.hpp" diff --git a/src/common/transformations/tests/transpose_sinking/ts_gather_test.cpp b/src/common/transformations/tests/transpose_sinking/ts_gather_test.cpp index 9c26fb6ad64..34586bcdd81 100644 --- a/src/common/transformations/tests/transpose_sinking/ts_gather_test.cpp +++ b/src/common/transformations/tests/transpose_sinking/ts_gather_test.cpp @@ -4,7 +4,7 @@ #include "transformations/transpose_sinking/ts_gather.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/opsets/opset10.hpp" #include "openvino/pass/manager.hpp" diff --git a/src/common/transformations/tests/transpose_sinking/ts_general_test.cpp b/src/common/transformations/tests/transpose_sinking/ts_general_test.cpp index 86ddc6f2613..7689c7f45eb 100644 --- a/src/common/transformations/tests/transpose_sinking/ts_general_test.cpp +++ b/src/common/transformations/tests/transpose_sinking/ts_general_test.cpp @@ -6,7 +6,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/frontend/manager.hpp" #include "openvino/opsets/opset10.hpp" diff --git a/src/common/transformations/tests/transpose_sinking/ts_reset_no_sinking_attribute.cpp b/src/common/transformations/tests/transpose_sinking/ts_reset_no_sinking_attribute.cpp index 207bf8a025f..1fecf456fa6 100644 --- a/src/common/transformations/tests/transpose_sinking/ts_reset_no_sinking_attribute.cpp +++ b/src/common/transformations/tests/transpose_sinking/ts_reset_no_sinking_attribute.cpp @@ -2,15 +2,16 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/transpose_sinking/ts_reset_no_sinking_attribute.hpp" + #include #include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/rt_info/transpose_sinking_attr.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace std; diff --git a/src/common/transformations/tests/transpose_sinking/ts_split_test.cpp b/src/common/transformations/tests/transpose_sinking/ts_split_test.cpp index cd526b94408..457ba5ea9ee 100644 --- a/src/common/transformations/tests/transpose_sinking/ts_split_test.cpp +++ b/src/common/transformations/tests/transpose_sinking/ts_split_test.cpp @@ -6,7 +6,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/frontend/manager.hpp" #include "openvino/opsets/opset10.hpp" diff --git a/src/common/transformations/tests/transpose_sinking/ts_test_case.hpp b/src/common/transformations/tests/transpose_sinking/ts_test_case.hpp index d154f02016e..a8b8db3d090 100644 --- a/src/common/transformations/tests/transpose_sinking/ts_test_case.hpp +++ b/src/common/transformations/tests/transpose_sinking/ts_test_case.hpp @@ -4,7 +4,7 @@ #pragma once -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/frontend/manager.hpp" #include "openvino/opsets/opset10.hpp" diff --git a/src/common/transformations/tests/transpose_sinking/ts_test_utils.hpp b/src/common/transformations/tests/transpose_sinking/ts_test_utils.hpp index 72fedfc35c3..826d75e0b1b 100644 --- a/src/common/transformations/tests/transpose_sinking/ts_test_utils.hpp +++ b/src/common/transformations/tests/transpose_sinking/ts_test_utils.hpp @@ -4,7 +4,7 @@ #pragma once -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/frontend/manager.hpp" #include "openvino/opsets/opset10.hpp" diff --git a/src/common/transformations/tests/transpose_sinking/ts_unary_test.cpp b/src/common/transformations/tests/transpose_sinking/ts_unary_test.cpp index 7a931d65bf6..e47f378cb2b 100644 --- a/src/common/transformations/tests/transpose_sinking/ts_unary_test.cpp +++ b/src/common/transformations/tests/transpose_sinking/ts_unary_test.cpp @@ -4,7 +4,7 @@ #include "transformations/transpose_sinking/ts_unary.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/frontend/manager.hpp" #include "openvino/opsets/opset10.hpp" diff --git a/src/common/transformations/tests/type_relaxed_tests.cpp b/src/common/transformations/tests/type_relaxed_tests.cpp index 0ea1290a934..cb485e1d01e 100644 --- a/src/common/transformations/tests/type_relaxed_tests.cpp +++ b/src/common/transformations/tests/type_relaxed_tests.cpp @@ -4,13 +4,12 @@ #include -#include -#include -#include -#include - #include "common_test_utils/test_common.hpp" #include "openvino/core/rt_info.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "ov_ops/type_relaxed.hpp" #include "transformations/convert_precision.hpp" namespace element = ov::element; diff --git a/src/common/transformations/tests/utils/compare_functions_test.cpp b/src/common/transformations/tests/utils/compare_functions_test.cpp index 980e8501c86..185fab308d3 100644 --- a/src/common/transformations/tests/utils/compare_functions_test.cpp +++ b/src/common/transformations/tests/utils/compare_functions_test.cpp @@ -6,17 +6,17 @@ #include #include -#include -#include -#include -#include #include #include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; @@ -599,21 +599,21 @@ TEST(TransformationTests, DummyOpNegativeDifferentStringVector) { namespace ov { -struct TestDummyDataTypeTransformationTests_NO_NGRAPH_NAME_COLISION {}; +struct TestDummyDataTypeTransformationTests_NO_OV_NAME_COLISION {}; template <> -class AttributeAdapter - : public DirectValueAccessor { +class AttributeAdapter + : public DirectValueAccessor { public: - AttributeAdapter(TestDummyDataTypeTransformationTests_NO_NGRAPH_NAME_COLISION& value) - : DirectValueAccessor(value) {} + AttributeAdapter(TestDummyDataTypeTransformationTests_NO_OV_NAME_COLISION& value) + : DirectValueAccessor(value) {} - OPENVINO_RTTI("TestDummyDataTypeTransformationTests_NO_NGRAPH_NAME_COLISION"); + OPENVINO_RTTI("TestDummyDataTypeTransformationTests_NO_OV_NAME_COLISION"); }; } // namespace ov TEST(TransformationTests, DummyOpNegativeNotSupportedType) { - ov::TestDummyDataTypeTransformationTests_NO_NGRAPH_NAME_COLISION m{}; + ov::TestDummyDataTypeTransformationTests_NO_OV_NAME_COLISION m{}; const auto& f1 = createDummyFunc(m); const auto& f2 = createDummyFunc(m); diff --git a/src/common/transformations/tests/utils/compress_quantize_weights.cpp b/src/common/transformations/tests/utils/compress_quantize_weights.cpp index 7e96ce9267e..5a62b79bfaa 100644 --- a/src/common/transformations/tests/utils/compress_quantize_weights.cpp +++ b/src/common/transformations/tests/utils/compress_quantize_weights.cpp @@ -2,18 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "compress_quantize_weights.hpp" + #include -#include #include -#include -#include -#include -#include -#include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/rt_info/decompression.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; @@ -59,7 +60,7 @@ class CompressQuantizeWeightsTests model = std::make_shared(fq, ParameterVector{}); } - manager.register_pass(); + manager.register_pass(); { auto data = opset8::Constant::create(param.expected_type, param.shape, param.expected_weights); @@ -147,7 +148,7 @@ TEST_F(TransformationTestsF, CompressQuantizeWeightsWithDequantizationSubgraph) model = std::make_shared(NodeVector{mul}, ParameterVector{}); - manager.register_pass(); + manager.register_pass(); } { auto data = opset8::Constant::create(element::i8, Shape{2, 4, 1, 1}, {-128, -128, -128, -96, -64, -32, 0, 127}); @@ -182,7 +183,7 @@ TEST_F(TransformationTestsF, CompressQuantizeWeightsWithDequantizationSubgraphFP model = std::make_shared(NodeVector{mul}, ParameterVector{}); - manager.register_pass(); + manager.register_pass(); } { auto data = opset8::Constant::create(element::i8, Shape{2, 4, 1, 1}, {-128, -128, -128, -96, -64, -32, 0, 127}); @@ -207,8 +208,8 @@ TEST_F(TransformationTestsF, CompressQuantizeWeightsWithZeroPointOptimizer) { auto fq = std::make_shared(data, input_low, input_high, output_low, output_high, 256); model = std::make_shared(NodeVector{fq}, ParameterVector{}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { @@ -237,8 +238,8 @@ TEST_F(TransformationTestsF, CompressQuantizeWeightsWithZeroPointOptimizerFP16) auto fq = std::make_shared(data, input_low, input_high, output_low, output_high, 255); model = std::make_shared(NodeVector{fq}, ParameterVector{}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { @@ -262,8 +263,8 @@ TEST_F(TransformationTestsF, NegativeCompressQuantizeWeightsWithZeroPointOptimiz auto fq = std::make_shared(data, input_low, input_high, output_low, output_high, 256); model = std::make_shared(NodeVector{fq}, ParameterVector{}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { auto data = opset8::Constant::create(element::i8, Shape{2, 4, 1, 1}, {-128, -128, -128, -96, -64, -32, 0, 127}); @@ -287,8 +288,8 @@ TEST_F(TransformationTestsF, NegativeCompressQuantizeWeightsNonConstantInput) { auto fq = std::make_shared(data, input_low, input_high, output_low, output_high, 256); model = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); diff --git a/src/common/transformations/tests/utils/convert_precision.cpp b/src/common/transformations/tests/utils/convert_precision.cpp index 472eab49ce3..cab235a9459 100644 --- a/src/common/transformations/tests/utils/convert_precision.cpp +++ b/src/common/transformations/tests/utils/convert_precision.cpp @@ -2,28 +2,29 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/convert_precision.hpp" + #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset10.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/manager.hpp" +#include "openvino/pass/visualize_tree.hpp" +#include "ov_ops/type_relaxed.hpp" +#include "transformations/common_optimizations/disable_shapeof_constant_folding.hpp" #include "transformations/rt_info/disable_fp16_compression.hpp" +#include "transformations/utils/utils.hpp" using namespace testing; using namespace ov; diff --git a/src/common/transformations/tests/utils/primitives_priority_test.cpp b/src/common/transformations/tests/utils/primitives_priority_test.cpp index 7f04b3b8237..a748477e2b9 100644 --- a/src/common/transformations/tests/utils/primitives_priority_test.cpp +++ b/src/common/transformations/tests/utils/primitives_priority_test.cpp @@ -6,19 +6,19 @@ #include #include -#include #include #include -#include -#include #include #include #include -#include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" +#include "ie_ngraph_utils.hpp" +#include "openvino/core/model.hpp" +#include "openvino/opsets/opset1.hpp" #include "transformations/rt_info/primitives_priority_attribute.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing; @@ -49,9 +49,9 @@ TEST(TransformationTests, ConvBiasFusion) { InferenceEngine::CNNNetwork network(f); // Set PrimitivesPriority to all Convolutions - auto nGraph = network.getFunction(); - ASSERT_NE(nullptr, nGraph); - for (auto& op : nGraph->get_ops()) { + auto model = network.getFunction(); + ASSERT_NE(nullptr, model); + for (auto& op : model->get_ops()) { if (auto conv = std::dynamic_pointer_cast(op)) { auto& rtInfo = conv->get_rt_info(); rtInfo[ov::PrimitivesPriority::get_type_info_static()] = ov::PrimitivesPriority("test"); diff --git a/src/core/tests/graph_rewrite.cpp b/src/core/tests/graph_rewrite.cpp index 3361c65e725..ed9f74388b4 100644 --- a/src/core/tests/graph_rewrite.cpp +++ b/src/core/tests/graph_rewrite.cpp @@ -6,7 +6,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/core/rtti.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" diff --git a/src/core/tests/pass/constant_folding.cpp b/src/core/tests/pass/constant_folding.cpp index 372d8eb387e..848d57f26bf 100644 --- a/src/core/tests/pass/constant_folding.cpp +++ b/src/core/tests/pass/constant_folding.cpp @@ -7,7 +7,7 @@ #include #include "common_test_utils/all_close_f.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_tools.hpp" #include "openvino/op/acosh.hpp" #include "openvino/op/constant.hpp" diff --git a/src/core/tests/pattern.cpp b/src/core/tests/pattern.cpp index 4ccb32062d0..3cc87150491 100644 --- a/src/core/tests/pattern.cpp +++ b/src/core/tests/pattern.cpp @@ -11,7 +11,7 @@ #include #include "common_test_utils/matcher.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_tools.hpp" #include "ngraph/pass/graph_rewrite.hpp" #include "openvino/core/except.hpp" diff --git a/src/frontends/onnx/tests/convert_partially_tests.cpp b/src/frontends/onnx/tests/convert_partially_tests.cpp index c84fd7b0c11..58fc0f00877 100644 --- a/src/frontends/onnx/tests/convert_partially_tests.cpp +++ b/src/frontends/onnx/tests/convert_partially_tests.cpp @@ -7,7 +7,7 @@ #include #include "common_test_utils/file_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/frontend/manager.hpp" #include "openvino/op/util/framework_node.hpp" #include "openvino/opsets/opset11.hpp" diff --git a/src/frontends/onnx/tests/onnx_import.in.cpp b/src/frontends/onnx/tests/onnx_import.in.cpp index db59268baa9..d2044d99a0c 100644 --- a/src/frontends/onnx/tests/onnx_import.in.cpp +++ b/src/frontends/onnx/tests/onnx_import.in.cpp @@ -24,7 +24,7 @@ #endif // clang-format on #include "common_test_utils/file_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "default_opset.hpp" #include "openvino/opsets/opset12.hpp" #include "common_test_utils/test_case.hpp" diff --git a/src/frontends/onnx/tests/onnx_import_quant.in.cpp b/src/frontends/onnx/tests/onnx_import_quant.in.cpp index 2cfa8a3ef13..b35b388d6a9 100644 --- a/src/frontends/onnx/tests/onnx_import_quant.in.cpp +++ b/src/frontends/onnx/tests/onnx_import_quant.in.cpp @@ -16,7 +16,7 @@ #include "common_test_utils/all_close.hpp" #include "common_test_utils/file_utils.hpp" #include "common_test_utils/ndarray.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_case.hpp" #include "common_test_utils/test_control.hpp" #include "common_test_utils/test_tools.hpp" diff --git a/src/frontends/onnx/tests/onnx_import_rnn.in.cpp b/src/frontends/onnx/tests/onnx_import_rnn.in.cpp index 74e795b960f..ac0e1624c35 100644 --- a/src/frontends/onnx/tests/onnx_import_rnn.in.cpp +++ b/src/frontends/onnx/tests/onnx_import_rnn.in.cpp @@ -16,7 +16,7 @@ #include "common_test_utils/all_close.hpp" #include "common_test_utils/file_utils.hpp" #include "common_test_utils/ndarray.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_case.hpp" #include "common_test_utils/test_control.hpp" #include "common_test_utils/test_tools.hpp" diff --git a/src/frontends/paddle/tests/convert_unsupported.cpp b/src/frontends/paddle/tests/convert_unsupported.cpp index e0a6c01667d..3bd3f47a52c 100644 --- a/src/frontends/paddle/tests/convert_unsupported.cpp +++ b/src/frontends/paddle/tests/convert_unsupported.cpp @@ -5,7 +5,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "paddle_utils.hpp" #include "utils.hpp" #include "openvino/opsets/opset6.hpp" diff --git a/src/frontends/paddle/tests/read_paddle_model_test.cpp b/src/frontends/paddle/tests/read_paddle_model_test.cpp index 5cbdcc94da7..1095c2b8f98 100644 --- a/src/frontends/paddle/tests/read_paddle_model_test.cpp +++ b/src/frontends/paddle/tests/read_paddle_model_test.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/unicode_utils.hpp" #include "frontend/shared/include/utils.hpp" #include "openvino/openvino.hpp" diff --git a/src/frontends/paddle/tests/throw_in_conversion.cpp b/src/frontends/paddle/tests/throw_in_conversion.cpp index a8ee29b687d..5831dbd93f4 100644 --- a/src/frontends/paddle/tests/throw_in_conversion.cpp +++ b/src/frontends/paddle/tests/throw_in_conversion.cpp @@ -5,7 +5,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "paddle_utils.hpp" #include "utils.hpp" diff --git a/src/frontends/tests/frontend/shared/src/convert_model.cpp b/src/frontends/tests/frontend/shared/src/convert_model.cpp index 456d1c51c3f..7351242fb8f 100644 --- a/src/frontends/tests/frontend/shared/src/convert_model.cpp +++ b/src/frontends/tests/frontend/shared/src/convert_model.cpp @@ -4,7 +4,7 @@ #include "convert_model.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/pass/visualize_tree.hpp" #include "utils.hpp" diff --git a/src/inference/tests/functional/matmul_sr_tests.cpp b/src/inference/tests/functional/matmul_sr_tests.cpp index ef124499662..5e669b94229 100644 --- a/src/inference/tests/functional/matmul_sr_tests.cpp +++ b/src/inference/tests/functional/matmul_sr_tests.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include #include #include @@ -129,7 +129,7 @@ TEST(SmartReshapeTransposeMatMulTests, TransposeAMatMulFuse) { auto matmul = std::make_shared(transpose, data_B, false, false); f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{data_A, data_B}); - ngraph::pass::Manager m; + ov::pass::Manager m; m.register_pass(); m.register_pass(); m.run_passes(f); diff --git a/src/inference/tests/unit/add_preprocessing.cpp b/src/inference/tests/unit/add_preprocessing.cpp index 5ed602cc702..4bad1b27ada 100644 --- a/src/inference/tests/unit/add_preprocessing.cpp +++ b/src/inference/tests/unit/add_preprocessing.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" #include "dev/preprocessing/preprocessing.hpp" #include "openvino/op/add.hpp" diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/convert_group_conv.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/convert_group_conv.hpp index fd4cb79a49b..307fd04530a 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/convert_group_conv.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/convert_group_conv.hpp @@ -59,7 +59,7 @@ namespace ov { namespace intel_cpu { -class ConvertGroupConvolution: public ngraph::pass::MatcherPass { +class ConvertGroupConvolution: public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertGroupConvolution", "0"); ConvertGroupConvolution(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/convert_group_conv1d.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/convert_group_conv1d.hpp index 37905dc63f5..2759a97818e 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/convert_group_conv1d.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/convert_group_conv1d.hpp @@ -52,7 +52,7 @@ namespace ov { namespace intel_cpu { -class ConvertConv1DBase: public ngraph::pass::MatcherPass { +class ConvertConv1DBase: public ov::pass::MatcherPass { protected: OPENVINO_RTTI("ConvertConv1DBase", "0"); template diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/convert_reduce_multi_axis.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/convert_reduce_multi_axis.hpp index e4c39020bf6..f4a90a9e275 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/convert_reduce_multi_axis.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/convert_reduce_multi_axis.hpp @@ -49,7 +49,7 @@ namespace ov { namespace intel_cpu { -class ConvertReduceMultiAxisBase: public ngraph::pass::MatcherPass { +class ConvertReduceMultiAxisBase: public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertReduceMultiAxisBase", "0"); template @@ -80,7 +80,7 @@ public: ConvertReduceSum(); }; -class ConvertReduceMultiAxis: public ngraph::pass::GraphRewrite { +class ConvertReduceMultiAxis: public ov::pass::GraphRewrite { public: OPENVINO_RTTI("ConvertReduceMultiAxis", "0"); ConvertReduceMultiAxis() { diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/mish_decomposition.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/mish_decomposition.hpp index b56870679ed..3db05f87165 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/mish_decomposition.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/arm/pass/mish_decomposition.hpp @@ -9,7 +9,7 @@ namespace ov { namespace intel_cpu { -class MishDecomposition: public ngraph::pass::MatcherPass { +class MishDecomposition: public ov::pass::MatcherPass { public: OPENVINO_RTTI("MishDecomposition", "0"); MishDecomposition(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/align_matmul_input_ranks.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/align_matmul_input_ranks.hpp index 764dcc5f9c4..a94e26c3d63 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/align_matmul_input_ranks.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/align_matmul_input_ranks.hpp @@ -17,7 +17,7 @@ namespace ov { namespace intel_cpu { -class AlignMatMulInputRanks: public ngraph::pass::MatcherPass { +class AlignMatMulInputRanks: public ov::pass::MatcherPass { public: OPENVINO_RTTI("AlignMatMulInputRanks", "0"); AlignMatMulInputRanks(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_broadcast_to_tiles.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_broadcast_to_tiles.hpp index f775a1ae798..e1d36efd199 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_broadcast_to_tiles.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_broadcast_to_tiles.hpp @@ -9,7 +9,7 @@ namespace ov { namespace intel_cpu { -class ConvertBroadcastToTiles: public ngraph::pass::MatcherPass { +class ConvertBroadcastToTiles: public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertBroadcastToTiles", "0"); ConvertBroadcastToTiles(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_fq_rnn_to_quantized_rnn.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_fq_rnn_to_quantized_rnn.hpp index 70930bfe54b..5ba3ae6a0fe 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_fq_rnn_to_quantized_rnn.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_fq_rnn_to_quantized_rnn.hpp @@ -74,7 +74,7 @@ namespace ov { namespace intel_cpu { -class ConvertFqRnnToQuantizedRnn: public ngraph::pass::MatcherPass { +class ConvertFqRnnToQuantizedRnn: public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertFqRnnToQuantizedRnn", "0"); ConvertFqRnnToQuantizedRnn(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_matmul_to_fc.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_matmul_to_fc.hpp index 55361fbe941..281b6ec5226 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_matmul_to_fc.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_matmul_to_fc.hpp @@ -9,7 +9,7 @@ namespace ov { namespace intel_cpu { -class ConvertMatMulToFC: public ngraph::pass::MatcherPass { +class ConvertMatMulToFC: public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertMatMulToFC", "0"); ConvertMatMulToFC(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_tile_to_seq_tiles.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_tile_to_seq_tiles.hpp index 971c468eee2..5630177d204 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_tile_to_seq_tiles.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_tile_to_seq_tiles.hpp @@ -9,7 +9,7 @@ namespace ov { namespace intel_cpu { -class ConvertTileToSeqTiles: public ngraph::pass::MatcherPass { +class ConvertTileToSeqTiles: public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertTileToSeqTiles", "0"); ConvertTileToSeqTiles(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_to_leaky_relu.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_to_leaky_relu.hpp index b29cc88602e..70bb7cf2783 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_to_leaky_relu.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_to_leaky_relu.hpp @@ -9,7 +9,7 @@ namespace ov { namespace intel_cpu { -class ConvertToLeakyRelu: public ngraph::pass::MatcherPass { +class ConvertToLeakyRelu: public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertToLeakyRelu", "0"); ConvertToLeakyRelu(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_to_power_static.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_to_power_static.hpp index 20366c49e6b..a2278bcb6e8 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_to_power_static.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_to_power_static.hpp @@ -9,7 +9,7 @@ namespace ov { namespace intel_cpu { -class ConvertToPowerStatic: public ngraph::pass::MatcherPass { +class ConvertToPowerStatic: public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertToPowerStatic", "0"); ConvertToPowerStatic(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_to_swish_cpu.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_to_swish_cpu.hpp index 49773065770..f4e36f766eb 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_to_swish_cpu.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/convert_to_swish_cpu.hpp @@ -9,7 +9,7 @@ namespace ov { namespace intel_cpu { -class ConvertToSwishCPU: public ngraph::pass::MatcherPass { +class ConvertToSwishCPU: public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertToSwishCPU", "0"); ConvertToSwishCPU(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/decompose_integer_divide.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/decompose_integer_divide.hpp index c9d23bee89d..4d65ab52e54 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/decompose_integer_divide.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/decompose_integer_divide.hpp @@ -9,7 +9,7 @@ namespace ov { namespace intel_cpu { -class DecomposeIntegerDivide: public ngraph::pass::MatcherPass { +class DecomposeIntegerDivide: public ov::pass::MatcherPass { public: OPENVINO_RTTI("DecomposeIntegerDivide", "0"); DecomposeIntegerDivide(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/move_eltwise_up_data_movement.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/move_eltwise_up_data_movement.hpp index 1c5ef18c9bf..a0d965ccd87 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/move_eltwise_up_data_movement.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/move_eltwise_up_data_movement.hpp @@ -9,7 +9,7 @@ namespace ov { namespace intel_cpu { -class MoveEltwiseUpThroughDataMov : public ngraph::pass::MatcherPass { +class MoveEltwiseUpThroughDataMov : public ov::pass::MatcherPass { public: OPENVINO_RTTI("MoveEltwiseUpThroughDataMov", "0"); MoveEltwiseUpThroughDataMov(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/reshape_fc_fusion.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/reshape_fc_fusion.hpp index fd8e4335c69..61c16353356 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/reshape_fc_fusion.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/reshape_fc_fusion.hpp @@ -9,7 +9,7 @@ namespace ov { namespace intel_cpu { -class ReshapeFullyConnectedFusion : public ngraph::pass::MatcherPass { +class ReshapeFullyConnectedFusion : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ReshapeFullyConnectedFusion", "0"); ReshapeFullyConnectedFusion(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/rnn_sequences_optimization.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/rnn_sequences_optimization.hpp index f063899ce7f..e52ae81f76c 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/rnn_sequences_optimization.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/rnn_sequences_optimization.hpp @@ -9,25 +9,25 @@ namespace ov { namespace intel_cpu { -class OptimizeGRUSequenceTransposes : public ngraph::pass::MatcherPass { +class OptimizeGRUSequenceTransposes : public ov::pass::MatcherPass { public: OPENVINO_RTTI("OptimizeGRUSequenceTransposes", "0"); OptimizeGRUSequenceTransposes(); }; -class OptimizeLSTMSequenceTransposes : public ngraph::pass::MatcherPass { +class OptimizeLSTMSequenceTransposes : public ov::pass::MatcherPass { public: OPENVINO_RTTI("OptimizeLSTMSequenceTransposes", "0"); OptimizeLSTMSequenceTransposes(); }; -class OptimizeRNNSequenceTransposes : public ngraph::pass::MatcherPass { +class OptimizeRNNSequenceTransposes : public ov::pass::MatcherPass { public: OPENVINO_RTTI("OptimizeRNNSequenceTransposes", "0"); OptimizeRNNSequenceTransposes(); }; -class OptimizeSequenceTransposes : public ngraph::pass::GraphRewrite { +class OptimizeSequenceTransposes : public ov::pass::GraphRewrite { public: OPENVINO_RTTI("OptimizeSequenceTransposes", "0"); OptimizeSequenceTransposes(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/swap_convert_transpose.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/swap_convert_transpose.hpp index 537e11b0f14..ab098a6ce00 100755 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/swap_convert_transpose.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/swap_convert_transpose.hpp @@ -9,7 +9,7 @@ namespace ov { namespace intel_cpu { -class SwapConvertTranspose : public ngraph::pass::MatcherPass { +class SwapConvertTranspose : public ov::pass::MatcherPass { public: NGRAPH_RTTI_DECLARATION; SwapConvertTranspose(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/x64/pass/convert_to_interaction.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/x64/pass/convert_to_interaction.hpp index 804cca20c35..4a37a500252 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/x64/pass/convert_to_interaction.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/x64/pass/convert_to_interaction.hpp @@ -9,19 +9,19 @@ namespace ov { namespace intel_cpu { -class ConvertToInteraction: public ngraph::pass::MatcherPass { +class ConvertToInteraction: public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertToInteraction", "0"); ConvertToInteraction(); }; -class FuseFQtoInteraction: public ngraph::pass::MatcherPass { +class FuseFQtoInteraction: public ov::pass::MatcherPass { public: OPENVINO_RTTI("FuseFQtoInteraction", "0"); FuseFQtoInteraction(); }; -class ConvertInteractionInt8: public ngraph::pass::MatcherPass { +class ConvertInteractionInt8: public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertInteractionInt8", "0"); ConvertInteractionInt8(); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/x64/pass/mha_fusion.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/x64/pass/mha_fusion.hpp index fb429d05bc1..0e9fdbc83fd 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/x64/pass/mha_fusion.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/x64/pass/mha_fusion.hpp @@ -10,7 +10,7 @@ namespace ov { namespace intel_cpu { -class MHAFusionBase : public ngraph::pass::MatcherPass { +class MHAFusionBase : public ov::pass::MatcherPass { protected: bool valid_transpose_order(const std::shared_ptr& node, const std::vector& expected_order) { if (auto transpose_pattern = ngraph::as_type_ptr(node)) { @@ -49,7 +49,7 @@ public: MHAQuantFusion2(); }; -class MHAFusion : public ngraph::pass::GraphRewrite { +class MHAFusion : public ov::pass::GraphRewrite { public: OPENVINO_RTTI("MHAFusion", "0"); MHAFusion() { diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/arm/convert_group_conv.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/arm/convert_group_conv.cpp index 2428f3cad4d..5d94fe19c4e 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/arm/convert_group_conv.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/arm/convert_group_conv.cpp @@ -17,7 +17,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov::intel_cpu; diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/arm/convert_group_conv1d.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/arm/convert_group_conv1d.cpp index 3156a981ec0..eefb96c305a 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/arm/convert_group_conv1d.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/arm/convert_group_conv1d.cpp @@ -17,7 +17,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov::intel_cpu; diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/arm/convert_reduce_multi_axis.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/arm/convert_reduce_multi_axis.cpp index 1ccb78ea331..f18fe3e581f 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/arm/convert_reduce_multi_axis.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/arm/convert_reduce_multi_axis.cpp @@ -17,7 +17,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov::intel_cpu; diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_matmul_test.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_matmul_test.cpp index edc4b9c94b0..b1edcce5ae4 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_matmul_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_matmul_test.cpp @@ -18,7 +18,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/rt_info/decompression.hpp" using namespace testing; diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_leaky_relu_test.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_leaky_relu_test.cpp index 30c556f52f0..47e71670447 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_leaky_relu_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_leaky_relu_test.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov::intel_cpu; diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_eltwise_up_data_movement_test.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_eltwise_up_data_movement_test.cpp index 0521100e87c..fab71925f0b 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_eltwise_up_data_movement_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_eltwise_up_data_movement_test.cpp @@ -10,7 +10,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include using namespace testing; diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_fc_reshape_to_weights.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_fc_reshape_to_weights.cpp index e8ffd0694b3..bcd8efdd5c0 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_fc_reshape_to_weights.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_fc_reshape_to_weights.cpp @@ -15,7 +15,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov::intel_cpu; diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/optimize_sequence_transposes_test.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/optimize_sequence_transposes_test.cpp index 1309062d194..1bc2135b23b 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/optimize_sequence_transposes_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/optimize_sequence_transposes_test.cpp @@ -16,7 +16,7 @@ #include #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov::intel_cpu; diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/swap_convert_transpose.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/swap_convert_transpose.cpp index 453358ca756..3534a24f355 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/swap_convert_transpose.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/swap_convert_transpose.cpp @@ -4,7 +4,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include #include diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/x64/convert_to_interaction.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/x64/convert_to_interaction.cpp index b295ecf3529..f9406850b4c 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/x64/convert_to_interaction.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/x64/convert_to_interaction.cpp @@ -19,7 +19,7 @@ #include "ov_ops/type_relaxed.hpp" #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov::intel_cpu; diff --git a/src/plugins/intel_cpu/tests/unit/snippets_transformations/fake_quantize_tokenization_test.cpp b/src/plugins/intel_cpu/tests/unit/snippets_transformations/fake_quantize_tokenization_test.cpp index f9b4f9f9f53..559295a9ec3 100644 --- a/src/plugins/intel_cpu/tests/unit/snippets_transformations/fake_quantize_tokenization_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/snippets_transformations/fake_quantize_tokenization_test.cpp @@ -4,7 +4,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "snippets/pass/fq_decomposition.hpp" #include "snippets/pass/tokenization.hpp" #include "snippets/pass/collapse_subgraph.hpp" diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/conv_bias_fusion.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/conv_bias_fusion.hpp index 4e7bdae1461..da2c69f27bf 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/conv_bias_fusion.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/conv_bias_fusion.hpp @@ -29,25 +29,25 @@ class DeconvAddFusion; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvAddFusion : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvAddFusion : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvAddFusion", "0"); ConvAddFusion(); }; -class ngraph::pass::ConvMultiplyFusion : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvMultiplyFusion : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvMultiplyFusion", "0"); ConvMultiplyFusion(); }; -class ngraph::pass::DeconvAddFusion : public ngraph::pass::MatcherPass { +class ngraph::pass::DeconvAddFusion : public ov::pass::MatcherPass { public: OPENVINO_RTTI("DeconvAddFusion", "0"); DeconvAddFusion(); }; -class ngraph::pass::ConvFusion : public ngraph::pass::GraphRewrite { +class ngraph::pass::ConvFusion : public ov::pass::GraphRewrite { public: OPENVINO_RTTI("ConvFusion", "0"); ConvFusion() { diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp index f14f213c779..b258aecfe92 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp @@ -21,19 +21,19 @@ class ConvertRNNCellMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertLSTMCellMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertLSTMCellMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertLSTMCellMatcher", "0"); ConvertLSTMCellMatcher(); }; -class ngraph::pass::ConvertGRUCellMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertGRUCellMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertGRUCellMatcher", "0"); ConvertGRUCellMatcher(); }; -class ngraph::pass::ConvertRNNCellMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertRNNCellMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertRNNCellMatcher", "0"); ConvertRNNCellMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_convolutions.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_convolutions.hpp index 09c5d77d084..f70425ca24b 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_convolutions.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_convolutions.hpp @@ -23,31 +23,31 @@ class ConvertGroupDeconvolution; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertConvolution : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertConvolution : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertConvolution", "0"); ConvertConvolution(); }; -class ngraph::pass::ConvertGroupConvolution : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertGroupConvolution : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertGroupConvolution", "0"); ConvertGroupConvolution(); }; -class ngraph::pass::ConvertDeconvolution : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertDeconvolution : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertDeconvolution", "0"); ConvertDeconvolution(); }; -class ngraph::pass::ConvertGroupDeconvolution : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertGroupDeconvolution : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertGroupDeconvolution", "0"); ConvertGroupDeconvolution(); }; -class ngraph::pass::ConvertConvolutions : public ngraph::pass::GraphRewrite { +class ngraph::pass::ConvertConvolutions : public ov::pass::GraphRewrite { public: OPENVINO_RTTI("ConvertConvolutions", "0"); ConvertConvolutions() { diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp index 01341d48cd3..7902fc28111 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp @@ -32,7 +32,7 @@ class ConvertGatherToGatherIEMatcher; * we unsqueeze indices input and squeeze GatherIE output. */ -class ngraph::pass::ConvertGatherToGatherIEMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertGatherToGatherIEMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertGatherToGatherIEMatcher", "0"); ConvertGatherToGatherIEMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp index 76cc313e457..dbadc67fa0d 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp @@ -20,7 +20,7 @@ class ConvertGatherTreeToGatherTreeIEMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertGatherTreeToGatherTreeIEMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertGatherTreeToGatherTreeIEMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertGatherTreeToGatherTreeIEMatcher", "0"); ConvertGatherTreeToGatherTreeIEMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp index 718aef17b4c..680e4b243de 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp @@ -19,7 +19,7 @@ class ConvertHardSigmoidToLegacyMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertHardSigmoidToLegacyMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertHardSigmoidToLegacyMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertHardSigmoidToLegacyMatcher", "0"); ConvertHardSigmoidToLegacyMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp index a17f18ac330..e4eef4a835e 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp @@ -21,7 +21,7 @@ class ConvertInterpolateToInterpOrResampleMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertInterpolateToInterpOrResampleMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertInterpolateToInterpOrResampleMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertInterpolateToInterpOrResampleMatcher", "0"); ConvertInterpolateToInterpOrResampleMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp index b644d72a9e0..16834374345 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp @@ -19,7 +19,7 @@ class ConvertLRNToLegacyMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertLRNToLegacyMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertLRNToLegacyMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertLRNToLegacyMatcher", "0"); ConvertLRNToLegacyMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp index bbb89dfc3a3..d05fbaac2a1 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp @@ -24,19 +24,19 @@ class ConvertMatMulToGemm; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertMatMulToFC : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertMatMulToFC : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertMatMulToFC", "0"); ConvertMatMulToFC(); }; -class ngraph::pass::ConvertMatMulToGemm : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertMatMulToGemm : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertMatMulToGemm", "0"); ConvertMatMulToGemm(); }; -class ngraph::pass::ConvertMatMulToFCorGemm : public ngraph::pass::GraphRewrite { +class ngraph::pass::ConvertMatMulToFCorGemm : public ov::pass::GraphRewrite { public: OPENVINO_RTTI("ConvertMatMulToFCorGemm", "0"); ConvertMatMulToFCorGemm() { diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp index a5ab33304dd..c78342c492d 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp @@ -18,7 +18,7 @@ class ConvertMulAddToScaleShiftOrPower; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertMulAddToScaleShiftOrPower : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertMulAddToScaleShiftOrPower : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertMulAddToScaleShiftOrPower", "0"); ConvertMulAddToScaleShiftOrPower(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp index a20a648f6c5..4d258b369bf 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp @@ -18,7 +18,7 @@ class ConvertMulOrAddFinally; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertMulOrAddFinally : public ngraph::pass::GraphRewrite { +class ngraph::pass::ConvertMulOrAddFinally : public ov::pass::GraphRewrite { public: OPENVINO_RTTI("ConvertMulOrAddFinally", "0"); ConvertMulOrAddFinally(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.hpp index 66a0eb4ef53..4ba32c1834b 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_5_to_legacy.hpp @@ -22,7 +22,7 @@ class ConvertNMS5ToLegacyMatcher; * Convert NMS-5 directly to inner NMS. */ -class ngraph::pass::ConvertNMS5ToLegacyMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertNMS5ToLegacyMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertNMS5ToLegacyMatcher", "0"); ConvertNMS5ToLegacyMatcher(bool force_i32_output_type = true); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp index a9d331f1968..76733f6a60c 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp @@ -27,7 +27,7 @@ class ConvertNMSToNMSIEMatcher; * we insert Unsqueeze operations. */ -class ngraph::pass::ConvertNMSToNMSIEMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertNMSToNMSIEMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertNMSToNMSIEMatcher", "0"); ConvertNMSToNMSIEMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp index 0582a1a86ef..47adbbfa870 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp @@ -19,13 +19,13 @@ class ConvertNormalizeL2ToLegacyMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertNormalizeL2WithMulToNormalizeIE : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertNormalizeL2WithMulToNormalizeIE : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertNormalizeL2WithMulToNormalizeIE", "0"); ConvertNormalizeL2WithMulToNormalizeIE(); }; -class ngraph::pass::ConvertNormalizeL2ToLegacyMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertNormalizeL2ToLegacyMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertNormalizeL2ToLegacyMatcher", "0"); ConvertNormalizeL2ToLegacyMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp index d040792683d..c37f71d2878 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp @@ -19,7 +19,7 @@ class ConvertOneHotToOneHotIEMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertOneHotToOneHotIEMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertOneHotToOneHotIEMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertOneHotToOneHotIEMatcher", "0"); ConvertOneHotToOneHotIEMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp index 05bb4e2dcb6..69d511d1204 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp @@ -18,7 +18,7 @@ class ConvertOpSet1ToLegacy; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertOpSet1ToLegacy : public ngraph::pass::FunctionPass { +class ngraph::pass::ConvertOpSet1ToLegacy : public ov::pass::ModelPass { public: OPENVINO_RTTI("ConvertOpSet1ToLegacy", "0"); bool run_on_model(const std::shared_ptr& m) override; diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp index e3cb74d62a7..7b017df37e1 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp @@ -23,7 +23,7 @@ class ConvertPadToLegacyMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertPadToLegacyMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertPadToLegacyMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertPadToLegacyMatcher", "0"); ConvertPadToLegacyMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp index 56f367f838e..dee94dd5e54 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp @@ -19,7 +19,7 @@ class ConvertPowerToPowerIEMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertPowerToPowerIEMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertPowerToPowerIEMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertPowerToPowerIEMatcher", "0"); ConvertPowerToPowerIEMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp index b3e0fdfd2a4..82fcb02e729 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp @@ -19,7 +19,7 @@ class ConvertPReLUToReLUIE; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertPReLUToReLUIE : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertPReLUToReLUIE : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertPReLUToReLUIE", "0"); ConvertPReLUToReLUIE(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp index 5d8cc38ab35..fe6702f8c0d 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp @@ -19,13 +19,13 @@ class ConvertProposal4ToLegacyMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertProposal4ToLegacyMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertProposal4ToLegacyMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertProposal4ToLegacyMatcher", "0"); ConvertProposal4ToLegacyMatcher(); }; -class ngraph::pass::ConvertProposalToLegacyMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertProposalToLegacyMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertProposalToLegacyMatcher", "0"); ConvertProposalToLegacyMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp index ab263be6563..3d5ae3aa874 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp @@ -19,7 +19,7 @@ class ConvertSeluToSeluIEMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertSeluToSeluIEMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertSeluToSeluIEMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertSeluToSeluIEMatcher", "0"); ConvertSeluToSeluIEMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp index 816d2f4427c..2021f83c55b 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp @@ -28,7 +28,7 @@ class ConvertRNNSequenceMatcher; * We squeeze num_direction dimension for all corresponding inputs and unsqueeze them after the SequenceIE op. */ -class ngraph::pass::ConvertLSTMSequenceMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertLSTMSequenceMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertLSTMSequenceMatcher", "0"); ConvertLSTMSequenceMatcher(); @@ -41,7 +41,7 @@ public: * We squeeze num_direction dimension for all corresponding inputs and unsqueeze them after the SequenceIE op. */ -class ngraph::pass::ConvertGRUSequenceMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertGRUSequenceMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertGRUSequenceMatcher", "0"); ConvertGRUSequenceMatcher(); @@ -54,7 +54,7 @@ public: * We squeeze num_direction dimension for all corresponding inputs and unsqueeze them after the SequenceIE op. */ -class ngraph::pass::ConvertRNNSequenceMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertRNNSequenceMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertRNNSequenceMatcher", "0"); ConvertRNNSequenceMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp index 4a1aa3617ef..63b863aa872 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp @@ -19,7 +19,7 @@ class ConvertSqrtToPowerIEMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertSqrtToPowerIEMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertSqrtToPowerIEMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertSqrtToPowerIEMatcher", "0"); ConvertSqrtToPowerIEMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp index b38a7cfd441..0ef21312641 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp @@ -19,7 +19,7 @@ class ConvertStridedSliceToCropMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertStridedSliceToCropMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertStridedSliceToCropMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertStridedSliceToCropMatcher", "0"); ConvertStridedSliceToCropMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp index 88783d4f5b2..1d5c9ae1d54 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp @@ -17,7 +17,7 @@ class ConvertSwishToSwishIEMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertSwishToSwishIEMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertSwishToSwishIEMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertSwishToSwishIEMatcher", "0"); ConvertSwishToSwishIEMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp index c0633f2bb53..5049a755a36 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp @@ -18,7 +18,7 @@ class ConvertTileToLegacyMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertTileToLegacyMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertTileToLegacyMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertTileToLegacyMatcher", "0"); ConvertTileToLegacyMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp index 9fedb169ae3..e4c3034c189 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp @@ -19,7 +19,7 @@ class ConvertTopKToTopKIEMatcher; } // namespace pass } // namespace ngraph -class ngraph::pass::ConvertTopKToTopKIEMatcher : public ngraph::pass::MatcherPass { +class ngraph::pass::ConvertTopKToTopKIEMatcher : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertTopKToTopKIEMatcher", "0"); ConvertTopKToTopKIEMatcher(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp index 3eac2372f86..fe960f2a041 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp @@ -28,7 +28,7 @@ class FullyConnectedBiasFusion; } // namespace pass } // namespace ngraph -class ngraph::pass::FullyConnectedBiasFusion : public ngraph::pass::MatcherPass { +class ngraph::pass::FullyConnectedBiasFusion : public ov::pass::MatcherPass { public: OPENVINO_RTTI("FullyConnectedBiasFusion", "0"); FullyConnectedBiasFusion(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp index b7af01fe423..be46603f8fd 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp @@ -21,25 +21,25 @@ class Reshape1DMaxPool; } // namespace pass } // namespace ngraph -class ngraph::pass::Reshape1DConvolution : public ngraph::pass::MatcherPass { +class ngraph::pass::Reshape1DConvolution : public ov::pass::MatcherPass { public: OPENVINO_RTTI("Reshape1DConvolution", "0"); Reshape1DConvolution(); }; -class ngraph::pass::Reshape1DAvgPool : public ngraph::pass::MatcherPass { +class ngraph::pass::Reshape1DAvgPool : public ov::pass::MatcherPass { public: OPENVINO_RTTI("Reshape1DAvgPool", "0"); Reshape1DAvgPool(); }; -class ngraph::pass::Reshape1DMaxPool : public ngraph::pass::MatcherPass { +class ngraph::pass::Reshape1DMaxPool : public ov::pass::MatcherPass { public: OPENVINO_RTTI("Reshape1DMaxPool", "0"); Reshape1DMaxPool(); }; -class ngraph::pass::Reshape1DOps : public ngraph::pass::GraphRewrite { +class ngraph::pass::Reshape1DOps : public ov::pass::GraphRewrite { public: OPENVINO_RTTI("Reshape1DOps", "0"); Reshape1DOps() { diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp index 1e8eeb40561..1aae7fe07de 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp @@ -28,7 +28,7 @@ class ReshapeFullyConnectedFusion; } // namespace pass } // namespace ngraph -class ngraph::pass::ReshapeFullyConnectedFusion : public ngraph::pass::MatcherPass { +class ngraph::pass::ReshapeFullyConnectedFusion : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ReshapeFullyConnectedFusion", "0"); ReshapeFullyConnectedFusion(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp index 2914773e805..d0c615369c3 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp @@ -41,7 +41,7 @@ class ReshapeFullyConnected; * */ -class ngraph::pass::ReshapeFullyConnected : public ngraph::pass::MatcherPass { +class ngraph::pass::ReshapeFullyConnected : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ReshapeFullyConnected", "0"); ReshapeFullyConnected(); diff --git a/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.cpp index c39a770465c..b20f56605d7 100644 --- a/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.cpp +++ b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.cpp @@ -206,7 +206,7 @@ ngraph::matcher_pass_callback get_callback() { return callback; } -class ConvertAdd : public ngraph::pass::MatcherPass { +class ConvertAdd : public ov::pass::MatcherPass { public: ConvertAdd() { auto m = std::make_shared(ngraph::pattern::wrap_type()); @@ -214,7 +214,7 @@ public: } }; -class ConvertSub : public ngraph::pass::MatcherPass { +class ConvertSub : public ov::pass::MatcherPass { public: ConvertSub() { auto m = std::make_shared(ngraph::pattern::wrap_type()); @@ -222,7 +222,7 @@ public: } }; -class ConvertMul : public ngraph::pass::MatcherPass { +class ConvertMul : public ov::pass::MatcherPass { public: ConvertMul() { auto m = std::make_shared(ngraph::pattern::wrap_type()); diff --git a/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp index 20026df7c98..b527127b03f 100644 --- a/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp +++ b/src/plugins/intel_gna/legacy/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp @@ -58,7 +58,7 @@ bool ngraph::pass::ConvertOpSet1ToLegacy::run_on_model(const std::shared_ptr(); + auto decomp = manager.register_pass(); decomp->add_matcher(); decomp->add_matcher(); decomp->add_matcher(); @@ -66,7 +66,7 @@ bool ngraph::pass::ConvertOpSet1ToLegacy::run_on_model(const std::shared_ptradd_matcher(); decomp->set_name("ngraph::pass::LegacyDecompositions"); - auto convert_matmul = manager.register_pass(); + auto convert_matmul = manager.register_pass(); convert_matmul->add_matcher(); convert_matmul->add_matcher(); convert_matmul->add_matcher(); @@ -78,7 +78,7 @@ bool ngraph::pass::ConvertOpSet1ToLegacy::run_on_model(const std::shared_ptr(); // Convolution/Deconvolution/FullyConnected fusions - auto fusion = manager.register_pass(); + auto fusion = manager.register_pass(); fusion->add_matcher(); fusion->add_matcher(); fusion->add_matcher(); @@ -90,7 +90,7 @@ bool ngraph::pass::ConvertOpSet1ToLegacy::run_on_model(const std::shared_ptr(); + auto anchor = manager.register_pass(); anchor->add_matcher(); anchor->add_matcher(); anchor->add_matcher(); diff --git a/src/plugins/intel_gna/legacy/tests/conv_fusion_test.cpp b/src/plugins/intel_gna/legacy/tests/conv_fusion_test.cpp index 64deeb9bc4b..5a2e9e46de4 100644 --- a/src/plugins/intel_gna/legacy/tests/conv_fusion_test.cpp +++ b/src/plugins/intel_gna/legacy/tests/conv_fusion_test.cpp @@ -20,7 +20,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" using namespace ov; diff --git a/src/plugins/intel_gna/legacy/tests/convert_cells_to_cells_ie_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_cells_to_cells_ie_test.cpp index 11689e31ac0..dcc57170121 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_cells_to_cells_ie_test.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_cells_to_cells_ie_test.cpp @@ -21,7 +21,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" using namespace testing; diff --git a/src/plugins/intel_gna/legacy/tests/convert_convolution_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_convolution_test.cpp index 0261c1c6f0c..1adb814f3ad 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_convolution_test.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_convolution_test.cpp @@ -20,7 +20,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" using namespace testing; diff --git a/src/plugins/intel_gna/legacy/tests/convert_deconvolution_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_deconvolution_test.cpp index d613a0daec0..32118727546 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_deconvolution_test.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_deconvolution_test.cpp @@ -21,7 +21,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" using namespace testing; diff --git a/src/plugins/intel_gna/legacy/tests/convert_gather_to_gather_ie.cpp b/src/plugins/intel_gna/legacy/tests/convert_gather_to_gather_ie.cpp index 5b9ff860ca7..b1877d7b379 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_gather_to_gather_ie.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_gather_to_gather_ie.cpp @@ -15,7 +15,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov; diff --git a/src/plugins/intel_gna/legacy/tests/convert_interpolate_to_legacy.cpp b/src/plugins/intel_gna/legacy/tests/convert_interpolate_to_legacy.cpp index 22cdc8eb1eb..27f11605168 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_interpolate_to_legacy.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_interpolate_to_legacy.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; diff --git a/src/plugins/intel_gna/legacy/tests/convert_lrn_to_legacy.cpp b/src/plugins/intel_gna/legacy/tests/convert_lrn_to_legacy.cpp index f81686fb98d..5830fb44602 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_lrn_to_legacy.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_lrn_to_legacy.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; diff --git a/src/plugins/intel_gna/legacy/tests/convert_matmul_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_matmul_test.cpp index bcd2bcdca04..1b81e71e89d 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_matmul_test.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_matmul_test.cpp @@ -20,7 +20,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" using namespace testing; diff --git a/src/plugins/intel_gna/legacy/tests/convert_nms5_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_nms5_test.cpp index e6e9af28a09..91bbab21cc9 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_nms5_test.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_nms5_test.cpp @@ -14,7 +14,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov; diff --git a/src/plugins/intel_gna/legacy/tests/convert_nms_to_nms_ie_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_nms_to_nms_ie_test.cpp index 5c06b39343c..f4cc881d9c1 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_nms_to_nms_ie_test.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_nms_to_nms_ie_test.cpp @@ -19,7 +19,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov; diff --git a/src/plugins/intel_gna/legacy/tests/convert_pad_to_legacy.cpp b/src/plugins/intel_gna/legacy/tests/convert_pad_to_legacy.cpp index 88ae02f6954..7f2324c7135 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_pad_to_legacy.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_pad_to_legacy.cpp @@ -13,7 +13,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; diff --git a/src/plugins/intel_gna/legacy/tests/convert_sequences_to_sequences_ie_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_sequences_to_sequences_ie_test.cpp index 2965e7b44c6..2eb898f46b9 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_sequences_to_sequences_ie_test.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_sequences_to_sequences_ie_test.cpp @@ -16,7 +16,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" using namespace testing; diff --git a/src/plugins/intel_gna/legacy/tests/convert_strided_slice_to_crop_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_strided_slice_to_crop_test.cpp index bdbc4aac6f5..5c54aec78a2 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_strided_slice_to_crop_test.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_strided_slice_to_crop_test.cpp @@ -21,7 +21,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" using namespace testing; diff --git a/src/plugins/intel_gna/legacy/tests/convert_tile_to_legacy.cpp b/src/plugins/intel_gna/legacy/tests/convert_tile_to_legacy.cpp index a6137ba4242..ef388748261 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_tile_to_legacy.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_tile_to_legacy.cpp @@ -15,7 +15,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; using namespace ov; diff --git a/src/plugins/intel_gna/legacy/tests/convert_topk_test.cpp b/src/plugins/intel_gna/legacy/tests/convert_topk_test.cpp index b3dcd03fca4..1e52ba47638 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_topk_test.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_topk_test.cpp @@ -16,7 +16,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" using namespace testing; diff --git a/src/plugins/intel_gna/legacy/tests/fc_bias_fusion_test.cpp b/src/plugins/intel_gna/legacy/tests/fc_bias_fusion_test.cpp index c5b7c085c3a..edb49a7ea8f 100644 --- a/src/plugins/intel_gna/legacy/tests/fc_bias_fusion_test.cpp +++ b/src/plugins/intel_gna/legacy/tests/fc_bias_fusion_test.cpp @@ -18,7 +18,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" using namespace testing; diff --git a/src/plugins/intel_gna/legacy/tests/mul_add_conversion_test.cpp b/src/plugins/intel_gna/legacy/tests/mul_add_conversion_test.cpp index 75fbde06947..ddd3affdb80 100644 --- a/src/plugins/intel_gna/legacy/tests/mul_add_conversion_test.cpp +++ b/src/plugins/intel_gna/legacy/tests/mul_add_conversion_test.cpp @@ -24,7 +24,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" #include "lpt_ngraph_functions/common/builders.hpp" diff --git a/src/plugins/intel_gna/legacy/tests/reshape_fc_fusion_test.cpp b/src/plugins/intel_gna/legacy/tests/reshape_fc_fusion_test.cpp index c41098ca5fb..0b7fc397e8f 100644 --- a/src/plugins/intel_gna/legacy/tests/reshape_fc_fusion_test.cpp +++ b/src/plugins/intel_gna/legacy/tests/reshape_fc_fusion_test.cpp @@ -17,7 +17,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" using namespace testing; diff --git a/src/plugins/intel_gna/src/transformations/broadcast_const.hpp b/src/plugins/intel_gna/src/transformations/broadcast_const.hpp index 6c46b36cafc..32e4d61e5b6 100644 --- a/src/plugins/intel_gna/src/transformations/broadcast_const.hpp +++ b/src/plugins/intel_gna/src/transformations/broadcast_const.hpp @@ -46,7 +46,7 @@ namespace pass { * For information about broadcasting rules see * https://github.com/openvinotoolkit/openvino/blob/master/docs/ops/broadcast_rules.md */ -class BroadcastAddMultiplyConst : public ngraph::pass::MatcherPass { +class BroadcastAddMultiplyConst : public ov::pass::MatcherPass { public: OPENVINO_RTTI("BroadcastAddMultiplyConst", "0"); BroadcastAddMultiplyConst(); diff --git a/src/plugins/intel_gna/src/transformations/convert_dwsc_to_scaleshifts.hpp b/src/plugins/intel_gna/src/transformations/convert_dwsc_to_scaleshifts.hpp index ff4d90a124d..80163251528 100644 --- a/src/plugins/intel_gna/src/transformations/convert_dwsc_to_scaleshifts.hpp +++ b/src/plugins/intel_gna/src/transformations/convert_dwsc_to_scaleshifts.hpp @@ -14,7 +14,7 @@ namespace pass { * @brief Convert a depthwise separable convolution (represented by a GroupConvolution) to a set of ScaleShift layers * (MatMul + Add) Additionally supported are bias and fake quantize layers. */ -class ConvertDWSCToScaleShifts : public ngraph::pass::MatcherPass { +class ConvertDWSCToScaleShifts : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertDWSCToScaleShifts", "0"); ConvertDWSCToScaleShifts(); diff --git a/src/plugins/intel_gna/src/transformations/convert_matmul_to_pointwise_convolution.hpp b/src/plugins/intel_gna/src/transformations/convert_matmul_to_pointwise_convolution.hpp index cd892b245ef..50bb2edc669 100644 --- a/src/plugins/intel_gna/src/transformations/convert_matmul_to_pointwise_convolution.hpp +++ b/src/plugins/intel_gna/src/transformations/convert_matmul_to_pointwise_convolution.hpp @@ -22,7 +22,7 @@ namespace pass { * | * Transose (NCHW -> NHWC) */ -class ConvertMatmulToPointWiseConvolution : public ngraph::pass::MatcherPass { +class ConvertMatmulToPointWiseConvolution : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertMatmulToPointWiseConvolution", "0"); ConvertMatmulToPointWiseConvolution(); @@ -42,7 +42,7 @@ public: * | * Transose (NCHW -> NHWC) */ -class ConvertMatmulWithBiasToPointWiseConvolution : public ngraph::pass::MatcherPass { +class ConvertMatmulWithBiasToPointWiseConvolution : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertMatmulWithBiasToPointWiseConvolution", "0"); ConvertMatmulWithBiasToPointWiseConvolution(); @@ -64,7 +64,7 @@ public: * | * Transose (NCHW -> NHWC) */ -class ConvertMatmulWithFqToPointWiseConvolution : public ngraph::pass::MatcherPass { +class ConvertMatmulWithFqToPointWiseConvolution : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertMatmulWithFqToPointWiseConvolution", "0"); ConvertMatmulWithFqToPointWiseConvolution(); diff --git a/src/plugins/intel_gna/src/transformations/convert_padded_to_valid_convolution.hpp b/src/plugins/intel_gna/src/transformations/convert_padded_to_valid_convolution.hpp index 39bcea78baf..aa19a6e253b 100644 --- a/src/plugins/intel_gna/src/transformations/convert_padded_to_valid_convolution.hpp +++ b/src/plugins/intel_gna/src/transformations/convert_padded_to_valid_convolution.hpp @@ -30,7 +30,7 @@ namespace pass { * Transpose (NCHW -> NHWC) Transpose (NCHW -> NHWC) * */ -class ConvertPaddedToValidConv : public ngraph::pass::MatcherPass { +class ConvertPaddedToValidConv : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ConvertPaddedToValidConv", "0"); ConvertPaddedToValidConv(); diff --git a/src/plugins/intel_gna/src/transformations/decompose_2d_convolution.hpp b/src/plugins/intel_gna/src/transformations/decompose_2d_convolution.hpp index 1aeb9070295..8749e42203c 100644 --- a/src/plugins/intel_gna/src/transformations/decompose_2d_convolution.hpp +++ b/src/plugins/intel_gna/src/transformations/decompose_2d_convolution.hpp @@ -32,7 +32,7 @@ namespace pass { * Transpose (NCHW -> NHWC) Transpose (NCHW -> NHWC) * */ -class Decompose2DConv : public ngraph::pass::MatcherPass { +class Decompose2DConv : public ov::pass::MatcherPass { public: OPENVINO_RTTI("Decompose2DConv", "0"); Decompose2DConv(const InferenceEngine::Precision& gnaPrecision); @@ -53,7 +53,7 @@ public: * Broadcast Bias Broadcast Bias * */ -class Decompose2DConvTransposedWithBias : public ngraph::pass::MatcherPass { +class Decompose2DConvTransposedWithBias : public ov::pass::MatcherPass { public: OPENVINO_RTTI("Decompose2DConvTransposedWithBias", "0"); Decompose2DConvTransposedWithBias(const InferenceEngine::Precision& gnaPrecision); @@ -76,7 +76,7 @@ public: * Activation Function Activation Function * */ -class Decompose2DConvTransposedWithBiasAF : public ngraph::pass::MatcherPass { +class Decompose2DConvTransposedWithBiasAF : public ov::pass::MatcherPass { public: OPENVINO_RTTI("Decompose2DConvTransposedWithBiasAF", "0"); Decompose2DConvTransposedWithBiasAF(const InferenceEngine::Precision& gnaPrecision); diff --git a/src/plugins/intel_gna/src/transformations/decompose_mvn.hpp b/src/plugins/intel_gna/src/transformations/decompose_mvn.hpp index 1f044a16a6f..39dfc6a9117 100644 --- a/src/plugins/intel_gna/src/transformations/decompose_mvn.hpp +++ b/src/plugins/intel_gna/src/transformations/decompose_mvn.hpp @@ -17,7 +17,7 @@ namespace pass { * https://docs.openvino.ai/2023.0/openvino_docs_ops_normalization_MVN_6.html * */ -class DecomposeMVN : public ngraph::pass::MatcherPass { +class DecomposeMVN : public ov::pass::MatcherPass { public: OPENVINO_RTTI("DecomposeMVN", "0"); DecomposeMVN(); diff --git a/src/plugins/intel_gna/src/transformations/handle_transposes_around_matmul.hpp b/src/plugins/intel_gna/src/transformations/handle_transposes_around_matmul.hpp index 2180f251e39..8d4924ec812 100644 --- a/src/plugins/intel_gna/src/transformations/handle_transposes_around_matmul.hpp +++ b/src/plugins/intel_gna/src/transformations/handle_transposes_around_matmul.hpp @@ -29,7 +29,7 @@ namespace pass { * | | * MatMul MatMul */ -class HandleTransposeBeforeMatMul : public ngraph::pass::MatcherPass { +class HandleTransposeBeforeMatMul : public ov::pass::MatcherPass { public: OPENVINO_RTTI("HandleTransposeBeforeMatMul", "0"); HandleTransposeBeforeMatMul(); @@ -58,13 +58,13 @@ public: * | | * [1, A*B] [1, A*B] */ -class HandleTransposeAfterMatMul : public ngraph::pass::MatcherPass { +class HandleTransposeAfterMatMul : public ov::pass::MatcherPass { public: OPENVINO_RTTI("HandleTransposeAfterMatMul", "0"); HandleTransposeAfterMatMul(); }; -class HandleTransposesAroundMatMul : public ngraph::pass::GraphRewrite { +class HandleTransposesAroundMatMul : public ov::pass::GraphRewrite { public: OPENVINO_RTTI("HandleTransposesAroundMatMul", "0"); HandleTransposesAroundMatMul(); diff --git a/src/plugins/intel_gna/src/transformations/insert_copy_layer.hpp b/src/plugins/intel_gna/src/transformations/insert_copy_layer.hpp index 1e9532bf19d..5924be6ca6e 100644 --- a/src/plugins/intel_gna/src/transformations/insert_copy_layer.hpp +++ b/src/plugins/intel_gna/src/transformations/insert_copy_layer.hpp @@ -28,7 +28,7 @@ namespace pass { * | | * [Memory] [Memory] */ -class InsertCopyBeforeAssignLayer : public ngraph::pass::MatcherPass { +class InsertCopyBeforeAssignLayer : public ov::pass::MatcherPass { public: NGRAPH_RTTI_DECLARATION; InsertCopyBeforeAssignLayer(); @@ -67,7 +67,7 @@ public: * | | | | | / * [Concat] [Concat] */ -class InsertCopyBeforeConcatLayer : public ngraph::pass::MatcherPass { +class InsertCopyBeforeConcatLayer : public ov::pass::MatcherPass { public: NGRAPH_RTTI_DECLARATION; InsertCopyBeforeConcatLayer(); @@ -103,7 +103,7 @@ public: * - layer is Broadcast and product of input and target shape is the same * - layer is Tile amd all repeats values are equal 1 */ -class InsertCopyBeforeLayerToBeEliminated : public ngraph::pass::MatcherPass { +class InsertCopyBeforeLayerToBeEliminated : public ov::pass::MatcherPass { public: OPENVINO_RTTI("InsertCopyBeforeLayerToBeEliminated", "0"); InsertCopyBeforeLayerToBeEliminated(); @@ -147,7 +147,7 @@ public: * | \ | \ * [Memory] [Concat] [Memory] [Concat] */ -class HandleMultiConnectedLayerToConcatAndMemory : public ngraph::pass::FunctionPass { +class HandleMultiConnectedLayerToConcatAndMemory : public ov::pass::ModelPass { public: NGRAPH_RTTI_DECLARATION; bool run_on_model(const std::shared_ptr& f) override; @@ -174,7 +174,7 @@ public: * | | | \ * [Result] [Result] [Result] [Result] */ -class MatchNonComputationalLayers : public ngraph::pass::MatcherPass { +class MatchNonComputationalLayers : public ov::pass::MatcherPass { public: NGRAPH_RTTI_DECLARATION; MatchNonComputationalLayers(); diff --git a/src/plugins/intel_gna/src/transformations/insert_reshape_around_matmul.hpp b/src/plugins/intel_gna/src/transformations/insert_reshape_around_matmul.hpp index 0e18c73dd84..2d5025ca9d4 100644 --- a/src/plugins/intel_gna/src/transformations/insert_reshape_around_matmul.hpp +++ b/src/plugins/intel_gna/src/transformations/insert_reshape_around_matmul.hpp @@ -12,25 +12,25 @@ namespace intel_gna { namespace pass { // @brief Insert Reshapes from 3d/4d to 2d before MatMul and from 2d to 3d/4d after MatMul -class InsertReshapeAroundMatmul : public ngraph::pass::MatcherPass { +class InsertReshapeAroundMatmul : public ov::pass::MatcherPass { public: OPENVINO_RTTI("InsertReshapeAroundMatmul", "0"); InsertReshapeAroundMatmul(); }; -class InsertReshapeAroundMatmulWithAdd : public ngraph::pass::MatcherPass { +class InsertReshapeAroundMatmulWithAdd : public ov::pass::MatcherPass { public: OPENVINO_RTTI("InsertReshapeAroundMatmulWithAdd", "0"); InsertReshapeAroundMatmulWithAdd(); }; -class InsertReshapeAroundMatmulWithFq : public ngraph::pass::MatcherPass { +class InsertReshapeAroundMatmulWithFq : public ov::pass::MatcherPass { public: OPENVINO_RTTI("InsertReshapeAroundMatmulWithFq", "0"); InsertReshapeAroundMatmulWithFq(); }; -class InsertReshapeAroundMatmulWithTranspose : public ngraph::pass::MatcherPass { +class InsertReshapeAroundMatmulWithTranspose : public ov::pass::MatcherPass { public: OPENVINO_RTTI("InsertReshapeAroundMatmulWithTranspose", "0"); InsertReshapeAroundMatmulWithTranspose(); diff --git a/src/plugins/intel_gna/src/transformations/insert_transpose_after_convolution_or_pooling.hpp b/src/plugins/intel_gna/src/transformations/insert_transpose_after_convolution_or_pooling.hpp index c6c3c9c0edf..b11dc5ea680 100644 --- a/src/plugins/intel_gna/src/transformations/insert_transpose_after_convolution_or_pooling.hpp +++ b/src/plugins/intel_gna/src/transformations/insert_transpose_after_convolution_or_pooling.hpp @@ -20,7 +20,7 @@ namespace pass { * | * Convolution */ -class InsertTransposeAfterConvOrPool : public ngraph::pass::FunctionPass { +class InsertTransposeAfterConvOrPool : public ov::pass::ModelPass { public: OPENVINO_RTTI("InsertTransposeAfterConvOrPool", "0"); bool run_on_model(const std::shared_ptr& f) override; diff --git a/src/plugins/intel_gna/src/transformations/markup_fusable_transpose.hpp b/src/plugins/intel_gna/src/transformations/markup_fusable_transpose.hpp index 5c22700ec9e..6323409d6ac 100644 --- a/src/plugins/intel_gna/src/transformations/markup_fusable_transpose.hpp +++ b/src/plugins/intel_gna/src/transformations/markup_fusable_transpose.hpp @@ -16,7 +16,7 @@ namespace pass { * with specific 0-3-2-1 transpose after Convolution and mark it up * for special handling in compiler for backward compatibility purposes */ -class MarkupFusableTranspose : public ngraph::pass::FunctionPass { +class MarkupFusableTranspose : public ov::pass::ModelPass { public: OPENVINO_RTTI("MarkupFusableTranspose", "0"); bool run_on_model(const std::shared_ptr& f) override; diff --git a/src/plugins/intel_gna/src/transformations/pwl_approximation.hpp b/src/plugins/intel_gna/src/transformations/pwl_approximation.hpp index 61c484cc933..a25974b35d1 100644 --- a/src/plugins/intel_gna/src/transformations/pwl_approximation.hpp +++ b/src/plugins/intel_gna/src/transformations/pwl_approximation.hpp @@ -25,13 +25,13 @@ namespace pass { * @ingroup ie_transformation_common_api * @brief PWLApproximation transformation replaces suitable activation function with pwl */ -class PWLApproximation : public ngraph::pass::MatcherPass { +class PWLApproximation : public ov::pass::MatcherPass { public: NGRAPH_RTTI_DECLARATION; PWLApproximation(double max_error_percent); }; -class PWLApproximationWithFq : public ngraph::pass::MatcherPass { +class PWLApproximationWithFq : public ov::pass::MatcherPass { public: NGRAPH_RTTI_DECLARATION; PWLApproximationWithFq(double max_error_percent); diff --git a/src/plugins/intel_gna/src/transformations/remove_converts.hpp b/src/plugins/intel_gna/src/transformations/remove_converts.hpp index d1c303145b9..cf222bfd8a3 100644 --- a/src/plugins/intel_gna/src/transformations/remove_converts.hpp +++ b/src/plugins/intel_gna/src/transformations/remove_converts.hpp @@ -46,7 +46,7 @@ const std::vector> kSupportedInp {ov::element::f32, ov::element::i32}, {ov::element::f32, ov::element::f32}}; -class RemoveInputConvert : public ngraph::pass::MatcherPass { +class RemoveInputConvert : public ov::pass::MatcherPass { public: OPENVINO_RTTI("RemoveInputConvert", "0"); RemoveInputConvert(); @@ -78,7 +78,7 @@ const std::vector> kSupportedOut {ov::element::f32, ov::element::f32}, {ov::element::f32, ov::element::i32}}; -class RemoveOutputConvert : public ngraph::pass::MatcherPass { +class RemoveOutputConvert : public ov::pass::MatcherPass { public: OPENVINO_RTTI("RemoveOutputConvert", "0"); RemoveOutputConvert(); diff --git a/src/plugins/intel_gna/src/transformations/remove_extra_reshapes.hpp b/src/plugins/intel_gna/src/transformations/remove_extra_reshapes.hpp index 723c829c158..0f3f5e3146f 100644 --- a/src/plugins/intel_gna/src/transformations/remove_extra_reshapes.hpp +++ b/src/plugins/intel_gna/src/transformations/remove_extra_reshapes.hpp @@ -14,7 +14,7 @@ namespace pass { * @brief Removes reshapes before MaxPool which do nothing. Such reshapes can be a result of conversion from IR10 to * IR7. */ -class RemoveExtraReshapes : public ngraph::pass::MatcherPass { +class RemoveExtraReshapes : public ov::pass::MatcherPass { public: OPENVINO_RTTI("RemoveExtraReshapes", "0"); RemoveExtraReshapes(); diff --git a/src/plugins/intel_gna/src/transformations/remove_single_input_concat.hpp b/src/plugins/intel_gna/src/transformations/remove_single_input_concat.hpp index ce521ffedb4..d3183959062 100644 --- a/src/plugins/intel_gna/src/transformations/remove_single_input_concat.hpp +++ b/src/plugins/intel_gna/src/transformations/remove_single_input_concat.hpp @@ -25,7 +25,7 @@ namespace pass { * | * Any output layer */ -class RemoveSingleInputConcat : public ngraph::pass::MatcherPass { +class RemoveSingleInputConcat : public ov::pass::MatcherPass { public: OPENVINO_RTTI("RemoveSingleInputConcat", "0"); RemoveSingleInputConcat(); diff --git a/src/plugins/intel_gna/src/transformations/reorder_activation_and_pooling.hpp b/src/plugins/intel_gna/src/transformations/reorder_activation_and_pooling.hpp index 67a245f83b5..f8b7cf11011 100644 --- a/src/plugins/intel_gna/src/transformations/reorder_activation_and_pooling.hpp +++ b/src/plugins/intel_gna/src/transformations/reorder_activation_and_pooling.hpp @@ -13,7 +13,7 @@ namespace pass { * @brief Pooling can be reordered with activation, on GNA there is a strategy to have conv->maxpool->activation * it means maxpool receives 4 bytes, and produces 4 bytes */ -class ReorderActivationAndPooling : public ngraph::pass::MatcherPass { +class ReorderActivationAndPooling : public ov::pass::MatcherPass { public: OPENVINO_RTTI("ReorderActivationAndPooling", "0"); ReorderActivationAndPooling(); diff --git a/src/plugins/intel_gna/src/transformations/replace_gna_nhwc_layers.hpp b/src/plugins/intel_gna/src/transformations/replace_gna_nhwc_layers.hpp index 904c6834a3a..476a9adc630 100644 --- a/src/plugins/intel_gna/src/transformations/replace_gna_nhwc_layers.hpp +++ b/src/plugins/intel_gna/src/transformations/replace_gna_nhwc_layers.hpp @@ -19,7 +19,7 @@ namespace pass { * | * Transpose (NHWC -> NCHW) */ -class SubstituteGNAConvolution : public ngraph::pass::MatcherPass { +class SubstituteGNAConvolution : public ov::pass::MatcherPass { public: NGRAPH_RTTI_DECLARATION; SubstituteGNAConvolution(); @@ -34,7 +34,7 @@ public: * | * Transpose (NHWC -> NCHW) */ -class SubstituteGNAMaxPool : public ngraph::pass::MatcherPass { +class SubstituteGNAMaxPool : public ov::pass::MatcherPass { public: NGRAPH_RTTI_DECLARATION; SubstituteGNAMaxPool(); @@ -43,7 +43,7 @@ public: /** * @brief calls SubstituteGNAConvolution and SubstituteGNAMaxPool together */ -class ReplaceGnaNHWCLayers : public ngraph::pass::FunctionPass { +class ReplaceGnaNHWCLayers : public ov::pass::ModelPass { public: NGRAPH_RTTI_DECLARATION; bool run_on_model(const std::shared_ptr& f) override; diff --git a/src/plugins/intel_gna/src/transformations/split_convolution_with_large_buffer_size.hpp b/src/plugins/intel_gna/src/transformations/split_convolution_with_large_buffer_size.hpp index 55cabb72f4b..04a3d418058 100644 --- a/src/plugins/intel_gna/src/transformations/split_convolution_with_large_buffer_size.hpp +++ b/src/plugins/intel_gna/src/transformations/split_convolution_with_large_buffer_size.hpp @@ -11,14 +11,14 @@ namespace intel_gna { namespace pass { // @brief Splits convolution with large input buffer -class SplitConvolution : public ngraph::pass::MatcherPass { +class SplitConvolution : public ov::pass::MatcherPass { public: OPENVINO_RTTI("SplitConvolution", "0"); SplitConvolution(); }; // @brief Splits convolution with large input buffer, move add with bias to each convolution before concat -class SplitConvolutionWithBias : public ngraph::pass::MatcherPass { +class SplitConvolutionWithBias : public ov::pass::MatcherPass { public: OPENVINO_RTTI("SplitConvolutionWithBias", "0"); SplitConvolutionWithBias(); @@ -27,7 +27,7 @@ public: /* @brief Splits convolution with large input buffer, * move add with bias and/or fake quantize to each convolution before concat */ -class SplitConvolutionWithFq : public ngraph::pass::MatcherPass { +class SplitConvolutionWithFq : public ov::pass::MatcherPass { public: OPENVINO_RTTI("SplitConvolutionWithFq", "0"); SplitConvolutionWithFq(); diff --git a/src/plugins/intel_gna/src/transformations/substitute_softsign.hpp b/src/plugins/intel_gna/src/transformations/substitute_softsign.hpp index 4b762497a57..73155b3a8a7 100644 --- a/src/plugins/intel_gna/src/transformations/substitute_softsign.hpp +++ b/src/plugins/intel_gna/src/transformations/substitute_softsign.hpp @@ -38,7 +38,7 @@ namespace pass { * SubstituteSoftsign transformation does backward substitution to SoftSign. * TODO: remove that pass as soon as ModelOptimizer will not substitute SoftSign activation */ -class SubstituteSoftsign : public ngraph::pass::MatcherPass { +class SubstituteSoftsign : public ov::pass::MatcherPass { public: OPENVINO_RTTI("SubstituteSoftsign", "0"); SubstituteSoftsign(); diff --git a/src/plugins/intel_gna/src/transformations/swap_input_matmul_gna.hpp b/src/plugins/intel_gna/src/transformations/swap_input_matmul_gna.hpp index 11c4c7b30bd..aa268e6580d 100644 --- a/src/plugins/intel_gna/src/transformations/swap_input_matmul_gna.hpp +++ b/src/plugins/intel_gna/src/transformations/swap_input_matmul_gna.hpp @@ -32,31 +32,31 @@ namespace pass { * Separate matchers are required for different last nodes. They should be registered in the order from the longest * to the shortest pattern. **/ -class SwapInputMatMul : public ngraph::pass::MatcherPass { +class SwapInputMatMul : public ov::pass::MatcherPass { public: OPENVINO_RTTI("SwapInputMatMul", "0"); SwapInputMatMul(); }; -class SwapInputMatMulWithBias : public ngraph::pass::MatcherPass { +class SwapInputMatMulWithBias : public ov::pass::MatcherPass { public: OPENVINO_RTTI("SwapInputMatMulWithBias", "0"); SwapInputMatMulWithBias(); }; -class SwapInputMatMulWithFq : public ngraph::pass::MatcherPass { +class SwapInputMatMulWithFq : public ov::pass::MatcherPass { public: OPENVINO_RTTI("SwapInputMatMulWithFq", "0"); SwapInputMatMulWithFq(); }; -class SwapInputMatMulWithAct : public ngraph::pass::MatcherPass { +class SwapInputMatMulWithAct : public ov::pass::MatcherPass { public: OPENVINO_RTTI("SwapInputMatMulWithAct", "0"); SwapInputMatMulWithAct(); }; -class SwapInputMatMulWithTrailingTranspose : public ngraph::pass::MatcherPass { +class SwapInputMatMulWithTrailingTranspose : public ov::pass::MatcherPass { public: OPENVINO_RTTI("SwapInputMatMulWithTrailingTranspose", "0"); SwapInputMatMulWithTrailingTranspose(); diff --git a/src/plugins/intel_gna/src/transformations/ts_concat_forward.hpp b/src/plugins/intel_gna/src/transformations/ts_concat_forward.hpp index a1c840fa8ca..aa41b9e1bc5 100644 --- a/src/plugins/intel_gna/src/transformations/ts_concat_forward.hpp +++ b/src/plugins/intel_gna/src/transformations/ts_concat_forward.hpp @@ -37,7 +37,7 @@ namespace pass { * | * Any#M */ -class TSConcatForward : public ngraph::pass::MatcherPass { +class TSConcatForward : public ov::pass::MatcherPass { public: OPENVINO_RTTI("TSConcatForward", "0"); TSConcatForward(); diff --git a/src/plugins/intel_gna/src/transformations/ts_split_backward.hpp b/src/plugins/intel_gna/src/transformations/ts_split_backward.hpp index 2a395276140..f6aa866aeda 100644 --- a/src/plugins/intel_gna/src/transformations/ts_split_backward.hpp +++ b/src/plugins/intel_gna/src/transformations/ts_split_backward.hpp @@ -37,7 +37,7 @@ namespace pass { * | | | * Any#2 .. Any#K .. Any#N */ -class TSSplitBackward : public ngraph::pass::MatcherPass { +class TSSplitBackward : public ov::pass::MatcherPass { public: OPENVINO_RTTI("TSSplitBackward", "0"); TSSplitBackward(); diff --git a/src/plugins/intel_gna/src/transformations/unfuse_reshape_and_transpose.hpp b/src/plugins/intel_gna/src/transformations/unfuse_reshape_and_transpose.hpp index 603d138df2b..466f078101b 100644 --- a/src/plugins/intel_gna/src/transformations/unfuse_reshape_and_transpose.hpp +++ b/src/plugins/intel_gna/src/transformations/unfuse_reshape_and_transpose.hpp @@ -34,7 +34,7 @@ namespace pass { * | * Convolution */ -class Unfuse2dto4dReshapeAndTranspose : public ngraph::pass::MatcherPass { +class Unfuse2dto4dReshapeAndTranspose : public ov::pass::MatcherPass { public: OPENVINO_RTTI("Unfuse2dto4dReshapeAndTranspose", "0"); Unfuse2dto4dReshapeAndTranspose(); @@ -65,7 +65,7 @@ public: * [N, HW] * */ -class Unfuse4dto2dReshapeAndTranspose : public ngraph::pass::MatcherPass { +class Unfuse4dto2dReshapeAndTranspose : public ov::pass::MatcherPass { public: OPENVINO_RTTI("Unfuse4dto2dReshapeAndTranspose", "0"); Unfuse4dto2dReshapeAndTranspose(); diff --git a/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/cnn_ngraph_impl_tests.cpp b/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/cnn_ngraph_impl_tests.cpp index 2c9ae02ea8d..38abd6b94ba 100644 --- a/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/cnn_ngraph_impl_tests.cpp +++ b/src/plugins/intel_gna/tests/deprecated/unit/inference_engine_tests/cnn_ngraph_impl_tests.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/plugins/intel_gna/tests/functional/preprocess_tests/gather_transpose_merge.cpp b/src/plugins/intel_gna/tests/functional/preprocess_tests/gather_transpose_merge.cpp index 322f1d89431..88d6c07272b 100644 --- a/src/plugins/intel_gna/tests/functional/preprocess_tests/gather_transpose_merge.cpp +++ b/src/plugins/intel_gna/tests/functional/preprocess_tests/gather_transpose_merge.cpp @@ -6,7 +6,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "ngraph_functions/builders.hpp" #include "openvino/opsets/opset10.hpp" #include "shared_test_classes/base/layer_test_utils.hpp" diff --git a/src/plugins/intel_gna/tests/unit/gna_export_import_test.cpp b/src/plugins/intel_gna/tests/unit/gna_export_import_test.cpp index 4513766d29e..bed9fa4eb0e 100644 --- a/src/plugins/intel_gna/tests/unit/gna_export_import_test.cpp +++ b/src/plugins/intel_gna/tests/unit/gna_export_import_test.cpp @@ -10,7 +10,7 @@ #include "any_copy.hpp" #include "common/versioning.hpp" #include "common_test_utils/data_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gna_mock_api.hpp" #include "gna_plugin.hpp" #include "ngraph_functions/builders.hpp" diff --git a/src/plugins/intel_gna/tests/unit/gna_infer_request_test.cpp b/src/plugins/intel_gna/tests/unit/gna_infer_request_test.cpp index b7c62d50bd8..abd7efeeef4 100644 --- a/src/plugins/intel_gna/tests/unit/gna_infer_request_test.cpp +++ b/src/plugins/intel_gna/tests/unit/gna_infer_request_test.cpp @@ -11,7 +11,7 @@ #include "any_copy.hpp" #include "common_test_utils/data_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gna_mock_api.hpp" #include "gna_plugin.hpp" #include "ngraph_functions/builders.hpp" diff --git a/src/plugins/intel_gna/tests/unit/pre_post_processing/gna_input_preproc_test.cpp b/src/plugins/intel_gna/tests/unit/pre_post_processing/gna_input_preproc_test.cpp index e377f44bcd8..7da896f0ac0 100644 --- a/src/plugins/intel_gna/tests/unit/pre_post_processing/gna_input_preproc_test.cpp +++ b/src/plugins/intel_gna/tests/unit/pre_post_processing/gna_input_preproc_test.cpp @@ -9,7 +9,7 @@ #include #include "common_test_utils/data_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "pre_post_process/converter_factory.hpp" #include "pre_post_process/input_output_data_handler.hpp" diff --git a/src/plugins/intel_gna/tests/unit/pre_post_processing/gna_output_postproc_test.cpp b/src/plugins/intel_gna/tests/unit/pre_post_processing/gna_output_postproc_test.cpp index 9004541212f..e3169c2a342 100644 --- a/src/plugins/intel_gna/tests/unit/pre_post_processing/gna_output_postproc_test.cpp +++ b/src/plugins/intel_gna/tests/unit/pre_post_processing/gna_output_postproc_test.cpp @@ -8,7 +8,7 @@ #include #include "common_test_utils/data_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "pre_post_process/converter_factory.hpp" #include "pre_post_process/input_output_data_handler.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_binary_test.cpp b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_binary_test.cpp index 438968cb08a..c357993bf19 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_binary_test.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_binary_test.cpp @@ -6,7 +6,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gather_sinking_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/frontend/manager.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_fuse_test.cpp b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_fuse_test.cpp index cc0a41dd759..a1c7bb75d34 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_fuse_test.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_fuse_test.cpp @@ -4,7 +4,7 @@ #include "transformations/gather_sinking_fuse.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/frontend/manager.hpp" #include "openvino/opsets/opset12.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_general_test.cpp b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_general_test.cpp index 98f8ee93b6b..8879695d0b2 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_general_test.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_general_test.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gather_sinking_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/core/model.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_matmul_test.cpp b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_matmul_test.cpp index b253f04aa28..f81e1420bf1 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_matmul_test.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_matmul_test.cpp @@ -4,7 +4,7 @@ #include "transformations/gather_sinking_matmul.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gather_sinking_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/core/model.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_reshape_test.cpp b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_reshape_test.cpp index 81b57361c63..c9d546da8c0 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_reshape_test.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_reshape_test.cpp @@ -4,7 +4,7 @@ #include "transformations/gather_sinking_reshape.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gather_sinking_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/core/model.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_split_test.cpp b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_split_test.cpp index c65e146a3a4..e394f3d4b7e 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_split_test.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_split_test.cpp @@ -4,7 +4,7 @@ #include "transformations/gather_sinking_split.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gather_sinking_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/core/model.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_test.cpp b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_test.cpp index a0cb85812d7..3fde2aec9d7 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_test.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_test.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "transformations/gather_sinking_matmul.hpp" #include "transformations/gather_sinking_reshape.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_transpose_reshape.cpp b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_transpose_reshape.cpp index 0bef883b583..732e85a4b79 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_transpose_reshape.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_transpose_reshape.cpp @@ -6,7 +6,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/opsets/opset12.hpp" #include "openvino/pass/manager.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_ts_split_test.cpp b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_ts_split_test.cpp index 69ca9807b49..48c12f124c9 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_ts_split_test.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_ts_split_test.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2023 Intel Corporation // SPDX-License-Identifier: Apache-2.0 // -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gather_sinking_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/core/model.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_unary_test.cpp b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_unary_test.cpp index c899f36d336..fddcf806aa0 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_unary_test.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gather_sinking_unary_test.cpp @@ -4,7 +4,7 @@ #include "transformations/gather_sinking_unary.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "gtest/gtest.h" #include "openvino/frontend/manager.hpp" #include "openvino/opsets/opset12.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gather_transpose_merge.cpp b/src/plugins/intel_gna/tests/unit/transformations/gather_transpose_merge.cpp index 338779374f6..6b07a8f698b 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gather_transpose_merge.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gather_transpose_merge.cpp @@ -6,7 +6,7 @@ #include "common/graph_utils.hpp" #include "common_test_utils/common_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "ngraph_functions/builders.hpp" #include "openvino/opsets/opset10.hpp" #include "openvino/pass/manager.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_broadcast_const.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_broadcast_const.cpp index 48bbb66c899..184f20b8204 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_broadcast_const.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_broadcast_const.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "legacy/ngraph_ops/eltwise.hpp" #include "legacy/ngraph_ops/scaleshift.hpp" #include "transformations/broadcast_const.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_convert_dwsc_to_scaleshifts.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_convert_dwsc_to_scaleshifts.cpp index ab108300c90..0b88e4a6439 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_convert_dwsc_to_scaleshifts.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_convert_dwsc_to_scaleshifts.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/convert_dwsc_to_scaleshifts.hpp" namespace testing { diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_convert_matmul_to_pointwise_convolution.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_convert_matmul_to_pointwise_convolution.cpp index a87ab26f46b..1985ac71690 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_convert_matmul_to_pointwise_convolution.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_convert_matmul_to_pointwise_convolution.cpp @@ -11,7 +11,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "ngraph_functions/builders.hpp" #include "transformations/convert_matmul_to_pointwise_convolution.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_convert_padded_to_valid_convolution.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_convert_padded_to_valid_convolution.cpp index 4d32157b26c..ce4ec6b702c 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_convert_padded_to_valid_convolution.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_convert_padded_to_valid_convolution.cpp @@ -10,7 +10,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/convert_padded_to_valid_convolution.hpp" namespace testing { diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_2d_convolution.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_2d_convolution.cpp index 49b7f96cc78..ea03b9971e1 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_2d_convolution.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_2d_convolution.cpp @@ -12,7 +12,7 @@ #include #include "backend/gna_limitations.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/decompose_2d_convolution.hpp" using namespace ov::intel_gna::limitations; diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_mvn.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_mvn.cpp index 2f01a3882de..a5e90ea86a6 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_mvn.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_mvn.cpp @@ -9,7 +9,7 @@ #include #include "backend/gna_limitations.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/decompose_mvn.hpp" #include "transformations/op_conversions/convert_mvn1_to_mvn6.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_handle_transposes_around_matmul.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_handle_transposes_around_matmul.cpp index 8c65d5183da..c4ae53b7255 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_handle_transposes_around_matmul.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_handle_transposes_around_matmul.cpp @@ -10,7 +10,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/handle_transposes_around_matmul.hpp" namespace handle_transpose_before_matmul { diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_copy_layer.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_copy_layer.cpp index dc81d3ea5a7..c5b4d05c674 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_copy_layer.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_copy_layer.cpp @@ -13,7 +13,7 @@ #include "backend/gna_limitations.hpp" #include "common/gna_target.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "ngraph_functions/builders.hpp" #include "ops/copy.hpp" #include "transformations/insert_copy_layer.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_identity_layer.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_identity_layer.cpp index 6090132b981..111d609ab31 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_identity_layer.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_identity_layer.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include #include #include diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_reshape_around_matmul.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_reshape_around_matmul.cpp index 7b0376125a2..f23acb81887 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_reshape_around_matmul.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_reshape_around_matmul.cpp @@ -10,7 +10,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/insert_reshape_around_matmul.hpp" template #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/insert_transpose_after_convolution_or_pooling.hpp" namespace testing { diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_pwl.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_pwl.cpp index 66ba7ea302b..58f493a9f15 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_pwl.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_pwl.cpp @@ -10,7 +10,7 @@ #include #include "common_test_utils/data_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/pwl_approximation.hpp" using namespace ov::intel_gna::common; diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_remove_convert.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_remove_convert.cpp index b029ab88068..da1434da634 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_remove_convert.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_remove_convert.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "ngraph_functions/builders.hpp" #include "transformations/remove_converts.hpp" diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_remove_extra_reshapes.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_remove_extra_reshapes.cpp index 286e9ba93dc..842681b8d34 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_remove_extra_reshapes.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_remove_extra_reshapes.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/remove_extra_reshapes.hpp" namespace testing { diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_remove_single_input_concat.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_remove_single_input_concat.cpp index 6b878206f50..7af95a3a67c 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_remove_single_input_concat.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_remove_single_input_concat.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/remove_single_input_concat.hpp" namespace testing { diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_reorder_activation_and_pooling.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_reorder_activation_and_pooling.cpp index 6555b93240d..d4a65bd8cd3 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_reorder_activation_and_pooling.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_reorder_activation_and_pooling.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/reorder_activation_and_pooling.hpp" namespace testing { diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_split_convolution_with_large_buffer_size.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_split_convolution_with_large_buffer_size.cpp index 328349e3fd2..e51b7832d44 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_split_convolution_with_large_buffer_size.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_split_convolution_with_large_buffer_size.cpp @@ -11,7 +11,7 @@ #include "backend/gna_limitations.hpp" #include "common/gna_target.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/split_convolution_with_large_buffer_size.hpp" using namespace ov::intel_gna::limitations; diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_split_eltwise.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_split_eltwise.cpp index 671d03017f4..05f928a596d 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_split_eltwise.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_split_eltwise.cpp @@ -14,7 +14,7 @@ #include "backend/gna_limitations.hpp" #include "common/gna_target.hpp" #include "common_test_utils/common_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/split_eltwise.hpp" using namespace ov::intel_gna::limitations; diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_substitute_softsign.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_substitute_softsign.cpp index 4a31b720335..6cd0be8bc4c 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_substitute_softsign.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_substitute_softsign.cpp @@ -10,7 +10,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/substitute_softsign.hpp" namespace testing { diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_swap_input_matmul.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_swap_input_matmul.cpp index dab8fe52348..8118ac2948c 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_swap_input_matmul.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_swap_input_matmul.cpp @@ -9,7 +9,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/swap_input_matmul_gna.hpp" namespace testing { diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_unfuse_reshape_and_transpose.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_unfuse_reshape_and_transpose.cpp index 5aca394c68b..f0312aa24d4 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_unfuse_reshape_and_transpose.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_unfuse_reshape_and_transpose.cpp @@ -10,7 +10,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "transformations/unfuse_reshape_and_transpose.hpp" namespace testing { diff --git a/src/plugins/intel_gna/tests/unit/transformations/transpose_compress.cpp b/src/plugins/intel_gna/tests/unit/transformations/transpose_compress.cpp index e4e3bd87f8e..86577b16693 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/transpose_compress.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/transpose_compress.cpp @@ -6,7 +6,7 @@ #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "openvino/core/model.hpp" #include "openvino/opsets/opset12.hpp" diff --git a/src/plugins/template/tests/functional/transformations/disable_transformations_test.cpp b/src/plugins/template/tests/functional/transformations/disable_transformations_test.cpp index fa7a2b557da..6ad9c5c024f 100644 --- a/src/plugins/template/tests/functional/transformations/disable_transformations_test.cpp +++ b/src/plugins/template/tests/functional/transformations/disable_transformations_test.cpp @@ -9,7 +9,7 @@ #include #include "common_test_utils/graph_comparator.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "functional_test_utils/ov_plugin_cache.hpp" #include "openvino/opsets/opset11.hpp" #include "template/properties.hpp" diff --git a/src/tests/functional/plugin/shared/include/behavior/compiled_model/compiled_model_base.hpp b/src/tests/functional/plugin/shared/include/behavior/compiled_model/compiled_model_base.hpp index 171a01e8034..2160fe9cf80 100644 --- a/src/tests/functional/plugin/shared/include/behavior/compiled_model/compiled_model_base.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/compiled_model/compiled_model_base.hpp @@ -8,7 +8,7 @@ #include "base/ov_behavior_test_utils.hpp" #include "common_test_utils/file_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" #include "openvino/runtime/tensor.hpp" diff --git a/src/tests/functional/plugin/shared/include/behavior/compiled_model/import_export.hpp b/src/tests/functional/plugin/shared/include/behavior/compiled_model/import_export.hpp index 1509314287f..72e924b1298 100644 --- a/src/tests/functional/plugin/shared/include/behavior/compiled_model/import_export.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/compiled_model/import_export.hpp @@ -8,7 +8,7 @@ #include #include #include "base/ov_behavior_test_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/common_utils.hpp" #include "common_test_utils/file_utils.hpp" diff --git a/src/tests/functional/plugin/shared/include/behavior/executable_network/exec_network_base.hpp b/src/tests/functional/plugin/shared/include/behavior/executable_network/exec_network_base.hpp index 0d0f155360f..379c39393bd 100644 --- a/src/tests/functional/plugin/shared/include/behavior/executable_network/exec_network_base.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/executable_network/exec_network_base.hpp @@ -4,7 +4,7 @@ #include #include "base/behavior_test_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/file_utils.hpp" #include "openvino/core/model.hpp" diff --git a/src/tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_graph_info.hpp b/src/tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_graph_info.hpp index 0889a18dd00..d946a652dbd 100644 --- a/src/tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_graph_info.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_graph_info.hpp @@ -8,7 +8,7 @@ #include #include #include "base/ov_behavior_test_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/common_utils.hpp" #include "common_test_utils/file_utils.hpp" diff --git a/src/tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_network_base.hpp b/src/tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_network_base.hpp index 09deb1aed68..82eff7a1594 100644 --- a/src/tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_network_base.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_network_base.hpp @@ -8,7 +8,7 @@ #include "base/ov_behavior_test_utils.hpp" #include "common_test_utils/file_utils.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "functional_test_utils/plugin_cache.hpp" #include "openvino/runtime/tensor.hpp" diff --git a/src/tests/functional/plugin/shared/src/execution_graph_tests/nms_transformation_for_last_node.cpp b/src/tests/functional/plugin/shared/src/execution_graph_tests/nms_transformation_for_last_node.cpp index c0927c87116..78052b1f7e8 100644 --- a/src/tests/functional/plugin/shared/src/execution_graph_tests/nms_transformation_for_last_node.cpp +++ b/src/tests/functional/plugin/shared/src/execution_graph_tests/nms_transformation_for_last_node.cpp @@ -12,7 +12,7 @@ #include #include "functional_test_utils/skip_tests_config.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include #include diff --git a/src/tests/functional/plugin/shared/src/execution_graph_tests/normalize_l2_decomposition.cpp b/src/tests/functional/plugin/shared/src/execution_graph_tests/normalize_l2_decomposition.cpp index f341a1ba23d..994deee1219 100644 --- a/src/tests/functional/plugin/shared/src/execution_graph_tests/normalize_l2_decomposition.cpp +++ b/src/tests/functional/plugin/shared/src/execution_graph_tests/normalize_l2_decomposition.cpp @@ -10,7 +10,7 @@ #include #include "functional_test_utils/skip_tests_config.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_constants.hpp" #include "execution_graph_tests/normalize_l2_decomposition.hpp" diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp index 4227cbf492e..918f63c3af9 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/layer_test_utils.hpp @@ -18,7 +18,7 @@ #include #include -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/common_utils.hpp" #include "common_test_utils/test_common.hpp" diff --git a/src/tests/ngraph_helpers/ngraph_functions/include/ngraph_functions/pass/convert_prc.hpp b/src/tests/ngraph_helpers/ngraph_functions/include/ngraph_functions/pass/convert_prc.hpp index ae14a1673d3..867bd76de2f 100644 --- a/src/tests/ngraph_helpers/ngraph_functions/include/ngraph_functions/pass/convert_prc.hpp +++ b/src/tests/ngraph_helpers/ngraph_functions/include/ngraph_functions/pass/convert_prc.hpp @@ -86,7 +86,7 @@ public: }; template -class ConvertPrecision : public ngraph::pass::GraphRewrite { +class ConvertPrecision : public ov::pass::GraphRewrite { public: ConvertPrecision() { add_matcher>(); diff --git a/src/tests/ngraph_helpers/snippets_ngraph_functions/include/snippets_helpers.hpp b/src/tests/ngraph_helpers/snippets_ngraph_functions/include/snippets_helpers.hpp index 9d3edad4b55..d7faf9db47e 100644 --- a/src/tests/ngraph_helpers/snippets_ngraph_functions/include/snippets_helpers.hpp +++ b/src/tests/ngraph_helpers/snippets_ngraph_functions/include/snippets_helpers.hpp @@ -4,7 +4,7 @@ #pragma once #include "openvino/core/model.hpp" -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" namespace ov { namespace test { diff --git a/src/tests/test_utils/common_test_utils/include/common_test_utils/ngraph_test_utils.hpp b/src/tests/test_utils/common_test_utils/include/common_test_utils/ov_test_utils.hpp similarity index 100% rename from src/tests/test_utils/common_test_utils/include/common_test_utils/ngraph_test_utils.hpp rename to src/tests/test_utils/common_test_utils/include/common_test_utils/ov_test_utils.hpp diff --git a/src/tests/test_utils/common_test_utils/src/ngraph_test_utils.cpp b/src/tests/test_utils/common_test_utils/src/ov_test_utils.cpp similarity index 98% rename from src/tests/test_utils/common_test_utils/src/ngraph_test_utils.cpp rename to src/tests/test_utils/common_test_utils/src/ov_test_utils.cpp index 8dca1c4b185..ef179e61771 100644 --- a/src/tests/test_utils/common_test_utils/src/ngraph_test_utils.cpp +++ b/src/tests/test_utils/common_test_utils/src/ov_test_utils.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "common_test_utils/ngraph_test_utils.hpp" +#include "common_test_utils/ov_test_utils.hpp" namespace ov { namespace pass {