From a93ec833fac91ddc3ae8b37d5e1475ce262a3d74 Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Mon, 22 Jul 2024 02:05:39 +0400 Subject: [PATCH 01/16] change transformations headers --- .../low_precision/base_matcher_pass.hpp | 2 +- .../convert_subtract_constant.hpp | 2 +- .../low_precision/create_attribute.hpp | 1 - .../create_precisions_dependent_attribute.hpp | 2 +- .../low_precision/layer_transformation.hpp | 2 +- .../include/low_precision/low_precision.hpp | 2 +- .../include/low_precision/markup_bias.hpp | 2 +- .../low_precision/propagate_shared_value.hpp | 2 +- .../propagate_through_precision_preserved.hpp | 2 +- .../low_precision/propagate_to_input.hpp | 2 +- .../pull_reshape_through_dequantization.hpp | 2 +- .../pull_transpose_through_dequantization.hpp | 2 +- .../include/compress_quantize_weights.hpp | 2 +- .../include/pruning.hpp | 2 +- .../pass/broadcast_to_movebroadcast.hpp | 2 +- .../snippets/pass/collapse_subgraph.hpp | 3 +- .../snippets/pass/common_optimizations.hpp | 2 +- .../snippets/pass/convert_constants.hpp | 2 +- .../pass/convert_power_to_powerstatic.hpp | 3 +- .../pass/explicit_transpose_matmul_inputs.hpp | 2 +- .../pass/extract_reshapes_from_mha.hpp | 3 +- .../snippets/pass/fq_decomposition.hpp | 2 +- .../snippets/pass/fuse_transpose_brgemm.hpp | 3 +- .../snippets/pass/gn_decomposition.hpp | 3 +- .../snippets/pass/insert_movebroadcast.hpp | 3 +- .../snippets/pass/matmul_to_brgemm.hpp | 3 +- .../snippets/pass/mha_tokenization.hpp | 3 +- .../pass/reduce_to_snippets_reduce.hpp | 3 +- .../snippets/pass/softmax_decomposition.hpp | 3 +- .../pass/softmax_reshape_elimination.hpp | 3 +- .../include/snippets/pass/tokenization.hpp | 3 +- .../snippets/pass/transform_convert.hpp | 3 +- .../snippets/pass/transpose_decomposition.hpp | 3 +- .../include/snippets/pass/validate.hpp | 3 +- .../adaptive_pool_to_reduce.hpp | 2 +- .../add_fake_quantize_fusion.hpp | 2 +- .../align_eltwise_input_ranks.hpp | 2 +- .../augru_cell_fusion.hpp | 2 +- .../batch_to_space_fusion.hpp | 2 +- .../common_optimizations/binarize_weights.hpp | 2 +- .../broadcast_elementwise_fusion.hpp | 2 +- .../broadcast_transition.hpp | 2 +- .../common_optimizations/clamp_fusion.hpp | 2 +- .../common_optimizations.hpp | 2 +- .../compress_float_constants.hpp | 2 +- .../common_optimizations/concat_fusion.hpp | 2 +- .../concat_reduce_fusion.hpp | 2 +- .../concat_to_broadcast.hpp | 2 +- .../common_optimizations/conv_mul_fusion.hpp | 2 +- .../conv_to_binary_conv.hpp | 2 +- .../convert_nms_gather_path_to_unsigned.hpp | 2 +- .../convert_quantize_dequantize.hpp | 2 +- ...onvert_u4_weights_zero_point_to_scalar.hpp | 2 +- .../depth_to_space_fusion.hpp | 2 +- .../dilated_convolution_converter.hpp | 2 +- .../dimension_tracking.hpp | 2 +- ...isable_random_uniform_constant_folding.hpp | 2 +- .../disable_shapeof_constant_folding.hpp | 3 +- .../common_optimizations/divide_fusion.hpp | 2 +- .../dropout_with_random_uniform_replacer.hpp | 2 +- .../eliminate_duplicate_ti_inputs.hpp | 2 +- .../eliminate_loop_inputs_outputs.hpp | 2 +- .../eliminate_unsqueeze_gather.hpp | 3 +- .../enable_shapeof_constant_folding.hpp | 2 +- .../fold_subgraph_empty_inputs.hpp | 2 +- .../common_optimizations/fq_mul_fusion.hpp | 2 +- .../fq_reshape_fusion.hpp | 2 +- .../fuse_rotary_positional_embeddings.hpp | 2 +- .../common_optimizations/gelu_fusion.hpp | 2 +- .../common_optimizations/gru_cell_fusion.hpp | 2 +- .../common_optimizations/hsigmoid_fusion.hpp | 2 +- .../interpolate_sequence_fusion.hpp | 3 +- .../leaky_relu_fusion.hpp | 2 +- .../common_optimizations/mish_fusion.hpp | 3 +- .../moc_transformations.hpp | 3 +- .../move_eltwise_up_data_movement.hpp | 2 +- .../mul_fake_quantize_fusion.hpp | 2 +- .../nearest_neighbor_upsampling_fusion.hpp | 2 +- .../common_optimizations/nop_elimination.hpp | 2 +- .../pull_transpose_through_fq.hpp | 2 +- .../reduce_reshape_fusion.hpp | 2 +- .../relu_fake_quantize_fusion.hpp | 2 +- .../common_optimizations/reshape_prelu.hpp | 2 +- .../reshape_sequence_fusion.hpp | 2 +- .../common_optimizations/ric_fusion.hpp | 3 +- .../common_optimizations/rms_fusion.hpp | 2 +- .../select_with_one_value_condition.hpp | 2 +- .../common_optimizations/sequence_fusion.hpp | 2 +- .../shared_ops_optimization.hpp | 2 +- .../shuffle_channels_fusion.hpp | 2 +- .../simplify_shape_of_sub_graph.hpp | 2 +- ...ip_gather_before_transpose_and_reshape.hpp | 2 +- .../common_optimizations/softmax_fusion.hpp | 2 +- .../common_optimizations/softplus_fusion.hpp | 2 +- .../softplus_to_mish_fusion.hpp | 3 +- .../space_to_batch_fusion.hpp | 2 +- ...plit_concat_pair_to_interpolate_fusion.hpp | 3 +- .../split_squeeze_concat_fusion.hpp | 3 +- .../strides_optimization.hpp | 2 +- .../common_optimizations/subtract_fusion.hpp | 2 +- .../common_optimizations/swish_fusion.hpp | 2 +- ...anspose_reshape_elimination_for_matmul.hpp | 2 +- .../transpose_sinking.hpp | 3 +- .../transpose_to_reshape.hpp | 3 +- .../weights_dequantize_to_fake_quantize.hpp | 2 +- .../wrap_interpolate_into_transposes.hpp | 2 +- .../control_flow/unroll_if.hpp | 2 +- .../control_flow/unroll_tensor_iterator.hpp | 2 +- .../transformations/convert_precision.hpp | 2 +- .../flush_fp32_subnormals_to_zero.hpp | 2 +- .../align_mixed_fp32_fp16_types.hpp | 3 +- .../convert_compression_only_to_legacy.hpp | 3 +- ...decompression_convert_constant_folding.hpp | 2 +- ...k_subgraphs_to_keep_in_mixed_precision.hpp | 3 +- .../transformations/init_node_info.hpp | 2 +- .../mark_dequantization_subgraph.hpp | 2 +- .../batch_norm_decomposition.hpp | 2 +- .../convert_avgpool_downgrade.hpp | 2 +- .../op_conversions/convert_batch_to_space.hpp | 2 +- .../op_conversions/convert_broadcast3.hpp | 2 +- .../convert_broadcast_to_tiles.hpp | 2 +- .../op_conversions/convert_convertlike.hpp | 2 +- .../convert_convertpromotetypes.hpp | 2 +- .../convert_deformable_conv_v8_to_v1.hpp | 2 +- .../op_conversions/convert_depth_to_space.hpp | 2 +- .../op_conversions/convert_divide.hpp | 2 +- ...vert_embedding_bag_offsets15_downgrade.hpp | 2 +- ...nvert_embedding_bag_packed15_downgrade.hpp | 2 +- .../op_conversions/convert_gather_0d.hpp | 2 +- .../convert_gather_downgrade.hpp | 2 +- .../convert_gather_to_compressed.hpp | 2 +- .../op_conversions/convert_gather_upgrade.hpp | 2 +- .../op_conversions/convert_gelu.hpp | 2 +- .../convert_gp9_to_gp_ie_internal.hpp | 2 +- .../convert_interpolate11_downgrade.hpp | 2 +- .../convert_interpolate1_to_interpolate4.hpp | 2 +- .../convert_matrix_nms_to_matrix_nms_ie.hpp | 2 +- .../convert_maxpool_downgrade.hpp | 2 +- .../convert_maxpool_upgrade.hpp | 2 +- .../convert_minimum_to_power_and_max.hpp | 2 +- .../op_conversions/convert_mod.hpp | 2 +- ...rt_multiclass_nms_to_multiclass_nms_ie.hpp | 2 +- .../convert_multiclass_nms_upgrade.hpp | 2 +- .../op_conversions/convert_mvn1_to_mvn6.hpp | 2 +- .../op_conversions/convert_negative.hpp | 2 +- .../convert_nms9_to_nms_ie_internal.hpp | 2 +- ...convert_nms_rotated_to_nms_ie_internal.hpp | 2 +- .../convert_nms_to_nms_ie_internal.hpp | 2 +- .../convert_pad12_downgrade.hpp | 2 +- .../convert_pad_to_group_conv.hpp | 2 +- .../convert_previous_nms_to_nms_5.hpp | 2 +- .../convert_prior_box_v8_to_v0.hpp | 2 +- .../convert_roi_align_v3_to_v9.hpp | 2 +- .../op_conversions/convert_shapeof3.hpp | 2 +- .../convert_softmax_downgrade.hpp | 2 +- .../op_conversions/convert_space_to_depth.hpp | 2 +- .../op_conversions/convert_subtract.hpp | 2 +- .../convert_xor_to_logical_xor.hpp | 2 +- .../op_conversions/eye_decomposition.hpp | 2 +- .../normalize_l2_decomposition.hpp | 3 +- ...ed_dot_product_attention_decomposition.hpp | 2 +- .../convert_opset2_to_opset1.hpp | 2 +- .../position_ids_replacer.hpp | 2 +- .../prev_sequence_length_pattern.hpp | 2 +- .../smart_reshape/reshape_sinking.hpp | 2 +- .../smart_reshape/reshape_to_1D.hpp | 2 +- .../smart_reshape/shape_of_const_folding.hpp | 2 +- .../smart_reshape/smart_reshape.hpp | 2 +- .../smart_reshape/strided_slice_squeeze.hpp | 2 +- .../chained_maximum.hpp | 2 +- .../dereshape_matmul.hpp | 2 +- .../reshape_optimizations.hpp | 2 +- .../transpose_sinking/ts_binary.hpp | 3 +- .../transpose_sinking/ts_concat.hpp | 3 +- .../transpose_sinking/ts_cumsum.hpp | 3 +- .../transpose_sinking/ts_data_movement.hpp | 3 +- .../transpose_sinking/ts_fuse.hpp | 3 +- .../transpose_sinking/ts_gather.hpp | 3 +- .../transpose_sinking/ts_interpolate.hpp | 3 +- .../transpose_sinking/ts_reduction.hpp | 3 +- .../ts_reset_no_sinking_attribute.hpp | 3 +- .../transpose_sinking/ts_slice.hpp | 3 +- .../transpose_sinking/ts_squeeze.hpp | 3 +- .../transpose_sinking/ts_unary.hpp | 2 +- .../openvino/pass/BackwardGraphRewrite.hpp | 27 ++++ .../include/openvino/pass/GraphRewrite.hpp | 137 ++++++++++++++++++ .../include/openvino/pass/MatcherPass.hpp | 109 ++++++++++++++ .../include/openvino/pass/NodeRegistry.hpp | 61 ++++++++ .../openvino/pass/convert_fp32_to_fp16.hpp | 2 +- .../include/openvino/pass/graph_rewrite.hpp | 4 + 190 files changed, 522 insertions(+), 226 deletions(-) create mode 100644 src/core/include/openvino/pass/BackwardGraphRewrite.hpp create mode 100644 src/core/include/openvino/pass/GraphRewrite.hpp create mode 100644 src/core/include/openvino/pass/MatcherPass.hpp create mode 100644 src/core/include/openvino/pass/NodeRegistry.hpp 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 a71735090f49dd..9da2caf1d57df0 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 @@ -4,7 +4,7 @@ #pragma once #include "openvino/core/node.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "rt_info/attribute_parameters.hpp" namespace ov { diff --git a/src/common/low_precision_transformations/include/low_precision/convert_subtract_constant.hpp b/src/common/low_precision_transformations/include/low_precision/convert_subtract_constant.hpp index 0316f0b2b029bb..c68452d3254bbc 100644 --- a/src/common/low_precision_transformations/include/low_precision/convert_subtract_constant.hpp +++ b/src/common/low_precision_transformations/include/low_precision/convert_subtract_constant.hpp @@ -8,7 +8,7 @@ #include #include "low_precision/lpt_visibility.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace pass { diff --git a/src/common/low_precision_transformations/include/low_precision/create_attribute.hpp b/src/common/low_precision_transformations/include/low_precision/create_attribute.hpp index 1357b81a88af0f..cd9c21f7fe8d40 100644 --- a/src/common/low_precision_transformations/include/low_precision/create_attribute.hpp +++ b/src/common/low_precision_transformations/include/low_precision/create_attribute.hpp @@ -8,7 +8,6 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "low_precision/lpt_visibility.hpp" #include "low_precision/base_matcher_pass.hpp" 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 dc3d81eefd9d89..c61b11c879f1e0 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 @@ -11,7 +11,7 @@ #include "openvino/pass/pattern/op/wrap_type.hpp" #include "low_precision/lpt_visibility.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "openvino/opsets/opset1.hpp" #include "rt_info/precision_preserved_attribute.hpp" #include "network_helper.hpp" diff --git a/src/common/low_precision_transformations/include/low_precision/layer_transformation.hpp b/src/common/low_precision_transformations/include/low_precision/layer_transformation.hpp index 590c9f2171efcc..ab8181c9bb9d26 100644 --- a/src/common/low_precision_transformations/include/low_precision/layer_transformation.hpp +++ b/src/common/low_precision_transformations/include/low_precision/layer_transformation.hpp @@ -11,7 +11,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformation_context.hpp" #include "quantization_details.hpp" #include "low_precision/common/ie_lpt_exception.hpp" diff --git a/src/common/low_precision_transformations/include/low_precision/low_precision.hpp b/src/common/low_precision_transformations/include/low_precision/low_precision.hpp index d6bddd3643a4f6..757624cf68795b 100644 --- a/src/common/low_precision_transformations/include/low_precision/low_precision.hpp +++ b/src/common/low_precision_transformations/include/low_precision/low_precision.hpp @@ -25,7 +25,7 @@ #include "low_precision/common/precisions_restriction.hpp" #include "low_precision/layer_transformation.hpp" #include "low_precision/markup_precisions.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/GraphRewrite.hpp" #include "openvino/pass/pass.hpp" namespace ov { diff --git a/src/common/low_precision_transformations/include/low_precision/markup_bias.hpp b/src/common/low_precision_transformations/include/low_precision/markup_bias.hpp index de5487187c4d56..cd6021dcfb936e 100644 --- a/src/common/low_precision_transformations/include/low_precision/markup_bias.hpp +++ b/src/common/low_precision_transformations/include/low_precision/markup_bias.hpp @@ -6,7 +6,7 @@ #include "low_precision/lpt_visibility.hpp" #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "openvino/pass/pattern/matcher.hpp" namespace ov { 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 3f69575fc200e7..f894c9da6d9f88 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 @@ -11,7 +11,7 @@ #include "openvino/core/node.hpp" #include "low_precision/lpt_visibility.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "low_precision/network_helper.hpp" #include "lpt_itt.hpp" 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 ce6139e2fca817..675b3cc1379fd5 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 @@ -8,7 +8,7 @@ #include #include "openvino/core/node.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "low_precision/lpt_visibility.hpp" 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 0e8b0026fafac7..b29e410f06b639 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 @@ -11,7 +11,7 @@ #include "openvino/pass/pattern/op/wrap_type.hpp" #include "low_precision/lpt_visibility.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "network_helper.hpp" namespace ov { 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 adf623c757b647..8c29e157b81200 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 @@ -7,7 +7,7 @@ #include #include #include "low_precision/lpt_visibility.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace pass { 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 aca835624e7ade..aba1ff997eb474 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 @@ -7,7 +7,7 @@ #include #include #include "low_precision/lpt_visibility.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace pass { diff --git a/src/common/offline_transformations/include/compress_quantize_weights.hpp b/src/common/offline_transformations/include/compress_quantize_weights.hpp index 597b50828494a5..e33f18b643f618 100644 --- a/src/common/offline_transformations/include/compress_quantize_weights.hpp +++ b/src/common/offline_transformations/include/compress_quantize_weights.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/GraphRewrite.hpp" namespace ov { namespace pass { diff --git a/src/common/offline_transformations/include/pruning.hpp b/src/common/offline_transformations/include/pruning.hpp index c71a84fe18d396..1b535420430ecf 100644 --- a/src/common/offline_transformations/include/pruning.hpp +++ b/src/common/offline_transformations/include/pruning.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/GraphRewrite.hpp" #include "openvino/pass/manager.hpp" namespace ov { diff --git a/src/common/snippets/include/snippets/pass/broadcast_to_movebroadcast.hpp b/src/common/snippets/include/snippets/pass/broadcast_to_movebroadcast.hpp index 3e2dc15d99ae30..38b9fa41572afb 100644 --- a/src/common/snippets/include/snippets/pass/broadcast_to_movebroadcast.hpp +++ b/src/common/snippets/include/snippets/pass/broadcast_to_movebroadcast.hpp @@ -5,7 +5,7 @@ #pragma once #include "openvino/pass/pattern/matcher.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/collapse_subgraph.hpp b/src/common/snippets/include/snippets/pass/collapse_subgraph.hpp index 57f8662a65ea52..14b90a26aa9a4b 100644 --- a/src/common/snippets/include/snippets/pass/collapse_subgraph.hpp +++ b/src/common/snippets/include/snippets/pass/collapse_subgraph.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "snippets/pass/tokenization.hpp" namespace ov { diff --git a/src/common/snippets/include/snippets/pass/common_optimizations.hpp b/src/common/snippets/include/snippets/pass/common_optimizations.hpp index 36fb7d7ef1bca4..76969e2efd4d69 100644 --- a/src/common/snippets/include/snippets/pass/common_optimizations.hpp +++ b/src/common/snippets/include/snippets/pass/common_optimizations.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "snippets/pass/tokenization.hpp" namespace ov { diff --git a/src/common/snippets/include/snippets/pass/convert_constants.hpp b/src/common/snippets/include/snippets/pass/convert_constants.hpp index 4b62d80ba44748..33dcd1d53fbb83 100644 --- a/src/common/snippets/include/snippets/pass/convert_constants.hpp +++ b/src/common/snippets/include/snippets/pass/convert_constants.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "openvino/pass/pattern/matcher.hpp" namespace ov { diff --git a/src/common/snippets/include/snippets/pass/convert_power_to_powerstatic.hpp b/src/common/snippets/include/snippets/pass/convert_power_to_powerstatic.hpp index 85ead3b5785a04..42369e5372d55e 100644 --- a/src/common/snippets/include/snippets/pass/convert_power_to_powerstatic.hpp +++ b/src/common/snippets/include/snippets/pass/convert_power_to_powerstatic.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/explicit_transpose_matmul_inputs.hpp b/src/common/snippets/include/snippets/pass/explicit_transpose_matmul_inputs.hpp index d4aa8ed2ed947b..df6a814114c14d 100644 --- a/src/common/snippets/include/snippets/pass/explicit_transpose_matmul_inputs.hpp +++ b/src/common/snippets/include/snippets/pass/explicit_transpose_matmul_inputs.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/extract_reshapes_from_mha.hpp b/src/common/snippets/include/snippets/pass/extract_reshapes_from_mha.hpp index 9c7e9f67b7eafb..436c73dce42266 100644 --- a/src/common/snippets/include/snippets/pass/extract_reshapes_from_mha.hpp +++ b/src/common/snippets/include/snippets/pass/extract_reshapes_from_mha.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/fq_decomposition.hpp b/src/common/snippets/include/snippets/pass/fq_decomposition.hpp index 9ad25c927d1ca3..1df14e33b1f58f 100644 --- a/src/common/snippets/include/snippets/pass/fq_decomposition.hpp +++ b/src/common/snippets/include/snippets/pass/fq_decomposition.hpp @@ -5,7 +5,7 @@ #pragma once #include "openvino/op/fake_quantize.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/fuse_transpose_brgemm.hpp b/src/common/snippets/include/snippets/pass/fuse_transpose_brgemm.hpp index d32bc179f8af9c..922b2e23bc7719 100644 --- a/src/common/snippets/include/snippets/pass/fuse_transpose_brgemm.hpp +++ b/src/common/snippets/include/snippets/pass/fuse_transpose_brgemm.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "openvino/op/transpose.hpp" diff --git a/src/common/snippets/include/snippets/pass/gn_decomposition.hpp b/src/common/snippets/include/snippets/pass/gn_decomposition.hpp index 8bd80f90c790ff..7cc1afce6aaf5e 100644 --- a/src/common/snippets/include/snippets/pass/gn_decomposition.hpp +++ b/src/common/snippets/include/snippets/pass/gn_decomposition.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/insert_movebroadcast.hpp b/src/common/snippets/include/snippets/pass/insert_movebroadcast.hpp index 2ee9de1c15ed2f..aa0e4442efe68a 100644 --- a/src/common/snippets/include/snippets/pass/insert_movebroadcast.hpp +++ b/src/common/snippets/include/snippets/pass/insert_movebroadcast.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/matmul_to_brgemm.hpp b/src/common/snippets/include/snippets/pass/matmul_to_brgemm.hpp index 2b5cc357cc50d4..fc5949766f6cc0 100644 --- a/src/common/snippets/include/snippets/pass/matmul_to_brgemm.hpp +++ b/src/common/snippets/include/snippets/pass/matmul_to_brgemm.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "snippets/op/brgemm.hpp" diff --git a/src/common/snippets/include/snippets/pass/mha_tokenization.hpp b/src/common/snippets/include/snippets/pass/mha_tokenization.hpp index 633505a5ce5ad6..a0be1164a3d740 100644 --- a/src/common/snippets/include/snippets/pass/mha_tokenization.hpp +++ b/src/common/snippets/include/snippets/pass/mha_tokenization.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "snippets/pass/tokenization.hpp" namespace ov { diff --git a/src/common/snippets/include/snippets/pass/reduce_to_snippets_reduce.hpp b/src/common/snippets/include/snippets/pass/reduce_to_snippets_reduce.hpp index 1270cf1ecccf88..230a8a46c4ca5d 100644 --- a/src/common/snippets/include/snippets/pass/reduce_to_snippets_reduce.hpp +++ b/src/common/snippets/include/snippets/pass/reduce_to_snippets_reduce.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/pattern/matcher.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/softmax_decomposition.hpp b/src/common/snippets/include/snippets/pass/softmax_decomposition.hpp index 51d80520d4991f..f23988cb755129 100644 --- a/src/common/snippets/include/snippets/pass/softmax_decomposition.hpp +++ b/src/common/snippets/include/snippets/pass/softmax_decomposition.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/softmax_reshape_elimination.hpp b/src/common/snippets/include/snippets/pass/softmax_reshape_elimination.hpp index f72098996a0b13..e0b076ae1f33d3 100644 --- a/src/common/snippets/include/snippets/pass/softmax_reshape_elimination.hpp +++ b/src/common/snippets/include/snippets/pass/softmax_reshape_elimination.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/tokenization.hpp b/src/common/snippets/include/snippets/pass/tokenization.hpp index aeee72160c85fe..3d2b6533b7e3df 100644 --- a/src/common/snippets/include/snippets/pass/tokenization.hpp +++ b/src/common/snippets/include/snippets/pass/tokenization.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "snippets/op/subgraph.hpp" diff --git a/src/common/snippets/include/snippets/pass/transform_convert.hpp b/src/common/snippets/include/snippets/pass/transform_convert.hpp index bf9c27f0d782e1..713c0dc9505ee9 100644 --- a/src/common/snippets/include/snippets/pass/transform_convert.hpp +++ b/src/common/snippets/include/snippets/pass/transform_convert.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/transpose_decomposition.hpp b/src/common/snippets/include/snippets/pass/transpose_decomposition.hpp index e9bd1506b93c60..1b3020c5c34a4e 100644 --- a/src/common/snippets/include/snippets/pass/transpose_decomposition.hpp +++ b/src/common/snippets/include/snippets/pass/transpose_decomposition.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/validate.hpp b/src/common/snippets/include/snippets/pass/validate.hpp index be0aed0a9f1f37..9dc23ca23823af 100644 --- a/src/common/snippets/include/snippets/pass/validate.hpp +++ b/src/common/snippets/include/snippets/pass/validate.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace snippets { diff --git a/src/common/transformations/include/transformations/common_optimizations/adaptive_pool_to_reduce.hpp b/src/common/transformations/include/transformations/common_optimizations/adaptive_pool_to_reduce.hpp index a8e2bda647e776..3ae4fab25e18f5 100644 --- a/src/common/transformations/include/transformations/common_optimizations/adaptive_pool_to_reduce.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/adaptive_pool_to_reduce.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/add_fake_quantize_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/add_fake_quantize_fusion.hpp index 442e8f05548e4c..c9e436d460e7d2 100644 --- a/src/common/transformations/include/transformations/common_optimizations/add_fake_quantize_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/add_fake_quantize_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/align_eltwise_input_ranks.hpp b/src/common/transformations/include/transformations/common_optimizations/align_eltwise_input_ranks.hpp index ba25cbf634068a..88522087013e33 100644 --- a/src/common/transformations/include/transformations/common_optimizations/align_eltwise_input_ranks.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/align_eltwise_input_ranks.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" /** diff --git a/src/common/transformations/include/transformations/common_optimizations/augru_cell_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/augru_cell_fusion.hpp index 88a464fb81622e..7d84fb9489f3bc 100644 --- a/src/common/transformations/include/transformations/common_optimizations/augru_cell_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/augru_cell_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/batch_to_space_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/batch_to_space_fusion.hpp index 4075b2d8c11426..513602a556770c 100644 --- a/src/common/transformations/include/transformations/common_optimizations/batch_to_space_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/batch_to_space_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/binarize_weights.hpp b/src/common/transformations/include/transformations/common_optimizations/binarize_weights.hpp index 91c3fb3a794dd2..c0adee494f192c 100644 --- a/src/common/transformations/include/transformations/common_optimizations/binarize_weights.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/binarize_weights.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/broadcast_elementwise_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/broadcast_elementwise_fusion.hpp index fce96aff0ff374..48fcd925323da4 100644 --- a/src/common/transformations/include/transformations/common_optimizations/broadcast_elementwise_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/broadcast_elementwise_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/broadcast_transition.hpp b/src/common/transformations/include/transformations/common_optimizations/broadcast_transition.hpp index 8dcaca0b7c6408..96b066b54a0332 100644 --- a/src/common/transformations/include/transformations/common_optimizations/broadcast_transition.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/broadcast_transition.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "openvino/pass/pattern/matcher.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/common_optimizations/clamp_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/clamp_fusion.hpp index 1cd33cdd93711d..2e3fd65dc18cb6 100644 --- a/src/common/transformations/include/transformations/common_optimizations/clamp_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/clamp_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/common_optimizations.hpp b/src/common/transformations/include/transformations/common_optimizations/common_optimizations.hpp index ccb268ebf17a55..a3ab09e115147d 100644 --- a/src/common/transformations/include/transformations/common_optimizations/common_optimizations.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/common_optimizations.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/compress_float_constants.hpp b/src/common/transformations/include/transformations/common_optimizations/compress_float_constants.hpp index 77bac5753bd757..16b4bb093b9086 100644 --- a/src/common/transformations/include/transformations/common_optimizations/compress_float_constants.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/compress_float_constants.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/GraphRewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/concat_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/concat_fusion.hpp index 0a450e3d4f1a19..488d88da1292fb 100644 --- a/src/common/transformations/include/transformations/common_optimizations/concat_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/concat_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/concat_reduce_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/concat_reduce_fusion.hpp index 4aa5391dd42618..7285462a770396 100644 --- a/src/common/transformations/include/transformations/common_optimizations/concat_reduce_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/concat_reduce_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/GraphRewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/concat_to_broadcast.hpp b/src/common/transformations/include/transformations/common_optimizations/concat_to_broadcast.hpp index 1a26d6a95db9a6..8cdd855cf874dc 100644 --- a/src/common/transformations/include/transformations/common_optimizations/concat_to_broadcast.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/concat_to_broadcast.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/conv_mul_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/conv_mul_fusion.hpp index b96dd5346dabce..408670cf4b1ee5 100644 --- a/src/common/transformations/include/transformations/common_optimizations/conv_mul_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/conv_mul_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/conv_to_binary_conv.hpp b/src/common/transformations/include/transformations/common_optimizations/conv_to_binary_conv.hpp index d615d3d6fd79b7..7f92b8163882d3 100644 --- a/src/common/transformations/include/transformations/common_optimizations/conv_to_binary_conv.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/conv_to_binary_conv.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp b/src/common/transformations/include/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp index d778c255160281..506921cdf30042 100644 --- a/src/common/transformations/include/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/GraphRewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/convert_quantize_dequantize.hpp b/src/common/transformations/include/transformations/common_optimizations/convert_quantize_dequantize.hpp index 823844b416a66a..8dd006b0226447 100644 --- a/src/common/transformations/include/transformations/common_optimizations/convert_quantize_dequantize.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/convert_quantize_dequantize.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/convert_u4_weights_zero_point_to_scalar.hpp b/src/common/transformations/include/transformations/common_optimizations/convert_u4_weights_zero_point_to_scalar.hpp index f6463890f60b79..bf8ba321e5e651 100644 --- a/src/common/transformations/include/transformations/common_optimizations/convert_u4_weights_zero_point_to_scalar.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/convert_u4_weights_zero_point_to_scalar.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/depth_to_space_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/depth_to_space_fusion.hpp index 82184e8491ac90..34739255e6234c 100644 --- a/src/common/transformations/include/transformations/common_optimizations/depth_to_space_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/depth_to_space_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/dilated_convolution_converter.hpp b/src/common/transformations/include/transformations/common_optimizations/dilated_convolution_converter.hpp index c4814634d91d1b..82e5a708490414 100644 --- a/src/common/transformations/include/transformations/common_optimizations/dilated_convolution_converter.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/dilated_convolution_converter.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/dimension_tracking.hpp b/src/common/transformations/include/transformations/common_optimizations/dimension_tracking.hpp index a9bd1db84d33d7..7f58a3b9fd1a27 100644 --- a/src/common/transformations/include/transformations/common_optimizations/dimension_tracking.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/dimension_tracking.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" using P2Btype = diff --git a/src/common/transformations/include/transformations/common_optimizations/disable_random_uniform_constant_folding.hpp b/src/common/transformations/include/transformations/common_optimizations/disable_random_uniform_constant_folding.hpp index 00735ac681f584..d4b9728f1c5166 100644 --- a/src/common/transformations/include/transformations/common_optimizations/disable_random_uniform_constant_folding.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/disable_random_uniform_constant_folding.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp b/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp index f0e439b72c19f4..007262e3fdec9b 100644 --- a/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp @@ -5,8 +5,7 @@ #pragma once #include - -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/divide_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/divide_fusion.hpp index 911c5c558687b6..ae4260629e5b10 100644 --- a/src/common/transformations/include/transformations/common_optimizations/divide_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/divide_fusion.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/dropout_with_random_uniform_replacer.hpp b/src/common/transformations/include/transformations/common_optimizations/dropout_with_random_uniform_replacer.hpp index ab5e157e5cfd21..7901a87d72d4f7 100644 --- a/src/common/transformations/include/transformations/common_optimizations/dropout_with_random_uniform_replacer.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/dropout_with_random_uniform_replacer.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/eliminate_duplicate_ti_inputs.hpp b/src/common/transformations/include/transformations/common_optimizations/eliminate_duplicate_ti_inputs.hpp index 87c4b28f3a7bbb..07e73620fbd01e 100644 --- a/src/common/transformations/include/transformations/common_optimizations/eliminate_duplicate_ti_inputs.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/eliminate_duplicate_ti_inputs.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/eliminate_loop_inputs_outputs.hpp b/src/common/transformations/include/transformations/common_optimizations/eliminate_loop_inputs_outputs.hpp index 361ccd11daf016..9741e3a22ff105 100644 --- a/src/common/transformations/include/transformations/common_optimizations/eliminate_loop_inputs_outputs.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/eliminate_loop_inputs_outputs.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/eliminate_unsqueeze_gather.hpp b/src/common/transformations/include/transformations/common_optimizations/eliminate_unsqueeze_gather.hpp index 244a51e8cb7423..cafb167b3d62c6 100644 --- a/src/common/transformations/include/transformations/common_optimizations/eliminate_unsqueeze_gather.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/eliminate_unsqueeze_gather.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/enable_shapeof_constant_folding.hpp b/src/common/transformations/include/transformations/common_optimizations/enable_shapeof_constant_folding.hpp index 79c7eae24cc936..ad8ace857a97ce 100644 --- a/src/common/transformations/include/transformations/common_optimizations/enable_shapeof_constant_folding.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/enable_shapeof_constant_folding.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/fold_subgraph_empty_inputs.hpp b/src/common/transformations/include/transformations/common_optimizations/fold_subgraph_empty_inputs.hpp index 698a45f4acb612..5f433c38925cc6 100644 --- a/src/common/transformations/include/transformations/common_optimizations/fold_subgraph_empty_inputs.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/fold_subgraph_empty_inputs.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/fq_mul_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/fq_mul_fusion.hpp index 6b3875a3a977e1..e79e03d67f1348 100644 --- a/src/common/transformations/include/transformations/common_optimizations/fq_mul_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/fq_mul_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/fq_reshape_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/fq_reshape_fusion.hpp index c39e505a0faf0e..371d2d996a95c9 100644 --- a/src/common/transformations/include/transformations/common_optimizations/fq_reshape_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/fq_reshape_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/fuse_rotary_positional_embeddings.hpp b/src/common/transformations/include/transformations/common_optimizations/fuse_rotary_positional_embeddings.hpp index 5cd99f88d13413..51a70eec1d23a6 100644 --- a/src/common/transformations/include/transformations/common_optimizations/fuse_rotary_positional_embeddings.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/fuse_rotary_positional_embeddings.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/GraphRewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp index c3e50b7c992a53..a3468b8b9da128 100644 --- a/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/GraphRewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/gru_cell_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/gru_cell_fusion.hpp index 4cb8542190de5a..8407070706c478 100644 --- a/src/common/transformations/include/transformations/common_optimizations/gru_cell_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/gru_cell_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp index 04841837a5a76b..95e0aedce84de4 100644 --- a/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/GraphRewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/interpolate_sequence_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/interpolate_sequence_fusion.hpp index ff2c2ae9fe920c..abdbf3a3c35dc8 100644 --- a/src/common/transformations/include/transformations/common_optimizations/interpolate_sequence_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/interpolate_sequence_fusion.hpp @@ -7,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/leaky_relu_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/leaky_relu_fusion.hpp index 42c66251cde2ac..6d4f6a3db562df 100644 --- a/src/common/transformations/include/transformations/common_optimizations/leaky_relu_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/leaky_relu_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/mish_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/mish_fusion.hpp index 6f37fdf7dae9ee..5c2e991ad78024 100644 --- a/src/common/transformations/include/transformations/common_optimizations/mish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/mish_fusion.hpp @@ -7,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp b/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp index ffe98b65a2bd06..3e8538ed26830a 100644 --- a/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp @@ -5,8 +5,7 @@ #pragma once #include - -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/move_eltwise_up_data_movement.hpp b/src/common/transformations/include/transformations/common_optimizations/move_eltwise_up_data_movement.hpp index 7f41c1694b32bc..deb669d03baac0 100644 --- a/src/common/transformations/include/transformations/common_optimizations/move_eltwise_up_data_movement.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/move_eltwise_up_data_movement.hpp @@ -5,7 +5,7 @@ #pragma once #include "openvino/core/type.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/mul_fake_quantize_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/mul_fake_quantize_fusion.hpp index b4be1d6c7c3e6d..919efbcf11a4f6 100644 --- a/src/common/transformations/include/transformations/common_optimizations/mul_fake_quantize_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/mul_fake_quantize_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/nearest_neighbor_upsampling_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/nearest_neighbor_upsampling_fusion.hpp index 40536393a08d2e..230c05a0ce64f0 100644 --- a/src/common/transformations/include/transformations/common_optimizations/nearest_neighbor_upsampling_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/nearest_neighbor_upsampling_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp b/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp index ce07b9bd93020d..a3fb9267efd6c3 100644 --- a/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/GraphRewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/pull_transpose_through_fq.hpp b/src/common/transformations/include/transformations/common_optimizations/pull_transpose_through_fq.hpp index 27ac2edd134f45..6eff36ed12dd04 100644 --- a/src/common/transformations/include/transformations/common_optimizations/pull_transpose_through_fq.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/pull_transpose_through_fq.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/reduce_reshape_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/reduce_reshape_fusion.hpp index 2521c44ce4231a..59719e692fe8cd 100644 --- a/src/common/transformations/include/transformations/common_optimizations/reduce_reshape_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/reduce_reshape_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/relu_fake_quantize_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/relu_fake_quantize_fusion.hpp index a905438f8fd0eb..bea4b5869249be 100644 --- a/src/common/transformations/include/transformations/common_optimizations/relu_fake_quantize_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/relu_fake_quantize_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/reshape_prelu.hpp b/src/common/transformations/include/transformations/common_optimizations/reshape_prelu.hpp index d2984eceec4aa5..a7b81606692645 100644 --- a/src/common/transformations/include/transformations/common_optimizations/reshape_prelu.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/reshape_prelu.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/reshape_sequence_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/reshape_sequence_fusion.hpp index 338655e70f879a..9e2c9dbb186b38 100644 --- a/src/common/transformations/include/transformations/common_optimizations/reshape_sequence_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/reshape_sequence_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/ric_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/ric_fusion.hpp index d47ba645b94f84..7ed9d47edacb78 100644 --- a/src/common/transformations/include/transformations/common_optimizations/ric_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/ric_fusion.hpp @@ -5,8 +5,7 @@ #pragma once #include "openvino/core/model.hpp" -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/rms_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/rms_fusion.hpp index b03902440067b2..ac97a4323428c0 100644 --- a/src/common/transformations/include/transformations/common_optimizations/rms_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/rms_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "openvino/pass/manager.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/common_optimizations/select_with_one_value_condition.hpp b/src/common/transformations/include/transformations/common_optimizations/select_with_one_value_condition.hpp index 66d4f50fbc6c75..5193de7e6a044d 100644 --- a/src/common/transformations/include/transformations/common_optimizations/select_with_one_value_condition.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/select_with_one_value_condition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/sequence_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/sequence_fusion.hpp index cdbd57ec269e31..e03696878da447 100644 --- a/src/common/transformations/include/transformations/common_optimizations/sequence_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/sequence_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/shared_ops_optimization.hpp b/src/common/transformations/include/transformations/common_optimizations/shared_ops_optimization.hpp index da582db367b010..cee3bd6abd7d2d 100644 --- a/src/common/transformations/include/transformations/common_optimizations/shared_ops_optimization.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/shared_ops_optimization.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/shuffle_channels_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/shuffle_channels_fusion.hpp index 6b3aa632f34a62..3007a724229e9b 100644 --- a/src/common/transformations/include/transformations/common_optimizations/shuffle_channels_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/shuffle_channels_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/simplify_shape_of_sub_graph.hpp b/src/common/transformations/include/transformations/common_optimizations/simplify_shape_of_sub_graph.hpp index 92286f06b70b92..589fb74e02d672 100644 --- a/src/common/transformations/include/transformations/common_optimizations/simplify_shape_of_sub_graph.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/simplify_shape_of_sub_graph.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.hpp b/src/common/transformations/include/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.hpp index b5ab5480134e1d..99a5af1a5e0f28 100644 --- a/src/common/transformations/include/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/softmax_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/softmax_fusion.hpp index 88ef524ef523aa..9865909501e7c1 100644 --- a/src/common/transformations/include/transformations/common_optimizations/softmax_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/softmax_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/softplus_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/softplus_fusion.hpp index 094dee82f6cc19..bcbc6f26812b79 100644 --- a/src/common/transformations/include/transformations/common_optimizations/softplus_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/softplus_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/softplus_to_mish_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/softplus_to_mish_fusion.hpp index bb0689bc639a54..e1cc503ab7e6fb 100644 --- a/src/common/transformations/include/transformations/common_optimizations/softplus_to_mish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/softplus_to_mish_fusion.hpp @@ -7,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/space_to_batch_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/space_to_batch_fusion.hpp index 0048e63b7e60ba..3d18c471017031 100644 --- a/src/common/transformations/include/transformations/common_optimizations/space_to_batch_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/space_to_batch_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.hpp index f18c0b736975fd..a4cc8329c37284 100644 --- a/src/common/transformations/include/transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.hpp @@ -7,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/split_squeeze_concat_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/split_squeeze_concat_fusion.hpp index 6ec54032c0c6e8..c4e61bca2bc906 100644 --- a/src/common/transformations/include/transformations/common_optimizations/split_squeeze_concat_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/split_squeeze_concat_fusion.hpp @@ -7,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/strides_optimization.hpp b/src/common/transformations/include/transformations/common_optimizations/strides_optimization.hpp index a0d73eb6b40676..98a08f6ae0f71b 100644 --- a/src/common/transformations/include/transformations/common_optimizations/strides_optimization.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/strides_optimization.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/BackwardGraphRewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/subtract_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/subtract_fusion.hpp index 18f660ccf581c0..120ace6843cfc4 100644 --- a/src/common/transformations/include/transformations/common_optimizations/subtract_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/subtract_fusion.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp index a630e1998e84ca..d93d84224d9ec5 100644 --- a/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/GraphRewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp b/src/common/transformations/include/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp index 7ac286eb610f48..d1c606c3fa3a00 100644 --- a/src/common/transformations/include/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp b/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp index 3fc33c9a553060..8522f4ddba6405 100644 --- a/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp @@ -7,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/GraphRewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/transpose_to_reshape.hpp b/src/common/transformations/include/transformations/common_optimizations/transpose_to_reshape.hpp index 3ca43521250699..f23fecda290a9a 100644 --- a/src/common/transformations/include/transformations/common_optimizations/transpose_to_reshape.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/transpose_to_reshape.hpp @@ -7,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/weights_dequantize_to_fake_quantize.hpp b/src/common/transformations/include/transformations/common_optimizations/weights_dequantize_to_fake_quantize.hpp index 5e856384a0bebb..9c433badaf7ace 100644 --- a/src/common/transformations/include/transformations/common_optimizations/weights_dequantize_to_fake_quantize.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/weights_dequantize_to_fake_quantize.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/wrap_interpolate_into_transposes.hpp b/src/common/transformations/include/transformations/common_optimizations/wrap_interpolate_into_transposes.hpp index 1a4122349c51e6..ffda4b72997060 100644 --- a/src/common/transformations/include/transformations/common_optimizations/wrap_interpolate_into_transposes.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/wrap_interpolate_into_transposes.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/control_flow/unroll_if.hpp b/src/common/transformations/include/transformations/control_flow/unroll_if.hpp index a41447caa2f7a8..4b16344a62c479 100644 --- a/src/common/transformations/include/transformations/control_flow/unroll_if.hpp +++ b/src/common/transformations/include/transformations/control_flow/unroll_if.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/control_flow/unroll_tensor_iterator.hpp b/src/common/transformations/include/transformations/control_flow/unroll_tensor_iterator.hpp index b2755da91bfd71..c9d0a81c0bcc61 100644 --- a/src/common/transformations/include/transformations/control_flow/unroll_tensor_iterator.hpp +++ b/src/common/transformations/include/transformations/control_flow/unroll_tensor_iterator.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/convert_precision.hpp b/src/common/transformations/include/transformations/convert_precision.hpp index 636dae4ac4d38f..d466422950d66d 100644 --- a/src/common/transformations/include/transformations/convert_precision.hpp +++ b/src/common/transformations/include/transformations/convert_precision.hpp @@ -10,7 +10,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/flush_fp32_subnormals_to_zero.hpp b/src/common/transformations/include/transformations/flush_fp32_subnormals_to_zero.hpp index 26925ad35ab4f0..54fb62c7d9cec5 100644 --- a/src/common/transformations/include/transformations/flush_fp32_subnormals_to_zero.hpp +++ b/src/common/transformations/include/transformations/flush_fp32_subnormals_to_zero.hpp @@ -7,7 +7,7 @@ #include #include "openvino/core/model.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "openvino/pass/serialize.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/fp16_compression/align_mixed_fp32_fp16_types.hpp b/src/common/transformations/include/transformations/fp16_compression/align_mixed_fp32_fp16_types.hpp index e819795d9bec2d..4cc22ba651e7ff 100644 --- a/src/common/transformations/include/transformations/fp16_compression/align_mixed_fp32_fp16_types.hpp +++ b/src/common/transformations/include/transformations/fp16_compression/align_mixed_fp32_fp16_types.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/fp16_compression/convert_compression_only_to_legacy.hpp b/src/common/transformations/include/transformations/fp16_compression/convert_compression_only_to_legacy.hpp index 9a4ab82a778fca..de7378a68fc557 100644 --- a/src/common/transformations/include/transformations/fp16_compression/convert_compression_only_to_legacy.hpp +++ b/src/common/transformations/include/transformations/fp16_compression/convert_compression_only_to_legacy.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/fp16_compression/mark_decompression_convert_constant_folding.hpp b/src/common/transformations/include/transformations/fp16_compression/mark_decompression_convert_constant_folding.hpp index a9aa3a0855cf0a..7bca4a9db13baf 100644 --- a/src/common/transformations/include/transformations/fp16_compression/mark_decompression_convert_constant_folding.hpp +++ b/src/common/transformations/include/transformations/fp16_compression/mark_decompression_convert_constant_folding.hpp @@ -5,7 +5,7 @@ #pragma once #include "mark_decompression_convert_constant_folding.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp b/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp index ae50cc2d943dcc..5e2448e565840f 100644 --- a/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp +++ b/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/init_node_info.hpp b/src/common/transformations/include/transformations/init_node_info.hpp index 13e748f2316ab6..cf4648f18fddc5 100644 --- a/src/common/transformations/include/transformations/init_node_info.hpp +++ b/src/common/transformations/include/transformations/init_node_info.hpp @@ -12,7 +12,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/low_precision/mark_dequantization_subgraph.hpp b/src/common/transformations/include/transformations/low_precision/mark_dequantization_subgraph.hpp index ec7595eea854a9..9011ed9367a293 100644 --- a/src/common/transformations/include/transformations/low_precision/mark_dequantization_subgraph.hpp +++ b/src/common/transformations/include/transformations/low_precision/mark_dequantization_subgraph.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/batch_norm_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/batch_norm_decomposition.hpp index 75b1bc38df3fbc..39c09c56ee2c74 100644 --- a/src/common/transformations/include/transformations/op_conversions/batch_norm_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/batch_norm_decomposition.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" using namespace std; diff --git a/src/common/transformations/include/transformations/op_conversions/convert_avgpool_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_avgpool_downgrade.hpp index 7a16d522c283a5..2d02286d5e2975 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_avgpool_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_avgpool_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_batch_to_space.hpp b/src/common/transformations/include/transformations/op_conversions/convert_batch_to_space.hpp index 5e84c886f4e5d2..60ead9d3c8d392 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_batch_to_space.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_batch_to_space.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_broadcast3.hpp b/src/common/transformations/include/transformations/op_conversions/convert_broadcast3.hpp index afadecfd967490..ae7d8234d97651 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_broadcast3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_broadcast3.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_broadcast_to_tiles.hpp b/src/common/transformations/include/transformations/op_conversions/convert_broadcast_to_tiles.hpp index ba799943863ea4..3432f2f3497629 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_broadcast_to_tiles.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_broadcast_to_tiles.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_convertlike.hpp b/src/common/transformations/include/transformations/op_conversions/convert_convertlike.hpp index 74f15d1aef6c84..e25363468aeebd 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_convertlike.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_convertlike.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_convertpromotetypes.hpp b/src/common/transformations/include/transformations/op_conversions/convert_convertpromotetypes.hpp index a0c8fd3eb0fd5a..679bff353d07af 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_convertpromotetypes.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_convertpromotetypes.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_deformable_conv_v8_to_v1.hpp b/src/common/transformations/include/transformations/op_conversions/convert_deformable_conv_v8_to_v1.hpp index 9208403e4eca85..87597497ba50b1 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_deformable_conv_v8_to_v1.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_deformable_conv_v8_to_v1.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_depth_to_space.hpp b/src/common/transformations/include/transformations/op_conversions/convert_depth_to_space.hpp index 72e0ecb168fd69..f7d5ade7d57b34 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_depth_to_space.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_depth_to_space.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_divide.hpp b/src/common/transformations/include/transformations/op_conversions/convert_divide.hpp index 9698f59f2b73c0..fd7d19d0415481 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_divide.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_divide.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_offsets15_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_offsets15_downgrade.hpp index 18b1339366ece3..3442f74bae40a6 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_offsets15_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_offsets15_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_packed15_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_packed15_downgrade.hpp index bac6e636ac9daa..a440845aa8ac73 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_packed15_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_packed15_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_gather_0d.hpp b/src/common/transformations/include/transformations/op_conversions/convert_gather_0d.hpp index 2d97152a1b1588..c9e989ee06b583 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gather_0d.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gather_0d.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_gather_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_gather_downgrade.hpp index e6b6b0a8b67fb4..c7d4112c60011b 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gather_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gather_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_gather_to_compressed.hpp b/src/common/transformations/include/transformations/op_conversions/convert_gather_to_compressed.hpp index 2181396adc0284..1cfdd2c3a867e6 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gather_to_compressed.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gather_to_compressed.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_gather_upgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_gather_upgrade.hpp index cfc2f41b23af06..a11e6089005af2 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gather_upgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gather_upgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_gelu.hpp b/src/common/transformations/include/transformations/op_conversions/convert_gelu.hpp index a7d172cb81a307..0eb7d40cb0e406 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gelu.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gelu.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_gp9_to_gp_ie_internal.hpp b/src/common/transformations/include/transformations/op_conversions/convert_gp9_to_gp_ie_internal.hpp index 90017756954aa5..b96f08c16f7b5a 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gp9_to_gp_ie_internal.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gp9_to_gp_ie_internal.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_interpolate11_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_interpolate11_downgrade.hpp index 2797da2370315d..e494b6fefaedbd 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_interpolate11_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_interpolate11_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_interpolate1_to_interpolate4.hpp b/src/common/transformations/include/transformations/op_conversions/convert_interpolate1_to_interpolate4.hpp index 6c54128dfce58b..9387a49119a954 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_interpolate1_to_interpolate4.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_interpolate1_to_interpolate4.hpp @@ -8,7 +8,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.hpp b/src/common/transformations/include/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.hpp index 940db1608607fc..f3944376588bfe 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.hpp @@ -8,7 +8,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_maxpool_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_maxpool_downgrade.hpp index f62300e95a9d26..6d88f091bd91d7 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_maxpool_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_maxpool_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_maxpool_upgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_maxpool_upgrade.hpp index ade23432733f37..8d07db8249aa95 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_maxpool_upgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_maxpool_upgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_minimum_to_power_and_max.hpp b/src/common/transformations/include/transformations/op_conversions/convert_minimum_to_power_and_max.hpp index 90f97eb8cdb01f..885cc2b7cd4f4f 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_minimum_to_power_and_max.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_minimum_to_power_and_max.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_mod.hpp b/src/common/transformations/include/transformations/op_conversions/convert_mod.hpp index d3bec6f48e764e..8ebb878ae5158b 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_mod.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_mod.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.hpp b/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.hpp index 5a33375a833548..5aea3c52762102 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_upgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_upgrade.hpp index 653aeca61fd4f8..6dcc7b7ec2df6c 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_upgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_upgrade.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_mvn1_to_mvn6.hpp b/src/common/transformations/include/transformations/op_conversions/convert_mvn1_to_mvn6.hpp index 4daba95e86a192..c5a6a9fa086968 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_mvn1_to_mvn6.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_mvn1_to_mvn6.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_negative.hpp b/src/common/transformations/include/transformations/op_conversions/convert_negative.hpp index e85e6092b6ee40..183707d16d8a1e 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_negative.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_negative.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_nms9_to_nms_ie_internal.hpp b/src/common/transformations/include/transformations/op_conversions/convert_nms9_to_nms_ie_internal.hpp index d9078815070172..a43af595f2c669 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_nms9_to_nms_ie_internal.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_nms9_to_nms_ie_internal.hpp @@ -8,7 +8,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_nms_rotated_to_nms_ie_internal.hpp b/src/common/transformations/include/transformations/op_conversions/convert_nms_rotated_to_nms_ie_internal.hpp index f117b406d2863e..c9db50dc1a02db 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_nms_rotated_to_nms_ie_internal.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_nms_rotated_to_nms_ie_internal.hpp @@ -8,7 +8,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_nms_to_nms_ie_internal.hpp b/src/common/transformations/include/transformations/op_conversions/convert_nms_to_nms_ie_internal.hpp index a5ff6807870f91..6fb53a31e1f397 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_nms_to_nms_ie_internal.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_nms_to_nms_ie_internal.hpp @@ -8,7 +8,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_pad12_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_pad12_downgrade.hpp index 7cd48773e492d0..48c38344f62d5e 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_pad12_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_pad12_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_pad_to_group_conv.hpp b/src/common/transformations/include/transformations/op_conversions/convert_pad_to_group_conv.hpp index 8134d27d207ca2..8886e981083e5e 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_pad_to_group_conv.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_pad_to_group_conv.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_5.hpp b/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_5.hpp index 7077d672d0aa5f..fb4f7c26debb80 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_5.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_5.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_prior_box_v8_to_v0.hpp b/src/common/transformations/include/transformations/op_conversions/convert_prior_box_v8_to_v0.hpp index 24b4520c506642..7111382a8c2d79 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_prior_box_v8_to_v0.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_prior_box_v8_to_v0.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v3_to_v9.hpp b/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v3_to_v9.hpp index 66de7739d61572..8bebd0cc04838b 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v3_to_v9.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v3_to_v9.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_shapeof3.hpp b/src/common/transformations/include/transformations/op_conversions/convert_shapeof3.hpp index e684e7a699be8b..dc513b20f7368b 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_shapeof3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_shapeof3.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_softmax_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_softmax_downgrade.hpp index 0bd1d11c68a491..22eb4830e448ed 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_softmax_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_softmax_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_space_to_depth.hpp b/src/common/transformations/include/transformations/op_conversions/convert_space_to_depth.hpp index ec97bbdc62016c..6d387b102ad0e9 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_space_to_depth.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_space_to_depth.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_subtract.hpp b/src/common/transformations/include/transformations/op_conversions/convert_subtract.hpp index b3f41501dfd084..44a28686b9f493 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_subtract.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_subtract.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_xor_to_logical_xor.hpp b/src/common/transformations/include/transformations/op_conversions/convert_xor_to_logical_xor.hpp index 21740be21597df..55575c2760127b 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_xor_to_logical_xor.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_xor_to_logical_xor.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/eye_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/eye_decomposition.hpp index dda37e63fe93e8..1e2768083b923e 100644 --- a/src/common/transformations/include/transformations/op_conversions/eye_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/eye_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/normalize_l2_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/normalize_l2_decomposition.hpp index d93c28577c2c8b..2cb9fe7762f77f 100644 --- a/src/common/transformations/include/transformations/op_conversions/normalize_l2_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/normalize_l2_decomposition.hpp @@ -7,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/scaled_dot_product_attention_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/scaled_dot_product_attention_decomposition.hpp index 254f64ff43c2b5..fea81b63d6406b 100644 --- a/src/common/transformations/include/transformations/op_conversions/scaled_dot_product_attention_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/scaled_dot_product_attention_decomposition.hpp @@ -5,7 +5,7 @@ #pragma once #include "openvino/op/scaled_dot_product_attention.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/opset_conversions/convert_opset2_to_opset1.hpp b/src/common/transformations/include/transformations/opset_conversions/convert_opset2_to_opset1.hpp index 273f7f915624f1..77dba423bfe06b 100644 --- a/src/common/transformations/include/transformations/opset_conversions/convert_opset2_to_opset1.hpp +++ b/src/common/transformations/include/transformations/opset_conversions/convert_opset2_to_opset1.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/sdpa_to_paged_attention/position_ids_replacer.hpp b/src/common/transformations/include/transformations/sdpa_to_paged_attention/position_ids_replacer.hpp index 99f557c0c98098..c6021d8c04af50 100644 --- a/src/common/transformations/include/transformations/sdpa_to_paged_attention/position_ids_replacer.hpp +++ b/src/common/transformations/include/transformations/sdpa_to_paged_attention/position_ids_replacer.hpp @@ -7,7 +7,7 @@ #include "openvino/cc/pass/itt.hpp" #include "openvino/op/add.hpp" #include "openvino/op/parameter.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/sdpa_to_paged_attention/prev_sequence_length_pattern.hpp b/src/common/transformations/include/transformations/sdpa_to_paged_attention/prev_sequence_length_pattern.hpp index e54dc7f6176e0e..45b867698a42e0 100644 --- a/src/common/transformations/include/transformations/sdpa_to_paged_attention/prev_sequence_length_pattern.hpp +++ b/src/common/transformations/include/transformations/sdpa_to_paged_attention/prev_sequence_length_pattern.hpp @@ -7,7 +7,7 @@ #include "openvino/cc/pass/itt.hpp" #include "openvino/op/shape_of.hpp" #include "openvino/op/subtract.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/smart_reshape/reshape_sinking.hpp b/src/common/transformations/include/transformations/smart_reshape/reshape_sinking.hpp index c9fa23ce7f86a3..6f5b33f598cbec 100644 --- a/src/common/transformations/include/transformations/smart_reshape/reshape_sinking.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/reshape_sinking.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/reshape_to_1D.hpp b/src/common/transformations/include/transformations/smart_reshape/reshape_to_1D.hpp index d08f212925182a..39e134c36ae92e 100644 --- a/src/common/transformations/include/transformations/smart_reshape/reshape_to_1D.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/reshape_to_1D.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/shape_of_const_folding.hpp b/src/common/transformations/include/transformations/smart_reshape/shape_of_const_folding.hpp index d7dc15d4d7454b..76d72d92f4c6e5 100644 --- a/src/common/transformations/include/transformations/smart_reshape/shape_of_const_folding.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/shape_of_const_folding.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/smart_reshape.hpp b/src/common/transformations/include/transformations/smart_reshape/smart_reshape.hpp index f8f6c021097301..6aa354a5fa15ca 100644 --- a/src/common/transformations/include/transformations/smart_reshape/smart_reshape.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/smart_reshape.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/strided_slice_squeeze.hpp b/src/common/transformations/include/transformations/smart_reshape/strided_slice_squeeze.hpp index a60b76f8a8473c..0e2f88c7f13715 100644 --- a/src/common/transformations/include/transformations/smart_reshape/strided_slice_squeeze.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/strided_slice_squeeze.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/symbolic_transformations/chained_maximum.hpp b/src/common/transformations/include/transformations/symbolic_transformations/chained_maximum.hpp index 203259ecdcf7ce..133cb07789917a 100644 --- a/src/common/transformations/include/transformations/symbolic_transformations/chained_maximum.hpp +++ b/src/common/transformations/include/transformations/symbolic_transformations/chained_maximum.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/symbolic_transformations/dereshape_matmul.hpp b/src/common/transformations/include/transformations/symbolic_transformations/dereshape_matmul.hpp index 037a9cce421a11..c9a40c0f4e15fb 100644 --- a/src/common/transformations/include/transformations/symbolic_transformations/dereshape_matmul.hpp +++ b/src/common/transformations/include/transformations/symbolic_transformations/dereshape_matmul.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/symbolic_transformations/reshape_optimizations.hpp b/src/common/transformations/include/transformations/symbolic_transformations/reshape_optimizations.hpp index 6ad409b4d96ad5..0d98e1ba080fe6 100644 --- a/src/common/transformations/include/transformations/symbolic_transformations/reshape_optimizations.hpp +++ b/src/common/transformations/include/transformations/symbolic_transformations/reshape_optimizations.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_binary.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_binary.hpp index 5c913e3d778be8..0f9d8c91ffad40 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_binary.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_binary.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_concat.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_concat.hpp index c37cccaaac6516..4f06f15ce622c7 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_concat.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_concat.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_cumsum.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_cumsum.hpp index de82ce274cf32c..4e8cf401c2f36d 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_cumsum.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_cumsum.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_data_movement.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_data_movement.hpp index 768972af596a2e..85d43f500e7f82 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_data_movement.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_data_movement.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_fuse.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_fuse.hpp index 206f3cd0af7559..bc579088e278bd 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_fuse.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_fuse.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_gather.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_gather.hpp index 188cbe6556940e..434e331176f59e 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_gather.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_gather.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_interpolate.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_interpolate.hpp index 32100f40d878ea..7ad24240d8fd64 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_interpolate.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_interpolate.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_reduction.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_reduction.hpp index 44fd1fc534315e..675ae6bd1986f0 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_reduction.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_reduction.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_reset_no_sinking_attribute.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_reset_no_sinking_attribute.hpp index cab1f1841107bc..c03f009e7ef8fd 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_reset_no_sinking_attribute.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_reset_no_sinking_attribute.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_slice.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_slice.hpp index 8b486609aa1f1c..0fbb8ffd34933f 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_slice.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_slice.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_squeeze.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_squeeze.hpp index 820dd3da37d8af..94a5ab6471f9b3 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_squeeze.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_squeeze.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_unary.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_unary.hpp index 3d7694a32832f9..d897ce77274408 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_unary.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_unary.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/core/include/openvino/pass/BackwardGraphRewrite.hpp b/src/core/include/openvino/pass/BackwardGraphRewrite.hpp new file mode 100644 index 00000000000000..bae03b2549f36c --- /dev/null +++ b/src/core/include/openvino/pass/BackwardGraphRewrite.hpp @@ -0,0 +1,27 @@ +#pragma once + +#include +#include +#include + +#include "openvino/pass/pass.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/GraphRewrite.hpp" + +namespace ov { +using matcher_pass_callback = std::function; +using graph_rewrite_callback = std::function; +using handler_callback = std::function& node)>; +namespace pass { +class OPENVINO_API BackwardGraphRewrite : public GraphRewrite { +public: + OPENVINO_RTTI("ov::pass::BackwardGraphRewrite"); + + BackwardGraphRewrite() = default; + + explicit BackwardGraphRewrite(const std::shared_ptr& pass) : GraphRewrite(pass) {} + + bool run_on_model(const std::shared_ptr& m) override; +}; +} // namespace pass +} // namespace ov diff --git a/src/core/include/openvino/pass/GraphRewrite.hpp b/src/core/include/openvino/pass/GraphRewrite.hpp new file mode 100644 index 00000000000000..d848ce5ea1cc60 --- /dev/null +++ b/src/core/include/openvino/pass/GraphRewrite.hpp @@ -0,0 +1,137 @@ +// Copyright (C) 2018-2024 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include + +#include "openvino/pass/pass.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" + +namespace ov { +using matcher_pass_callback = std::function; +using graph_rewrite_callback = std::function; +using handler_callback = std::function& node)>; +namespace pass { +/// \brief GraphRewrite is a container for MatcherPasses that allows to run them on Function +/// in +/// efficient way +/// +/// Graph rewrite pass is used for matcher passes execution on Function. +/// To register MatcherPass use \sa add_matcher(args) method where T is a MatcherPass +/// class. +/// As a default algorithm graph rewrite pass traverse Function in topological order and +/// applies +/// registered matcher passes for each node. But if all registered matcher passes have type +/// based +/// root node in Matcher pattern then efficient mechanism is used to execute them. +/// Matcher pattern root is type based if it's operation from opset or +/// pattern::op::WrapType. +/// Note: when implementing pattern for Matcher make sure that root node is an operation +/// from opset +/// or has ov::pattern::op::WrapType. That will help GraphRewrite to execute matcher +/// passes more +/// efficient. +/// \ingroup ov_pass_cpp_api +class OPENVINO_API GraphRewrite : public ModelPass { +public: + OPENVINO_RTTI("ov::pass::GraphRewrite"); + + GraphRewrite() = default; + + explicit GraphRewrite(const std::shared_ptr& pass) : ModelPass() { + m_matchers.push_back(pass); + } + + /// \brief Register given transformation class type to GraphRewrite execution list + /// All registered transformations will be executed in a single graph traversal. + /// Example below show the basic usage of pass::GraphRewrite + /// + /// pass::Manager manager; + /// auto anchor = manager.register_pass(); + /// anchor->add_matcher(); + /// anchor->add_matcher(); + /// anchor->set_name("CommonMatchers"); + /// manager.run_passes(f); + /// + /// For some purposes transformation can be registered and disabled by default. + /// + /// anchor->add_matcher(); + /// + /// \return shared_ptr to the transformation instance + template ::value, bool>::type = true> + std::shared_ptr add_matcher(Args&&... args) { + static_assert(std::is_base_of::value, "pass not derived from MatcherPass"); + auto pass = std::make_shared(std::forward(args)...); + auto pass_config = get_pass_config(); + pass->set_pass_config(pass_config); + if (!Enabled && !pass_config->is_enabled()) { + pass_config->disable(); + } + m_matchers.push_back(pass); + return pass; + } + + /// \brief Register passes from GraphRewrite class that contains sequence of matcher + /// passes registered in its ctor. + /// For example: + /// + /// class ov::pass::LinFusions: public ov::pass::GraphRewrite { + /// public: + /// OPENVINO_RTTI("LinFusion"); + /// Fusions() { + /// add_matcher(); + /// add_matcher(); + /// } + /// }; + /// + /// pass::Manager manager; + /// auto anchor = manager.register_pass(); + /// anchor->add_matcher(); + /// anchor->add_matcher(); + /// anchor->set_name("CommonFusions"); + /// manager.run_passes(f); + /// + /// In this case all matcher passes from LinFusions pass will be united with other + /// registered matchers. + template ::value, bool>::type = true> + void add_matcher(Args&&... args) { + static_assert(std::is_base_of::value, "pass not derived from GraphRewrite"); + auto pass = std::make_shared(std::forward(args)...); + auto pass_config = get_pass_config(); + + for (auto& matcher : pass->m_matchers) { + pass->set_pass_config(pass_config); + m_matchers.push_back(matcher); + } + } + + std::shared_ptr add_matcher(const std::shared_ptr& pass) { + auto pass_config = get_pass_config(); + pass->set_pass_config(pass_config); + m_matchers.push_back(pass); + return pass; + } + + bool run_on_model(const std::shared_ptr& m) override; + + void set_pass_config(const std::shared_ptr& pass_config) override; + +protected: + bool apply_matcher_passes(std::shared_ptr f, std::deque> nodes_to_run); + + bool m_enable_shape_inference = false; + + std::vector> m_matchers; +}; +} // namespace pass +} // namespace ov diff --git a/src/core/include/openvino/pass/MatcherPass.hpp b/src/core/include/openvino/pass/MatcherPass.hpp new file mode 100644 index 00000000000000..8b2f02842a9b58 --- /dev/null +++ b/src/core/include/openvino/pass/MatcherPass.hpp @@ -0,0 +1,109 @@ +// Copyright (C) 2018-2024 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include + +#include "openvino/pass/pass.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/NodeRegistry.hpp" + +namespace ov { +using matcher_pass_callback = std::function; +using graph_rewrite_callback = std::function; +using handler_callback = std::function& node)>; +namespace pass { +/// \brief MatcherPass is a basic block for pattern based transformations. It describes +/// pattern and +/// action that is applied if pattern is matched. +/// +/// MatcherPass consists of Matcher and matcher_pass_callback that needs to be implemented +/// and +/// finally registered by using \sa register_matcher. MatcherPass can be executed on node +/// within +/// \sa apply method. To run matcher pass on Function use GraphRewrite. +/// In addition MatcherPass provides a way for adding new operations into GraphRewrite +/// execution +/// queue. That means that operations that were created inside transformation callback can +/// be added +/// for matching. To register node use \sa register_new_node method. GraphRewrite +/// automatically +/// takes registered nodes and put them to execution queue. If multiple nodes were register +/// make +/// sure that they were registered in topological order. +/// Note: when implementing pattern for Matcher make sure that root node is an operation +/// from opset +/// or has ov::pass::pattern::op::WrapType. That will help GraphRewrite to execute matcher +/// passes more +/// efficient. +/// \ingroup ov_pass_cpp_api +class OPENVINO_API MatcherPass : public PassBase { +public: + OPENVINO_RTTI("ov::pass::MatcherPass"); + + MatcherPass() = default; + + MatcherPass(const MatcherPass&) = delete; + MatcherPass& operator=(const MatcherPass&) = delete; + + explicit MatcherPass(const std::string& name, + const std::shared_ptr& m, + const handler_callback& handler, + const PassPropertyMask& property = PassProperty::CHANGE_DYNAMIC_STATE) + : PassBase(), + m_handler(handler), + m_matcher(m) { + set_name(name); + set_property(property, true); + } + + MatcherPass(const std::shared_ptr& m, const matcher_pass_callback& callback) : PassBase() { + register_matcher(m, callback); + } + + bool apply(std::shared_ptr node); + + template + std::shared_ptr register_new_node(Args&&... args) { + return m_new_nodes.make(std::forward(args)...); + } + + template + std::shared_ptr register_new_node(const std::shared_ptr& node) { + return m_new_nodes.add(node); + } + + std::shared_ptr register_new_node_(const std::shared_ptr& node) { + return register_new_node(node); + } + + const std::vector>& get_new_nodes() { + return m_new_nodes.get(); + } + + void clear_new_nodes() { + m_new_nodes.clear(); + } + + std::shared_ptr get_matcher() { + return m_matcher; + } + +protected: + void register_matcher(const std::shared_ptr& m, + const matcher_pass_callback& callback, + const PassPropertyMask& property); + + void register_matcher(const std::shared_ptr& m, const matcher_pass_callback& callback); + +private: + handler_callback m_handler; + std::shared_ptr m_matcher; + NodeRegistry m_new_nodes; +}; +} // namespace pass +} // namespace ov diff --git a/src/core/include/openvino/pass/NodeRegistry.hpp b/src/core/include/openvino/pass/NodeRegistry.hpp new file mode 100644 index 00000000000000..a56d123b7dc216 --- /dev/null +++ b/src/core/include/openvino/pass/NodeRegistry.hpp @@ -0,0 +1,61 @@ +#pragma once + +#include +#include +#include + +#include "openvino/pass/pass.hpp" +#include "openvino/pass/pattern/matcher.hpp" + +namespace ov { +using matcher_pass_callback = std::function; +using graph_rewrite_callback = std::function; +using handler_callback = std::function& node)>; +namespace pass { +/// \brief Register openvino node pointers into container. +/// Can create and/or add existing node pointers into register +class NodeRegistry { +public: + /// \brief Make new node and add it to register. + /// + /// \tparam T Node type. + /// \tparam Args Node ctor args types. + /// + /// \param args New node ctor arguments. + /// \return Shared pointer to node of type T. + template + std::shared_ptr make(Args&&... args) { + auto node = std::make_shared(std::forward(args)...); + return add(node); + } + + /// \brief Add node to register + /// + /// \tparam T Node type. + /// + /// \param node Node to add + /// + /// \return Shared pointer to new node added of type T. + template + std::shared_ptr add(const std::shared_ptr& node) { + m_nodes.push_back(node); + return node; + } + + /// \brief Get nodes container. + /// + /// \return Const reference to nodes container. + const std::vector>& get() const { + return m_nodes; + } + + /// \brief Clear register. + void clear() { + m_nodes.clear(); + } + +private: + std::vector> m_nodes; //!< Stores added nodes. +}; +} // namespace pass +} // namespace ov diff --git a/src/core/include/openvino/pass/convert_fp32_to_fp16.hpp b/src/core/include/openvino/pass/convert_fp32_to_fp16.hpp index 61c76e3b2f974a..e7d1afe700b46a 100644 --- a/src/core/include/openvino/pass/convert_fp32_to_fp16.hpp +++ b/src/core/include/openvino/pass/convert_fp32_to_fp16.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" namespace ov { namespace pass { diff --git a/src/core/include/openvino/pass/graph_rewrite.hpp b/src/core/include/openvino/pass/graph_rewrite.hpp index 792393b33a1b5b..993cba1c31de45 100644 --- a/src/core/include/openvino/pass/graph_rewrite.hpp +++ b/src/core/include/openvino/pass/graph_rewrite.hpp @@ -11,10 +11,13 @@ #include "openvino/pass/pass.hpp" #include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/BackwardGraphRewrite.hpp" +/*/ namespace ov { using matcher_pass_callback = std::function; using graph_rewrite_callback = std::function; using handler_callback = std::function& node)>; + namespace pass { /// \brief Register openvino node pointers into container. /// Can create and/or add existing node pointers into register @@ -280,3 +283,4 @@ class OPENVINO_API BackwardGraphRewrite : public GraphRewrite { }; } // namespace pass } // namespace ov +*/ \ No newline at end of file From d3b009263541b04e4670469c817e70769cac0097 Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Mon, 22 Jul 2024 15:47:52 +0400 Subject: [PATCH 02/16] change transformations headers 2 --- .../common_optimizations/matmul_multiply_fusion.hpp | 2 +- .../common_optimizations/nonzero_horizontal_fusion.hpp | 3 +-- .../common_optimizations/normalize_l2_fusion.hpp | 3 +-- .../common_optimizations/random_uniform_fusion.hpp | 2 +- .../transformations/common_optimizations/reduce_merge.hpp | 2 +- .../op_conversions/convert_previous_nms_to_nms_9.hpp | 2 +- .../op_conversions/convert_roi_align_v9_to_v3.hpp | 2 +- .../op_conversions/convert_scatter_elements_to_scatter.hpp | 2 +- .../convert_scatter_elements_update12_downgrade.hpp | 2 +- .../op_conversions/convert_shuffle_channels3.hpp | 2 +- .../transformations/op_conversions/convert_softmax_upgrade.hpp | 2 +- .../transformations/op_conversions/convert_space_to_batch.hpp | 2 +- .../op_conversions/convert_topk11_downgrade.hpp | 2 +- .../op_conversions/detection_output_downgrade.hpp | 2 +- .../op_conversions/detection_output_upgrade.hpp | 2 +- .../transformations/op_conversions/einsum_decomposition.hpp | 2 +- .../transformations/op_conversions/fq_decomposition.hpp | 2 +- .../include/transformations/op_conversions/gelu7_downgrade.hpp | 2 +- .../op_conversions/group_normalization_decomposition.hpp | 2 +- .../transformations/op_conversions/gru_cell_decomposition.hpp | 2 +- .../op_conversions/hard_sigmoid_decomposition.hpp | 2 +- .../transformations/op_conversions/hsigmoid_decomposition.hpp | 2 +- .../transformations/op_conversions/hswish_decomposition.hpp | 2 +- .../op_conversions/log_softmax_decomposition.hpp | 2 +- .../transformations/op_conversions/lstm_cell_decomposition.hpp | 2 +- .../transformations/op_conversions/mvn6_decomposition.hpp | 2 +- .../transformations/op_conversions/reduce_l1_decomposition.hpp | 3 +-- .../transformations/op_conversions/reduce_l2_decomposition.hpp | 3 +-- .../transformations/op_conversions/rnn_cell_decomposition.hpp | 2 +- .../op_conversions/simplify_ctc_greedy_decoder_seq_len.hpp | 2 +- .../transformations/op_conversions/softmax_decomposition.hpp | 2 +- .../transformations/op_conversions/softplus_decomposition.hpp | 2 +- .../transformations/op_conversions/softsign_decomposition.hpp | 2 +- .../transformations/op_conversions/unique_decomposition.hpp | 2 +- .../opset_conversions/convert_opset3_to_opset2.hpp | 2 +- .../sdpa_to_paged_attention/state_management_pattern.hpp | 2 +- .../sdpa_to_paged_attention/total_sequence_length_pattern.hpp | 2 +- .../smart_reshape/broadcast_const_range_replacement.hpp | 2 +- .../transformations/smart_reshape/lstm_states_broadcast.hpp | 2 +- .../include/transformations/smart_reshape/matmul_sr.hpp | 2 +- .../smart_reshape/proposal_scales_stridedslice.hpp | 2 +- .../transformations/symbolic_transformations/nop_broadcast.hpp | 2 +- .../include/transformations/transpose_sinking/ts_base.hpp | 3 +-- .../include/transformations/transpose_sinking/ts_unsqueeze.hpp | 3 +-- 44 files changed, 44 insertions(+), 50 deletions(-) diff --git a/src/common/transformations/include/transformations/common_optimizations/matmul_multiply_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/matmul_multiply_fusion.hpp index 57108da5ea554f..c275d1aa73b448 100644 --- a/src/common/transformations/include/transformations/common_optimizations/matmul_multiply_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/matmul_multiply_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/nonzero_horizontal_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/nonzero_horizontal_fusion.hpp index 7e4ac4a25bf994..dad524d8c4f9b6 100644 --- a/src/common/transformations/include/transformations/common_optimizations/nonzero_horizontal_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/nonzero_horizontal_fusion.hpp @@ -6,8 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/normalize_l2_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/normalize_l2_fusion.hpp index e117e97c3ea301..df8efb45cd0478 100644 --- a/src/common/transformations/include/transformations/common_optimizations/normalize_l2_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/normalize_l2_fusion.hpp @@ -7,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/random_uniform_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/random_uniform_fusion.hpp index 96cede7bb5a628..90d248c6ae789c 100644 --- a/src/common/transformations/include/transformations/common_optimizations/random_uniform_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/random_uniform_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/reduce_merge.hpp b/src/common/transformations/include/transformations/common_optimizations/reduce_merge.hpp index 87af67497b85ae..6bbed54e93bf66 100644 --- a/src/common/transformations/include/transformations/common_optimizations/reduce_merge.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/reduce_merge.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_9.hpp b/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_9.hpp index 1a50dd10708eae..6ff66644346447 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_9.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_9.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v9_to_v3.hpp b/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v9_to_v3.hpp index 6d0a830dc7f0bd..50b82809cf3fbf 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v9_to_v3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v9_to_v3.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_to_scatter.hpp b/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_to_scatter.hpp index 9bc3cedbf3b532..4920cfca2ef3ad 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_to_scatter.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_to_scatter.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_update12_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_update12_downgrade.hpp index 37f5a86224ce62..c8a1815cadc019 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_update12_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_update12_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_shuffle_channels3.hpp b/src/common/transformations/include/transformations/op_conversions/convert_shuffle_channels3.hpp index 3efd57c95c11b7..5d92913b3d461f 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_shuffle_channels3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_shuffle_channels3.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_softmax_upgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_softmax_upgrade.hpp index 31754bc9a997cb..fc836fb138c7a1 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_softmax_upgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_softmax_upgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_space_to_batch.hpp b/src/common/transformations/include/transformations/op_conversions/convert_space_to_batch.hpp index 7d3f98cd273b6d..b744394dd11c97 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_space_to_batch.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_space_to_batch.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_topk11_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_topk11_downgrade.hpp index 0514e0bad38003..3834ea1926c44c 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_topk11_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_topk11_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/detection_output_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/detection_output_downgrade.hpp index f34c28a0f3295c..a45d765d0d2323 100644 --- a/src/common/transformations/include/transformations/op_conversions/detection_output_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/detection_output_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/detection_output_upgrade.hpp b/src/common/transformations/include/transformations/op_conversions/detection_output_upgrade.hpp index cb0b108f22460a..9fe750025f3f6f 100644 --- a/src/common/transformations/include/transformations/op_conversions/detection_output_upgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/detection_output_upgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/einsum_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/einsum_decomposition.hpp index a754f954261a3e..e58f5e647e360c 100644 --- a/src/common/transformations/include/transformations/op_conversions/einsum_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/einsum_decomposition.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/fq_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/fq_decomposition.hpp index c1ed179ba39fb6..8881e8649d9a78 100644 --- a/src/common/transformations/include/transformations/op_conversions/fq_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/fq_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/gelu7_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/gelu7_downgrade.hpp index b95d2a21472420..48f24dd1920eec 100644 --- a/src/common/transformations/include/transformations/op_conversions/gelu7_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/gelu7_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/group_normalization_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/group_normalization_decomposition.hpp index c9dbfe594c1a22..2717cafaa6e522 100644 --- a/src/common/transformations/include/transformations/op_conversions/group_normalization_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/group_normalization_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/gru_cell_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/gru_cell_decomposition.hpp index de6e414e3a9024..b46d74082c9657 100644 --- a/src/common/transformations/include/transformations/op_conversions/gru_cell_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/gru_cell_decomposition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/hard_sigmoid_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/hard_sigmoid_decomposition.hpp index cfdf19bdbf305d..b4b20b7c681e46 100644 --- a/src/common/transformations/include/transformations/op_conversions/hard_sigmoid_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/hard_sigmoid_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/hsigmoid_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/hsigmoid_decomposition.hpp index 6db5d0b39553a4..b3c4a899d0c89c 100644 --- a/src/common/transformations/include/transformations/op_conversions/hsigmoid_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/hsigmoid_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/hswish_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/hswish_decomposition.hpp index 021768ce572975..c7e2c884c0f42c 100644 --- a/src/common/transformations/include/transformations/op_conversions/hswish_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/hswish_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/log_softmax_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/log_softmax_decomposition.hpp index 625f375487df66..8c96ab2c532ae3 100644 --- a/src/common/transformations/include/transformations/op_conversions/log_softmax_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/log_softmax_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/lstm_cell_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/lstm_cell_decomposition.hpp index d2f16d5c1a164e..41a449aa8153ee 100644 --- a/src/common/transformations/include/transformations/op_conversions/lstm_cell_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/lstm_cell_decomposition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/mvn6_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/mvn6_decomposition.hpp index 2cff2f6ea823a6..61794ffe725f0a 100644 --- a/src/common/transformations/include/transformations/op_conversions/mvn6_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/mvn6_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/reduce_l1_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/reduce_l1_decomposition.hpp index 18f3560b90cebd..addad16c616aaf 100644 --- a/src/common/transformations/include/transformations/op_conversions/reduce_l1_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/reduce_l1_decomposition.hpp @@ -7,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/reduce_l2_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/reduce_l2_decomposition.hpp index ab69a523ea9d56..7251a4986239dc 100644 --- a/src/common/transformations/include/transformations/op_conversions/reduce_l2_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/reduce_l2_decomposition.hpp @@ -7,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/rnn_cell_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/rnn_cell_decomposition.hpp index df8fab51867862..953c0db0b2d44d 100644 --- a/src/common/transformations/include/transformations/op_conversions/rnn_cell_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/rnn_cell_decomposition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.hpp b/src/common/transformations/include/transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.hpp index a87bcd5265f158..98bfe0867110d0 100644 --- a/src/common/transformations/include/transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.hpp +++ b/src/common/transformations/include/transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/softmax_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/softmax_decomposition.hpp index b7fb184a74f7ef..aa644395d45b92 100644 --- a/src/common/transformations/include/transformations/op_conversions/softmax_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/softmax_decomposition.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/softplus_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/softplus_decomposition.hpp index 2d79165c5aabf5..0ca572addec6d4 100644 --- a/src/common/transformations/include/transformations/op_conversions/softplus_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/softplus_decomposition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/softsign_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/softsign_decomposition.hpp index 62f372052e81cf..57e1acc5b9556c 100644 --- a/src/common/transformations/include/transformations/op_conversions/softsign_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/softsign_decomposition.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/unique_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/unique_decomposition.hpp index 05833b9305cd82..f7138c3c25bb46 100644 --- a/src/common/transformations/include/transformations/op_conversions/unique_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/unique_decomposition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/opset_conversions/convert_opset3_to_opset2.hpp b/src/common/transformations/include/transformations/opset_conversions/convert_opset3_to_opset2.hpp index d7100c6adfc1ff..0bf6499c0dc0b2 100644 --- a/src/common/transformations/include/transformations/opset_conversions/convert_opset3_to_opset2.hpp +++ b/src/common/transformations/include/transformations/opset_conversions/convert_opset3_to_opset2.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/sdpa_to_paged_attention/state_management_pattern.hpp b/src/common/transformations/include/transformations/sdpa_to_paged_attention/state_management_pattern.hpp index bd25d6718d6656..741f5fb8b02ac0 100644 --- a/src/common/transformations/include/transformations/sdpa_to_paged_attention/state_management_pattern.hpp +++ b/src/common/transformations/include/transformations/sdpa_to_paged_attention/state_management_pattern.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/sdpa_to_paged_attention/total_sequence_length_pattern.hpp b/src/common/transformations/include/transformations/sdpa_to_paged_attention/total_sequence_length_pattern.hpp index 3fef00bb7e05f6..595217b0ff8130 100644 --- a/src/common/transformations/include/transformations/sdpa_to_paged_attention/total_sequence_length_pattern.hpp +++ b/src/common/transformations/include/transformations/sdpa_to_paged_attention/total_sequence_length_pattern.hpp @@ -7,7 +7,7 @@ #include "openvino/cc/pass/itt.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/parameter.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/smart_reshape/broadcast_const_range_replacement.hpp b/src/common/transformations/include/transformations/smart_reshape/broadcast_const_range_replacement.hpp index 2561a01854c038..3d261102a3f92a 100644 --- a/src/common/transformations/include/transformations/smart_reshape/broadcast_const_range_replacement.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/broadcast_const_range_replacement.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/lstm_states_broadcast.hpp b/src/common/transformations/include/transformations/smart_reshape/lstm_states_broadcast.hpp index 8616fafa2b131a..2925a34b8696df 100644 --- a/src/common/transformations/include/transformations/smart_reshape/lstm_states_broadcast.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/lstm_states_broadcast.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/matmul_sr.hpp b/src/common/transformations/include/transformations/smart_reshape/matmul_sr.hpp index 430da1d1250790..d1c236e6b69d88 100644 --- a/src/common/transformations/include/transformations/smart_reshape/matmul_sr.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/matmul_sr.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/proposal_scales_stridedslice.hpp b/src/common/transformations/include/transformations/smart_reshape/proposal_scales_stridedslice.hpp index 6c853f5820a815..2784113cd2b9aa 100644 --- a/src/common/transformations/include/transformations/smart_reshape/proposal_scales_stridedslice.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/proposal_scales_stridedslice.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/symbolic_transformations/nop_broadcast.hpp b/src/common/transformations/include/transformations/symbolic_transformations/nop_broadcast.hpp index 19d6e41f9627d1..42aa7c1b6b3dc5 100644 --- a/src/common/transformations/include/transformations/symbolic_transformations/nop_broadcast.hpp +++ b/src/common/transformations/include/transformations/symbolic_transformations/nop_broadcast.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_base.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_base.hpp index 34a2a7b83f5d9c..58254481d60ba6 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_base.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_base.hpp @@ -6,8 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/transpose_sinking/ts_utils.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_unsqueeze.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_unsqueeze.hpp index a660b99506f1ea..3a32837471e253 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_unsqueeze.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_unsqueeze.hpp @@ -4,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" From 479be6a6855758c68e9714ed4daebc2deb610e61 Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Mon, 22 Jul 2024 19:24:12 +0400 Subject: [PATCH 03/16] change transformations headers 3 --- .../common_optimizations/matmul_const_transposes_extraction.hpp | 2 +- .../transformations/common_optimizations/mul_conv_fusion.hpp | 2 +- .../common_optimizations/remove_concat_zero_dim_input.hpp | 2 +- .../op_conversions/convert_slice_to_strided_slice.hpp | 2 +- .../include/transformations/op_conversions/convert_topk3.hpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/transformations/include/transformations/common_optimizations/matmul_const_transposes_extraction.hpp b/src/common/transformations/include/transformations/common_optimizations/matmul_const_transposes_extraction.hpp index 4ce419c0353497..1bc0bde3209057 100644 --- a/src/common/transformations/include/transformations/common_optimizations/matmul_const_transposes_extraction.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/matmul_const_transposes_extraction.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" /** diff --git a/src/common/transformations/include/transformations/common_optimizations/mul_conv_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/mul_conv_fusion.hpp index 1b2906a0292ccc..ae0be321bdc3bb 100644 --- a/src/common/transformations/include/transformations/common_optimizations/mul_conv_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/mul_conv_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/remove_concat_zero_dim_input.hpp b/src/common/transformations/include/transformations/common_optimizations/remove_concat_zero_dim_input.hpp index c941a60c1b9c68..d7780b94b6fcc8 100644 --- a/src/common/transformations/include/transformations/common_optimizations/remove_concat_zero_dim_input.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/remove_concat_zero_dim_input.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_slice_to_strided_slice.hpp b/src/common/transformations/include/transformations/op_conversions/convert_slice_to_strided_slice.hpp index c6b4bf125f1195..229cc6b12e95ed 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_slice_to_strided_slice.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_slice_to_strided_slice.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_topk3.hpp b/src/common/transformations/include/transformations/op_conversions/convert_topk3.hpp index 7b5b5dad08f096..9637661fa2af25 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_topk3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_topk3.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/MatcherPass.hpp" #include "transformations_visibility.hpp" namespace ov { From d94ed63a3ac1f45013cd1a84cbd7778f7e879aa0 Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Mon, 19 Aug 2024 16:28:51 +0400 Subject: [PATCH 04/16] add one --- .../transformations/common_optimizations/hswish_fusion.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp index ede2769ec278f1..adce503e67819a 100644 --- a/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/GraphRewrite.hpp" #include "transformations_visibility.hpp" namespace ov { From 4254f4e2bd3b4b548afe009071ad322416ef4053 Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Thu, 22 Aug 2024 05:24:52 +0400 Subject: [PATCH 05/16] a few changes --- .../common_optimizations/move_eltwise_up_data_movement.hpp | 2 +- .../sdpa_to_paged_attention/total_sequence_length_pattern.hpp | 1 - src/core/include/openvino/pass/NodeRegistry.hpp | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/common/transformations/include/transformations/common_optimizations/move_eltwise_up_data_movement.hpp b/src/common/transformations/include/transformations/common_optimizations/move_eltwise_up_data_movement.hpp index 447c184633494b..4f704b089190a4 100644 --- a/src/common/transformations/include/transformations/common_optimizations/move_eltwise_up_data_movement.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/move_eltwise_up_data_movement.hpp @@ -5,7 +5,7 @@ #pragma once #include "openvino/core/type.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/sdpa_to_paged_attention/total_sequence_length_pattern.hpp b/src/common/transformations/include/transformations/sdpa_to_paged_attention/total_sequence_length_pattern.hpp index ba4ba555827d04..1df9f1995d9379 100644 --- a/src/common/transformations/include/transformations/sdpa_to_paged_attention/total_sequence_length_pattern.hpp +++ b/src/common/transformations/include/transformations/sdpa_to_paged_attention/total_sequence_length_pattern.hpp @@ -4,7 +4,6 @@ #pragma once -#include "openvino/cc/pass/itt.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/parameter.hpp" #include "openvino/pass/MatcherPass.hpp" diff --git a/src/core/include/openvino/pass/NodeRegistry.hpp b/src/core/include/openvino/pass/NodeRegistry.hpp index a56d123b7dc216..cbbb2f05158fea 100644 --- a/src/core/include/openvino/pass/NodeRegistry.hpp +++ b/src/core/include/openvino/pass/NodeRegistry.hpp @@ -8,9 +8,6 @@ #include "openvino/pass/pattern/matcher.hpp" namespace ov { -using matcher_pass_callback = std::function; -using graph_rewrite_callback = std::function; -using handler_callback = std::function& node)>; namespace pass { /// \brief Register openvino node pointers into container. /// Can create and/or add existing node pointers into register From 1486c563205cc230cfbfda608ddac7f385bc3026 Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Thu, 22 Aug 2024 05:05:42 +0400 Subject: [PATCH 06/16] fix after review --- .../pyopenvino/graph/passes/graph_rewrite.cpp | 2 + .../low_precision/base_matcher_pass.hpp | 2 +- .../convert_subtract_constant.hpp | 2 +- .../create_precisions_dependent_attribute.hpp | 2 +- .../low_precision/layer_transformation.hpp | 2 +- .../include/low_precision/low_precision.hpp | 2 +- .../include/low_precision/markup_bias.hpp | 2 +- .../low_precision/propagate_shared_value.hpp | 2 +- .../propagate_through_precision_preserved.hpp | 2 +- .../low_precision/propagate_to_input.hpp | 2 +- .../pull_reshape_through_dequantization.hpp | 2 +- .../pull_transpose_through_dequantization.hpp | 2 +- .../include/compress_quantize_weights.hpp | 2 +- .../include/pruning.hpp | 2 +- .../pass/broadcast_to_movebroadcast.hpp | 2 +- .../snippets/pass/collapse_subgraph.hpp | 2 +- .../snippets/pass/common_optimizations.hpp | 2 +- .../snippets/pass/convert_constants.hpp | 2 +- .../pass/convert_power_to_powerstatic.hpp | 2 +- .../pass/explicit_transpose_matmul_inputs.hpp | 2 +- .../pass/extract_reshapes_from_mha.hpp | 2 +- .../snippets/pass/fq_decomposition.hpp | 2 +- .../snippets/pass/fuse_transpose_brgemm.hpp | 2 +- .../snippets/pass/gn_decomposition.hpp | 2 +- .../snippets/pass/insert_movebroadcast.hpp | 2 +- .../snippets/pass/matmul_to_brgemm.hpp | 2 +- .../snippets/pass/mha_tokenization.hpp | 2 +- .../pass/reduce_to_snippets_reduce.hpp | 2 +- .../snippets/pass/softmax_decomposition.hpp | 2 +- .../pass/softmax_reshape_elimination.hpp | 2 +- .../include/snippets/pass/tokenization.hpp | 2 +- .../snippets/pass/transform_convert.hpp | 2 +- .../snippets/pass/transpose_decomposition.hpp | 2 +- .../include/snippets/pass/validate.hpp | 2 +- .../adaptive_pool_to_reduce.hpp | 2 +- .../add_fake_quantize_fusion.hpp | 2 +- .../align_eltwise_input_ranks.hpp | 2 +- .../augru_cell_fusion.hpp | 2 +- .../batch_to_space_fusion.hpp | 2 +- .../common_optimizations/binarize_weights.hpp | 2 +- .../broadcast_elementwise_fusion.hpp | 2 +- .../broadcast_transition.hpp | 2 +- .../common_optimizations/clamp_fusion.hpp | 2 +- .../common_optimizations.hpp | 2 +- .../compress_float_constants.hpp | 2 +- .../common_optimizations/concat_fusion.hpp | 2 +- .../concat_reduce_fusion.hpp | 2 +- .../concat_to_broadcast.hpp | 2 +- .../common_optimizations/conv_mul_fusion.hpp | 2 +- .../conv_to_binary_conv.hpp | 2 +- .../convert_nms_gather_path_to_unsigned.hpp | 2 +- .../convert_quantize_dequantize.hpp | 2 +- ...onvert_u4_weights_zero_point_to_scalar.hpp | 2 +- .../depth_to_space_fusion.hpp | 2 +- .../dilated_convolution_converter.hpp | 2 +- .../dimension_tracking.hpp | 2 +- ...isable_random_uniform_constant_folding.hpp | 2 +- .../disable_shapeof_constant_folding.hpp | 2 +- .../common_optimizations/divide_fusion.hpp | 2 +- .../dropout_with_random_uniform_replacer.hpp | 2 +- .../eliminate_duplicate_ti_inputs.hpp | 2 +- .../eliminate_loop_inputs_outputs.hpp | 2 +- .../eliminate_unsqueeze_gather.hpp | 2 +- .../enable_shapeof_constant_folding.hpp | 2 +- .../fold_subgraph_empty_inputs.hpp | 2 +- .../common_optimizations/fq_mul_fusion.hpp | 2 +- .../fq_reshape_fusion.hpp | 2 +- .../fuse_rotary_positional_embeddings.hpp | 2 +- .../common_optimizations/gelu_fusion.hpp | 2 +- .../common_optimizations/gru_cell_fusion.hpp | 2 +- .../common_optimizations/hsigmoid_fusion.hpp | 2 +- .../common_optimizations/hswish_fusion.hpp | 2 +- .../interpolate_sequence_fusion.hpp | 2 +- .../leaky_relu_fusion.hpp | 2 +- .../matmul_const_transposes_extraction.hpp | 2 +- .../matmul_multiply_fusion.hpp | 2 +- .../common_optimizations/mish_fusion.hpp | 2 +- .../common_optimizations/mul_conv_fusion.hpp | 2 +- .../mul_fake_quantize_fusion.hpp | 2 +- .../nearest_neighbor_upsampling_fusion.hpp | 2 +- .../nonzero_horizontal_fusion.hpp | 2 +- .../common_optimizations/nop_elimination.hpp | 2 +- .../normalize_l2_fusion.hpp | 2 +- .../pull_transpose_through_fq.hpp | 2 +- .../random_uniform_fusion.hpp | 2 +- .../common_optimizations/reduce_merge.hpp | 2 +- .../reduce_reshape_fusion.hpp | 2 +- .../relu_fake_quantize_fusion.hpp | 2 +- .../remove_concat_zero_dim_input.hpp | 2 +- .../common_optimizations/reshape_prelu.hpp | 2 +- .../reshape_sequence_fusion.hpp | 2 +- .../common_optimizations/ric_fusion.hpp | 2 +- .../common_optimizations/rms_fusion.hpp | 2 +- .../select_with_one_value_condition.hpp | 2 +- .../common_optimizations/sequence_fusion.hpp | 2 +- .../shared_ops_optimization.hpp | 2 +- .../shuffle_channels_fusion.hpp | 2 +- .../simplify_shape_of_sub_graph.hpp | 2 +- ...ip_gather_before_transpose_and_reshape.hpp | 2 +- .../common_optimizations/softmax_fusion.hpp | 2 +- .../common_optimizations/softplus_fusion.hpp | 2 +- .../softplus_to_mish_fusion.hpp | 2 +- .../space_to_batch_fusion.hpp | 2 +- ...plit_concat_pair_to_interpolate_fusion.hpp | 2 +- .../split_squeeze_concat_fusion.hpp | 2 +- .../strides_optimization.hpp | 2 +- .../common_optimizations/subtract_fusion.hpp | 2 +- .../common_optimizations/swish_fusion.hpp | 2 +- ...anspose_reshape_elimination_for_matmul.hpp | 2 +- .../transpose_sinking.hpp | 2 +- .../transpose_to_reshape.hpp | 2 +- .../weights_dequantize_to_fake_quantize.hpp | 2 +- .../wrap_interpolate_into_transposes.hpp | 2 +- .../control_flow/unroll_if.hpp | 2 +- .../control_flow/unroll_tensor_iterator.hpp | 2 +- .../transformations/convert_precision.hpp | 2 +- .../flush_fp32_subnormals_to_zero.hpp | 2 +- .../align_mixed_fp32_fp16_types.hpp | 2 +- .../convert_compression_only_to_legacy.hpp | 2 +- ...decompression_convert_constant_folding.hpp | 2 +- ...k_subgraphs_to_keep_in_mixed_precision.hpp | 2 +- .../transformations/init_node_info.hpp | 2 +- .../mark_dequantization_subgraph.hpp | 2 +- .../batch_norm_decomposition.hpp | 2 +- .../convert_avgpool_downgrade.hpp | 2 +- .../op_conversions/convert_batch_to_space.hpp | 2 +- .../op_conversions/convert_broadcast3.hpp | 2 +- .../convert_broadcast_to_tiles.hpp | 2 +- .../op_conversions/convert_convertlike.hpp | 2 +- .../convert_convertpromotetypes.hpp | 2 +- .../convert_deformable_conv_v8_to_v1.hpp | 2 +- .../op_conversions/convert_depth_to_space.hpp | 2 +- .../op_conversions/convert_divide.hpp | 2 +- ...vert_embedding_bag_offsets15_downgrade.hpp | 2 +- ...nvert_embedding_bag_packed15_downgrade.hpp | 2 +- .../op_conversions/convert_gather_0d.hpp | 2 +- .../convert_gather_downgrade.hpp | 2 +- .../convert_gather_to_compressed.hpp | 2 +- .../op_conversions/convert_gather_upgrade.hpp | 2 +- .../op_conversions/convert_gelu.hpp | 2 +- .../convert_gp9_to_gp_ie_internal.hpp | 2 +- .../convert_interpolate11_downgrade.hpp | 2 +- .../convert_interpolate1_to_interpolate4.hpp | 2 +- .../convert_matrix_nms_to_matrix_nms_ie.hpp | 2 +- .../convert_maxpool_downgrade.hpp | 2 +- .../convert_maxpool_upgrade.hpp | 2 +- .../convert_minimum_to_power_and_max.hpp | 2 +- .../op_conversions/convert_mod.hpp | 2 +- ...rt_multiclass_nms_to_multiclass_nms_ie.hpp | 2 +- .../convert_multiclass_nms_upgrade.hpp | 2 +- .../op_conversions/convert_mvn1_to_mvn6.hpp | 2 +- .../op_conversions/convert_negative.hpp | 2 +- .../convert_nms9_to_nms_ie_internal.hpp | 2 +- ...convert_nms_rotated_to_nms_ie_internal.hpp | 2 +- .../convert_nms_to_nms_ie_internal.hpp | 2 +- .../convert_pad12_downgrade.hpp | 2 +- .../convert_pad_to_group_conv.hpp | 2 +- .../convert_previous_nms_to_nms_5.hpp | 2 +- .../convert_previous_nms_to_nms_9.hpp | 2 +- .../convert_prior_box_v8_to_v0.hpp | 2 +- .../convert_roi_align_v3_to_v9.hpp | 2 +- .../convert_roi_align_v9_to_v3.hpp | 2 +- .../convert_scatter_elements_to_scatter.hpp | 2 +- ...rt_scatter_elements_update12_downgrade.hpp | 2 +- .../op_conversions/convert_shapeof3.hpp | 2 +- .../convert_shuffle_channels3.hpp | 2 +- .../convert_slice_to_strided_slice.hpp | 2 +- .../convert_softmax_downgrade.hpp | 2 +- .../convert_softmax_upgrade.hpp | 2 +- .../op_conversions/convert_space_to_batch.hpp | 2 +- .../op_conversions/convert_space_to_depth.hpp | 2 +- .../op_conversions/convert_subtract.hpp | 2 +- .../convert_topk11_downgrade.hpp | 2 +- .../op_conversions/convert_topk3.hpp | 2 +- .../convert_xor_to_logical_xor.hpp | 2 +- .../detection_output_downgrade.hpp | 2 +- .../detection_output_upgrade.hpp | 2 +- .../op_conversions/einsum_decomposition.hpp | 2 +- .../op_conversions/eye_decomposition.hpp | 2 +- .../op_conversions/fq_decomposition.hpp | 2 +- .../op_conversions/gelu7_downgrade.hpp | 2 +- .../group_normalization_decomposition.hpp | 2 +- .../op_conversions/gru_cell_decomposition.hpp | 2 +- .../hard_sigmoid_decomposition.hpp | 2 +- .../op_conversions/hsigmoid_decomposition.hpp | 2 +- .../op_conversions/hswish_decomposition.hpp | 2 +- .../log_softmax_decomposition.hpp | 2 +- .../lstm_cell_decomposition.hpp | 2 +- .../op_conversions/mvn6_decomposition.hpp | 2 +- .../normalize_l2_decomposition.hpp | 2 +- .../reduce_l1_decomposition.hpp | 2 +- .../reduce_l2_decomposition.hpp | 2 +- .../op_conversions/rnn_cell_decomposition.hpp | 2 +- ...ed_dot_product_attention_decomposition.hpp | 2 +- .../simplify_ctc_greedy_decoder_seq_len.hpp | 2 +- .../op_conversions/softmax_decomposition.hpp | 2 +- .../op_conversions/softplus_decomposition.hpp | 2 +- .../op_conversions/softsign_decomposition.hpp | 2 +- .../op_conversions/unique_decomposition.hpp | 2 +- .../convert_opset2_to_opset1.hpp | 2 +- .../convert_opset3_to_opset2.hpp | 2 +- .../position_ids_replacer.hpp | 2 +- .../prev_sequence_length_pattern.hpp | 2 +- .../state_management_pattern.hpp | 2 +- .../total_sequence_length_pattern.hpp | 2 +- .../broadcast_const_range_replacement.hpp | 2 +- .../smart_reshape/lstm_states_broadcast.hpp | 2 +- .../smart_reshape/matmul_sr.hpp | 2 +- .../proposal_scales_stridedslice.hpp | 2 +- .../smart_reshape/reshape_sinking.hpp | 2 +- .../smart_reshape/reshape_to_1D.hpp | 2 +- .../smart_reshape/shape_of_const_folding.hpp | 2 +- .../smart_reshape/smart_reshape.hpp | 2 +- .../smart_reshape/strided_slice_squeeze.hpp | 2 +- .../chained_maximum.hpp | 2 +- .../dereshape_matmul.hpp | 2 +- .../nop_broadcast.hpp | 2 +- .../reshape_optimizations.hpp | 2 +- .../transpose_sinking/ts_base.hpp | 2 +- .../transpose_sinking/ts_binary.hpp | 2 +- .../transpose_sinking/ts_concat.hpp | 2 +- .../transpose_sinking/ts_cumsum.hpp | 2 +- .../transpose_sinking/ts_data_movement.hpp | 2 +- .../transpose_sinking/ts_fuse.hpp | 2 +- .../transpose_sinking/ts_gather.hpp | 2 +- .../transpose_sinking/ts_interpolate.hpp | 2 +- .../transpose_sinking/ts_reduction.hpp | 2 +- .../ts_reset_no_sinking_attribute.hpp | 2 +- .../transpose_sinking/ts_slice.hpp | 2 +- .../transpose_sinking/ts_squeeze.hpp | 2 +- .../transpose_sinking/ts_unary.hpp | 2 +- .../transpose_sinking/ts_unsqueeze.hpp | 2 +- .../common_optimizations/ric_fusion.cpp | 1 + ...k_subgraphs_to_keep_in_mixed_precision.cpp | 1 + .../include/openvino/pass/GraphRewrite.hpp | 137 --------------- ...Rewrite.hpp => backward_graph_rewrite.hpp} | 6 +- .../openvino/pass/convert_fp32_to_fp16.hpp | 2 +- .../include/openvino/pass/graph_rewrite.hpp | 162 +----------------- .../{MatcherPass.hpp => matcher_pass.hpp} | 2 +- .../{NodeRegistry.hpp => node_registry.hpp} | 6 +- src/core/src/pass/graph_rewrite.cpp | 7 + src/core/src/pass/node_registry.cpp | 9 + src/core/tests/graph_rewrite.cpp | 1 + 243 files changed, 259 insertions(+), 539 deletions(-) delete mode 100644 src/core/include/openvino/pass/GraphRewrite.hpp rename src/core/include/openvino/pass/{BackwardGraphRewrite.hpp => backward_graph_rewrite.hpp} (61%) rename src/core/include/openvino/pass/{MatcherPass.hpp => matcher_pass.hpp} (98%) rename src/core/include/openvino/pass/{NodeRegistry.hpp => node_registry.hpp} (94%) create mode 100644 src/core/src/pass/node_registry.cpp diff --git a/src/bindings/python/src/pyopenvino/graph/passes/graph_rewrite.cpp b/src/bindings/python/src/pyopenvino/graph/passes/graph_rewrite.cpp index be013a00a76fde..caca29a10dcc6d 100644 --- a/src/bindings/python/src/pyopenvino/graph/passes/graph_rewrite.cpp +++ b/src/bindings/python/src/pyopenvino/graph/passes/graph_rewrite.cpp @@ -3,6 +3,8 @@ // #include "pyopenvino/graph/passes/graph_rewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" #include 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 9da2caf1d57df0..f3a217e9d25cab 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 @@ -4,7 +4,7 @@ #pragma once #include "openvino/core/node.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "rt_info/attribute_parameters.hpp" namespace ov { diff --git a/src/common/low_precision_transformations/include/low_precision/convert_subtract_constant.hpp b/src/common/low_precision_transformations/include/low_precision/convert_subtract_constant.hpp index c68452d3254bbc..d89384a8cd169f 100644 --- a/src/common/low_precision_transformations/include/low_precision/convert_subtract_constant.hpp +++ b/src/common/low_precision_transformations/include/low_precision/convert_subtract_constant.hpp @@ -8,7 +8,7 @@ #include #include "low_precision/lpt_visibility.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace pass { 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 c61b11c879f1e0..c57d15dde899bd 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 @@ -11,7 +11,7 @@ #include "openvino/pass/pattern/op/wrap_type.hpp" #include "low_precision/lpt_visibility.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "openvino/opsets/opset1.hpp" #include "rt_info/precision_preserved_attribute.hpp" #include "network_helper.hpp" diff --git a/src/common/low_precision_transformations/include/low_precision/layer_transformation.hpp b/src/common/low_precision_transformations/include/low_precision/layer_transformation.hpp index 949f418067d96d..d86dbd9470cc07 100644 --- a/src/common/low_precision_transformations/include/low_precision/layer_transformation.hpp +++ b/src/common/low_precision_transformations/include/low_precision/layer_transformation.hpp @@ -11,7 +11,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformation_context.hpp" #include "quantization_details.hpp" #include "low_precision/common/ie_lpt_exception.hpp" diff --git a/src/common/low_precision_transformations/include/low_precision/low_precision.hpp b/src/common/low_precision_transformations/include/low_precision/low_precision.hpp index 757624cf68795b..d6bddd3643a4f6 100644 --- a/src/common/low_precision_transformations/include/low_precision/low_precision.hpp +++ b/src/common/low_precision_transformations/include/low_precision/low_precision.hpp @@ -25,7 +25,7 @@ #include "low_precision/common/precisions_restriction.hpp" #include "low_precision/layer_transformation.hpp" #include "low_precision/markup_precisions.hpp" -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "openvino/pass/pass.hpp" namespace ov { diff --git a/src/common/low_precision_transformations/include/low_precision/markup_bias.hpp b/src/common/low_precision_transformations/include/low_precision/markup_bias.hpp index cd6021dcfb936e..a7f46f74dc0645 100644 --- a/src/common/low_precision_transformations/include/low_precision/markup_bias.hpp +++ b/src/common/low_precision_transformations/include/low_precision/markup_bias.hpp @@ -6,7 +6,7 @@ #include "low_precision/lpt_visibility.hpp" #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "openvino/pass/pattern/matcher.hpp" namespace ov { 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 f894c9da6d9f88..16a014cda6ec04 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 @@ -11,7 +11,7 @@ #include "openvino/core/node.hpp" #include "low_precision/lpt_visibility.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "low_precision/network_helper.hpp" #include "lpt_itt.hpp" 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 675b3cc1379fd5..0450091699065d 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 @@ -8,7 +8,7 @@ #include #include "openvino/core/node.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "low_precision/lpt_visibility.hpp" 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 b29e410f06b639..3e550b9e950ff3 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 @@ -11,7 +11,7 @@ #include "openvino/pass/pattern/op/wrap_type.hpp" #include "low_precision/lpt_visibility.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "network_helper.hpp" namespace ov { 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 8c29e157b81200..75d0d3f6510048 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 @@ -7,7 +7,7 @@ #include #include #include "low_precision/lpt_visibility.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace pass { 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 aba1ff997eb474..92e9eeebd2be52 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 @@ -7,7 +7,7 @@ #include #include #include "low_precision/lpt_visibility.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace pass { diff --git a/src/common/offline_transformations/include/compress_quantize_weights.hpp b/src/common/offline_transformations/include/compress_quantize_weights.hpp index e33f18b643f618..597b50828494a5 100644 --- a/src/common/offline_transformations/include/compress_quantize_weights.hpp +++ b/src/common/offline_transformations/include/compress_quantize_weights.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" namespace ov { namespace pass { diff --git a/src/common/offline_transformations/include/pruning.hpp b/src/common/offline_transformations/include/pruning.hpp index 1b535420430ecf..c71a84fe18d396 100644 --- a/src/common/offline_transformations/include/pruning.hpp +++ b/src/common/offline_transformations/include/pruning.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "openvino/pass/manager.hpp" namespace ov { diff --git a/src/common/snippets/include/snippets/pass/broadcast_to_movebroadcast.hpp b/src/common/snippets/include/snippets/pass/broadcast_to_movebroadcast.hpp index 38b9fa41572afb..242d490b2fab05 100644 --- a/src/common/snippets/include/snippets/pass/broadcast_to_movebroadcast.hpp +++ b/src/common/snippets/include/snippets/pass/broadcast_to_movebroadcast.hpp @@ -5,7 +5,7 @@ #pragma once #include "openvino/pass/pattern/matcher.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/collapse_subgraph.hpp b/src/common/snippets/include/snippets/pass/collapse_subgraph.hpp index 14b90a26aa9a4b..41236df12aa0ef 100644 --- a/src/common/snippets/include/snippets/pass/collapse_subgraph.hpp +++ b/src/common/snippets/include/snippets/pass/collapse_subgraph.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "snippets/pass/tokenization.hpp" namespace ov { diff --git a/src/common/snippets/include/snippets/pass/common_optimizations.hpp b/src/common/snippets/include/snippets/pass/common_optimizations.hpp index 76969e2efd4d69..1ff2d6293db649 100644 --- a/src/common/snippets/include/snippets/pass/common_optimizations.hpp +++ b/src/common/snippets/include/snippets/pass/common_optimizations.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "snippets/pass/tokenization.hpp" namespace ov { diff --git a/src/common/snippets/include/snippets/pass/convert_constants.hpp b/src/common/snippets/include/snippets/pass/convert_constants.hpp index 33dcd1d53fbb83..629528a1700959 100644 --- a/src/common/snippets/include/snippets/pass/convert_constants.hpp +++ b/src/common/snippets/include/snippets/pass/convert_constants.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "openvino/pass/pattern/matcher.hpp" namespace ov { diff --git a/src/common/snippets/include/snippets/pass/convert_power_to_powerstatic.hpp b/src/common/snippets/include/snippets/pass/convert_power_to_powerstatic.hpp index 42369e5372d55e..a2274837fb7c3a 100644 --- a/src/common/snippets/include/snippets/pass/convert_power_to_powerstatic.hpp +++ b/src/common/snippets/include/snippets/pass/convert_power_to_powerstatic.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/explicit_transpose_matmul_inputs.hpp b/src/common/snippets/include/snippets/pass/explicit_transpose_matmul_inputs.hpp index df6a814114c14d..5aeee244a76877 100644 --- a/src/common/snippets/include/snippets/pass/explicit_transpose_matmul_inputs.hpp +++ b/src/common/snippets/include/snippets/pass/explicit_transpose_matmul_inputs.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/extract_reshapes_from_mha.hpp b/src/common/snippets/include/snippets/pass/extract_reshapes_from_mha.hpp index 436c73dce42266..c4c23b6e247951 100644 --- a/src/common/snippets/include/snippets/pass/extract_reshapes_from_mha.hpp +++ b/src/common/snippets/include/snippets/pass/extract_reshapes_from_mha.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/fq_decomposition.hpp b/src/common/snippets/include/snippets/pass/fq_decomposition.hpp index 1df14e33b1f58f..982835b4f27d64 100644 --- a/src/common/snippets/include/snippets/pass/fq_decomposition.hpp +++ b/src/common/snippets/include/snippets/pass/fq_decomposition.hpp @@ -5,7 +5,7 @@ #pragma once #include "openvino/op/fake_quantize.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/fuse_transpose_brgemm.hpp b/src/common/snippets/include/snippets/pass/fuse_transpose_brgemm.hpp index 922b2e23bc7719..d913df46caa890 100644 --- a/src/common/snippets/include/snippets/pass/fuse_transpose_brgemm.hpp +++ b/src/common/snippets/include/snippets/pass/fuse_transpose_brgemm.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "openvino/op/transpose.hpp" diff --git a/src/common/snippets/include/snippets/pass/gn_decomposition.hpp b/src/common/snippets/include/snippets/pass/gn_decomposition.hpp index 7cc1afce6aaf5e..5c7b6478dec15f 100644 --- a/src/common/snippets/include/snippets/pass/gn_decomposition.hpp +++ b/src/common/snippets/include/snippets/pass/gn_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/insert_movebroadcast.hpp b/src/common/snippets/include/snippets/pass/insert_movebroadcast.hpp index aa0e4442efe68a..787677a22ed108 100644 --- a/src/common/snippets/include/snippets/pass/insert_movebroadcast.hpp +++ b/src/common/snippets/include/snippets/pass/insert_movebroadcast.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/matmul_to_brgemm.hpp b/src/common/snippets/include/snippets/pass/matmul_to_brgemm.hpp index 6308d01e2c588f..780b153b4f0487 100644 --- a/src/common/snippets/include/snippets/pass/matmul_to_brgemm.hpp +++ b/src/common/snippets/include/snippets/pass/matmul_to_brgemm.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "snippets/op/brgemm.hpp" diff --git a/src/common/snippets/include/snippets/pass/mha_tokenization.hpp b/src/common/snippets/include/snippets/pass/mha_tokenization.hpp index a0be1164a3d740..78dad6ee8e6e19 100644 --- a/src/common/snippets/include/snippets/pass/mha_tokenization.hpp +++ b/src/common/snippets/include/snippets/pass/mha_tokenization.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "snippets/pass/tokenization.hpp" namespace ov { diff --git a/src/common/snippets/include/snippets/pass/reduce_to_snippets_reduce.hpp b/src/common/snippets/include/snippets/pass/reduce_to_snippets_reduce.hpp index 230a8a46c4ca5d..01d33d6e86cd9c 100644 --- a/src/common/snippets/include/snippets/pass/reduce_to_snippets_reduce.hpp +++ b/src/common/snippets/include/snippets/pass/reduce_to_snippets_reduce.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/softmax_decomposition.hpp b/src/common/snippets/include/snippets/pass/softmax_decomposition.hpp index f23988cb755129..8e24c1532a72d3 100644 --- a/src/common/snippets/include/snippets/pass/softmax_decomposition.hpp +++ b/src/common/snippets/include/snippets/pass/softmax_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/softmax_reshape_elimination.hpp b/src/common/snippets/include/snippets/pass/softmax_reshape_elimination.hpp index e0b076ae1f33d3..b43881c1425f84 100644 --- a/src/common/snippets/include/snippets/pass/softmax_reshape_elimination.hpp +++ b/src/common/snippets/include/snippets/pass/softmax_reshape_elimination.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/tokenization.hpp b/src/common/snippets/include/snippets/pass/tokenization.hpp index 3d2b6533b7e3df..24efcceec71a24 100644 --- a/src/common/snippets/include/snippets/pass/tokenization.hpp +++ b/src/common/snippets/include/snippets/pass/tokenization.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "snippets/op/subgraph.hpp" diff --git a/src/common/snippets/include/snippets/pass/transform_convert.hpp b/src/common/snippets/include/snippets/pass/transform_convert.hpp index 713c0dc9505ee9..5b087d4ae559eb 100644 --- a/src/common/snippets/include/snippets/pass/transform_convert.hpp +++ b/src/common/snippets/include/snippets/pass/transform_convert.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/transpose_decomposition.hpp b/src/common/snippets/include/snippets/pass/transpose_decomposition.hpp index 1b3020c5c34a4e..dbef9bc7b31c93 100644 --- a/src/common/snippets/include/snippets/pass/transpose_decomposition.hpp +++ b/src/common/snippets/include/snippets/pass/transpose_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace snippets { diff --git a/src/common/snippets/include/snippets/pass/validate.hpp b/src/common/snippets/include/snippets/pass/validate.hpp index 9dc23ca23823af..1fedf8a2ce08d5 100644 --- a/src/common/snippets/include/snippets/pass/validate.hpp +++ b/src/common/snippets/include/snippets/pass/validate.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace snippets { diff --git a/src/common/transformations/include/transformations/common_optimizations/adaptive_pool_to_reduce.hpp b/src/common/transformations/include/transformations/common_optimizations/adaptive_pool_to_reduce.hpp index 3ae4fab25e18f5..06dde1ff0bbf63 100644 --- a/src/common/transformations/include/transformations/common_optimizations/adaptive_pool_to_reduce.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/adaptive_pool_to_reduce.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/add_fake_quantize_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/add_fake_quantize_fusion.hpp index c9e436d460e7d2..f63f00a455a117 100644 --- a/src/common/transformations/include/transformations/common_optimizations/add_fake_quantize_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/add_fake_quantize_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/align_eltwise_input_ranks.hpp b/src/common/transformations/include/transformations/common_optimizations/align_eltwise_input_ranks.hpp index 88522087013e33..1a7578d3551903 100644 --- a/src/common/transformations/include/transformations/common_optimizations/align_eltwise_input_ranks.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/align_eltwise_input_ranks.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" /** diff --git a/src/common/transformations/include/transformations/common_optimizations/augru_cell_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/augru_cell_fusion.hpp index 7d84fb9489f3bc..c6773de5ec894f 100644 --- a/src/common/transformations/include/transformations/common_optimizations/augru_cell_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/augru_cell_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/batch_to_space_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/batch_to_space_fusion.hpp index 513602a556770c..7b05f721f52400 100644 --- a/src/common/transformations/include/transformations/common_optimizations/batch_to_space_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/batch_to_space_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/binarize_weights.hpp b/src/common/transformations/include/transformations/common_optimizations/binarize_weights.hpp index c0adee494f192c..3803281478a055 100644 --- a/src/common/transformations/include/transformations/common_optimizations/binarize_weights.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/binarize_weights.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/broadcast_elementwise_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/broadcast_elementwise_fusion.hpp index 48fcd925323da4..38ae4799e932a0 100644 --- a/src/common/transformations/include/transformations/common_optimizations/broadcast_elementwise_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/broadcast_elementwise_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/broadcast_transition.hpp b/src/common/transformations/include/transformations/common_optimizations/broadcast_transition.hpp index 96b066b54a0332..089f1472b7c431 100644 --- a/src/common/transformations/include/transformations/common_optimizations/broadcast_transition.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/broadcast_transition.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "openvino/pass/pattern/matcher.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/common_optimizations/clamp_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/clamp_fusion.hpp index 2e3fd65dc18cb6..fe966323edbb98 100644 --- a/src/common/transformations/include/transformations/common_optimizations/clamp_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/clamp_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/common_optimizations.hpp b/src/common/transformations/include/transformations/common_optimizations/common_optimizations.hpp index a3ab09e115147d..7540275ce74d0f 100644 --- a/src/common/transformations/include/transformations/common_optimizations/common_optimizations.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/common_optimizations.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/compress_float_constants.hpp b/src/common/transformations/include/transformations/common_optimizations/compress_float_constants.hpp index 16b4bb093b9086..77bac5753bd757 100644 --- a/src/common/transformations/include/transformations/common_optimizations/compress_float_constants.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/compress_float_constants.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/concat_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/concat_fusion.hpp index 488d88da1292fb..31b710722bf13f 100644 --- a/src/common/transformations/include/transformations/common_optimizations/concat_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/concat_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/concat_reduce_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/concat_reduce_fusion.hpp index 7285462a770396..4aa5391dd42618 100644 --- a/src/common/transformations/include/transformations/common_optimizations/concat_reduce_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/concat_reduce_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/concat_to_broadcast.hpp b/src/common/transformations/include/transformations/common_optimizations/concat_to_broadcast.hpp index 8cdd855cf874dc..ddb20338c0b01d 100644 --- a/src/common/transformations/include/transformations/common_optimizations/concat_to_broadcast.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/concat_to_broadcast.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/conv_mul_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/conv_mul_fusion.hpp index 408670cf4b1ee5..9e2ba5194367ba 100644 --- a/src/common/transformations/include/transformations/common_optimizations/conv_mul_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/conv_mul_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/conv_to_binary_conv.hpp b/src/common/transformations/include/transformations/common_optimizations/conv_to_binary_conv.hpp index 7f92b8163882d3..a60a15d37be9e7 100644 --- a/src/common/transformations/include/transformations/common_optimizations/conv_to_binary_conv.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/conv_to_binary_conv.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp b/src/common/transformations/include/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp index 506921cdf30042..d778c255160281 100644 --- a/src/common/transformations/include/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/convert_quantize_dequantize.hpp b/src/common/transformations/include/transformations/common_optimizations/convert_quantize_dequantize.hpp index 8dd006b0226447..7c0b6b5be95d5d 100644 --- a/src/common/transformations/include/transformations/common_optimizations/convert_quantize_dequantize.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/convert_quantize_dequantize.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/convert_u4_weights_zero_point_to_scalar.hpp b/src/common/transformations/include/transformations/common_optimizations/convert_u4_weights_zero_point_to_scalar.hpp index bf8ba321e5e651..dfd9eef8069665 100644 --- a/src/common/transformations/include/transformations/common_optimizations/convert_u4_weights_zero_point_to_scalar.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/convert_u4_weights_zero_point_to_scalar.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/depth_to_space_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/depth_to_space_fusion.hpp index 34739255e6234c..53e6b623d67d5a 100644 --- a/src/common/transformations/include/transformations/common_optimizations/depth_to_space_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/depth_to_space_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/dilated_convolution_converter.hpp b/src/common/transformations/include/transformations/common_optimizations/dilated_convolution_converter.hpp index 82e5a708490414..204190cafd305c 100644 --- a/src/common/transformations/include/transformations/common_optimizations/dilated_convolution_converter.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/dilated_convolution_converter.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/dimension_tracking.hpp b/src/common/transformations/include/transformations/common_optimizations/dimension_tracking.hpp index 7f58a3b9fd1a27..d1ec2069b3f621 100644 --- a/src/common/transformations/include/transformations/common_optimizations/dimension_tracking.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/dimension_tracking.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" using P2Btype = diff --git a/src/common/transformations/include/transformations/common_optimizations/disable_random_uniform_constant_folding.hpp b/src/common/transformations/include/transformations/common_optimizations/disable_random_uniform_constant_folding.hpp index d4b9728f1c5166..405e8ff7288e5d 100644 --- a/src/common/transformations/include/transformations/common_optimizations/disable_random_uniform_constant_folding.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/disable_random_uniform_constant_folding.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp b/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp index 007262e3fdec9b..acc14586d4c3b3 100644 --- a/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/divide_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/divide_fusion.hpp index ae4260629e5b10..37a5b1f66a5551 100644 --- a/src/common/transformations/include/transformations/common_optimizations/divide_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/divide_fusion.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/dropout_with_random_uniform_replacer.hpp b/src/common/transformations/include/transformations/common_optimizations/dropout_with_random_uniform_replacer.hpp index 7901a87d72d4f7..2ad17f308d46bc 100644 --- a/src/common/transformations/include/transformations/common_optimizations/dropout_with_random_uniform_replacer.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/dropout_with_random_uniform_replacer.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/eliminate_duplicate_ti_inputs.hpp b/src/common/transformations/include/transformations/common_optimizations/eliminate_duplicate_ti_inputs.hpp index 07e73620fbd01e..058daba182b8a6 100644 --- a/src/common/transformations/include/transformations/common_optimizations/eliminate_duplicate_ti_inputs.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/eliminate_duplicate_ti_inputs.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/eliminate_loop_inputs_outputs.hpp b/src/common/transformations/include/transformations/common_optimizations/eliminate_loop_inputs_outputs.hpp index 9741e3a22ff105..ca58bb504fd811 100644 --- a/src/common/transformations/include/transformations/common_optimizations/eliminate_loop_inputs_outputs.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/eliminate_loop_inputs_outputs.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/eliminate_unsqueeze_gather.hpp b/src/common/transformations/include/transformations/common_optimizations/eliminate_unsqueeze_gather.hpp index cafb167b3d62c6..b0ce4581a25569 100644 --- a/src/common/transformations/include/transformations/common_optimizations/eliminate_unsqueeze_gather.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/eliminate_unsqueeze_gather.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/enable_shapeof_constant_folding.hpp b/src/common/transformations/include/transformations/common_optimizations/enable_shapeof_constant_folding.hpp index ad8ace857a97ce..ab515ce65ac83b 100644 --- a/src/common/transformations/include/transformations/common_optimizations/enable_shapeof_constant_folding.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/enable_shapeof_constant_folding.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/fold_subgraph_empty_inputs.hpp b/src/common/transformations/include/transformations/common_optimizations/fold_subgraph_empty_inputs.hpp index 5f433c38925cc6..8775d93644456e 100644 --- a/src/common/transformations/include/transformations/common_optimizations/fold_subgraph_empty_inputs.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/fold_subgraph_empty_inputs.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/fq_mul_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/fq_mul_fusion.hpp index e79e03d67f1348..3b48e9da740269 100644 --- a/src/common/transformations/include/transformations/common_optimizations/fq_mul_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/fq_mul_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/fq_reshape_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/fq_reshape_fusion.hpp index 371d2d996a95c9..e4004d794d8ec7 100644 --- a/src/common/transformations/include/transformations/common_optimizations/fq_reshape_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/fq_reshape_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/fuse_rotary_positional_embeddings.hpp b/src/common/transformations/include/transformations/common_optimizations/fuse_rotary_positional_embeddings.hpp index 51a70eec1d23a6..5cd99f88d13413 100644 --- a/src/common/transformations/include/transformations/common_optimizations/fuse_rotary_positional_embeddings.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/fuse_rotary_positional_embeddings.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp index a3468b8b9da128..c3e50b7c992a53 100644 --- a/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/gru_cell_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/gru_cell_fusion.hpp index 8407070706c478..50bc5ac370a74c 100644 --- a/src/common/transformations/include/transformations/common_optimizations/gru_cell_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/gru_cell_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp index 95e0aedce84de4..04841837a5a76b 100644 --- a/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp index adce503e67819a..ede2769ec278f1 100644 --- a/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/interpolate_sequence_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/interpolate_sequence_fusion.hpp index abdbf3a3c35dc8..ff7495e5a2d405 100644 --- a/src/common/transformations/include/transformations/common_optimizations/interpolate_sequence_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/interpolate_sequence_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/leaky_relu_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/leaky_relu_fusion.hpp index 6d4f6a3db562df..42abc74e0dbc2a 100644 --- a/src/common/transformations/include/transformations/common_optimizations/leaky_relu_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/leaky_relu_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/matmul_const_transposes_extraction.hpp b/src/common/transformations/include/transformations/common_optimizations/matmul_const_transposes_extraction.hpp index 1bc0bde3209057..7626be5f877527 100644 --- a/src/common/transformations/include/transformations/common_optimizations/matmul_const_transposes_extraction.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/matmul_const_transposes_extraction.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" /** diff --git a/src/common/transformations/include/transformations/common_optimizations/matmul_multiply_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/matmul_multiply_fusion.hpp index c275d1aa73b448..7994a04be7972d 100644 --- a/src/common/transformations/include/transformations/common_optimizations/matmul_multiply_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/matmul_multiply_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/mish_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/mish_fusion.hpp index 5c2e991ad78024..8dc6e0149c881f 100644 --- a/src/common/transformations/include/transformations/common_optimizations/mish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/mish_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/mul_conv_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/mul_conv_fusion.hpp index ae0be321bdc3bb..75d73b5f2a8d97 100644 --- a/src/common/transformations/include/transformations/common_optimizations/mul_conv_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/mul_conv_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/mul_fake_quantize_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/mul_fake_quantize_fusion.hpp index 919efbcf11a4f6..f66e52f82c6c0e 100644 --- a/src/common/transformations/include/transformations/common_optimizations/mul_fake_quantize_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/mul_fake_quantize_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/nearest_neighbor_upsampling_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/nearest_neighbor_upsampling_fusion.hpp index 230c05a0ce64f0..04b45ee6c67cd3 100644 --- a/src/common/transformations/include/transformations/common_optimizations/nearest_neighbor_upsampling_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/nearest_neighbor_upsampling_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/nonzero_horizontal_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/nonzero_horizontal_fusion.hpp index dad524d8c4f9b6..d579cb0c8a9ec1 100644 --- a/src/common/transformations/include/transformations/common_optimizations/nonzero_horizontal_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/nonzero_horizontal_fusion.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp b/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp index a3fb9267efd6c3..ce07b9bd93020d 100644 --- a/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/normalize_l2_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/normalize_l2_fusion.hpp index df8efb45cd0478..39355ec6af5ec4 100644 --- a/src/common/transformations/include/transformations/common_optimizations/normalize_l2_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/normalize_l2_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/pull_transpose_through_fq.hpp b/src/common/transformations/include/transformations/common_optimizations/pull_transpose_through_fq.hpp index 6eff36ed12dd04..c4aa71724a07a3 100644 --- a/src/common/transformations/include/transformations/common_optimizations/pull_transpose_through_fq.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/pull_transpose_through_fq.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/random_uniform_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/random_uniform_fusion.hpp index 90d248c6ae789c..198666e9a02673 100644 --- a/src/common/transformations/include/transformations/common_optimizations/random_uniform_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/random_uniform_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/reduce_merge.hpp b/src/common/transformations/include/transformations/common_optimizations/reduce_merge.hpp index 6bbed54e93bf66..20daf9173b87c8 100644 --- a/src/common/transformations/include/transformations/common_optimizations/reduce_merge.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/reduce_merge.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/reduce_reshape_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/reduce_reshape_fusion.hpp index 59719e692fe8cd..2827be2cdb5738 100644 --- a/src/common/transformations/include/transformations/common_optimizations/reduce_reshape_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/reduce_reshape_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/relu_fake_quantize_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/relu_fake_quantize_fusion.hpp index bea4b5869249be..8d2895b378c774 100644 --- a/src/common/transformations/include/transformations/common_optimizations/relu_fake_quantize_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/relu_fake_quantize_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/remove_concat_zero_dim_input.hpp b/src/common/transformations/include/transformations/common_optimizations/remove_concat_zero_dim_input.hpp index d7780b94b6fcc8..5c746cd4dde987 100644 --- a/src/common/transformations/include/transformations/common_optimizations/remove_concat_zero_dim_input.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/remove_concat_zero_dim_input.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/reshape_prelu.hpp b/src/common/transformations/include/transformations/common_optimizations/reshape_prelu.hpp index a7b81606692645..9ced2036d9906b 100644 --- a/src/common/transformations/include/transformations/common_optimizations/reshape_prelu.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/reshape_prelu.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/reshape_sequence_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/reshape_sequence_fusion.hpp index 9e2c9dbb186b38..5fa22e7feb0fe6 100644 --- a/src/common/transformations/include/transformations/common_optimizations/reshape_sequence_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/reshape_sequence_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/ric_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/ric_fusion.hpp index 7ed9d47edacb78..c91c27a464cada 100644 --- a/src/common/transformations/include/transformations/common_optimizations/ric_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/ric_fusion.hpp @@ -5,7 +5,7 @@ #pragma once #include "openvino/core/model.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/rms_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/rms_fusion.hpp index ac97a4323428c0..d528fb344578a3 100644 --- a/src/common/transformations/include/transformations/common_optimizations/rms_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/rms_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "openvino/pass/manager.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/common_optimizations/select_with_one_value_condition.hpp b/src/common/transformations/include/transformations/common_optimizations/select_with_one_value_condition.hpp index 5193de7e6a044d..5278e17d07ff64 100644 --- a/src/common/transformations/include/transformations/common_optimizations/select_with_one_value_condition.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/select_with_one_value_condition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/sequence_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/sequence_fusion.hpp index e03696878da447..ecba41990e28dd 100644 --- a/src/common/transformations/include/transformations/common_optimizations/sequence_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/sequence_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/shared_ops_optimization.hpp b/src/common/transformations/include/transformations/common_optimizations/shared_ops_optimization.hpp index cee3bd6abd7d2d..8e2a87502ebcc9 100644 --- a/src/common/transformations/include/transformations/common_optimizations/shared_ops_optimization.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/shared_ops_optimization.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/shuffle_channels_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/shuffle_channels_fusion.hpp index 3007a724229e9b..2304fe637b4551 100644 --- a/src/common/transformations/include/transformations/common_optimizations/shuffle_channels_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/shuffle_channels_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/simplify_shape_of_sub_graph.hpp b/src/common/transformations/include/transformations/common_optimizations/simplify_shape_of_sub_graph.hpp index 589fb74e02d672..509047578bd489 100644 --- a/src/common/transformations/include/transformations/common_optimizations/simplify_shape_of_sub_graph.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/simplify_shape_of_sub_graph.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.hpp b/src/common/transformations/include/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.hpp index 99a5af1a5e0f28..a93fdb8f4f20fe 100644 --- a/src/common/transformations/include/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/softmax_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/softmax_fusion.hpp index 9865909501e7c1..f56a8bd1b574f7 100644 --- a/src/common/transformations/include/transformations/common_optimizations/softmax_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/softmax_fusion.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/softplus_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/softplus_fusion.hpp index bcbc6f26812b79..44d34dcdcc4c90 100644 --- a/src/common/transformations/include/transformations/common_optimizations/softplus_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/softplus_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/softplus_to_mish_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/softplus_to_mish_fusion.hpp index e1cc503ab7e6fb..6a6d247e4ea351 100644 --- a/src/common/transformations/include/transformations/common_optimizations/softplus_to_mish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/softplus_to_mish_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/space_to_batch_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/space_to_batch_fusion.hpp index 3d18c471017031..43cf4654628cf5 100644 --- a/src/common/transformations/include/transformations/common_optimizations/space_to_batch_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/space_to_batch_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.hpp index a4cc8329c37284..e9ecba4fe6e961 100644 --- a/src/common/transformations/include/transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/split_squeeze_concat_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/split_squeeze_concat_fusion.hpp index c4e61bca2bc906..24073c6a61e2dc 100644 --- a/src/common/transformations/include/transformations/common_optimizations/split_squeeze_concat_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/split_squeeze_concat_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/strides_optimization.hpp b/src/common/transformations/include/transformations/common_optimizations/strides_optimization.hpp index 98a08f6ae0f71b..57f5036fe5faa7 100644 --- a/src/common/transformations/include/transformations/common_optimizations/strides_optimization.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/strides_optimization.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/BackwardGraphRewrite.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/subtract_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/subtract_fusion.hpp index 120ace6843cfc4..69e4095b6becd7 100644 --- a/src/common/transformations/include/transformations/common_optimizations/subtract_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/subtract_fusion.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp index d93d84224d9ec5..a630e1998e84ca 100644 --- a/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp b/src/common/transformations/include/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp index d1c606c3fa3a00..c1299872c4b3a5 100644 --- a/src/common/transformations/include/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp b/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp index 8522f4ddba6405..8189535fe260ae 100644 --- a/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/transpose_to_reshape.hpp b/src/common/transformations/include/transformations/common_optimizations/transpose_to_reshape.hpp index f23fecda290a9a..aba6154bb0b58c 100644 --- a/src/common/transformations/include/transformations/common_optimizations/transpose_to_reshape.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/transpose_to_reshape.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/weights_dequantize_to_fake_quantize.hpp b/src/common/transformations/include/transformations/common_optimizations/weights_dequantize_to_fake_quantize.hpp index 9c433badaf7ace..aa34c7859d068a 100644 --- a/src/common/transformations/include/transformations/common_optimizations/weights_dequantize_to_fake_quantize.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/weights_dequantize_to_fake_quantize.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/common_optimizations/wrap_interpolate_into_transposes.hpp b/src/common/transformations/include/transformations/common_optimizations/wrap_interpolate_into_transposes.hpp index ffda4b72997060..7b35498d5dde64 100644 --- a/src/common/transformations/include/transformations/common_optimizations/wrap_interpolate_into_transposes.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/wrap_interpolate_into_transposes.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/control_flow/unroll_if.hpp b/src/common/transformations/include/transformations/control_flow/unroll_if.hpp index 4b16344a62c479..e59b60106e2536 100644 --- a/src/common/transformations/include/transformations/control_flow/unroll_if.hpp +++ b/src/common/transformations/include/transformations/control_flow/unroll_if.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/control_flow/unroll_tensor_iterator.hpp b/src/common/transformations/include/transformations/control_flow/unroll_tensor_iterator.hpp index c9d0a81c0bcc61..282aecab5c7f05 100644 --- a/src/common/transformations/include/transformations/control_flow/unroll_tensor_iterator.hpp +++ b/src/common/transformations/include/transformations/control_flow/unroll_tensor_iterator.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/convert_precision.hpp b/src/common/transformations/include/transformations/convert_precision.hpp index d466422950d66d..30f773da9e3be4 100644 --- a/src/common/transformations/include/transformations/convert_precision.hpp +++ b/src/common/transformations/include/transformations/convert_precision.hpp @@ -10,7 +10,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/flush_fp32_subnormals_to_zero.hpp b/src/common/transformations/include/transformations/flush_fp32_subnormals_to_zero.hpp index 54fb62c7d9cec5..71c71b0614f29d 100644 --- a/src/common/transformations/include/transformations/flush_fp32_subnormals_to_zero.hpp +++ b/src/common/transformations/include/transformations/flush_fp32_subnormals_to_zero.hpp @@ -7,7 +7,7 @@ #include #include "openvino/core/model.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "openvino/pass/serialize.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/fp16_compression/align_mixed_fp32_fp16_types.hpp b/src/common/transformations/include/transformations/fp16_compression/align_mixed_fp32_fp16_types.hpp index 4cc22ba651e7ff..4fd93d7742ab67 100644 --- a/src/common/transformations/include/transformations/fp16_compression/align_mixed_fp32_fp16_types.hpp +++ b/src/common/transformations/include/transformations/fp16_compression/align_mixed_fp32_fp16_types.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/fp16_compression/convert_compression_only_to_legacy.hpp b/src/common/transformations/include/transformations/fp16_compression/convert_compression_only_to_legacy.hpp index de7378a68fc557..fbac44f637a2a2 100644 --- a/src/common/transformations/include/transformations/fp16_compression/convert_compression_only_to_legacy.hpp +++ b/src/common/transformations/include/transformations/fp16_compression/convert_compression_only_to_legacy.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/fp16_compression/mark_decompression_convert_constant_folding.hpp b/src/common/transformations/include/transformations/fp16_compression/mark_decompression_convert_constant_folding.hpp index 7bca4a9db13baf..4f003dbc09e671 100644 --- a/src/common/transformations/include/transformations/fp16_compression/mark_decompression_convert_constant_folding.hpp +++ b/src/common/transformations/include/transformations/fp16_compression/mark_decompression_convert_constant_folding.hpp @@ -5,7 +5,7 @@ #pragma once #include "mark_decompression_convert_constant_folding.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp b/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp index 5e2448e565840f..f178292943357d 100644 --- a/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp +++ b/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/init_node_info.hpp b/src/common/transformations/include/transformations/init_node_info.hpp index cf4648f18fddc5..e458bcfdcd4bd4 100644 --- a/src/common/transformations/include/transformations/init_node_info.hpp +++ b/src/common/transformations/include/transformations/init_node_info.hpp @@ -12,7 +12,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/low_precision/mark_dequantization_subgraph.hpp b/src/common/transformations/include/transformations/low_precision/mark_dequantization_subgraph.hpp index 2d586e81389f44..832c06573caff4 100644 --- a/src/common/transformations/include/transformations/low_precision/mark_dequantization_subgraph.hpp +++ b/src/common/transformations/include/transformations/low_precision/mark_dequantization_subgraph.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/batch_norm_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/batch_norm_decomposition.hpp index 39c09c56ee2c74..9f4399804c50ff 100644 --- a/src/common/transformations/include/transformations/op_conversions/batch_norm_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/batch_norm_decomposition.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" using namespace std; diff --git a/src/common/transformations/include/transformations/op_conversions/convert_avgpool_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_avgpool_downgrade.hpp index 2d02286d5e2975..40f4e32b60af7e 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_avgpool_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_avgpool_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_batch_to_space.hpp b/src/common/transformations/include/transformations/op_conversions/convert_batch_to_space.hpp index 60ead9d3c8d392..f2792b467a96e0 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_batch_to_space.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_batch_to_space.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_broadcast3.hpp b/src/common/transformations/include/transformations/op_conversions/convert_broadcast3.hpp index ae7d8234d97651..06687b9e07ba01 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_broadcast3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_broadcast3.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_broadcast_to_tiles.hpp b/src/common/transformations/include/transformations/op_conversions/convert_broadcast_to_tiles.hpp index 3432f2f3497629..5d5934b33e8216 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_broadcast_to_tiles.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_broadcast_to_tiles.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_convertlike.hpp b/src/common/transformations/include/transformations/op_conversions/convert_convertlike.hpp index e25363468aeebd..dfe5e5e7424d90 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_convertlike.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_convertlike.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_convertpromotetypes.hpp b/src/common/transformations/include/transformations/op_conversions/convert_convertpromotetypes.hpp index 679bff353d07af..c4d95f1211bea5 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_convertpromotetypes.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_convertpromotetypes.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_deformable_conv_v8_to_v1.hpp b/src/common/transformations/include/transformations/op_conversions/convert_deformable_conv_v8_to_v1.hpp index 87597497ba50b1..7db239e18d265a 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_deformable_conv_v8_to_v1.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_deformable_conv_v8_to_v1.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_depth_to_space.hpp b/src/common/transformations/include/transformations/op_conversions/convert_depth_to_space.hpp index f7d5ade7d57b34..481006b7a05822 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_depth_to_space.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_depth_to_space.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_divide.hpp b/src/common/transformations/include/transformations/op_conversions/convert_divide.hpp index fd7d19d0415481..66442bbdc123da 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_divide.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_divide.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_offsets15_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_offsets15_downgrade.hpp index 3442f74bae40a6..6ddbff4b7991b6 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_offsets15_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_offsets15_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_packed15_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_packed15_downgrade.hpp index a440845aa8ac73..a925928a28a3d8 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_packed15_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_embedding_bag_packed15_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_gather_0d.hpp b/src/common/transformations/include/transformations/op_conversions/convert_gather_0d.hpp index c9e989ee06b583..75f9dd967d48c8 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gather_0d.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gather_0d.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_gather_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_gather_downgrade.hpp index c7d4112c60011b..dfdbed915679b2 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gather_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gather_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_gather_to_compressed.hpp b/src/common/transformations/include/transformations/op_conversions/convert_gather_to_compressed.hpp index 1cfdd2c3a867e6..a916e9a4b91a44 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gather_to_compressed.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gather_to_compressed.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_gather_upgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_gather_upgrade.hpp index a11e6089005af2..ec8f8be61c3015 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gather_upgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gather_upgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_gelu.hpp b/src/common/transformations/include/transformations/op_conversions/convert_gelu.hpp index 0eb7d40cb0e406..498872814f9cbb 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gelu.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gelu.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_gp9_to_gp_ie_internal.hpp b/src/common/transformations/include/transformations/op_conversions/convert_gp9_to_gp_ie_internal.hpp index b96f08c16f7b5a..9fe62aad7fbd8c 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gp9_to_gp_ie_internal.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gp9_to_gp_ie_internal.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_interpolate11_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_interpolate11_downgrade.hpp index e494b6fefaedbd..8c136aa918f5f0 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_interpolate11_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_interpolate11_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_interpolate1_to_interpolate4.hpp b/src/common/transformations/include/transformations/op_conversions/convert_interpolate1_to_interpolate4.hpp index 9387a49119a954..f3b07c36962ccd 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_interpolate1_to_interpolate4.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_interpolate1_to_interpolate4.hpp @@ -8,7 +8,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.hpp b/src/common/transformations/include/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.hpp index f3944376588bfe..6d414139ad6f57 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.hpp @@ -8,7 +8,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_maxpool_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_maxpool_downgrade.hpp index 6d88f091bd91d7..953cbab8a801a7 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_maxpool_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_maxpool_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_maxpool_upgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_maxpool_upgrade.hpp index 8d07db8249aa95..6e7eed21342584 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_maxpool_upgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_maxpool_upgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_minimum_to_power_and_max.hpp b/src/common/transformations/include/transformations/op_conversions/convert_minimum_to_power_and_max.hpp index 885cc2b7cd4f4f..d092ffec29d8c4 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_minimum_to_power_and_max.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_minimum_to_power_and_max.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_mod.hpp b/src/common/transformations/include/transformations/op_conversions/convert_mod.hpp index 8ebb878ae5158b..0fbd3bba723ecb 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_mod.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_mod.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.hpp b/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.hpp index 5aea3c52762102..361d2352928b7e 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_upgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_upgrade.hpp index 6dcc7b7ec2df6c..1f3e9e9b5caf08 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_upgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_multiclass_nms_upgrade.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_mvn1_to_mvn6.hpp b/src/common/transformations/include/transformations/op_conversions/convert_mvn1_to_mvn6.hpp index c5a6a9fa086968..d958d166f7270d 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_mvn1_to_mvn6.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_mvn1_to_mvn6.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_negative.hpp b/src/common/transformations/include/transformations/op_conversions/convert_negative.hpp index 183707d16d8a1e..b985f4bfe7f639 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_negative.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_negative.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_nms9_to_nms_ie_internal.hpp b/src/common/transformations/include/transformations/op_conversions/convert_nms9_to_nms_ie_internal.hpp index a43af595f2c669..fee970b6b44bfc 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_nms9_to_nms_ie_internal.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_nms9_to_nms_ie_internal.hpp @@ -8,7 +8,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_nms_rotated_to_nms_ie_internal.hpp b/src/common/transformations/include/transformations/op_conversions/convert_nms_rotated_to_nms_ie_internal.hpp index c9db50dc1a02db..dcee03e513b38e 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_nms_rotated_to_nms_ie_internal.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_nms_rotated_to_nms_ie_internal.hpp @@ -8,7 +8,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_nms_to_nms_ie_internal.hpp b/src/common/transformations/include/transformations/op_conversions/convert_nms_to_nms_ie_internal.hpp index 6fb53a31e1f397..ca205fe9078f7a 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_nms_to_nms_ie_internal.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_nms_to_nms_ie_internal.hpp @@ -8,7 +8,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_pad12_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_pad12_downgrade.hpp index 48c38344f62d5e..36ca9112b07829 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_pad12_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_pad12_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_pad_to_group_conv.hpp b/src/common/transformations/include/transformations/op_conversions/convert_pad_to_group_conv.hpp index 8886e981083e5e..a89386bd7048cb 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_pad_to_group_conv.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_pad_to_group_conv.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_5.hpp b/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_5.hpp index fb4f7c26debb80..8a4c0ee3110c1b 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_5.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_5.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_9.hpp b/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_9.hpp index 6ff66644346447..f77db7a03f8606 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_9.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_previous_nms_to_nms_9.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_prior_box_v8_to_v0.hpp b/src/common/transformations/include/transformations/op_conversions/convert_prior_box_v8_to_v0.hpp index 7111382a8c2d79..2725d789a83a70 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_prior_box_v8_to_v0.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_prior_box_v8_to_v0.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v3_to_v9.hpp b/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v3_to_v9.hpp index 8bebd0cc04838b..71f6becff0ba26 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v3_to_v9.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v3_to_v9.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v9_to_v3.hpp b/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v9_to_v3.hpp index 50b82809cf3fbf..d06dc424ff436e 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v9_to_v3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_roi_align_v9_to_v3.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_to_scatter.hpp b/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_to_scatter.hpp index 4920cfca2ef3ad..d0a738c14fab9c 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_to_scatter.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_to_scatter.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_update12_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_update12_downgrade.hpp index c8a1815cadc019..4af4e18c706e93 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_update12_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_scatter_elements_update12_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_shapeof3.hpp b/src/common/transformations/include/transformations/op_conversions/convert_shapeof3.hpp index dc513b20f7368b..0aceb9e99614fb 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_shapeof3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_shapeof3.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_shuffle_channels3.hpp b/src/common/transformations/include/transformations/op_conversions/convert_shuffle_channels3.hpp index 5d92913b3d461f..05b2d2607464b8 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_shuffle_channels3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_shuffle_channels3.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_slice_to_strided_slice.hpp b/src/common/transformations/include/transformations/op_conversions/convert_slice_to_strided_slice.hpp index 229cc6b12e95ed..8d396bca6ccd1e 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_slice_to_strided_slice.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_slice_to_strided_slice.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_softmax_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_softmax_downgrade.hpp index 22eb4830e448ed..701f2cb94e9857 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_softmax_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_softmax_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_softmax_upgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_softmax_upgrade.hpp index fc836fb138c7a1..2164eac6052384 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_softmax_upgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_softmax_upgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_space_to_batch.hpp b/src/common/transformations/include/transformations/op_conversions/convert_space_to_batch.hpp index b744394dd11c97..97bda0273c522f 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_space_to_batch.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_space_to_batch.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_space_to_depth.hpp b/src/common/transformations/include/transformations/op_conversions/convert_space_to_depth.hpp index 6d387b102ad0e9..da97add26411a8 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_space_to_depth.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_space_to_depth.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_subtract.hpp b/src/common/transformations/include/transformations/op_conversions/convert_subtract.hpp index 44a28686b9f493..5b2a5d0c36abdf 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_subtract.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_subtract.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_topk11_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/convert_topk11_downgrade.hpp index 3834ea1926c44c..e6e8340e45df94 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_topk11_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_topk11_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_topk3.hpp b/src/common/transformations/include/transformations/op_conversions/convert_topk3.hpp index 9637661fa2af25..0b61bf85bff28f 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_topk3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_topk3.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_xor_to_logical_xor.hpp b/src/common/transformations/include/transformations/op_conversions/convert_xor_to_logical_xor.hpp index 55575c2760127b..ee7bf0f55615bd 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_xor_to_logical_xor.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_xor_to_logical_xor.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/detection_output_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/detection_output_downgrade.hpp index a45d765d0d2323..8f4e6ad237a6b0 100644 --- a/src/common/transformations/include/transformations/op_conversions/detection_output_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/detection_output_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/detection_output_upgrade.hpp b/src/common/transformations/include/transformations/op_conversions/detection_output_upgrade.hpp index 9fe750025f3f6f..8693fb206ed2cd 100644 --- a/src/common/transformations/include/transformations/op_conversions/detection_output_upgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/detection_output_upgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/einsum_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/einsum_decomposition.hpp index e58f5e647e360c..78accf3f0b4877 100644 --- a/src/common/transformations/include/transformations/op_conversions/einsum_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/einsum_decomposition.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/eye_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/eye_decomposition.hpp index 1e2768083b923e..15c53bc9cf6f30 100644 --- a/src/common/transformations/include/transformations/op_conversions/eye_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/eye_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/fq_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/fq_decomposition.hpp index 8881e8649d9a78..d938a9b70687e2 100644 --- a/src/common/transformations/include/transformations/op_conversions/fq_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/fq_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/gelu7_downgrade.hpp b/src/common/transformations/include/transformations/op_conversions/gelu7_downgrade.hpp index 48f24dd1920eec..d08c3877de26a1 100644 --- a/src/common/transformations/include/transformations/op_conversions/gelu7_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/gelu7_downgrade.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/group_normalization_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/group_normalization_decomposition.hpp index 2717cafaa6e522..8df9c220a9de75 100644 --- a/src/common/transformations/include/transformations/op_conversions/group_normalization_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/group_normalization_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/gru_cell_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/gru_cell_decomposition.hpp index b46d74082c9657..ce4387293f97ad 100644 --- a/src/common/transformations/include/transformations/op_conversions/gru_cell_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/gru_cell_decomposition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/hard_sigmoid_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/hard_sigmoid_decomposition.hpp index b4b20b7c681e46..b635a08350922b 100644 --- a/src/common/transformations/include/transformations/op_conversions/hard_sigmoid_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/hard_sigmoid_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/hsigmoid_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/hsigmoid_decomposition.hpp index b3c4a899d0c89c..5a455c37253afe 100644 --- a/src/common/transformations/include/transformations/op_conversions/hsigmoid_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/hsigmoid_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/hswish_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/hswish_decomposition.hpp index c7e2c884c0f42c..e6168109d3c89b 100644 --- a/src/common/transformations/include/transformations/op_conversions/hswish_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/hswish_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/log_softmax_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/log_softmax_decomposition.hpp index 8c96ab2c532ae3..f972a0cdd8fa76 100644 --- a/src/common/transformations/include/transformations/op_conversions/log_softmax_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/log_softmax_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/lstm_cell_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/lstm_cell_decomposition.hpp index 41a449aa8153ee..08b109533738cf 100644 --- a/src/common/transformations/include/transformations/op_conversions/lstm_cell_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/lstm_cell_decomposition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/mvn6_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/mvn6_decomposition.hpp index 61794ffe725f0a..f8335f5f4546f2 100644 --- a/src/common/transformations/include/transformations/op_conversions/mvn6_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/mvn6_decomposition.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/normalize_l2_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/normalize_l2_decomposition.hpp index 2cb9fe7762f77f..ae058a3e8cba2f 100644 --- a/src/common/transformations/include/transformations/op_conversions/normalize_l2_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/normalize_l2_decomposition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/reduce_l1_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/reduce_l1_decomposition.hpp index addad16c616aaf..506853e003e33a 100644 --- a/src/common/transformations/include/transformations/op_conversions/reduce_l1_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/reduce_l1_decomposition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/reduce_l2_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/reduce_l2_decomposition.hpp index 7251a4986239dc..dab02ff58f2f5c 100644 --- a/src/common/transformations/include/transformations/op_conversions/reduce_l2_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/reduce_l2_decomposition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/rnn_cell_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/rnn_cell_decomposition.hpp index 953c0db0b2d44d..ce651a47510577 100644 --- a/src/common/transformations/include/transformations/op_conversions/rnn_cell_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/rnn_cell_decomposition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/scaled_dot_product_attention_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/scaled_dot_product_attention_decomposition.hpp index fea81b63d6406b..e52c6ba46838b9 100644 --- a/src/common/transformations/include/transformations/op_conversions/scaled_dot_product_attention_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/scaled_dot_product_attention_decomposition.hpp @@ -5,7 +5,7 @@ #pragma once #include "openvino/op/scaled_dot_product_attention.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.hpp b/src/common/transformations/include/transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.hpp index 98bfe0867110d0..70cd9bbe0162c5 100644 --- a/src/common/transformations/include/transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.hpp +++ b/src/common/transformations/include/transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/softmax_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/softmax_decomposition.hpp index aa644395d45b92..a1ab4be69fdc62 100644 --- a/src/common/transformations/include/transformations/op_conversions/softmax_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/softmax_decomposition.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/softplus_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/softplus_decomposition.hpp index 0ca572addec6d4..3a7cca9ff5c8b1 100644 --- a/src/common/transformations/include/transformations/op_conversions/softplus_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/softplus_decomposition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/softsign_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/softsign_decomposition.hpp index 57e1acc5b9556c..bfd026f21eb111 100644 --- a/src/common/transformations/include/transformations/op_conversions/softsign_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/softsign_decomposition.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/op_conversions/unique_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/unique_decomposition.hpp index f7138c3c25bb46..02f889e7d3122a 100644 --- a/src/common/transformations/include/transformations/op_conversions/unique_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/unique_decomposition.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/opset_conversions/convert_opset2_to_opset1.hpp b/src/common/transformations/include/transformations/opset_conversions/convert_opset2_to_opset1.hpp index 77dba423bfe06b..8b523bc663912d 100644 --- a/src/common/transformations/include/transformations/opset_conversions/convert_opset2_to_opset1.hpp +++ b/src/common/transformations/include/transformations/opset_conversions/convert_opset2_to_opset1.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/opset_conversions/convert_opset3_to_opset2.hpp b/src/common/transformations/include/transformations/opset_conversions/convert_opset3_to_opset2.hpp index 0bf6499c0dc0b2..8a44b0d24ad6e4 100644 --- a/src/common/transformations/include/transformations/opset_conversions/convert_opset3_to_opset2.hpp +++ b/src/common/transformations/include/transformations/opset_conversions/convert_opset3_to_opset2.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/sdpa_to_paged_attention/position_ids_replacer.hpp b/src/common/transformations/include/transformations/sdpa_to_paged_attention/position_ids_replacer.hpp index 16bb4a139fd9c1..5ee79ec787a9bc 100644 --- a/src/common/transformations/include/transformations/sdpa_to_paged_attention/position_ids_replacer.hpp +++ b/src/common/transformations/include/transformations/sdpa_to_paged_attention/position_ids_replacer.hpp @@ -6,7 +6,7 @@ #include "openvino/op/add.hpp" #include "openvino/op/parameter.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/sdpa_to_paged_attention/prev_sequence_length_pattern.hpp b/src/common/transformations/include/transformations/sdpa_to_paged_attention/prev_sequence_length_pattern.hpp index c35548417bfcdf..fd4e22c69262ae 100644 --- a/src/common/transformations/include/transformations/sdpa_to_paged_attention/prev_sequence_length_pattern.hpp +++ b/src/common/transformations/include/transformations/sdpa_to_paged_attention/prev_sequence_length_pattern.hpp @@ -7,7 +7,7 @@ #include "openvino/cc/pass/itt.hpp" #include "openvino/op/shape_of.hpp" #include "openvino/op/subtract.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/sdpa_to_paged_attention/state_management_pattern.hpp b/src/common/transformations/include/transformations/sdpa_to_paged_attention/state_management_pattern.hpp index e6fe7e9a9f0237..feab06ccc0cd5d 100644 --- a/src/common/transformations/include/transformations/sdpa_to_paged_attention/state_management_pattern.hpp +++ b/src/common/transformations/include/transformations/sdpa_to_paged_attention/state_management_pattern.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/sdpa_to_paged_attention/total_sequence_length_pattern.hpp b/src/common/transformations/include/transformations/sdpa_to_paged_attention/total_sequence_length_pattern.hpp index 1df9f1995d9379..c6b319a389ecaa 100644 --- a/src/common/transformations/include/transformations/sdpa_to_paged_attention/total_sequence_length_pattern.hpp +++ b/src/common/transformations/include/transformations/sdpa_to_paged_attention/total_sequence_length_pattern.hpp @@ -6,7 +6,7 @@ #include "openvino/op/concat.hpp" #include "openvino/op/parameter.hpp" -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/smart_reshape/broadcast_const_range_replacement.hpp b/src/common/transformations/include/transformations/smart_reshape/broadcast_const_range_replacement.hpp index 3d261102a3f92a..04f7de9a336414 100644 --- a/src/common/transformations/include/transformations/smart_reshape/broadcast_const_range_replacement.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/broadcast_const_range_replacement.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/lstm_states_broadcast.hpp b/src/common/transformations/include/transformations/smart_reshape/lstm_states_broadcast.hpp index 2925a34b8696df..55f80ace7812e3 100644 --- a/src/common/transformations/include/transformations/smart_reshape/lstm_states_broadcast.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/lstm_states_broadcast.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/matmul_sr.hpp b/src/common/transformations/include/transformations/smart_reshape/matmul_sr.hpp index d1c236e6b69d88..4e21e767d1bce6 100644 --- a/src/common/transformations/include/transformations/smart_reshape/matmul_sr.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/matmul_sr.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/proposal_scales_stridedslice.hpp b/src/common/transformations/include/transformations/smart_reshape/proposal_scales_stridedslice.hpp index 2784113cd2b9aa..d2eaf125e0dd5c 100644 --- a/src/common/transformations/include/transformations/smart_reshape/proposal_scales_stridedslice.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/proposal_scales_stridedslice.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/reshape_sinking.hpp b/src/common/transformations/include/transformations/smart_reshape/reshape_sinking.hpp index 6f5b33f598cbec..aeaf46ccde1c2b 100644 --- a/src/common/transformations/include/transformations/smart_reshape/reshape_sinking.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/reshape_sinking.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/reshape_to_1D.hpp b/src/common/transformations/include/transformations/smart_reshape/reshape_to_1D.hpp index 39e134c36ae92e..a973038bb30900 100644 --- a/src/common/transformations/include/transformations/smart_reshape/reshape_to_1D.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/reshape_to_1D.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/shape_of_const_folding.hpp b/src/common/transformations/include/transformations/smart_reshape/shape_of_const_folding.hpp index 76d72d92f4c6e5..d2bc029cce4682 100644 --- a/src/common/transformations/include/transformations/smart_reshape/shape_of_const_folding.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/shape_of_const_folding.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/smart_reshape.hpp b/src/common/transformations/include/transformations/smart_reshape/smart_reshape.hpp index 6aa354a5fa15ca..55bdf523762d91 100644 --- a/src/common/transformations/include/transformations/smart_reshape/smart_reshape.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/smart_reshape.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/strided_slice_squeeze.hpp b/src/common/transformations/include/transformations/smart_reshape/strided_slice_squeeze.hpp index 0e2f88c7f13715..f34b6d25a27e49 100644 --- a/src/common/transformations/include/transformations/smart_reshape/strided_slice_squeeze.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/strided_slice_squeeze.hpp @@ -7,7 +7,7 @@ #include #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/symbolic_transformations/chained_maximum.hpp b/src/common/transformations/include/transformations/symbolic_transformations/chained_maximum.hpp index 133cb07789917a..c7cb03afd5ade4 100644 --- a/src/common/transformations/include/transformations/symbolic_transformations/chained_maximum.hpp +++ b/src/common/transformations/include/transformations/symbolic_transformations/chained_maximum.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/symbolic_transformations/dereshape_matmul.hpp b/src/common/transformations/include/transformations/symbolic_transformations/dereshape_matmul.hpp index c9a40c0f4e15fb..fa1c844faa7129 100644 --- a/src/common/transformations/include/transformations/symbolic_transformations/dereshape_matmul.hpp +++ b/src/common/transformations/include/transformations/symbolic_transformations/dereshape_matmul.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/symbolic_transformations/nop_broadcast.hpp b/src/common/transformations/include/transformations/symbolic_transformations/nop_broadcast.hpp index 42aa7c1b6b3dc5..5a12b5735ce428 100644 --- a/src/common/transformations/include/transformations/symbolic_transformations/nop_broadcast.hpp +++ b/src/common/transformations/include/transformations/symbolic_transformations/nop_broadcast.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/symbolic_transformations/reshape_optimizations.hpp b/src/common/transformations/include/transformations/symbolic_transformations/reshape_optimizations.hpp index 0d98e1ba080fe6..5d84d83bad2de5 100644 --- a/src/common/transformations/include/transformations/symbolic_transformations/reshape_optimizations.hpp +++ b/src/common/transformations/include/transformations/symbolic_transformations/reshape_optimizations.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_base.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_base.hpp index 58254481d60ba6..013799e854df8f 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_base.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_base.hpp @@ -6,7 +6,7 @@ #include -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/transpose_sinking/ts_utils.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_binary.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_binary.hpp index 0f9d8c91ffad40..9534380d51253e 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_binary.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_binary.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_concat.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_concat.hpp index 4f06f15ce622c7..cc0ccc2c194dbf 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_concat.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_concat.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_cumsum.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_cumsum.hpp index 4e8cf401c2f36d..185bea0105ec4d 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_cumsum.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_cumsum.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_data_movement.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_data_movement.hpp index 85d43f500e7f82..9775e57d61146b 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_data_movement.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_data_movement.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_fuse.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_fuse.hpp index bc579088e278bd..974e7accc4d808 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_fuse.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_fuse.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_gather.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_gather.hpp index 434e331176f59e..5bc7cea340cb72 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_gather.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_gather.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_interpolate.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_interpolate.hpp index 7ad24240d8fd64..dfdd062e1f7ce3 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_interpolate.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_interpolate.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_reduction.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_reduction.hpp index 675ae6bd1986f0..a983519a3012d6 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_reduction.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_reduction.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_reset_no_sinking_attribute.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_reset_no_sinking_attribute.hpp index c03f009e7ef8fd..240c6e8342c069 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_reset_no_sinking_attribute.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_reset_no_sinking_attribute.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_slice.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_slice.hpp index 0fbb8ffd34933f..5e10a7f0e8a930 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_slice.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_slice.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_squeeze.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_squeeze.hpp index 94a5ab6471f9b3..752e040ab52cab 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_squeeze.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_squeeze.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_unary.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_unary.hpp index d897ce77274408..c8148e912b30c0 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_unary.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_unary.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/transpose_sinking/ts_unsqueeze.hpp b/src/common/transformations/include/transformations/transpose_sinking/ts_unsqueeze.hpp index 3a32837471e253..1ee195624cb801 100644 --- a/src/common/transformations/include/transformations/transpose_sinking/ts_unsqueeze.hpp +++ b/src/common/transformations/include/transformations/transpose_sinking/ts_unsqueeze.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations/transpose_sinking/ts_base.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp index 6e44692b5f169c..405dfcc3a28c3f 100644 --- a/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp @@ -29,6 +29,7 @@ #include "openvino/pass/pattern/op/wrap_type.hpp" #include "openvino/util/log.hpp" #include "transformations/utils/utils.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" namespace ov { namespace pass { diff --git a/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp b/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp index 769fa3c72870e9..ffa5bbf12f8640 100644 --- a/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp +++ b/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp @@ -51,6 +51,7 @@ #include "transformations/convert_precision.hpp" #include "transformations/rt_info/disable_fp16_compression.hpp" #include "transformations/utils/utils.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" using namespace std; diff --git a/src/core/include/openvino/pass/GraphRewrite.hpp b/src/core/include/openvino/pass/GraphRewrite.hpp deleted file mode 100644 index d848ce5ea1cc60..00000000000000 --- a/src/core/include/openvino/pass/GraphRewrite.hpp +++ /dev/null @@ -1,137 +0,0 @@ -// Copyright (C) 2018-2024 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#include -#include -#include - -#include "openvino/pass/pass.hpp" -#include "openvino/pass/pattern/matcher.hpp" -#include "openvino/pass/MatcherPass.hpp" - -namespace ov { -using matcher_pass_callback = std::function; -using graph_rewrite_callback = std::function; -using handler_callback = std::function& node)>; -namespace pass { -/// \brief GraphRewrite is a container for MatcherPasses that allows to run them on Function -/// in -/// efficient way -/// -/// Graph rewrite pass is used for matcher passes execution on Function. -/// To register MatcherPass use \sa add_matcher(args) method where T is a MatcherPass -/// class. -/// As a default algorithm graph rewrite pass traverse Function in topological order and -/// applies -/// registered matcher passes for each node. But if all registered matcher passes have type -/// based -/// root node in Matcher pattern then efficient mechanism is used to execute them. -/// Matcher pattern root is type based if it's operation from opset or -/// pattern::op::WrapType. -/// Note: when implementing pattern for Matcher make sure that root node is an operation -/// from opset -/// or has ov::pattern::op::WrapType. That will help GraphRewrite to execute matcher -/// passes more -/// efficient. -/// \ingroup ov_pass_cpp_api -class OPENVINO_API GraphRewrite : public ModelPass { -public: - OPENVINO_RTTI("ov::pass::GraphRewrite"); - - GraphRewrite() = default; - - explicit GraphRewrite(const std::shared_ptr& pass) : ModelPass() { - m_matchers.push_back(pass); - } - - /// \brief Register given transformation class type to GraphRewrite execution list - /// All registered transformations will be executed in a single graph traversal. - /// Example below show the basic usage of pass::GraphRewrite - /// - /// pass::Manager manager; - /// auto anchor = manager.register_pass(); - /// anchor->add_matcher(); - /// anchor->add_matcher(); - /// anchor->set_name("CommonMatchers"); - /// manager.run_passes(f); - /// - /// For some purposes transformation can be registered and disabled by default. - /// - /// anchor->add_matcher(); - /// - /// \return shared_ptr to the transformation instance - template ::value, bool>::type = true> - std::shared_ptr add_matcher(Args&&... args) { - static_assert(std::is_base_of::value, "pass not derived from MatcherPass"); - auto pass = std::make_shared(std::forward(args)...); - auto pass_config = get_pass_config(); - pass->set_pass_config(pass_config); - if (!Enabled && !pass_config->is_enabled()) { - pass_config->disable(); - } - m_matchers.push_back(pass); - return pass; - } - - /// \brief Register passes from GraphRewrite class that contains sequence of matcher - /// passes registered in its ctor. - /// For example: - /// - /// class ov::pass::LinFusions: public ov::pass::GraphRewrite { - /// public: - /// OPENVINO_RTTI("LinFusion"); - /// Fusions() { - /// add_matcher(); - /// add_matcher(); - /// } - /// }; - /// - /// pass::Manager manager; - /// auto anchor = manager.register_pass(); - /// anchor->add_matcher(); - /// anchor->add_matcher(); - /// anchor->set_name("CommonFusions"); - /// manager.run_passes(f); - /// - /// In this case all matcher passes from LinFusions pass will be united with other - /// registered matchers. - template ::value, bool>::type = true> - void add_matcher(Args&&... args) { - static_assert(std::is_base_of::value, "pass not derived from GraphRewrite"); - auto pass = std::make_shared(std::forward(args)...); - auto pass_config = get_pass_config(); - - for (auto& matcher : pass->m_matchers) { - pass->set_pass_config(pass_config); - m_matchers.push_back(matcher); - } - } - - std::shared_ptr add_matcher(const std::shared_ptr& pass) { - auto pass_config = get_pass_config(); - pass->set_pass_config(pass_config); - m_matchers.push_back(pass); - return pass; - } - - bool run_on_model(const std::shared_ptr& m) override; - - void set_pass_config(const std::shared_ptr& pass_config) override; - -protected: - bool apply_matcher_passes(std::shared_ptr f, std::deque> nodes_to_run); - - bool m_enable_shape_inference = false; - - std::vector> m_matchers; -}; -} // namespace pass -} // namespace ov diff --git a/src/core/include/openvino/pass/BackwardGraphRewrite.hpp b/src/core/include/openvino/pass/backward_graph_rewrite.hpp similarity index 61% rename from src/core/include/openvino/pass/BackwardGraphRewrite.hpp rename to src/core/include/openvino/pass/backward_graph_rewrite.hpp index bae03b2549f36c..7e0fc7cb1f5fe3 100644 --- a/src/core/include/openvino/pass/BackwardGraphRewrite.hpp +++ b/src/core/include/openvino/pass/backward_graph_rewrite.hpp @@ -5,13 +5,9 @@ #include #include "openvino/pass/pass.hpp" -#include "openvino/pass/pattern/matcher.hpp" -#include "openvino/pass/GraphRewrite.hpp" +#include "openvino/pass/graph_rewrite.hpp" namespace ov { -using matcher_pass_callback = std::function; -using graph_rewrite_callback = std::function; -using handler_callback = std::function& node)>; namespace pass { class OPENVINO_API BackwardGraphRewrite : public GraphRewrite { public: diff --git a/src/core/include/openvino/pass/convert_fp32_to_fp16.hpp b/src/core/include/openvino/pass/convert_fp32_to_fp16.hpp index e7d1afe700b46a..ae9bb25efb4a87 100644 --- a/src/core/include/openvino/pass/convert_fp32_to_fp16.hpp +++ b/src/core/include/openvino/pass/convert_fp32_to_fp16.hpp @@ -4,7 +4,7 @@ #pragma once -#include "openvino/pass/MatcherPass.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace pass { diff --git a/src/core/include/openvino/pass/graph_rewrite.hpp b/src/core/include/openvino/pass/graph_rewrite.hpp index 993cba1c31de45..23483c10124fab 100644 --- a/src/core/include/openvino/pass/graph_rewrite.hpp +++ b/src/core/include/openvino/pass/graph_rewrite.hpp @@ -9,151 +9,10 @@ #include #include "openvino/pass/pass.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/matcher_pass.hpp" -#include "openvino/pass/BackwardGraphRewrite.hpp" -/*/ namespace ov { -using matcher_pass_callback = std::function; -using graph_rewrite_callback = std::function; -using handler_callback = std::function& node)>; - namespace pass { -/// \brief Register openvino node pointers into container. -/// Can create and/or add existing node pointers into register -class NodeRegistry { -public: - /// \brief Make new node and add it to register. - /// - /// \tparam T Node type. - /// \tparam Args Node ctor args types. - /// - /// \param args New node ctor arguments. - /// \return Shared pointer to node of type T. - template - std::shared_ptr make(Args&&... args) { - auto node = std::make_shared(std::forward(args)...); - return add(node); - } - - /// \brief Add node to register - /// - /// \tparam T Node type. - /// - /// \param node Node to add - /// - /// \return Shared pointer to new node added of type T. - template - std::shared_ptr add(const std::shared_ptr& node) { - m_nodes.push_back(node); - return node; - } - - /// \brief Get nodes container. - /// - /// \return Const reference to nodes container. - const std::vector>& get() const { - return m_nodes; - } - - /// \brief Clear register. - void clear() { - m_nodes.clear(); - } - -private: - std::vector> m_nodes; //!< Stores added nodes. -}; - -/// \brief MatcherPass is a basic block for pattern based transformations. It describes -/// pattern and -/// action that is applied if pattern is matched. -/// -/// MatcherPass consists of Matcher and matcher_pass_callback that needs to be implemented -/// and -/// finally registered by using \sa register_matcher. MatcherPass can be executed on node -/// within -/// \sa apply method. To run matcher pass on Function use GraphRewrite. -/// In addition MatcherPass provides a way for adding new operations into GraphRewrite -/// execution -/// queue. That means that operations that were created inside transformation callback can -/// be added -/// for matching. To register node use \sa register_new_node method. GraphRewrite -/// automatically -/// takes registered nodes and put them to execution queue. If multiple nodes were register -/// make -/// sure that they were registered in topological order. -/// Note: when implementing pattern for Matcher make sure that root node is an operation -/// from opset -/// or has ov::pass::pattern::op::WrapType. That will help GraphRewrite to execute matcher -/// passes more -/// efficient. -/// \ingroup ov_pass_cpp_api -class OPENVINO_API MatcherPass : public PassBase { -public: - OPENVINO_RTTI("ov::pass::MatcherPass"); - - MatcherPass() = default; - - MatcherPass(const MatcherPass&) = delete; - MatcherPass& operator=(const MatcherPass&) = delete; - - explicit MatcherPass(const std::string& name, - const std::shared_ptr& m, - const handler_callback& handler, - const PassPropertyMask& property = PassProperty::CHANGE_DYNAMIC_STATE) - : PassBase(), - m_handler(handler), - m_matcher(m) { - set_name(name); - set_property(property, true); - } - - MatcherPass(const std::shared_ptr& m, const matcher_pass_callback& callback) : PassBase() { - register_matcher(m, callback); - } - - bool apply(std::shared_ptr node); - - template - std::shared_ptr register_new_node(Args&&... args) { - return m_new_nodes.make(std::forward(args)...); - } - - template - std::shared_ptr register_new_node(const std::shared_ptr& node) { - return m_new_nodes.add(node); - } - - std::shared_ptr register_new_node_(const std::shared_ptr& node) { - return register_new_node(node); - } - - const std::vector>& get_new_nodes() { - return m_new_nodes.get(); - } - - void clear_new_nodes() { - m_new_nodes.clear(); - } - - std::shared_ptr get_matcher() { - return m_matcher; - } - -protected: - void register_matcher(const std::shared_ptr& m, - const matcher_pass_callback& callback, - const PassPropertyMask& property); - - void register_matcher(const std::shared_ptr& m, const matcher_pass_callback& callback); - -private: - handler_callback m_handler; - std::shared_ptr m_matcher; - NodeRegistry m_new_nodes; -}; - /// \brief GraphRewrite is a container for MatcherPasses that allows to run them on Function /// in /// efficient way @@ -252,12 +111,7 @@ class OPENVINO_API GraphRewrite : public ModelPass { } } - std::shared_ptr add_matcher(const std::shared_ptr& pass) { - auto pass_config = get_pass_config(); - pass->set_pass_config(pass_config); - m_matchers.push_back(pass); - return pass; - } + std::shared_ptr add_matcher(const std::shared_ptr& pass); bool run_on_model(const std::shared_ptr& m) override; @@ -270,17 +124,5 @@ class OPENVINO_API GraphRewrite : public ModelPass { std::vector> m_matchers; }; - -class OPENVINO_API BackwardGraphRewrite : public GraphRewrite { -public: - OPENVINO_RTTI("ov::pass::BackwardGraphRewrite"); - - BackwardGraphRewrite() = default; - - explicit BackwardGraphRewrite(const std::shared_ptr& pass) : GraphRewrite(pass) {} - - bool run_on_model(const std::shared_ptr& m) override; -}; } // namespace pass } // namespace ov -*/ \ No newline at end of file diff --git a/src/core/include/openvino/pass/MatcherPass.hpp b/src/core/include/openvino/pass/matcher_pass.hpp similarity index 98% rename from src/core/include/openvino/pass/MatcherPass.hpp rename to src/core/include/openvino/pass/matcher_pass.hpp index 8b2f02842a9b58..09d1afe931eb43 100644 --- a/src/core/include/openvino/pass/MatcherPass.hpp +++ b/src/core/include/openvino/pass/matcher_pass.hpp @@ -10,7 +10,7 @@ #include "openvino/pass/pass.hpp" #include "openvino/pass/pattern/matcher.hpp" -#include "openvino/pass/NodeRegistry.hpp" +#include "openvino/pass/node_registry.hpp" namespace ov { using matcher_pass_callback = std::function; diff --git a/src/core/include/openvino/pass/NodeRegistry.hpp b/src/core/include/openvino/pass/node_registry.hpp similarity index 94% rename from src/core/include/openvino/pass/NodeRegistry.hpp rename to src/core/include/openvino/pass/node_registry.hpp index cbbb2f05158fea..f0cdb4b228c613 100644 --- a/src/core/include/openvino/pass/NodeRegistry.hpp +++ b/src/core/include/openvino/pass/node_registry.hpp @@ -4,7 +4,7 @@ #include #include -#include "openvino/pass/pass.hpp" +#include "openvino/core/node.hpp" #include "openvino/pass/pattern/matcher.hpp" namespace ov { @@ -47,9 +47,7 @@ class NodeRegistry { } /// \brief Clear register. - void clear() { - m_nodes.clear(); - } + void clear(); private: std::vector> m_nodes; //!< Stores added nodes. diff --git a/src/core/src/pass/graph_rewrite.cpp b/src/core/src/pass/graph_rewrite.cpp index 24353a56bf746a..8a0edfde5dead7 100644 --- a/src/core/src/pass/graph_rewrite.cpp +++ b/src/core/src/pass/graph_rewrite.cpp @@ -3,6 +3,7 @@ // #include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" #include #include @@ -64,6 +65,12 @@ PerfCounters& perf_counters_graph_rewrite() { } // namespace ov #endif // ENABLE_PROFILING_ITT +std::shared_ptr ov::pass::GraphRewrite::add_matcher(const std::shared_ptr& pass) { + auto pass_config = get_pass_config(); + pass->set_pass_config(pass_config); + m_matchers.push_back(pass); + return pass; +} bool ov::pass::BackwardGraphRewrite::run_on_model(const std::shared_ptr& f) { RUN_ON_MODEL_SCOPE(BackwardGraphRewrite); diff --git a/src/core/src/pass/node_registry.cpp b/src/core/src/pass/node_registry.cpp new file mode 100644 index 00000000000000..67b719a3b4c5e5 --- /dev/null +++ b/src/core/src/pass/node_registry.cpp @@ -0,0 +1,9 @@ +// Copyright (C) 2018-2024 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "openvino/pass/node_registry.hpp" + +void ov::pass::NodeRegistry::clear() { + m_nodes.clear(); +} diff --git a/src/core/tests/graph_rewrite.cpp b/src/core/tests/graph_rewrite.cpp index 02369738741dcc..8a4a9e70bd6109 100644 --- a/src/core/tests/graph_rewrite.cpp +++ b/src/core/tests/graph_rewrite.cpp @@ -3,6 +3,7 @@ // #include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" #include From dfdce52ffc35f21da8c5860acca657c86b03b3a9 Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Thu, 22 Aug 2024 05:05:42 +0400 Subject: [PATCH 07/16] code style --- src/core/include/openvino/pass/graph_rewrite.hpp | 1 - src/core/include/openvino/pass/matcher_pass.hpp | 1 - 2 files changed, 2 deletions(-) diff --git a/src/core/include/openvino/pass/graph_rewrite.hpp b/src/core/include/openvino/pass/graph_rewrite.hpp index 23483c10124fab..3fd801235c31a2 100644 --- a/src/core/include/openvino/pass/graph_rewrite.hpp +++ b/src/core/include/openvino/pass/graph_rewrite.hpp @@ -8,7 +8,6 @@ #include #include -#include "openvino/pass/pass.hpp" #include "openvino/pass/matcher_pass.hpp" namespace ov { diff --git a/src/core/include/openvino/pass/matcher_pass.hpp b/src/core/include/openvino/pass/matcher_pass.hpp index 09d1afe931eb43..7bfaf514286ffb 100644 --- a/src/core/include/openvino/pass/matcher_pass.hpp +++ b/src/core/include/openvino/pass/matcher_pass.hpp @@ -8,7 +8,6 @@ #include #include -#include "openvino/pass/pass.hpp" #include "openvino/pass/pattern/matcher.hpp" #include "openvino/pass/node_registry.hpp" From c58435c7209ec5fd891edb5f4143ed56241eda72 Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Thu, 22 Aug 2024 06:30:32 +0400 Subject: [PATCH 08/16] code style --- .../common_optimizations/disable_shapeof_constant_folding.hpp | 1 + .../transformations/common_optimizations/moc_transformations.hpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp b/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp index acc14586d4c3b3..1526fea966347d 100644 --- a/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp @@ -5,6 +5,7 @@ #pragma once #include + #include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp b/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp index 3e8538ed26830a..49893dfb220de6 100644 --- a/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp @@ -5,6 +5,7 @@ #pragma once #include + #include "openvino/pass/pass.hpp" #include "transformations_visibility.hpp" From 37e7f4222a1215a99ba15b69843f6431ac4fdf99 Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Thu, 22 Aug 2024 06:44:05 +0400 Subject: [PATCH 09/16] code style --- .../python/src/pyopenvino/graph/passes/graph_rewrite.cpp | 4 ++-- .../transformations/common_optimizations/rms_fusion.hpp | 2 +- .../src/transformations/common_optimizations/ric_fusion.cpp | 2 +- src/core/src/pass/graph_rewrite.cpp | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/bindings/python/src/pyopenvino/graph/passes/graph_rewrite.cpp b/src/bindings/python/src/pyopenvino/graph/passes/graph_rewrite.cpp index caca29a10dcc6d..3ebbe2bb10c1a2 100644 --- a/src/bindings/python/src/pyopenvino/graph/passes/graph_rewrite.cpp +++ b/src/bindings/python/src/pyopenvino/graph/passes/graph_rewrite.cpp @@ -3,13 +3,13 @@ // #include "pyopenvino/graph/passes/graph_rewrite.hpp" -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/backward_graph_rewrite.hpp" #include #include #include +#include +#include #include "pyopenvino/core/common.hpp" diff --git a/src/common/transformations/include/transformations/common_optimizations/rms_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/rms_fusion.hpp index d528fb344578a3..5d4d5609367ff1 100644 --- a/src/common/transformations/include/transformations/common_optimizations/rms_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/rms_fusion.hpp @@ -4,8 +4,8 @@ #pragma once -#include "openvino/pass/matcher_pass.hpp" #include "openvino/pass/manager.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp index 405dfcc3a28c3f..56cfc5dbd44530 100644 --- a/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp @@ -28,8 +28,8 @@ #include "openvino/pass/pattern/op/or.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "openvino/util/log.hpp" -#include "transformations/utils/utils.hpp" #include "openvino/pass/backward_graph_rewrite.hpp" +#include "transformations/utils/utils.hpp" namespace ov { namespace pass { diff --git a/src/core/src/pass/graph_rewrite.cpp b/src/core/src/pass/graph_rewrite.cpp index 8a0edfde5dead7..bffb4bef0f57fa 100644 --- a/src/core/src/pass/graph_rewrite.cpp +++ b/src/core/src/pass/graph_rewrite.cpp @@ -3,7 +3,6 @@ // #include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/backward_graph_rewrite.hpp" #include #include @@ -17,6 +16,7 @@ #include "openvino/op/util/multi_subgraph_base.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "openvino/util/log.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" #include "perf_counters.hpp" /* GraphRewrite algorithm: @@ -65,7 +65,8 @@ PerfCounters& perf_counters_graph_rewrite() { } // namespace ov #endif // ENABLE_PROFILING_ITT -std::shared_ptr ov::pass::GraphRewrite::add_matcher(const std::shared_ptr& pass) { +std::shared_ptr ov::pass::GraphRewrite::add_matcher( + const std::shared_ptr& pass) { auto pass_config = get_pass_config(); pass->set_pass_config(pass_config); m_matchers.push_back(pass); From b500c13a3d9833f9a3e7dfe32a2d556a25d13371 Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Thu, 22 Aug 2024 06:52:50 +0400 Subject: [PATCH 10/16] code style --- .../python/src/pyopenvino/graph/passes/graph_rewrite.cpp | 3 --- .../src/transformations/common_optimizations/ric_fusion.cpp | 2 +- src/core/include/openvino/pass/backward_graph_rewrite.hpp | 2 +- src/core/include/openvino/pass/matcher_pass.hpp | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/bindings/python/src/pyopenvino/graph/passes/graph_rewrite.cpp b/src/bindings/python/src/pyopenvino/graph/passes/graph_rewrite.cpp index 3ebbe2bb10c1a2..031a188b74c6d7 100644 --- a/src/bindings/python/src/pyopenvino/graph/passes/graph_rewrite.cpp +++ b/src/bindings/python/src/pyopenvino/graph/passes/graph_rewrite.cpp @@ -6,9 +6,6 @@ #include -#include -#include -#include #include #include "pyopenvino/core/common.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp index 56cfc5dbd44530..3da64b58734d14 100644 --- a/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp @@ -27,8 +27,8 @@ #include "openvino/pass/manager.hpp" #include "openvino/pass/pattern/op/or.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" -#include "openvino/util/log.hpp" #include "openvino/pass/backward_graph_rewrite.hpp" +#include "openvino/util/log.hpp" #include "transformations/utils/utils.hpp" namespace ov { diff --git a/src/core/include/openvino/pass/backward_graph_rewrite.hpp b/src/core/include/openvino/pass/backward_graph_rewrite.hpp index 7e0fc7cb1f5fe3..7e7f6f118efe8d 100644 --- a/src/core/include/openvino/pass/backward_graph_rewrite.hpp +++ b/src/core/include/openvino/pass/backward_graph_rewrite.hpp @@ -4,8 +4,8 @@ #include #include -#include "openvino/pass/pass.hpp" #include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pass.hpp" namespace ov { namespace pass { diff --git a/src/core/include/openvino/pass/matcher_pass.hpp b/src/core/include/openvino/pass/matcher_pass.hpp index 7bfaf514286ffb..b17237fdf08340 100644 --- a/src/core/include/openvino/pass/matcher_pass.hpp +++ b/src/core/include/openvino/pass/matcher_pass.hpp @@ -8,7 +8,6 @@ #include #include -#include "openvino/pass/pattern/matcher.hpp" #include "openvino/pass/node_registry.hpp" namespace ov { From 9869f36f246ab427257520a446fa7ed012048055 Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Thu, 22 Aug 2024 06:58:53 +0400 Subject: [PATCH 11/16] code style --- .../src/transformations/common_optimizations/ric_fusion.cpp | 2 +- .../mark_subgraphs_to_keep_in_mixed_precision.cpp | 2 +- src/core/src/pass/graph_rewrite.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp index 3da64b58734d14..60643d726ec275 100644 --- a/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp @@ -24,10 +24,10 @@ #include "openvino/op/transpose.hpp" #include "openvino/op/util/binary_elementwise_arithmetic.hpp" #include "openvino/op/util/pad_base.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" #include "openvino/pass/manager.hpp" #include "openvino/pass/pattern/op/or.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" -#include "openvino/pass/backward_graph_rewrite.hpp" #include "openvino/util/log.hpp" #include "transformations/utils/utils.hpp" diff --git a/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp b/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp index ffa5bbf12f8640..2ae43c7ac8ed4a 100644 --- a/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp +++ b/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp @@ -47,11 +47,11 @@ #include "openvino/pass/pattern/op/optional.hpp" #include "openvino/pass/pattern/op/or.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" #include "transformations/common_optimizations/mark_precision_sensitive_shapeof_subgraphs.hpp" #include "transformations/convert_precision.hpp" #include "transformations/rt_info/disable_fp16_compression.hpp" #include "transformations/utils/utils.hpp" -#include "openvino/pass/backward_graph_rewrite.hpp" using namespace std; diff --git a/src/core/src/pass/graph_rewrite.cpp b/src/core/src/pass/graph_rewrite.cpp index bffb4bef0f57fa..00eafa873043c3 100644 --- a/src/core/src/pass/graph_rewrite.cpp +++ b/src/core/src/pass/graph_rewrite.cpp @@ -14,9 +14,9 @@ #include "openvino/cc/pass/itt.hpp" #include "openvino/op/util/multi_subgraph_base.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "openvino/util/log.hpp" -#include "openvino/pass/backward_graph_rewrite.hpp" #include "perf_counters.hpp" /* GraphRewrite algorithm: @@ -66,7 +66,7 @@ PerfCounters& perf_counters_graph_rewrite() { #endif // ENABLE_PROFILING_ITT std::shared_ptr ov::pass::GraphRewrite::add_matcher( - const std::shared_ptr& pass) { + const std::shared_ptr& pass) { auto pass_config = get_pass_config(); pass->set_pass_config(pass_config); m_matchers.push_back(pass); From 4de4e0520c90dcf5eb346244bdf1bccd02fa92fa Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Thu, 22 Aug 2024 07:04:34 +0400 Subject: [PATCH 12/16] code style --- .../mark_subgraphs_to_keep_in_mixed_precision.hpp | 1 + .../mark_subgraphs_to_keep_in_mixed_precision.cpp | 1 - src/core/tests/graph_rewrite.cpp | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp b/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp index f178292943357d..f1172624da09f4 100644 --- a/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp +++ b/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp @@ -5,6 +5,7 @@ #pragma once #include "openvino/pass/matcher_pass.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp b/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp index 2ae43c7ac8ed4a..769fa3c72870e9 100644 --- a/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp +++ b/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp @@ -47,7 +47,6 @@ #include "openvino/pass/pattern/op/optional.hpp" #include "openvino/pass/pattern/op/or.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" -#include "openvino/pass/backward_graph_rewrite.hpp" #include "transformations/common_optimizations/mark_precision_sensitive_shapeof_subgraphs.hpp" #include "transformations/convert_precision.hpp" #include "transformations/rt_info/disable_fp16_compression.hpp" diff --git a/src/core/tests/graph_rewrite.cpp b/src/core/tests/graph_rewrite.cpp index 8a4a9e70bd6109..02369738741dcc 100644 --- a/src/core/tests/graph_rewrite.cpp +++ b/src/core/tests/graph_rewrite.cpp @@ -3,7 +3,6 @@ // #include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/backward_graph_rewrite.hpp" #include From 4c567e95e9c1f2e9b29cae7dd7057babc471d68b Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Thu, 22 Aug 2024 07:08:36 +0400 Subject: [PATCH 13/16] code style --- .../mark_subgraphs_to_keep_in_mixed_precision.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp b/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp index f1172624da09f4..0ffce989f0d83c 100644 --- a/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp +++ b/src/common/transformations/include/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp @@ -4,7 +4,6 @@ #pragma once -#include "openvino/pass/matcher_pass.hpp" #include "openvino/pass/backward_graph_rewrite.hpp" #include "transformations_visibility.hpp" From 6dc0b47bfe29b9160f2623fbb7712467bbeb5e2f Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Thu, 22 Aug 2024 14:39:05 +0400 Subject: [PATCH 14/16] fix --- src/core/tests/graph_rewrite.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/tests/graph_rewrite.cpp b/src/core/tests/graph_rewrite.cpp index 02369738741dcc..5617d8c1c12ada 100644 --- a/src/core/tests/graph_rewrite.cpp +++ b/src/core/tests/graph_rewrite.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" #include From ef2b23516f9f8ec1883290749e2da403373caa21 Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Thu, 22 Aug 2024 15:04:44 +0400 Subject: [PATCH 15/16] fix --- src/core/tests/graph_rewrite.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core/tests/graph_rewrite.cpp b/src/core/tests/graph_rewrite.cpp index 5617d8c1c12ada..20545c9de0ead7 100644 --- a/src/core/tests/graph_rewrite.cpp +++ b/src/core/tests/graph_rewrite.cpp @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "openvino/pass/backward_graph_rewrite.hpp" - #include #include "common_test_utils/ov_test_utils.hpp" @@ -16,6 +14,7 @@ #include "openvino/op/tanh.hpp" #include "openvino/pass/manager.hpp" #include "openvino/pass/pattern/op/label.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" using namespace ::testing; using namespace std; From d9f88da38e0ea993c6d2f814b8b3363430bc83ae Mon Sep 17 00:00:00 2001 From: andrei-cv Date: Thu, 22 Aug 2024 15:08:26 +0400 Subject: [PATCH 16/16] fix code style --- src/core/tests/graph_rewrite.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/tests/graph_rewrite.cpp b/src/core/tests/graph_rewrite.cpp index 20545c9de0ead7..3043e851aaf1d9 100644 --- a/src/core/tests/graph_rewrite.cpp +++ b/src/core/tests/graph_rewrite.cpp @@ -12,9 +12,9 @@ #include "openvino/op/relu.hpp" #include "openvino/op/result.hpp" #include "openvino/op/tanh.hpp" +#include "openvino/pass/backward_graph_rewrite.hpp" #include "openvino/pass/manager.hpp" #include "openvino/pass/pattern/op/label.hpp" -#include "openvino/pass/backward_graph_rewrite.hpp" using namespace ::testing; using namespace std;