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..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,8 +6,7 @@ #include -#include -#include +#include #include "pyopenvino/core/common.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..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/graph_rewrite.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 0316f0b2b029bb..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/graph_rewrite.hpp" +#include "openvino/pass/matcher_pass.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..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/graph_rewrite.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 7a272d4a6adcb1..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/graph_rewrite.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/markup_bias.hpp b/src/common/low_precision_transformations/include/low_precision/markup_bias.hpp index de5487187c4d56..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/graph_rewrite.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 3f69575fc200e7..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/graph_rewrite.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 ce6139e2fca817..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/graph_rewrite.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 0e8b0026fafac7..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/graph_rewrite.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 adf623c757b647..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/graph_rewrite.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 aca835624e7ade..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/graph_rewrite.hpp" +#include "openvino/pass/matcher_pass.hpp" namespace ov { namespace pass { 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..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/graph_rewrite.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 57f8662a65ea52..41236df12aa0ef 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/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 36fb7d7ef1bca4..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/graph_rewrite.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 4b62d80ba44748..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/graph_rewrite.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 85ead3b5785a04..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 d4aa8ed2ed947b..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/graph_rewrite.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 9c7e9f67b7eafb..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 9ad25c927d1ca3..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/graph_rewrite.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 d32bc179f8af9c..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 8bd80f90c790ff..5c7b6478dec15f 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/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 2ee9de1c15ed2f..787677a22ed108 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/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 29ce586bf2b394..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 633505a5ce5ad6..78dad6ee8e6e19 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/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 1270cf1ecccf88..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,8 +4,7 @@ #pragma once -#include "openvino/pass/pattern/matcher.hpp" -#include "openvino/pass/graph_rewrite.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 51d80520d4991f..8e24c1532a72d3 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/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 f72098996a0b13..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 aeee72160c85fe..24efcceec71a24 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/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 bf9c27f0d782e1..5b087d4ae559eb 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/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 e9bd1506b93c60..dbef9bc7b31c93 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/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 be0aed0a9f1f37..1fedf8a2ce08d5 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/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 a8e2bda647e776..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/graph_rewrite.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 442e8f05548e4c..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/graph_rewrite.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 ba25cbf634068a..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/graph_rewrite.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 88a464fb81622e..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/graph_rewrite.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 4075b2d8c11426..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/graph_rewrite.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 91c3fb3a794dd2..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/graph_rewrite.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 fce96aff0ff374..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/graph_rewrite.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 8dcaca0b7c6408..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/graph_rewrite.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 1cd33cdd93711d..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/graph_rewrite.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 ccb268ebf17a55..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/graph_rewrite.hpp" +#include "openvino/pass/matcher_pass.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..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/graph_rewrite.hpp" +#include "openvino/pass/matcher_pass.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..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/graph_rewrite.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 b96dd5346dabce..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/graph_rewrite.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 d615d3d6fd79b7..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/graph_rewrite.hpp" +#include "openvino/pass/matcher_pass.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..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/graph_rewrite.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 f6463890f60b79..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/graph_rewrite.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 82184e8491ac90..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/graph_rewrite.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 c4814634d91d1b..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/graph_rewrite.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 a9bd1db84d33d7..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/graph_rewrite.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 00735ac681f584..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/graph_rewrite.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 f0e439b72c19f4..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 @@ -6,7 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.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 911c5c558687b6..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/graph_rewrite.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 ab5e157e5cfd21..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/graph_rewrite.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 87c4b28f3a7bbb..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/graph_rewrite.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 361ccd11daf016..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/graph_rewrite.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 244a51e8cb7423..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 79c7eae24cc936..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/graph_rewrite.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 698a45f4acb612..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/graph_rewrite.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 6b3875a3a977e1..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/graph_rewrite.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 c39e505a0faf0e..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/graph_rewrite.hpp" +#include "openvino/pass/matcher_pass.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..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/graph_rewrite.hpp" +#include "openvino/pass/matcher_pass.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..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,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 42c66251cde2ac..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/graph_rewrite.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 4ce419c0353497..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/graph_rewrite.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 57108da5ea554f..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/graph_rewrite.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 6f37fdf7dae9ee..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,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/matcher_pass.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..49893dfb220de6 100644 --- a/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp @@ -6,7 +6,7 @@ #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/mul_conv_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/mul_conv_fusion.hpp index 1b2906a0292ccc..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/graph_rewrite.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 b4be1d6c7c3e6d..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/graph_rewrite.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 40536393a08d2e..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/graph_rewrite.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 7e4ac4a25bf994..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,8 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/matcher_pass.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..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,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 27ac2edd134f45..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/graph_rewrite.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 96cede7bb5a628..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/graph_rewrite.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 87af67497b85ae..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/graph_rewrite.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 2521c44ce4231a..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/graph_rewrite.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 a905438f8fd0eb..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/graph_rewrite.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 c941a60c1b9c68..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/graph_rewrite.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 d2984eceec4aa5..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/graph_rewrite.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 338655e70f879a..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/graph_rewrite.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 d47ba645b94f84..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,8 +5,7 @@ #pragma once #include "openvino/core/model.hpp" -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 b03902440067b2..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/graph_rewrite.hpp" #include "openvino/pass/manager.hpp" +#include "openvino/pass/matcher_pass.hpp" #include "transformations_visibility.hpp" namespace ov { 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..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/graph_rewrite.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 cdbd57ec269e31..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/graph_rewrite.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 da582db367b010..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/graph_rewrite.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 6b3aa632f34a62..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/graph_rewrite.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 92286f06b70b92..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/graph_rewrite.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 b5ab5480134e1d..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/graph_rewrite.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 88ef524ef523aa..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/graph_rewrite.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 094dee82f6cc19..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/graph_rewrite.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 bb0689bc639a54..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,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 0048e63b7e60ba..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/graph_rewrite.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 f18c0b736975fd..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,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 6ec54032c0c6e8..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,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 a0d73eb6b40676..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/graph_rewrite.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 18f660ccf581c0..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/graph_rewrite.hpp" +#include "openvino/pass/matcher_pass.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..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/graph_rewrite.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 3fc33c9a553060..8189535fe260ae 100644 --- a/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp @@ -8,7 +8,6 @@ #include #include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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..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,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 5e856384a0bebb..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/graph_rewrite.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 1a4122349c51e6..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/graph_rewrite.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 a41447caa2f7a8..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/graph_rewrite.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 b2755da91bfd71..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/graph_rewrite.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 636dae4ac4d38f..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/graph_rewrite.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 26925ad35ab4f0..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/graph_rewrite.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 e819795d9bec2d..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 9a4ab82a778fca..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 a9aa3a0855cf0a..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/graph_rewrite.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 ae50cc2d943dcc..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.hpp" +#include "openvino/pass/backward_graph_rewrite.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..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/graph_rewrite.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 0fe847d402e405..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/graph_rewrite.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 75b1bc38df3fbc..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/graph_rewrite.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 7a16d522c283a5..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/graph_rewrite.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 5e84c886f4e5d2..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/graph_rewrite.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 afadecfd967490..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/graph_rewrite.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 ba799943863ea4..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/graph_rewrite.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 74f15d1aef6c84..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/graph_rewrite.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 a0c8fd3eb0fd5a..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/graph_rewrite.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 9208403e4eca85..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/graph_rewrite.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 72e0ecb168fd69..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/graph_rewrite.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 9698f59f2b73c0..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/graph_rewrite.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 18b1339366ece3..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/graph_rewrite.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 bac6e636ac9daa..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/graph_rewrite.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 2d97152a1b1588..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/graph_rewrite.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 e6b6b0a8b67fb4..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/graph_rewrite.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 2181396adc0284..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/graph_rewrite.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 cfc2f41b23af06..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/graph_rewrite.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 a7d172cb81a307..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/graph_rewrite.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 90017756954aa5..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/graph_rewrite.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 2797da2370315d..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/graph_rewrite.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 6c54128dfce58b..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/graph_rewrite.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 940db1608607fc..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/graph_rewrite.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 f62300e95a9d26..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/graph_rewrite.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 ade23432733f37..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/graph_rewrite.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 90f97eb8cdb01f..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/graph_rewrite.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 d3bec6f48e764e..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/graph_rewrite.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 5a33375a833548..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/graph_rewrite.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 653aeca61fd4f8..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/graph_rewrite.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 4daba95e86a192..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/graph_rewrite.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 e85e6092b6ee40..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/graph_rewrite.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 d9078815070172..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/graph_rewrite.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 f117b406d2863e..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/graph_rewrite.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 a5ff6807870f91..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/graph_rewrite.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 7cd48773e492d0..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/graph_rewrite.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 8134d27d207ca2..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/graph_rewrite.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 7077d672d0aa5f..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/graph_rewrite.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 1a50dd10708eae..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/graph_rewrite.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 24b4520c506642..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/graph_rewrite.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 66de7739d61572..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/graph_rewrite.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 6d0a830dc7f0bd..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/graph_rewrite.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 9bc3cedbf3b532..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/graph_rewrite.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 37f5a86224ce62..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/graph_rewrite.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 e684e7a699be8b..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/graph_rewrite.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 3efd57c95c11b7..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/graph_rewrite.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 c6b4bf125f1195..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/graph_rewrite.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 0bd1d11c68a491..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/graph_rewrite.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 31754bc9a997cb..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/graph_rewrite.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 7d3f98cd273b6d..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/graph_rewrite.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 ec97bbdc62016c..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/graph_rewrite.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 b3f41501dfd084..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/graph_rewrite.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 0514e0bad38003..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/graph_rewrite.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 7b5b5dad08f096..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/graph_rewrite.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 21740be21597df..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/graph_rewrite.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 f34c28a0f3295c..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/graph_rewrite.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 cb0b108f22460a..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/graph_rewrite.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 a754f954261a3e..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/graph_rewrite.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 dda37e63fe93e8..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/graph_rewrite.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 c1ed179ba39fb6..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/graph_rewrite.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 b95d2a21472420..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/graph_rewrite.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 c9dbfe594c1a22..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/graph_rewrite.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 de6e414e3a9024..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/graph_rewrite.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 cfdf19bdbf305d..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/graph_rewrite.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 6db5d0b39553a4..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/graph_rewrite.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 021768ce572975..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/graph_rewrite.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 625f375487df66..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/graph_rewrite.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 d2f16d5c1a164e..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/graph_rewrite.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 2cff2f6ea823a6..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/graph_rewrite.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 d93c28577c2c8b..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,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 18f3560b90cebd..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,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 ab69a523ea9d56..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,8 +7,7 @@ #include #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pattern/matcher.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 df8fab51867862..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/graph_rewrite.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 254f64ff43c2b5..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/graph_rewrite.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 a87bcd5265f158..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/graph_rewrite.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 b7fb184a74f7ef..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/graph_rewrite.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 2d79165c5aabf5..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/graph_rewrite.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 62f372052e81cf..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/graph_rewrite.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 05833b9305cd82..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/graph_rewrite.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 273f7f915624f1..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/graph_rewrite.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 d7100c6adfc1ff..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/graph_rewrite.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 bd0c29aa0474cf..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 @@ -5,7 +5,10 @@ #pragma once #include "openvino/op/add.hpp" -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/op/parameter.hpp" +#include "openvino/pass/matcher_pass.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" #include "transformations_visibility.hpp" namespace ov { 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 a811a8eeac2e2c..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 @@ -4,7 +4,11 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/cc/pass/itt.hpp" +#include "openvino/op/shape_of.hpp" +#include "openvino/op/subtract.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 d3be92d829165a..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/graph_rewrite.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 8ebb0f6ec71905..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 @@ -4,7 +4,11 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/op/concat.hpp" +#include "openvino/op/parameter.hpp" +#include "openvino/pass/matcher_pass.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" #include "transformations_visibility.hpp" namespace ov { 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..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/graph_rewrite.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 8616fafa2b131a..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/graph_rewrite.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 430da1d1250790..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/graph_rewrite.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 6c853f5820a815..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/graph_rewrite.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 c9fa23ce7f86a3..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/graph_rewrite.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 d08f212925182a..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/graph_rewrite.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 d7dc15d4d7454b..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/graph_rewrite.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 f8f6c021097301..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/graph_rewrite.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 a60b76f8a8473c..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/graph_rewrite.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 203259ecdcf7ce..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/graph_rewrite.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 037a9cce421a11..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/graph_rewrite.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 19d6e41f9627d1..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/graph_rewrite.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 6ad409b4d96ad5..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/graph_rewrite.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 34a2a7b83f5d9c..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,8 +6,7 @@ #include -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 5c913e3d778be8..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 c37cccaaac6516..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 de82ce274cf32c..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 768972af596a2e..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 206f3cd0af7559..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 188cbe6556940e..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 32100f40d878ea..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 44fd1fc534315e..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 cab1f1841107bc..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 8b486609aa1f1c..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 820dd3da37d8af..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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 3d7694a32832f9..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/graph_rewrite.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 a660b99506f1ea..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,8 +4,7 @@ #pragma once -#include "openvino/pass/graph_rewrite.hpp" -#include "openvino/pass/pass.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..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,6 +24,7 @@ #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" diff --git a/src/core/include/openvino/pass/backward_graph_rewrite.hpp b/src/core/include/openvino/pass/backward_graph_rewrite.hpp new file mode 100644 index 00000000000000..7e7f6f118efe8d --- /dev/null +++ b/src/core/include/openvino/pass/backward_graph_rewrite.hpp @@ -0,0 +1,23 @@ +#pragma once + +#include +#include +#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pass.hpp" + +namespace ov { +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/convert_fp32_to_fp16.hpp b/src/core/include/openvino/pass/convert_fp32_to_fp16.hpp index 61c76e3b2f974a..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/graph_rewrite.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 792393b33a1b5b..3fd801235c31a2 100644 --- a/src/core/include/openvino/pass/graph_rewrite.hpp +++ b/src/core/include/openvino/pass/graph_rewrite.hpp @@ -8,149 +8,10 @@ #include #include -#include "openvino/pass/pass.hpp" -#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/matcher_pass.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 @@ -249,12 +110,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; @@ -267,16 +123,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 diff --git a/src/core/include/openvino/pass/matcher_pass.hpp b/src/core/include/openvino/pass/matcher_pass.hpp new file mode 100644 index 00000000000000..b17237fdf08340 --- /dev/null +++ b/src/core/include/openvino/pass/matcher_pass.hpp @@ -0,0 +1,107 @@ +// Copyright (C) 2018-2024 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include + +#include "openvino/pass/node_registry.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/node_registry.hpp b/src/core/include/openvino/pass/node_registry.hpp new file mode 100644 index 00000000000000..f0cdb4b228c613 --- /dev/null +++ b/src/core/include/openvino/pass/node_registry.hpp @@ -0,0 +1,56 @@ +#pragma once + +#include +#include +#include + +#include "openvino/core/node.hpp" +#include "openvino/pass/pattern/matcher.hpp" + +namespace ov { +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(); + +private: + std::vector> m_nodes; //!< Stores added nodes. +}; +} // namespace pass +} // namespace ov diff --git a/src/core/src/pass/graph_rewrite.cpp b/src/core/src/pass/graph_rewrite.cpp index 24353a56bf746a..00eafa873043c3 100644 --- a/src/core/src/pass/graph_rewrite.cpp +++ b/src/core/src/pass/graph_rewrite.cpp @@ -14,6 +14,7 @@ #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 "perf_counters.hpp" @@ -64,6 +65,13 @@ 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..3043e851aaf1d9 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/graph_rewrite.hpp" - #include #include "common_test_utils/ov_test_utils.hpp" @@ -14,6 +12,7 @@ #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"