From 128ec5452e4dfe229eeaa92ebc57eaba5ad6f6b4 Mon Sep 17 00:00:00 2001 From: Ivan Tikhonov Date: Wed, 23 Aug 2023 11:45:34 +0400 Subject: [PATCH] Transformations API 2.0: replace ngraph headers and namespaces with openvino (#19304) * switch to OV headers and namespaces * resolve review comments * fix precomp header * refactoring, add missing include --- .../ov_ops/generate_proposals_ie_internal.hpp | 2 +- .../ov_ops/multiclass_nms_ie_internal.hpp | 3 +- .../include/ov_ops/nms_ie_internal.hpp | 2 +- .../include/ov_ops/nms_static_shape_ie.hpp | 2 +- .../include/ov_ops/type_relaxed.hpp | 7 +- .../adaptive_pool_to_reduce.hpp | 5 +- .../add_fake_quantize_fusion.hpp | 5 +- .../align_eltwise_input_ranks.hpp | 4 +- .../batch_to_space_fusion.hpp | 5 +- .../common_optimizations/binarize_weights.hpp | 4 +- .../broadcast_elementwise_fusion.hpp | 4 +- .../broadcast_transition.hpp | 7 +- .../common_optimizations/clamp_fusion.hpp | 5 +- .../common_optimizations.hpp | 5 +- .../concat_reduce_fusion.hpp | 4 +- .../common_optimizations/conv_mul_fusion.hpp | 5 +- .../conv_to_binary_conv.hpp | 4 +- .../convert_nms_gather_path_to_unsigned.hpp | 4 +- .../convert_quantize_dequantize.hpp | 5 +- ...onvolution_to_group_convolution_fusion.hpp | 4 +- .../depth_to_space_fusion.hpp | 5 +- .../dilated_convolution_converter.hpp | 5 +- .../dimension_tracking.hpp | 7 +- ...isable_random_uniform_constant_folding.hpp | 5 +- .../disable_shapeof_constant_folding.hpp | 5 +- .../common_optimizations/divide_fusion.hpp | 5 +- .../dropout_with_random_uniform_replacer.hpp | 4 +- .../eliminate_duplicate_ti_inputs.hpp | 5 +- .../eliminate_unsqueeze_gather.hpp | 6 +- .../fold_subgraph_empty_inputs.hpp | 5 +- .../common_optimizations/fq_mul_fusion.hpp | 5 +- .../fq_reshape_fusion.hpp | 5 +- .../fused_names_cleanup.hpp | 4 +- .../common_optimizations/gelu_fusion.hpp | 5 +- .../common_optimizations/hsigmoid_fusion.hpp | 5 +- .../common_optimizations/hswish_fusion.hpp | 5 +- .../interpolate_sequence_fusion.hpp | 7 +- .../leaky_relu_fusion.hpp | 5 +- .../lin_op_sequence_fusion.hpp | 5 +- .../matmul_const_transposes_extraction.hpp | 4 +- .../matmul_multiply_fusion.hpp | 4 +- .../common_optimizations/mish_fusion.hpp | 7 +- .../moc_transformations.hpp | 5 +- .../common_optimizations/mul_conv_fusion.hpp | 5 +- .../mul_fake_quantize_fusion.hpp | 5 +- .../common_optimizations/mvn_fusion.hpp | 7 +- .../nearest_neighbor_upsampling_fusion.hpp | 5 +- .../nonzero_horizontal_fusion.hpp | 7 +- .../common_optimizations/nop_elimination.hpp | 4 +- .../normalize_l2_fusion.hpp | 7 +- .../optimize_strided_slice.hpp | 5 +- .../common_optimizations/pad_fusion.hpp | 4 +- .../common_optimizations/prelu_fusion.hpp | 5 +- .../pull_transpose_through_fq.hpp | 5 +- .../push_constant_to_subgraph.hpp | 4 +- .../random_uniform_fusion.hpp | 4 +- .../common_optimizations/reduce_merge.hpp | 5 +- .../relu_fake_quantize_fusion.hpp | 4 +- .../remove_concat_zero_dim_input.hpp | 5 +- .../remove_filtering_boxes_by_size.hpp | 5 +- .../common_optimizations/reshape_prelu.hpp | 4 +- .../reshape_sequence_fusion.hpp | 4 +- .../reverse_shape_and_type_infer.hpp | 4 +- .../common_optimizations/ric_fusion.hpp | 8 +- .../select_with_one_value_condition.hpp | 5 +- .../common_optimizations/sequence_fusion.hpp | 5 +- .../shared_ops_optimization.hpp | 4 +- .../shuffle_channels_fusion.hpp | 5 +- .../simplify_shape_of_sub_graph.hpp | 5 +- ...ip_gather_before_transpose_and_reshape.hpp | 5 +- .../common_optimizations/softmax_fusion.hpp | 4 +- .../common_optimizations/softplus_fusion.hpp | 5 +- .../softplus_to_mish_fusion.hpp | 7 +- .../space_to_batch_fusion.hpp | 5 +- ...plit_concat_pair_to_interpolate_fusion.hpp | 7 +- .../split_squeeze_concat_fusion.hpp | 7 +- .../strides_optimization.hpp | 5 +- .../common_optimizations/subtract_fusion.hpp | 5 +- .../common_optimizations/swish_fusion.hpp | 5 +- .../transpose_sinking.hpp | 7 +- .../transpose_to_reshape.hpp | 7 +- .../weights_dequantize_to_fake_quantize.hpp | 5 +- .../wrap_interpolate_into_transposes.hpp | 5 +- .../control_flow/unroll_if.hpp | 4 +- .../control_flow/unroll_tensor_iterator.hpp | 5 +- .../transformations/convert_precision.hpp | 5 +- .../include/transformations/fix_rt_info.hpp | 2 +- .../flush_fp32_subnormals_to_zero.hpp | 2 +- .../transformations/init_node_info.hpp | 2 +- .../mark_dequantization_subgraph.hpp | 4 +- .../batch_norm_decomposition.hpp | 5 +- .../bidirectional_sequences_decomposition.hpp | 5 +- .../op_conversions/convert_batch_to_space.hpp | 5 +- .../op_conversions/convert_broadcast3.hpp | 5 +- .../convert_broadcast_to_tiles.hpp | 5 +- .../op_conversions/convert_convertlike.hpp | 4 +- .../convert_deformable_conv_v8_to_v1.hpp | 4 +- .../op_conversions/convert_depth_to_space.hpp | 5 +- .../op_conversions/convert_divide.hpp | 5 +- .../op_conversions/convert_gather_0d.hpp | 5 +- .../convert_gather_downgrade.hpp | 4 +- .../op_conversions/convert_gather_upgrade.hpp | 4 +- .../op_conversions/convert_gelu.hpp | 5 +- .../convert_gp9_to_gp_ie_internal.hpp | 4 +- .../convert_interpolate11_downgrade.hpp | 4 +- .../convert_interpolate1_to_interpolate4.hpp | 5 +- .../convert_matrix_nms_to_matrix_nms_ie.hpp | 5 +- .../convert_maxpool_downgrade.hpp | 4 +- .../convert_maxpool_upgrade.hpp | 4 +- .../convert_minimum_to_power_and_max.hpp | 5 +- .../op_conversions/convert_mod.hpp | 5 +- ...rt_multiclass_nms_to_multiclass_nms_ie.hpp | 4 +- .../convert_multiclass_nms_upgrade.hpp | 5 +- .../op_conversions/convert_mvn1_to_mvn6.hpp | 4 +- .../op_conversions/convert_negative.hpp | 5 +- .../convert_nms9_to_nms_ie_internal.hpp | 5 +- .../convert_nms_to_nms_ie_internal.hpp | 5 +- .../convert_pad12_downgrade.hpp | 4 +- .../convert_pad_to_group_conv.hpp | 5 +- .../convert_previous_nms_to_nms_5.hpp | 5 +- .../convert_previous_nms_to_nms_9.hpp | 5 +- .../convert_prior_box_v8_to_v0.hpp | 4 +- .../convert_reduce_to_pooling.hpp | 9 +- .../convert_reduce_to_reshape.hpp | 9 +- .../convert_roi_align_v3_to_v9.hpp | 4 +- .../convert_roi_align_v9_to_v3.hpp | 4 +- .../convert_scatter_elements_to_scatter.hpp | 5 +- ...rt_scatter_elements_update12_downgrade.hpp | 4 +- .../convert_sequences_to_tensor_iterator.hpp | 5 +- .../op_conversions/convert_shapeof3.hpp | 5 +- .../convert_shuffle_channels3.hpp | 5 +- .../convert_slice_to_strided_slice.hpp | 4 +- .../convert_softmax_downgrade.hpp | 4 +- .../convert_softmax_upgrade.hpp | 4 +- .../op_conversions/convert_space_to_batch.hpp | 5 +- .../op_conversions/convert_space_to_depth.hpp | 5 +- .../op_conversions/convert_subtract.hpp | 5 +- .../convert_ti_to_sequences.hpp | 5 +- .../convert_topk11_downgrade.hpp | 4 +- .../op_conversions/convert_topk3.hpp | 5 +- .../convert_xor_to_logical_xor.hpp | 4 +- .../detection_output_downgrade.hpp | 4 +- .../detection_output_upgrade.hpp | 4 +- .../op_conversions/einsum_decomposition.hpp | 5 +- .../op_conversions/fq_decomposition.hpp | 4 +- .../gather_normalize_negative_indices.hpp | 4 +- .../op_conversions/gelu7_downgrade.hpp | 4 +- .../op_conversions/gru_cell_decomposition.hpp | 5 +- .../op_conversions/hsigmoid_decomposition.hpp | 4 +- .../op_conversions/hswish_decomposition.hpp | 4 +- .../log_softmax_decomposition.hpp | 4 +- .../lstm_cell_decomposition.hpp | 5 +- .../op_conversions/mvn6_decomposition.hpp | 4 +- .../normalize_l2_decomposition.hpp | 7 +- .../reduce_l1_decomposition.hpp | 7 +- .../reduce_l2_decomposition.hpp | 7 +- .../op_conversions/rnn_cell_decomposition.hpp | 5 +- .../simplify_ctc_greedy_decoder_seq_len.hpp | 5 +- .../op_conversions/softmax_decomposition.hpp | 5 +- .../op_conversions/softplus_decomposition.hpp | 5 +- .../op_conversions/softsign_decomposition.hpp | 5 +- .../convert_opset2_to_opset1.hpp | 5 +- .../convert_opset3_to_opset2.hpp | 5 +- .../transformations/rt_info/attributes.hpp | 27 +- .../rt_info/disable_constant_folding.hpp | 2 +- .../rt_info/fused_names_attribute.hpp | 2 +- .../rt_info/nms_selected_indices.hpp | 2 +- .../old_api_map_element_type_attribute.hpp | 7 +- .../rt_info/old_api_map_order_attribute.hpp | 7 +- .../rt_info/preprocessing_attribute.hpp | 7 +- .../rt_info/strides_property.hpp | 3 +- .../broadcast_const_range_replacement.hpp | 4 +- .../smart_reshape/matmul_sr.hpp | 2 +- .../smart_reshape/mimic_set_batch_size.hpp | 2 +- .../proposal_scales_stridedslice.hpp | 2 +- .../smart_reshape/reshape_to_1D.hpp | 2 +- .../smart_reshape/set_batch_size.hpp | 4 +- .../smart_reshape/shape_of_const_folding.hpp | 3 +- .../smart_reshape/smart_reshape.hpp | 2 +- .../smart_reshape/strided_slice_squeeze.hpp | 2 +- .../include/transformations/utils/utils.hpp | 17 +- src/common/transformations/src/itt.hpp | 14 +- .../src/ov_ops/augru_sequence.cpp | 1 - .../ov_ops/generate_proposals_ie_internal.cpp | 2 +- .../src/ov_ops/nms_ie_internal.cpp | 12 +- .../src/ov_ops/nms_static_shape_ie.cpp | 2 +- src/common/transformations/src/precomp.hpp | 4 +- .../add_fake_quantize_fusion.cpp | 22 +- .../align_eltwise_input_ranks.cpp | 9 +- .../batch_to_space_fusion.cpp | 8 +- .../common_optimizations/binarize_weights.cpp | 8 +- .../broadcast_elementwise_fusion.cpp | 20 +- .../broadcast_transition.cpp | 4 +- .../change_placeholder_types.cpp | 2 +- .../common_optimizations/clamp_fusion.cpp | 26 +- .../common_optimizations.cpp | 31 ++- .../concat_reduce_fusion.cpp | 30 +-- .../common_optimizations/conv_mul_fusion.cpp | 9 +- .../conv_to_binary_conv.cpp | 26 +- .../convert_nms_gather_path_to_unsigned.cpp | 12 +- .../convert_quantize_dequantize.cpp | 26 +- .../convolution_to_group_convolution.cpp | 5 +- .../depth_to_space_fusion.cpp | 49 ++-- .../dimension_tracking.cpp | 10 +- ...isable_random_uniform_constant_folding.cpp | 6 +- .../disable_shapeof_constant_folding.cpp | 9 +- .../common_optimizations/divide_fusion.cpp | 8 +- .../dropout_with_random_uniform_replacer.cpp | 25 +- .../eliminate_duplicate_ti_inputs.cpp | 2 +- .../eliminate_unsqueeze_gather.cpp | 9 +- .../fold_subgraph_empty_inputs.cpp | 2 +- .../common_optimizations/fq_mul_fusion.cpp | 14 +- .../fq_reshape_fusion.cpp | 16 +- .../fused_names_cleanup.cpp | 4 +- .../common_optimizations/gelu_fusion.cpp | 110 ++++----- .../common_optimizations/hsigmoid_fusion.cpp | 138 +++++------ .../common_optimizations/hswish_fusion.cpp | 78 +++--- .../interpolate_sequence_fusion.cpp | 23 +- .../leaky_relu_fusion.cpp | 10 +- .../lin_op_sequence_fusion.cpp | 42 ++-- .../matmul_const_transposes_extraction.cpp | 7 +- .../matmul_multiply_fusion.cpp | 7 +- .../common_optimizations/mish_fusion.cpp | 24 +- .../moc_transformations.cpp | 173 ++++++------- .../common_optimizations/mul_conv_fusion.cpp | 51 ++-- .../mul_fake_quantize_fusion.cpp | 22 +- .../common_optimizations/mvn_fusion.cpp | 52 ++-- .../nearest_neighbor_upsampling_fusion.cpp | 14 +- .../nonzero_horizontal_fusion.cpp | 2 +- .../common_optimizations/nop_elimination.cpp | 24 +- .../normalize_l2_fusion.cpp | 24 +- .../optimize_strided_slice.cpp | 33 +-- .../common_optimizations/pad_fusion.cpp | 8 +- .../common_optimizations/prelu_fusion.cpp | 138 +++++------ .../pull_transpose_through_fq.cpp | 22 +- .../random_uniform_fusion.cpp | 28 +-- .../common_optimizations/reduce_merge.cpp | 12 +- .../relu_fake_quantize_fusion.cpp | 20 +- .../remove_concat_zero_dim_input.cpp | 2 +- .../remove_filtering_boxes_by_size.cpp | 22 +- .../common_optimizations/reshape_prelu.cpp | 5 +- .../reshape_sequence_fusion.cpp | 6 +- .../common_optimizations/ric_fusion.cpp | 13 +- .../shared_ops_optimization.cpp | 26 +- .../shuffle_channels_fusion.cpp | 53 ++-- .../simplify_shape_of_sub_graph.cpp | 17 +- ...ip_gather_before_transpose_and_reshape.cpp | 26 +- .../common_optimizations/softmax_fusion.cpp | 23 +- .../common_optimizations/softplus_fusion.cpp | 20 +- .../softplus_to_mish_fusion.cpp | 22 +- .../space_to_batch_fusion.cpp | 8 +- ...plit_concat_pair_to_interpolate_fusion.cpp | 14 +- .../split_squeeze_concat_fusion.cpp | 14 +- .../strides_optimization.cpp | 27 +- .../common_optimizations/subtract_fusion.cpp | 10 +- .../common_optimizations/swish_fusion.cpp | 68 ++--- ...anspose_reshape_elimination_for_matmul.cpp | 26 +- .../transpose_sinking.cpp | 70 +++--- .../transpose_to_reshape.cpp | 10 +- .../weights_dequantize_to_fake_quantize.cpp | 30 +-- .../wrap_interpolate_into_transposes.cpp | 4 +- .../control_flow/unroll_if.cpp | 18 +- .../control_flow/unroll_tensor_iterator.cpp | 22 +- .../src/transformations/convert_precision.cpp | 175 +++++++------ .../src/transformations/fix_rt_info.cpp | 6 +- ...k_subgraphs_to_keep_in_mixed_precision.cpp | 3 +- .../src/transformations/init_node_info.cpp | 6 +- .../mark_dequantization_subgraph.cpp | 12 +- .../batch_norm_decomposition.cpp | 16 +- .../bidirectional_sequences_decomposition.cpp | 50 ++-- .../op_conversions/convert_batch_to_space.cpp | 4 +- .../op_conversions/convert_broadcast3.cpp | 6 +- .../convert_broadcast_to_tiles.cpp | 12 +- .../op_conversions/convert_convertlike.cpp | 4 +- .../convert_deformable_conv_v8_to_v1.cpp | 9 +- .../op_conversions/convert_depth_to_space.cpp | 12 +- .../op_conversions/convert_divide.cpp | 33 ++- .../op_conversions/convert_gather_0d.cpp | 12 +- .../convert_gather_downgrade.cpp | 13 +- .../op_conversions/convert_gather_upgrade.cpp | 13 +- .../op_conversions/convert_gelu.cpp | 14 +- .../convert_gp9_to_gp_ie_internal.cpp | 17 +- .../convert_interpolate11_downgrade.cpp | 4 +- .../convert_interpolate1_to_interpolate4.cpp | 18 +- .../convert_matrix_nms_to_matrix_nms_ie.cpp | 14 +- .../convert_maxpool_downgrade.cpp | 13 +- .../convert_maxpool_upgrade.cpp | 13 +- .../convert_minimum_to_power_and_max.cpp | 12 +- .../op_conversions/convert_mod.cpp | 14 +- ...rt_multiclass_nms_to_multiclass_nms_ie.cpp | 6 +- .../convert_multiclass_nms_upgrade.cpp | 7 +- .../op_conversions/convert_mvn1_to_mvn6.cpp | 10 +- .../op_conversions/convert_negative.cpp | 12 +- .../convert_nms9_to_nms_ie_internal.cpp | 22 +- .../convert_nms_to_nms_ie_internal.cpp | 22 +- .../convert_pad12_downgrade.cpp | 7 +- .../convert_pad_to_group_conv.cpp | 16 +- .../convert_previous_nms_to_nms_5.cpp | 18 +- .../convert_previous_nms_to_nms_9.cpp | 22 +- .../convert_prior_box_v8_to_v0.cpp | 9 +- .../convert_reduce_to_reshape.cpp | 2 +- .../convert_roi_align_v3_to_v9.cpp | 9 +- .../convert_roi_align_v9_to_v3.cpp | 9 +- .../convert_scatter_elements_to_scatter.cpp | 13 +- ...rt_scatter_elements_update12_downgrade.cpp | 7 +- .../convert_sequences_to_tensor_iterator.cpp | 127 +++++----- .../op_conversions/convert_shapeof3.cpp | 12 +- .../convert_shuffle_channels3.cpp | 6 +- .../convert_slice_to_strided_slice.cpp | 31 ++- .../convert_softmax_downgrade.cpp | 7 +- .../convert_softmax_upgrade.cpp | 5 +- .../op_conversions/convert_space_to_batch.cpp | 4 +- .../op_conversions/convert_space_to_depth.cpp | 13 +- .../op_conversions/convert_subtract.cpp | 7 +- .../convert_ti_to_sequences.cpp | 232 +++++++++--------- .../convert_topk11_downgrade.cpp | 5 +- .../op_conversions/convert_topk3.cpp | 10 +- .../convert_xor_to_logical_xor.cpp | 5 +- .../detection_output_downgrade.cpp | 11 +- .../detection_output_upgrade.cpp | 10 +- .../op_conversions/einsum_decomposition.cpp | 129 +++++----- .../op_conversions/fq_decomposition.cpp | 27 +- .../gather_normalize_negative_indices.cpp | 20 +- .../op_conversions/gelu7_downgrade.cpp | 14 +- .../op_conversions/gru_cell_decomposition.cpp | 58 ++--- .../op_conversions/hsigmoid_decomposition.cpp | 20 +- .../op_conversions/hswish_decomposition.cpp | 22 +- .../log_softmax_decomposition.cpp | 20 +- .../lstm_cell_decomposition.cpp | 16 +- .../op_conversions/mvn6_decomposition.cpp | 22 +- .../normalize_l2_decomposition.cpp | 14 +- .../reduce_l1_decomposition.cpp | 14 +- .../reduce_l2_decomposition.cpp | 14 +- .../op_conversions/rnn_cell_decomposition.cpp | 19 +- .../simplify_ctc_greedy_decoder_seq_len.cpp | 57 +++-- .../op_conversions/softmax_decomposition.cpp | 15 +- .../op_conversions/softplus_decomposition.cpp | 14 +- .../op_conversions/softsign_decomposition.cpp | 13 +- .../convert_opset2_to_opset1.cpp | 6 +- .../convert_opset3_to_opset2.cpp | 6 +- .../rt_info/fused_names_attribute.cpp | 14 +- .../rt_info/preprocessing_attribute.cpp | 6 +- .../rt_info/primitives_priority_attribute.cpp | 22 +- .../broadcast_const_range_replacement.cpp | 19 +- .../smart_reshape/lstm_states_broadcast.cpp | 10 +- .../smart_reshape/matmul_sr.cpp | 54 ++-- .../smart_reshape/mimic_set_batch_size.cpp | 22 +- .../proposal_scales_stridedslice.cpp | 52 ++-- .../smart_reshape/reshape_to_1D.cpp | 17 +- .../smart_reshape/set_batch_size.cpp | 24 +- .../smart_reshape/shape_of_const_folding.cpp | 3 +- .../smart_reshape/smart_reshape.cpp | 29 +-- .../smart_reshape/strided_slice_squeeze.cpp | 36 +-- .../src/transformations/utils/utils.cpp | 54 ++-- 354 files changed, 2522 insertions(+), 2470 deletions(-) diff --git a/src/common/transformations/include/ov_ops/generate_proposals_ie_internal.hpp b/src/common/transformations/include/ov_ops/generate_proposals_ie_internal.hpp index 68ebf321ddd..6d74231cdf3 100644 --- a/src/common/transformations/include/ov_ops/generate_proposals_ie_internal.hpp +++ b/src/common/transformations/include/ov_ops/generate_proposals_ie_internal.hpp @@ -6,10 +6,10 @@ #include #include -#include #include "openvino/op/generate_proposals.hpp" #include "openvino/op/op.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace op { diff --git a/src/common/transformations/include/ov_ops/multiclass_nms_ie_internal.hpp b/src/common/transformations/include/ov_ops/multiclass_nms_ie_internal.hpp index 26750bc17a5..f603f2577ec 100644 --- a/src/common/transformations/include/ov_ops/multiclass_nms_ie_internal.hpp +++ b/src/common/transformations/include/ov_ops/multiclass_nms_ie_internal.hpp @@ -4,10 +4,9 @@ #pragma once -#include - #include "openvino/op/util/multiclass_nms_base.hpp" #include "openvino/opsets/opset9.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace op { diff --git a/src/common/transformations/include/ov_ops/nms_ie_internal.hpp b/src/common/transformations/include/ov_ops/nms_ie_internal.hpp index 9c4cb3be04a..797b89add6d 100644 --- a/src/common/transformations/include/ov_ops/nms_ie_internal.hpp +++ b/src/common/transformations/include/ov_ops/nms_ie_internal.hpp @@ -6,10 +6,10 @@ #include #include -#include #include "openvino/core/coordinate_diff.hpp" #include "openvino/op/op.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace op { diff --git a/src/common/transformations/include/ov_ops/nms_static_shape_ie.hpp b/src/common/transformations/include/ov_ops/nms_static_shape_ie.hpp index 5da183db15a..2bc4219c82b 100644 --- a/src/common/transformations/include/ov_ops/nms_static_shape_ie.hpp +++ b/src/common/transformations/include/ov_ops/nms_static_shape_ie.hpp @@ -7,10 +7,10 @@ #include #include #include -#include #include #include "openvino/op/op.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace op { diff --git a/src/common/transformations/include/ov_ops/type_relaxed.hpp b/src/common/transformations/include/ov_ops/type_relaxed.hpp index f35631320e4..1748cdc586f 100644 --- a/src/common/transformations/include/ov_ops/type_relaxed.hpp +++ b/src/common/transformations/include/ov_ops/type_relaxed.hpp @@ -7,12 +7,13 @@ #include #include #include -#include -#include #include -#include #include +#include "openvino/op/convert.hpp" +#include "openvino/op/parameter.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace op { 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 84ff14d4bd3..9a82379e454 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 fb2283dc2de..7c5efdc2146 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 3b19a4b83eb..060976dfd08 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" /** * @ingroup ie_transformation_common_api 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 66c3de32beb..f5734bc33d3 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 1fdc63f2b45..dfdcfcf8e26 100644 --- a/src/common/transformations/include/transformations/common_optimizations/binarize_weights.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/binarize_weights.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 008b8df6382..f1690983b5e 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 77f1641ab76..e977ff0be37 100644 --- a/src/common/transformations/include/transformations/common_optimizations/broadcast_transition.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/broadcast_transition.hpp @@ -5,9 +5,10 @@ #pragma once #include -#include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 b192030caf0..6d80b4bbfd5 100644 --- a/src/common/transformations/include/transformations/common_optimizations/clamp_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/clamp_fusion.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 df1c4cc8815..8d59e2575f1 100644 --- a/src/common/transformations/include/transformations/common_optimizations/common_optimizations.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/common_optimizations.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/concat_reduce_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/concat_reduce_fusion.hpp index 8da66c34528..c8bc0628928 100644 --- a/src/common/transformations/include/transformations/common_optimizations/concat_reduce_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/concat_reduce_fusion.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 2056dc52b21..851048c7df0 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 @@ -6,8 +6,9 @@ #include #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 50df78ed3e1..a6693f57988 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp b/src/common/transformations/include/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp index 865b4d881cb..533833cc006 100644 --- a/src/common/transformations/include/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 59b9d5e914a..fd4b3d11560 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/convolution_to_group_convolution_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/convolution_to_group_convolution_fusion.hpp index aa5409acad6..173c9ac60dc 100644 --- a/src/common/transformations/include/transformations/common_optimizations/convolution_to_group_convolution_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/convolution_to_group_convolution_fusion.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 dec44602382..b28a019f656 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 9f09155525a..adf2cd00576 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 f6ebed6a8d3..e890553085c 100644 --- a/src/common/transformations/include/transformations/common_optimizations/dimension_tracking.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/dimension_tracking.hpp @@ -5,9 +5,10 @@ #pragma once #include -#include -#include -#include + +#include "openvino/opsets/opset1.hpp" +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" using P2Btype = std::unordered_map, std::unordered_set>; 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 92a0984a1db..825a5925649 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 @@ -5,8 +5,9 @@ #pragma once #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 c3fda78a7ad..9aa0f36adbb 100644 --- a/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/disable_shapeof_constant_folding.hpp @@ -5,8 +5,9 @@ #pragma once #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 8ffffeea446..b04130fc5ee 100644 --- a/src/common/transformations/include/transformations/common_optimizations/divide_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/divide_fusion.hpp @@ -5,8 +5,9 @@ #pragma once #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 e860e1232a3..a3443414e3a 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 f7e51a3f36f..7fa89421b09 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 cc02e475a60..08e54a4f34b 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,9 +4,9 @@ #pragma once -#include -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 0353c96eff6..9d081e9bb13 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 2f9d09272d1..fb66b877e8d 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 1927d5ef709..ceea764f1f8 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/fused_names_cleanup.hpp b/src/common/transformations/include/transformations/common_optimizations/fused_names_cleanup.hpp index b185e984de6..6801a7dc7a6 100644 --- a/src/common/transformations/include/transformations/common_optimizations/fused_names_cleanup.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/fused_names_cleanup.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/pass.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp index 887658f124b..61722260bb5 100644 --- a/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp index 31604d4e7c9..887e20ef245 100644 --- a/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp index f7ac37ded86..0b87f3228b7 100644 --- a/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 67adc3fd3af..cefd478b3a2 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 @@ -5,11 +5,12 @@ #pragma once #include -#include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 748d88dee78..0025880bd8c 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/lin_op_sequence_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/lin_op_sequence_fusion.hpp index 18d91bc05d8..4d7db6c3c4a 100644 --- a/src/common/transformations/include/transformations/common_optimizations/lin_op_sequence_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/lin_op_sequence_fusion.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 07acd276d52..7dd6a5bbeb2 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" /** * @ingroup ie_transformation_common_api 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 98ccea5ce0e..657cf6b6f0a 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 66f794980c9..6679f717328 100644 --- a/src/common/transformations/include/transformations/common_optimizations/mish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/mish_fusion.hpp @@ -5,11 +5,12 @@ #pragma once #include -#include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 62bb1ec7e8d..15fc6549e5e 100644 --- a/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp @@ -5,8 +5,9 @@ #pragma once #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 389524a68e3..5dd16f06bfb 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 @@ -6,8 +6,9 @@ #include #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 6928167fde9..9bf1b34c4c3 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/mvn_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/mvn_fusion.hpp index 85cbadd50dd..ba296de461a 100644 --- a/src/common/transformations/include/transformations/common_optimizations/mvn_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/mvn_fusion.hpp @@ -5,11 +5,12 @@ #pragma once #include -#include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 0a816bdad13..73db5d395f7 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 5a3b6af5aa9..ff7f09a3024 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 @@ -5,9 +5,10 @@ #pragma once #include -#include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp b/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp index 6187d8ea4b6..d756624f60e 100644 --- a/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 b3ffd3c040b..6e70d51e205 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 @@ -5,11 +5,12 @@ #pragma once #include -#include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/optimize_strided_slice.hpp b/src/common/transformations/include/transformations/common_optimizations/optimize_strided_slice.hpp index b7f1a18b730..0e56210edef 100644 --- a/src/common/transformations/include/transformations/common_optimizations/optimize_strided_slice.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/optimize_strided_slice.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/pad_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/pad_fusion.hpp index 88c042c071c..1a45a1ce22b 100644 --- a/src/common/transformations/include/transformations/common_optimizations/pad_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/pad_fusion.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/prelu_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/prelu_fusion.hpp index e9b090381ec..4b27152de9a 100644 --- a/src/common/transformations/include/transformations/common_optimizations/prelu_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/prelu_fusion.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 9e9f519c11c..eec337e14e2 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/push_constant_to_subgraph.hpp b/src/common/transformations/include/transformations/common_optimizations/push_constant_to_subgraph.hpp index 9eff13e6861..0eeab2d9008 100644 --- a/src/common/transformations/include/transformations/common_optimizations/push_constant_to_subgraph.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/push_constant_to_subgraph.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/pass.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 b7fa81358ac..8b108bbcfde 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 511ad80487e..2120a7625a9 100644 --- a/src/common/transformations/include/transformations/common_optimizations/reduce_merge.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/reduce_merge.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 3adb867deb3..d06001e1974 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 5b9ef88f545..c85e24b1219 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/remove_filtering_boxes_by_size.hpp b/src/common/transformations/include/transformations/common_optimizations/remove_filtering_boxes_by_size.hpp index ed5f97e20d9..09d6557e8de 100644 --- a/src/common/transformations/include/transformations/common_optimizations/remove_filtering_boxes_by_size.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/remove_filtering_boxes_by_size.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 3e2d3ababf0..0b3119c79da 100644 --- a/src/common/transformations/include/transformations/common_optimizations/reshape_prelu.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/reshape_prelu.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 b9f1caac1e0..49cce824c70 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/reverse_shape_and_type_infer.hpp b/src/common/transformations/include/transformations/common_optimizations/reverse_shape_and_type_infer.hpp index 9b0df29b3e0..4760bf487d8 100644 --- a/src/common/transformations/include/transformations/common_optimizations/reverse_shape_and_type_infer.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/reverse_shape_and_type_infer.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/pass.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 99c658aaa0d..55551f43b09 100644 --- a/src/common/transformations/include/transformations/common_optimizations/ric_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/ric_fusion.hpp @@ -4,10 +4,10 @@ #pragma once -#include -#include -#include -#include +#include "openvino/core/model.hpp" +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pass.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 96cd6c6d888..1c9e39159bb 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 e3bec3feaca..d727f2fa801 100644 --- a/src/common/transformations/include/transformations/common_optimizations/sequence_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/sequence_fusion.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 4a9ce18c711..7008571d466 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 e2aefa3ff51..41d40db4d56 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 a14547c280f..d4ff490bd2c 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 b36b45ef6f5..676bab506eb 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 337bb65bd21..1139a4104cb 100644 --- a/src/common/transformations/include/transformations/common_optimizations/softmax_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/softmax_fusion.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 4319d9cbc35..589edca60f2 100644 --- a/src/common/transformations/include/transformations/common_optimizations/softplus_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/softplus_fusion.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 96b14c160c4..574a9d95e9c 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 @@ -5,11 +5,12 @@ #pragma once #include -#include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 f365391f7e6..ee2fecb62b0 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 17334152a3e..8608d76ec53 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 @@ -5,11 +5,12 @@ #pragma once #include -#include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 cf88edb79dc..733e6c66a5f 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 @@ -5,11 +5,12 @@ #pragma once #include -#include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 1ab842d2703..d922c3578b7 100644 --- a/src/common/transformations/include/transformations/common_optimizations/strides_optimization.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/strides_optimization.hpp @@ -5,8 +5,9 @@ #pragma once #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 f60a1c05e25..393e0e58f66 100644 --- a/src/common/transformations/include/transformations/common_optimizations/subtract_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/subtract_fusion.hpp @@ -5,8 +5,9 @@ #pragma once #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp b/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp index 22b565950ff..aeec1b47276 100644 --- a/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 22e991d0172..6db82cf895c 100644 --- a/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp @@ -5,11 +5,12 @@ #pragma once #include -#include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 b0689263da7..beefcc0410c 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 @@ -5,11 +5,12 @@ #pragma once #include -#include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 8e03253b609..f146444b1f9 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 a54743f815a..59fc907774c 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 2b309f81fb9..e11001b49a1 100644 --- a/src/common/transformations/include/transformations/control_flow/unroll_if.hpp +++ b/src/common/transformations/include/transformations/control_flow/unroll_if.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 f33f9551fb4..149f725b7c9 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/convert_precision.hpp b/src/common/transformations/include/transformations/convert_precision.hpp index 81b218e3172..f9e929bd3c5 100644 --- a/src/common/transformations/include/transformations/convert_precision.hpp +++ b/src/common/transformations/include/transformations/convert_precision.hpp @@ -6,11 +6,12 @@ #include #include -#include -#include #include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/fix_rt_info.hpp b/src/common/transformations/include/transformations/fix_rt_info.hpp index 97c45c9af5f..a9c33645633 100644 --- a/src/common/transformations/include/transformations/fix_rt_info.hpp +++ b/src/common/transformations/include/transformations/fix_rt_info.hpp @@ -10,9 +10,9 @@ */ #include -#include #include +#include "openvino/pass/graph_rewrite.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 e155cf1c6c6..1731aa74934 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 @@ -4,10 +4,10 @@ #pragma once -#include #include #include "openvino/core/model.hpp" +#include "openvino/pass/graph_rewrite.hpp" #include "openvino/pass/serialize.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/init_node_info.hpp b/src/common/transformations/include/transformations/init_node_info.hpp index 900247b0ac5..f9d232b8421 100644 --- a/src/common/transformations/include/transformations/init_node_info.hpp +++ b/src/common/transformations/include/transformations/init_node_info.hpp @@ -10,9 +10,9 @@ */ #include -#include #include +#include "openvino/pass/graph_rewrite.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 b8c2ff5bdec..30645b72cd5 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 d36e3a96859..fa6fe3f2882 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 @@ -5,8 +5,9 @@ #pragma once #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" using namespace std; diff --git a/src/common/transformations/include/transformations/op_conversions/bidirectional_sequences_decomposition.hpp b/src/common/transformations/include/transformations/op_conversions/bidirectional_sequences_decomposition.hpp index 5df54c68d12..c96d2de79a1 100644 --- a/src/common/transformations/include/transformations/op_conversions/bidirectional_sequences_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/bidirectional_sequences_decomposition.hpp @@ -5,11 +5,12 @@ #pragma once #include -#include #include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 a1727362186..938cbf348b7 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 93c75804da6..9d3c4f937ec 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_broadcast3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_broadcast3.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 0dedd021895..4db0548df26 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 162bc87bdec..74f15d1aef6 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_convertlike.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_convertlike.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 f3de3888f02..e247a99b406 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 bf61e54e7e6..a3dd4c968a9 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 7736ba0d28a..689acd00b55 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_divide.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_divide.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 4679d7de254..f25dffda327 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 0dd08d49abb..ad1ac45be56 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 0efe5703a77..aebbf3055b6 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 ed5554f921d..db7b756d346 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gelu.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gelu.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 381e6b66d24..90017756954 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 b112c5d8abd..69a04a9580e 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 598d4371f73..5bac62071fe 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 @@ -5,11 +5,12 @@ #pragma once #include -#include -#include #include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 fc68c2e795a..8656e4dbcee 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 @@ -5,11 +5,12 @@ #pragma once #include -#include -#include #include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 6bfcef078b0..a0b18e3fcf1 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 d0eebc6acc3..9bb4a6f2fbd 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 b12ea47f237..292378f322f 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 fe745923b4e..4f5013fcaba 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_mod.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_mod.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 4bab06d8fc6..521744c78dd 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 496055fad5a..15195e08bbd 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 10353167d83..0640cde1d3a 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 abbe0117ad5..045306ff6d7 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_negative.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_negative.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 52f357b920d..219f786df2e 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 @@ -5,11 +5,12 @@ #pragma once #include -#include -#include #include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 7cad680fc05..45f50d0beb8 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 @@ -5,11 +5,12 @@ #pragma once #include -#include -#include #include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 e00626a4b71..7286b20ef39 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 409784d74f6..d495652aefc 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 2817b26a7cd..2b60d223b6b 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 b75ffe87250..c4314312318 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 47092b8d86b..55cd6df515d 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_reduce_to_pooling.hpp b/src/common/transformations/include/transformations/op_conversions/convert_reduce_to_pooling.hpp index d3e4b4ab1e2..a28237c8ae1 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_reduce_to_pooling.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_reduce_to_pooling.hpp @@ -6,12 +6,13 @@ #include #include -#include -#include -#include -#include #include +#include "openvino/core/rt_info.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_reduce_to_reshape.hpp b/src/common/transformations/include/transformations/op_conversions/convert_reduce_to_reshape.hpp index 674f01a3170..66e55a0733b 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_reduce_to_reshape.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_reduce_to_reshape.hpp @@ -6,12 +6,13 @@ #include #include -#include -#include -#include -#include #include +#include "openvino/core/rt_info.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 765c14179ed..b2cec8e05ee 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 00befe0cb1c..44418e5284e 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 af25d9413e7..95b66871bbc 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 a3679eabc52..72437ccc615 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp b/src/common/transformations/include/transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp index 3dedec4fa13..552adea901c 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 76fd27d8134..656e8a7a128 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_shapeof3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_shapeof3.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 e03ac37c728..21886c6c50c 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 9f024ac2f53..f9897dc4c0b 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 08eefe9e954..f8ba4261274 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 5ad549a58c3..c06f6c64a4e 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 536fa1548ae..bd9d3b790fc 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 1a092977d25..73cf1f4b3dc 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 bb768813af2..3d3782169c2 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_subtract.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_subtract.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/op_conversions/convert_ti_to_sequences.hpp b/src/common/transformations/include/transformations/op_conversions/convert_ti_to_sequences.hpp index 315731560ed..81ec7e98a53 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_ti_to_sequences.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_ti_to_sequences.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 d0260ac5057..554fee4f461 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 acfa45c46ff..0d317d90248 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_topk3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_topk3.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 08ac7e39e69..114848e27d2 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 862a5fee200..6104c1a47f8 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 8b2a2eb71d7..8b19b86a20c 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 33cae60db52..44d9556218b 100644 --- a/src/common/transformations/include/transformations/op_conversions/einsum_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/einsum_decomposition.hpp @@ -5,8 +5,9 @@ #pragma once #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 19bd51f4824..916c689e747 100644 --- a/src/common/transformations/include/transformations/op_conversions/fq_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/fq_decomposition.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/op_conversions/gather_normalize_negative_indices.hpp b/src/common/transformations/include/transformations/op_conversions/gather_normalize_negative_indices.hpp index 3fc31433874..bb912f5a980 100644 --- a/src/common/transformations/include/transformations/op_conversions/gather_normalize_negative_indices.hpp +++ b/src/common/transformations/include/transformations/op_conversions/gather_normalize_negative_indices.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 bfbdc670e8d..b35d20bc747 100644 --- a/src/common/transformations/include/transformations/op_conversions/gelu7_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/gelu7_downgrade.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 3076010fb9b..6485d3707a6 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 84b822d2cc8..c079330e5d4 100644 --- a/src/common/transformations/include/transformations/op_conversions/hsigmoid_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/hsigmoid_decomposition.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 30c4711c90e..8e19c03c7a4 100644 --- a/src/common/transformations/include/transformations/op_conversions/hswish_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/hswish_decomposition.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 3e0ab216a5a..9f762101950 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 605c0b7be66..62dc964437e 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 230b0ff6b8e..ccbe226bbee 100644 --- a/src/common/transformations/include/transformations/op_conversions/mvn6_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/mvn6_decomposition.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 7d1d3442585..990473b689c 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 @@ -5,11 +5,12 @@ #pragma once #include -#include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 03be100ac05..299b1ec6de4 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 @@ -5,11 +5,12 @@ #pragma once #include -#include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 5a3c51f7ebb..169e3e70e66 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 @@ -5,11 +5,12 @@ #pragma once #include -#include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 70b98f65837..df4061ee9f7 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 @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 42e4e536632..e2cc70c9351 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 @@ -5,8 +5,9 @@ #pragma once #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 b611f36fac8..dbcfaaabf41 100644 --- a/src/common/transformations/include/transformations/op_conversions/softmax_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/softmax_decomposition.hpp @@ -5,8 +5,9 @@ #pragma once #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 9e089b60b93..28d7954fbeb 100644 --- a/src/common/transformations/include/transformations/op_conversions/softplus_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/softplus_decomposition.hpp @@ -5,10 +5,11 @@ #pragma once #include -#include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 5f762eecc23..8f78fd59663 100644 --- a/src/common/transformations/include/transformations/op_conversions/softsign_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/softsign_decomposition.hpp @@ -5,8 +5,9 @@ #pragma once #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 1b4f95564fa..96c548acda7 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 @@ -5,8 +5,9 @@ #pragma once #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 43dc4ed714f..2935ed0846f 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 @@ -5,8 +5,9 @@ #pragma once #include -#include -#include + +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { diff --git a/src/common/transformations/include/transformations/rt_info/attributes.hpp b/src/common/transformations/include/transformations/rt_info/attributes.hpp index a6e69582598..39bb1bdee1d 100644 --- a/src/common/transformations/include/transformations/rt_info/attributes.hpp +++ b/src/common/transformations/include/transformations/rt_info/attributes.hpp @@ -7,22 +7,23 @@ #include #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include "openvino/core/any.hpp" +#include "openvino/core/preprocess/input_tensor_info.hpp" +#include "transformations/rt_info/decompression.hpp" +#include "transformations/rt_info/disable_constant_folding.hpp" +#include "transformations/rt_info/disable_fp16_compression.hpp" +#include "transformations/rt_info/fused_names_attribute.hpp" +#include "transformations/rt_info/nms_selected_indices.hpp" +#include "transformations/rt_info/old_api_map_element_type_attribute.hpp" +#include "transformations/rt_info/old_api_map_order_attribute.hpp" +#include "transformations/rt_info/preprocessing_attribute.hpp" +#include "transformations/rt_info/primitives_priority_attribute.hpp" +#include "transformations/rt_info/strides_property.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { class TRANSFORMATIONS_API Attributes { diff --git a/src/common/transformations/include/transformations/rt_info/disable_constant_folding.hpp b/src/common/transformations/include/transformations/rt_info/disable_constant_folding.hpp index 8458cfac625..6c7684363c9 100644 --- a/src/common/transformations/include/transformations/rt_info/disable_constant_folding.hpp +++ b/src/common/transformations/include/transformations/rt_info/disable_constant_folding.hpp @@ -10,9 +10,9 @@ #include #include #include -#include #include "openvino/pass/constant_folding.hpp" +#include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/rt_info/fused_names_attribute.hpp b/src/common/transformations/include/transformations/rt_info/fused_names_attribute.hpp index 38636da5be8..cd92aa54484 100644 --- a/src/common/transformations/include/transformations/rt_info/fused_names_attribute.hpp +++ b/src/common/transformations/include/transformations/rt_info/fused_names_attribute.hpp @@ -13,10 +13,10 @@ #include #include -#include #include #include +#include "openvino/core/rtti.hpp" #include "openvino/core/runtime_attribute.hpp" #include "transformations_visibility.hpp" diff --git a/src/common/transformations/include/transformations/rt_info/nms_selected_indices.hpp b/src/common/transformations/include/transformations/rt_info/nms_selected_indices.hpp index c0e2f084e7e..0719a5347cb 100644 --- a/src/common/transformations/include/transformations/rt_info/nms_selected_indices.hpp +++ b/src/common/transformations/include/transformations/rt_info/nms_selected_indices.hpp @@ -10,10 +10,10 @@ #include #include #include -#include #include "openvino/core/node.hpp" #include "openvino/core/runtime_attribute.hpp" +#include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/rt_info/old_api_map_element_type_attribute.hpp b/src/common/transformations/include/transformations/rt_info/old_api_map_element_type_attribute.hpp index b034cd14636..e3a89ff9a3a 100644 --- a/src/common/transformations/include/transformations/rt_info/old_api_map_element_type_attribute.hpp +++ b/src/common/transformations/include/transformations/rt_info/old_api_map_element_type_attribute.hpp @@ -13,13 +13,14 @@ #include #include -#include -#include #include #include -#include #include +#include "openvino/core/node.hpp" +#include "openvino/core/rtti.hpp" +#include "transformations_visibility.hpp" + namespace ov { /** * @ingroup ie_runtime_attr_api diff --git a/src/common/transformations/include/transformations/rt_info/old_api_map_order_attribute.hpp b/src/common/transformations/include/transformations/rt_info/old_api_map_order_attribute.hpp index 5319a3b27eb..67a7711e3c9 100644 --- a/src/common/transformations/include/transformations/rt_info/old_api_map_order_attribute.hpp +++ b/src/common/transformations/include/transformations/rt_info/old_api_map_order_attribute.hpp @@ -13,13 +13,14 @@ #include #include -#include -#include #include #include -#include #include +#include "openvino/core/node.hpp" +#include "openvino/core/rtti.hpp" +#include "transformations_visibility.hpp" + namespace ov { class OldApiMapOrder; diff --git a/src/common/transformations/include/transformations/rt_info/preprocessing_attribute.hpp b/src/common/transformations/include/transformations/rt_info/preprocessing_attribute.hpp index c311cffc66e..6145d9f6295 100644 --- a/src/common/transformations/include/transformations/rt_info/preprocessing_attribute.hpp +++ b/src/common/transformations/include/transformations/rt_info/preprocessing_attribute.hpp @@ -4,10 +4,9 @@ #pragma once -#include -#include -#include - +#include "openvino/core/node.hpp" +#include "openvino/core/rtti.hpp" +#include "openvino/core/runtime_attribute.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/rt_info/strides_property.hpp b/src/common/transformations/include/transformations/rt_info/strides_property.hpp index 665cbf62b53..2b5fbe477b4 100644 --- a/src/common/transformations/include/transformations/rt_info/strides_property.hpp +++ b/src/common/transformations/include/transformations/rt_info/strides_property.hpp @@ -4,11 +4,10 @@ #pragma once -#include - #include "openvino/core/node.hpp" #include "openvino/core/node_input.hpp" #include "openvino/core/runtime_attribute.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 9cd4aee2bbd..a0caa3e9700 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,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 24fc8f3369e..c89e6064f49 100644 --- a/src/common/transformations/include/transformations/smart_reshape/matmul_sr.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/matmul_sr.hpp @@ -6,8 +6,8 @@ #include #include -#include +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/mimic_set_batch_size.hpp b/src/common/transformations/include/transformations/smart_reshape/mimic_set_batch_size.hpp index 7cea10a4357..050b6c80d4c 100644 --- a/src/common/transformations/include/transformations/smart_reshape/mimic_set_batch_size.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/mimic_set_batch_size.hpp @@ -7,8 +7,8 @@ #include #include #include -#include +#include "openvino/pass/graph_rewrite.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 8cdbae0bd86..a782fbec0cf 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 @@ -5,9 +5,9 @@ #pragma once #include -#include #include +#include "openvino/pass/graph_rewrite.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 6c11d69b401..5e45c02124c 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 @@ -5,9 +5,9 @@ #pragma once #include -#include #include +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/smart_reshape/set_batch_size.hpp b/src/common/transformations/include/transformations/smart_reshape/set_batch_size.hpp index 7b246da02b7..192c1758d44 100644 --- a/src/common/transformations/include/transformations/smart_reshape/set_batch_size.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/set_batch_size.hpp @@ -5,9 +5,11 @@ #pragma once #include -#include #include +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace pass { 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 cd1083ab9aa..4649b565993 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,9 +4,8 @@ #pragma once -#include - #include "openvino/pass/graph_rewrite.hpp" +#include "transformations_visibility.hpp" namespace ov { namespace pass { 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 24ef53add29..60e0ccbefda 100644 --- a/src/common/transformations/include/transformations/smart_reshape/smart_reshape.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/smart_reshape.hpp @@ -5,9 +5,9 @@ #pragma once #include -#include #include +#include "openvino/pass/graph_rewrite.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 e19af7e982e..dd5304abecd 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 @@ -5,9 +5,9 @@ #pragma once #include -#include #include +#include "openvino/pass/graph_rewrite.hpp" #include "transformations_visibility.hpp" namespace ov { diff --git a/src/common/transformations/include/transformations/utils/utils.hpp b/src/common/transformations/include/transformations/utils/utils.hpp index c24a1e46c96..1af4dfbf155 100644 --- a/src/common/transformations/include/transformations/utils/utils.hpp +++ b/src/common/transformations/include/transformations/utils/utils.hpp @@ -9,14 +9,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include #include +#include "openvino/core/rt_info.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/pass/graph_rewrite.hpp" +#include "transformations/rt_info/attributes.hpp" +#include "transformations_visibility.hpp" + namespace ov { namespace op { namespace util { @@ -61,9 +62,9 @@ inline bool has_decompression_converts(const std::shared_ptr& f inline std::string create_ie_output_name(const Output& output) { std::string out_name; - NGRAPH_SUPPRESS_DEPRECATED_START + OPENVINO_SUPPRESS_DEPRECATED_START auto tensor_name = ov::descriptor::get_ov_tensor_legacy_name(output.get_tensor()); - NGRAPH_SUPPRESS_DEPRECATED_END + OPENVINO_SUPPRESS_DEPRECATED_END if (!tensor_name.empty()) { out_name = std::move(tensor_name); } else { diff --git a/src/common/transformations/src/itt.hpp b/src/common/transformations/src/itt.hpp index 58e21ec30f2..7b4edafdc04 100644 --- a/src/common/transformations/src/itt.hpp +++ b/src/common/transformations/src/itt.hpp @@ -9,26 +9,26 @@ #pragma once -#include -#include -#include +#include "openvino/cc/selective_build.h" +#include "openvino/itt.hpp" +#include "openvino/cc/ngraph/itt.hpp" -namespace ngraph { +namespace ov { namespace pass { namespace itt { namespace domains { - OV_ITT_DOMAIN(IETransform); + OV_ITT_DOMAIN(Transform); } // namespace domains } // namespace itt } // namespace pass -} // namespace ngraph +} // namespace ov OV_CC_DOMAINS(internal_op); /* * RUN_ON_FUNCTION_SCOPE macro allows to disable the run_on_function pass * MATCHER_SCOPE macro allows to disable the MatcherPass if matcher isn't applied - * INTERNAL_OP_SCOPE macro allows to disable parts of internal nGraph operations if they are not used + * INTERNAL_OP_SCOPE macro allows to disable parts of internal openvino operations if they are not used */ #if defined(SELECTIVE_BUILD_ANALYZER) diff --git a/src/common/transformations/src/ov_ops/augru_sequence.cpp b/src/common/transformations/src/ov_ops/augru_sequence.cpp index 4dc918d26c4..56b1215f918 100644 --- a/src/common/transformations/src/ov_ops/augru_sequence.cpp +++ b/src/common/transformations/src/ov_ops/augru_sequence.cpp @@ -6,7 +6,6 @@ #include "augru_sequence_shape_inference.hpp" #include "itt.hpp" -#include "ngraph/op/util/recurrent_sequence.hpp" using namespace std; diff --git a/src/common/transformations/src/ov_ops/generate_proposals_ie_internal.cpp b/src/common/transformations/src/ov_ops/generate_proposals_ie_internal.cpp index 43634c0f847..97bf3d9b597 100644 --- a/src/common/transformations/src/ov_ops/generate_proposals_ie_internal.cpp +++ b/src/common/transformations/src/ov_ops/generate_proposals_ie_internal.cpp @@ -5,9 +5,9 @@ #include "ov_ops/generate_proposals_ie_internal.hpp" #include -#include #include "itt.hpp" +#include "openvino/opsets/opset9.hpp" using namespace std; using namespace ov; diff --git a/src/common/transformations/src/ov_ops/nms_ie_internal.cpp b/src/common/transformations/src/ov_ops/nms_ie_internal.cpp index d5513af0d4c..c305304dbf7 100644 --- a/src/common/transformations/src/ov_ops/nms_ie_internal.cpp +++ b/src/common/transformations/src/ov_ops/nms_ie_internal.cpp @@ -5,9 +5,9 @@ #include "ov_ops/nms_ie_internal.hpp" #include -#include #include "itt.hpp" +#include "openvino/opsets/opset5.hpp" using namespace std; using namespace ov; @@ -19,8 +19,8 @@ op::internal::NonMaxSuppressionIEInternal::NonMaxSuppressionIEInternal(const Out const Output& score_threshold, int center_point_box, bool sort_result_descending, - const ngraph::element::Type& output_type, - const ngraph::element::Type& score_output_type) + const ov::element::Type& output_type, + const ov::element::Type& score_output_type) : Op({boxes, scores, max_output_boxes_per_class, iou_threshold, score_threshold}), m_center_point_box(center_point_box), m_sort_result_descending(sort_result_descending), @@ -37,8 +37,8 @@ op::internal::NonMaxSuppressionIEInternal::NonMaxSuppressionIEInternal(const Out const Output& soft_nms_sigma, int center_point_box, bool sort_result_descending, - const ngraph::element::Type& output_type, - const ngraph::element::Type& score_output_type) + const ov::element::Type& output_type, + const ov::element::Type& score_output_type) : Op({boxes, scores, max_output_boxes_per_class, iou_threshold, score_threshold, soft_nms_sigma}), m_center_point_box(center_point_box), m_sort_result_descending(sort_result_descending), @@ -48,7 +48,7 @@ op::internal::NonMaxSuppressionIEInternal::NonMaxSuppressionIEInternal(const Out } std::shared_ptr op::internal::NonMaxSuppressionIEInternal::clone_with_new_inputs( - const ngraph::OutputVector& new_args) const { + const ov::OutputVector& new_args) const { INTERNAL_OP_SCOPE(internal_NonMaxSuppressionIEInternal_clone_with_new_inputs); if (new_args.size() == 6) { return make_shared(new_args.at(0), diff --git a/src/common/transformations/src/ov_ops/nms_static_shape_ie.cpp b/src/common/transformations/src/ov_ops/nms_static_shape_ie.cpp index 7e6b5b3b0e4..bb77bd6f5f4 100644 --- a/src/common/transformations/src/ov_ops/nms_static_shape_ie.cpp +++ b/src/common/transformations/src/ov_ops/nms_static_shape_ie.cpp @@ -3,7 +3,7 @@ // // clang-format off -#include "ngraph/ops.hpp" +#include "openvino/op/ops.hpp" #include "ov_ops/nms_static_shape_ie.hpp" // clang-format on diff --git a/src/common/transformations/src/precomp.hpp b/src/common/transformations/src/precomp.hpp index de698a6d2f9..4c592248e62 100644 --- a/src/common/transformations/src/precomp.hpp +++ b/src/common/transformations/src/precomp.hpp @@ -4,8 +4,8 @@ #pragma once -#include -#include +#include "openvino/core/core.hpp" +#include "openvino/op/ops.hpp" #include #include diff --git a/src/common/transformations/src/transformations/common_optimizations/add_fake_quantize_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/add_fake_quantize_fusion.cpp index ffe213dfb6b..1395c2bc1df 100644 --- a/src/common/transformations/src/transformations/common_optimizations/add_fake_quantize_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/add_fake_quantize_fusion.cpp @@ -5,12 +5,11 @@ #include "transformations/common_optimizations/add_fake_quantize_fusion.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/add.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" @@ -20,19 +19,20 @@ #include "openvino/op/matmul.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::AddFakeQuantizeFusion::AddFakeQuantizeFusion() { MATCHER_SCOPE(AddFakeQuantizeFusion); auto input_pattern = pass::pattern::any_input(); - auto const_pattern = ngraph::pattern::wrap_type(); + auto const_pattern = ov::pass::pattern::wrap_type(); auto add_pattern = - ngraph::pattern::wrap_type({input_pattern, const_pattern}, pattern::consumers_count(1)); - auto fq_pattern = ngraph::pattern::wrap_type({add_pattern, - pass::pattern::any_input(), - pass::pattern::any_input(), - pass::pattern::any_input(), - pass::pattern::any_input()}); + ov::pass::pattern::wrap_type({input_pattern, const_pattern}, pattern::consumers_count(1)); + auto fq_pattern = ov::pass::pattern::wrap_type({add_pattern, + pass::pattern::any_input(), + pass::pattern::any_input(), + pass::pattern::any_input(), + pass::pattern::any_input()}); matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_value_map = m.get_pattern_value_map(); const auto& input = pattern_value_map.at(input_pattern); @@ -137,6 +137,6 @@ ov::pass::AddFakeQuantizeFusion::AddFakeQuantizeFusion() { return true; }; - auto m = std::make_shared(fq_pattern, matcher_name); + auto m = std::make_shared(fq_pattern, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/align_eltwise_input_ranks.cpp b/src/common/transformations/src/transformations/common_optimizations/align_eltwise_input_ranks.cpp index 4bc0d22a2d6..0fcbae8034a 100644 --- a/src/common/transformations/src/transformations/common_optimizations/align_eltwise_input_ranks.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/align_eltwise_input_ranks.cpp @@ -4,9 +4,7 @@ #include "transformations/common_optimizations/align_eltwise_input_ranks.hpp" -#include -#include - +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/fake_quantize.hpp" #include "openvino/op/multiply.hpp" @@ -14,6 +12,7 @@ #include "openvino/op/squared_difference.hpp" #include "openvino/op/util/binary_elementwise_comparison.hpp" #include "openvino/op/util/binary_elementwise_logical.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::AlignEltwiseInputRanks::AlignEltwiseInputRanks() { auto eltwise_pattern = pattern::wrap_type(node.get()); if (fq) { - if (fq->get_auto_broadcast() != ngraph::op::AutoBroadcastType::NUMPY) { + if (fq->get_auto_broadcast() != ov::op::AutoBroadcastType::NUMPY) { return false; } - } else if (node->get_autob() != ngraph::op::AutoBroadcastType::NUMPY) { + } else if (node->get_autob() != ov::op::AutoBroadcastType::NUMPY) { return false; } diff --git a/src/common/transformations/src/transformations/common_optimizations/batch_to_space_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/batch_to_space_fusion.cpp index 55f8dd59de2..f05b0146a0e 100644 --- a/src/common/transformations/src/transformations/common_optimizations/batch_to_space_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/batch_to_space_fusion.cpp @@ -5,18 +5,18 @@ #include "transformations/common_optimizations/batch_to_space_fusion.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/batch_to_space.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/depth_to_space.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/strided_slice.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::BatchToSpaceFusion::BatchToSpaceFusion() { @@ -130,6 +130,6 @@ ov::pass::BatchToSpaceFusion::BatchToSpaceFusion() { return true; }; - auto m = std::make_shared(reshape_or_transpose_after_pattern, matcher_name); + auto m = std::make_shared(reshape_or_transpose_after_pattern, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/binarize_weights.cpp b/src/common/transformations/src/transformations/common_optimizations/binarize_weights.cpp index fb834ad4b53..a558d1d2667 100644 --- a/src/common/transformations/src/transformations/common_optimizations/binarize_weights.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/binarize_weights.cpp @@ -5,16 +5,16 @@ #include "transformations/common_optimizations/binarize_weights.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convolution.hpp" #include "openvino/op/fake_quantize.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/reshape.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" using namespace ov; @@ -34,8 +34,8 @@ static std::vector quantize_weights(const Shape& weights_shape, Shape output_low_high_shape, const std::vector& output_low, const std::vector& output_high) { - NGRAPH_CHECK(shape_size(input_low_high_shape) == 1 || shape_size(input_low_high_shape) == weights_shape[0]); - NGRAPH_CHECK(shape_size(output_low_high_shape) == 1 || shape_size(output_low_high_shape) == weights_shape[0]); + OPENVINO_ASSERT(shape_size(input_low_high_shape) == 1 || shape_size(input_low_high_shape) == weights_shape[0]); + OPENVINO_ASSERT(shape_size(output_low_high_shape) == 1 || shape_size(output_low_high_shape) == weights_shape[0]); size_t out_feat_off = 1; for (size_t i = 1; i < weights_shape.size(); i++) out_feat_off *= weights_shape[i]; diff --git a/src/common/transformations/src/transformations/common_optimizations/broadcast_elementwise_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/broadcast_elementwise_fusion.cpp index 4005b6a276d..878521a0bfb 100644 --- a/src/common/transformations/src/transformations/common_optimizations/broadcast_elementwise_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/broadcast_elementwise_fusion.cpp @@ -4,20 +4,20 @@ #include "transformations/common_optimizations/broadcast_elementwise_fusion.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/broadcast.hpp" #include "openvino/op/shape_of.hpp" +#include "openvino/op/util/binary_elementwise_arithmetic.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" namespace { -bool can_eliminate_broadcast(const ngraph::Output& eltwise, - const ngraph::Output& eltwise_input, - const ngraph::Output& broadcast) { - auto b = std::dynamic_pointer_cast(eltwise.get_node_shared_ptr()); - if (!b || b->get_autob() == ngraph::op::AutoBroadcastType::NONE) { +bool can_eliminate_broadcast(const ov::Output& eltwise, + const ov::Output& eltwise_input, + const ov::Output& broadcast) { + auto b = std::dynamic_pointer_cast(eltwise.get_node_shared_ptr()); + if (!b || b->get_autob() == ov::op::AutoBroadcastType::NONE) { return false; } @@ -77,7 +77,7 @@ ov::pass::BroadcastElementwiseFusion::BroadcastElementwiseFusion() { auto eltwise_input = pattern::any_input(); auto eltwise = pattern::wrap_type({eltwise_input, broadcast}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_value = m.get_pattern_value_map(); const auto& m_eltwise_input = pattern_value.at(eltwise_input); @@ -96,6 +96,6 @@ ov::pass::BroadcastElementwiseFusion::BroadcastElementwiseFusion() { return false; }; - auto m = std::make_shared(eltwise, matcher_name); + auto m = std::make_shared(eltwise, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/broadcast_transition.cpp b/src/common/transformations/src/transformations/common_optimizations/broadcast_transition.cpp index 6b2cad4b7d0..c68016620ca 100644 --- a/src/common/transformations/src/transformations/common_optimizations/broadcast_transition.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/broadcast_transition.cpp @@ -5,8 +5,6 @@ #include "transformations/common_optimizations/broadcast_transition.hpp" #include -#include -#include #include #include "itt.hpp" @@ -16,6 +14,8 @@ #include "openvino/op/convert.hpp" #include "openvino/op/maximum.hpp" #include "openvino/op/shape_of.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::BroadcastTransition::BroadcastTransition() { diff --git a/src/common/transformations/src/transformations/common_optimizations/change_placeholder_types.cpp b/src/common/transformations/src/transformations/common_optimizations/change_placeholder_types.cpp index 6a85bdf2770..ea4e0819f12 100644 --- a/src/common/transformations/src/transformations/common_optimizations/change_placeholder_types.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/change_placeholder_types.cpp @@ -9,7 +9,7 @@ #include #include "itt.hpp" -#include "ngraph/node.hpp" +#include "openvino/core/node.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/shape_of.hpp" #include "transformations/rt_info/old_api_map_element_type_attribute.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/clamp_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/clamp_fusion.cpp index ff2bb99a43e..49f1a0e2cab 100644 --- a/src/common/transformations/src/transformations/common_optimizations/clamp_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/clamp_fusion.cpp @@ -5,30 +5,30 @@ #include "transformations/common_optimizations/clamp_fusion.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/clamp.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/maximum.hpp" #include "openvino/op/minimum.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::ClampFusion::ClampFusion() { MATCHER_SCOPE(ClampFusion); auto data_pattern = pass::pattern::any_input(); - auto min_const_pattern = ngraph::pattern::wrap_type(); - auto max_const_pattern = ngraph::pattern::wrap_type(); - auto max_pattern1 = - ngraph::pattern::wrap_type({data_pattern, min_const_pattern}, pattern::consumers_count(1)); - auto min_pattern1 = ngraph::pattern::wrap_type({max_pattern1, max_const_pattern}); - auto min_pattern2 = ngraph::pattern::wrap_type({data_pattern, max_const_pattern}); - auto max_pattern2 = - ngraph::pattern::wrap_type({min_pattern2, min_const_pattern}, pattern::consumers_count(1)); - auto root = std::make_shared(ngraph::OutputVector{min_pattern1, max_pattern2}); + auto min_const_pattern = ov::pass::pattern::wrap_type(); + auto max_const_pattern = ov::pass::pattern::wrap_type(); + auto max_pattern1 = ov::pass::pattern::wrap_type({data_pattern, min_const_pattern}, + pattern::consumers_count(1)); + auto min_pattern1 = ov::pass::pattern::wrap_type({max_pattern1, max_const_pattern}); + auto min_pattern2 = ov::pass::pattern::wrap_type({data_pattern, max_const_pattern}); + auto max_pattern2 = ov::pass::pattern::wrap_type({min_pattern2, min_const_pattern}, + pattern::consumers_count(1)); + auto root = std::make_shared(ov::OutputVector{min_pattern1, max_pattern2}); ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { auto pattern_map = m.get_pattern_value_map(); @@ -71,6 +71,6 @@ ov::pass::ClampFusion::ClampFusion() { return true; }; - auto m = std::make_shared(root, matcher_name); + auto m = std::make_shared(root, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/common_optimizations.cpp b/src/common/transformations/src/transformations/common_optimizations/common_optimizations.cpp index 6f9144e3a76..1638f2c4301 100644 --- a/src/common/transformations/src/transformations/common_optimizations/common_optimizations.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/common_optimizations.cpp @@ -5,18 +5,10 @@ #include "transformations/common_optimizations/common_optimizations.hpp" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "itt.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" #include "transformations/common_optimizations/add_fake_quantize_fusion.hpp" #include "transformations/common_optimizations/batch_to_space_fusion.hpp" #include "transformations/common_optimizations/binarize_weights.hpp" @@ -41,6 +33,7 @@ #include "transformations/common_optimizations/lin_op_sequence_fusion.hpp" #include "transformations/common_optimizations/mark_precision_sensitive_shapeof_subgraphs.hpp" #include "transformations/common_optimizations/matmul_multiply_fusion.hpp" +#include "transformations/common_optimizations/moc_transformations.hpp" #include "transformations/common_optimizations/mul_conv_fusion.hpp" #include "transformations/common_optimizations/mul_fake_quantize_fusion.hpp" #include "transformations/common_optimizations/mvn_fusion.hpp" @@ -53,6 +46,7 @@ #include "transformations/common_optimizations/reduce_merge.hpp" #include "transformations/common_optimizations/relu_fake_quantize_fusion.hpp" #include "transformations/common_optimizations/remove_filtering_boxes_by_size.hpp" +#include "transformations/common_optimizations/simplify_shape_of_sub_graph.hpp" #include "transformations/common_optimizations/skip_gather_before_transpose_and_reshape.hpp" #include "transformations/common_optimizations/softmax_fusion.hpp" #include "transformations/common_optimizations/softplus_fusion.hpp" @@ -61,8 +55,11 @@ #include "transformations/common_optimizations/split_squeeze_concat_fusion.hpp" #include "transformations/common_optimizations/strides_optimization.hpp" #include "transformations/common_optimizations/swish_fusion.hpp" +#include "transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp" #include "transformations/common_optimizations/transpose_sinking.hpp" #include "transformations/common_optimizations/transpose_to_reshape.hpp" +#include "transformations/common_optimizations/weights_dequantize_to_fake_quantize.hpp" +#include "transformations/control_flow/unroll_if.hpp" #include "transformations/fp16_compression/convert_compression_only_to_legacy.hpp" #include "transformations/fp16_compression/mark_decompression_convert_constant_folding.hpp" #include "transformations/init_node_info.hpp" @@ -107,17 +104,19 @@ #include "transformations/op_conversions/hswish_decomposition.hpp" #include "transformations/op_conversions/log_softmax_decomposition.hpp" #include "transformations/op_conversions/mvn6_decomposition.hpp" +#include "transformations/op_conversions/normalize_l2_decomposition.hpp" #include "transformations/op_conversions/reduce_l1_decomposition.hpp" #include "transformations/op_conversions/reduce_l2_decomposition.hpp" #include "transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.hpp" +#include "transformations/op_conversions/softmax_decomposition.hpp" +#include "transformations/op_conversions/softsign_decomposition.hpp" #include "transformations/op_conversions/unique_decomposition.hpp" bool ov::pass::CommonOptimizations::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(CommonOptimizations); - ngraph::pass::Manager manager(get_pass_config()); + ov::pass::Manager manager(get_pass_config()); manager.set_per_pass_validation(false); - using namespace ngraph::pass; using namespace ov::pass; REGISTER_PASS(manager, DisableDecompressionConvertConstantFolding) @@ -138,7 +137,7 @@ bool ov::pass::CommonOptimizations::run_on_model(const std::shared_ptrset_name("ngraph::pass::CommonFusions"); + common_fusions->set_name("ov::pass::CommonFusions"); manager.register_pass(); REGISTER_DISABLED_PASS(manager, ConvertPadToGroupConvolution) @@ -175,7 +174,7 @@ bool ov::pass::CommonOptimizations::run_on_model(const std::shared_ptrset_name("ngraph::pass::CommonDecompositions"); + decomp->set_name("ov::pass::CommonDecompositions"); // CF is required after all decompositions REGISTER_PASS(manager, ConstantFolding) @@ -194,7 +193,7 @@ bool ov::pass::CommonOptimizations::run_on_model(const std::shared_ptrset_name("ngraph::pass::MultiplyFusions"); + multiply_fusions->set_name("ov::pass::MultiplyFusions"); REGISTER_PASS(manager, ConstantFolding) REGISTER_PASS(manager, ConvertGather8ToGather7) // not plugins implemented gather8 @@ -226,7 +225,7 @@ bool ov::pass::CommonOptimizations::run_on_model(const std::shared_ptrset_name("ngraph::pass::FakeQuantizeFusions"); + fq_fusions->set_name("ov::pass::FakeQuantizeFusions"); // StridesOptimization should be at the very end // because we cannot insert any MaxPools since they may prevent diff --git a/src/common/transformations/src/transformations/common_optimizations/concat_reduce_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/concat_reduce_fusion.cpp index b4936a2844f..89da7598815 100644 --- a/src/common/transformations/src/transformations/common_optimizations/concat_reduce_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/concat_reduce_fusion.cpp @@ -5,13 +5,10 @@ #include "transformations/common_optimizations/concat_reduce_fusion.hpp" #include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/maximum.hpp" @@ -21,6 +18,8 @@ #include "openvino/op/reshape.hpp" #include "openvino/op/squeeze.hpp" #include "openvino/op/unsqueeze.hpp" +#include "openvino/pass/manager.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/common_optimizations/nop_elimination.hpp" #include "transformations/utils/utils.hpp" @@ -60,7 +59,7 @@ ov::pass::PullSqueezeThroughEltwise::PullSqueezeThroughEltwise() { } } - ngraph::OutputVector eltwise_inputs; + ov::OutputVector eltwise_inputs; for (size_t input_index = 0; input_index < eltwise_inputs_size; ++input_index) { const auto eltwise_input = eltwise->input_value(input_index); const auto new_input_node = ov::op::util::clone_try_fold(squeeze, {eltwise_input, squeeze->input_value(1)}); @@ -68,14 +67,14 @@ ov::pass::PullSqueezeThroughEltwise::PullSqueezeThroughEltwise() { if (!is_type(new_input_node)) register_new_node(as_type_ptr(new_input_node)); - ngraph::copy_runtime_info(squeeze, new_input_node); + ov::copy_runtime_info(squeeze, new_input_node); eltwise_inputs.push_back(new_input_node); } const auto new_eltwise = ov::op::util::clone_try_fold(eltwise, eltwise_inputs); new_eltwise->set_friendly_name(squeeze->get_friendly_name()); - ngraph::copy_runtime_info({eltwise, squeeze}, new_eltwise); - ngraph::replace_node(squeeze, new_eltwise); + ov::copy_runtime_info({eltwise, squeeze}, new_eltwise); + ov::replace_node(squeeze, new_eltwise); return true; }; @@ -86,10 +85,11 @@ ov::pass::PullSqueezeThroughEltwise::PullSqueezeThroughEltwise() { ov::pass::ReplaceConcatReduceByMinOrMax::ReplaceConcatReduceByMinOrMax() { MATCHER_SCOPE(ReplaceConcatReduceByMinOrMax); - auto concat_pattern = ngraph::pattern::wrap_type({pattern::any_input(), pattern::any_input()}); - auto reduce_axes_pattern = ngraph::pattern::wrap_type(); - auto reduce_pattern = - ngraph::pattern::wrap_type({concat_pattern, reduce_axes_pattern}); + auto concat_pattern = + ov::pass::pattern::wrap_type({pattern::any_input(), pattern::any_input()}); + auto reduce_axes_pattern = ov::pass::pattern::wrap_type(); + auto reduce_pattern = ov::pass::pattern::wrap_type( + {concat_pattern, reduce_axes_pattern}); ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); @@ -106,7 +106,7 @@ ov::pass::ReplaceConcatReduceByMinOrMax::ReplaceConcatReduceByMinOrMax() { } ReduceType reduce_type = get_reduce_type(reduce); - std::shared_ptr result_node; + std::shared_ptr result_node; switch (reduce_type) { case ReduceType::MAX: result_node = register_new_node(concat->input_value(0), concat->input_value(1)); @@ -122,7 +122,7 @@ ov::pass::ReplaceConcatReduceByMinOrMax::ReplaceConcatReduceByMinOrMax() { if (!reduce->get_keep_dims()) { const auto squeeze_axis_node = - ov::op::v0::Constant::create(ngraph::element::i64, {}, {*reduction_axes.begin()}); + ov::op::v0::Constant::create(ov::element::i64, {}, {*reduction_axes.begin()}); result_node = register_new_node(result_node, squeeze_axis_node); copy_runtime_info({concat, reduce}, result_node); } @@ -132,7 +132,7 @@ ov::pass::ReplaceConcatReduceByMinOrMax::ReplaceConcatReduceByMinOrMax() { return true; }; - auto m = std::make_shared(reduce_pattern, matcher_name); + auto m = std::make_shared(reduce_pattern, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/conv_mul_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/conv_mul_fusion.cpp index c8a43783de5..17c59bbb95b 100644 --- a/src/common/transformations/src/transformations/common_optimizations/conv_mul_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/conv_mul_fusion.cpp @@ -4,17 +4,16 @@ #include "transformations/common_optimizations/conv_mul_fusion.hpp" -#include -#include -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convolution.hpp" #include "openvino/op/group_conv.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/reshape.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" ov::pass::ConvolutionMultiplyFusion::ConvolutionMultiplyFusion() { MATCHER_SCOPE(ConvolutionMultiplyFusion); diff --git a/src/common/transformations/src/transformations/common_optimizations/conv_to_binary_conv.cpp b/src/common/transformations/src/transformations/common_optimizations/conv_to_binary_conv.cpp index 0e31d78e47b..e6d5c3ac145 100644 --- a/src/common/transformations/src/transformations/common_optimizations/conv_to_binary_conv.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/conv_to_binary_conv.cpp @@ -5,12 +5,11 @@ #include "transformations/common_optimizations/conv_to_binary_conv.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/add.hpp" #include "openvino/op/binary_convolution.hpp" #include "openvino/op/constant.hpp" @@ -19,6 +18,7 @@ #include "openvino/op/multiply.hpp" #include "openvino/op/reduce_sum.hpp" #include "openvino/op/reshape.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" static std::vector binarize_weights(const std::vector& weights) { std::vector out; @@ -38,14 +38,14 @@ static std::vector binarize_weights(const std::vector& weights) ov::pass::ConvToBinaryConv::ConvToBinaryConv() { MATCHER_SCOPE(ConvToBinaryConv); auto fq_pattern = - ngraph::pattern::wrap_type({pattern::any_input(), - pattern::any_input(), - pattern::any_input(), - ngraph::pattern::wrap_type(), - ngraph::pattern::wrap_type()}, - pattern::consumers_count(1)); - auto conv_pattern = ngraph::pattern::wrap_type( - {fq_pattern, ngraph::pattern::wrap_type()}); + ov::pass::pattern::wrap_type({pattern::any_input(), + pattern::any_input(), + pattern::any_input(), + ov::pass::pattern::wrap_type(), + ov::pass::pattern::wrap_type()}, + pattern::consumers_count(1)); + auto conv_pattern = ov::pass::pattern::wrap_type( + {fq_pattern, ov::pass::pattern::wrap_type()}); ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { auto conv = std::dynamic_pointer_cast(m.get_match_root()); @@ -122,7 +122,7 @@ ov::pass::ConvToBinaryConv::ConvToBinaryConv() { ov::op::v0::Constant::create(element::i64, Shape{weights_reduced_shape.size()}, weights_reduced_shape), false); OPENVINO_SUPPRESS_DEPRECATED_START - weights_reduced_reshaped = ngraph::get_constant_from_source(weights_reduced_reshaped); + weights_reduced_reshaped = ov::get_constant_from_source(weights_reduced_reshaped); OPENVINO_SUPPRESS_DEPRECATED_END auto add = std::make_shared(new_conv, weights_reduced_reshaped); auto mul = @@ -151,6 +151,6 @@ ov::pass::ConvToBinaryConv::ConvToBinaryConv() { return true; }; - auto m = std::make_shared(conv_pattern, matcher_name); + auto m = std::make_shared(conv_pattern, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.cpp b/src/common/transformations/src/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.cpp index 3f31ef61bbb..a59232ed2e4 100644 --- a/src/common/transformations/src/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/convert_nms_gather_path_to_unsigned.cpp @@ -4,14 +4,10 @@ #include "transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp" #include -#include -#include -#include -#include -#include #include "itt.hpp" -#include "ngraph/node.hpp" +#include "openvino/core/node.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/non_max_suppression.hpp" @@ -20,7 +16,11 @@ #include "openvino/op/squeeze.hpp" #include "openvino/op/strided_slice.hpp" #include "openvino/op/unsqueeze.hpp" +#include "openvino/op/util/broadcast_base.hpp" +#include "openvino/op/util/gather_base.hpp" #include "openvino/op/variadic_split.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/rt_info/nms_selected_indices.hpp" using namespace std; diff --git a/src/common/transformations/src/transformations/common_optimizations/convert_quantize_dequantize.cpp b/src/common/transformations/src/transformations/common_optimizations/convert_quantize_dequantize.cpp index fba26434a33..233f84cd0c8 100644 --- a/src/common/transformations/src/transformations/common_optimizations/convert_quantize_dequantize.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/convert_quantize_dequantize.cpp @@ -5,17 +5,17 @@ #include "transformations/common_optimizations/convert_quantize_dequantize.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/fake_quantize.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" // ConvertQuantizeDequantize converts Quantize/Dequantize pair to a single FakeQuantize. @@ -65,20 +65,20 @@ ov::pass::ConvertQuantizeDequantize::ConvertQuantizeDequantize() { auto data_pattern = pass::pattern::any_input(); auto input_low_pattern = pass::pattern::any_input(); auto input_high_pattern = pass::pattern::any_input(); - auto output_low_pattern = ngraph::pattern::wrap_type(); - auto output_high_pattern = ngraph::pattern::wrap_type(); - auto fq_pattern = ngraph::pattern::wrap_type( + auto output_low_pattern = ov::pass::pattern::wrap_type(); + auto output_high_pattern = ov::pass::pattern::wrap_type(); + auto fq_pattern = ov::pass::pattern::wrap_type( {data_pattern, input_low_pattern, input_high_pattern, output_low_pattern, output_high_pattern}); auto convert1_pattern = - ngraph::pattern::wrap_type({fq_pattern}, - pattern::type_matches_any({element::i8, element::u8})); + ov::pass::pattern::wrap_type({fq_pattern}, + pattern::type_matches_any({element::i8, element::u8})); auto convert2_pattern = - ngraph::pattern::wrap_type({convert1_pattern}, pattern::type_matches(element::f32)); + ov::pass::pattern::wrap_type({convert1_pattern}, pattern::type_matches(element::f32)); auto zero_point_pattern = pass::pattern::any_input(); - auto sub_pattern = ngraph::pattern::wrap_type({convert2_pattern, zero_point_pattern}, - pattern::consumers_count(1)); + auto sub_pattern = ov::pass::pattern::wrap_type({convert2_pattern, zero_point_pattern}, + pattern::consumers_count(1)); auto scale_pattern = pass::pattern::any_input(); - auto mul_pattern = ngraph::pattern::wrap_type({sub_pattern, scale_pattern}); + auto mul_pattern = ov::pass::pattern::wrap_type({sub_pattern, scale_pattern}); ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { auto pattern_map = m.get_pattern_value_map(); @@ -178,6 +178,6 @@ ov::pass::ConvertQuantizeDequantize::ConvertQuantizeDequantize() { return true; }; - auto m = std::make_shared(mul_pattern, matcher_name); + auto m = std::make_shared(mul_pattern, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/convolution_to_group_convolution.cpp b/src/common/transformations/src/transformations/common_optimizations/convolution_to_group_convolution.cpp index da5259e1a09..183506eedc7 100644 --- a/src/common/transformations/src/transformations/common_optimizations/convolution_to_group_convolution.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/convolution_to_group_convolution.cpp @@ -4,16 +4,15 @@ #include "openvino/op/convolution.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/group_conv.hpp" #include "openvino/op/split.hpp" #include "openvino/op/unsqueeze.hpp" #include "openvino/op/variadic_split.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/common_optimizations/convolution_to_group_convolution_fusion.hpp" static bool compare_convolutions(const ov::op::v1::Convolution* conv1, ov::Node* node) { diff --git a/src/common/transformations/src/transformations/common_optimizations/depth_to_space_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/depth_to_space_fusion.cpp index 4d235e40ed9..03ea54420be 100644 --- a/src/common/transformations/src/transformations/common_optimizations/depth_to_space_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/depth_to_space_fusion.cpp @@ -5,22 +5,22 @@ #include "transformations/common_optimizations/depth_to_space_fusion.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/depth_to_space.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" namespace { -bool check_block_first(const ngraph::PartialShape& shape_input, - const ngraph::PartialShape& shape_reshape_before, - const ngraph::AxisVector& permutation, - const ngraph::PartialShape& shape_reshape_after, +bool check_block_first(const ov::PartialShape& shape_input, + const ov::PartialShape& shape_reshape_before, + const ov::AxisVector& permutation, + const ov::PartialShape& shape_reshape_after, size_t& possible_block_size) { const auto input_rank = shape_input.rank(); auto spatial_dims = input_rank.get_length() - 2; @@ -29,11 +29,11 @@ bool check_block_first(const ngraph::PartialShape& shape_input, } possible_block_size = shape_reshape_before[1].get_length(); - ngraph::Dimension c_dim( + ov::Dimension c_dim( static_cast(shape_input[1].get_length() / std::pow(possible_block_size, spatial_dims))); // x' = reshape(data, [N, block_size, block_size, ..., block_size, C / (block_size ^ K), D1, D2, ..., DK]) - ngraph::PartialShape expected_shape = {shape_input[0]}; + ov::PartialShape expected_shape = {shape_input[0]}; for (int i = 0; i < spatial_dims; ++i) expected_shape.push_back(possible_block_size); expected_shape.push_back(c_dim); @@ -45,7 +45,7 @@ bool check_block_first(const ngraph::PartialShape& shape_input, } // x'' = transpose(x', [0, K + 1, K + 2, 1, K + 3, 2, K + 4, 3, ..., K + (K + 1), K]) - ngraph::AxisVector expected_permutation = {0, static_cast(spatial_dims + 1)}; + ov::AxisVector expected_permutation = {0, static_cast(spatial_dims + 1)}; for (int i = 2; i < input_rank.get_length(); ++i) { expected_permutation.push_back(spatial_dims + i); expected_permutation.push_back(i - 1); @@ -68,10 +68,10 @@ bool check_block_first(const ngraph::PartialShape& shape_input, return true; } -bool check_depth_first(const ngraph::PartialShape& shape_input, - const ngraph::PartialShape& shape_reshape_before, - const ngraph::AxisVector& permutation, - const ngraph::PartialShape& shape_reshape_after, +bool check_depth_first(const ov::PartialShape& shape_input, + const ov::PartialShape& shape_reshape_before, + const ov::AxisVector& permutation, + const ov::PartialShape& shape_reshape_after, size_t& possible_block_size) { const auto input_rank = shape_input.rank(); auto spatial_dims = input_rank.get_length() - 2; @@ -80,11 +80,10 @@ bool check_depth_first(const ngraph::PartialShape& shape_input, } possible_block_size = shape_reshape_before[2].get_length(); - ngraph::Dimension c_dim( - static_cast(shape_input[1].get_length() / std::pow(possible_block_size, spatial_dims))); + ov::Dimension c_dim(static_cast(shape_input[1].get_length() / std::pow(possible_block_size, spatial_dims))); // x' = reshape(data, [N, C / (block_size ^ K), block_size, block_size, ..., block_size, D1, D2, ..., DK]) - ngraph::PartialShape expected_shape = {shape_input[0], c_dim}; + ov::PartialShape expected_shape = {shape_input[0], c_dim}; for (int i = 0; i < spatial_dims; ++i) expected_shape.push_back(possible_block_size); for (int i = 2; i < input_rank.get_length(); ++i) @@ -95,7 +94,7 @@ bool check_depth_first(const ngraph::PartialShape& shape_input, } // x'' = transpose(x', [0, 1, K + 2, 2, K + 3, 3, K + 4, 4, ..., K + (K + 1), K + 1]) - ngraph::AxisVector expected_permutation = {0, 1}; + ov::AxisVector expected_permutation = {0, 1}; for (int i = 2; i < input_rank.get_length(); ++i) { expected_permutation.push_back(spatial_dims + i); expected_permutation.push_back(i); @@ -126,10 +125,10 @@ ov::pass::DepthToSpaceFusion::DepthToSpaceFusion() { auto input2 = pass::pattern::any_input(); auto input3 = pass::pattern::any_input(); auto reshape_before = - ngraph::pattern::wrap_type({input0, input1}, pattern::consumers_count(1)); + ov::pass::pattern::wrap_type({input0, input1}, pattern::consumers_count(1)); auto permute = - ngraph::pattern::wrap_type({reshape_before, input2}, pattern::consumers_count(1)); - auto reshape_after = ngraph::pattern::wrap_type({permute, input3}); + ov::pass::pattern::wrap_type({reshape_before, input2}, pattern::consumers_count(1)); + auto reshape_after = ov::pass::pattern::wrap_type({permute, input3}); ov::matcher_pass_callback callback = [](pattern::Matcher& m) { auto reshape_after = std::dynamic_pointer_cast(m.get_match_root()); @@ -158,7 +157,7 @@ ov::pass::DepthToSpaceFusion::DepthToSpaceFusion() { } // check that all dimensions except batch are static - if (std::any_of(p_shape_input.begin() + 1, p_shape_input.end(), [](const ngraph::Dimension& x) { + if (std::any_of(p_shape_input.begin() + 1, p_shape_input.end(), [](const ov::Dimension& x) { return x.is_dynamic(); })) { return false; @@ -172,7 +171,7 @@ ov::pass::DepthToSpaceFusion::DepthToSpaceFusion() { return false; } - ngraph::AxisVector permutation; + ov::AxisVector permutation; if (auto input_const = std::dynamic_pointer_cast(permute->get_input_node_shared_ptr(1))) { permutation = input_const->get_axis_vector_val(); } else { @@ -196,11 +195,11 @@ ov::pass::DepthToSpaceFusion::DepthToSpaceFusion() { auto depth_to_space = std::make_shared(reshape_before->input_value(0), mode, block_size); depth_to_space->set_friendly_name(reshape_after->get_friendly_name()); - ngraph::copy_runtime_info({reshape_before, permute, reshape_after}, depth_to_space); - ngraph::replace_node(reshape_after, depth_to_space); + ov::copy_runtime_info({reshape_before, permute, reshape_after}, depth_to_space); + ov::replace_node(reshape_after, depth_to_space); return true; }; - auto m = std::make_shared(reshape_after, matcher_name); + auto m = std::make_shared(reshape_after, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/dimension_tracking.cpp b/src/common/transformations/src/transformations/common_optimizations/dimension_tracking.cpp index bb7cae59ff3..d075cfca729 100644 --- a/src/common/transformations/src/transformations/common_optimizations/dimension_tracking.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/dimension_tracking.cpp @@ -5,11 +5,11 @@ #include "transformations/common_optimizations/dimension_tracking.hpp" #include -#include #include #include "itt.hpp" #include "openvino/core/dimension_tracker.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/convert_like.hpp" #include "openvino/op/convolution.hpp" @@ -108,10 +108,10 @@ P2Btype ov::batch_util::find_batch(const std::shared_ptr& f) { for (const auto& parameter : f->get_parameters()) { auto raw_parameter = parameter.get(); - std::vector layout_independent_results; + std::vector layout_independent_results; - std::deque nodes{raw_parameter}; - std::unordered_set visited; + std::deque nodes{raw_parameter}; + std::unordered_set visited; while (!nodes.empty()) { auto curr_node = nodes.front(); @@ -240,7 +240,7 @@ bool ov::batch_util::detach_detection_output(const std::shared_ptr& f if (ov::is_type(do_node) || ov::is_type(do_node)) { for (auto& new_result_src : do_node->input_values()) { auto new_result = std::make_shared(new_result_src); - ngraph::copy_runtime_info(result_node, new_result); + ov::copy_runtime_info(result_node, new_result); new_outputs.push_back(new_result); } outputs_to_delete.push_back(result_node); diff --git a/src/common/transformations/src/transformations/common_optimizations/disable_random_uniform_constant_folding.cpp b/src/common/transformations/src/transformations/common_optimizations/disable_random_uniform_constant_folding.cpp index 5f12ca907be..5257f9ec779 100644 --- a/src/common/transformations/src/transformations/common_optimizations/disable_random_uniform_constant_folding.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/disable_random_uniform_constant_folding.cpp @@ -5,10 +5,10 @@ #include "transformations/common_optimizations/disable_random_uniform_constant_folding.hpp" #include -#include -#include #include "openvino/op/random_uniform.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/rt_info/disable_constant_folding.hpp" ov::pass::DisableRandomUniformConstantFolding::DisableRandomUniformConstantFolding() { auto random_uniform = pattern::wrap_type(); @@ -18,6 +18,6 @@ ov::pass::DisableRandomUniformConstantFolding::DisableRandomUniformConstantFoldi return true; }; - auto m = std::make_shared(random_uniform, "DisableRandomUniformConstantFolding"); + auto m = std::make_shared(random_uniform, "DisableRandomUniformConstantFolding"); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/disable_shapeof_constant_folding.cpp b/src/common/transformations/src/transformations/common_optimizations/disable_shapeof_constant_folding.cpp index ac230daa093..ee5252516fe 100644 --- a/src/common/transformations/src/transformations/common_optimizations/disable_shapeof_constant_folding.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/disable_shapeof_constant_folding.cpp @@ -2,12 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/disable_shapeof_constant_folding.hpp" + #include -#include -#include -#include #include "openvino/op/shape_of.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/rt_info/disable_constant_folding.hpp" ov::pass::DisableShapeOfConstantFolding::DisableShapeOfConstantFolding() { auto shape_of = pattern::wrap_type([=](const Output& output) { @@ -20,6 +21,6 @@ ov::pass::DisableShapeOfConstantFolding::DisableShapeOfConstantFolding() { return true; }; - auto m = std::make_shared(shape_of, "DisableShapeOfConstantFolding"); + auto m = std::make_shared(shape_of, "DisableShapeOfConstantFolding"); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/divide_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/divide_fusion.cpp index ff2bf0d151e..baef021bd4b 100644 --- a/src/common/transformations/src/transformations/common_optimizations/divide_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/divide_fusion.cpp @@ -5,14 +5,14 @@ #include "transformations/common_optimizations/divide_fusion.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/power.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::DivideFusion::DivideFusion() { @@ -21,7 +21,7 @@ ov::pass::DivideFusion::DivideFusion() { auto p_pow_const = pattern::wrap_type(); auto p_pow = pattern::wrap_type({p_pow_input, p_pow_const}); auto p_mul_input = pattern::any_input(); - auto p_mul = ngraph::pattern::wrap_type({p_mul_input, p_pow}); + auto p_mul = ov::pass::pattern::wrap_type({p_mul_input, p_pow}); matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); @@ -43,6 +43,6 @@ ov::pass::DivideFusion::DivideFusion() { return true; }; - auto m = std::make_shared(p_mul, matcher_name); + auto m = std::make_shared(p_mul, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/dropout_with_random_uniform_replacer.cpp b/src/common/transformations/src/transformations/common_optimizations/dropout_with_random_uniform_replacer.cpp index 4ade33ef844..676a1741445 100644 --- a/src/common/transformations/src/transformations/common_optimizations/dropout_with_random_uniform_replacer.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/dropout_with_random_uniform_replacer.cpp @@ -5,37 +5,36 @@ #include "transformations/common_optimizations/dropout_with_random_uniform_replacer.hpp" #include -#include -#include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/broadcast.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/floor.hpp" #include "openvino/op/random_uniform.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::DropoutWithRandomUniformReplacer::DropoutWithRandomUniformReplacer() { MATCHER_SCOPE(DropoutWithRandomUniformReplacer); const auto shape_pattern = pass::pattern::any_input(); - const auto ru_min_const_pattern = ngraph::pattern::wrap_type(); - const auto ru_max_const_pattern = ngraph::pattern::wrap_type(); - const auto random_uniform_pattern = ngraph::pattern::wrap_type( + const auto ru_min_const_pattern = ov::pass::pattern::wrap_type(); + const auto ru_max_const_pattern = ov::pass::pattern::wrap_type(); + const auto random_uniform_pattern = ov::pass::pattern::wrap_type( {shape_pattern, ru_min_const_pattern, ru_max_const_pattern}, pattern::consumers_count(1)); - const auto convert_pattern = ngraph::pattern::wrap_type({random_uniform_pattern}); - const auto add_const_pattern = ngraph::pattern::wrap_type(); + const auto convert_pattern = ov::pass::pattern::wrap_type({random_uniform_pattern}); + const auto add_const_pattern = ov::pass::pattern::wrap_type(); const auto convert_or_random_uniform_pattern = std::make_shared(OutputVector{convert_pattern, random_uniform_pattern}); const auto add_pattern = - ngraph::pattern::wrap_type({convert_or_random_uniform_pattern, add_const_pattern}); + ov::pass::pattern::wrap_type({convert_or_random_uniform_pattern, add_const_pattern}); - const auto floor_pattern = ngraph::pattern::wrap_type({add_pattern}); + const auto floor_pattern = ov::pass::pattern::wrap_type({add_pattern}); ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); @@ -75,11 +74,11 @@ ov::pass::DropoutWithRandomUniformReplacer::DropoutWithRandomUniformReplacer() { broadcast->set_friendly_name(ru->get_friendly_name()); copy_runtime_info(ru, broadcast); - ngraph::replace_node(ru, broadcast); + ov::replace_node(ru, broadcast); return true; }; - auto m = std::make_shared(floor_pattern, matcher_name); + auto m = std::make_shared(floor_pattern, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/eliminate_duplicate_ti_inputs.cpp b/src/common/transformations/src/transformations/common_optimizations/eliminate_duplicate_ti_inputs.cpp index 1da956b2e67..5fde4e3e202 100644 --- a/src/common/transformations/src/transformations/common_optimizations/eliminate_duplicate_ti_inputs.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/eliminate_duplicate_ti_inputs.cpp @@ -5,10 +5,10 @@ #include "transformations/common_optimizations/eliminate_duplicate_ti_inputs.hpp" #include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/tensor_iterator.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/eliminate_unsqueeze_gather.cpp b/src/common/transformations/src/transformations/common_optimizations/eliminate_unsqueeze_gather.cpp index 4fb86591848..3f9b62f75f6 100644 --- a/src/common/transformations/src/transformations/common_optimizations/eliminate_unsqueeze_gather.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/eliminate_unsqueeze_gather.cpp @@ -4,15 +4,14 @@ #include "transformations/common_optimizations/eliminate_unsqueeze_gather.hpp" -#include -#include -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/unsqueeze.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace ov::op; diff --git a/src/common/transformations/src/transformations/common_optimizations/fold_subgraph_empty_inputs.cpp b/src/common/transformations/src/transformations/common_optimizations/fold_subgraph_empty_inputs.cpp index a685434f75c..75d600993cc 100644 --- a/src/common/transformations/src/transformations/common_optimizations/fold_subgraph_empty_inputs.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/fold_subgraph_empty_inputs.cpp @@ -6,10 +6,10 @@ #include #include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/fq_mul_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/fq_mul_fusion.cpp index e40abe0f47a..b655849fbd7 100644 --- a/src/common/transformations/src/transformations/common_optimizations/fq_mul_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/fq_mul_fusion.cpp @@ -5,18 +5,18 @@ #include "transformations/common_optimizations/fq_mul_fusion.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convolution.hpp" #include "openvino/op/fake_quantize.hpp" #include "openvino/op/group_conv.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/reshape.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" // This transformation multiplies the "output_low" and "output_high" inputs of the FQ operation @@ -46,13 +46,13 @@ ov::pass::FakeQuantizeMulFusion::FakeQuantizeMulFusion() { const auto fq_output_low_p = pass::pattern::any_input(); const auto fq_output_high_p = pass::pattern::any_input(); - const auto fq_node_p = ngraph::pattern::wrap_type( + const auto fq_node_p = ov::pass::pattern::wrap_type( {data_p, pass::pattern::any_input(), pass::pattern::any_input(), fq_output_low_p, fq_output_high_p}, pattern::consumers_count(1)); - const auto mul_constant_p = ngraph::pattern::wrap_type(); + const auto mul_constant_p = ov::pass::pattern::wrap_type(); const auto mul_node_p = - ngraph::pattern::wrap_type({fq_node_p, mul_constant_p}, pattern::consumers_count(1)); + ov::pass::pattern::wrap_type({fq_node_p, mul_constant_p}, pattern::consumers_count(1)); ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); @@ -156,6 +156,6 @@ ov::pass::FakeQuantizeMulFusion::FakeQuantizeMulFusion() { return true; }; - auto m = std::make_shared(mul_node_p, matcher_name); + auto m = std::make_shared(mul_node_p, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/fq_reshape_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/fq_reshape_fusion.cpp index c919a10d6fa..50ec00491fc 100644 --- a/src/common/transformations/src/transformations/common_optimizations/fq_reshape_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/fq_reshape_fusion.cpp @@ -5,26 +5,26 @@ #include "transformations/common_optimizations/fq_reshape_fusion.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/fake_quantize.hpp" #include "openvino/op/group_conv.hpp" #include "openvino/op/reshape.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::FakeQuantizeReshapeFusion::FakeQuantizeReshapeFusion() { MATCHER_SCOPE(FakeQuantizeReshapeFusion); - const auto fq_node_p = ngraph::pattern::wrap_type( - {ngraph::pattern::wrap_type(), // for weights only + const auto fq_node_p = ov::pass::pattern::wrap_type( + {ov::pass::pattern::wrap_type(), // for weights only pattern::any_input(), pattern::any_input(), pattern::any_input(), pattern::any_input()}, pattern::consumers_count(1)); - const auto reshape_node_p = ngraph::pattern::wrap_type( + const auto reshape_node_p = ov::pass::pattern::wrap_type( {fq_node_p, pattern::any_input()}, [](const Output& output) { // WA: check that all Reshape node consumers are not GroupConvolution operations @@ -46,10 +46,10 @@ ov::pass::FakeQuantizeReshapeFusion::FakeQuantizeReshapeFusion() { for (auto i = 1; i < 5; ++i) { Output limit_input = fq_node->input_value(i); auto limit_shape = limit_input.get_shape(); - NGRAPH_CHECK(limit_shape.size() <= original_data_rank, "FakeQuantize limit input has unexpected rank"); + OPENVINO_ASSERT(limit_shape.size() <= original_data_rank, "FakeQuantize limit input has unexpected rank"); if (limit_shape.size() < original_data_rank) // aligning limit rank with data rank limit_shape.insert(limit_shape.begin(), original_data_rank - limit_shape.size(), uint64_t(1)); - NGRAPH_CHECK(limit_shape.size() == original_data_rank, "FakeQuantize limit input has unexpected rank"); + OPENVINO_ASSERT(limit_shape.size() == original_data_rank, "FakeQuantize limit input has unexpected rank"); const auto& limit_size = shape_size(limit_shape); const auto& max_element = *std::max_element(limit_shape.begin(), limit_shape.end()); if (max_element == limit_size) { // per-tensor / per-channel limit @@ -83,6 +83,6 @@ ov::pass::FakeQuantizeReshapeFusion::FakeQuantizeReshapeFusion() { return true; }; - auto m = std::make_shared(reshape_node_p, matcher_name); + auto m = std::make_shared(reshape_node_p, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/fused_names_cleanup.cpp b/src/common/transformations/src/transformations/common_optimizations/fused_names_cleanup.cpp index 700a41ffe0a..6252b19171d 100644 --- a/src/common/transformations/src/transformations/common_optimizations/fused_names_cleanup.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/fused_names_cleanup.cpp @@ -4,8 +4,8 @@ #include "transformations/common_optimizations/fused_names_cleanup.hpp" -#include -#include +#include "openvino/cc/ngraph/itt.hpp" +#include "transformations/rt_info/fused_names_attribute.hpp" bool ov::pass::FusedNamesCleanup::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(FusedNamesCleanup); diff --git a/src/common/transformations/src/transformations/common_optimizations/gelu_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/gelu_fusion.cpp index c403aadd396..90b718f8067 100644 --- a/src/common/transformations/src/transformations/common_optimizations/gelu_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/gelu_fusion.cpp @@ -9,10 +9,9 @@ #include #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" @@ -21,6 +20,7 @@ #include "openvino/op/multiply.hpp" #include "openvino/op/power.hpp" #include "openvino/op/tanh.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::GeluFusionWithErfOne::GeluFusionWithErfOne() { @@ -28,18 +28,18 @@ ov::pass::GeluFusionWithErfOne::GeluFusionWithErfOne() { // Replaces a sub-graph with a Gelu op // Shared by every pattern: (1 + erf(x / sqrt(2))) auto input = pass::pattern::any_input(); - auto div_constant = ngraph::pattern::wrap_type(); - auto div = ngraph::pattern::wrap_type({input, div_constant}); - auto erf = ngraph::pattern::wrap_type({div}); - auto add_constant = ngraph::pattern::wrap_type(); - auto add = ngraph::pattern::wrap_type({add_constant, erf}); - auto mul_constant = ngraph::pattern::wrap_type(); + auto div_constant = ov::pass::pattern::wrap_type(); + auto div = ov::pass::pattern::wrap_type({input, div_constant}); + auto erf = ov::pass::pattern::wrap_type({div}); + auto add_constant = ov::pass::pattern::wrap_type(); + auto add = ov::pass::pattern::wrap_type({add_constant, erf}); + auto mul_constant = ov::pass::pattern::wrap_type(); // (0.5 * x) * (1 + erf(x / sqrt(2)) - auto mul_first = ngraph::pattern::wrap_type({input, mul_constant}); - auto mul = ngraph::pattern::wrap_type({mul_first, add}); + auto mul_first = ov::pass::pattern::wrap_type({input, mul_constant}); + auto mul = ov::pass::pattern::wrap_type({mul_first, add}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto x_output = pattern_to_output.at(input); @@ -66,7 +66,7 @@ ov::pass::GeluFusionWithErfOne::GeluFusionWithErfOne() { auto gelu = std::make_shared(x_output); gelu->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info( + ov::copy_runtime_info( { pattern_to_output.at(div).get_node_shared_ptr(), pattern_to_output.at(erf).get_node_shared_ptr(), @@ -75,11 +75,11 @@ ov::pass::GeluFusionWithErfOne::GeluFusionWithErfOne() { pattern_to_output.at(mul).get_node_shared_ptr(), }, gelu); - ngraph::replace_node(m.get_match_root(), gelu); + ov::replace_node(m.get_match_root(), gelu); return true; }; - auto m = std::make_shared(mul, matcher_name); + auto m = std::make_shared(mul, matcher_name); register_matcher(m, callback); } @@ -88,18 +88,18 @@ ov::pass::GeluFusionWithErfTwo::GeluFusionWithErfTwo() { // Replaces a sub-graph with a Gelu op // Shared by every pattern: (1 + erf(x / sqrt(2))) auto input = pass::pattern::any_input(); - auto div_constant = ngraph::pattern::wrap_type(); - auto div = ngraph::pattern::wrap_type({input, div_constant}); - auto erf = ngraph::pattern::wrap_type({div}); - auto add_constant = ngraph::pattern::wrap_type(); - auto add = ngraph::pattern::wrap_type({add_constant, erf}); - auto mul_constant = ngraph::pattern::wrap_type(); + auto div_constant = ov::pass::pattern::wrap_type(); + auto div = ov::pass::pattern::wrap_type({input, div_constant}); + auto erf = ov::pass::pattern::wrap_type({div}); + auto add_constant = ov::pass::pattern::wrap_type(); + auto add = ov::pass::pattern::wrap_type({add_constant, erf}); + auto mul_constant = ov::pass::pattern::wrap_type(); // 0.5 * (x * (1 + erf(x / sqrt(2))) - auto mul_first = ngraph::pattern::wrap_type({input, add}); - auto mul = ngraph::pattern::wrap_type({mul_constant, mul_first}); + auto mul_first = ov::pass::pattern::wrap_type({input, add}); + auto mul = ov::pass::pattern::wrap_type({mul_constant, mul_first}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto x_output = pattern_to_output.at(input); @@ -126,7 +126,7 @@ ov::pass::GeluFusionWithErfTwo::GeluFusionWithErfTwo() { auto gelu = std::make_shared(x_output); gelu->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info( + ov::copy_runtime_info( { pattern_to_output.at(div).get_node_shared_ptr(), pattern_to_output.at(erf).get_node_shared_ptr(), @@ -135,11 +135,11 @@ ov::pass::GeluFusionWithErfTwo::GeluFusionWithErfTwo() { pattern_to_output.at(mul).get_node_shared_ptr(), }, gelu); - ngraph::replace_node(m.get_match_root(), gelu); + ov::replace_node(m.get_match_root(), gelu); return true; }; - auto m = std::make_shared(mul, matcher_name); + auto m = std::make_shared(mul, matcher_name); register_matcher(m, callback); } @@ -148,18 +148,18 @@ ov::pass::GeluFusionWithErfThree::GeluFusionWithErfThree() { // Replaces a sub-graph with a Gelu op // Shared by every pattern: (1 + erf(x / sqrt(2))) auto input = pass::pattern::any_input(); - auto div_constant = ngraph::pattern::wrap_type(); - auto div = ngraph::pattern::wrap_type({input, div_constant}); - auto erf = ngraph::pattern::wrap_type({div}); - auto add_constant = ngraph::pattern::wrap_type(); - auto add = ngraph::pattern::wrap_type({add_constant, erf}); - auto mul_constant = ngraph::pattern::wrap_type(); + auto div_constant = ov::pass::pattern::wrap_type(); + auto div = ov::pass::pattern::wrap_type({input, div_constant}); + auto erf = ov::pass::pattern::wrap_type({div}); + auto add_constant = ov::pass::pattern::wrap_type(); + auto add = ov::pass::pattern::wrap_type({add_constant, erf}); + auto mul_constant = ov::pass::pattern::wrap_type(); // x * (0.5 * (1 + erf(x / sqrt(2))) - auto mul_first = ngraph::pattern::wrap_type({add, mul_constant}); - auto mul = ngraph::pattern::wrap_type({input, mul_first}); + auto mul_first = ov::pass::pattern::wrap_type({add, mul_constant}); + auto mul = ov::pass::pattern::wrap_type({input, mul_first}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto x_output = pattern_to_output.at(input); @@ -186,7 +186,7 @@ ov::pass::GeluFusionWithErfThree::GeluFusionWithErfThree() { auto gelu = std::make_shared(x_output); gelu->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info( + ov::copy_runtime_info( { pattern_to_output.at(div).get_node_shared_ptr(), pattern_to_output.at(erf).get_node_shared_ptr(), @@ -195,11 +195,11 @@ ov::pass::GeluFusionWithErfThree::GeluFusionWithErfThree() { pattern_to_output.at(mul).get_node_shared_ptr(), }, gelu); - ngraph::replace_node(m.get_match_root(), gelu); + ov::replace_node(m.get_match_root(), gelu); return true; }; - auto m = std::make_shared(mul, matcher_name); + auto m = std::make_shared(mul, matcher_name); register_matcher(m, callback); } @@ -261,28 +261,28 @@ ov::pass::GeluFusionWithTanh::GeluFusionWithTanh() { // x * (0.5 * (1 + tanh([sqrt(2 / pi)] * [x + 0.044715^3])) auto input = pass::pattern::any_input(); - auto pow_constant = ngraph::pattern::wrap_type(); - auto pow = ngraph::pattern::wrap_type({input, pow_constant}); + auto pow_constant = ov::pass::pattern::wrap_type(); + auto pow = ov::pass::pattern::wrap_type({input, pow_constant}); - auto mul_0_constant = ngraph::pattern::wrap_type(); - auto mul_0 = ngraph::pattern::wrap_type({pow, mul_0_constant}); + auto mul_0_constant = ov::pass::pattern::wrap_type(); + auto mul_0 = ov::pass::pattern::wrap_type({pow, mul_0_constant}); - auto add_0 = ngraph::pattern::wrap_type({input, mul_0}); + auto add_0 = ov::pass::pattern::wrap_type({input, mul_0}); - auto mul_1_constant = ngraph::pattern::wrap_type(); - auto mul_1 = ngraph::pattern::wrap_type({add_0, mul_1_constant}); + auto mul_1_constant = ov::pass::pattern::wrap_type(); + auto mul_1 = ov::pass::pattern::wrap_type({add_0, mul_1_constant}); - auto tanh = ngraph::pattern::wrap_type({mul_1}); + auto tanh = ov::pass::pattern::wrap_type({mul_1}); - auto add_1_constant = ngraph::pattern::wrap_type(); - auto add_1 = ngraph::pattern::wrap_type({tanh, add_1_constant}); + auto add_1_constant = ov::pass::pattern::wrap_type(); + auto add_1 = ov::pass::pattern::wrap_type({tanh, add_1_constant}); - auto mul_2_constant = ngraph::pattern::wrap_type(); - auto mul_2 = ngraph::pattern::wrap_type({add_1, mul_2_constant}); + auto mul_2_constant = ov::pass::pattern::wrap_type(); + auto mul_2 = ov::pass::pattern::wrap_type({add_1, mul_2_constant}); - auto mul_3 = ngraph::pattern::wrap_type({input, mul_2}); + auto mul_3 = ov::pass::pattern::wrap_type({input, mul_2}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto x_output = pattern_to_output.at(input); @@ -317,7 +317,7 @@ ov::pass::GeluFusionWithTanh::GeluFusionWithTanh() { auto gelu = std::make_shared(x_output, op::GeluApproximationMode::TANH); gelu->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info( + ov::copy_runtime_info( { pattern_to_output.at(pow).get_node_shared_ptr(), pattern_to_output.at(mul_0).get_node_shared_ptr(), @@ -329,10 +329,10 @@ ov::pass::GeluFusionWithTanh::GeluFusionWithTanh() { pattern_to_output.at(add_1).get_node_shared_ptr(), }, gelu); - ngraph::replace_node(m.get_match_root(), gelu); + ov::replace_node(m.get_match_root(), gelu); return true; }; - auto m = std::make_shared(mul_3, matcher_name); + auto m = std::make_shared(mul_3, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/hsigmoid_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/hsigmoid_fusion.cpp index 715c05fd1e2..1e46b78f77d 100644 --- a/src/common/transformations/src/transformations/common_optimizations/hsigmoid_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/hsigmoid_fusion.cpp @@ -5,10 +5,9 @@ #include "transformations/common_optimizations/hsigmoid_fusion.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/clamp.hpp" #include "openvino/op/constant.hpp" @@ -18,21 +17,22 @@ #include "openvino/op/minimum.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/relu.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::HSigmoidFusionWithReluDiv::HSigmoidFusionWithReluDiv() { MATCHER_SCOPE(HSigmoidFusionWithReluDiv); // Replaces a sub-graph ((min(Relu(x + 3), 6)) / 6 with a HSigmoid op. auto input = pass::pattern::any_input(); - auto add_constant = ngraph::pattern::wrap_type(); - auto add = ngraph::pattern::wrap_type({input, add_constant}); - auto relu = ngraph::pattern::wrap_type({add}); - auto min_constant = ngraph::pattern::wrap_type(); - auto min = ngraph::pattern::wrap_type({relu, min_constant}); - auto div_constant = ngraph::pattern::wrap_type(); - auto div = ngraph::pattern::wrap_type({min, div_constant}); + auto add_constant = ov::pass::pattern::wrap_type(); + auto add = ov::pass::pattern::wrap_type({input, add_constant}); + auto relu = ov::pass::pattern::wrap_type({add}); + auto min_constant = ov::pass::pattern::wrap_type(); + auto min = ov::pass::pattern::wrap_type({relu, min_constant}); + auto div_constant = ov::pass::pattern::wrap_type(); + auto div = ov::pass::pattern::wrap_type({min, div_constant}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto x_output = pattern_to_output.at(input); @@ -54,7 +54,7 @@ ov::pass::HSigmoidFusionWithReluDiv::HSigmoidFusionWithReluDiv() { auto hsigmoid = register_new_node(x_output); hsigmoid->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info( + ov::copy_runtime_info( { pattern_to_output.at(add).get_node_shared_ptr(), pattern_to_output.at(relu).get_node_shared_ptr(), @@ -62,11 +62,11 @@ ov::pass::HSigmoidFusionWithReluDiv::HSigmoidFusionWithReluDiv() { pattern_to_output.at(div).get_node_shared_ptr(), }, hsigmoid); - ngraph::replace_node(m.get_match_root(), hsigmoid); + ov::replace_node(m.get_match_root(), hsigmoid); return true; }; - auto m = std::make_shared(div, matcher_name); + auto m = std::make_shared(div, matcher_name); register_matcher(m, callback); } @@ -74,15 +74,15 @@ ov::pass::HSigmoidFusionWithReluMul::HSigmoidFusionWithReluMul() { MATCHER_SCOPE(HSigmoidFusionWithReluMul); // Replaces a sub-graph ((min(Relu(x + 3), 6)) * const(1/6) with a HSigmoid op. auto input = pass::pattern::any_input(); - auto add_constant = ngraph::pattern::wrap_type(); - auto add = ngraph::pattern::wrap_type({input, add_constant}); - auto relu = ngraph::pattern::wrap_type({add}); - auto min_constant = ngraph::pattern::wrap_type(); - auto min = ngraph::pattern::wrap_type({relu, min_constant}); - auto mul_constant = ngraph::pattern::wrap_type(); - auto mul_second = ngraph::pattern::wrap_type({min, mul_constant}); + auto add_constant = ov::pass::pattern::wrap_type(); + auto add = ov::pass::pattern::wrap_type({input, add_constant}); + auto relu = ov::pass::pattern::wrap_type({add}); + auto min_constant = ov::pass::pattern::wrap_type(); + auto min = ov::pass::pattern::wrap_type({relu, min_constant}); + auto mul_constant = ov::pass::pattern::wrap_type(); + auto mul_second = ov::pass::pattern::wrap_type({min, mul_constant}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto x_output = pattern_to_output.at(input); @@ -104,16 +104,16 @@ ov::pass::HSigmoidFusionWithReluMul::HSigmoidFusionWithReluMul() { auto hsigmoid = register_new_node(x_output); hsigmoid->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info({pattern_to_output.at(add).get_node_shared_ptr(), - pattern_to_output.at(relu).get_node_shared_ptr(), - pattern_to_output.at(min).get_node_shared_ptr(), - pattern_to_output.at(mul_second).get_node_shared_ptr()}, - hsigmoid); - ngraph::replace_node(m.get_match_root(), hsigmoid); + ov::copy_runtime_info({pattern_to_output.at(add).get_node_shared_ptr(), + pattern_to_output.at(relu).get_node_shared_ptr(), + pattern_to_output.at(min).get_node_shared_ptr(), + pattern_to_output.at(mul_second).get_node_shared_ptr()}, + hsigmoid); + ov::replace_node(m.get_match_root(), hsigmoid); return true; }; - auto m = std::make_shared(mul_second, matcher_name); + auto m = std::make_shared(mul_second, matcher_name); register_matcher(m, callback); } @@ -121,17 +121,17 @@ ov::pass::HSigmoidFusionWithoutRelu::HSigmoidFusionWithoutRelu() { MATCHER_SCOPE(HSigmoidFusionWithoutRelu); // Replaces a sub-graph (min(max(x + 3, 0), 6) / 6) with a HSigmoid op. auto input = pass::pattern::any_input(); - auto add_constant = ngraph::pattern::wrap_type(); - auto add = ngraph::pattern::wrap_type({input, add_constant}); - auto max_constant = ngraph::pattern::wrap_type(); - auto max = ngraph::pattern::wrap_type({add, max_constant}); - auto min_constant = ngraph::pattern::wrap_type(); - auto min = ngraph::pattern::wrap_type({max, min_constant}); - auto div_constant = ngraph::pattern::wrap_type(); - auto div = ngraph::pattern::wrap_type({min, div_constant}); - auto mul = ngraph::pattern::wrap_type({input, div}); + auto add_constant = ov::pass::pattern::wrap_type(); + auto add = ov::pass::pattern::wrap_type({input, add_constant}); + auto max_constant = ov::pass::pattern::wrap_type(); + auto max = ov::pass::pattern::wrap_type({add, max_constant}); + auto min_constant = ov::pass::pattern::wrap_type(); + auto min = ov::pass::pattern::wrap_type({max, min_constant}); + auto div_constant = ov::pass::pattern::wrap_type(); + auto div = ov::pass::pattern::wrap_type({min, div_constant}); + auto mul = ov::pass::pattern::wrap_type({input, div}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto x_output = pattern_to_output.at(input); @@ -156,16 +156,16 @@ ov::pass::HSigmoidFusionWithoutRelu::HSigmoidFusionWithoutRelu() { auto hsigmoid = register_new_node(x_output); hsigmoid->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info({pattern_to_output.at(add).get_node_shared_ptr(), - pattern_to_output.at(max).get_node_shared_ptr(), - pattern_to_output.at(min).get_node_shared_ptr(), - pattern_to_output.at(div).get_node_shared_ptr()}, - hsigmoid); - ngraph::replace_node(m.get_match_root(), hsigmoid); + ov::copy_runtime_info({pattern_to_output.at(add).get_node_shared_ptr(), + pattern_to_output.at(max).get_node_shared_ptr(), + pattern_to_output.at(min).get_node_shared_ptr(), + pattern_to_output.at(div).get_node_shared_ptr()}, + hsigmoid); + ov::replace_node(m.get_match_root(), hsigmoid); return true; }; - auto m = std::make_shared(div, matcher_name); + auto m = std::make_shared(div, matcher_name); register_matcher(m, callback); } @@ -173,13 +173,13 @@ ov::pass::HSigmoidFusionWithClampMul::HSigmoidFusionWithClampMul() { MATCHER_SCOPE(HSigmoidFusionWithClampMul); // Replaces a sub-graph (Clamp(x + 3, 0, 6) * const(1/6)) with a HSigmoid op. auto input = pass::pattern::any_input(); - auto add_constant = ngraph::pattern::wrap_type(); - auto add = ngraph::pattern::wrap_type({input, add_constant}); - auto clamp = ngraph::pattern::wrap_type({add}); - auto mul_constant = ngraph::pattern::wrap_type(); - auto mul_first = ngraph::pattern::wrap_type({clamp, mul_constant}); + auto add_constant = ov::pass::pattern::wrap_type(); + auto add = ov::pass::pattern::wrap_type({input, add_constant}); + auto clamp = ov::pass::pattern::wrap_type({add}); + auto mul_constant = ov::pass::pattern::wrap_type(); + auto mul_first = ov::pass::pattern::wrap_type({clamp, mul_constant}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto x_output = pattern_to_output.at(input); @@ -203,15 +203,15 @@ ov::pass::HSigmoidFusionWithClampMul::HSigmoidFusionWithClampMul() { auto hsigmoid = register_new_node(x_output); hsigmoid->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info({pattern_to_output.at(add).get_node_shared_ptr(), - pattern_to_output.at(clamp).get_node_shared_ptr(), - pattern_to_output.at(mul_first).get_node_shared_ptr()}, - hsigmoid); - ngraph::replace_node(m.get_match_root(), hsigmoid); + ov::copy_runtime_info({pattern_to_output.at(add).get_node_shared_ptr(), + pattern_to_output.at(clamp).get_node_shared_ptr(), + pattern_to_output.at(mul_first).get_node_shared_ptr()}, + hsigmoid); + ov::replace_node(m.get_match_root(), hsigmoid); return true; }; - auto m = std::make_shared(mul_first, matcher_name); + auto m = std::make_shared(mul_first, matcher_name); register_matcher(m, callback); } @@ -219,13 +219,13 @@ ov::pass::HSigmoidFusionWithClampDiv::HSigmoidFusionWithClampDiv() { MATCHER_SCOPE(HSigmoidFusionWithClampDiv); // Replaces a sub-graph (Clamp(x + 3, 0, 6) / 6) with a HSigmoid op. auto input = pass::pattern::any_input(); - auto add_constant = ngraph::pattern::wrap_type(); - auto add = ngraph::pattern::wrap_type({input, add_constant}); - auto clamp = ngraph::pattern::wrap_type({add}); - auto div_constant = ngraph::pattern::wrap_type(); - auto div = ngraph::pattern::wrap_type({clamp, div_constant}); + auto add_constant = ov::pass::pattern::wrap_type(); + auto add = ov::pass::pattern::wrap_type({input, add_constant}); + auto clamp = ov::pass::pattern::wrap_type({add}); + auto div_constant = ov::pass::pattern::wrap_type(); + auto div = ov::pass::pattern::wrap_type({clamp, div_constant}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto x_output = pattern_to_output.at(input); @@ -249,14 +249,14 @@ ov::pass::HSigmoidFusionWithClampDiv::HSigmoidFusionWithClampDiv() { auto hsigmoid = register_new_node(x_output); hsigmoid->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info({pattern_to_output.at(add).get_node_shared_ptr(), - pattern_to_output.at(clamp).get_node_shared_ptr(), - pattern_to_output.at(div).get_node_shared_ptr()}, - hsigmoid); - ngraph::replace_node(m.get_match_root(), hsigmoid); + ov::copy_runtime_info({pattern_to_output.at(add).get_node_shared_ptr(), + pattern_to_output.at(clamp).get_node_shared_ptr(), + pattern_to_output.at(div).get_node_shared_ptr()}, + hsigmoid); + ov::replace_node(m.get_match_root(), hsigmoid); return true; }; - auto m = std::make_shared(div, matcher_name); + auto m = std::make_shared(div, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/hswish_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/hswish_fusion.cpp index 69b31f38974..1a33eda0a95 100644 --- a/src/common/transformations/src/transformations/common_optimizations/hswish_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/hswish_fusion.cpp @@ -5,10 +5,9 @@ #include "transformations/common_optimizations/hswish_fusion.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/clamp.hpp" #include "openvino/op/constant.hpp" @@ -18,22 +17,23 @@ #include "openvino/op/minimum.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/relu.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::HSwishFusionWithReluDiv::HSwishFusionWithReluDiv() { MATCHER_SCOPE(HSwishFusionWithReluDiv); // Replaces a sub-graph (x * (min(Relu(x + 3), 6)) / 6 with a HSwish op. auto input = pass::pattern::any_input(); - auto add_constant = ngraph::pattern::wrap_type(); + auto add_constant = ov::pass::pattern::wrap_type(); auto add = std::make_shared(input, add_constant); auto relu = std::make_shared(add); - auto min_constant = ngraph::pattern::wrap_type(); + auto min_constant = ov::pass::pattern::wrap_type(); auto min = std::make_shared(relu, min_constant); auto mul = std::make_shared(input, min); - auto div_constant = ngraph::pattern::wrap_type(); + auto div_constant = ov::pass::pattern::wrap_type(); auto div = std::make_shared(mul, div_constant); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto x_output = pattern_to_output.at(input); @@ -55,7 +55,7 @@ ov::pass::HSwishFusionWithReluDiv::HSwishFusionWithReluDiv() { auto hswish = std::make_shared(x_output); hswish->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info( + ov::copy_runtime_info( { pattern_to_output.at(add_constant).get_node_shared_ptr(), pattern_to_output.at(add).get_node_shared_ptr(), @@ -67,11 +67,11 @@ ov::pass::HSwishFusionWithReluDiv::HSwishFusionWithReluDiv() { pattern_to_output.at(div).get_node_shared_ptr(), }, hswish); - ngraph::replace_node(m.get_match_root(), hswish); + ov::replace_node(m.get_match_root(), hswish); return true; }; - auto m = std::make_shared(div, matcher_name); + auto m = std::make_shared(div, matcher_name); register_matcher(m, callback); } @@ -79,16 +79,16 @@ ov::pass::HSwishFusionWithReluMul::HSwishFusionWithReluMul() { MATCHER_SCOPE(HSwishFusionWithReluMul); // Replaces a sub-graph (x * (min(Relu(x + 3), 6)) * const(1/6) with a HSwish op. auto input = pass::pattern::any_input(); - auto add_constant = ngraph::pattern::wrap_type(); + auto add_constant = ov::pass::pattern::wrap_type(); auto add = std::make_shared(input, add_constant); auto relu = std::make_shared(add); - auto min_constant = ngraph::pattern::wrap_type(); + auto min_constant = ov::pass::pattern::wrap_type(); auto min = std::make_shared(relu, min_constant); auto mul_first = std::make_shared(input, min); - auto mul_constant = ngraph::pattern::wrap_type(); + auto mul_constant = ov::pass::pattern::wrap_type(); auto mul_second = std::make_shared(mul_first, mul_constant); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto x_output = pattern_to_output.at(input); @@ -110,20 +110,20 @@ ov::pass::HSwishFusionWithReluMul::HSwishFusionWithReluMul() { auto hswish = std::make_shared(x_output); hswish->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info({pattern_to_output.at(add_constant).get_node_shared_ptr(), - pattern_to_output.at(add).get_node_shared_ptr(), - pattern_to_output.at(relu).get_node_shared_ptr(), - pattern_to_output.at(min_constant).get_node_shared_ptr(), - pattern_to_output.at(min).get_node_shared_ptr(), - pattern_to_output.at(mul_first).get_node_shared_ptr(), - pattern_to_output.at(mul_constant).get_node_shared_ptr(), - pattern_to_output.at(mul_second).get_node_shared_ptr()}, - hswish); - ngraph::replace_node(m.get_match_root(), hswish); + ov::copy_runtime_info({pattern_to_output.at(add_constant).get_node_shared_ptr(), + pattern_to_output.at(add).get_node_shared_ptr(), + pattern_to_output.at(relu).get_node_shared_ptr(), + pattern_to_output.at(min_constant).get_node_shared_ptr(), + pattern_to_output.at(min).get_node_shared_ptr(), + pattern_to_output.at(mul_first).get_node_shared_ptr(), + pattern_to_output.at(mul_constant).get_node_shared_ptr(), + pattern_to_output.at(mul_second).get_node_shared_ptr()}, + hswish); + ov::replace_node(m.get_match_root(), hswish); return true; }; - auto m = std::make_shared(mul_second, matcher_name); + auto m = std::make_shared(mul_second, matcher_name); register_matcher(m, callback); } @@ -134,19 +134,19 @@ ov::pass::HSwishFusionWithHSigmoid::HSwishFusionWithHSigmoid() { auto hsigmoid_pattern = pattern::wrap_type({input}, pattern::consumers_count(1)); auto mul_pattern = pattern::wrap_type({input, hsigmoid_pattern}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); auto hsigmoid = pattern_to_output.at(hsigmoid_pattern).get_node_shared_ptr(); auto mul = pattern_to_output.at(mul_pattern).get_node_shared_ptr(); auto hswish = std::make_shared(pattern_to_output.at(input)); hswish->set_friendly_name(mul->get_friendly_name()); - ngraph::copy_runtime_info({hsigmoid, mul}, hswish); - ngraph::replace_node(mul, hswish); + ov::copy_runtime_info({hsigmoid, mul}, hswish); + ov::replace_node(mul, hswish); return true; }; - auto m = std::make_shared(mul_pattern, matcher_name); + auto m = std::make_shared(mul_pattern, matcher_name); register_matcher(m, callback); } @@ -154,12 +154,12 @@ ov::pass::HSwishFusionWithClamp::HSwishFusionWithClamp() { MATCHER_SCOPE(HSwishFusionWithClampMul); // Replaces a sub-graph (Clamp(x + 3, 0, 6) * x) with a HSwish * 6. const auto input = pass::pattern::any_input(); - const auto add_constant = ngraph::pattern::wrap_type(); - const auto add = ngraph::pattern::wrap_type({input, add_constant}); - const auto clamp = ngraph::pattern::wrap_type({add}); - const auto mul = ngraph::pattern::wrap_type({clamp, input}); + const auto add_constant = ov::pass::pattern::wrap_type(); + const auto add = ov::pass::pattern::wrap_type({input, add_constant}); + const auto clamp = ov::pass::pattern::wrap_type({add}); + const auto mul = ov::pass::pattern::wrap_type({clamp, input}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); const auto x_output = pattern_to_output.at(input); const auto add_const_value = @@ -180,14 +180,14 @@ ov::pass::HSwishFusionWithClamp::HSwishFusionWithClamp() { auto new_mul = std::make_shared(hswish, new_mul_const); new_mul->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info({pattern_to_output.at(add).get_node_shared_ptr(), - pattern_to_output.at(clamp).get_node_shared_ptr(), - pattern_to_output.at(mul).get_node_shared_ptr()}, - {hswish, new_mul_const, new_mul}); - ngraph::replace_node(m.get_match_root(), new_mul); + ov::copy_runtime_info({pattern_to_output.at(add).get_node_shared_ptr(), + pattern_to_output.at(clamp).get_node_shared_ptr(), + pattern_to_output.at(mul).get_node_shared_ptr()}, + {hswish, new_mul_const, new_mul}); + ov::replace_node(m.get_match_root(), new_mul); return true; }; - auto m = std::make_shared(mul, matcher_name); + auto m = std::make_shared(mul, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/interpolate_sequence_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/interpolate_sequence_fusion.cpp index 1cc04f4aa21..4457373a9b8 100644 --- a/src/common/transformations/src/transformations/common_optimizations/interpolate_sequence_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/interpolate_sequence_fusion.cpp @@ -12,6 +12,7 @@ #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/divide.hpp" @@ -20,9 +21,7 @@ #include "openvino/op/interpolate.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/shape_of.hpp" -// #include -#include -#include +#include "openvino/pass/pattern/op/wrap_type.hpp" namespace { using namespace ov; @@ -84,9 +83,9 @@ bool can_be_fused(const std::shared_ptr& fst, return compatible_axes(fst_axes, snd_axes); } -ngraph::NodeVector subgraph_for_sizes_calculation_mode(const std::shared_ptr& fst, - const std::shared_ptr& snd, - pass::MatcherPass* matcherPass) { +ov::NodeVector subgraph_for_sizes_calculation_mode(const std::shared_ptr& fst, + const std::shared_ptr& snd, + pass::MatcherPass* matcherPass) { const auto fst_axes = get_interpolated_axes(fst); const auto snd_axes = get_interpolated_axes(snd); const auto fst_sizes_node = @@ -143,9 +142,9 @@ ngraph::NodeVector subgraph_for_sizes_calculation_mode(const std::shared_ptr& fst, - const std::shared_ptr& snd, - pass::MatcherPass* matcherPass) { +ov::NodeVector subgraph_for_scales_calculation_mode(const std::shared_ptr& fst, + const std::shared_ptr& snd, + pass::MatcherPass* matcherPass) { const auto fst_axes = get_interpolated_axes(fst); const auto snd_axes = get_interpolated_axes(snd); const auto fst_scales_node = @@ -211,8 +210,8 @@ ngraph::NodeVector subgraph_for_scales_calculation_mode(const std::shared_ptr(); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + auto interpolate_pattern = ov::pass::pattern::wrap_type(); + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto snd_interpolate = std::dynamic_pointer_cast(m.get_match_root()); if (!snd_interpolate) return false; @@ -242,6 +241,6 @@ ov::pass::InterpolateSequenceFusion::InterpolateSequenceFusion() { return true; }; - auto m = std::make_shared(interpolate_pattern, matcher_name); + auto m = std::make_shared(interpolate_pattern, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/leaky_relu_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/leaky_relu_fusion.cpp index 54493f7a5b1..2891643ef50 100644 --- a/src/common/transformations/src/transformations/common_optimizations/leaky_relu_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/leaky_relu_fusion.cpp @@ -5,14 +5,14 @@ #include "transformations/common_optimizations/leaky_relu_fusion.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/maximum.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/prelu.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::LeakyReluFusion::LeakyReluFusion() { @@ -20,8 +20,8 @@ ov::pass::LeakyReluFusion::LeakyReluFusion() { auto data_pattern = pass::pattern::any_input(); auto alpha_pattern = pass::pattern::any_input(pattern::has_static_shape()); auto multiply_pattern = - ngraph::pattern::wrap_type({data_pattern, alpha_pattern}, pattern::consumers_count(1)); - auto max_pattern = ngraph::pattern::wrap_type({data_pattern, multiply_pattern}); + ov::pass::pattern::wrap_type({data_pattern, alpha_pattern}, pattern::consumers_count(1)); + auto max_pattern = ov::pass::pattern::wrap_type({data_pattern, multiply_pattern}); ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); @@ -41,6 +41,6 @@ ov::pass::LeakyReluFusion::LeakyReluFusion() { return true; }; - auto m = std::make_shared(max_pattern, matcher_name); + auto m = std::make_shared(max_pattern, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/lin_op_sequence_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/lin_op_sequence_fusion.cpp index 8bbb750a51e..eaaa2a52312 100644 --- a/src/common/transformations/src/transformations/common_optimizations/lin_op_sequence_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/lin_op_sequence_fusion.cpp @@ -5,15 +5,15 @@ #include "transformations/common_optimizations/lin_op_sequence_fusion.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/multiply.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; @@ -21,12 +21,12 @@ ov::pass::AddMultiplyFusion::AddMultiplyFusion() { MATCHER_SCOPE(AddMultiplyFusion); // Create Add->Multiply pattern where Add has exactly one consumer auto m_data = pass::pattern::any_input(); - auto m_add_constant = ngraph::pattern::wrap_type(); - auto m_add = ngraph::pattern::wrap_type({m_data, m_add_constant}, pattern::consumers_count(1)); - auto m_mul_constant = ngraph::pattern::wrap_type(); - auto m_mul = ngraph::pattern::wrap_type({m_add, m_mul_constant}); + auto m_add_constant = ov::pass::pattern::wrap_type(); + auto m_add = ov::pass::pattern::wrap_type({m_data, m_add_constant}, pattern::consumers_count(1)); + auto m_mul_constant = ov::pass::pattern::wrap_type(); + auto m_mul = ov::pass::pattern::wrap_type({m_add, m_mul_constant}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) -> bool { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) -> bool { auto& label_to_output = m.get_pattern_value_map(); auto mul = label_to_output[m_mul].get_node_shared_ptr(); @@ -61,7 +61,7 @@ ov::pass::AddMultiplyFusion::AddMultiplyFusion() { return true; }; - auto m = std::make_shared(m_mul, matcher_name); + auto m = std::make_shared(m_mul, matcher_name); this->register_matcher(m, callback); } @@ -69,12 +69,12 @@ ov::pass::AddAddFusion::AddAddFusion() { MATCHER_SCOPE(AddAddFusion); // Create Add->Add pattern where first Add has exactly one consumer auto m_data = pass::pattern::any_input(); - auto m_add1_constant = ngraph::pattern::wrap_type(); - auto m_add1 = ngraph::pattern::wrap_type({m_data, m_add1_constant}, pattern::consumers_count(1)); - auto m_add2_constant = ngraph::pattern::wrap_type(); - auto m_add2 = ngraph::pattern::wrap_type({m_add1, m_add2_constant}); + auto m_add1_constant = ov::pass::pattern::wrap_type(); + auto m_add1 = ov::pass::pattern::wrap_type({m_data, m_add1_constant}, pattern::consumers_count(1)); + auto m_add2_constant = ov::pass::pattern::wrap_type(); + auto m_add2 = ov::pass::pattern::wrap_type({m_add1, m_add2_constant}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) -> bool { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) -> bool { auto& label_to_output = m.get_pattern_value_map(); auto add1 = label_to_output[m_add1].get_node_shared_ptr(); @@ -95,7 +95,7 @@ ov::pass::AddAddFusion::AddAddFusion() { return true; }; - auto m = std::make_shared(m_add2, matcher_name); + auto m = std::make_shared(m_add2, matcher_name); this->register_matcher(m, callback); } @@ -103,13 +103,13 @@ ov::pass::MultiplyMultiplyFusion::MultiplyMultiplyFusion() { MATCHER_SCOPE(MultiplyMultiplyFusion); // Create Multiply->Multiply pattern where first Multiply has exactly one consumer auto m_data = pass::pattern::any_input(); - auto m_mul1_constant = ngraph::pattern::wrap_type(); + auto m_mul1_constant = ov::pass::pattern::wrap_type(); auto m_mul1 = - ngraph::pattern::wrap_type({m_data, m_mul1_constant}, pattern::consumers_count(1)); - auto m_mul2_constant = ngraph::pattern::wrap_type(); - auto m_mul2 = ngraph::pattern::wrap_type({m_mul1, m_mul2_constant}); + ov::pass::pattern::wrap_type({m_data, m_mul1_constant}, pattern::consumers_count(1)); + auto m_mul2_constant = ov::pass::pattern::wrap_type(); + auto m_mul2 = ov::pass::pattern::wrap_type({m_mul1, m_mul2_constant}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) -> bool { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) -> bool { auto& label_to_output = m.get_pattern_value_map(); auto mul1 = label_to_output[m_mul1].get_node_shared_ptr(); @@ -131,6 +131,6 @@ ov::pass::MultiplyMultiplyFusion::MultiplyMultiplyFusion() { return true; }; - auto m = std::make_shared(m_mul2, matcher_name); + auto m = std::make_shared(m_mul2, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/matmul_const_transposes_extraction.cpp b/src/common/transformations/src/transformations/common_optimizations/matmul_const_transposes_extraction.cpp index 27a66ecc9fe..825fb20a3b7 100644 --- a/src/common/transformations/src/transformations/common_optimizations/matmul_const_transposes_extraction.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/matmul_const_transposes_extraction.cpp @@ -4,14 +4,13 @@ #include "transformations/common_optimizations/matmul_const_transposes_extraction.hpp" -#include -#include -#include - +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/fake_quantize.hpp" #include "openvino/op/matmul.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::MatMulConstTransposesExtraction::MatMulConstTransposesExtraction() { auto data_pattern = pattern::any_input(); diff --git a/src/common/transformations/src/transformations/common_optimizations/matmul_multiply_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/matmul_multiply_fusion.cpp index e7233c1042b..383879fa55b 100644 --- a/src/common/transformations/src/transformations/common_optimizations/matmul_multiply_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/matmul_multiply_fusion.cpp @@ -4,15 +4,14 @@ #include "transformations/common_optimizations/matmul_multiply_fusion.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/matmul.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" using namespace ov; @@ -26,7 +25,7 @@ static std::shared_ptr fuse_const_to_weights(const std::shared_ptr& int64_t weights_rank = static_cast(weights_shape.rank().get_length()); // Fuse if const is a scalar - if (ngraph::is_scalar(const_shape)) { + if (ov::is_scalar(const_shape)) { return std::make_shared(weights, mul_const); } diff --git a/src/common/transformations/src/transformations/common_optimizations/mish_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/mish_fusion.cpp index 3d0f5abcbe9..4e0ab2decc9 100644 --- a/src/common/transformations/src/transformations/common_optimizations/mish_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/mish_fusion.cpp @@ -5,11 +5,10 @@ #include "transformations/common_optimizations/mish_fusion.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/exp.hpp" @@ -17,33 +16,34 @@ #include "openvino/op/mish.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/tanh.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::MishFusion::MishFusion() { MATCHER_SCOPE(MishFusion); auto input = pass::pattern::any_input(); auto exp = std::make_shared(input); - auto add = std::make_shared(exp, ngraph::pattern::wrap_type()); + auto add = std::make_shared(exp, ov::pass::pattern::wrap_type()); auto log = std::make_shared(add); auto tanh = std::make_shared(log); auto mul = std::make_shared(input, tanh); - ov::matcher_pass_callback matcher_pass_callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback matcher_pass_callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto exp_input = pattern_to_output.at(input); auto mish = std::make_shared(exp_input); mish->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info({pattern_to_output.at(mul).get_node_shared_ptr(), - pattern_to_output.at(tanh).get_node_shared_ptr(), - pattern_to_output.at(log).get_node_shared_ptr(), - pattern_to_output.at(add).get_node_shared_ptr(), - pattern_to_output.at(exp).get_node_shared_ptr()}, - mish); - ngraph::replace_node(m.get_match_root(), mish); + ov::copy_runtime_info({pattern_to_output.at(mul).get_node_shared_ptr(), + pattern_to_output.at(tanh).get_node_shared_ptr(), + pattern_to_output.at(log).get_node_shared_ptr(), + pattern_to_output.at(add).get_node_shared_ptr(), + pattern_to_output.at(exp).get_node_shared_ptr()}, + mish); + ov::replace_node(m.get_match_root(), mish); return true; }; - auto m = std::make_shared(mul, matcher_name); + auto m = std::make_shared(mul, matcher_name); register_matcher(m, matcher_pass_callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/moc_transformations.cpp b/src/common/transformations/src/transformations/common_optimizations/moc_transformations.cpp index bfe4daa66d8..4dc4ecfb813 100644 --- a/src/common/transformations/src/transformations/common_optimizations/moc_transformations.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/moc_transformations.cpp @@ -2,95 +2,96 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/moc_transformations.hpp" + #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "itt.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/common_optimizations/adaptive_pool_to_reduce.hpp" +#include "transformations/common_optimizations/add_fake_quantize_fusion.hpp" +#include "transformations/common_optimizations/align_eltwise_input_ranks.hpp" +#include "transformations/common_optimizations/batch_to_space_fusion.hpp" +#include "transformations/common_optimizations/binarize_weights.hpp" +#include "transformations/common_optimizations/broadcast_elementwise_fusion.hpp" +#include "transformations/common_optimizations/clamp_fusion.hpp" +#include "transformations/common_optimizations/conv_mul_fusion.hpp" +#include "transformations/common_optimizations/conv_to_binary_conv.hpp" +#include "transformations/common_optimizations/convert_nms_gather_path_to_unsigned.hpp" +#include "transformations/common_optimizations/convert_quantize_dequantize.hpp" +#include "transformations/common_optimizations/convolution_to_group_convolution_fusion.hpp" +#include "transformations/common_optimizations/depth_to_space_fusion.hpp" +#include "transformations/common_optimizations/dilated_convolution_converter.hpp" +#include "transformations/common_optimizations/disable_random_uniform_constant_folding.hpp" +#include "transformations/common_optimizations/disable_shapeof_constant_folding.hpp" +#include "transformations/common_optimizations/divide_fusion.hpp" +#include "transformations/common_optimizations/eliminate_duplicate_ti_inputs.hpp" +#include "transformations/common_optimizations/eliminate_unsqueeze_gather.hpp" +#include "transformations/common_optimizations/fold_subgraph_empty_inputs.hpp" +#include "transformations/common_optimizations/fq_mul_fusion.hpp" +#include "transformations/common_optimizations/fq_reshape_fusion.hpp" +#include "transformations/common_optimizations/gelu_fusion.hpp" +#include "transformations/common_optimizations/gru_cell_fusion.hpp" +#include "transformations/common_optimizations/hsigmoid_fusion.hpp" +#include "transformations/common_optimizations/hswish_fusion.hpp" +#include "transformations/common_optimizations/leaky_relu_fusion.hpp" +#include "transformations/common_optimizations/lin_op_sequence_fusion.hpp" +#include "transformations/common_optimizations/matmul_const_transposes_extraction.hpp" +#include "transformations/common_optimizations/matmul_multiply_fusion.hpp" +#include "transformations/common_optimizations/mul_conv_fusion.hpp" +#include "transformations/common_optimizations/mul_fake_quantize_fusion.hpp" +#include "transformations/common_optimizations/mvn_fusion.hpp" +#include "transformations/common_optimizations/nearest_neighbor_upsampling_fusion.hpp" +#include "transformations/common_optimizations/nonzero_horizontal_fusion.hpp" +#include "transformations/common_optimizations/nop_elimination.hpp" +#include "transformations/common_optimizations/normalize_l2_fusion.hpp" +#include "transformations/common_optimizations/optimize_strided_slice.hpp" +#include "transformations/common_optimizations/pad_fusion.hpp" +#include "transformations/common_optimizations/prelu_fusion.hpp" +#include "transformations/common_optimizations/pull_through_reduce.hpp" +#include "transformations/common_optimizations/pull_transpose_through_fq.hpp" +#include "transformations/common_optimizations/push_constant_to_subgraph.hpp" +#include "transformations/common_optimizations/random_uniform_fusion.hpp" +#include "transformations/common_optimizations/reduce_reshape_fusion.hpp" +#include "transformations/common_optimizations/relu_fake_quantize_fusion.hpp" +#include "transformations/common_optimizations/remove_concat_zero_dim_input.hpp" +#include "transformations/common_optimizations/remove_filtering_boxes_by_size.hpp" +#include "transformations/common_optimizations/remove_multi_subgraph_op_dangling_params.hpp" +#include "transformations/common_optimizations/reshape_sequence_fusion.hpp" +#include "transformations/common_optimizations/ric_fusion.hpp" +#include "transformations/common_optimizations/select_with_one_value_condition.hpp" +#include "transformations/common_optimizations/sequence_fusion.hpp" +#include "transformations/common_optimizations/shared_ops_optimization.hpp" +#include "transformations/common_optimizations/shuffle_channels_fusion.hpp" +#include "transformations/common_optimizations/simplify_shape_of_sub_graph.hpp" +#include "transformations/common_optimizations/softmax_fusion.hpp" +#include "transformations/common_optimizations/softplus_fusion.hpp" +#include "transformations/common_optimizations/softplus_to_mish_fusion.hpp" +#include "transformations/common_optimizations/space_to_batch_fusion.hpp" +#include "transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.hpp" +#include "transformations/common_optimizations/split_squeeze_concat_fusion.hpp" +#include "transformations/common_optimizations/subtract_fusion.hpp" +#include "transformations/common_optimizations/swish_fusion.hpp" +#include "transformations/common_optimizations/transpose_sinking.hpp" +#include "transformations/common_optimizations/transpose_to_reshape.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/low_precision/mark_dequantization_subgraph.hpp" +#include "transformations/op_conversions/batch_norm_decomposition.hpp" +#include "transformations/op_conversions/convert_divide.hpp" +#include "transformations/op_conversions/convert_negative.hpp" +#include "transformations/op_conversions/convert_scatter_elements_to_scatter.hpp" +#include "transformations/op_conversions/convert_subtract.hpp" +#include "transformations/op_conversions/convert_ti_to_sequences.hpp" #include "transformations/resolve_names_collisions.hpp" +#include "transformations/smart_reshape/lstm_states_broadcast.hpp" +#include "transformations/smart_reshape/reshape_sinking.hpp" -bool ov::pass::MOCTransformations::run_on_model(const std::shared_ptr& f) { +bool ov::pass::MOCTransformations::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(MOCTransformations); - // To avoid issues with dynamism we make nGraph Function dynamic and after we apply all - // transformations we restore original shapes to the nGraph Function back - std::unordered_map input_shapes; + // To avoid issues with dynamism we make ov::Model dynamic and after we apply all + // transformations we restore original shapes to the ov::Model back + std::unordered_map input_shapes; if (!m_use_shapes) { for (auto&& param : f->get_parameters()) { input_shapes[param.get()] = param->get_partial_shape(); @@ -101,11 +102,11 @@ bool ov::pass::MOCTransformations::run_on_model(const std::shared_ptr( - element::TypeVector{ngraph::element::i8, ngraph::element::u8, ngraph::element::i4, ngraph::element::u4}); + element::TypeVector{ov::element::i8, ov::element::u8, ov::element::i4, ov::element::u4}); } if (!m_use_shapes) { manager.register_pass(); @@ -251,7 +252,7 @@ bool ov::pass::MOCTransformations::run_on_model(const std::shared_ptrget_parameters()) { param->set_partial_shape(input_shapes.at(param.get())); } diff --git a/src/common/transformations/src/transformations/common_optimizations/mul_conv_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/mul_conv_fusion.cpp index 3abcdd66495..cfbed99ff99 100644 --- a/src/common/transformations/src/transformations/common_optimizations/mul_conv_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/mul_conv_fusion.cpp @@ -5,28 +5,28 @@ #include "transformations/common_optimizations/mul_conv_fusion.hpp" #include -#include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convolution.hpp" #include "openvino/op/group_conv.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/reshape.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" ov::pass::MultiplyConvolutionFusion::MultiplyConvolutionFusion() { MATCHER_SCOPE(MultiplyConvolutionFusion); auto input_pattern = pattern::any_input(); - auto mul_const_pattern = ngraph::pattern::wrap_type(); - auto mul_pattern = ngraph::pattern::wrap_type({input_pattern, mul_const_pattern}, - pattern::consumers_count(1)); + auto mul_const_pattern = ov::pass::pattern::wrap_type(); + auto mul_pattern = ov::pass::pattern::wrap_type({input_pattern, mul_const_pattern}, + pattern::consumers_count(1)); auto weights_pattern = pass::pattern::any_input(pattern::has_static_shape()); - auto conv_pattern = ngraph::pattern::wrap_type({mul_pattern, weights_pattern}); + auto conv_pattern = ov::pass::pattern::wrap_type({mul_pattern, weights_pattern}); matcher_pass_callback callback = [=](pattern::Matcher& m) -> bool { const auto& pattern_to_output = m.get_pattern_value_map(); @@ -68,18 +68,18 @@ ov::pass::MultiplyConvolutionFusion::MultiplyConvolutionFusion() { return true; }; - auto m = std::make_shared(conv_pattern, matcher_name); + auto m = std::make_shared(conv_pattern, matcher_name); register_matcher(m, callback); } ov::pass::MultiplyGroupConvolutionFusion::MultiplyGroupConvolutionFusion() { MATCHER_SCOPE(MultiplyGroupConvolutionFusion); auto input_pattern = pattern::any_input(); - auto mul_const_pattern = ngraph::pattern::wrap_type(); - auto mul_pattern = ngraph::pattern::wrap_type({input_pattern, mul_const_pattern}, - pattern::consumers_count(1)); + auto mul_const_pattern = ov::pass::pattern::wrap_type(); + auto mul_pattern = ov::pass::pattern::wrap_type({input_pattern, mul_const_pattern}, + pattern::consumers_count(1)); auto weights_pattern = pass::pattern::any_input(pattern::has_static_shape()); - auto conv_pattern = ngraph::pattern::wrap_type({mul_pattern, weights_pattern}); + auto conv_pattern = ov::pass::pattern::wrap_type({mul_pattern, weights_pattern}); matcher_pass_callback callback = [=](pattern::Matcher& m) -> bool { const auto& pattern_to_output = m.get_pattern_value_map(); @@ -135,18 +135,19 @@ ov::pass::MultiplyGroupConvolutionFusion::MultiplyGroupConvolutionFusion() { return true; }; - auto m = std::make_shared(conv_pattern, matcher_name); + auto m = std::make_shared(conv_pattern, matcher_name); register_matcher(m, callback); } ov::pass::MultiplyConvolutionBackpropDataFusion::MultiplyConvolutionBackpropDataFusion() { MATCHER_SCOPE(MultiplyConvolutionBackpropDataFusion); auto input_pattern = pattern::any_input(); - auto mul_const_pattern = ngraph::pattern::wrap_type(); - auto mul_pattern = ngraph::pattern::wrap_type({input_pattern, mul_const_pattern}, - pattern::consumers_count(1)); + auto mul_const_pattern = ov::pass::pattern::wrap_type(); + auto mul_pattern = ov::pass::pattern::wrap_type({input_pattern, mul_const_pattern}, + pattern::consumers_count(1)); auto weights_pattern = pass::pattern::any_input(pattern::has_static_shape()); - auto conv_pattern = ngraph::pattern::wrap_type({mul_pattern, weights_pattern}); + auto conv_pattern = + ov::pass::pattern::wrap_type({mul_pattern, weights_pattern}); matcher_pass_callback callback = [=](pattern::Matcher& m) -> bool { const auto& pattern_to_output = m.get_pattern_value_map(); @@ -204,19 +205,19 @@ ov::pass::MultiplyConvolutionBackpropDataFusion::MultiplyConvolutionBackpropData return true; }; - auto m = std::make_shared(conv_pattern, matcher_name); + auto m = std::make_shared(conv_pattern, matcher_name); register_matcher(m, callback); } ov::pass::MultiplyGroupConvolutionBackpropDataFusion::MultiplyGroupConvolutionBackpropDataFusion() { MATCHER_SCOPE(MultiplyGroupConvolutionBackpropDataFusion); auto input_pattern = pattern::any_input(); - auto mul_const_pattern = ngraph::pattern::wrap_type(); - auto mul_pattern = ngraph::pattern::wrap_type({input_pattern, mul_const_pattern}, - pattern::consumers_count(1)); + auto mul_const_pattern = ov::pass::pattern::wrap_type(); + auto mul_pattern = ov::pass::pattern::wrap_type({input_pattern, mul_const_pattern}, + pattern::consumers_count(1)); auto weights_pattern = pass::pattern::any_input(pattern::has_static_shape()); auto conv_pattern = - ngraph::pattern::wrap_type({mul_pattern, weights_pattern}); + ov::pass::pattern::wrap_type({mul_pattern, weights_pattern}); matcher_pass_callback callback = [=](pattern::Matcher& m) -> bool { const auto& pattern_to_output = m.get_pattern_value_map(); @@ -276,6 +277,6 @@ ov::pass::MultiplyGroupConvolutionBackpropDataFusion::MultiplyGroupConvolutionBa return true; }; - auto m = std::make_shared(conv_pattern, matcher_name); + auto m = std::make_shared(conv_pattern, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/mul_fake_quantize_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/mul_fake_quantize_fusion.cpp index 7df054f38ab..0ece865690e 100644 --- a/src/common/transformations/src/transformations/common_optimizations/mul_fake_quantize_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/mul_fake_quantize_fusion.cpp @@ -5,31 +5,31 @@ #include "transformations/common_optimizations/mul_fake_quantize_fusion.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" #include "openvino/op/fake_quantize.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/reshape.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::MulFakeQuantizeFusion::MulFakeQuantizeFusion() { MATCHER_SCOPE(MulFakeQuantizeFusion); auto input_pattern = pass::pattern::any_input(); - auto const_pattern = ngraph::pattern::wrap_type(); + auto const_pattern = ov::pass::pattern::wrap_type(); auto mul_pattern = - ngraph::pattern::wrap_type({input_pattern, const_pattern}, pattern::consumers_count(1)); - auto fq_pattern = ngraph::pattern::wrap_type({mul_pattern, - pass::pattern::any_input(), - pass::pattern::any_input(), - pass::pattern::any_input(), - pass::pattern::any_input()}); + ov::pass::pattern::wrap_type({input_pattern, const_pattern}, pattern::consumers_count(1)); + auto fq_pattern = ov::pass::pattern::wrap_type({mul_pattern, + pass::pattern::any_input(), + pass::pattern::any_input(), + pass::pattern::any_input(), + pass::pattern::any_input()}); ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_value_map = m.get_pattern_value_map(); const auto& input = pattern_value_map.at(input_pattern); @@ -128,6 +128,6 @@ ov::pass::MulFakeQuantizeFusion::MulFakeQuantizeFusion() { return true; }; - auto m = std::make_shared(fq_pattern, matcher_name); + auto m = std::make_shared(fq_pattern, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/mvn_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/mvn_fusion.cpp index 3423b63ff9a..6554c16fe62 100644 --- a/src/common/transformations/src/transformations/common_optimizations/mvn_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/mvn_fusion.cpp @@ -5,12 +5,10 @@ #include "transformations/common_optimizations/mvn_fusion.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" @@ -22,11 +20,13 @@ #include "openvino/op/sqrt.hpp" #include "openvino/op/squared_difference.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" template -std::function)> value_is_equal_to(const std::vector& ref_values) { - return [ref_values](ngraph::Output output) -> bool { +std::function)> value_is_equal_to(const std::vector& ref_values) { + return [ref_values](ov::Output output) -> bool { auto node = output.get_node_shared_ptr(); if (auto const_node = std::dynamic_pointer_cast(node)) { return const_node->template cast_vector() == ref_values; @@ -110,7 +110,7 @@ ov::pass::MVNFusionWithoutConstants::MVNFusionWithoutConstants() { auto div_alt = pattern::wrap_type({sub1, outsideOrInside}); const auto powerMulOrDiv = std::make_shared(OutputVector{div, div_alt}); - ov::matcher_pass_callback matcher_pass_callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback matcher_pass_callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto exp_input = pattern_to_output.at(x); @@ -148,10 +148,10 @@ ov::pass::MVNFusionWithoutConstants::MVNFusionWithoutConstants() { } } - ngraph::NodeVector nodes_to_copy_info({pattern_to_output.at(mean1).get_node_shared_ptr(), - pattern_to_output.at(sub1).get_node_shared_ptr(), - pattern_to_output.at(power).get_node_shared_ptr(), - pattern_to_output.at(mean3).get_node_shared_ptr()}); + ov::NodeVector nodes_to_copy_info({pattern_to_output.at(mean1).get_node_shared_ptr(), + pattern_to_output.at(sub1).get_node_shared_ptr(), + pattern_to_output.at(power).get_node_shared_ptr(), + pattern_to_output.at(mean3).get_node_shared_ptr()}); op::MVNEpsMode mode; if (pattern_to_output.count(add_eps_os)) { @@ -192,12 +192,12 @@ ov::pass::MVNFusionWithoutConstants::MVNFusionWithoutConstants() { } mvn->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info(nodes_to_copy_info, mvn); - ngraph::replace_node(m.get_match_root(), mvn); + ov::copy_runtime_info(nodes_to_copy_info, mvn); + ov::replace_node(m.get_match_root(), mvn); return true; }; - auto m = std::make_shared(powerMulOrDiv, matcher_name); + auto m = std::make_shared(powerMulOrDiv, matcher_name); register_matcher(m, matcher_pass_callback); } @@ -255,7 +255,7 @@ ov::pass::MVNFusionWithConstantsInside::MVNFusionWithConstantsInside() { // gamma * (x - ReduceMean(x, axes)) / Sqrt(ReduceMean((x - ReduceMean(x, axes)) ^ 2) + eps) + beta auto add = pattern::wrap_type({mul2, sub}); - ov::matcher_pass_callback matcher_pass_callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback matcher_pass_callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto x_output = pattern_to_output.at(x); @@ -297,21 +297,21 @@ ov::pass::MVNFusionWithConstantsInside::MVNFusionWithConstantsInside() { auto mul_gamma = std::make_shared(mvn, const_gamma_node); auto add_beta = std::make_shared(mul_gamma, const_beta_node); - ngraph::copy_runtime_info({pattern_to_output.at(mean1).get_node_shared_ptr(), - pattern_to_output.at(squared_difference).get_node_shared_ptr(), - pattern_to_output.at(add_eps).get_node_shared_ptr(), - pattern_to_output.at(power).get_node_shared_ptr(), - pattern_to_output.at(mul1).get_node_shared_ptr(), - pattern_to_output.at(mul2).get_node_shared_ptr(), - pattern_to_output.at(mul3).get_node_shared_ptr(), - pattern_to_output.at(sub).get_node_shared_ptr(), - pattern_to_output.at(add).get_node_shared_ptr()}, - {mvn, const_gamma_node, mul_gamma, const_beta_node, add_beta}); + ov::copy_runtime_info({pattern_to_output.at(mean1).get_node_shared_ptr(), + pattern_to_output.at(squared_difference).get_node_shared_ptr(), + pattern_to_output.at(add_eps).get_node_shared_ptr(), + pattern_to_output.at(power).get_node_shared_ptr(), + pattern_to_output.at(mul1).get_node_shared_ptr(), + pattern_to_output.at(mul2).get_node_shared_ptr(), + pattern_to_output.at(mul3).get_node_shared_ptr(), + pattern_to_output.at(sub).get_node_shared_ptr(), + pattern_to_output.at(add).get_node_shared_ptr()}, + {mvn, const_gamma_node, mul_gamma, const_beta_node, add_beta}); add_beta->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::replace_node(m.get_match_root(), add_beta); + ov::replace_node(m.get_match_root(), add_beta); return true; }; - auto m = std::make_shared(add, matcher_name); + auto m = std::make_shared(add, matcher_name); register_matcher(m, matcher_pass_callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/nearest_neighbor_upsampling_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/nearest_neighbor_upsampling_fusion.cpp index e6892268483..13d55cfbbfe 100644 --- a/src/common/transformations/src/transformations/common_optimizations/nearest_neighbor_upsampling_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/nearest_neighbor_upsampling_fusion.cpp @@ -6,15 +6,12 @@ #include #include -#include -#include -#include -#include #include #include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/interpolate.hpp" @@ -23,6 +20,9 @@ #include "openvino/op/shape_of.hpp" #include "openvino/op/strided_slice.hpp" #include "openvino/op/unsqueeze.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" namespace { @@ -38,7 +38,7 @@ std::vector get_scales_from_mul_const_shape(const Shape& s, uint64_t inpu if (input_rank < 4 || s.size() != 2 * input_rank - 2) return {}; - ngraph::Shape expected_shape(2 * input_rank - 2, 1); + ov::Shape expected_shape(2 * input_rank - 2, 1); std::vector scales(input_rank - 2); for (uint64_t i = 1; i <= input_rank - 2; ++i) { expected_shape[2 * i] = s[2 * i]; @@ -281,7 +281,7 @@ ov::pass::NearestNeighborUpsamplingFusion::NearestNeighborUpsamplingFusion() { auto mul = pattern::wrap_type({reshape_1, mul_const}); auto reshape_2 = pattern::wrap_type({mul, concat_2}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); const auto reshape_2_node = @@ -384,6 +384,6 @@ ov::pass::NearestNeighborUpsamplingFusion::NearestNeighborUpsamplingFusion() { return true; }; - auto m = std::make_shared(reshape_2, matcher_name); + auto m = std::make_shared(reshape_2, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/nonzero_horizontal_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/nonzero_horizontal_fusion.cpp index 508d1332356..efa6a36eee1 100644 --- a/src/common/transformations/src/transformations/common_optimizations/nonzero_horizontal_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/nonzero_horizontal_fusion.cpp @@ -5,11 +5,11 @@ #include "transformations/common_optimizations/nonzero_horizontal_fusion.hpp" #include -#include #include #include "itt.hpp" #include "openvino/op/non_zero.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::NonZeroHorizontalFusion::NonZeroHorizontalFusion() { diff --git a/src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp b/src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp index 1293e38fe31..9cbf24a6dae 100644 --- a/src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp @@ -2,20 +2,15 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/nop_elimination.hpp" + #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include #include "compare.hpp" #include "itt.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/add.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" @@ -36,8 +31,13 @@ #include "openvino/op/subtract.hpp" #include "openvino/op/transpose.hpp" #include "openvino/op/unsqueeze.hpp" +#include "openvino/op/util/pad_base.hpp" #include "openvino/op/variadic_split.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "openvino/util/log.hpp" +#include "openvino/util/util.hpp" +#include "transformations/utils/utils.hpp" using namespace std; using namespace ov; @@ -269,8 +269,8 @@ static bool eliminate_unsqueeze(const shared_ptr& node) { // eliminate redundant squeeze->unsqueeze if (squeeze) { const auto& data_shape = squeeze->input_value(0).get_partial_shape(); - if (ngraph::compare_constants(squeeze->input_value(1).get_node_shared_ptr(), - unsqueeze->input_value(1).get_node_shared_ptr())) { + if (ov::compare_constants(squeeze->input_value(1).get_node_shared_ptr(), + unsqueeze->input_value(1).get_node_shared_ptr())) { return replace_output_update_name(unsqueeze->output(0), squeeze->input_value(0)); } if (data_shape.rank().is_dynamic() || out_shape.rank().is_dynamic()) { @@ -476,8 +476,8 @@ pass::EliminateSqueeze::EliminateSqueeze() { } else { data_shape = input->input(0).get_partial_shape(); } - if (ngraph::compare_constants(unsqueeze->input_value(1).get_node_shared_ptr(), - squeeze->input_value(1).get_node_shared_ptr())) { + if (ov::compare_constants(unsqueeze->input_value(1).get_node_shared_ptr(), + squeeze->input_value(1).get_node_shared_ptr())) { return replace_output_update_name(squeeze->output(0), unsqueeze->input_value(0)); } if (data_shape.rank().is_dynamic() || out_shape.rank().is_dynamic()) { diff --git a/src/common/transformations/src/transformations/common_optimizations/normalize_l2_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/normalize_l2_fusion.cpp index 9030be29caf..489868504ce 100644 --- a/src/common/transformations/src/transformations/common_optimizations/normalize_l2_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/normalize_l2_fusion.cpp @@ -5,12 +5,10 @@ #include "transformations/common_optimizations/normalize_l2_fusion.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" @@ -20,36 +18,38 @@ #include "openvino/op/power.hpp" #include "openvino/op/reduce_sum.hpp" #include "openvino/op/sqrt.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::NormalizeL2Fusion::NormalizeL2Fusion() { MATCHER_SCOPE(NormalizeL2Fusion); auto input = pass::pattern::any_input(); - auto exp = ngraph::pattern::wrap_type(); + auto exp = ov::pass::pattern::wrap_type(); auto pow = std::make_shared(input, exp); - auto axes = ngraph::pattern::wrap_type(); + auto axes = ov::pass::pattern::wrap_type(); auto reduce_sum = std::make_shared(pow, axes); - auto eps_const = ngraph::pattern::wrap_type(); + auto eps_const = ov::pass::pattern::wrap_type(); auto max = std::make_shared(reduce_sum, eps_const); auto add = std::make_shared(reduce_sum, eps_const); auto max_or_add = std::make_shared(OutputVector{max, add}); // Sqrt can be represented by Sqrt node or as Power node with exponent 0.5 auto sqrt = std::make_shared(max_or_add); - auto exp2 = ngraph::pattern::wrap_type(); + auto exp2 = ov::pass::pattern::wrap_type(); auto pow_as_sqrt = std::make_shared(max_or_add, exp2); auto power_or_sqrt = std::make_shared(OutputVector{sqrt, pow_as_sqrt}); // divide(input,sqrt(..)) can be represented as mul(input, power(..., -0.5f)) auto divide = std::make_shared(input, power_or_sqrt); - auto exp3 = ngraph::pattern::wrap_type(); + auto exp3 = ov::pass::pattern::wrap_type(); auto reversed_pow_as_sqrt = std::make_shared(max_or_add, exp3); auto mul = std::make_shared(input, reversed_pow_as_sqrt); auto divide_or_mul = std::make_shared(OutputVector{divide, mul}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); const auto data_input = pattern_to_output.at(input); @@ -126,11 +126,11 @@ ov::pass::NormalizeL2Fusion::NormalizeL2Fusion() { outputs_to_replace.emplace_back(pattern_to_output.at(add)); } - ngraph::copy_runtime_info(as_node_vector(outputs_to_replace), normalize_l2); - ngraph::replace_node(m.get_match_root(), normalize_l2); + ov::copy_runtime_info(as_node_vector(outputs_to_replace), normalize_l2); + ov::replace_node(m.get_match_root(), normalize_l2); return true; }; - auto m = std::make_shared(divide_or_mul, matcher_name); + auto m = std::make_shared(divide_or_mul, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/optimize_strided_slice.cpp b/src/common/transformations/src/transformations/common_optimizations/optimize_strided_slice.cpp index 3f3d3546b3b..aa63ab3b6a0 100644 --- a/src/common/transformations/src/transformations/common_optimizations/optimize_strided_slice.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/optimize_strided_slice.cpp @@ -2,25 +2,26 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/optimize_strided_slice.hpp" + #include -#include -#include -#include -#include #include #include "itt.hpp" +#include "ngraph/slice_plan.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/result.hpp" #include "openvino/op/slice.hpp" #include "openvino/op/strided_slice.hpp" #include "openvino/op/util/sub_graph_base.hpp" #include "openvino/op/variadic_split.hpp" +#include "openvino/pass/manager.hpp" #include "transformations/op_conversions/convert_slice_to_strided_slice.hpp" using namespace ov; -bool ov::pass::UselessStridedSliceEraser::run_on_model(const std::shared_ptr& f) { +bool ov::pass::UselessStridedSliceEraser::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(UselessStridedSliceEraser); bool rewritten = false; for (auto& node : f->get_ordered_ops()) { @@ -53,7 +54,7 @@ namespace { ngraph::SlicePlan get_slice_plan(std::shared_ptr slice) { auto convert_mask_to_axis_set = [](const std::vector& mask) { - ngraph::AxisSet axis_set{}; + ov::AxisSet axis_set{}; for (size_t i = 0; i < static_cast(mask.size()); ++i) { if (mask[i] == 1) axis_set.emplace(i); @@ -99,11 +100,11 @@ bool strided_slices_perform_the_same(std::shared_ptr l } // namespace -bool ov::pass::SharedStridedSliceEraser::run_on_model(const std::shared_ptr& f) { +bool ov::pass::SharedStridedSliceEraser::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(SharedStridedSliceEraser); bool graph_rewritten = false; - std::map, std::vector>> source_to_ss; + std::map, std::vector>> source_to_ss; for (const auto& node : f->get_ordered_ops()) { // Recursively apply transformation for sub-graph based operations if (auto sub_graph_node = std::dynamic_pointer_cast(node)) { @@ -130,7 +131,7 @@ bool ov::pass::SharedStridedSliceEraser::run_on_model(const std::shared_ptr& f) { +bool ov::pass::GroupedStridedSliceOptimizer::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(GroupedStridedSliceOptimizer); bool graph_rewritten = false; struct planned_slice { @@ -138,7 +139,7 @@ bool ov::pass::GroupedStridedSliceOptimizer::run_on_model(const std::shared_ptr< ngraph::SlicePlan plan; }; - std::map, std::vector> source_to_ss_with_plan; + std::map, std::vector> source_to_ss_with_plan; for (const auto& node : f->get_ordered_ops()) { // Recursively apply transformation for sub-graph based operations if (auto sub_graph_node = std::dynamic_pointer_cast(node)) { @@ -238,13 +239,13 @@ bool ov::pass::GroupedStridedSliceOptimizer::run_on_model(const std::shared_ptr< output_to_size.emplace_back(fake_output, input_shape[axis] - prev_r); } - auto axis_const = ov::op::v0::Constant::create(ngraph::element::i64, ngraph::Shape{}, {axis}); + auto axis_const = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{}, {axis}); std::vector size_splits; for (const auto& item : output_to_size) size_splits.push_back(item.second); auto size_splits_const = - ov::op::v0::Constant::create(ngraph::element::i64, ngraph::Shape{size_splits.size()}, size_splits); + ov::op::v0::Constant::create(ov::element::i64, ov::Shape{size_splits.size()}, size_splits); auto variadic_split = std::make_shared(pair.first, axis_const, size_splits_const); auto i = 0; @@ -374,8 +375,8 @@ bool ov::pass::GroupedSliceToVSplitOptimization::run_on_model(const std::shared_ if (current_sum != dimension) continue; auto split_lengths_const = - op::v0::Constant::create(ngraph::element::i64, ngraph::Shape{split_lengths.size()}, split_lengths); - auto axis_const = op::v0::Constant::create(ngraph::element::i64, ngraph::Shape{}, {axis}); + op::v0::Constant::create(ov::element::i64, ov::Shape{split_lengths.size()}, split_lengths); + auto axis_const = op::v0::Constant::create(ov::element::i64, ov::Shape{}, {axis}); auto variadic_split = std::make_shared(output, axis_const, split_lengths_const); auto i = 0; @@ -393,11 +394,11 @@ ov::pass::StridedSliceOptimization::StridedSliceOptimization(bool use_shapes) { m_use_shapes = use_shapes; } -bool ov::pass::StridedSliceOptimization::run_on_model(const std::shared_ptr& f) { +bool ov::pass::StridedSliceOptimization::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(StridedSliceOptimization); ov::pass::Manager manager(get_pass_config()); - using namespace ngraph::pass; + using namespace ov::pass; REGISTER_PASS(manager, SliceToStridedSlice, m_use_shapes) manager.run_passes(f); diff --git a/src/common/transformations/src/transformations/common_optimizations/pad_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/pad_fusion.cpp index a489055499a..eed6ea287cb 100644 --- a/src/common/transformations/src/transformations/common_optimizations/pad_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/pad_fusion.cpp @@ -5,17 +5,17 @@ #include "transformations/common_optimizations/pad_fusion.hpp" #include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/avg_pool.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convolution.hpp" #include "openvino/op/group_conv.hpp" +#include "openvino/op/util/pad_base.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" using namespace ov; diff --git a/src/common/transformations/src/transformations/common_optimizations/prelu_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/prelu_fusion.cpp index c05ef9de623..cf8d64828a2 100644 --- a/src/common/transformations/src/transformations/common_optimizations/prelu_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/prelu_fusion.cpp @@ -7,11 +7,9 @@ #include "transformations/common_optimizations/prelu_fusion.hpp" #include -#include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/abs.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" @@ -20,72 +18,74 @@ #include "openvino/op/prelu.hpp" #include "openvino/op/relu.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::PReluFusionNegativeAdd::PReluFusionNegativeAdd() { MATCHER_SCOPE(PReluFusionNegativeAdd); auto input = pass::pattern::any_input(); - auto relu_pos = ngraph::pattern::wrap_type({input}); - auto neg1 = ngraph::pattern::wrap_type({input}); - auto relu_neg = ngraph::pattern::wrap_type({neg1}); - auto neg2 = ngraph::pattern::wrap_type({relu_neg}); - auto mul_constant = ngraph::pattern::wrap_type(); - auto mul = ngraph::pattern::wrap_type({neg2, mul_constant}); - auto add = ngraph::pattern::wrap_type({relu_pos, mul}); + auto relu_pos = ov::pass::pattern::wrap_type({input}); + auto neg1 = ov::pass::pattern::wrap_type({input}); + auto relu_neg = ov::pass::pattern::wrap_type({neg1}); + auto neg2 = ov::pass::pattern::wrap_type({relu_neg}); + auto mul_constant = ov::pass::pattern::wrap_type(); + auto mul = ov::pass::pattern::wrap_type({neg2, mul_constant}); + auto add = ov::pass::pattern::wrap_type({relu_pos, mul}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); auto input_output = pattern_to_output.at(input); auto slope_output = pattern_to_output.at(mul_constant); auto add_node = pattern_to_output.at(add).get_node_shared_ptr(); auto prelu = std::make_shared(input_output, slope_output); prelu->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::NodeVector copy_from = {pattern_to_output.at(relu_pos).get_node_shared_ptr(), - pattern_to_output.at(neg1).get_node_shared_ptr(), - pattern_to_output.at(relu_neg).get_node_shared_ptr(), - pattern_to_output.at(neg2).get_node_shared_ptr(), - pattern_to_output.at(mul).get_node_shared_ptr(), - pattern_to_output.at(add).get_node_shared_ptr()}; - ngraph::copy_runtime_info(copy_from, prelu); - ngraph::replace_node(add_node, prelu); + ov::NodeVector copy_from = {pattern_to_output.at(relu_pos).get_node_shared_ptr(), + pattern_to_output.at(neg1).get_node_shared_ptr(), + pattern_to_output.at(relu_neg).get_node_shared_ptr(), + pattern_to_output.at(neg2).get_node_shared_ptr(), + pattern_to_output.at(mul).get_node_shared_ptr(), + pattern_to_output.at(add).get_node_shared_ptr()}; + ov::copy_runtime_info(copy_from, prelu); + ov::replace_node(add_node, prelu); return true; }; - auto m = std::make_shared(add, matcher_name); + auto m = std::make_shared(add, matcher_name); register_matcher(m, callback); } ov::pass::PReluFusionNegativeSub::PReluFusionNegativeSub() { MATCHER_SCOPE(PReluFusionNegativeSub); auto input = pass::pattern::any_input(); - auto relu_pos = ngraph::pattern::wrap_type({input}); - auto neg1 = ngraph::pattern::wrap_type({input}); - auto relu_neg = ngraph::pattern::wrap_type({neg1}); - auto mul_constant = ngraph::pattern::wrap_type(); - auto mul = ngraph::pattern::wrap_type({relu_neg, mul_constant}); - auto sub = ngraph::pattern::wrap_type({relu_pos, mul}); + auto relu_pos = ov::pass::pattern::wrap_type({input}); + auto neg1 = ov::pass::pattern::wrap_type({input}); + auto relu_neg = ov::pass::pattern::wrap_type({neg1}); + auto mul_constant = ov::pass::pattern::wrap_type(); + auto mul = ov::pass::pattern::wrap_type({relu_neg, mul_constant}); + auto sub = ov::pass::pattern::wrap_type({relu_pos, mul}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); auto input_output = pattern_to_output.at(input); auto slope_output = pattern_to_output.at(mul_constant); auto sub_node = pattern_to_output.at(sub).get_node_shared_ptr(); auto prelu = std::make_shared(input_output, slope_output); prelu->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::NodeVector copy_from = {pattern_to_output.at(relu_pos).get_node_shared_ptr(), - pattern_to_output.at(neg1).get_node_shared_ptr(), - pattern_to_output.at(relu_neg).get_node_shared_ptr(), - pattern_to_output.at(mul).get_node_shared_ptr(), - pattern_to_output.at(sub).get_node_shared_ptr()}; - ngraph::copy_runtime_info(copy_from, prelu); - ngraph::replace_node(sub_node, prelu); + ov::NodeVector copy_from = {pattern_to_output.at(relu_pos).get_node_shared_ptr(), + pattern_to_output.at(neg1).get_node_shared_ptr(), + pattern_to_output.at(relu_neg).get_node_shared_ptr(), + pattern_to_output.at(mul).get_node_shared_ptr(), + pattern_to_output.at(sub).get_node_shared_ptr()}; + ov::copy_runtime_info(copy_from, prelu); + ov::replace_node(sub_node, prelu); return true; }; - auto m = std::make_shared(sub, matcher_name); + auto m = std::make_shared(sub, matcher_name); register_matcher(m, callback); } -static std::function)> constant_value(const float target_value) { - return [=](const ngraph::Output& output) -> bool { +static std::function)> constant_value(const float target_value) { + return [=](const ov::Output& output) -> bool { auto node = std::dynamic_pointer_cast(output.get_node_shared_ptr()); if (!node) { return false; @@ -101,15 +101,15 @@ static std::function)> constant_value(const fl ov::pass::PReluFusionMultiplyAdd::PReluFusionMultiplyAdd() { MATCHER_SCOPE(PReluFusionMultiplyAdd); auto input = pass::pattern::any_input(); - auto relu_pos = ngraph::pattern::wrap_type({input}); - auto mul_neg_constant = ngraph::pattern::wrap_type(constant_value(-1.0)); - auto mul_neg = ngraph::pattern::wrap_type({input, mul_neg_constant}); - auto relu_neg = ngraph::pattern::wrap_type({mul_neg}); - auto mul_constant = ngraph::pattern::wrap_type(); - auto mul = ngraph::pattern::wrap_type({relu_neg, mul_constant}); - auto add = ngraph::pattern::wrap_type({relu_pos, mul}); + auto relu_pos = ov::pass::pattern::wrap_type({input}); + auto mul_neg_constant = ov::pass::pattern::wrap_type(constant_value(-1.0)); + auto mul_neg = ov::pass::pattern::wrap_type({input, mul_neg_constant}); + auto relu_neg = ov::pass::pattern::wrap_type({mul_neg}); + auto mul_constant = ov::pass::pattern::wrap_type(); + auto mul = ov::pass::pattern::wrap_type({relu_neg, mul_constant}); + auto add = ov::pass::pattern::wrap_type({relu_pos, mul}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); auto input_output = pattern_to_output.at(input); auto slope_output = pattern_to_output.at(mul_constant); @@ -118,31 +118,31 @@ ov::pass::PReluFusionMultiplyAdd::PReluFusionMultiplyAdd() { auto prelu = std::make_shared(input_output, negative); prelu->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::NodeVector copy_from = {pattern_to_output.at(relu_pos).get_node_shared_ptr(), - pattern_to_output.at(mul_neg).get_node_shared_ptr(), - pattern_to_output.at(relu_neg).get_node_shared_ptr(), - pattern_to_output.at(mul).get_node_shared_ptr(), - pattern_to_output.at(add).get_node_shared_ptr()}; - ngraph::copy_runtime_info(copy_from, {prelu, negative}); - ngraph::replace_node(add_node, prelu); + ov::NodeVector copy_from = {pattern_to_output.at(relu_pos).get_node_shared_ptr(), + pattern_to_output.at(mul_neg).get_node_shared_ptr(), + pattern_to_output.at(relu_neg).get_node_shared_ptr(), + pattern_to_output.at(mul).get_node_shared_ptr(), + pattern_to_output.at(add).get_node_shared_ptr()}; + ov::copy_runtime_info(copy_from, {prelu, negative}); + ov::replace_node(add_node, prelu); return true; }; - auto m = std::make_shared(add, matcher_name); + auto m = std::make_shared(add, matcher_name); register_matcher(m, callback); } ov::pass::PReluFusionMultiplySub::PReluFusionMultiplySub() { MATCHER_SCOPE(PReluFusionMultiplySub); auto input = pass::pattern::any_input(); - auto relu_pos = ngraph::pattern::wrap_type({input}); - auto mul_neg_constant = ngraph::pattern::wrap_type(constant_value(-1.0)); - auto mul_neg = ngraph::pattern::wrap_type({input, mul_neg_constant}); - auto relu_neg = ngraph::pattern::wrap_type({mul_neg}); - auto mul_constant = ngraph::pattern::wrap_type(); - auto mul = ngraph::pattern::wrap_type({relu_neg, mul_constant}); - auto sub = ngraph::pattern::wrap_type({relu_pos, mul}); + auto relu_pos = ov::pass::pattern::wrap_type({input}); + auto mul_neg_constant = ov::pass::pattern::wrap_type(constant_value(-1.0)); + auto mul_neg = ov::pass::pattern::wrap_type({input, mul_neg_constant}); + auto relu_neg = ov::pass::pattern::wrap_type({mul_neg}); + auto mul_constant = ov::pass::pattern::wrap_type(); + auto mul = ov::pass::pattern::wrap_type({relu_neg, mul_constant}); + auto sub = ov::pass::pattern::wrap_type({relu_pos, mul}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); auto input_output = pattern_to_output.at(input); auto slope_output = pattern_to_output.at(mul_constant); @@ -150,16 +150,16 @@ ov::pass::PReluFusionMultiplySub::PReluFusionMultiplySub() { auto prelu = std::make_shared(input_output, slope_output); prelu->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::NodeVector copy_from = {pattern_to_output.at(relu_pos).get_node_shared_ptr(), - pattern_to_output.at(mul_neg).get_node_shared_ptr(), - pattern_to_output.at(relu_neg).get_node_shared_ptr(), - pattern_to_output.at(mul).get_node_shared_ptr(), - pattern_to_output.at(sub).get_node_shared_ptr()}; - ngraph::copy_runtime_info(copy_from, prelu); - ngraph::replace_node(sub_node, prelu); + ov::NodeVector copy_from = {pattern_to_output.at(relu_pos).get_node_shared_ptr(), + pattern_to_output.at(mul_neg).get_node_shared_ptr(), + pattern_to_output.at(relu_neg).get_node_shared_ptr(), + pattern_to_output.at(mul).get_node_shared_ptr(), + pattern_to_output.at(sub).get_node_shared_ptr()}; + ov::copy_runtime_info(copy_from, prelu); + ov::replace_node(sub_node, prelu); return true; }; - auto m = std::make_shared(sub, matcher_name); + auto m = std::make_shared(sub, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/pull_transpose_through_fq.cpp b/src/common/transformations/src/transformations/common_optimizations/pull_transpose_through_fq.cpp index aac422f239b..23b505e02c3 100644 --- a/src/common/transformations/src/transformations/common_optimizations/pull_transpose_through_fq.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/pull_transpose_through_fq.cpp @@ -5,21 +5,21 @@ #include "transformations/common_optimizations/pull_transpose_through_fq.hpp" #include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/fake_quantize.hpp" #include "openvino/op/transpose.hpp" #include "openvino/op/unsqueeze.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" ov::pass::PullTransposeThroughFQUp::PullTransposeThroughFQUp() { MATCHER_SCOPE(PullTransposeThroughFQUp); - const auto weights = ngraph::pattern::wrap_type(); + const auto weights = ov::pass::pattern::wrap_type(); auto m_fq = pattern::wrap_type({weights, pattern::any_input(pattern::has_static_shape()), pattern::any_input(pattern::has_static_shape()), @@ -49,8 +49,8 @@ ov::pass::PullTransposeThroughFQUp::PullTransposeThroughFQUp() { auto input_rank = fq->input(0).get_partial_shape().rank().get_length(); - ngraph::NodeVector new_ops; - ngraph::OutputVector fq_inputs; + ov::NodeVector new_ops; + ov::OutputVector fq_inputs; for (size_t i = 0; i < fq->inputs().size(); ++i) { auto fq_input = fq->input_value(i); auto fq_input_rank = fq_input.get_partial_shape().rank().get_length(); @@ -70,19 +70,19 @@ ov::pass::PullTransposeThroughFQUp::PullTransposeThroughFQUp() { OPENVINO_SUPPRESS_DEPRECATED_END fq_input = constant; } - ngraph::copy_runtime_info(transpose, fq_input.get_node_shared_ptr()); + ov::copy_runtime_info(transpose, fq_input.get_node_shared_ptr()); fq_inputs.push_back(fq_input); } auto new_fq = fq->clone_with_new_inputs(fq_inputs); new_ops.push_back(new_fq); new_fq->set_friendly_name(transpose->get_friendly_name()); - ngraph::copy_runtime_info({fq, transpose}, new_ops); - ngraph::replace_node(transpose, new_fq); + ov::copy_runtime_info({fq, transpose}, new_ops); + ov::replace_node(transpose, new_fq); return true; }; - auto m = std::make_shared(m_transpose, matcher_name); + auto m = std::make_shared(m_transpose, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/random_uniform_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/random_uniform_fusion.cpp index 32746ac4858..f7894923895 100644 --- a/src/common/transformations/src/transformations/common_optimizations/random_uniform_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/random_uniform_fusion.cpp @@ -5,33 +5,33 @@ #include "transformations/common_optimizations/random_uniform_fusion.hpp" #include -#include -#include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/random_uniform.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::RandomUniformFusion::RandomUniformFusion() { MATCHER_SCOPE(RandomUniformFusion); const auto data_pattern = pass::pattern::any_input(); const auto ru_min_input_pattern = pass::pattern::any_input(); const auto ru_max_input_pattern = pass::pattern::any_input(); - const auto random_uniform_pattern = ngraph::pattern::wrap_type( + const auto random_uniform_pattern = ov::pass::pattern::wrap_type( {data_pattern, ru_min_input_pattern, ru_max_input_pattern}, pattern::consumers_count(1)); - const auto const_pattern = ngraph::pattern::wrap_type(); + const auto const_pattern = ov::pass::pattern::wrap_type(); - const auto convert_pattern = ngraph::pattern::wrap_type({random_uniform_pattern}); + const auto convert_pattern = ov::pass::pattern::wrap_type({random_uniform_pattern}); const auto random_uniform_or_convert_pattern = std::make_shared(OutputVector{random_uniform_pattern, convert_pattern}); - const auto mul_add_pattern = ngraph::pattern::wrap_type( + const auto mul_add_pattern = ov::pass::pattern::wrap_type( {random_uniform_or_convert_pattern, const_pattern}); ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { @@ -59,13 +59,13 @@ ov::pass::RandomUniformFusion::RandomUniformFusion() { auto new_const = ov::op::v0::Constant::create(ru->get_out_type(), Shape{}, value); const auto& mul_add = pattern_map.at(mul_add_pattern); - const auto mul_add_ptr = std::dynamic_pointer_cast(mul_add.get_node_shared_ptr()); + const auto mul_add_ptr = std::dynamic_pointer_cast(mul_add.get_node_shared_ptr()); const auto new_mul_add1 = mul_add_ptr->clone_with_new_inputs({ru->input_value(1), new_const}); const auto new_mul_add2 = mul_add_ptr->clone_with_new_inputs({ru->input_value(2), new_const}); OPENVINO_SUPPRESS_DEPRECATED_START - const auto& folded_const1 = ngraph::get_constant_from_source(new_mul_add1); - const auto& folded_const2 = ngraph::get_constant_from_source(new_mul_add2); + const auto& folded_const1 = ov::get_constant_from_source(new_mul_add1); + const auto& folded_const2 = ov::get_constant_from_source(new_mul_add2); OPENVINO_SUPPRESS_DEPRECATED_END const auto new_ru = ru->clone_with_new_inputs( @@ -82,16 +82,16 @@ ov::pass::RandomUniformFusion::RandomUniformFusion() { copy_runtime_info({ru, cvt, mul_add.get_node_shared_ptr()}, {new_mul_add1, new_mul_add2, new_ru, new_ru_conv}); new_ru_conv->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::replace_node(m.get_match_root(), new_ru_conv); + ov::replace_node(m.get_match_root(), new_ru_conv); } else { copy_runtime_info({ru, mul_add.get_node_shared_ptr()}, {new_mul_add1, new_mul_add2, new_ru}); new_ru->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::replace_node(m.get_match_root(), new_ru); + ov::replace_node(m.get_match_root(), new_ru); } return true; }; - auto m = std::make_shared(mul_add_pattern, matcher_name); + auto m = std::make_shared(mul_add_pattern, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/reduce_merge.cpp b/src/common/transformations/src/transformations/common_optimizations/reduce_merge.cpp index 67bf208d2f2..b50a795205a 100644 --- a/src/common/transformations/src/transformations/common_optimizations/reduce_merge.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/reduce_merge.cpp @@ -5,12 +5,10 @@ #include "transformations/common_optimizations/reduce_merge.hpp" #include -#include -#include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/reduce_l1.hpp" #include "openvino/op/reduce_l2.hpp" @@ -21,6 +19,8 @@ #include "openvino/op/reduce_min.hpp" #include "openvino/op/reduce_prod.hpp" #include "openvino/op/reduce_sum.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" using namespace ov; using namespace ov::pass; @@ -77,7 +77,7 @@ bool fuse_reduce_operations(const std::shared_ptr& node) { new_reduce->set_friendly_name(bottom_reduce->get_friendly_name()); copy_runtime_info({top_reduce, bottom_reduce}, {axes, new_reduce}); - ngraph::replace_node(bottom_reduce, new_reduce); + ov::replace_node(bottom_reduce, new_reduce); return true; } @@ -104,7 +104,7 @@ pass::ReduceMerge::ReduceMerge() { reduce_prod_pattern, reduce_sum_pattern}); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto node = m.get_match_root(); if (ov::is_type(node)) { return fuse_reduce_operations(node); diff --git a/src/common/transformations/src/transformations/common_optimizations/relu_fake_quantize_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/relu_fake_quantize_fusion.cpp index b482c2ad7a7..299b56b7c5a 100644 --- a/src/common/transformations/src/transformations/common_optimizations/relu_fake_quantize_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/relu_fake_quantize_fusion.cpp @@ -5,26 +5,26 @@ #include "transformations/common_optimizations/relu_fake_quantize_fusion.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/fake_quantize.hpp" #include "openvino/op/relu.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::ReluFakeQuantizeFusion::ReluFakeQuantizeFusion() { MATCHER_SCOPE(ReluFakeQuantizeFusion); auto data_pattern = pass::pattern::any_input(); - auto relu_pattern = ngraph::pattern::wrap_type({data_pattern}, pattern::consumers_count(1)); - auto input_low_pattern = ngraph::pattern::wrap_type(); - auto fq_pattern = ngraph::pattern::wrap_type({relu_pattern, - input_low_pattern, - pass::pattern::any_input(), - pass::pattern::any_input(), - pass::pattern::any_input()}); + auto relu_pattern = ov::pass::pattern::wrap_type({data_pattern}, pattern::consumers_count(1)); + auto input_low_pattern = ov::pass::pattern::wrap_type(); + auto fq_pattern = ov::pass::pattern::wrap_type({relu_pattern, + input_low_pattern, + pass::pattern::any_input(), + pass::pattern::any_input(), + pass::pattern::any_input()}); ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { auto pattern_map = m.get_pattern_value_map(); @@ -57,6 +57,6 @@ ov::pass::ReluFakeQuantizeFusion::ReluFakeQuantizeFusion() { return true; }; - auto m = std::make_shared(fq_pattern, matcher_name); + auto m = std::make_shared(fq_pattern, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/remove_concat_zero_dim_input.cpp b/src/common/transformations/src/transformations/common_optimizations/remove_concat_zero_dim_input.cpp index 9f074aad8b2..6eeca5d9060 100644 --- a/src/common/transformations/src/transformations/common_optimizations/remove_concat_zero_dim_input.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/remove_concat_zero_dim_input.cpp @@ -6,10 +6,10 @@ #include #include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/remove_filtering_boxes_by_size.cpp b/src/common/transformations/src/transformations/common_optimizations/remove_filtering_boxes_by_size.cpp index 572ab285533..092249e26fe 100644 --- a/src/common/transformations/src/transformations/common_optimizations/remove_filtering_boxes_by_size.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/remove_filtering_boxes_by_size.cpp @@ -5,11 +5,10 @@ #include "transformations/common_optimizations/remove_filtering_boxes_by_size.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" @@ -25,6 +24,7 @@ #include "openvino/op/subtract.hpp" #include "openvino/op/transpose.hpp" #include "openvino/op/variadic_split.hpp" +#include "openvino/pass/manager.hpp" #include "transformations/common_optimizations/subtract_fusion.hpp" ov::pass::FuseFilteringBoxesBySize::FuseFilteringBoxesBySize() { @@ -51,7 +51,7 @@ ov::pass::RemoveFilteringBoxesBySize::RemoveFilteringBoxesBySize() { // concat auto concat = std::make_shared( - ngraph::OutputVector({split->output(0), split->output(1), add_1->output(0), add_2->output(0)}), + ov::OutputVector({split->output(0), split->output(1), add_1->output(0), add_2->output(0)}), 1); // second variadic split @@ -78,18 +78,18 @@ ov::pass::RemoveFilteringBoxesBySize::RemoveFilteringBoxesBySize() { auto not_2 = std::make_shared(less_2); // cast - auto cast_11 = std::make_shared(not_1, ngraph::element::u8); - auto cast_12 = std::make_shared(cast_11, ngraph::element::boolean); + auto cast_11 = std::make_shared(not_1, ov::element::u8); + auto cast_12 = std::make_shared(cast_11, ov::element::boolean); - auto cast_21 = std::make_shared(not_2, ngraph::element::u8); - auto cast_22 = std::make_shared(cast_21, ngraph::element::boolean); + auto cast_21 = std::make_shared(not_2, ov::element::u8); + auto cast_22 = std::make_shared(cast_21, ov::element::boolean); // logical and auto and_1 = std::make_shared(cast_12, cast_22); // cast - auto cast_31 = std::make_shared(and_1, ngraph::element::u8); - auto cast_32 = std::make_shared(cast_31, ngraph::element::f32); + auto cast_31 = std::make_shared(and_1, ov::element::u8); + auto cast_32 = std::make_shared(cast_31, ov::element::f32); // nonzero auto non_zero = std::make_shared(cast_32); @@ -100,7 +100,7 @@ ov::pass::RemoveFilteringBoxesBySize::RemoveFilteringBoxesBySize() { auto squeeze_3_axis = ov::op::v0::Constant::create(element::i64, Shape{1}, std::vector({1})); auto squeeze_3 = std::make_shared(transpose, squeeze_3_axis); - auto cast = std::make_shared(squeeze_3, ngraph::element::i64); + auto cast = std::make_shared(squeeze_3, ov::element::i64); ov::matcher_pass_callback callback = [data](pattern::Matcher& m) { auto start = ov::op::v0::Constant::create(element::i64, Shape{}, std::vector({0})); @@ -121,7 +121,7 @@ ov::pass::RemoveFilteringBoxesBySize::RemoveFilteringBoxesBySize() { range->set_friendly_name(output->get_friendly_name()); // TODO: add copy_runtime_info - ngraph::replace_node(output, range); + ov::replace_node(output, range); return true; }; diff --git a/src/common/transformations/src/transformations/common_optimizations/reshape_prelu.cpp b/src/common/transformations/src/transformations/common_optimizations/reshape_prelu.cpp index fd4d47fa35e..7d239cb6224 100644 --- a/src/common/transformations/src/transformations/common_optimizations/reshape_prelu.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/reshape_prelu.cpp @@ -4,13 +4,12 @@ #include "transformations/common_optimizations/reshape_prelu.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/prelu.hpp" #include "openvino/op/reshape.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" using namespace ov::pass; diff --git a/src/common/transformations/src/transformations/common_optimizations/reshape_sequence_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/reshape_sequence_fusion.cpp index 17894386565..fc099a1c2f8 100644 --- a/src/common/transformations/src/transformations/common_optimizations/reshape_sequence_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/reshape_sequence_fusion.cpp @@ -5,14 +5,14 @@ #include "transformations/common_optimizations/reshape_sequence_fusion.hpp" #include -#include -#include #include #include "itt.hpp" #include "openvino/core/bound_evaluation_util.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" namespace { @@ -114,6 +114,6 @@ ov::pass::ReshapeSequenceFusion::ReshapeSequenceFusion(bool use_shape_for_elimin return true; }; - auto m = std::make_shared(reshape_b, matcher_name); + auto m = std::make_shared(reshape_b, matcher_name); this->register_matcher(m, callback); } 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 4182a51c269..9e715d1b4d9 100644 --- a/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/ric_fusion.cpp @@ -5,17 +5,12 @@ #include "transformations/common_optimizations/ric_fusion.hpp" #include -#include -#include -#include -#include -#include -#include -#include #include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" @@ -27,7 +22,11 @@ #include "openvino/op/shape_of.hpp" #include "openvino/op/split.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/op/util/binary_elementwise_arithmetic.hpp" #include "openvino/op/util/pad_base.hpp" +#include "openvino/pass/manager.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "openvino/util/log.hpp" #include "transformations/utils/utils.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/shared_ops_optimization.cpp b/src/common/transformations/src/transformations/common_optimizations/shared_ops_optimization.cpp index baa92cc612a..5f23344b251 100644 --- a/src/common/transformations/src/transformations/common_optimizations/shared_ops_optimization.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/shared_ops_optimization.cpp @@ -2,21 +2,21 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "transformations/common_optimizations/shared_ops_optimization.hpp" #include "itt.hpp" +#include "openvino/core/validation_util.hpp" +#include "openvino/op/concat.hpp" +#include "openvino/op/convert.hpp" +#include "openvino/op/gather.hpp" +#include "openvino/op/gather_elements.hpp" +#include "openvino/op/reshape.hpp" +#include "openvino/op/shape_of.hpp" +#include "openvino/op/slice.hpp" +#include "openvino/op/squeeze.hpp" +#include "openvino/op/tile.hpp" +#include "openvino/op/unsqueeze.hpp" +#include "openvino/op/util/sub_graph_base.hpp" using namespace std; using namespace ov; diff --git a/src/common/transformations/src/transformations/common_optimizations/shuffle_channels_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/shuffle_channels_fusion.cpp index e7f30db72a8..d9a8e17067e 100644 --- a/src/common/transformations/src/transformations/common_optimizations/shuffle_channels_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/shuffle_channels_fusion.cpp @@ -5,22 +5,22 @@ #include "transformations/common_optimizations/shuffle_channels_fusion.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/shuffle_channels.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" namespace { -bool check_shapes(const ngraph::PartialShape& pshape_input, - const ngraph::PartialShape& pshape_reshape_before, - const ngraph::AxisVector& transpose_constant_values, - const ngraph::PartialShape& pshape_reshape_after) { +bool check_shapes(const ov::PartialShape& pshape_input, + const ov::PartialShape& pshape_reshape_before, + const ov::AxisVector& transpose_constant_values, + const ov::PartialShape& pshape_reshape_after) { // x: [N, C, H, W] const auto rank = pshape_input.rank(); if (rank.is_dynamic() || rank.get_length() != 4) { @@ -28,7 +28,7 @@ bool check_shapes(const ngraph::PartialShape& pshape_input, } // check that all dimensions except batch are static - if (std::any_of(pshape_input.begin() + 1, pshape_input.end(), [](const ngraph::Dimension& x) { + if (std::any_of(pshape_input.begin() + 1, pshape_input.end(), [](const ov::Dimension& x) { return x.is_dynamic(); })) { return false; @@ -40,7 +40,7 @@ bool check_shapes(const ngraph::PartialShape& pshape_input, } const auto group = pshape_reshape_before[1].get_length(); - ngraph::PartialShape expected_reshape_before; + ov::PartialShape expected_reshape_before; if (pshape_reshape_before.rank().get_length() == 4) { expected_reshape_before = {pshape_input[0], group, @@ -63,7 +63,7 @@ bool check_shapes(const ngraph::PartialShape& pshape_input, return false; } - ngraph::AxisVector expected_transpose_values{0, 2, 1, 3}; + ov::AxisVector expected_transpose_values{0, 2, 1, 3}; if (transpose_constant_values.size() == 5) { expected_transpose_values.push_back(4); } @@ -85,17 +85,18 @@ bool check_shapes(const ngraph::PartialShape& pshape_input, ov::pass::ShuffleChannelsFusion::ShuffleChannelsFusion(const bool reshape_constants_check) { MATCHER_SCOPE(ShuffleChannelsFusion); auto input = pass::pattern::any_input(pattern::rank_equals(4)); - auto reshape_before_const_pattern = ngraph::pattern::wrap_type(); - auto transpose_const_pattern = ngraph::pattern::wrap_type(); - auto reshape_after_const_pattern = ngraph::pattern::wrap_type(); + auto reshape_before_const_pattern = ov::pass::pattern::wrap_type(); + auto transpose_const_pattern = ov::pass::pattern::wrap_type(); + auto reshape_after_const_pattern = ov::pass::pattern::wrap_type(); - auto reshape_before_pattern = ngraph::pattern::wrap_type({input, reshape_before_const_pattern}, - pattern::consumers_count(1)); - auto transpose_pattern = - ngraph::pattern::wrap_type({reshape_before_pattern, transpose_const_pattern}, + auto reshape_before_pattern = + ov::pass::pattern::wrap_type({input, reshape_before_const_pattern}, pattern::consumers_count(1)); + auto transpose_pattern = + ov::pass::pattern::wrap_type({reshape_before_pattern, transpose_const_pattern}, + pattern::consumers_count(1)); auto reshape_after_pattern = - ngraph::pattern::wrap_type({transpose_pattern, reshape_after_const_pattern}); + ov::pass::pattern::wrap_type({transpose_pattern, reshape_after_const_pattern}); ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); @@ -146,17 +147,17 @@ ov::pass::ShuffleChannelsFusion::ShuffleChannelsFusion(const bool reshape_consta auto shuffle_shannels = std::make_shared(data, axis, group); shuffle_shannels->set_friendly_name(reshape_after->get_friendly_name()); - ngraph::copy_runtime_info({reshape_before, - reshape_before_constant, - transpose, - transpose_constant, - reshape_after, - reshape_after_constant}, - shuffle_shannels); - ngraph::replace_node(reshape_after, shuffle_shannels); + ov::copy_runtime_info({reshape_before, + reshape_before_constant, + transpose, + transpose_constant, + reshape_after, + reshape_after_constant}, + shuffle_shannels); + ov::replace_node(reshape_after, shuffle_shannels); return true; }; - auto m = std::make_shared(reshape_after_pattern, matcher_name); + auto m = std::make_shared(reshape_after_pattern, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/simplify_shape_of_sub_graph.cpp b/src/common/transformations/src/transformations/common_optimizations/simplify_shape_of_sub_graph.cpp index aa490f99c31..00c84d52115 100644 --- a/src/common/transformations/src/transformations/common_optimizations/simplify_shape_of_sub_graph.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/simplify_shape_of_sub_graph.cpp @@ -2,26 +2,27 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/common_optimizations/simplify_shape_of_sub_graph.hpp" + #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/fake_quantize.hpp" #include "openvino/op/gather.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/shape_of.hpp" +#include "openvino/op/util/op_types.hpp" +#include "openvino/pass/manager.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/common_optimizations/eliminate_unsqueeze_gather.hpp" #include "transformations/common_optimizations/shared_ops_optimization.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; using namespace ov::op; diff --git a/src/common/transformations/src/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.cpp b/src/common/transformations/src/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.cpp index a68a3806b9f..634851cfed0 100644 --- a/src/common/transformations/src/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.cpp @@ -5,30 +5,30 @@ #include "transformations/common_optimizations/skip_gather_before_transpose_and_reshape.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::SkipGatherBeforeTransposeAndReshape::SkipGatherBeforeTransposeAndReshape() { MATCHER_SCOPE(SkipGatherBeforeTransposeAndReshape); - auto input_m = pass::pattern::any_input(ngraph::pattern::has_static_dim(0)); + auto input_m = pass::pattern::any_input(ov::pass::pattern::has_static_dim(0)); - auto indices_m = ngraph::pattern::wrap_type(); - auto axis_m = ngraph::pattern::wrap_type(); - auto gather_m = ngraph::pattern::wrap_type({input_m, indices_m, axis_m}); + auto indices_m = ov::pass::pattern::wrap_type(); + auto axis_m = ov::pass::pattern::wrap_type(); + auto gather_m = ov::pass::pattern::wrap_type({input_m, indices_m, axis_m}); - auto transpose_const_m = ngraph::pattern::wrap_type(); - auto transpose_m = ngraph::pattern::wrap_type({gather_m, transpose_const_m}); + auto transpose_const_m = ov::pass::pattern::wrap_type(); + auto transpose_m = ov::pass::pattern::wrap_type({gather_m, transpose_const_m}); - auto reshape_const_m = ngraph::pattern::wrap_type(); - auto reshape_m = ngraph::pattern::wrap_type({transpose_m, reshape_const_m}); + auto reshape_const_m = ov::pass::pattern::wrap_type(); + auto reshape_m = ov::pass::pattern::wrap_type({transpose_m, reshape_const_m}); ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_value_map(); @@ -82,12 +82,12 @@ ov::pass::SkipGatherBeforeTransposeAndReshape::SkipGatherBeforeTransposeAndResha new_transpose_vals); const auto new_transpose = transpose->clone_with_new_inputs({input, new_transpose_const}); new_transpose->set_friendly_name(transpose->get_friendly_name()); - ngraph::copy_runtime_info({transpose, gather}, new_transpose); - ngraph::replace_node(transpose, new_transpose); + ov::copy_runtime_info({transpose, gather}, new_transpose); + ov::replace_node(transpose, new_transpose); return false; }; - auto m = std::make_shared(reshape_m, matcher_name); + auto m = std::make_shared(reshape_m, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/softmax_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/softmax_fusion.cpp index c3a2121cdc3..4bd8778aeb2 100644 --- a/src/common/transformations/src/transformations/common_optimizations/softmax_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/softmax_fusion.cpp @@ -5,12 +5,10 @@ #include "transformations/common_optimizations/softmax_fusion.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" #include "openvino/op/exp.hpp" @@ -18,23 +16,26 @@ #include "openvino/op/reduce_sum.hpp" #include "openvino/op/softmax.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::SoftmaxFusion::SoftmaxFusion() { MATCHER_SCOPE(SoftmaxFusion); auto data_pattern = pass::pattern::any_input(pass::pattern::has_static_rank()); - auto reduce_max_axes_pattern = ngraph::pattern::wrap_type(); + auto reduce_max_axes_pattern = ov::pass::pattern::wrap_type(); auto reduce_max_pattern = - ngraph::pattern::wrap_type({data_pattern, reduce_max_axes_pattern}); - auto sub_pattern = ngraph::pattern::wrap_type({data_pattern, reduce_max_pattern}); + ov::pass::pattern::wrap_type({data_pattern, reduce_max_axes_pattern}); + auto sub_pattern = ov::pass::pattern::wrap_type({data_pattern, reduce_max_pattern}); auto exp_input = std::make_shared(OutputVector{sub_pattern, data_pattern}); - auto exp_pattern = ngraph::pattern::wrap_type({exp_input}); + auto exp_pattern = ov::pass::pattern::wrap_type({exp_input}); - auto reduce_sum_axes_pattern = ngraph::pattern::wrap_type(); - auto reduce_sum_pattern = ngraph::pattern::wrap_type({exp_pattern, reduce_sum_axes_pattern}); - auto div_pattern = ngraph::pattern::wrap_type({exp_pattern, reduce_sum_pattern}); + auto reduce_sum_axes_pattern = ov::pass::pattern::wrap_type(); + auto reduce_sum_pattern = + ov::pass::pattern::wrap_type({exp_pattern, reduce_sum_axes_pattern}); + auto div_pattern = ov::pass::pattern::wrap_type({exp_pattern, reduce_sum_pattern}); ov::matcher_pass_callback callback = [=](pass::pattern::Matcher& m) { if (transformation_callback(m.get_match_root())) @@ -88,6 +89,6 @@ ov::pass::SoftmaxFusion::SoftmaxFusion() { return true; }; - auto m = std::make_shared(div_pattern, matcher_name); + auto m = std::make_shared(div_pattern, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/softplus_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/softplus_fusion.cpp index 9e8d69b12f5..03ecd841367 100644 --- a/src/common/transformations/src/transformations/common_optimizations/softplus_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/softplus_fusion.cpp @@ -5,16 +5,16 @@ #include "transformations/common_optimizations/softplus_fusion.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/exp.hpp" #include "openvino/op/log.hpp" #include "openvino/op/softplus.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::SoftPlusFusion::SoftPlusFusion() { MATCHER_SCOPE(SoftPlusFusion); @@ -22,11 +22,11 @@ ov::pass::SoftPlusFusion::SoftPlusFusion() { auto input = pattern::any_input(); auto exp = std::make_shared(input); auto add_constant = - ngraph::pattern::wrap_type(pattern::type_matches_any({element::f32, element::f16})); + ov::pass::pattern::wrap_type(pattern::type_matches_any({element::f32, element::f16})); auto add = std::make_shared(exp, add_constant); auto log = std::make_shared(add); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); auto exp_input = pattern_to_output.at(input); @@ -43,14 +43,14 @@ ov::pass::SoftPlusFusion::SoftPlusFusion() { auto softplus = std::make_shared(exp_input); softplus->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info({pattern_to_output.at(log).get_node_shared_ptr(), - pattern_to_output.at(add).get_node_shared_ptr(), - pattern_to_output.at(exp).get_node_shared_ptr()}, - softplus); - ngraph::replace_node(m.get_match_root(), softplus); + ov::copy_runtime_info({pattern_to_output.at(log).get_node_shared_ptr(), + pattern_to_output.at(add).get_node_shared_ptr(), + pattern_to_output.at(exp).get_node_shared_ptr()}, + softplus); + ov::replace_node(m.get_match_root(), softplus); return true; }; - auto m = std::make_shared(log, matcher_name); + auto m = std::make_shared(log, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/softplus_to_mish_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/softplus_to_mish_fusion.cpp index 7f3ac59bc62..bc33f2686b9 100644 --- a/src/common/transformations/src/transformations/common_optimizations/softplus_to_mish_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/softplus_to_mish_fusion.cpp @@ -5,38 +5,38 @@ #include "transformations/common_optimizations/softplus_to_mish_fusion.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/mish.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/softplus.hpp" #include "openvino/op/tanh.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::SoftPlusToMishFusion::SoftPlusToMishFusion() { MATCHER_SCOPE(SoftPlusToMishFusion); auto input = pass::pattern::any_input(); - auto softplus = ngraph::pattern::wrap_type({input}, pattern::consumers_count(1)); - auto tanh = ngraph::pattern::wrap_type({softplus}, pattern::consumers_count(1)); + auto softplus = ov::pass::pattern::wrap_type({input}, pattern::consumers_count(1)); + auto tanh = ov::pass::pattern::wrap_type({softplus}, pattern::consumers_count(1)); auto mul = std::make_shared(input, tanh); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto exp_input = pattern_to_output.at(input); auto mish = std::make_shared(exp_input); mish->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info({pattern_to_output.at(mul).get_node_shared_ptr(), - pattern_to_output.at(tanh).get_node_shared_ptr(), - pattern_to_output.at(softplus).get_node_shared_ptr()}, - mish); - ngraph::replace_node(m.get_match_root(), mish); + ov::copy_runtime_info({pattern_to_output.at(mul).get_node_shared_ptr(), + pattern_to_output.at(tanh).get_node_shared_ptr(), + pattern_to_output.at(softplus).get_node_shared_ptr()}, + mish); + ov::replace_node(m.get_match_root(), mish); return true; }; - auto m = std::make_shared(mul, matcher_name); + auto m = std::make_shared(mul, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/space_to_batch_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/space_to_batch_fusion.cpp index 9356f6d1d6f..94f38801550 100644 --- a/src/common/transformations/src/transformations/common_optimizations/space_to_batch_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/space_to_batch_fusion.cpp @@ -5,18 +5,18 @@ #include "transformations/common_optimizations/space_to_batch_fusion.hpp" #include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/space_to_batch.hpp" #include "openvino/op/space_to_depth.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/op/util/pad_base.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::SpaceToBatchFusion::SpaceToBatchFusion() { diff --git a/src/common/transformations/src/transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.cpp index 5a7f2ef56b3..168e425930c 100644 --- a/src/common/transformations/src/transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/split_concat_pair_to_interpolate_fusion.cpp @@ -6,17 +6,15 @@ #include #include -#include -#include #include -#include -#include #include #include #include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" @@ -26,6 +24,8 @@ #include "openvino/op/shape_of.hpp" #include "openvino/op/split.hpp" #include "openvino/op/strided_slice.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/rt_info/disable_constant_folding.hpp" using namespace ov; @@ -149,8 +149,8 @@ ov::pass::SplitConcatPairToInterpolateFusion::SplitConcatPairToInterpolateFusion // by number of output ports of 'split'. // // Detect only concat, because we don't know how many inputs will go into concat. - auto concat_pattern = ngraph::pattern::wrap_type(); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + auto concat_pattern = ov::pass::pattern::wrap_type(); + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto concat = std::dynamic_pointer_cast(m.get_match_root()); if (!concat) return false; @@ -248,6 +248,6 @@ ov::pass::SplitConcatPairToInterpolateFusion::SplitConcatPairToInterpolateFusion return true; }; - auto m = std::make_shared(concat_pattern, matcher_name); + auto m = std::make_shared(concat_pattern, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/split_squeeze_concat_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/split_squeeze_concat_fusion.cpp index a316539cb20..358227c39ae 100644 --- a/src/common/transformations/src/transformations/common_optimizations/split_squeeze_concat_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/split_squeeze_concat_fusion.cpp @@ -5,25 +5,25 @@ #include "transformations/common_optimizations/split_squeeze_concat_fusion.hpp" #include -#include -#include #include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/split.hpp" #include "openvino/op/squeeze.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::SplitSqueezeConcatFusion::SplitSqueezeConcatFusion() { MATCHER_SCOPE(SplitSqueezeConcatFusion); // Detect only concat, because we don't know how many inputs will go into concat - auto concat_pattern = ngraph::pattern::wrap_type(); + auto concat_pattern = ov::pass::pattern::wrap_type(); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); auto concat = std::dynamic_pointer_cast(pattern_to_output.at(concat_pattern).get_node_shared_ptr()); @@ -98,11 +98,11 @@ ov::pass::SplitSqueezeConcatFusion::SplitSqueezeConcatFusion() { auto reshape = std::make_shared(transpose, shape_after, false); reshape->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info(nodes_to_delete, {transpose, reshape}); - ngraph::replace_node(m.get_match_root(), reshape); + ov::copy_runtime_info(nodes_to_delete, {transpose, reshape}); + ov::replace_node(m.get_match_root(), reshape); return true; }; - auto m = std::make_shared(concat_pattern, matcher_name); + auto m = std::make_shared(concat_pattern, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/strides_optimization.cpp b/src/common/transformations/src/transformations/common_optimizations/strides_optimization.cpp index 8c2ec061722..20cc162f845 100644 --- a/src/common/transformations/src/transformations/common_optimizations/strides_optimization.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/strides_optimization.cpp @@ -2,15 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include +#include "transformations/common_optimizations/strides_optimization.hpp" + #include -#include -#include -#include #include "itt.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convolution.hpp" @@ -18,26 +15,30 @@ #include "openvino/op/reshape.hpp" #include "openvino/op/shape_of.hpp" #include "openvino/op/squeeze.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/rt_info/strides_property.hpp" +#include "transformations/utils/utils.hpp" using namespace std; using namespace ov; -static bool can_propagate_conv_stride(const std::shared_ptr& conv) { +static bool can_propagate_conv_stride(const std::shared_ptr& conv) { const auto& kernel_shape = conv->input_value(1).get_shape(); return std::all_of(kernel_shape.begin() + 2, kernel_shape.end(), [](size_t s) -> bool { return s == 1; }); } -static std::tuple check_next_ops(const std::vector>& next_ops) { - std::vector strides; +static std::tuple check_next_ops(const std::vector>& next_ops) { + std::vector strides; for (const auto& op : next_ops) { if (!has_strides_prop(op)) { - return std::make_tuple(ngraph::Strides{}, false); + return std::make_tuple(ov::Strides{}, false); } strides.push_back(get_strides_prop(op)); } - bool all_ops_are_valid = std::all_of(strides.begin(), strides.end(), [&strides](const ngraph::Strides& s) -> bool { + bool all_ops_are_valid = std::all_of(strides.begin(), strides.end(), [&strides](const ov::Strides& s) -> bool { bool all_ones = std::all_of(s.begin(), s.end(), [](size_t i) -> bool { return i == 1; }); @@ -85,7 +86,7 @@ static void insert_pooling(const Output& first, Input& second, const second.replace_source_output(new_node); } -static void handle_not_equal_stride_props(std::vector>& next_ops) { +static void handle_not_equal_stride_props(std::vector>& next_ops) { for (auto& op : next_ops) { if (!has_strides_prop(op)) continue; @@ -104,7 +105,7 @@ static void handle_not_equal_stride_props(std::vector>& nodes) { +static void remove_strides_property_from_nodes(std::vector>& nodes) { for (auto& node : nodes) { remove_strides_prop(node); } diff --git a/src/common/transformations/src/transformations/common_optimizations/subtract_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/subtract_fusion.cpp index 0e12a966c59..3ca2666f5e1 100644 --- a/src/common/transformations/src/transformations/common_optimizations/subtract_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/subtract_fusion.cpp @@ -5,16 +5,16 @@ #include "transformations/common_optimizations/subtract_fusion.hpp" #include -#include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/negative.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::SubtractFusion::SubtractFusion() { @@ -29,7 +29,7 @@ ov::pass::SubtractFusion::SubtractFusion() { auto p_mul_or_neg = std::make_shared(OutputVector({p_mul, p_neg})); auto p_add_input = pattern::any_input(); - auto p_add = ngraph::pattern::wrap_type({p_add_input, p_mul_or_neg}); + auto p_add = ov::pass::pattern::wrap_type({p_add_input, p_mul_or_neg}); matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); @@ -58,6 +58,6 @@ ov::pass::SubtractFusion::SubtractFusion() { return true; }; - auto m = std::make_shared(p_add, matcher_name); + auto m = std::make_shared(p_add, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/swish_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/swish_fusion.cpp index da5296ce3c4..d74fe15da0f 100644 --- a/src/common/transformations/src/transformations/common_optimizations/swish_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/swish_fusion.cpp @@ -5,10 +5,9 @@ #include "transformations/common_optimizations/swish_fusion.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" @@ -17,6 +16,7 @@ #include "openvino/op/negative.hpp" #include "openvino/op/sigmoid.hpp" #include "openvino/op/swish.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" namespace { @@ -26,7 +26,7 @@ bool check_beta_value(const std::shared_ptr& constant) { if (!constant) { return false; } - if (constant->get_element_type() == ngraph::element::f32 || constant->get_element_type() == ngraph::element::f16) { + if (constant->get_element_type() == ov::element::f32 || constant->get_element_type() == ov::element::f16) { auto data = constant->cast_vector(); if (!std::equal(data.begin() + 1, data.end(), data.begin())) { return false; @@ -46,21 +46,21 @@ ov::pass::SwishFusionWithSigmoid::SwishFusionWithSigmoid() { auto sigmoid = std::make_shared(input); auto mul = std::make_shared(input, sigmoid); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto exp_input = pattern_to_output.at(input); auto swish = std::make_shared(exp_input); swish->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info( + ov::copy_runtime_info( {pattern_to_output.at(sigmoid).get_node_shared_ptr(), pattern_to_output.at(mul).get_node_shared_ptr()}, swish); - ngraph::replace_node(m.get_match_root(), swish); + ov::replace_node(m.get_match_root(), swish); return true; }; - auto m = std::make_shared(mul, matcher_name); + auto m = std::make_shared(mul, matcher_name); register_matcher(m, callback); } @@ -73,7 +73,7 @@ ov::pass::SwishFusionWithSigmoidWithBeta::SwishFusionWithSigmoidWithBeta() { auto sigmoid = std::make_shared(mul_beta); auto mul = std::make_shared(input, sigmoid); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto exp_input = pattern_to_output.at(input); auto beta_input = pattern_to_output.at(beta); @@ -90,7 +90,7 @@ ov::pass::SwishFusionWithSigmoidWithBeta::SwishFusionWithSigmoidWithBeta() { } } else { // if the input is not constant and number of elements is not equal to 1 then we cannot perform fusing - if (beta_input.get_partial_shape().is_dynamic() || ngraph::shape_size(beta_input.get_shape()) != 1) { + if (beta_input.get_partial_shape().is_dynamic() || ov::shape_size(beta_input.get_shape()) != 1) { return false; } new_beta = beta_input; @@ -99,14 +99,14 @@ ov::pass::SwishFusionWithSigmoidWithBeta::SwishFusionWithSigmoidWithBeta() { auto swish = std::make_shared(exp_input, new_beta); swish->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info( + ov::copy_runtime_info( {pattern_to_output.at(sigmoid).get_node_shared_ptr(), pattern_to_output.at(mul).get_node_shared_ptr()}, swish); - ngraph::replace_node(m.get_match_root(), swish); + ov::replace_node(m.get_match_root(), swish); return true; }; - auto m = std::make_shared(mul, matcher_name); + auto m = std::make_shared(mul, matcher_name); register_matcher(m, callback); } @@ -118,11 +118,11 @@ ov::pass::SwishFusionWithBeta::SwishFusionWithBeta() { auto mul = std::make_shared(input, beta); auto neg = std::make_shared(mul); auto exp = std::make_shared(neg); - auto add_constant = ngraph::pattern::wrap_type(); + auto add_constant = ov::pass::pattern::wrap_type(); auto add = std::make_shared(exp, add_constant); auto div = std::make_shared(input, add); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto exp_input = pattern_to_output.at(input); @@ -135,19 +135,19 @@ ov::pass::SwishFusionWithBeta::SwishFusionWithBeta() { auto swish = std::make_shared(exp_input, pattern_to_output.at(beta)); swish->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info({pattern_to_output.at(beta).get_node_shared_ptr(), - pattern_to_output.at(mul).get_node_shared_ptr(), - pattern_to_output.at(neg).get_node_shared_ptr(), - pattern_to_output.at(exp).get_node_shared_ptr(), - pattern_to_output.at(add_constant).get_node_shared_ptr(), - pattern_to_output.at(add).get_node_shared_ptr(), - pattern_to_output.at(div).get_node_shared_ptr()}, - swish); - ngraph::replace_node(m.get_match_root(), swish); + ov::copy_runtime_info({pattern_to_output.at(beta).get_node_shared_ptr(), + pattern_to_output.at(mul).get_node_shared_ptr(), + pattern_to_output.at(neg).get_node_shared_ptr(), + pattern_to_output.at(exp).get_node_shared_ptr(), + pattern_to_output.at(add_constant).get_node_shared_ptr(), + pattern_to_output.at(add).get_node_shared_ptr(), + pattern_to_output.at(div).get_node_shared_ptr()}, + swish); + ov::replace_node(m.get_match_root(), swish); return true; }; - auto m = std::make_shared(div, matcher_name); + auto m = std::make_shared(div, matcher_name); register_matcher(m, callback); } @@ -157,11 +157,11 @@ ov::pass::SwishFusionWithoutBeta::SwishFusionWithoutBeta() { auto input = pass::pattern::any_input(); auto neg = std::make_shared(input); auto exp = std::make_shared(neg); - auto add_constant = ngraph::pattern::wrap_type(); + auto add_constant = ov::pass::pattern::wrap_type(); auto add = std::make_shared(exp, add_constant); auto div = std::make_shared(input, add); - ov::matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto exp_input = pattern_to_output.at(input); @@ -174,16 +174,16 @@ ov::pass::SwishFusionWithoutBeta::SwishFusionWithoutBeta() { auto swish = std::make_shared(exp_input); swish->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info({pattern_to_output.at(neg).get_node_shared_ptr(), - pattern_to_output.at(exp).get_node_shared_ptr(), - pattern_to_output.at(add_constant).get_node_shared_ptr(), - pattern_to_output.at(add).get_node_shared_ptr(), - pattern_to_output.at(div).get_node_shared_ptr()}, - swish); - ngraph::replace_node(m.get_match_root(), swish); + ov::copy_runtime_info({pattern_to_output.at(neg).get_node_shared_ptr(), + pattern_to_output.at(exp).get_node_shared_ptr(), + pattern_to_output.at(add_constant).get_node_shared_ptr(), + pattern_to_output.at(add).get_node_shared_ptr(), + pattern_to_output.at(div).get_node_shared_ptr()}, + swish); + ov::replace_node(m.get_match_root(), swish); return true; }; - auto m = std::make_shared(div, matcher_name); + auto m = std::make_shared(div, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.cpp b/src/common/transformations/src/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.cpp index 4669077a73b..013c91ef680 100644 --- a/src/common/transformations/src/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.cpp @@ -8,13 +8,13 @@ #include #include "itt.hpp" -#include "ngraph/pattern/op/wrap_type.hpp" -#include "ngraph/rt_info.hpp" -#include "ngraph/validation_util.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/matmul.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" namespace { /// \brief Check for correct Transpose orders which are before and after MatMul. Second Transpose must be back for @@ -121,23 +121,23 @@ ov::pass::TransposeReshapeEliminationForMatmul::TransposeReshapeEliminationForMa return node.get_partial_shape().is_static(); }); - auto const_transpose_before_pattern = ngraph::pattern::wrap_type(); + auto const_transpose_before_pattern = ov::pass::pattern::wrap_type(); auto transpose_before_pattern = - ngraph::pattern::wrap_type({input_2_pattern, const_transpose_before_pattern}); + ov::pass::pattern::wrap_type({input_2_pattern, const_transpose_before_pattern}); - auto const_reshape_before_pattern = ngraph::pattern::wrap_type(); + auto const_reshape_before_pattern = ov::pass::pattern::wrap_type(); auto reshape_before_pattern = - ngraph::pattern::wrap_type({transpose_before_pattern, const_reshape_before_pattern}); + ov::pass::pattern::wrap_type({transpose_before_pattern, const_reshape_before_pattern}); - auto matmul_pattern = ngraph::pattern::wrap_type({input_1_pattern, reshape_before_pattern}); + auto matmul_pattern = ov::pass::pattern::wrap_type({input_1_pattern, reshape_before_pattern}); - auto const_reshape_after_pattern = ngraph::pattern::wrap_type(); + auto const_reshape_after_pattern = ov::pass::pattern::wrap_type(); auto reshape_after_pattern = - ngraph::pattern::wrap_type({matmul_pattern, const_reshape_after_pattern}); + ov::pass::pattern::wrap_type({matmul_pattern, const_reshape_after_pattern}); - auto const_transpose_after_pattern = ngraph::pattern::wrap_type(); + auto const_transpose_after_pattern = ov::pass::pattern::wrap_type(); auto transpose_after_pattern = - ngraph::pattern::wrap_type({reshape_after_pattern, const_transpose_after_pattern}); + ov::pass::pattern::wrap_type({reshape_after_pattern, const_transpose_after_pattern}); ov::matcher_pass_callback callback = [=](pattern::Matcher& m) { const auto& pattern_value_map = m.get_pattern_value_map(); @@ -191,6 +191,6 @@ ov::pass::TransposeReshapeEliminationForMatmul::TransposeReshapeEliminationForMa return true; }; - auto m = std::make_shared(transpose_after_pattern, matcher_name); + auto m = std::make_shared(transpose_after_pattern, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/transpose_sinking.cpp b/src/common/transformations/src/transformations/common_optimizations/transpose_sinking.cpp index 67f1f7a335f..092f7454f74 100644 --- a/src/common/transformations/src/transformations/common_optimizations/transpose_sinking.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/transpose_sinking.cpp @@ -5,13 +5,12 @@ #include "transformations/common_optimizations/transpose_sinking.hpp" #include -#include -#include #include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/fake_quantize.hpp" @@ -19,6 +18,7 @@ #include "openvino/op/squeeze.hpp" #include "openvino/op/transpose.hpp" #include "openvino/op/unsqueeze.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" using namespace ov; @@ -50,23 +50,20 @@ std::shared_ptr get_reduced_order_constant( std::replace(order.begin(), order.end(), *lowest_greater_eq_i, i); std::replace(order_sorted.begin(), order_sorted.end(), *lowest_greater_eq_i, i); } - return std::make_shared(ngraph::element::i64, ngraph::Shape{order.size()}, order); + return std::make_shared(ov::element::i64, ov::Shape{order.size()}, order); } std::shared_ptr get_reversed_order_constant( const std::shared_ptr& order_const) { const auto& order = order_const->cast_vector(); const auto& rank = order.size(); - OPENVINO_SUPPRESS_DEPRECATED_START - const auto& default_order = ngraph::get_default_order(rank); - OPENVINO_SUPPRESS_DEPRECATED_END + AxisVector default_order(rank); + std::iota(begin(default_order), end(default_order), 0); std::vector reverse_order(rank); for (size_t i = 0; i < rank; ++i) reverse_order[order[i]] = default_order[i]; - return std::make_shared(ngraph::element::i64, - ngraph::Shape{reverse_order.size()}, - reverse_order); + return std::make_shared(ov::element::i64, ov::Shape{reverse_order.size()}, reverse_order); } } // namespace @@ -85,7 +82,7 @@ ov::pass::TransposeEltwise::TransposeEltwise() { pattern::wrap_type({eltwise_p, pattern::wrap_type()}, pattern::consumers_count(1)); - auto callback = [=](ngraph::pattern::Matcher& m) { + auto callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); auto eltwise = pattern_to_output.at(eltwise_p).get_node_shared_ptr(); auto eltwise_const_input = pattern_to_output.at(eltwise_const_input_p); @@ -119,7 +116,7 @@ ov::pass::TransposeEltwise::TransposeEltwise() { return true; }; - auto m = std::make_shared(transpose_p, matcher_name); + auto m = std::make_shared(transpose_p, matcher_name); register_matcher(m, callback); } @@ -131,7 +128,7 @@ ov::pass::TransposeConvert::TransposeConvert() { pattern::consumers_count(1)); auto convert_label = pattern::wrap_type({transpose_label}); - matcher_pass_callback matcher_pass_callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback matcher_pass_callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); auto transpose = pattern_to_output.at(transpose_label).get_node_shared_ptr(); auto convert = pattern_to_output.at(convert_label).get_node_shared_ptr(); @@ -146,7 +143,7 @@ ov::pass::TransposeConvert::TransposeConvert() { return true; }; - auto m = std::make_shared(convert_label, matcher_name); + auto m = std::make_shared(convert_label, matcher_name); register_matcher(m, matcher_pass_callback); } @@ -161,7 +158,7 @@ ov::pass::TransposeReduction::TransposeReduction() { op::util::LogicalReductionKeepDims, ov::op::v0::Squeeze>({transpose_label, pattern::wrap_type()}); - ov::matcher_pass_callback matcher_pass_callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback matcher_pass_callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); auto transpose = pattern_to_output.at(transpose_label).get_node_shared_ptr(); @@ -188,14 +185,13 @@ ov::pass::TransposeReduction::TransposeReduction() { reduction_axes->cast_vector(), reduction->get_input_partial_shape(0).rank()); OPENVINO_SUPPRESS_DEPRECATED_END - reduction_axes = - ov::op::v0::Constant::create(ngraph::element::i64, {non_negative_axes.size()}, non_negative_axes); + reduction_axes = ov::op::v0::Constant::create(ov::element::i64, {non_negative_axes.size()}, non_negative_axes); - ngraph::NodeVector new_ops; - auto new_axes = ov::op::util::make_try_fold( - transpose_order, - reduction_axes, - ov::op::v0::Constant::create(ngraph::element::i64, {}, {0})); + ov::NodeVector new_ops; + auto new_axes = + ov::op::util::make_try_fold(transpose_order, + reduction_axes, + ov::op::v0::Constant::create(ov::element::i64, {}, {0})); new_ops.push_back(new_axes); auto new_reduce = reduction->clone_with_new_inputs({transpose->input_value(0), new_axes}); new_ops.push_back(new_reduce); @@ -213,13 +209,13 @@ ov::pass::TransposeReduction::TransposeReduction() { new_ops.push_back(new_transpose); new_transpose->set_friendly_name(reduction->get_friendly_name()); - ngraph::copy_runtime_info({reduction, transpose}, new_ops); - ngraph::replace_node(reduction, new_transpose); + ov::copy_runtime_info({reduction, transpose}, new_ops); + ov::replace_node(reduction, new_transpose); return true; }; - auto m = std::make_shared(reduce_or_squeeze_label, matcher_name); + auto m = std::make_shared(reduce_or_squeeze_label, matcher_name); register_matcher(m, matcher_pass_callback); } @@ -238,7 +234,7 @@ ov::pass::TransposeFQReduction::TransposeFQReduction() { op::util::LogicalReductionKeepDims, ov::op::v0::Squeeze>({fq_label, pattern::wrap_type()}); - ov::matcher_pass_callback matcher_pass_callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback matcher_pass_callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto transpose = pattern_to_output.at(transpose_label).get_node_shared_ptr(); @@ -250,17 +246,17 @@ ov::pass::TransposeFQReduction::TransposeFQReduction() { if (!transpose_order || !fq) return false; - ngraph::NodeVector new_ops; + ov::NodeVector new_ops; const auto& reverse_order_constant = get_reversed_order_constant(transpose_order); new_ops.push_back(reverse_order_constant); const auto& input_rank = fq->get_input_partial_shape(0).rank().get_length(); - ngraph::OutputVector fq_inputs = {transpose->input_value(0)}; + ov::OutputVector fq_inputs = {transpose->input_value(0)}; for (size_t i = 1; i < fq->inputs().size(); ++i) { auto input = fq->input_value(i); const auto& ranks_diff = input_rank - input.get_partial_shape().rank().get_length(); - NGRAPH_CHECK(ranks_diff >= 0); + OPENVINO_ASSERT(ranks_diff >= 0); if (ranks_diff > 0) { std::vector axes(ranks_diff); std::iota(axes.begin(), axes.end(), 0); @@ -282,14 +278,14 @@ ov::pass::TransposeFQReduction::TransposeFQReduction() { new_ops.push_back(new_transpose); new_transpose->set_friendly_name(fq->get_friendly_name()); - ngraph::copy_runtime_info({fq, transpose}, new_ops); - ngraph::replace_node(fq, new_transpose); + ov::copy_runtime_info({fq, transpose}, new_ops); + ov::replace_node(fq, new_transpose); // The root node (reduction) left unchanged during current matcher pass. // We return false here for further MatcherPasses to be applicable for this node as a root node return false; }; - auto m = std::make_shared(reduce_or_squeeze_label, matcher_name); + auto m = std::make_shared(reduce_or_squeeze_label, matcher_name); register_matcher(m, matcher_pass_callback); } @@ -302,7 +298,7 @@ ov::pass::TransposeFuse::TransposeFuse() { auto transpose_2 = pattern::wrap_type({transpose_1, pattern::wrap_type()}); - ov::matcher_pass_callback matcher_pass_callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback matcher_pass_callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_to_output = m.get_pattern_value_map(); auto transpose1 = pattern_to_output.at(transpose_1).get_node_shared_ptr(); @@ -333,19 +329,19 @@ ov::pass::TransposeFuse::TransposeFuse() { transpose_order_type = element::i64; if (is_ordered) { - return ngraph::replace_output_update_name(transpose2->output(0), input); + return ov::replace_output_update_name(transpose2->output(0), input); } else { auto new_order = ov::op::v0::Constant::create(transpose_order_type, {order2.size()}, order2); auto new_transpose = register_new_node(input, new_order); new_transpose->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info({transpose1, transpose2}, new_transpose); - ngraph::replace_node(m.get_match_root(), new_transpose); + ov::copy_runtime_info({transpose1, transpose2}, new_transpose); + ov::replace_node(m.get_match_root(), new_transpose); } return true; }; - auto m = std::make_shared(transpose_2, matcher_name); + auto m = std::make_shared(transpose_2, matcher_name); register_matcher(m, matcher_pass_callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/transpose_to_reshape.cpp b/src/common/transformations/src/transformations/common_optimizations/transpose_to_reshape.cpp index 2aaa8ec6e01..728896d9033 100644 --- a/src/common/transformations/src/transformations/common_optimizations/transpose_to_reshape.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/transpose_to_reshape.cpp @@ -5,17 +5,17 @@ #include "transformations/common_optimizations/transpose_to_reshape.hpp" #include -#include -#include #include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/gather.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/shape_of.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" using namespace ov; @@ -25,7 +25,7 @@ ov::pass::TransposeToReshape::TransposeToReshape() { auto transpose_label = pattern::wrap_type( {pattern::any_input(pattern::has_static_rank()), pattern::wrap_type()}); - ov::matcher_pass_callback matcher_pass_callback = [=](ngraph::pattern::Matcher& m) { + ov::matcher_pass_callback matcher_pass_callback = [=](ov::pass::pattern::Matcher& m) { auto transpose = m.get_match_root(); auto data = transpose->input_value(0); const auto input_shape = transpose->input(0).get_partial_shape(); @@ -33,7 +33,7 @@ ov::pass::TransposeToReshape::TransposeToReshape() { const size_t input_shape_rank = input_shape.rank().get_length(); auto order = ov::as_type_ptr(transpose->input_value(1).get_node_shared_ptr()); - if (!order || !ngraph::shape_size(order->get_shape())) { + if (!order || !ov::shape_size(order->get_shape())) { return false; } @@ -110,6 +110,6 @@ ov::pass::TransposeToReshape::TransposeToReshape() { return true; }; - auto m = std::make_shared(transpose_label, matcher_name); + auto m = std::make_shared(transpose_label, matcher_name); register_matcher(m, matcher_pass_callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/weights_dequantize_to_fake_quantize.cpp b/src/common/transformations/src/transformations/common_optimizations/weights_dequantize_to_fake_quantize.cpp index f2396dca413..7a4e0ebaa62 100644 --- a/src/common/transformations/src/transformations/common_optimizations/weights_dequantize_to_fake_quantize.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/weights_dequantize_to_fake_quantize.cpp @@ -2,35 +2,35 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include +#include "transformations/common_optimizations/weights_dequantize_to_fake_quantize.hpp" #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/fake_quantize.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/rt_info/disable_constant_folding.hpp" +#include "transformations/utils/utils.hpp" ov::pass::WeightsDequantizeToFakeQuantize::WeightsDequantizeToFakeQuantize() { MATCHER_SCOPE(WeightsDequantizeToFakeQuantize); - const auto weights = ngraph::pattern::wrap_type(pattern::type_matches(element::i8)); - const auto convert = ngraph::pattern::wrap_type({weights}); - const auto sub_c = ngraph::pattern::wrap_type(); - const auto sub = ngraph::pattern::wrap_type({convert, sub_c}); + const auto weights = ov::pass::pattern::wrap_type(pattern::type_matches(element::i8)); + const auto convert = ov::pass::pattern::wrap_type({weights}); + const auto sub_c = ov::pass::pattern::wrap_type(); + const auto sub = ov::pass::pattern::wrap_type({convert, sub_c}); const auto sub_or_convert = std::make_shared(OutputVector{convert, sub}); - const auto mul_c = ngraph::pattern::wrap_type(); - const auto mul = ngraph::pattern::wrap_type({sub_or_convert, mul_c}); + const auto mul_c = ov::pass::pattern::wrap_type(); + const auto mul = ov::pass::pattern::wrap_type({sub_or_convert, mul_c}); ov::matcher_pass_callback callback; - callback = [=](ngraph::pattern::Matcher& m) { + callback = [=](ov::pass::pattern::Matcher& m) { const auto& pattern_map = m.get_pattern_map(); const auto& weights_node = ov::as_type_ptr(pattern_map.at(weights)); @@ -71,7 +71,7 @@ ov::pass::WeightsDequantizeToFakeQuantize::WeightsDequantizeToFakeQuantize() { if (pattern_map.count(sub)) nodes_to_copy_RT_info_from.push_back(sub); - ngraph::copy_runtime_info(nodes_to_copy_RT_info_from, fq); + ov::copy_runtime_info(nodes_to_copy_RT_info_from, fq); multiply_node->output(0).replace(fq->output(0)); fq->set_friendly_name(multiply_node->get_friendly_name()); @@ -80,6 +80,6 @@ ov::pass::WeightsDequantizeToFakeQuantize::WeightsDequantizeToFakeQuantize() { return true; }; - auto m = std::make_shared(mul, matcher_name); + auto m = std::make_shared(mul, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/common_optimizations/wrap_interpolate_into_transposes.cpp b/src/common/transformations/src/transformations/common_optimizations/wrap_interpolate_into_transposes.cpp index a899a64b722..5a7eb50f85d 100644 --- a/src/common/transformations/src/transformations/common_optimizations/wrap_interpolate_into_transposes.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/wrap_interpolate_into_transposes.cpp @@ -6,18 +6,18 @@ #include #include -#include #include -#include #include #include #include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/interpolate.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" namespace { std::vector reverse_permutation(const std::vector& perm) { diff --git a/src/common/transformations/src/transformations/control_flow/unroll_if.cpp b/src/common/transformations/src/transformations/control_flow/unroll_if.cpp index 2a47e41c903..25a35e8c3d1 100644 --- a/src/common/transformations/src/transformations/control_flow/unroll_if.cpp +++ b/src/common/transformations/src/transformations/control_flow/unroll_if.cpp @@ -5,18 +5,18 @@ #include "transformations/control_flow/unroll_if.hpp" #include -#include -#include -#include -#include #include "itt.hpp" #include "openvino/core/descriptor/tensor.hpp" +#include "openvino/core/graph_util.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/if.hpp" #include "openvino/op/result.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" -bool ov::pass::UnrollIf::run_on_model(const std::shared_ptr& f) { +bool ov::pass::UnrollIf::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(UnrollIf); bool is_applicable = false; for (const auto& op : f->get_ordered_ops()) { @@ -32,7 +32,7 @@ bool ov::pass::UnrollIf::run_on_model(const std::shared_ptr& f } Output cond = if_node->input_value(0); OPENVINO_SUPPRESS_DEPRECATED_START - const auto cond_is_const = ngraph::get_constant_from_source(cond); + const auto cond_is_const = ov::get_constant_from_source(cond); OPENVINO_SUPPRESS_DEPRECATED_END if (!cond_is_const) { continue; @@ -55,12 +55,12 @@ bool ov::pass::UnrollIf::run_on_model(const std::shared_ptr& f std::shared_ptr result = body->get_results()[output_desc->m_body_value_index]; const auto& in_value = result->input_value(0); - // set output name to Tensor to store it for ngraph to cnn conversion - NGRAPH_SUPPRESS_DEPRECATED_START + // set output name to Tensor to store it for openvino to cnn conversion + OPENVINO_SUPPRESS_DEPRECATED_START ov::descriptor::set_ov_tensor_legacy_name( in_value.get_tensor(), op::util::create_ie_output_name(if_node->output(output_desc->m_output_index))); - NGRAPH_SUPPRESS_DEPRECATED_END + OPENVINO_SUPPRESS_DEPRECATED_END for (const auto& input : if_node->output(output_desc->m_output_index).get_target_inputs()) { input.replace_source_output(result->get_input_source_output(0)); } diff --git a/src/common/transformations/src/transformations/control_flow/unroll_tensor_iterator.cpp b/src/common/transformations/src/transformations/control_flow/unroll_tensor_iterator.cpp index bd85ba3ed1d..2936028a3ba 100644 --- a/src/common/transformations/src/transformations/control_flow/unroll_tensor_iterator.cpp +++ b/src/common/transformations/src/transformations/control_flow/unroll_tensor_iterator.cpp @@ -5,21 +5,21 @@ #include "transformations/control_flow/unroll_tensor_iterator.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/graph_util.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/loop.hpp" #include "openvino/op/result.hpp" #include "openvino/op/split.hpp" #include "openvino/op/tensor_iterator.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" -bool ov::pass::UnrollTensorIterator::run_on_model(const std::shared_ptr& f) { +bool ov::pass::UnrollTensorIterator::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(UnrollTensorIterator); for (const auto& op : f->get_ops()) { auto sub_graph_op = std::dynamic_pointer_cast(op); @@ -37,7 +37,7 @@ bool ov::pass::UnrollTensorIterator::run_on_model(const std::shared_ptr> body_functions(num_iter); + std::vector> body_functions(num_iter); for (int64_t idx = 0; idx < num_iter; ++idx) { body_functions[idx] = function->clone(); for (auto& node : body_functions[idx]->get_ops()) { @@ -120,10 +120,10 @@ bool ov::pass::UnrollTensorIterator::run_on_model(const std::shared_ptr& target_inp) { return ov::as_type(target_inp.get_node()) != nullptr; })) { - NGRAPH_SUPPRESS_DEPRECATED_START + OPENVINO_SUPPRESS_DEPRECATED_START ov::descriptor::set_ov_tensor_legacy_name(insert_to.get_tensor(), ov::op::util::create_ie_output_name(ti_output)); - NGRAPH_SUPPRESS_DEPRECATED_END + OPENVINO_SUPPRESS_DEPRECATED_END } }; @@ -138,7 +138,7 @@ bool ov::pass::UnrollTensorIterator::run_on_model(const std::shared_ptr 1) { - ngraph::OutputVector to_concat(num_iter); + ov::OutputVector to_concat(num_iter); auto stride = concat_desc->m_stride; // Connect outputs of the bodies to the Concat layer @@ -152,7 +152,7 @@ bool ov::pass::UnrollTensorIterator::run_on_model(const std::shared_ptr(to_concat, concat_desc->m_axis); copy_runtime_info(sub_graph_op, concat); - // set output name to Tensor to store it for ngraph to cnn conversion + // set output name to Tensor to store it for openvino to cnn conversion insert_tensor_name(sub_graph_op->output(concat_desc->m_output_index), concat->output(0)); // connect the Concat layer to the corresponding TI outputs @@ -164,7 +164,7 @@ bool ov::pass::UnrollTensorIterator::run_on_model(const std::shared_ptr result = body_functions[0]->get_results().at(concat_desc->m_body_value_index); const auto& input_to_res = result->get_input_source_output(0); - // set output name to Tensor to store it for ngraph to cnn conversion + // set output name to Tensor to store it for openvino to cnn conversion insert_tensor_name(sub_graph_op->output(concat_desc->m_output_index), input_to_res); for (auto& input : sub_graph_op->output(concat_desc->m_output_index).get_target_inputs()) { @@ -216,7 +216,7 @@ bool ov::pass::UnrollTensorIterator::run_on_model(const std::shared_ptrget_special_body_ports().current_iteration_input_idx; const auto& param_to_delete = body_functions[idx]->get_parameters()[iter_idx]; - auto cur_iter_const = std::make_shared(ngraph::element::i64, Shape{}, idx); + auto cur_iter_const = std::make_shared(ov::element::i64, Shape{}, idx); replace_node(param_to_delete, cur_iter_const); body_functions[idx]->remove_parameter(param_to_delete); } diff --git a/src/common/transformations/src/transformations/convert_precision.cpp b/src/common/transformations/src/transformations/convert_precision.cpp index e1cc8127b69..42f0188f7b0 100644 --- a/src/common/transformations/src/transformations/convert_precision.cpp +++ b/src/common/transformations/src/transformations/convert_precision.cpp @@ -5,19 +5,19 @@ #include "transformations/convert_precision.hpp" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include "itt.hpp" +#include "ngraph/runtime/reference/convert.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset10.hpp" +#include "openvino/opsets/opset11.hpp" +#include "openvino/opsets/opset3.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/opsets/opset5.hpp" +#include "openvino/opsets/opset6.hpp" +#include "openvino/opsets/opset8.hpp" +#include "openvino/opsets/opset9.hpp" #include "openvino/pass/constant_folding.hpp" #include "openvino/pass/manager.hpp" #include "ov_ops/type_relaxed.hpp" @@ -31,41 +31,40 @@ using namespace ov; -bool fuse_type_to_parameter(const std::shared_ptr& node, +bool fuse_type_to_parameter(const std::shared_ptr& node, const precisions_map& precisions, bool convert_input_precision); -bool fuse_type_to_constant(const std::shared_ptr& node, +bool fuse_type_to_constant(const std::shared_ptr& node, const precisions_map& precisions, - const std::vector>& consumers); -bool fuse_type_to_shapeof(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_shapeof_v0(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_random_uniform_v8(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_unique_v10(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_range_v4(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_eye_v9(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_convert(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_nms3(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_nms4(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_nms5(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_nms9(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_matrix_nms(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_multiclass_nms(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_generate_proposals(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_topk(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_maxpool(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_nonzero(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_bucketize(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_ctc_greedy_decoder_seq_len(const std::shared_ptr& node, - const precisions_map& precisions); + const std::vector>& consumers); +bool fuse_type_to_shapeof(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_shapeof_v0(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_random_uniform_v8(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_unique_v10(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_range_v4(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_eye_v9(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_convert(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_nms3(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_nms4(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_nms5(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_nms9(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_matrix_nms(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_multiclass_nms(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_generate_proposals(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_topk(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_maxpool(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_nonzero(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_bucketize(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_ctc_greedy_decoder_seq_len(const std::shared_ptr& node, const precisions_map& precisions); -bool fuse_type_to_random_uniform_v8(const std::shared_ptr& node, const precisions_map& precisions); +bool fuse_type_to_random_uniform_v8(const std::shared_ptr& node, const precisions_map& precisions); -bool extend_select_type(const std::shared_ptr& node, const precisions_map& precisions); -bool extend_reverse_type(const std::shared_ptr& node, const precisions_map& precisions); +bool extend_select_type(const std::shared_ptr& node, const precisions_map& precisions); +bool extend_reverse_type(const std::shared_ptr& node, const precisions_map& precisions); template -bool fuse_type_to_binary_comparision(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_binary_comparision(const std::shared_ptr& node, const precisions_map& precisions) { auto it = precisions.find(node->get_output_element_type(0)); if (it == precisions.end()) return false; @@ -83,7 +82,7 @@ bool fuse_type_to_binary_comparision(const std::shared_ptr& node, } template -bool fuse_type_to_logical(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_logical(const std::shared_ptr& node, const precisions_map& precisions) { auto it = precisions.find(node->get_output_element_type(0)); if (it == precisions.end()) return false; @@ -103,7 +102,7 @@ bool fuse_type_to_logical(const std::shared_ptr& node, const preci } template -bool fuse_type_to_reduce_logical(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_reduce_logical(const std::shared_ptr& node, const precisions_map& precisions) { auto it = precisions.find(node->get_output_element_type(0)); if (it == precisions.end()) return false; @@ -133,13 +132,13 @@ bool node_is_replaced(const std::shared_ptr& node) { } bool convert_node_output_precision( - const std::shared_ptr& node, + const std::shared_ptr& node, const precisions_map& precisions, const type_to_fuse_map& type_to_fuse, - const std::unordered_map>>& const_to_internal_output, + const std::unordered_map>>& const_to_internal_output, bool function_changed) { bool node_changed = false; - // Handle case with Constants as they can have consumers from other nGraph Function object + // Handle case with Constants as they can have consumers from other ov::Model object const auto constant = ov::as_type_ptr(node); const auto it = const_to_internal_output.find(node.get()); if (constant && it != const_to_internal_output.end()) { @@ -159,7 +158,7 @@ bool convert_node_output_precision( return node_changed; } -bool convert_node_input_precision(const std::shared_ptr& node, +bool convert_node_input_precision(const std::shared_ptr& node, const precisions_map& precisions, const type_to_fuse_map& type_to_extend) { // For some operations we need to extend their input types to support new type @@ -170,17 +169,16 @@ bool convert_node_input_precision(const std::shared_ptr& node, return false; } -bool convert_function_precision( - const std::shared_ptr& f, - const type_to_fuse_map& type_to_fuse, - const type_to_fuse_map& type_to_extend, - const precisions_map& precisions, - std::unordered_map>>& const_to_internal_output, - bool has_fp16_compression, - bool skip_precision_sensitive, - bool is_changed, - bool is_subgraph, - bool convert_input_output_precision) { +bool convert_function_precision(const std::shared_ptr& f, + const type_to_fuse_map& type_to_fuse, + const type_to_fuse_map& type_to_extend, + const precisions_map& precisions, + std::unordered_map>>& const_to_internal_output, + bool has_fp16_compression, + bool skip_precision_sensitive, + bool is_changed, + bool is_subgraph, + bool convert_input_output_precision) { bool is_output_precision_changed = false; ov::element::TypeVector orig_result_types; @@ -307,17 +305,17 @@ bool convert_function_precision( } bool convert_precision(ov::pass::PassBase& pass, - const std::shared_ptr& f, + const std::shared_ptr& f, const type_to_fuse_map& type_to_fuse, const type_to_fuse_map& type_to_extend, const precisions_map& precisions, bool has_fp16_compression, bool skip_precision_sensitive, bool convert_input_output_precision) { - // As Constant operations can be shared between multiple nGraph Functions so before + // As Constant operations can be shared between multiple ov::Models so before // changing precision we need to understand which Constant consumers belongs - // to the current nGraph Function - std::unordered_map>> const_to_internal_output; + // to the current ov::Model + std::unordered_map>> const_to_internal_output; return convert_function_precision(f, type_to_fuse, type_to_extend, @@ -330,12 +328,12 @@ bool convert_precision(ov::pass::PassBase& pass, convert_input_output_precision); } -using precisions_set_t = std::unordered_set; +using precisions_set_t = std::unordered_set; -precisions_set_t find_all_used_precisions(const std::shared_ptr& fn) { +precisions_set_t find_all_used_precisions(const std::shared_ptr& fn) { precisions_set_t used_precisions; - ngraph::traverse_nodes(fn, [&](const std::shared_ptr& node) { + ov::traverse_nodes(fn, [&](const std::shared_ptr& node) { for (const auto& output : node->outputs()) { used_precisions.emplace(output.get_element_type()); } @@ -354,7 +352,7 @@ precisions_set_t find_all_used_precisions(const std::shared_ptr& f) { +bool ov::pass::ConvertPrecision::run_on_model(const std::shared_ptr& f) { const auto used_precisions_set = find_all_used_precisions(f); precisions_map used_precisions; for (const auto& p : used_precisions_set) { @@ -453,7 +451,7 @@ bool ov::pass::ConvertPrecision::run_on_model(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_shapeof(const std::shared_ptr& node, const precisions_map& precisions) { auto it = precisions.find(node->get_output_element_type(0)); if (it == precisions.end()) return false; @@ -467,7 +465,7 @@ bool fuse_type_to_shapeof(const std::shared_ptr& node, const preci return false; } -bool fuse_type_to_random_uniform_v8(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_random_uniform_v8(const std::shared_ptr& node, const precisions_map& precisions) { auto it = precisions.find(node->get_output_element_type(0)); if (it == precisions.end()) return false; @@ -498,7 +496,7 @@ bool fuse_type_to_unique_v10(const std::shared_ptr& node, const precisions return res; } -bool fuse_type_to_range_v4(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_range_v4(const std::shared_ptr& node, const precisions_map& precisions) { auto it = precisions.find(node->get_output_element_type(0)); if (it == precisions.end()) return false; @@ -512,7 +510,7 @@ bool fuse_type_to_range_v4(const std::shared_ptr& node, const prec return false; } -bool fuse_type_to_eye_v9(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_eye_v9(const std::shared_ptr& node, const precisions_map& precisions) { auto it = precisions.find(node->get_output_element_type(0)); if (it == precisions.end()) return false; @@ -526,7 +524,7 @@ bool fuse_type_to_eye_v9(const std::shared_ptr& node, const precis return false; } -bool fuse_type_to_parameter(const std::shared_ptr& node, +bool fuse_type_to_parameter(const std::shared_ptr& node, const precisions_map& precisions, bool convert_input_precision) { auto it = precisions.find(node->get_output_element_type(0)); @@ -555,7 +553,7 @@ bool fuse_type_to_parameter(const std::shared_ptr& node, return changed; } -bool fuse_type_to_convert(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_convert(const std::shared_ptr& node, const precisions_map& precisions) { auto it = precisions.find(node->get_output_element_type(0)); if (it == precisions.end()) return false; @@ -567,7 +565,7 @@ bool fuse_type_to_convert(const std::shared_ptr& node, const preci return false; } -bool fuse_type_to_nms3(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_nms3(const std::shared_ptr& node, const precisions_map& precisions) { auto it = precisions.find(node->get_output_element_type(0)); if (it == precisions.end()) return false; @@ -583,7 +581,7 @@ bool fuse_type_to_nms3(const std::shared_ptr& node, const precisio return false; } -bool fuse_type_to_nms4(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_nms4(const std::shared_ptr& node, const precisions_map& precisions) { auto it = precisions.find(node->get_output_element_type(0)); if (it == precisions.end()) return false; @@ -599,7 +597,7 @@ bool fuse_type_to_nms4(const std::shared_ptr& node, const precisio return false; } -bool fuse_type_to_nms5(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_nms5(const std::shared_ptr& node, const precisions_map& precisions) { auto nms = ov::as_type_ptr(node); if (!nms) { return false; @@ -645,7 +643,7 @@ bool fuse_type_to_nms5(const std::shared_ptr& node, const precisio return res; } -bool fuse_type_to_nms9(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_nms9(const std::shared_ptr& node, const precisions_map& precisions) { auto nms = ov::as_type_ptr(node); if (!nms) { return false; @@ -692,7 +690,7 @@ bool fuse_type_to_nms9(const std::shared_ptr& node, const precisio } bool update_type(size_t idx, - const std::shared_ptr& node, + const std::shared_ptr& node, const precisions_map& precisions, std::function update_method) { auto it = precisions.find(node->get_output_element_type(idx)); @@ -706,7 +704,7 @@ bool update_type(size_t idx, return false; } -bool fuse_type_to_matrix_nms(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_matrix_nms(const std::shared_ptr& node, const precisions_map& precisions) { auto nms = ov::as_type_ptr(node); if (!nms) { return false; @@ -717,7 +715,7 @@ bool fuse_type_to_matrix_nms(const std::shared_ptr& node, const pr }); } -bool fuse_type_to_multiclass_nms(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_multiclass_nms(const std::shared_ptr& node, const precisions_map& precisions) { std::shared_ptr nms; if (ov::is_type(node)) { nms = ov::as_type_ptr(node); @@ -733,7 +731,7 @@ bool fuse_type_to_multiclass_nms(const std::shared_ptr& node, cons }); } -bool fuse_type_to_generate_proposals(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_generate_proposals(const std::shared_ptr& node, const precisions_map& precisions) { auto generate_proposals = ov::as_type_ptr(node); if (!generate_proposals) { return false; @@ -744,7 +742,7 @@ bool fuse_type_to_generate_proposals(const std::shared_ptr& node, }); } -bool fuse_type_to_topk(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_topk(const std::shared_ptr& node, const precisions_map& precisions) { if (auto topk = ov::as_type_ptr(node)) { return update_type(1, node, precisions, [&](const element::Type& to) { topk->set_index_element_type(to); @@ -753,7 +751,7 @@ bool fuse_type_to_topk(const std::shared_ptr& node, const precisio return false; } -bool fuse_type_to_maxpool(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_maxpool(const std::shared_ptr& node, const precisions_map& precisions) { if (auto maxpool = ov::as_type_ptr(node)) { return update_type(1, node, precisions, [&](const element::Type& to) { maxpool->set_index_element_type(to); @@ -762,8 +760,7 @@ bool fuse_type_to_maxpool(const std::shared_ptr& node, const preci return false; } -bool fuse_type_to_ctc_greedy_decoder_seq_len(const std::shared_ptr& node, - const precisions_map& precisions) { +bool fuse_type_to_ctc_greedy_decoder_seq_len(const std::shared_ptr& node, const precisions_map& precisions) { bool res = false; if (auto ctc_decoder = ov::as_type_ptr(node)) { res = update_type(0, node, precisions, [&](const element::Type& to) { @@ -780,7 +777,7 @@ bool fuse_type_to_ctc_greedy_decoder_seq_len(const std::shared_ptr return res; } -bool fuse_type_to_nonzero(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_nonzero(const std::shared_ptr& node, const precisions_map& precisions) { if (auto nonzero = ov::as_type_ptr(node)) { return update_type(0, node, precisions, [&](const element::Type& to) { nonzero->set_output_type(to); @@ -789,7 +786,7 @@ bool fuse_type_to_nonzero(const std::shared_ptr& node, const preci return false; } -bool fuse_type_to_bucketize(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_bucketize(const std::shared_ptr& node, const precisions_map& precisions) { if (auto b = ov::as_type_ptr(node)) { return update_type(0, node, precisions, [&](const element::Type& to) { b->set_output_type(to); @@ -798,7 +795,7 @@ bool fuse_type_to_bucketize(const std::shared_ptr& node, const pre return false; } -bool fuse_type_to_shapeof_v0(const std::shared_ptr& node, const precisions_map& precisions) { +bool fuse_type_to_shapeof_v0(const std::shared_ptr& node, const precisions_map& precisions) { auto it = precisions.find(node->get_output_element_type(0)); if (it == precisions.end()) return false; @@ -816,7 +813,7 @@ bool fuse_type_to_shapeof_v0(const std::shared_ptr& node, const pr return false; } -bool extend_select_type(const std::shared_ptr& node, const precisions_map& precisions) { +bool extend_select_type(const std::shared_ptr& node, const precisions_map& precisions) { if (auto type_relaxed = std::dynamic_pointer_cast(node)) { type_relaxed->set_origin_input_type(ov::element::boolean, 0); return true; @@ -831,13 +828,13 @@ bool extend_select_type(const std::shared_ptr& node, const precisi return false; } -bool extend_reverse_type(const std::shared_ptr& node, const precisions_map& precisions) { +bool extend_reverse_type(const std::shared_ptr& node, const precisions_map& precisions) { if (const auto casted = std::dynamic_pointer_cast(node)) { if (casted->get_mode() == ov::op::v1::Reverse::Mode::MASK) { auto relaxed_op = std::make_shared>( *casted, ov::element::TypeVector{casted->get_input_element_type(0), ov::element::boolean}, - ngraph::element::TypeVector{casted->get_output_element_type(0)}); + ov::element::TypeVector{casted->get_output_element_type(0)}); replace_node(node, relaxed_op); } return true; @@ -876,7 +873,7 @@ inline int32_t convert_value(uint32_t val) { namespace { template -std::shared_ptr change_constant_precision(std::shared_ptr& constant) { +std::shared_ptr change_constant_precision(std::shared_ptr& constant) { using src_type = typename element_type_traits::value_type; using dst_type = typename element_type_traits::value_type; @@ -1119,7 +1116,7 @@ std::shared_ptr convert_low_precisions_int(std::shared_ptr& node, +bool fuse_type_to_constant(const std::shared_ptr& node, const precisions_map& precisions, const std::vector>& consumers) { // Consts marked with disable_constant_folding should be kept in f16 until they reach the plugin @@ -1132,7 +1129,7 @@ bool fuse_type_to_constant(const std::shared_ptr& node, return false; const auto& to = it->second; if (auto constant = ov::as_type_ptr(node)) { - std::shared_ptr new_const; + std::shared_ptr new_const; if (from == ov::element::u64 && to == ov::element::i32) { new_const = change_constant_precision(constant); } else if (from == ov::element::i64 && to == ov::element::i32) { diff --git a/src/common/transformations/src/transformations/fix_rt_info.cpp b/src/common/transformations/src/transformations/fix_rt_info.cpp index abd07aa0618..b70176ca7ae 100644 --- a/src/common/transformations/src/transformations/fix_rt_info.cpp +++ b/src/common/transformations/src/transformations/fix_rt_info.cpp @@ -5,14 +5,14 @@ #include "transformations/fix_rt_info.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/opsets/opset1.hpp" #include "transformations/rt_info/primitives_priority_attribute.hpp" -bool ov::pass::FixRtInfo::run_on_model(const std::shared_ptr& f) { +bool ov::pass::FixRtInfo::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(FixRtInfo); for (auto& node : f->get_ops()) { diff --git a/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp b/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp index 7052aa349c2..30f03222c48 100644 --- a/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp +++ b/src/common/transformations/src/transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.cpp @@ -4,8 +4,6 @@ #include "transformations/fp16_compression/mark_subgraphs_to_keep_in_mixed_precision.hpp" -#include - #include "itt.hpp" #include "openvino/op/add.hpp" #include "openvino/op/concat.hpp" @@ -39,6 +37,7 @@ #include "openvino/op/unsqueeze.hpp" #include "openvino/op/util/broadcast_base.hpp" #include "openvino/op/util/gather_base.hpp" +#include "openvino/op/util/pad_base.hpp" #include "openvino/op/variadic_split.hpp" #include "openvino/pass/manager.hpp" #include "openvino/pass/pattern/op/or.hpp" diff --git a/src/common/transformations/src/transformations/init_node_info.cpp b/src/common/transformations/src/transformations/init_node_info.cpp index 0fe6a33c691..93c958d14f6 100644 --- a/src/common/transformations/src/transformations/init_node_info.cpp +++ b/src/common/transformations/src/transformations/init_node_info.cpp @@ -5,16 +5,16 @@ #include "transformations/init_node_info.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/opsets/opset1.hpp" #include "transformations/fix_rt_info.hpp" #include "transformations/rt_info/fused_names_attribute.hpp" #include "transformations/rt_info/primitives_priority_attribute.hpp" -bool ov::pass::InitNodeInfo::run_on_model(const std::shared_ptr& f) { +bool ov::pass::InitNodeInfo::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(InitNodeInfo); for (auto& node : f->get_ops()) { diff --git a/src/common/transformations/src/transformations/low_precision/mark_dequantization_subgraph.cpp b/src/common/transformations/src/transformations/low_precision/mark_dequantization_subgraph.cpp index f0f7a5bf8eb..d79ac3bb873 100644 --- a/src/common/transformations/src/transformations/low_precision/mark_dequantization_subgraph.cpp +++ b/src/common/transformations/src/transformations/low_precision/mark_dequantization_subgraph.cpp @@ -4,12 +4,12 @@ #include "transformations/low_precision/mark_dequantization_subgraph.hpp" -#include -#include -#include -#include -#include -#include +#include "openvino/opsets/opset10.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/rt_info/dequantization_node.hpp" +#include "transformations/rt_info/disable_constant_folding.hpp" +#include "transformations/utils/utils.hpp" ov::pass::MarkDequantizationSubgraph::MarkDequantizationSubgraph(const element::TypeVector& precisions, const bool fold_subtract_const) { diff --git a/src/common/transformations/src/transformations/op_conversions/batch_norm_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/batch_norm_decomposition.cpp index ebf05299aef..16268f0d64d 100644 --- a/src/common/transformations/src/transformations/op_conversions/batch_norm_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/batch_norm_decomposition.cpp @@ -5,14 +5,11 @@ #include "transformations/op_conversions/batch_norm_decomposition.hpp" #include -#include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/add.hpp" #include "openvino/op/batch_norm.hpp" #include "openvino/op/broadcast.hpp" @@ -23,6 +20,9 @@ #include "openvino/op/reshape.hpp" #include "openvino/op/shape_of.hpp" #include "openvino/op/sqrt.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" using namespace ov; @@ -38,9 +38,9 @@ ov::pass::BatchNormDecomposition::BatchNormDecomposition() { pattern::any_input(pattern::has_static_shape()), pattern::any_input(pattern::has_static_shape()), pattern::any_input(pattern::has_static_shape())}); - auto bn = std::make_shared(OutputVector{bn_1, bn_5}); + auto bn = std::make_shared(OutputVector{bn_1, bn_5}); - matcher_pass_callback callback = [this](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [this](ov::pass::pattern::Matcher& m) { auto m_bn = m.get_match_root(); Output m_input, m_gamma, m_beta, m_mean, m_var; double eps; @@ -113,6 +113,6 @@ ov::pass::BatchNormDecomposition::BatchNormDecomposition() { return true; }; - auto m = std::make_shared(bn, matcher_name); + auto m = std::make_shared(bn, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/bidirectional_sequences_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/bidirectional_sequences_decomposition.cpp index bcedd851a8a..9d2779b8379 100644 --- a/src/common/transformations/src/transformations/op_conversions/bidirectional_sequences_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/bidirectional_sequences_decomposition.cpp @@ -5,20 +5,20 @@ #include "transformations/op_conversions/bidirectional_sequences_decomposition.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/gru_sequence.hpp" #include "openvino/op/lstm_sequence.hpp" #include "openvino/op/rnn_sequence.hpp" #include "openvino/op/split.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::BidirectionalLSTMSequenceDecomposition::BidirectionalLSTMSequenceDecomposition() { MATCHER_SCOPE(BidirectionalLSTMSequenceDecomposition); - auto lstm_sequence_ngraph = ngraph::pattern::wrap_type(); + auto lstm_sequence_ov = ov::pass::pattern::wrap_type(); matcher_pass_callback callback = [this](pattern::Matcher& m) { auto lstm_sequence = std::dynamic_pointer_cast(m.get_match_root()); @@ -26,7 +26,7 @@ ov::pass::BidirectionalLSTMSequenceDecomposition::BidirectionalLSTMSequenceDecom return false; } - if (lstm_sequence->get_direction() != ngraph::op::RecurrentSequenceDirection::BIDIRECTIONAL) + if (lstm_sequence->get_direction() != ov::op::RecurrentSequenceDirection::BIDIRECTIONAL) return false; auto axis_0 = ov::op::v0::Constant::create(element::i64, Shape{}, {0}); @@ -45,7 +45,7 @@ ov::pass::BidirectionalLSTMSequenceDecomposition::BidirectionalLSTMSequenceDecom R->output(0), B->output(0), lstm_sequence->get_hidden_size(), - ngraph::op::RecurrentSequenceDirection::FORWARD, + ov::op::RecurrentSequenceDirection::FORWARD, lstm_sequence->get_activations_alpha(), lstm_sequence->get_activations_beta(), lstm_sequence->get_activations(), @@ -60,7 +60,7 @@ ov::pass::BidirectionalLSTMSequenceDecomposition::BidirectionalLSTMSequenceDecom R->output(1), B->output(1), lstm_sequence->get_hidden_size(), - ngraph::op::RecurrentSequenceDirection::REVERSE, + ov::op::RecurrentSequenceDirection::REVERSE, lstm_sequence->get_activations_alpha(), lstm_sequence->get_activations_beta(), lstm_sequence->get_activations(), @@ -75,23 +75,23 @@ ov::pass::BidirectionalLSTMSequenceDecomposition::BidirectionalLSTMSequenceDecom auto concat_2 = std::make_shared( OutputVector{lstm_sequence_forward->output(2), lstm_sequence_reverse->output(2)}, 1); - ngraph::copy_runtime_info( + ov::copy_runtime_info( lstm_sequence, {H, C, W, R, B, lstm_sequence_forward, lstm_sequence_reverse, concat_0, concat_1, concat_2}); concat_0->set_friendly_name(lstm_sequence->get_friendly_name() + ".0"); concat_1->set_friendly_name(lstm_sequence->get_friendly_name() + ".1"); concat_2->set_friendly_name(lstm_sequence->get_friendly_name() + ".2"); - ngraph::replace_node(lstm_sequence, {concat_0->output(0), concat_1->output(0), concat_2->output(0)}); + ov::replace_node(lstm_sequence, {concat_0->output(0), concat_1->output(0), concat_2->output(0)}); return true; }; - auto m = std::make_shared(lstm_sequence_ngraph, matcher_name); + auto m = std::make_shared(lstm_sequence_ov, matcher_name); this->register_matcher(m, callback); } ov::pass::BidirectionalGRUSequenceDecomposition::BidirectionalGRUSequenceDecomposition() { MATCHER_SCOPE(BidirectionalGRUSequenceDecomposition); - auto gru_sequence_ngraph = ngraph::pattern::wrap_type(); + auto gru_sequence_ov = ov::pass::pattern::wrap_type(); matcher_pass_callback callback = [this](pattern::Matcher& m) { auto gru_sequence = std::dynamic_pointer_cast(m.get_match_root()); @@ -99,7 +99,7 @@ ov::pass::BidirectionalGRUSequenceDecomposition::BidirectionalGRUSequenceDecompo return false; } - if (gru_sequence->get_direction() != ngraph::op::RecurrentSequenceDirection::BIDIRECTIONAL) + if (gru_sequence->get_direction() != ov::op::RecurrentSequenceDirection::BIDIRECTIONAL) return false; auto axis_0 = ov::op::v0::Constant::create(element::i64, Shape{}, {0}); @@ -116,7 +116,7 @@ ov::pass::BidirectionalGRUSequenceDecomposition::BidirectionalGRUSequenceDecompo R->output(0), B->output(0), gru_sequence->get_hidden_size(), - ngraph::op::RecurrentSequenceDirection::FORWARD, + ov::op::RecurrentSequenceDirection::FORWARD, gru_sequence->get_activations(), gru_sequence->get_activations_alpha(), gru_sequence->get_activations_beta(), @@ -131,7 +131,7 @@ ov::pass::BidirectionalGRUSequenceDecomposition::BidirectionalGRUSequenceDecompo R->output(1), B->output(1), gru_sequence->get_hidden_size(), - ngraph::op::RecurrentSequenceDirection::REVERSE, + ov::op::RecurrentSequenceDirection::REVERSE, gru_sequence->get_activations(), gru_sequence->get_activations_alpha(), gru_sequence->get_activations_beta(), @@ -144,21 +144,21 @@ ov::pass::BidirectionalGRUSequenceDecomposition::BidirectionalGRUSequenceDecompo auto concat_1 = std::make_shared( OutputVector{gru_sequence_forward->output(1), gru_sequence_reverse->output(1)}, 1); - ngraph::copy_runtime_info(gru_sequence, - {H, W, R, B, gru_sequence_forward, gru_sequence_reverse, concat_0, concat_1}); + ov::copy_runtime_info(gru_sequence, + {H, W, R, B, gru_sequence_forward, gru_sequence_reverse, concat_0, concat_1}); concat_0->set_friendly_name(gru_sequence->get_friendly_name() + ".0"); concat_1->set_friendly_name(gru_sequence->get_friendly_name() + ".1"); - ngraph::replace_node(gru_sequence, {concat_0->output(0), concat_1->output(0)}); + ov::replace_node(gru_sequence, {concat_0->output(0), concat_1->output(0)}); return true; }; - auto m = std::make_shared(gru_sequence_ngraph, matcher_name); + auto m = std::make_shared(gru_sequence_ov, matcher_name); this->register_matcher(m, callback); } ov::pass::BidirectionalRNNSequenceDecomposition::BidirectionalRNNSequenceDecomposition() { MATCHER_SCOPE(BidirectionalRNNSequenceDecomposition); - auto rnn_sequence_ngraph = ngraph::pattern::wrap_type(); + auto rnn_sequence_ov = ov::pass::pattern::wrap_type(); matcher_pass_callback callback = [this](pattern::Matcher& m) { auto rnn_sequence = std::dynamic_pointer_cast(m.get_match_root()); @@ -166,7 +166,7 @@ ov::pass::BidirectionalRNNSequenceDecomposition::BidirectionalRNNSequenceDecompo return false; } - if (rnn_sequence->get_direction() != ngraph::op::RecurrentSequenceDirection::BIDIRECTIONAL) + if (rnn_sequence->get_direction() != ov::op::RecurrentSequenceDirection::BIDIRECTIONAL) return false; auto axis_0 = ov::op::v0::Constant::create(element::i64, Shape{}, {0}); @@ -183,7 +183,7 @@ ov::pass::BidirectionalRNNSequenceDecomposition::BidirectionalRNNSequenceDecompo R->output(0), B->output(0), rnn_sequence->get_hidden_size(), - ngraph::op::RecurrentSequenceDirection::FORWARD, + ov::op::RecurrentSequenceDirection::FORWARD, rnn_sequence->get_activations(), rnn_sequence->get_activations_alpha(), rnn_sequence->get_activations_beta(), @@ -197,7 +197,7 @@ ov::pass::BidirectionalRNNSequenceDecomposition::BidirectionalRNNSequenceDecompo R->output(1), B->output(1), rnn_sequence->get_hidden_size(), - ngraph::op::RecurrentSequenceDirection::REVERSE, + ov::op::RecurrentSequenceDirection::REVERSE, rnn_sequence->get_activations(), rnn_sequence->get_activations_alpha(), rnn_sequence->get_activations_beta(), @@ -209,14 +209,14 @@ ov::pass::BidirectionalRNNSequenceDecomposition::BidirectionalRNNSequenceDecompo auto concat_1 = std::make_shared( OutputVector{rnn_sequence_forward->output(1), rnn_sequence_reverse->output(1)}, 1); - ngraph::copy_runtime_info(rnn_sequence, - {H, W, R, B, rnn_sequence_forward, rnn_sequence_reverse, concat_0, concat_1}); + ov::copy_runtime_info(rnn_sequence, + {H, W, R, B, rnn_sequence_forward, rnn_sequence_reverse, concat_0, concat_1}); concat_0->set_friendly_name(rnn_sequence->get_friendly_name() + ".0"); concat_1->set_friendly_name(rnn_sequence->get_friendly_name() + ".1"); - ngraph::replace_node(rnn_sequence, {concat_0->output(0), concat_1->output(0)}); + ov::replace_node(rnn_sequence, {concat_0->output(0), concat_1->output(0)}); return true; }; - auto m = std::make_shared(rnn_sequence_ngraph, matcher_name); + auto m = std::make_shared(rnn_sequence_ov, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_batch_to_space.cpp b/src/common/transformations/src/transformations/op_conversions/convert_batch_to_space.cpp index 5d78205b2f1..9d7281b35bc 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_batch_to_space.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_batch_to_space.cpp @@ -7,11 +7,10 @@ #include #include #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/batch_to_space.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" @@ -25,6 +24,7 @@ #include "openvino/op/strided_slice.hpp" #include "openvino/op/subtract.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" using namespace std; using namespace ov::element; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_broadcast3.cpp b/src/common/transformations/src/transformations/op_conversions/convert_broadcast3.cpp index 8c809ee2565..9d85b3f71b9 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_broadcast3.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_broadcast3.cpp @@ -5,19 +5,19 @@ #include "transformations/op_conversions/convert_broadcast3.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/broadcast.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/logical_and.hpp" #include "openvino/op/multiply.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" namespace { -bool make_compatible_shape(const ngraph::PartialShape& input_shape, std::vector& target_shape) { +bool make_compatible_shape(const ov::PartialShape& input_shape, std::vector& target_shape) { if (input_shape.rank().is_dynamic()) { return false; } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_broadcast_to_tiles.cpp b/src/common/transformations/src/transformations/op_conversions/convert_broadcast_to_tiles.cpp index a9eef720f27..52c361ccfa5 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_broadcast_to_tiles.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_broadcast_to_tiles.cpp @@ -5,19 +5,19 @@ #include "transformations/op_conversions/convert_broadcast_to_tiles.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/broadcast.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/tile.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertBroadcastToTiles::ConvertBroadcastToTiles() { MATCHER_SCOPE(ConvertBroadcastToTiles); - auto broadcast = ngraph::pattern::wrap_type(); + auto broadcast = ov::pass::pattern::wrap_type(); matcher_pass_callback callback = [this](pattern::Matcher& m) { auto broadcast = std::dynamic_pointer_cast(m.get_match_root()); @@ -97,11 +97,11 @@ ov::pass::ConvertBroadcastToTiles::ConvertBroadcastToTiles() { new_ops.push_back(tile); tile->set_friendly_name(broadcast->get_friendly_name()); - ngraph::copy_runtime_info(broadcast, new_ops); - ngraph::replace_node(broadcast, tile); + ov::copy_runtime_info(broadcast, new_ops); + ov::replace_node(broadcast, tile); return true; }; - auto m = std::make_shared(broadcast, matcher_name); + auto m = std::make_shared(broadcast, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_convertlike.cpp b/src/common/transformations/src/transformations/op_conversions/convert_convertlike.cpp index 68f7801ed5f..38d167d58a5 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_convertlike.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_convertlike.cpp @@ -5,13 +5,13 @@ #include "transformations/op_conversions/convert_convertlike.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/convert_like.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" using namespace ov; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_deformable_conv_v8_to_v1.cpp b/src/common/transformations/src/transformations/op_conversions/convert_deformable_conv_v8_to_v1.cpp index 41321d80d88..6f47f92f397 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_deformable_conv_v8_to_v1.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_deformable_conv_v8_to_v1.cpp @@ -4,11 +4,10 @@ #include "transformations/op_conversions/convert_deformable_conv_v8_to_v1.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/deformable_convolution.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertDeformableConv8To1::ConvertDeformableConv8To1() { MATCHER_SCOPE(ConvertDeformableConv8To1); @@ -39,8 +38,8 @@ ov::pass::ConvertDeformableConv8To1::ConvertDeformableConv8To1() { deformable_conv_v8_node->get_group(), deformable_conv_v8_node->get_deformable_group()); deformable_conv_v1->set_friendly_name(deformable_conv_v8_node->get_friendly_name()); - ngraph::copy_runtime_info(deformable_conv_v8_node, deformable_conv_v1); - ngraph::replace_node(deformable_conv_v8_node, deformable_conv_v1); + ov::copy_runtime_info(deformable_conv_v8_node, deformable_conv_v1); + ov::replace_node(deformable_conv_v8_node, deformable_conv_v1); return true; }; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_depth_to_space.cpp b/src/common/transformations/src/transformations/op_conversions/convert_depth_to_space.cpp index 262ffa78411..a341c9b1b86 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_depth_to_space.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_depth_to_space.cpp @@ -5,20 +5,20 @@ #include "transformations/op_conversions/convert_depth_to_space.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/depth_to_space.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertDepthToSpace::ConvertDepthToSpace() { MATCHER_SCOPE(ConvertDepthToSpace); auto dts_node = - ngraph::pattern::wrap_type({pattern::any_input(pattern::has_static_shape())}); + ov::pass::pattern::wrap_type({pattern::any_input(pattern::has_static_shape())}); matcher_pass_callback callback = [this](pattern::Matcher& m) { auto dts_node = std::dynamic_pointer_cast(m.get_match_root()); @@ -99,11 +99,11 @@ ov::pass::ConvertDepthToSpace::ConvertDepthToSpace() { auto transpose = std::make_shared(reshape_begin, create_constant(order)); auto reshape_end = std::make_shared(transpose, create_constant(shape_end), true); reshape_end->set_friendly_name(dts_node->get_friendly_name()); - ngraph::copy_runtime_info(dts_node, {reshape_begin, transpose, reshape_end}); - ngraph::replace_node(dts_node, reshape_end); + ov::copy_runtime_info(dts_node, {reshape_begin, transpose, reshape_end}); + ov::replace_node(dts_node, reshape_end); return true; }; - auto m = std::make_shared(dts_node, matcher_name); + auto m = std::make_shared(dts_node, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_divide.cpp b/src/common/transformations/src/transformations/op_conversions/convert_divide.cpp index 71e35396be0..192bc109ca8 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_divide.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_divide.cpp @@ -5,36 +5,35 @@ #include "transformations/op_conversions/convert_divide.hpp" #include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/power.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "openvino/util/log.hpp" #include "transformations/rt_info/nonconvertible_divide.hpp" #include "transformations/utils/utils.hpp" namespace { -bool convert_divide(std::shared_ptr node) { +bool convert_divide(std::shared_ptr node) { auto div = std::dynamic_pointer_cast(node); // We can not apply this transformation in case with integer input data type if (!div || ov::divide_is_nonconvertible(div) || div->get_input_element_type(0).is_integral()) { return false; } - std::shared_ptr pow = std::make_shared( + std::shared_ptr pow = std::make_shared( div->input_value(1), - ngraph::op::Constant::create(div->get_input_element_type(1), ngraph::Shape{}, {-1})); + ov::op::v0::Constant::create(div->get_input_element_type(1), ov::Shape{}, {-1})); - if (std::dynamic_pointer_cast(div->get_input_node_shared_ptr(1))) { + if (std::dynamic_pointer_cast(div->get_input_node_shared_ptr(1))) { OPENVINO_SUPPRESS_DEPRECATED_START - if (auto const_pow = ngraph::get_constant_from_source(pow)) { + if (auto const_pow = ov::get_constant_from_source(pow)) { pow = const_pow; } else { OPENVINO_DEBUG << "ConvertDivide has failed due to unsupported evaluate type in " << pow.get(); @@ -42,18 +41,18 @@ bool convert_divide(std::shared_ptr node) { } OPENVINO_SUPPRESS_DEPRECATED_END } else { - ngraph::copy_runtime_info(div, pow); + ov::copy_runtime_info(div, pow); } auto mul = std::make_shared(div->input(0).get_source_output(), pow); // if Divide is an inverse, then we don't need the Multiply if (ov::op::util::can_eliminate_eltwise_node(mul, mul->input_value(0), mul->input_value(1))) { pow->set_friendly_name(div->get_friendly_name()); - ngraph::replace_node(div, pow); + ov::replace_node(div, pow); } else { mul->set_friendly_name(div->get_friendly_name()); - ngraph::copy_runtime_info(div, mul); - ngraph::replace_node(div, mul); + ov::copy_runtime_info(div, mul); + ov::replace_node(div, mul); } return true; } @@ -61,25 +60,25 @@ bool convert_divide(std::shared_ptr node) { ov::pass::ConvertDivide::ConvertDivide() { MATCHER_SCOPE(ConvertDivide); - auto div = ngraph::pattern::wrap_type(); + auto div = ov::pass::pattern::wrap_type(); matcher_pass_callback callback = [](pattern::Matcher& m) { return convert_divide(m.get_match_root()); }; - auto m = std::make_shared(div, matcher_name); + auto m = std::make_shared(div, matcher_name); this->register_matcher(m, callback); } ov::pass::ConvertDivideWithConstant::ConvertDivideWithConstant() { MATCHER_SCOPE(ConvertDivideWithConstant); - auto div = ngraph::pattern::wrap_type( + auto div = ov::pass::pattern::wrap_type( {pattern::any_input(), pattern::wrap_type()}); matcher_pass_callback callback = [](pattern::Matcher& m) { return convert_divide(m.get_match_root()); }; - auto m = std::make_shared(div, matcher_name); + auto m = std::make_shared(div, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_gather_0d.cpp b/src/common/transformations/src/transformations/op_conversions/convert_gather_0d.cpp index 4cb58b6aa36..d8347e5e31f 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_gather_0d.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_gather_0d.cpp @@ -5,19 +5,19 @@ #include "transformations/op_conversions/convert_gather_0d.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/gather.hpp" #include "openvino/op/squeeze.hpp" #include "openvino/op/unsqueeze.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertGather0D::ConvertGather0D() { MATCHER_SCOPE(ConvertGather0D); - auto gather = ngraph::pattern::wrap_type(); + auto gather = ov::pass::pattern::wrap_type(); matcher_pass_callback callback = [](pattern::Matcher& m) { auto gather = std::dynamic_pointer_cast(m.get_match_root()); @@ -47,12 +47,12 @@ ov::pass::ConvertGather0D::ConvertGather0D() { ov::op::v0::Constant::create(element::i64, Shape{1}, {axis})); sq->set_friendly_name(gather->get_friendly_name()); - ngraph::copy_runtime_info(gather, {indices.get_node_shared_ptr(), gather_new, sq}); - ngraph::replace_node(gather, sq); + ov::copy_runtime_info(gather, {indices.get_node_shared_ptr(), gather_new, sq}); + ov::replace_node(gather, sq); return true; }; - auto m1 = std::make_shared(gather, matcher_name); + auto m1 = std::make_shared(gather, matcher_name); this->register_matcher(m1, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_gather_downgrade.cpp b/src/common/transformations/src/transformations/op_conversions/convert_gather_downgrade.cpp index c85a0733b69..ae0aeb4d99a 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_gather_downgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_gather_downgrade.cpp @@ -4,11 +4,10 @@ #include "transformations/op_conversions/convert_gather_downgrade.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/gather.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" using namespace std; using namespace ov; @@ -30,8 +29,8 @@ pass::ConvertGather7ToGather1::ConvertGather7ToGather1() { gather_v7_node->input_value(2)); gather_v1_node->set_friendly_name(gather_v7_node->get_friendly_name()); - ngraph::copy_runtime_info(gather_v7_node, gather_v1_node); - ngraph::replace_node(gather_v7_node, gather_v1_node); + ov::copy_runtime_info(gather_v7_node, gather_v1_node); + ov::replace_node(gather_v7_node, gather_v1_node); return true; }; @@ -55,8 +54,8 @@ pass::ConvertGather8ToGather7::ConvertGather8ToGather7() { gather_v8_node->get_batch_dims()); gather_v7_node->set_friendly_name(gather_v8_node->get_friendly_name()); - ngraph::copy_runtime_info(gather_v8_node, gather_v7_node); - ngraph::replace_node(gather_v8_node, gather_v7_node); + ov::copy_runtime_info(gather_v8_node, gather_v7_node); + ov::replace_node(gather_v8_node, gather_v7_node); return true; }; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_gather_upgrade.cpp b/src/common/transformations/src/transformations/op_conversions/convert_gather_upgrade.cpp index 6a7816b819c..5334ac3dc39 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_gather_upgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_gather_upgrade.cpp @@ -4,11 +4,10 @@ #include "transformations/op_conversions/convert_gather_upgrade.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/gather.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" using namespace std; using namespace ov; @@ -29,8 +28,8 @@ pass::ConvertGather1ToGather7::ConvertGather1ToGather7() { 0); gather_v7_node->set_friendly_name(gather_v1_node->get_friendly_name()); - ngraph::copy_runtime_info(gather_v1_node, gather_v7_node); - ngraph::replace_node(gather_v1_node, gather_v7_node); + ov::copy_runtime_info(gather_v1_node, gather_v7_node); + ov::replace_node(gather_v1_node, gather_v7_node); return true; }; @@ -54,8 +53,8 @@ pass::ConvertGather7ToGather8::ConvertGather7ToGather8() { gather_v7_node->get_batch_dims()); gather_v8_node->set_friendly_name(gather_v7_node->get_friendly_name()); - ngraph::copy_runtime_info(gather_v7_node, gather_v8_node); - ngraph::replace_node(gather_v7_node, gather_v8_node); + ov::copy_runtime_info(gather_v7_node, gather_v8_node); + ov::replace_node(gather_v7_node, gather_v8_node); return true; }; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_gelu.cpp b/src/common/transformations/src/transformations/op_conversions/convert_gelu.cpp index d66e20bb8b1..9bc855b0d4e 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_gelu.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_gelu.cpp @@ -2,13 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/convert_gelu.hpp" + #include -#include -#include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" @@ -16,6 +15,7 @@ #include "openvino/op/gelu.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/sqrt.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertGELU::ConvertGELU() { MATCHER_SCOPE(ConvertGELU); @@ -38,11 +38,11 @@ ov::pass::ConvertGELU::ConvertGELU() { auto res = std::make_shared(mul, add); res->set_friendly_name(gelu->get_friendly_name()); - ngraph::copy_runtime_info(gelu, {mul, sq2, div, erf, add, res}); - ngraph::replace_node(gelu, res); + ov::copy_runtime_info(gelu, {mul, sq2, div, erf, add, res}); + ov::replace_node(gelu, res); return true; }; - auto m = std::make_shared(gelu, matcher_name); + auto m = std::make_shared(gelu, matcher_name); register_matcher(m, callback, PassProperty::CHANGE_DYNAMIC_STATE); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_gp9_to_gp_ie_internal.cpp b/src/common/transformations/src/transformations/op_conversions/convert_gp9_to_gp_ie_internal.cpp index 3b3a16da114..f4654bc5294 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_gp9_to_gp_ie_internal.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_gp9_to_gp_ie_internal.cpp @@ -4,16 +4,15 @@ #include "transformations/op_conversions/convert_gp9_to_gp_ie_internal.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/generate_proposals.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "ov_ops/generate_proposals_ie_internal.hpp" #include "transformations/utils/utils.hpp" ov::pass::ConvertGP9ToGPIEInternal::ConvertGP9ToGPIEInternal() { - matcher_pass_callback callback = [](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [](ov::pass::pattern::Matcher& m) { const auto root = m.get_match_root(); const auto old_node = std::dynamic_pointer_cast(root); if (!old_node) { @@ -36,11 +35,11 @@ ov::pass::ConvertGP9ToGPIEInternal::ConvertGP9ToGPIEInternal() { old_node->get_roi_num_type()); new_ops.push_back(new_node); - Output output_0 = new_node->output(0); + Output output_0 = new_node->output(0); new_ops.emplace_back(output_0.get_node_shared_ptr()); - Output output_1 = new_node->output(1); + Output output_1 = new_node->output(1); new_ops.emplace_back(output_1.get_node_shared_ptr()); - Output output_2 = new_node->output(2); + Output output_2 = new_node->output(2); new_ops.emplace_back(output_2.get_node_shared_ptr()); new_node->set_friendly_name(old_node->get_friendly_name()); @@ -49,7 +48,7 @@ ov::pass::ConvertGP9ToGPIEInternal::ConvertGP9ToGPIEInternal() { return true; }; - const auto generate_proposals = ngraph::pattern::wrap_type(); - const auto matcher = std::make_shared(generate_proposals, "ConvertGP9ToGPIEInternal"); + const auto generate_proposals = ov::pass::pattern::wrap_type(); + const auto matcher = std::make_shared(generate_proposals, "ConvertGP9ToGPIEInternal"); register_matcher(matcher, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_interpolate11_downgrade.cpp b/src/common/transformations/src/transformations/op_conversions/convert_interpolate11_downgrade.cpp index 38055b4a756..9ab51984b9d 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_interpolate11_downgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_interpolate11_downgrade.cpp @@ -5,14 +5,14 @@ #include "transformations/op_conversions/convert_interpolate11_downgrade.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/broadcast.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/interpolate.hpp" #include "openvino/op/shape_of.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" #include "utils.hpp" diff --git a/src/common/transformations/src/transformations/op_conversions/convert_interpolate1_to_interpolate4.cpp b/src/common/transformations/src/transformations/op_conversions/convert_interpolate1_to_interpolate4.cpp index b86d0a34ec4..8cf3540faab 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_interpolate1_to_interpolate4.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_interpolate1_to_interpolate4.cpp @@ -5,20 +5,20 @@ #include "transformations/op_conversions/convert_interpolate1_to_interpolate4.hpp" #include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/core.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/divide.hpp" #include "openvino/op/interpolate.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" ov::pass::ConvertInterpolate1ToInterpolate4::ConvertInterpolate1ToInterpolate4() { MATCHER_SCOPE(ConvertInterpolate1ToInterpolate4); - auto interpolate1 = ngraph::pattern::wrap_type( + auto interpolate1 = ov::pass::pattern::wrap_type( {pattern::any_input(pattern::has_static_rank()), pattern::any_input()}); matcher_pass_callback callback = [](pattern::Matcher& m) { auto interpolationV0 = std::dynamic_pointer_cast(m.get_match_root()); @@ -39,7 +39,7 @@ ov::pass::ConvertInterpolate1ToInterpolate4::ConvertInterpolate1ToInterpolate4() OPENVINO_SUPPRESS_DEPRECATED_END scales = constant; } - auto axisConstant = ov::op::v0::Constant::create(ngraph::element::i64, {axes.size()}, axes); + auto axisConstant = ov::op::v0::Constant::create(ov::element::i64, {axes.size()}, axes); ov::op::v4::Interpolate::InterpolateAttrs attrsV4; auto input_shape_rank = interpolationV0->get_input_partial_shape(0).rank().get_length(); @@ -99,11 +99,11 @@ ov::pass::ConvertInterpolate1ToInterpolate4::ConvertInterpolate1ToInterpolate4() attrsV4); interpolateV4->set_friendly_name(interpolationV0->get_friendly_name()); - ngraph::copy_runtime_info(interpolationV0, interpolateV4); - ngraph::replace_node(interpolationV0, interpolateV4); + ov::copy_runtime_info(interpolationV0, interpolateV4); + ov::replace_node(interpolationV0, interpolateV4); return true; }; - auto m = std::make_shared(interpolate1, matcher_name); + auto m = std::make_shared(interpolate1, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.cpp b/src/common/transformations/src/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.cpp index dffc3548b09..3eb1c89aa02 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.cpp @@ -5,19 +5,19 @@ #include "transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/matrix_nms.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "ov_ops/nms_static_shape_ie.hpp" #include "transformations/utils/utils.hpp" ov::pass::ConvertMatrixNmsToMatrixNmsIE::ConvertMatrixNmsToMatrixNmsIE(bool force_i32_output_type) { MATCHER_SCOPE(ConvertMatrixNmsToMatrixNmsIE); - auto nms = ngraph::pattern::wrap_type(); + auto nms = ov::pass::pattern::wrap_type(); matcher_pass_callback callback = [=](pattern::Matcher& m) { auto nms = std::dynamic_pointer_cast(m.get_match_root()); @@ -31,7 +31,7 @@ ov::pass::ConvertMatrixNmsToMatrixNmsIE::ConvertMatrixNmsToMatrixNmsIE(bool forc } const auto new_args = nms->input_values(); - // vector of new nGraph operations + // vector of new openvino operations NodeVector new_ops; auto attrs = nms->get_attrs(); attrs.output_type = force_i32_output_type ? element::i32 : attrs.output_type; @@ -57,11 +57,11 @@ ov::pass::ConvertMatrixNmsToMatrixNmsIE::ConvertMatrixNmsToMatrixNmsIE(bool forc } nms_new->set_friendly_name(nms->get_friendly_name()); - ngraph::copy_runtime_info(nms, new_ops); - ngraph::replace_node(nms, {output_0, output_1, output_2}); + ov::copy_runtime_info(nms, new_ops); + ov::replace_node(nms, {output_0, output_1, output_2}); return true; }; - auto m = std::make_shared(nms, matcher_name); + auto m = std::make_shared(nms, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_maxpool_downgrade.cpp b/src/common/transformations/src/transformations/op_conversions/convert_maxpool_downgrade.cpp index 7ef64d19058..9b86701ee67 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_maxpool_downgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_maxpool_downgrade.cpp @@ -4,13 +4,12 @@ #include "transformations/op_conversions/convert_maxpool_downgrade.hpp" -#include -#include -#include - #include "itt.hpp" #include "openvino/core/descriptor/tensor.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/max_pool.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" using namespace std; using namespace ov; @@ -42,12 +41,12 @@ pass::ConvertMaxPool8ToMaxPool1::ConvertMaxPool8ToMaxPool1() { maxpool_v1_node->set_friendly_name(maxpool_v8_node->get_friendly_name()); maxpool_v8_node->output(0).replace(maxpool_v1_node->output(0)); - ngraph::copy_runtime_info(maxpool_v8_node, maxpool_v1_node); + ov::copy_runtime_info(maxpool_v8_node, maxpool_v1_node); maxpool_v8_node->clear_control_dependencies(); - NGRAPH_SUPPRESS_DEPRECATED_START + OPENVINO_SUPPRESS_DEPRECATED_START ov::descriptor::set_ov_tensor_legacy_name(maxpool_v1_node->output(0).get_tensor(), out_name); - NGRAPH_SUPPRESS_DEPRECATED_END + OPENVINO_SUPPRESS_DEPRECATED_END return true; }; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_maxpool_upgrade.cpp b/src/common/transformations/src/transformations/op_conversions/convert_maxpool_upgrade.cpp index d5e43efa66b..659c6bc96c4 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_maxpool_upgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_maxpool_upgrade.cpp @@ -4,21 +4,20 @@ #include "transformations/op_conversions/convert_maxpool_upgrade.hpp" -#include -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/max_pool.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" ov::pass::ConvertMaxPool1ToMaxPool8::ConvertMaxPool1ToMaxPool8() { MATCHER_SCOPE(ConvertMaxPool1ToMaxPool8); // Replaces v1::MaxPool with v8::MaxPool with default dilations, axis and index_element_type attributes auto input = pattern::any_input(pattern::has_static_rank()); - auto maxpool_v1_pattern = ngraph::pattern::wrap_type({input}); + auto maxpool_v1_pattern = ov::pass::pattern::wrap_type({input}); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto maxpool_v1_node = std::dynamic_pointer_cast(m.get_match_root()); if (!maxpool_v1_node) @@ -42,7 +41,7 @@ ov::pass::ConvertMaxPool1ToMaxPool8::ConvertMaxPool1ToMaxPool8() { maxpool_v8_node->set_friendly_name(maxpool_v1_node->get_friendly_name()); maxpool_v1_node->output(0).replace(maxpool_v8_node->output(0)); - ngraph::copy_runtime_info(maxpool_v1_node, maxpool_v8_node); + ov::copy_runtime_info(maxpool_v1_node, maxpool_v8_node); maxpool_v1_node->clear_control_dependencies(); return true; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_minimum_to_power_and_max.cpp b/src/common/transformations/src/transformations/op_conversions/convert_minimum_to_power_and_max.cpp index bd37ce3bc2b..56f2fdd4b95 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_minimum_to_power_and_max.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_minimum_to_power_and_max.cpp @@ -5,19 +5,19 @@ #include "transformations/op_conversions/convert_minimum_to_power_and_max.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/maximum.hpp" #include "openvino/op/minimum.hpp" #include "openvino/op/multiply.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertMinimum::ConvertMinimum() { MATCHER_SCOPE(ConvertMinimum); - auto minimum = ngraph::pattern::wrap_type(); + auto minimum = ov::pass::pattern::wrap_type(); matcher_pass_callback callback = [this](pattern::Matcher& m) { auto minimum = std::dynamic_pointer_cast(m.get_match_root()); @@ -45,11 +45,11 @@ ov::pass::ConvertMinimum::ConvertMinimum() { ov::op::v0::Constant::create(max->get_element_type(), Shape{}, {-1})); neg_2->set_friendly_name(minimum->get_friendly_name()); - ngraph::copy_runtime_info(minimum, {neg_0, neg_1, max, neg_2}); - ngraph::replace_node(minimum, neg_2); + ov::copy_runtime_info(minimum, {neg_0, neg_1, max, neg_2}); + ov::replace_node(minimum, neg_2); return true; }; - auto m = std::make_shared(minimum, matcher_name); + auto m = std::make_shared(minimum, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_mod.cpp b/src/common/transformations/src/transformations/op_conversions/convert_mod.cpp index e44f10e3021..fcb2fbe33f1 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_mod.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_mod.cpp @@ -5,11 +5,10 @@ #include "transformations/op_conversions/convert_mod.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/abs.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/divide.hpp" @@ -17,10 +16,11 @@ #include "openvino/op/multiply.hpp" #include "openvino/op/sign.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertMod::ConvertMod() { MATCHER_SCOPE(ConvertMod); - auto mod = ngraph::pattern::wrap_type(); + auto mod = ov::pass::pattern::wrap_type(); matcher_pass_callback callback = [this](pattern::Matcher& m) { auto mod = std::dynamic_pointer_cast(m.get_match_root()); @@ -35,7 +35,7 @@ ov::pass::ConvertMod::ConvertMod() { // truncated(a / b) auto div = register_new_node(dividend, divisor); - auto convert_to_i64 = std::make_shared(div, ngraph::element::i64); + auto convert_to_i64 = std::make_shared(div, ov::element::i64); auto convert = std::make_shared(convert_to_i64, dividend_et); // truncated(a / b) * b auto multiplication = std::make_shared(convert, divisor); @@ -46,13 +46,13 @@ ov::pass::ConvertMod::ConvertMod() { auto mul = std::make_shared(dividend_sign, sub); mul->set_friendly_name(mod->get_friendly_name()); - ngraph::copy_runtime_info( + ov::copy_runtime_info( mod, {dividend, dividend_sign, divisor, div, convert_to_i64, convert, multiplication, sub, mul}); - ngraph::replace_node(mod, mul); + ov::replace_node(mod, mul); return true; }; - auto m = std::make_shared(mod, matcher_name); + auto m = std::make_shared(mod, matcher_name); this->register_matcher(m, callback, PassProperty::CHANGE_DYNAMIC_STATE); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.cpp b/src/common/transformations/src/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.cpp index d60f3776321..d81b328b444 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.cpp @@ -5,12 +5,12 @@ #include "transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/convert.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "ov_ops/multiclass_nms_ie_internal.hpp" #include "transformations/utils/utils.hpp" @@ -38,7 +38,7 @@ pass::ConvertMulticlassNmsToMulticlassNmsIE::ConvertMulticlassNmsToMulticlassNms } } - // vector of new nGraph operations + // vector of new openvino operations NodeVector new_ops; auto attrs = nms->get_attrs(); attrs.output_type = force_i32_output_type ? element::i32 : attrs.output_type; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_multiclass_nms_upgrade.cpp b/src/common/transformations/src/transformations/op_conversions/convert_multiclass_nms_upgrade.cpp index e3ac6887ba2..de48363db0f 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_multiclass_nms_upgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_multiclass_nms_upgrade.cpp @@ -4,11 +4,10 @@ #include "transformations/op_conversions/convert_multiclass_nms_upgrade.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/multiclass_nms.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertMulticlassNms8ToMulticlassNms9::ConvertMulticlassNms8ToMulticlassNms9() { MATCHER_SCOPE(ConvertMulticlassNms8ToMulticlassNms9); @@ -21,7 +20,7 @@ ov::pass::ConvertMulticlassNms8ToMulticlassNms9::ConvertMulticlassNms8ToMulticla return false; const auto new_args = nms_v8_node->input_values(); - // vector of new nGraph operations + // vector of new openvino operations NodeVector new_ops; auto attrs = nms_v8_node->get_attrs(); auto nms_v9_node = std::make_shared(new_args.at(0), new_args.at(1), attrs); diff --git a/src/common/transformations/src/transformations/op_conversions/convert_mvn1_to_mvn6.cpp b/src/common/transformations/src/transformations/op_conversions/convert_mvn1_to_mvn6.cpp index 2b692dd7fe0..b26ed1ab1c4 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_mvn1_to_mvn6.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_mvn1_to_mvn6.cpp @@ -4,13 +4,13 @@ #include "transformations/op_conversions/convert_mvn1_to_mvn6.hpp" -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/mvn.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::ConvertMVN1ToMVN6::ConvertMVN1ToMVN6() { @@ -37,7 +37,7 @@ ov::pass::ConvertMVN1ToMVN6::ConvertMVN1ToMVN6() { std::vector axes_v(input_rank.get_length() - start_axis); std::iota(axes_v.begin(), axes_v.end(), start_axis); - auto axes = ov::op::v0::Constant::create(ngraph::element::i64, {axes_v.size()}, axes_v); + auto axes = ov::op::v0::Constant::create(ov::element::i64, {axes_v.size()}, axes_v); auto mvn6_node = std::make_shared(input, axes, mvn_node->get_normalize_variance(), @@ -45,8 +45,8 @@ ov::pass::ConvertMVN1ToMVN6::ConvertMVN1ToMVN6() { op::MVNEpsMode::OUTSIDE_SQRT); mvn6_node->set_friendly_name(mvn_node->get_friendly_name()); - ngraph::copy_runtime_info(mvn_node, mvn6_node); - ngraph::replace_node(mvn_node, mvn6_node); + ov::copy_runtime_info(mvn_node, mvn6_node); + ov::replace_node(mvn_node, mvn6_node); return true; }; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_negative.cpp b/src/common/transformations/src/transformations/op_conversions/convert_negative.cpp index c43c25efe6a..3abe809cd88 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_negative.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_negative.cpp @@ -5,18 +5,18 @@ #include "transformations/op_conversions/convert_negative.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/negative.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertNegative::ConvertNegative() { MATCHER_SCOPE(ConvertNegative); - auto neg = ngraph::pattern::wrap_type(); + auto neg = ov::pass::pattern::wrap_type(); matcher_pass_callback callback = [](pattern::Matcher& m) { auto neg = std::dynamic_pointer_cast(m.get_match_root()); @@ -28,11 +28,11 @@ ov::pass::ConvertNegative::ConvertNegative() { neg->input(0).get_source_output(), ov::op::v0::Constant::create(neg->get_element_type(), Shape{}, {-1})); mul->set_friendly_name(neg->get_friendly_name()); - ngraph::copy_runtime_info(neg, mul); - ngraph::replace_node(neg, mul); + ov::copy_runtime_info(neg, mul); + ov::replace_node(neg, mul); return true; }; - auto m = std::make_shared(neg, matcher_name); + auto m = std::make_shared(neg, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_nms9_to_nms_ie_internal.cpp b/src/common/transformations/src/transformations/op_conversions/convert_nms9_to_nms_ie_internal.cpp index 95be5bcf5f0..c8f998de8ec 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_nms9_to_nms_ie_internal.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_nms9_to_nms_ie_internal.cpp @@ -5,21 +5,21 @@ #include "transformations/op_conversions/convert_nms9_to_nms_ie_internal.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/non_max_suppression.hpp" #include "openvino/op/reshape.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "ov_ops/nms_ie_internal.hpp" #include "transformations/utils/utils.hpp" ov::pass::ConvertNMS9ToNMSIEInternal::ConvertNMS9ToNMSIEInternal() { MATCHER_SCOPE(ConvertNMS9ToNMSIEInternal); - auto nms = ngraph::pattern::wrap_type(); + auto nms = ov::pass::pattern::wrap_type(); matcher_pass_callback callback = [=](pattern::Matcher& m) { auto nms_9 = std::dynamic_pointer_cast(m.get_match_root()); @@ -37,7 +37,7 @@ ov::pass::ConvertNMS9ToNMSIEInternal::ConvertNMS9ToNMSIEInternal() { const auto& score_threshold = num_of_inputs > 4 ? new_args.at(4) : ov::op::v0::Constant::create(element::f32, Shape{}, {.0f}); - // vector of new nGraph operations + // vector of new openvino operations NodeVector new_ops; auto one_dim_shape = Shape{1}; @@ -47,10 +47,10 @@ ov::pass::ConvertNMS9ToNMSIEInternal::ConvertNMS9ToNMSIEInternal() { Output new_score_threshold; Output new_soft_nms_sigma; - Output new_shape_for_max_per_class = ov::op::v0::Constant::create(ngraph::element::i64, Shape{1}, {1}); - Output new_shape_for_iou_threshold = ov::op::v0::Constant::create(ngraph::element::i64, Shape{1}, {1}); - Output new_shape_for_score_threshold = ov::op::v0::Constant::create(ngraph::element::i64, Shape{1}, {1}); - Output new_shape_for_soft_nms_sigma = ov::op::v0::Constant::create(ngraph::element::i64, Shape{1}, {1}); + Output new_shape_for_max_per_class = ov::op::v0::Constant::create(ov::element::i64, Shape{1}, {1}); + Output new_shape_for_iou_threshold = ov::op::v0::Constant::create(ov::element::i64, Shape{1}, {1}); + Output new_shape_for_score_threshold = ov::op::v0::Constant::create(ov::element::i64, Shape{1}, {1}); + Output new_shape_for_soft_nms_sigma = ov::op::v0::Constant::create(ov::element::i64, Shape{1}, {1}); new_max_per_class = std::make_shared(max_per_class, new_shape_for_max_per_class, true); new_ops.emplace_back(new_max_per_class.get_node_shared_ptr()); @@ -121,11 +121,11 @@ ov::pass::ConvertNMS9ToNMSIEInternal::ConvertNMS9ToNMSIEInternal() { } nms_legacy->set_friendly_name(nms_9->get_friendly_name()); - ngraph::copy_runtime_info(nms_9, new_ops); - ngraph::replace_node(nms_9, {output_0, nms_legacy->output(1), output_2}); + ov::copy_runtime_info(nms_9, new_ops); + ov::replace_node(nms_9, {output_0, nms_legacy->output(1), output_2}); return true; }; - auto m = std::make_shared(nms, matcher_name); + auto m = std::make_shared(nms, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_nms_to_nms_ie_internal.cpp b/src/common/transformations/src/transformations/op_conversions/convert_nms_to_nms_ie_internal.cpp index 91bd5820b04..2a7081bc8cf 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_nms_to_nms_ie_internal.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_nms_to_nms_ie_internal.cpp @@ -5,21 +5,21 @@ #include "transformations/op_conversions/convert_nms_to_nms_ie_internal.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/non_max_suppression.hpp" #include "openvino/op/reshape.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "ov_ops/nms_ie_internal.hpp" #include "transformations/utils/utils.hpp" ov::pass::ConvertNMSToNMSIEInternal::ConvertNMSToNMSIEInternal() { MATCHER_SCOPE(ConvertNMSToNMSIEInternal); - auto nms = ngraph::pattern::wrap_type(); + auto nms = ov::pass::pattern::wrap_type(); matcher_pass_callback callback = [=](pattern::Matcher& m) { auto nms_5 = std::dynamic_pointer_cast(m.get_match_root()); @@ -37,7 +37,7 @@ ov::pass::ConvertNMSToNMSIEInternal::ConvertNMSToNMSIEInternal() { const auto& arg4 = num_of_inputs > 4 ? new_args.at(4) : ov::op::v0::Constant::create(element::f32, Shape{}, {.0f}); - // vector of new nGraph operations + // vector of new openvino operations NodeVector new_ops; auto one_dim_shape = Shape{1}; @@ -47,10 +47,10 @@ ov::pass::ConvertNMSToNMSIEInternal::ConvertNMSToNMSIEInternal() { Output new_score_threshold; Output new_soft_nms_sigma; - Output new_shape_for_max_per_class = ov::op::v0::Constant::create(ngraph::element::i64, Shape{1}, {1}); - Output new_shape_for_iou_threshold = ov::op::v0::Constant::create(ngraph::element::i64, Shape{1}, {1}); - Output new_shape_for_score_threshold = ov::op::v0::Constant::create(ngraph::element::i64, Shape{1}, {1}); - Output new_shape_for_soft_nms_sigma = ov::op::v0::Constant::create(ngraph::element::i64, Shape{1}, {1}); + Output new_shape_for_max_per_class = ov::op::v0::Constant::create(ov::element::i64, Shape{1}, {1}); + Output new_shape_for_iou_threshold = ov::op::v0::Constant::create(ov::element::i64, Shape{1}, {1}); + Output new_shape_for_score_threshold = ov::op::v0::Constant::create(ov::element::i64, Shape{1}, {1}); + Output new_shape_for_soft_nms_sigma = ov::op::v0::Constant::create(ov::element::i64, Shape{1}, {1}); new_max_per_class = std::make_shared(arg2, new_shape_for_max_per_class, true); new_ops.emplace_back(new_max_per_class.get_node_shared_ptr()); @@ -120,11 +120,11 @@ ov::pass::ConvertNMSToNMSIEInternal::ConvertNMSToNMSIEInternal() { } nms_legacy->set_friendly_name(nms_5->get_friendly_name()); - ngraph::copy_runtime_info(nms_5, new_ops); - ngraph::replace_node(nms_5, {output_0, nms_legacy->output(1), output_2}); + ov::copy_runtime_info(nms_5, new_ops); + ov::replace_node(nms_5, {output_0, nms_legacy->output(1), output_2}); return true; }; - auto m = std::make_shared(nms, matcher_name); + auto m = std::make_shared(nms, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_pad12_downgrade.cpp b/src/common/transformations/src/transformations/op_conversions/convert_pad12_downgrade.cpp index b37c247be42..f50a44e804d 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_pad12_downgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_pad12_downgrade.cpp @@ -4,11 +4,10 @@ #include "transformations/op_conversions/convert_pad12_downgrade.hpp" -#include -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/op/pad.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertPad12ToPad1::ConvertPad12ToPad1() { MATCHER_SCOPE(ConvertPad12ToPad1); diff --git a/src/common/transformations/src/transformations/op_conversions/convert_pad_to_group_conv.cpp b/src/common/transformations/src/transformations/op_conversions/convert_pad_to_group_conv.cpp index 2c957417de1..869c2ee3379 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_pad_to_group_conv.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_pad_to_group_conv.cpp @@ -5,19 +5,19 @@ #include "transformations/op_conversions/convert_pad_to_group_conv.hpp" #include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/group_conv.hpp" +#include "openvino/op/util/pad_base.hpp" +#include "openvino/pass/pattern/op/pattern.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertPadToGroupConvolution::ConvertPadToGroupConvolution() { MATCHER_SCOPE(ConvertPadToGroupConvolution); - auto neg = ngraph::pattern::wrap_type(pattern::has_static_dim(1)); + auto neg = ov::pass::pattern::wrap_type(pattern::has_static_dim(1)); matcher_pass_callback callback = [](pattern::Matcher& m) { auto pad = std::dynamic_pointer_cast(m.get_match_root()); @@ -94,11 +94,11 @@ ov::pass::ConvertPadToGroupConvolution::ConvertPadToGroupConvolution() { std::make_shared(input, weights, stride, new_pad_begin, new_pad_end, stride); conv->set_friendly_name(pad->get_friendly_name()); - ngraph::copy_runtime_info(pad, conv); - ngraph::replace_node(pad, conv); + ov::copy_runtime_info(pad, conv); + ov::replace_node(pad, conv); return true; }; - auto m = std::make_shared(neg, matcher_name); + auto m = std::make_shared(neg, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_previous_nms_to_nms_5.cpp b/src/common/transformations/src/transformations/op_conversions/convert_previous_nms_to_nms_5.cpp index ebe87fe33e0..16ca9cc071c 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_previous_nms_to_nms_5.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_previous_nms_to_nms_5.cpp @@ -6,19 +6,19 @@ #include #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/non_max_suppression.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" using namespace ov; namespace { struct NMSAttributes { - ngraph::element::Type output_type; + ov::element::Type output_type; ov::op::v5::NonMaxSuppression::BoxEncodingType box_encoding; bool sort_result_descending; bool is_supported_nms; @@ -30,7 +30,7 @@ NMSAttributes get_nms4_attrs(const std::shared_ptrget_box_encoding()) { case ov::op::v4::NonMaxSuppression::BoxEncodingType::CENTER: @@ -55,7 +55,7 @@ NMSAttributes get_nms3_attrs(const std::shared_ptrget_box_encoding()) { case ov::op::v3::NonMaxSuppression::BoxEncodingType::CENTER: @@ -80,7 +80,7 @@ NMSAttributes get_nms1_attrs(const std::shared_ptrget_box_encoding()) { case ov::op::v1::NonMaxSuppression::BoxEncodingType::CENTER: @@ -98,9 +98,9 @@ NMSAttributes get_nms1_attrs(const std::shared_ptr& root) { +NMSAttributes get_nms_attrs(const std::shared_ptr& root) { NMSAttributes attrs; - attrs.output_type = ::ngraph::element::i64; + attrs.output_type = ::ov::element::i64; attrs.box_encoding = ov::op::v5::NonMaxSuppression::BoxEncodingType::CORNER; attrs.sort_result_descending = false; attrs.is_supported_nms = false; @@ -147,7 +147,7 @@ bool callback_func(pass::pattern::Matcher& m, pass::MatcherPass* impl) { attrs.output_type); nms_5->set_friendly_name(root->get_friendly_name()); - ngraph::copy_runtime_info(root, nms_5); + ov::copy_runtime_info(root, nms_5); root->output(0).replace(nms_5->output(0)); return true; } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_previous_nms_to_nms_9.cpp b/src/common/transformations/src/transformations/op_conversions/convert_previous_nms_to_nms_9.cpp index 53e62896d01..a39227205f4 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_previous_nms_to_nms_9.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_previous_nms_to_nms_9.cpp @@ -6,19 +6,19 @@ #include #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/non_max_suppression.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" using namespace ov; namespace { struct NMS9Attributes { - ngraph::element::Type output_type; + ov::element::Type output_type; ov::op::v9::NonMaxSuppression::BoxEncodingType box_encoding; bool sort_result_descending; bool is_supported_nms; @@ -30,7 +30,7 @@ NMS9Attributes get_nms9_attrs_from_nms5(const std::shared_ptrget_box_encoding()) { case ov::op::v5::NonMaxSuppression::BoxEncodingType::CENTER: @@ -55,7 +55,7 @@ NMS9Attributes get_nms9_attrs_from_nms4(const std::shared_ptrget_box_encoding()) { case ov::op::v4::NonMaxSuppression::BoxEncodingType::CENTER: @@ -80,7 +80,7 @@ NMS9Attributes get_nms9_attrs_from_nms3(const std::shared_ptrget_box_encoding()) { case ov::op::v3::NonMaxSuppression::BoxEncodingType::CENTER: @@ -105,7 +105,7 @@ NMS9Attributes get_nms9_attrs_from_nms1(const std::shared_ptrget_box_encoding()) { case ov::op::v1::NonMaxSuppression::BoxEncodingType::CENTER: @@ -123,9 +123,9 @@ NMS9Attributes get_nms9_attrs_from_nms1(const std::shared_ptr& root) { +NMS9Attributes get_nms9_attrs(const std::shared_ptr& root) { NMS9Attributes attrs; - attrs.output_type = ::ngraph::element::i64; + attrs.output_type = ::ov::element::i64; attrs.box_encoding = ov::op::v9::NonMaxSuppression::BoxEncodingType::CORNER; attrs.sort_result_descending = false; attrs.is_supported_nms = false; @@ -182,10 +182,10 @@ bool nms_to_nms9_callback_func(pass::pattern::Matcher& m, pass::MatcherPass* imp attrs.output_type); nms_9->set_friendly_name(root->get_friendly_name()); - ngraph::copy_runtime_info(root, nms_9); + ov::copy_runtime_info(root, nms_9); // nms0-4 have one output, nms5/9 have 3 outputs. if (std::dynamic_pointer_cast(root)) - ngraph::replace_node(root, nms_9); + ov::replace_node(root, nms_9); else root->output(0).replace(nms_9->output(0)); return true; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_prior_box_v8_to_v0.cpp b/src/common/transformations/src/transformations/op_conversions/convert_prior_box_v8_to_v0.cpp index 3b69811d775..c53a9c9832d 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_prior_box_v8_to_v0.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_prior_box_v8_to_v0.cpp @@ -4,11 +4,10 @@ #include "transformations/op_conversions/convert_prior_box_v8_to_v0.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/prior_box.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertPriorBox8To0::ConvertPriorBox8To0() { MATCHER_SCOPE(ConvertPriorBox8To0); @@ -42,8 +41,8 @@ ov::pass::ConvertPriorBox8To0::ConvertPriorBox8To0() { prior_box_v8_node->input_value(1), attrs_v0); prior_box_v0->set_friendly_name(prior_box_v8_node->get_friendly_name()); - ngraph::copy_runtime_info(prior_box_v8_node, prior_box_v0); - ngraph::replace_node(prior_box_v8_node, prior_box_v0); + ov::copy_runtime_info(prior_box_v8_node, prior_box_v0); + ov::replace_node(prior_box_v8_node, prior_box_v0); return true; }; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_reduce_to_reshape.cpp b/src/common/transformations/src/transformations/op_conversions/convert_reduce_to_reshape.cpp index cb7a61bc264..89006ae3ae3 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_reduce_to_reshape.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_reduce_to_reshape.cpp @@ -7,7 +7,7 @@ #include "itt.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" -bool CvtReduceBase::is_redundant(ngraph::Shape input, ngraph::Shape output) { +bool CvtReduceBase::is_redundant(ov::Shape input, ov::Shape output) { if (shape_size(input) != shape_size(output)) return false; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_roi_align_v3_to_v9.cpp b/src/common/transformations/src/transformations/op_conversions/convert_roi_align_v3_to_v9.cpp index 41ed2c1ae4c..881a6d69bc9 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_roi_align_v3_to_v9.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_roi_align_v3_to_v9.cpp @@ -4,11 +4,10 @@ #include "transformations/op_conversions/convert_roi_align_v3_to_v9.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/roi_align.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertROIAlign3To9::ConvertROIAlign3To9() { MATCHER_SCOPE(ConvertROIAlign3To9); @@ -49,8 +48,8 @@ ov::pass::ConvertROIAlign3To9::ConvertROIAlign3To9() { spatial_scale, m_mode_v9); roi_align_v9->set_friendly_name(roi_align_v3_node->get_friendly_name()); - ngraph::copy_runtime_info(roi_align_v3_node, roi_align_v9); - ngraph::replace_node(roi_align_v3_node, roi_align_v9); + ov::copy_runtime_info(roi_align_v3_node, roi_align_v9); + ov::replace_node(roi_align_v3_node, roi_align_v9); return true; }; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_roi_align_v9_to_v3.cpp b/src/common/transformations/src/transformations/op_conversions/convert_roi_align_v9_to_v3.cpp index 5e535468615..cfec9a6270d 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_roi_align_v9_to_v3.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_roi_align_v9_to_v3.cpp @@ -4,11 +4,10 @@ #include "transformations/op_conversions/convert_roi_align_v9_to_v3.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/roi_align.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertROIAlign9To3::ConvertROIAlign9To3() { MATCHER_SCOPE(ConvertROIAlign9To3); @@ -53,8 +52,8 @@ ov::pass::ConvertROIAlign9To3::ConvertROIAlign9To3() { spatial_scale, m_mode_v3); roi_align_v3->set_friendly_name(roi_align_v9_node->get_friendly_name()); - ngraph::copy_runtime_info(roi_align_v9_node, roi_align_v3); - ngraph::replace_node(roi_align_v9_node, roi_align_v3); + ov::copy_runtime_info(roi_align_v9_node, roi_align_v3); + ov::replace_node(roi_align_v9_node, roi_align_v3); return true; }; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_scatter_elements_to_scatter.cpp b/src/common/transformations/src/transformations/op_conversions/convert_scatter_elements_to_scatter.cpp index e27870efb8c..8420c6e7f7a 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_scatter_elements_to_scatter.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_scatter_elements_to_scatter.cpp @@ -5,12 +5,12 @@ #include "transformations/op_conversions/convert_scatter_elements_to_scatter.hpp" #include -#include -#include #include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/broadcast.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" @@ -62,9 +62,8 @@ ov::pass::ConvertScatterElementsToScatter::ConvertScatterElementsToScatter() { } OPENVINO_SUPPRESS_DEPRECATED_START - const size_t axis = ngraph::normalize_axes(scatter->get_friendly_name(), - axis_const->cast_vector(), - data_pshape.rank())[0]; + const size_t axis = + ov::normalize_axes(scatter->get_friendly_name(), axis_const->cast_vector(), data_pshape.rank())[0]; OPENVINO_SUPPRESS_DEPRECATED_END struct Range { @@ -217,8 +216,8 @@ ov::pass::ConvertScatterElementsToScatter::ConvertScatterElementsToScatter() { scatter->input_value(3)); new_ops.push_back(scatter_update); scatter_update->set_friendly_name(scatter->get_friendly_name()); - ngraph::copy_runtime_info({scatter, broadcast}, {new_ops}); - ngraph::replace_node(scatter, scatter_update); + ov::copy_runtime_info({scatter, broadcast}, {new_ops}); + ov::replace_node(scatter, scatter_update); return true; }; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_scatter_elements_update12_downgrade.cpp b/src/common/transformations/src/transformations/op_conversions/convert_scatter_elements_update12_downgrade.cpp index 1c9855154b5..eca603a1339 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_scatter_elements_update12_downgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_scatter_elements_update12_downgrade.cpp @@ -4,11 +4,10 @@ #include "transformations/op_conversions/convert_scatter_elements_update12_downgrade.hpp" -#include -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/op/scatter_elements_update.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertScatterElementsUpdate12ToScatterElementsUpdate3:: ConvertScatterElementsUpdate12ToScatterElementsUpdate3() { diff --git a/src/common/transformations/src/transformations/op_conversions/convert_sequences_to_tensor_iterator.cpp b/src/common/transformations/src/transformations/op_conversions/convert_sequences_to_tensor_iterator.cpp index 6406e2460ac..7d7cc804988 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_sequences_to_tensor_iterator.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_sequences_to_tensor_iterator.cpp @@ -5,13 +5,9 @@ #include "transformations/op_conversions/convert_sequences_to_tensor_iterator.hpp" #include -#include -#include -#include -#include #include "itt.hpp" -#include "ngraph/builder/autobroadcast.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/broadcast.hpp" #include "openvino/op/constant.hpp" @@ -31,15 +27,16 @@ #include "openvino/op/squeeze.hpp" #include "openvino/op/tensor_iterator.hpp" #include "openvino/op/unsqueeze.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" namespace { -ngraph::Output get_current_iter(ngraph::ParameterVector& body_params, - ngraph::ResultVector& body_results, - const ngraph::Output& seq_lengths) { - auto curr_iter_body_param = - std::make_shared(seq_lengths.get_element_type(), ngraph::Shape{1}); +ov::Output get_current_iter(ov::ParameterVector& body_params, + ov::ResultVector& body_results, + const ov::Output& seq_lengths) { + auto curr_iter_body_param = std::make_shared(seq_lengths.get_element_type(), ov::Shape{1}); // increment current iteration - auto one = ov::op::v0::Constant::create(seq_lengths.get_element_type(), ngraph::Shape{1}, {1}); + auto one = ov::op::v0::Constant::create(seq_lengths.get_element_type(), ov::Shape{1}, {1}); auto add = std::make_shared(curr_iter_body_param, one); auto curr_iter_result = std::make_shared(add); body_params.push_back(curr_iter_body_param); @@ -47,12 +44,12 @@ ngraph::Output get_current_iter(ngraph::ParameterVector& body_para return curr_iter_body_param; } -ngraph::Output get_masked_value(const std::shared_ptr& ti, - ngraph::ParameterVector& body_params, - ngraph::ResultVector& body_results, - const ngraph::Output& current_iter, - const ngraph::Output& data, - const ngraph::Output& seq_lengths) { +ov::Output get_masked_value(const std::shared_ptr& ti, + ov::ParameterVector& body_params, + ov::ResultVector& body_results, + const ov::Output& current_iter, + const ov::Output& data, + const ov::Output& seq_lengths) { // body parameters auto aggregated_Y_h_body_param = std::make_shared(data.get_element_type(), data.get_partial_shape()); @@ -65,7 +62,7 @@ ngraph::Output get_masked_value(const std::shared_ptr(seq_lengths, data_shape, axis, - ngraph::op::BroadcastType::EXPLICIT); + ov::op::BroadcastType::EXPLICIT); auto mask_condition = std::make_shared(current_iter, batch_seq_length); auto mask_Y_h = std::make_shared(current_iter, batch_seq_length); @@ -81,15 +78,15 @@ ngraph::Output get_masked_value(const std::shared_ptr(mask_condition, mask_value, data); } -bool convert_sequence_to_ti(const std::shared_ptr& sequence, - const ngraph::Output& X, - const ngraph::Output& H_t, - const ngraph::Output& C_t, - const ngraph::Output& seq_lengths, - const ngraph::Output& W, - const ngraph::Output& R, - const ngraph::Output& B, - const ngraph::op::RecurrentSequenceDirection& direction) { +bool convert_sequence_to_ti(const std::shared_ptr& sequence, + const ov::Output& X, + const ov::Output& H_t, + const ov::Output& C_t, + const ov::Output& seq_lengths, + const ov::Output& W, + const ov::Output& R, + const ov::Output& B, + const ov::op::RecurrentSequenceDirection& direction) { auto X_pshape = X.get_partial_shape(); if (X_pshape.size() < 2 || X_pshape[1].is_dynamic()) { return false; @@ -98,14 +95,14 @@ bool convert_sequence_to_ti(const std::shared_ptr& sequence, auto max_seq_len = X_pshape[1].get_length(); bool enable_mask = ov::op::util::is_seq_len_provided(seq_lengths.get_node_shared_ptr(), max_seq_len); - const bool is_reverse = direction == ngraph::op::RecurrentSequenceDirection::REVERSE; - std::shared_ptr reverse_seq_before; + const bool is_reverse = direction == ov::op::RecurrentSequenceDirection::REVERSE; + std::shared_ptr reverse_seq_before; if (is_reverse && enable_mask) { reverse_seq_before = std::make_shared(X, seq_lengths, 0, 1); } - auto axis_0 = ov::op::v0::Constant::create(ngraph::element::i64, ngraph::Shape{1}, {0}); - auto axis_1 = ov::op::v0::Constant::create(ngraph::element::i64, ngraph::Shape{1}, {1}); + auto axis_0 = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{1}, {0}); + auto axis_1 = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{1}, {1}); // TensorIterator Body: begin auto X_param_pshape = X_pshape; @@ -121,7 +118,7 @@ bool convert_sequence_to_ti(const std::shared_ptr& sequence, // LSTM sequence case const bool cell_state_defined = C_t.get_node_shared_ptr() != nullptr; std::shared_ptr C_body_param = nullptr; - std::shared_ptr squeezed_c = nullptr; + std::shared_ptr squeezed_c = nullptr; if (cell_state_defined) { squeezed_c = ov::op::util::make_try_fold(C_t, axis_1); C_body_param = std::make_shared(squeezed_c->get_element_type(), @@ -145,8 +142,8 @@ bool convert_sequence_to_ti(const std::shared_ptr& sequence, B_body_param = std::make_shared(squeezed_b->get_element_type(), squeezed_b->get_output_partial_shape(0)); - std::shared_ptr cell; - if (const auto lstm_sequence = ngraph::as_type_ptr(sequence)) { + std::shared_ptr cell; + if (const auto lstm_sequence = ov::as_type_ptr(sequence)) { cell = std::make_shared(squeezed_x, H_body_param, C_body_param, @@ -158,7 +155,7 @@ bool convert_sequence_to_ti(const std::shared_ptr& sequence, lstm_sequence->get_activations_alpha(), lstm_sequence->get_activations_beta(), lstm_sequence->get_clip()); - } else if (const auto rnn_sequence = ngraph::as_type_ptr(sequence)) { + } else if (const auto rnn_sequence = ov::as_type_ptr(sequence)) { cell = std::make_shared(squeezed_x, H_body_param, W_body_param ? W_body_param : squeezed_w, @@ -169,7 +166,7 @@ bool convert_sequence_to_ti(const std::shared_ptr& sequence, rnn_sequence->get_activations_alpha(), rnn_sequence->get_activations_beta(), rnn_sequence->get_clip()); - } else if (const auto gnn_sequence = ngraph::as_type_ptr(sequence)) { + } else if (const auto gnn_sequence = ov::as_type_ptr(sequence)) { cell = std::make_shared(squeezed_x, H_body_param, W_body_param ? W_body_param : squeezed_w, @@ -185,11 +182,11 @@ bool convert_sequence_to_ti(const std::shared_ptr& sequence, return false; } - ngraph::ParameterVector body_params; - ngraph::ResultVector body_results; + ov::ParameterVector body_params; + ov::ResultVector body_results; - ngraph::Output hidden_state = cell->output(0); - ngraph::Output cell_state; + ov::Output hidden_state = cell->output(0); + ov::Output cell_state; if (cell_state_defined) cell_state = cell->output(1); @@ -225,7 +222,7 @@ bool convert_sequence_to_ti(const std::shared_ptr& sequence, if (cell_state_defined) body_results.push_back(C_res); - auto body = std::make_shared(body_results, body_params); + auto body = std::make_shared(body_results, body_params); tensor_iterator->set_function(body); // TensorIterator Body: end if (is_reverse) { @@ -255,8 +252,8 @@ bool convert_sequence_to_ti(const std::shared_ptr& sequence, if (B_body_param) tensor_iterator->set_invariant_input(B_body_param, squeezed_b); - ngraph::Output H_out = H_res; - ngraph::Output C_out = C_res; + ov::Output H_out = H_res; + ov::Output C_out = C_res; if (enable_mask) { // create initial values for body_parameters in outer graph // aggregated Y_h - concatenation of the last non-zero values for each batch @@ -265,8 +262,8 @@ bool convert_sequence_to_ti(const std::shared_ptr& sequence, auto aggregated_Y_h = ov::op::util::make_try_fold(aggregated_Y_h_scalar, H_body_param_shape); - auto init_val_curr_iter = ov::op::v0::Constant::create(seq_lengths.get_element_type(), ngraph::Shape{1}, {1}); - ngraph::copy_runtime_info(sequence, {aggregated_Y_h, init_val_curr_iter}); + auto init_val_curr_iter = ov::op::v0::Constant::create(seq_lengths.get_element_type(), ov::Shape{1}, {1}); + ov::copy_runtime_info(sequence, {aggregated_Y_h, init_val_curr_iter}); // set initial value and back edge for current iteration tensor_iterator->set_merged_input(body_params.at(0), init_val_curr_iter, body_results.at(0)); @@ -280,7 +277,7 @@ bool convert_sequence_to_ti(const std::shared_ptr& sequence, auto aggregated_Y_c_scalar = ov::op::v0::Constant::create(C_body_param->get_element_type(), {}, {0.f}); auto aggregated_Y_c = ov::op::util::make_try_fold(aggregated_Y_c_scalar, C_body_param_shape); - ngraph::copy_runtime_info(sequence, aggregated_Y_c); + ov::copy_runtime_info(sequence, aggregated_Y_c); // set initial value and back edge for aggregated C tensor_iterator->set_merged_input(body_params.at(2), aggregated_Y_c, body_results.at(2)); @@ -292,10 +289,10 @@ bool convert_sequence_to_ti(const std::shared_ptr& sequence, if (cell_state_defined) tensor_iterator->get_iter_value(C_out); tensor_iterator->set_friendly_name(sequence->get_friendly_name()); - ngraph::NodeVector new_nodes{squeezed_h, tensor_iterator}; + ov::NodeVector new_nodes{squeezed_h, tensor_iterator}; if (cell_state_defined) new_nodes.push_back(squeezed_c); - ngraph::OutputVector nodes_to_replace; + ov::OutputVector nodes_to_replace; if (enable_mask && is_reverse) { auto reverse_seq_after = std::make_shared(tensor_iterator->output(0), seq_lengths, 0, 1); @@ -340,8 +337,8 @@ bool convert_sequence_to_ti(const std::shared_ptr& sequence, nodes_to_replace[i] = unsqueeze; new_nodes.push_back(unsqueeze); } - ngraph::copy_runtime_info(sequence, new_nodes); - ngraph::replace_node(sequence, nodes_to_replace); + ov::copy_runtime_info(sequence, new_nodes); + ov::replace_node(sequence, nodes_to_replace); return true; } @@ -355,14 +352,14 @@ ov::pass::ConvertRNNSequenceToTensorIterator::ConvertRNNSequenceToTensorIterator auto W_m = pattern::any_input(); auto R_m = pattern::any_input(); auto B_m = pattern::any_input(); - auto rnn_seq = ngraph::pattern::wrap_type({X_m, H_t_m, seq_lengths_m, W_m, R_m, B_m}); + auto rnn_seq = ov::pass::pattern::wrap_type({X_m, H_t_m, seq_lengths_m, W_m, R_m, B_m}); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { - auto sequence = ngraph::as_type_ptr(m.get_match_root()); + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { + auto sequence = ov::as_type_ptr(m.get_match_root()); // Bidirectional Sequence op should be decomposed to Reverse + Forward // (e.g. apply BidirectionalRNNSequenceDecomposition transformation before this one) - if (!sequence || sequence->get_direction() == ngraph::op::RecurrentSequenceDirection::BIDIRECTIONAL || + if (!sequence || sequence->get_direction() == ov::op::RecurrentSequenceDirection::BIDIRECTIONAL || transformation_callback(sequence)) { return false; } @@ -386,7 +383,7 @@ ov::pass::ConvertRNNSequenceToTensorIterator::ConvertRNNSequenceToTensorIterator sequence->get_direction()); }; - auto m = std::make_shared(rnn_seq, matcher_name); + auto m = std::make_shared(rnn_seq, matcher_name); register_matcher(m, callback); } @@ -398,14 +395,14 @@ ov::pass::ConvertGRUSequenceToTensorIterator::ConvertGRUSequenceToTensorIterator auto W_m = pattern::any_input(); auto R_m = pattern::any_input(); auto B_m = pattern::any_input(); - auto gru_seq = ngraph::pattern::wrap_type({X_m, H_t_m, seq_lengths_m, W_m, R_m, B_m}); + auto gru_seq = ov::pass::pattern::wrap_type({X_m, H_t_m, seq_lengths_m, W_m, R_m, B_m}); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { - auto sequence = ngraph::as_type_ptr(m.get_match_root()); + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { + auto sequence = ov::as_type_ptr(m.get_match_root()); // Bidirectional Sequence op should be decomposed to Reverse + Forward // (e.g. apply BidirectionalRNNSequenceDecomposition transformation before this one) - if (!sequence || sequence->get_direction() == ngraph::op::RecurrentSequenceDirection::BIDIRECTIONAL || + if (!sequence || sequence->get_direction() == ov::op::RecurrentSequenceDirection::BIDIRECTIONAL || transformation_callback(sequence)) { return false; } @@ -429,7 +426,7 @@ ov::pass::ConvertGRUSequenceToTensorIterator::ConvertGRUSequenceToTensorIterator sequence->get_direction()); }; - auto m = std::make_shared(gru_seq, matcher_name); + auto m = std::make_shared(gru_seq, matcher_name); register_matcher(m, callback); } @@ -443,14 +440,14 @@ ov::pass::ConvertLSTMSequenceToTensorIterator::ConvertLSTMSequenceToTensorIterat auto R_m = pattern::any_input(); auto B_m = pattern::any_input(); auto lstm_seq = - ngraph::pattern::wrap_type({X_m, H_t_m, C_t_m, seq_lengths_m, W_m, R_m, B_m}); + ov::pass::pattern::wrap_type({X_m, H_t_m, C_t_m, seq_lengths_m, W_m, R_m, B_m}); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { - auto sequence = ngraph::as_type_ptr(m.get_match_root()); + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { + auto sequence = ov::as_type_ptr(m.get_match_root()); // Bidirectional Sequence op should be decomposed to Reverse + Forward // (e.g. apply BidirectionalRNNSequenceDecomposition transformation before this one) - if (!sequence || sequence->get_direction() == ngraph::op::RecurrentSequenceDirection::BIDIRECTIONAL || + if (!sequence || sequence->get_direction() == ov::op::RecurrentSequenceDirection::BIDIRECTIONAL || transformation_callback(sequence)) { return false; } @@ -467,7 +464,7 @@ ov::pass::ConvertLSTMSequenceToTensorIterator::ConvertLSTMSequenceToTensorIterat return convert_sequence_to_ti(sequence, X, H_t, C_t, seq_lengths, W, R, B, sequence->get_direction()); }; - auto m = std::make_shared(lstm_seq, matcher_name); + auto m = std::make_shared(lstm_seq, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_shapeof3.cpp b/src/common/transformations/src/transformations/op_conversions/convert_shapeof3.cpp index 0ebacbf1e96..6cbfe193546 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_shapeof3.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_shapeof3.cpp @@ -5,13 +5,13 @@ #include "transformations/op_conversions/convert_shapeof3.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/shape_of.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertShapeOf3::ConvertShapeOf3() { MATCHER_SCOPE(ConvertShapeOf3); @@ -24,7 +24,7 @@ ov::pass::ConvertShapeOf3::ConvertShapeOf3() { } Output last; - ngraph::NodeVector new_ops; + ov::NodeVector new_ops; auto new_shapeof = std::make_shared(shapeof->input_value(0)); new_ops.push_back(new_shapeof); @@ -37,11 +37,11 @@ ov::pass::ConvertShapeOf3::ConvertShapeOf3() { } last.get_node_shared_ptr()->set_friendly_name(shapeof->get_friendly_name()); - ngraph::copy_runtime_info(shapeof, new_ops); - ngraph::replace_node(shapeof, last.get_node_shared_ptr()); + ov::copy_runtime_info(shapeof, new_ops); + ov::replace_node(shapeof, last.get_node_shared_ptr()); return true; }; - auto m = std::make_shared(shapeof, matcher_name); + auto m = std::make_shared(shapeof, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_shuffle_channels3.cpp b/src/common/transformations/src/transformations/op_conversions/convert_shuffle_channels3.cpp index b039cf20680..74c75adfda1 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_shuffle_channels3.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_shuffle_channels3.cpp @@ -5,11 +5,10 @@ #include "transformations/op_conversions/convert_shuffle_channels3.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/reduce_prod.hpp" @@ -18,6 +17,7 @@ #include "openvino/op/shuffle_channels.hpp" #include "openvino/op/transpose.hpp" #include "openvino/op/variadic_split.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" using namespace ov; @@ -103,6 +103,6 @@ ov::pass::ConvertShuffleChannels3::ConvertShuffleChannels3() { return true; }; - auto m = std::make_shared(shuffle_channels, matcher_name); + auto m = std::make_shared(shuffle_channels, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_slice_to_strided_slice.cpp b/src/common/transformations/src/transformations/op_conversions/convert_slice_to_strided_slice.cpp index e30e778ec46..9e7c865a6fe 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_slice_to_strided_slice.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_slice_to_strided_slice.cpp @@ -5,30 +5,29 @@ #include "transformations/op_conversions/convert_slice_to_strided_slice.hpp" #include -#include -#include #include #include "itt.hpp" -#include "ngraph/node.hpp" -#include "ngraph/op/constant.hpp" -#include "ngraph/op/util/op_types.hpp" -#include "ngraph/validation_util.hpp" +#include "openvino/core/node.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/scatter_update.hpp" #include "openvino/op/slice.hpp" #include "openvino/op/strided_slice.hpp" +#include "openvino/op/util/op_types.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" using namespace ov; namespace { -Output align_indices(const Output& indices, - const Output& slice_axes, - const Output& scatter_axis, - size_t slice_indices_length, - int64_t fill_in_value, - NodeVector& new_ops) { +Output align_indices(const Output& indices, + const Output& slice_axes, + const Output& scatter_axis, + size_t slice_indices_length, + int64_t fill_in_value, + NodeVector& new_ops) { // Handle a case when starts/ends/steps lengths are less than provided axes // in order to ensure compatibility with `StridedSlice:v1` interface // Example: @@ -41,13 +40,13 @@ Output align_indices(const Output& indices, const auto default_indices = ov::op::v0::Constant::create(indices.get_element_type(), Shape{slice_indices_length}, {fill_in_value}); - std::shared_ptr adjusted_indices = + std::shared_ptr adjusted_indices = ov::op::util::make_try_fold(default_indices, slice_axes, indices, // updates scatter_axis); - if (!ngraph::op::is_constant(adjusted_indices)) { + if (!ov::op::util::is_constant(adjusted_indices)) { new_ops.push_back(default_indices); } return adjusted_indices; @@ -156,8 +155,8 @@ ov::pass::SliceToStridedSlice::SliceToStridedSlice(bool use_shapes) { new_ops.push_back(strided_slice); strided_slice->set_friendly_name(slice_node->get_friendly_name()); - ngraph::copy_runtime_info(slice_node, new_ops); - ngraph::replace_node(slice_node, strided_slice); + ov::copy_runtime_info(slice_node, new_ops); + ov::replace_node(slice_node, strided_slice); return true; }; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_softmax_downgrade.cpp b/src/common/transformations/src/transformations/op_conversions/convert_softmax_downgrade.cpp index d0d0a0ebb89..1bd93f7a288 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_softmax_downgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_softmax_downgrade.cpp @@ -4,12 +4,11 @@ #include "transformations/op_conversions/convert_softmax_downgrade.hpp" -#include -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/softmax.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertSoftMax8ToSoftMax1::ConvertSoftMax8ToSoftMax1() { MATCHER_SCOPE(ConvertSoftMax8ToSoftMax1); diff --git a/src/common/transformations/src/transformations/op_conversions/convert_softmax_upgrade.cpp b/src/common/transformations/src/transformations/op_conversions/convert_softmax_upgrade.cpp index 68961860396..7942c110e1d 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_softmax_upgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_softmax_upgrade.cpp @@ -4,11 +4,10 @@ #include "transformations/op_conversions/convert_softmax_upgrade.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/softmax.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertSoftMax1ToSoftMax8::ConvertSoftMax1ToSoftMax8() { MATCHER_SCOPE(ConvertSoftMax1ToSoftMax8); diff --git a/src/common/transformations/src/transformations/op_conversions/convert_space_to_batch.cpp b/src/common/transformations/src/transformations/op_conversions/convert_space_to_batch.cpp index 8e5d758a23f..8ac2e294bd1 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_space_to_batch.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_space_to_batch.cpp @@ -6,11 +6,10 @@ #include #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" @@ -23,6 +22,7 @@ #include "openvino/op/slice.hpp" #include "openvino/op/space_to_batch.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" using namespace std; using namespace ov::element; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_space_to_depth.cpp b/src/common/transformations/src/transformations/op_conversions/convert_space_to_depth.cpp index a6170a6dc70..febb87963eb 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_space_to_depth.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_space_to_depth.cpp @@ -5,19 +5,20 @@ #include "transformations/op_conversions/convert_space_to_depth.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/space_to_depth.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertSpaceToDepth::ConvertSpaceToDepth() { MATCHER_SCOPE(ConvertSpaceToDepth); - auto dts = ngraph::pattern::wrap_type({pattern::any_input(pattern::has_static_shape())}); + auto dts = + ov::pass::pattern::wrap_type({pattern::any_input(pattern::has_static_shape())}); matcher_pass_callback callback = [this](pattern::Matcher& m) { auto std_node = std::dynamic_pointer_cast(m.get_match_root()); @@ -87,11 +88,11 @@ ov::pass::ConvertSpaceToDepth::ConvertSpaceToDepth() { auto transpose = std::make_shared(reshape_begin, create_constant(order)); auto reshape_end = std::make_shared(transpose, create_constant(shape_end), true); reshape_end->set_friendly_name(std_node->get_friendly_name()); - ngraph::copy_runtime_info(std_node, {reshape_begin, transpose, reshape_end}); - ngraph::replace_node(std_node, reshape_end); + ov::copy_runtime_info(std_node, {reshape_begin, transpose, reshape_end}); + ov::replace_node(std_node, reshape_end); return true; }; - auto m = std::make_shared(dts, matcher_name); + auto m = std::make_shared(dts, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_subtract.cpp b/src/common/transformations/src/transformations/op_conversions/convert_subtract.cpp index bd1c3e3ecbd..81b77d0bd2a 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_subtract.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_subtract.cpp @@ -4,15 +4,14 @@ #include "transformations/op_conversions/convert_subtract.hpp" -#include -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/rt_info/dequantization_node.hpp" using namespace ov; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_ti_to_sequences.cpp b/src/common/transformations/src/transformations/op_conversions/convert_ti_to_sequences.cpp index c3abe90ad63..ced9d28880f 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_ti_to_sequences.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_ti_to_sequences.cpp @@ -5,14 +5,12 @@ #include "transformations/op_conversions/convert_ti_to_sequences.hpp" #include -#include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/graph_util.hpp" +#include "openvino/core/node.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/broadcast.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/gather.hpp" @@ -30,18 +28,20 @@ #include "openvino/op/tensor_iterator.hpp" #include "openvino/op/transpose.hpp" #include "openvino/op/unsqueeze.hpp" +#include "openvino/pass/manager.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" namespace { bool convertTensorIteratorToSequence(const std::shared_ptr& ti, const std::shared_ptr& found_cell, - const ngraph::Output& data, - const ngraph::Output& h_pattern, - const ngraph::Output& c_pattern, - const ngraph::Output& w_pattern, - const ngraph::Output& r_pattern, - const ngraph::Output& b_pattern, - const ngraph::Output& unsqueeze_after_cell) { + const ov::Output& data, + const ov::Output& h_pattern, + const ov::Output& c_pattern, + const ov::Output& w_pattern, + const ov::Output& r_pattern, + const ov::Output& b_pattern, + const ov::Output& unsqueeze_after_cell) { const auto& func = ti->get_function(); const auto& params = func->get_parameters(); @@ -99,18 +99,18 @@ bool convertTensorIteratorToSequence(const std::shared_ptrinput_values(); auto X = ti_inputs[ordered_in_descs[0]->m_input_index]; if (slice_axis == 0) { - auto order = ov::op::v0::Constant::create(ngraph::element::i64, ngraph::Shape{3}, {1, 0, 2}); + auto order = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{3}, {1, 0, 2}); X = std::make_shared(ti_inputs[ordered_in_descs[0]->m_input_index], order); } // We must prepare cell inputs to sequence creation: insert num_directions elem via unsqueeze where needed (please, // see specification) - auto axis_1 = ov::op::v0::Constant::create(ngraph::element::i64, ngraph::Shape{1}, {1}); + auto axis_1 = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{1}, {1}); auto initial_hidden_state = std::make_shared(ti_inputs[ordered_in_descs[1]->m_input_index], axis_1); // LSTM case - std::shared_ptr initial_cell_state = + std::shared_ptr initial_cell_state = c_pattern.get_node_shared_ptr() == nullptr ? nullptr : std::make_shared(ti_inputs[ordered_in_descs[2]->m_input_index], axis_1); @@ -118,80 +118,76 @@ bool convertTensorIteratorToSequence(const std::shared_ptr(X); auto batch_dimension = std::make_shared(shape_of, - ov::op::v0::Constant::create(ngraph::element::i64, {1}, {0}), - ov::op::v0::Constant::create(ngraph::element::i64, {}, {0})); - auto seq_len_dim = - std::make_shared(shape_of, - ov::op::v0::Constant::create(ngraph::element::i64, {1}, {1}), - ov::op::v0::Constant::create(ngraph::element::i64, {}, {0})); + ov::op::v0::Constant::create(ov::element::i64, {1}, {0}), + ov::op::v0::Constant::create(ov::element::i64, {}, {0})); + auto seq_len_dim = std::make_shared(shape_of, + ov::op::v0::Constant::create(ov::element::i64, {1}, {1}), + ov::op::v0::Constant::create(ov::element::i64, {}, {0})); auto seq_lengths = std::make_shared(seq_len_dim, batch_dimension); - auto axis_0 = ov::op::v0::Constant::create(ov::element::i64, ngraph::Shape{1}, {0}); + auto axis_0 = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{1}, {0}); auto W = ov::op::util::make_try_fold(w_pattern, axis_0); auto R = ov::op::util::make_try_fold(r_pattern, axis_0); auto B = ov::op::util::make_try_fold(b_pattern, axis_0); - std::shared_ptr sequence; - if (ngraph::is_type(found_cell) || ngraph::is_type(found_cell)) { - sequence = - std::make_shared(X, - initial_hidden_state, - initial_cell_state, - seq_lengths, - W, - R, - B, - found_cell->get_hidden_size(), - stride > 0 ? ngraph::op::RecurrentSequenceDirection::FORWARD - : ngraph::op::RecurrentSequenceDirection::REVERSE, - found_cell->get_activations_alpha(), - found_cell->get_activations_beta(), - found_cell->get_activations(), - found_cell->get_clip()); - } else if (ngraph::is_type(found_cell)) { - sequence = - std::make_shared(X, - initial_hidden_state, - seq_lengths, - W, - R, - B, - found_cell->get_hidden_size(), - stride > 0 ? ngraph::op::RecurrentSequenceDirection::FORWARD - : ngraph::op::RecurrentSequenceDirection::REVERSE, - found_cell->get_activations(), - found_cell->get_activations_alpha(), - found_cell->get_activations_beta(), - found_cell->get_clip()); - } else if (ngraph::is_type(found_cell)) { - const auto gru_cell = ngraph::as_type_ptr(found_cell); - sequence = - std::make_shared(X, - initial_hidden_state, - seq_lengths, - W, - R, - B, - gru_cell->get_hidden_size(), - stride > 0 ? ngraph::op::RecurrentSequenceDirection::FORWARD - : ngraph::op::RecurrentSequenceDirection::REVERSE, - gru_cell->get_activations(), - gru_cell->get_activations_alpha(), - gru_cell->get_activations_beta(), - gru_cell->get_clip(), - gru_cell->get_linear_before_reset()); + std::shared_ptr sequence; + if (ov::is_type(found_cell) || ov::is_type(found_cell)) { + sequence = std::make_shared( + X, + initial_hidden_state, + initial_cell_state, + seq_lengths, + W, + R, + B, + found_cell->get_hidden_size(), + stride > 0 ? ov::op::RecurrentSequenceDirection::FORWARD : ov::op::RecurrentSequenceDirection::REVERSE, + found_cell->get_activations_alpha(), + found_cell->get_activations_beta(), + found_cell->get_activations(), + found_cell->get_clip()); + } else if (ov::is_type(found_cell)) { + sequence = std::make_shared( + X, + initial_hidden_state, + seq_lengths, + W, + R, + B, + found_cell->get_hidden_size(), + stride > 0 ? ov::op::RecurrentSequenceDirection::FORWARD : ov::op::RecurrentSequenceDirection::REVERSE, + found_cell->get_activations(), + found_cell->get_activations_alpha(), + found_cell->get_activations_beta(), + found_cell->get_clip()); + } else if (ov::is_type(found_cell)) { + const auto gru_cell = ov::as_type_ptr(found_cell); + sequence = std::make_shared( + X, + initial_hidden_state, + seq_lengths, + W, + R, + B, + gru_cell->get_hidden_size(), + stride > 0 ? ov::op::RecurrentSequenceDirection::FORWARD : ov::op::RecurrentSequenceDirection::REVERSE, + gru_cell->get_activations(), + gru_cell->get_activations_alpha(), + gru_cell->get_activations_beta(), + gru_cell->get_clip(), + gru_cell->get_linear_before_reset()); } else { OPENVINO_THROW("Unsupported sequence type"); } - ngraph::Output out = sequence->output(0); + ov::Output out = sequence->output(0); if (slice_axis == 0) { - auto order = ov::op::v0::Constant::create(ngraph::element::i64, ngraph::Shape{4}, {2, 1, 0, 3}); + auto order = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{4}, {2, 1, 0, 3}); out = std::make_shared(out, order); } - ngraph::NodeVector outputs; + ov::NodeVector outputs; // We must remove num_directions dimension that was added before sequence creation - auto axis_out = ov::op::v0::Constant::create(ngraph::element::i64, ngraph::Shape{1}, {1}); + auto axis_out = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{1}, {1}); auto out_0 = std::make_shared(out, axis_out); auto out_1 = std::make_shared(sequence->output(1), axis_out); out_0->set_friendly_name(ti->get_friendly_name() + ".0"); @@ -211,7 +207,7 @@ bool convertTensorIteratorToSequence(const std::shared_ptr(ngraph::pattern::rank_equals(3)); - auto pattern_1 = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(1)); - auto squeeze = ngraph::pattern::wrap_type({data, pattern_1}); + auto data = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(3)); + auto pattern_1 = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(1)); + auto squeeze = ov::pass::pattern::wrap_type({data, pattern_1}); - auto input_H_state = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(2)); - auto input_C_state = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(2)); - auto input_W = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(2)); - auto input_R = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(2)); - auto input_B = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(1)); + auto input_H_state = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(2)); + auto input_C_state = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(2)); + auto input_W = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(2)); + auto input_R = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(2)); + auto input_B = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(1)); - ngraph::OutputVector cell_inputs{squeeze, input_H_state, input_C_state, input_W, input_R, input_B}; - auto cell = ngraph::pattern::wrap_type(cell_inputs); + ov::OutputVector cell_inputs{squeeze, input_H_state, input_C_state, input_W, input_R, input_B}; + auto cell = ov::pass::pattern::wrap_type(cell_inputs); - auto pattern_2 = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(1)); - auto unsqueeze = ngraph::pattern::wrap_type({cell, pattern_2}); - ngraph::pattern::Matcher matcher(unsqueeze); + auto pattern_2 = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(1)); + auto unsqueeze = ov::pass::pattern::wrap_type({cell, pattern_2}); + ov::pass::pattern::Matcher matcher(unsqueeze); bool match = false; auto func = ti->get_body(); @@ -293,7 +289,7 @@ ov::pass::ConvertTensorIteratorToLSTMSequence::ConvertTensorIteratorToLSTMSequen pattern_map.at(unsqueeze)); }; - auto m = std::make_shared(tensor_iterator, matcher_name); + auto m = std::make_shared(tensor_iterator, matcher_name); register_matcher(m, callback); } @@ -307,21 +303,21 @@ ov::pass::ConvertTensorIteratorToRNNSequence::ConvertTensorIteratorToRNNSequence return false; // create a pattern for the TensorIterator body - auto data = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(3)); - auto pattern_1 = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(1)); - auto squeeze = ngraph::pattern::wrap_type({data, pattern_1}); + auto data = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(3)); + auto pattern_1 = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(1)); + auto squeeze = ov::pass::pattern::wrap_type({data, pattern_1}); - auto input_H_state = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(2)); - auto input_W = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(2)); - auto input_R = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(2)); - auto input_B = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(1)); + auto input_H_state = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(2)); + auto input_W = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(2)); + auto input_R = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(2)); + auto input_B = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(1)); - ngraph::OutputVector cell_inputs{squeeze, input_H_state, input_W, input_R, input_B}; - auto cell = ngraph::pattern::wrap_type(cell_inputs); + ov::OutputVector cell_inputs{squeeze, input_H_state, input_W, input_R, input_B}; + auto cell = ov::pass::pattern::wrap_type(cell_inputs); - auto pattern_2 = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(1)); - auto unsqueeze = ngraph::pattern::wrap_type({cell, pattern_2}); - ngraph::pattern::Matcher matcher(unsqueeze); + auto pattern_2 = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(1)); + auto unsqueeze = ov::pass::pattern::wrap_type({cell, pattern_2}); + ov::pass::pattern::Matcher matcher(unsqueeze); bool match = false; auto func = ti->get_body(); @@ -345,14 +341,14 @@ ov::pass::ConvertTensorIteratorToRNNSequence::ConvertTensorIteratorToRNNSequence rnn_cell, pattern_map.at(data), pattern_map.at(input_H_state), - ngraph::Output(), + ov::Output(), pattern_map.at(input_W), pattern_map.at(input_R), pattern_map.at(input_B), pattern_map.at(unsqueeze)); }; - auto m = std::make_shared(tensor_iterator, matcher_name); + auto m = std::make_shared(tensor_iterator, matcher_name); register_matcher(m, callback); } @@ -366,22 +362,22 @@ ov::pass::ConvertTensorIteratorToGRUSequence::ConvertTensorIteratorToGRUSequence return false; // create a pattern for the TensorIterator body - auto data = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(3)); - auto pattern_1 = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(1)); - auto squeeze = ngraph::pattern::wrap_type({data, pattern_1}); + auto data = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(3)); + auto pattern_1 = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(1)); + auto squeeze = ov::pass::pattern::wrap_type({data, pattern_1}); - auto input_H_state = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(2)); - auto input_W = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(2)); - auto input_R = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(2)); - auto input_B = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(1)); + auto input_H_state = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(2)); + auto input_W = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(2)); + auto input_R = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(2)); + auto input_B = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(1)); - ngraph::OutputVector cell_inputs{squeeze, input_H_state, input_W, input_R, input_B}; - auto cell = ngraph::pattern::wrap_type(cell_inputs); + ov::OutputVector cell_inputs{squeeze, input_H_state, input_W, input_R, input_B}; + auto cell = ov::pass::pattern::wrap_type(cell_inputs); - auto pattern_2 = ngraph::pattern::wrap_type(ngraph::pattern::rank_equals(1)); - auto unsqueeze = ngraph::pattern::wrap_type({cell, pattern_2}); + auto pattern_2 = ov::pass::pattern::wrap_type(ov::pass::pattern::rank_equals(1)); + auto unsqueeze = ov::pass::pattern::wrap_type({cell, pattern_2}); - ngraph::pattern::Matcher matcher(unsqueeze); + ov::pass::pattern::Matcher matcher(unsqueeze); bool match = false; auto func = ti->get_body(); @@ -405,14 +401,14 @@ ov::pass::ConvertTensorIteratorToGRUSequence::ConvertTensorIteratorToGRUSequence gru_cell, pattern_map.at(data), pattern_map.at(input_H_state), - ngraph::Output(), + ov::Output(), pattern_map.at(input_W), pattern_map.at(input_R), pattern_map.at(input_B), pattern_map.at(unsqueeze)); }; - auto m = std::make_shared(tensor_iterator, matcher_name); + auto m = std::make_shared(tensor_iterator, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_topk11_downgrade.cpp b/src/common/transformations/src/transformations/op_conversions/convert_topk11_downgrade.cpp index 7daefb574b1..daa1c567586 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_topk11_downgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_topk11_downgrade.cpp @@ -4,11 +4,10 @@ #include "transformations/op_conversions/convert_topk11_downgrade.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/topk.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertTopK11ToTopK3::ConvertTopK11ToTopK3() { MATCHER_SCOPE(ConvertTopK11ToTopK3); diff --git a/src/common/transformations/src/transformations/op_conversions/convert_topk3.cpp b/src/common/transformations/src/transformations/op_conversions/convert_topk3.cpp index 3beed348796..a4720b6d661 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_topk3.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_topk3.cpp @@ -5,13 +5,13 @@ #include "transformations/op_conversions/convert_topk3.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/topk.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertTopK3::ConvertTopK3() { MATCHER_SCOPE(ConvertTopK3); @@ -24,7 +24,7 @@ ov::pass::ConvertTopK3::ConvertTopK3() { } Output last0; Output last1; - ngraph::NodeVector new_ops; + ov::NodeVector new_ops; auto new_topk = std::make_shared(topk->input_value(0), topk->input_value(1), @@ -58,12 +58,12 @@ ov::pass::ConvertTopK3::ConvertTopK3() { last1.get_node_shared_ptr()->set_friendly_name(topk->get_friendly_name() + ".1"); } - ngraph::copy_runtime_info(topk, new_ops); + ov::copy_runtime_info(topk, new_ops); topk->output(0).replace(last0); topk->output(1).replace(last1); return true; }; - auto m = std::make_shared(topk, matcher_name); + auto m = std::make_shared(topk, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/convert_xor_to_logical_xor.cpp b/src/common/transformations/src/transformations/op_conversions/convert_xor_to_logical_xor.cpp index 70a687c3c7e..0f20944df52 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_xor_to_logical_xor.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_xor_to_logical_xor.cpp @@ -4,12 +4,11 @@ #include "transformations/op_conversions/convert_xor_to_logical_xor.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/logical_xor.hpp" #include "openvino/op/xor.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ConvertXorToLogicalXor::ConvertXorToLogicalXor() { MATCHER_SCOPE(ConvertXorToLogicalXor); diff --git a/src/common/transformations/src/transformations/op_conversions/detection_output_downgrade.cpp b/src/common/transformations/src/transformations/op_conversions/detection_output_downgrade.cpp index 255f2d2246b..0a09bdfc683 100644 --- a/src/common/transformations/src/transformations/op_conversions/detection_output_downgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/detection_output_downgrade.cpp @@ -4,12 +4,11 @@ #include "transformations/op_conversions/detection_output_downgrade.hpp" -#include -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/detection_output.hpp" +#include "openvino/op/util/detection_output_base.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" using namespace std; using namespace ov; @@ -69,8 +68,8 @@ pass::ConvertDetectionOutput8ToDetectionOutput1::ConvertDetectionOutput8ToDetect return false; detection_output_v1_node->set_friendly_name(detection_output_v8_node->get_friendly_name()); - ngraph::copy_runtime_info(detection_output_v8_node, detection_output_v1_node); - ngraph::replace_node(detection_output_v8_node, detection_output_v1_node); + ov::copy_runtime_info(detection_output_v8_node, detection_output_v1_node); + ov::replace_node(detection_output_v8_node, detection_output_v1_node); return true; }; diff --git a/src/common/transformations/src/transformations/op_conversions/detection_output_upgrade.cpp b/src/common/transformations/src/transformations/op_conversions/detection_output_upgrade.cpp index 57fffd8c269..2b2ab325173 100644 --- a/src/common/transformations/src/transformations/op_conversions/detection_output_upgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/detection_output_upgrade.cpp @@ -4,12 +4,10 @@ #include "transformations/op_conversions/detection_output_upgrade.hpp" -#include -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/detection_output.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" using namespace std; using namespace ov; @@ -63,8 +61,8 @@ pass::ConvertDetectionOutput1ToDetectionOutput8::ConvertDetectionOutput1ToDetect return false; detection_output_v8_node->set_friendly_name(detection_output_v1_node->get_friendly_name()); - ngraph::copy_runtime_info(detection_output_v1_node, detection_output_v8_node); - ngraph::replace_node(detection_output_v1_node, detection_output_v8_node); + ov::copy_runtime_info(detection_output_v1_node, detection_output_v8_node); + ov::replace_node(detection_output_v1_node, detection_output_v8_node); return true; }; diff --git a/src/common/transformations/src/transformations/op_conversions/einsum_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/einsum_decomposition.cpp index 4afa0c9f84a..ad61366b319 100644 --- a/src/common/transformations/src/transformations/op_conversions/einsum_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/einsum_decomposition.cpp @@ -5,12 +5,10 @@ #include "transformations/op_conversions/einsum_decomposition.hpp" #include -#include -#include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/einsum.hpp" @@ -23,6 +21,8 @@ #include "openvino/op/strided_slice.hpp" #include "openvino/op/transpose.hpp" #include "openvino/op/unsqueeze.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" namespace { /// \brief Check if the EinsumDecomposition transformation is applicable to a given Einsum. @@ -50,7 +50,7 @@ std::vector> compute_einsum_path(std::shared_ptr> einsum_path; const size_t num_inputs = einsum_node->get_input_size(); - NGRAPH_CHECK(num_inputs > 0); + OPENVINO_ASSERT(num_inputs > 0); for (size_t input_ind = num_inputs - 1; input_ind > 0; --input_ind) { einsum_path.push_back(std::make_pair(0, input_ind)); } @@ -158,15 +158,15 @@ std::string generate_grouping_subscript(const std::string& input_subscript, /// \param new_node New input node to be inserted in the tail /// \param new_subscript New input subscript to be inserted in the tail /// -void update_operands(ngraph::OutputVector& input_nodes, +void update_operands(ov::OutputVector& input_nodes, std::vector& input_subscripts, size_t input_ind1, size_t input_ind2, - const ngraph::Output& new_node, + const ov::Output& new_node, const std::string& new_subscript) { - NGRAPH_CHECK(input_ind1 < input_ind2); - NGRAPH_CHECK(input_ind2 < input_nodes.size()); - NGRAPH_CHECK(input_ind2 < input_subscripts.size()); + OPENVINO_ASSERT(input_ind1 < input_ind2); + OPENVINO_ASSERT(input_ind2 < input_nodes.size()); + OPENVINO_ASSERT(input_ind2 < input_subscripts.size()); input_nodes.erase(input_nodes.begin() + input_ind2); input_nodes.erase(input_nodes.begin() + input_ind1); input_nodes.push_back(new_node); @@ -187,27 +187,27 @@ void update_operands(ngraph::OutputVector& input_nodes, /// \return A vector of input nodes that can be empty (if s_end <= s_begin) /// or contains just one input node with sub-shape or its product /// -ngraph::OutputVector compute_sub_shape(const ngraph::Output& data_shape, - size_t s_begin, - size_t s_end, - ngraph::NodeVector& subgraph_nodes, - bool is_product = false) { +ov::OutputVector compute_sub_shape(const ov::Output& data_shape, + size_t s_begin, + size_t s_end, + ov::NodeVector& subgraph_nodes, + bool is_product = false) { int64_t begin = static_cast(s_begin); int64_t end = static_cast(s_end); - ngraph::OutputVector sub_shape_vector; + ov::OutputVector sub_shape_vector; if (end <= begin) { return sub_shape_vector; } std::vector begin_mask(1, 0); std::vector end_mask(1, 0); - auto begin_const = ov::op::v0::Constant::create(ngraph::element::Type_t::i64, ngraph::Shape{1}, {begin}); - auto end_const = ov::op::v0::Constant::create(ngraph::element::Type_t::i64, ngraph::Shape{1}, {end}); - auto stride_const = ov::op::v0::Constant::create(ngraph::element::Type_t::i64, ngraph::Shape{1}, {1}); + auto begin_const = ov::op::v0::Constant::create(ov::element::Type_t::i64, ov::Shape{1}, {begin}); + auto end_const = ov::op::v0::Constant::create(ov::element::Type_t::i64, ov::Shape{1}, {end}); + auto stride_const = ov::op::v0::Constant::create(ov::element::Type_t::i64, ov::Shape{1}, {1}); auto sub_shape = std::make_shared(data_shape, begin_const, end_const, begin_mask, end_mask); if (is_product) { - auto reduce_axis_const = ov::op::v0::Constant::create(ngraph::element::Type_t::i64, ngraph::Shape{1}, {0}); + auto reduce_axis_const = ov::op::v0::Constant::create(ov::element::Type_t::i64, ov::Shape{1}, {0}); auto separate_shape_prod = std::make_shared(sub_shape->output(0), reduce_axis_const, true); sub_shape_vector.push_back(separate_shape_prod->output(0)); @@ -230,15 +230,14 @@ ngraph::OutputVector compute_sub_shape(const ngraph::Output& data_ /// \return Unsqueezed input node if a vector of unsqueezing dimensions is not empty, /// otherwise, the original input node /// -ngraph::Output unsqueeze_input(const ngraph::Output& input_node, - const std::vector& unsqueeze_axes, - ngraph::NodeVector& subgraph_nodes) { +ov::Output unsqueeze_input(const ov::Output& input_node, + const std::vector& unsqueeze_axes, + ov::NodeVector& subgraph_nodes) { if (unsqueeze_axes.empty()) { return input_node; } - auto unsqueeze_axes_const = ov::op::v0::Constant::create(ngraph::element::Type_t::i64, - ngraph::Shape{unsqueeze_axes.size()}, - unsqueeze_axes); + auto unsqueeze_axes_const = + ov::op::v0::Constant::create(ov::element::Type_t::i64, ov::Shape{unsqueeze_axes.size()}, unsqueeze_axes); auto unsqueeze = std::make_shared(input_node, unsqueeze_axes_const); subgraph_nodes.insert(subgraph_nodes.end(), {unsqueeze_axes_const, unsqueeze}); return unsqueeze->output(0); @@ -258,28 +257,28 @@ ngraph::Output unsqueeze_input(const ngraph::Output& /// /// \return Reshaped input node /// -ngraph::Output reshape_input_for_matmul(const ngraph::Output& input_node, - const ngraph::OutputVector& common_sub_shape, - const ngraph::OutputVector& separate_sub_shape, - const ngraph::OutputVector& reduced_sub_shape_prod, - bool is_separate_first, - ngraph::NodeVector& subgraph_nodes) { - ngraph::OutputVector new_shape_parts; +ov::Output reshape_input_for_matmul(const ov::Output& input_node, + const ov::OutputVector& common_sub_shape, + const ov::OutputVector& separate_sub_shape, + const ov::OutputVector& reduced_sub_shape_prod, + bool is_separate_first, + ov::NodeVector& subgraph_nodes) { + ov::OutputVector new_shape_parts; new_shape_parts.insert(new_shape_parts.end(), common_sub_shape.begin(), common_sub_shape.end()); // compute a product of a sub-shape for separate labels - ngraph::OutputVector separate_parts; + ov::OutputVector separate_parts; if (common_sub_shape.size() > 0 && separate_sub_shape.size() == 0) { // in this case new dimension corresponding to separate labels must be added // since MatMul operation is not possible to do without separate dimensions if the // common dimension presents - auto separate_new_dim = ov::op::v0::Constant::create(ngraph::element::Type_t::i64, ngraph::Shape{1}, {1}); + auto separate_new_dim = ov::op::v0::Constant::create(ov::element::Type_t::i64, ov::Shape{1}, {1}); separate_parts.push_back(separate_new_dim); subgraph_nodes.insert(subgraph_nodes.end(), {separate_new_dim}); } else if (separate_sub_shape.size() > 0) { // in this case compute a product of separate dimension sizes since they must be // presented with just one dimension for MatMul - auto reduce_axis_const = ov::op::v0::Constant::create(ngraph::element::Type_t::i64, ngraph::Shape{1}, {0}); + auto reduce_axis_const = ov::op::v0::Constant::create(ov::element::Type_t::i64, ov::Shape{1}, {0}); auto separate_shape_prod = std::make_shared(separate_sub_shape[0], reduce_axis_const, true); separate_parts.push_back(separate_shape_prod->output(0)); @@ -307,7 +306,7 @@ ngraph::Output reshape_input_for_matmul(const ngraph::Output reshaped_input_op; OPENVINO_SUPPRESS_DEPRECATED_START - if (auto new_shape_const = ngraph::get_constant_from_source(new_shape_op)) { + if (auto new_shape_const = ov::get_constant_from_source(new_shape_op)) { OPENVINO_SUPPRESS_DEPRECATED_END reshaped_input_op = std::make_shared(input_node, new_shape_const, false); subgraph_nodes.insert(subgraph_nodes.end(), {new_shape_const}); @@ -331,15 +330,15 @@ ngraph::Output reshape_input_for_matmul(const ngraph::Output& input_subscripts, const std::string& required_subscript, size_t input_ind, - ngraph::NodeVector& subgraph_nodes) { + ov::NodeVector& subgraph_nodes) { // perform sanity check for arguments auto num_inputs = input_nodes.size(); - NGRAPH_CHECK(num_inputs == input_subscripts.size(), "Each input must have own subscript."); - NGRAPH_CHECK(input_ind < num_inputs, "Input index is out of range."); + OPENVINO_ASSERT(num_inputs == input_subscripts.size(), "Each input must have own subscript."); + OPENVINO_ASSERT(input_ind < num_inputs, "Input index is out of range."); // generate permutation vector by searching for bijection between input_subscripts // and required_subscript @@ -355,10 +354,10 @@ void transpose_input(ngraph::OutputVector& input_nodes, // and the required one auto labels = ov::op::v7::Einsum::extract_labels(input_subscript); auto required_labels = ov::op::v7::Einsum::extract_labels(required_subscript); - NGRAPH_CHECK(labels.size() == required_labels.size()); + OPENVINO_ASSERT(labels.size() == required_labels.size()); for (const auto& required_label : required_labels) { auto it = std::find(labels.begin(), labels.end(), required_label); - NGRAPH_CHECK(it != labels.end()); + OPENVINO_ASSERT(it != labels.end()); int64_t found_index = static_cast(it - labels.begin()); permutation.push_back(found_index); } @@ -366,7 +365,7 @@ void transpose_input(ngraph::OutputVector& input_nodes, // create a sub-graph for transposing into the required layout const auto& input_node = input_nodes[input_ind]; auto permutation_const = - ov::op::v0::Constant::create(ngraph::element::Type_t::i64, ngraph::Shape{permutation.size()}, permutation); + ov::op::v0::Constant::create(ov::element::Type_t::i64, ov::Shape{permutation.size()}, permutation); auto transpose = std::make_shared(input_node, permutation_const); // update a vector of inputs and input subscripts @@ -390,15 +389,15 @@ void transpose_input(ngraph::OutputVector& input_nodes, /// a sub-graph decomposing Einsum that is needed for copy_runtime_info /// void reduce_input(ov::pass::EinsumDecomposition* einsum_decompose_ptr, - ngraph::OutputVector& input_nodes, + ov::OutputVector& input_nodes, std::vector& input_subscripts, const std::string& output_subscript, size_t input_ind, - ngraph::NodeVector& subgraph_nodes) { + ov::NodeVector& subgraph_nodes) { // perform sanity check for arguments auto num_inputs = input_nodes.size(); - NGRAPH_CHECK(num_inputs == input_subscripts.size(), "Each input must have own subscript."); - NGRAPH_CHECK(input_ind < num_inputs, "Input index is out of range."); + OPENVINO_ASSERT(num_inputs == input_subscripts.size(), "Each input must have own subscript."); + OPENVINO_ASSERT(input_ind < num_inputs, "Input index is out of range."); std::vector reduced_axes; auto labels = ov::op::v7::Einsum::extract_labels(input_subscripts[input_ind]); @@ -426,7 +425,7 @@ void reduce_input(ov::pass::EinsumDecomposition* einsum_decompose_ptr, // reduce by summed up elements along dimension for which label is met just once const auto& input_node = input_nodes[input_ind]; auto axes_const = - ov::op::v0::Constant::create(ngraph::element::Type_t::i64, ngraph::Shape{reduced_axes.size()}, reduced_axes); + ov::op::v0::Constant::create(ov::element::Type_t::i64, ov::Shape{reduced_axes.size()}, reduced_axes); auto reduce_sum = einsum_decompose_ptr->register_new_node(input_node, axes_const, false); // update a vector of inputs and input subscripts @@ -452,12 +451,12 @@ void reduce_input(ov::pass::EinsumDecomposition* einsum_decompose_ptr, /// sub-graph decomposing Einsum that is needed for copy_runtime_info /// void contract_two_inputs(ov::pass::EinsumDecomposition* einsum_decompose_ptr, - ngraph::OutputVector& input_nodes, + ov::OutputVector& input_nodes, std::vector& input_subscripts, const std::string& output_subscript, size_t input_ind1, size_t input_ind2, - ngraph::NodeVector& subgraph_nodes) { + ov::NodeVector& subgraph_nodes) { // assume that input_ind1 < input_ind2 without loss of generality, otherwise, just swap them if (input_ind2 < input_ind1) { std::swap(input_ind1, input_ind2); @@ -465,8 +464,8 @@ void contract_two_inputs(ov::pass::EinsumDecomposition* einsum_decompose_ptr, // perform sanity check for arguments auto num_inputs = input_nodes.size(); - NGRAPH_CHECK(num_inputs == input_subscripts.size(), "Each input must have own subscript."); - NGRAPH_CHECK(input_ind2 < num_inputs && input_ind1 != input_ind2, "Incorrect input index is specified."); + OPENVINO_ASSERT(num_inputs == input_subscripts.size(), "Each input must have own subscript."); + OPENVINO_ASSERT(input_ind2 < num_inputs && input_ind1 != input_ind2, "Incorrect input index is specified."); const auto& input_node1 = input_nodes[input_ind1]; const auto& input_node2 = input_nodes[input_ind2]; @@ -548,7 +547,7 @@ void contract_two_inputs(ov::pass::EinsumDecomposition* einsum_decompose_ptr, // multiply both operands with broadcasting auto mul = std::make_shared(unsqueeze_output1, unsqueeze_output2, - ngraph::op::AutoBroadcastType::NUMPY); + ov::op::AutoBroadcastType::NUMPY); // update input operand and input subscript for Einsum operation update_operands(input_nodes, input_subscripts, input_ind1, input_ind2, mul->output(0), resultant_subscript); @@ -606,7 +605,7 @@ void contract_two_inputs(ov::pass::EinsumDecomposition* einsum_decompose_ptr, auto matmul_operand2 = input_node2; int64_t common_dims_begin = 0; int64_t common_dims_end = common_labels_inds1.size(); - ngraph::OutputVector common_sub_shape, separate1_sub_shape, separate2_sub_shape; + ov::OutputVector common_sub_shape, separate1_sub_shape, separate2_sub_shape; if (no_reshape_for_matmul1 == false || no_reshape_for_matmul2 == false) { auto data_shape1 = std::make_shared(input_node1); common_sub_shape = compute_sub_shape(data_shape1, common_dims_begin, common_dims_end, subgraph_nodes); @@ -664,7 +663,7 @@ void contract_two_inputs(ov::pass::EinsumDecomposition* einsum_decompose_ptr, // since there are no collapsed (or auxiliary added) separated dimensions update_operands(input_nodes, input_subscripts, input_ind1, input_ind2, matmul->output(0), resultant_subscript); } else { - ngraph::OutputVector new_shape; + ov::OutputVector new_shape; new_shape.insert(new_shape.end(), common_sub_shape.begin(), common_sub_shape.end()); new_shape.insert(new_shape.end(), separate1_sub_shape.begin(), separate1_sub_shape.end()); new_shape.insert(new_shape.end(), separate2_sub_shape.begin(), separate2_sub_shape.end()); @@ -674,7 +673,7 @@ void contract_two_inputs(ov::pass::EinsumDecomposition* einsum_decompose_ptr, // in order to prevent repeated computing during constant-folding pass std::shared_ptr result_op; OPENVINO_SUPPRESS_DEPRECATED_START - if (auto new_shape_const = ngraph::get_constant_from_source(result_shape_op)) { + if (auto new_shape_const = ov::get_constant_from_source(result_shape_op)) { OPENVINO_SUPPRESS_DEPRECATED_END result_op = std::make_shared(matmul->output(0), new_shape_const, false); subgraph_nodes.insert(subgraph_nodes.end(), {new_shape_const}); @@ -705,8 +704,8 @@ ov::pass::EinsumDecomposition::EinsumDecomposition() { // but not applicable to a case with equation="aabc,bd->ad" due to repeated labels // in the first input subscript. MATCHER_SCOPE(EinsumDecomposition); - auto einsum = ngraph::pattern::wrap_type(); - matcher_pass_callback callback = [this](ngraph::pattern::Matcher& m) { + auto einsum = ov::pass::pattern::wrap_type(); + matcher_pass_callback callback = [this](ov::pass::pattern::Matcher& m) { auto einsum_node = std::dynamic_pointer_cast(m.get_match_root()); if (!einsum_node) { return false; @@ -726,8 +725,8 @@ ov::pass::EinsumDecomposition::EinsumDecomposition() { // create a list of input nodes with preserving their order // and a vector of sub-graph nodes for copy_runtime_info - ngraph::OutputVector input_nodes = einsum_node->input_values(); - ngraph::NodeVector subgraph_nodes; + ov::OutputVector input_nodes = einsum_node->input_values(); + ov::NodeVector subgraph_nodes; // compute einsum path that is used to contract a pair of operands // in more optimal order @@ -745,7 +744,7 @@ ov::pass::EinsumDecomposition::EinsumDecomposition() { } // reduce dimensions for the remained input node - NGRAPH_CHECK(input_nodes.size() == 1); + OPENVINO_ASSERT(input_nodes.size() == 1); reduce_input(this, input_nodes, input_subscripts, output_subscript, 0, subgraph_nodes); // transpose dimensions to layout required by the output subscript @@ -755,11 +754,11 @@ ov::pass::EinsumDecomposition::EinsumDecomposition() { // preserve the original node name auto last_node = input_nodes[0].get_node_shared_ptr(); last_node->set_friendly_name(einsum_node->get_friendly_name()); - ngraph::copy_runtime_info(einsum_node, subgraph_nodes); - ngraph::replace_node(einsum_node, last_node); + ov::copy_runtime_info(einsum_node, subgraph_nodes); + ov::replace_node(einsum_node, last_node); return true; }; - auto m = std::make_shared(einsum, matcher_name); + auto m = std::make_shared(einsum, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/fq_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/fq_decomposition.cpp index 28bf02900be..0c694b4b967 100644 --- a/src/common/transformations/src/transformations/op_conversions/fq_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/fq_decomposition.cpp @@ -4,12 +4,10 @@ #include "transformations/op_conversions/fq_decomposition.hpp" -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" @@ -21,6 +19,7 @@ #include "openvino/op/multiply.hpp" #include "openvino/op/round.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" namespace { @@ -29,7 +28,7 @@ bool isValidRangesInputs(const std::shared_ptr& fq) { auto ih = fq->input_value(2); auto greater_equal = std::make_shared(il, ih); - ngraph::OutputVector result(1); + ov::OutputVector result(1); if (!greater_equal->constant_fold(result, greater_equal->input_values())) return false; @@ -47,13 +46,13 @@ bool isValidRangesInputs(const std::shared_ptr& fq) { ov::pass::FakeQuantizeDecomposition::FakeQuantizeDecomposition() { MATCHER_SCOPE(FakeQuantizeDecomposition); auto data = pattern::any_input(); - auto il = ngraph::pattern::wrap_type(); - auto ih = ngraph::pattern::wrap_type(); - auto ol = ngraph::pattern::wrap_type(); - auto oh = ngraph::pattern::wrap_type(); - auto fake_quantize = ngraph::pattern::wrap_type({data, il, ih, ol, oh}); + auto il = ov::pass::pattern::wrap_type(); + auto ih = ov::pass::pattern::wrap_type(); + auto ol = ov::pass::pattern::wrap_type(); + auto oh = ov::pass::pattern::wrap_type(); + auto fake_quantize = ov::pass::pattern::wrap_type({data, il, ih, ol, oh}); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); const auto fake_quantize_node = std::dynamic_pointer_cast( pattern_to_output.at(fake_quantize).get_node_shared_ptr()); @@ -70,7 +69,7 @@ ov::pass::FakeQuantizeDecomposition::FakeQuantizeDecomposition() { const Output output_high{fake_quantize_node->input_value(4)}; auto input_type = data.get_element_type(); - ngraph::NodeVector decomp_ops; + ov::NodeVector decomp_ops; if (input_type != input_low.get_element_type()) { input_type = input_low.get_element_type(); data = std::make_shared(data, input_type); @@ -132,11 +131,11 @@ ov::pass::FakeQuantizeDecomposition::FakeQuantizeDecomposition() { } result->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info(fake_quantize_node, decomp_ops); - ngraph::replace_node(m.get_match_root(), result); + ov::copy_runtime_info(fake_quantize_node, decomp_ops); + ov::replace_node(m.get_match_root(), result); return true; }; - auto m = std::make_shared(fake_quantize, matcher_name); + auto m = std::make_shared(fake_quantize, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/gather_normalize_negative_indices.cpp b/src/common/transformations/src/transformations/op_conversions/gather_normalize_negative_indices.cpp index 77a2b725afa..47ff221d82f 100644 --- a/src/common/transformations/src/transformations/op_conversions/gather_normalize_negative_indices.cpp +++ b/src/common/transformations/src/transformations/op_conversions/gather_normalize_negative_indices.cpp @@ -5,24 +5,24 @@ #include "transformations/op_conversions/gather_normalize_negative_indices.hpp" #include -#include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/gather.hpp" #include "openvino/op/shape_of.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::GatherNegativeConstIndicesNormalize::GatherNegativeConstIndicesNormalize() { MATCHER_SCOPE(GatherNegativeConstIndicesNormalize); auto data_input = pattern::any_input(pattern::has_static_rank()); - auto axis_input = ngraph::pattern::wrap_type(); - auto indices_input = ngraph::pattern::wrap_type(); - auto gather_node = ngraph::pattern::wrap_type({data_input, indices_input, axis_input}); + auto axis_input = ov::pass::pattern::wrap_type(); + auto indices_input = ov::pass::pattern::wrap_type(); + auto gather_node = ov::pass::pattern::wrap_type({data_input, indices_input, axis_input}); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto gather = pattern_to_output.at(gather_node).get_node_shared_ptr(); auto data = pattern_to_output.at(data_input); @@ -70,17 +70,17 @@ ov::pass::GatherNegativeConstIndicesNormalize::GatherNegativeConstIndicesNormali std::shared_ptr add = std::make_shared(input_gather, indices_constant); OPENVINO_SUPPRESS_DEPRECATED_START - if (auto folded_const = ngraph::get_constant_from_source(add)) { + if (auto folded_const = ov::get_constant_from_source(add)) { OPENVINO_SUPPRESS_DEPRECATED_END add = folded_const; } gather->input(1).replace_source_output(add); - ngraph::copy_runtime_info(gather, {shape_of, input_gather, add}); + ov::copy_runtime_info(gather, {shape_of, input_gather, add}); return true; }; - auto m = std::make_shared(gather_node, matcher_name); + auto m = std::make_shared(gather_node, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/gelu7_downgrade.cpp b/src/common/transformations/src/transformations/op_conversions/gelu7_downgrade.cpp index 7653f327986..18c1b6d6290 100644 --- a/src/common/transformations/src/transformations/op_conversions/gelu7_downgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/gelu7_downgrade.cpp @@ -5,17 +5,17 @@ #include "transformations/op_conversions/gelu7_downgrade.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/gelu.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::Gelu7Downgrade::Gelu7Downgrade() { MATCHER_SCOPE(Gelu7Downgrade); - auto gelu = ngraph::pattern::wrap_type(); + auto gelu = ov::pass::pattern::wrap_type(); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto gelu_node = std::dynamic_pointer_cast(pattern_to_output.at(gelu).get_node_shared_ptr()); @@ -25,11 +25,11 @@ ov::pass::Gelu7Downgrade::Gelu7Downgrade() { auto new_gelu_node = std::make_shared(gelu_node->input_value(0)); new_gelu_node->set_friendly_name(gelu_node->get_friendly_name()); - ngraph::copy_runtime_info(gelu_node, new_gelu_node); - ngraph::replace_node(gelu_node, new_gelu_node); + ov::copy_runtime_info(gelu_node, new_gelu_node); + ov::replace_node(gelu_node, new_gelu_node); return true; }; - auto m = std::make_shared(gelu, matcher_name); + auto m = std::make_shared(gelu, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/gru_cell_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/gru_cell_decomposition.cpp index e31e0de8454..550e64ea10e 100644 --- a/src/common/transformations/src/transformations/op_conversions/gru_cell_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/gru_cell_decomposition.cpp @@ -5,12 +5,10 @@ #include "transformations/op_conversions/gru_cell_decomposition.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/clamp.hpp" #include "openvino/op/constant.hpp" @@ -19,11 +17,13 @@ #include "openvino/op/multiply.hpp" #include "openvino/op/split.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" ov::pass::GRUCellDecomposition::GRUCellDecomposition() { MATCHER_SCOPE(GRUCellDecomposition); - auto gru_cell = ngraph::pattern::wrap_type(); - matcher_pass_callback callback = [this](ngraph::pattern::Matcher& m) { + auto gru_cell = ov::pass::pattern::wrap_type(); + matcher_pass_callback callback = [this](ov::pass::pattern::Matcher& m) { auto gru_cell = std::dynamic_pointer_cast(m.get_match_root()); if (!gru_cell || transformation_callback(gru_cell)) { return false; @@ -62,7 +62,7 @@ ov::pass::GRUCellDecomposition::GRUCellDecomposition() { if (clip > 0.f) { clamp_z = std::make_shared(add_z_2, -clip, clip); clamp_r = std::make_shared(add_r_2, -clip, clip); - ngraph::copy_runtime_info(gru_cell, {clamp_z, clamp_r}); + ov::copy_runtime_info(gru_cell, {clamp_z, clamp_r}); } // zt = f(Xt*(Wz^T) + Ht-1*(Rz^T) + Wbz + Rbz) @@ -77,20 +77,20 @@ ov::pass::GRUCellDecomposition::GRUCellDecomposition() { auto mul_h_1 = std::make_shared(r_t, Ht_Rh_Rbh); auto add_h_1 = std::make_shared(mul_h_1, biases_zrh->output(2)); _h = std::make_shared(Xt_W_zrh->output(2), add_h_1); - ngraph::copy_runtime_info(gru_cell, {Ht_Rh_Rbh, mul_h_1, add_h_1, _h}); + ov::copy_runtime_info(gru_cell, {Ht_Rh_Rbh, mul_h_1, add_h_1, _h}); } else { // _h = Xt*(Wh^T) + (rt (.) Ht-1)*(Rh^T) + Rbh + Wbh auto rt_Ht = std::make_shared(r_t, H_t); auto mul_h_1 = std::make_shared(rt_Ht, R_zrh->output(2), false, true); auto add_h_1 = std::make_shared(mul_h_1, biases_zrh->output(2)); _h = std::make_shared(Xt_W_zrh->output(2), add_h_1); - ngraph::copy_runtime_info(gru_cell, {rt_Ht, mul_h_1, add_h_1, _h}); + ov::copy_runtime_info(gru_cell, {rt_Ht, mul_h_1, add_h_1, _h}); } // ht = g(_h) std::shared_ptr clamp_h = _h; if (clip > 0.f) { clamp_h = std::make_shared(_h, -clip, clip); - ngraph::copy_runtime_info(gru_cell, clamp_h); + ov::copy_runtime_info(gru_cell, clamp_h); } auto h_t = ov::op::util::activation(gru_cell->get_activations()[1], clamp_h); @@ -102,28 +102,28 @@ ov::pass::GRUCellDecomposition::GRUCellDecomposition() { auto out_H = std::make_shared(mul_1, mul_2); out_H->set_friendly_name(gru_cell->get_friendly_name()); - ngraph::copy_runtime_info(gru_cell, - {Xt_W, - Ht_R, - axis_0, - Xt_W_zrh, - R_zrh, - Ht_R_zrh, - biases_zrh, - add_z_1, - add_z_2, - add_r_1, - add_r_2, - h_t, - one, - sub, - mul_1, - mul_2, - out_H}); - ngraph::replace_node(gru_cell, out_H); + ov::copy_runtime_info(gru_cell, + {Xt_W, + Ht_R, + axis_0, + Xt_W_zrh, + R_zrh, + Ht_R_zrh, + biases_zrh, + add_z_1, + add_z_2, + add_r_1, + add_r_2, + h_t, + one, + sub, + mul_1, + mul_2, + out_H}); + ov::replace_node(gru_cell, out_H); return true; }; - auto m = std::make_shared(gru_cell, matcher_name); + auto m = std::make_shared(gru_cell, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/hsigmoid_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/hsigmoid_decomposition.cpp index 418aed09a05..136cc4bc6a0 100644 --- a/src/common/transformations/src/transformations/op_conversions/hsigmoid_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/hsigmoid_decomposition.cpp @@ -5,23 +5,23 @@ #include "transformations/op_conversions/hsigmoid_decomposition.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/hsigmoid.hpp" #include "openvino/op/minimum.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/relu.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::HSigmoidDecomposition::HSigmoidDecomposition() { MATCHER_SCOPE(HSigmoidDecomposition); // Decomposes HSigmoid(x) op into sub-graph (min(Relu(x + 3), 6) * const(1/6) - auto hsigmoid = ngraph::pattern::wrap_type(); + auto hsigmoid = ov::pass::pattern::wrap_type(); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto hsigmoid_node = pattern_to_output.at(hsigmoid).get_node_shared_ptr(); @@ -30,20 +30,20 @@ ov::pass::HSigmoidDecomposition::HSigmoidDecomposition() { } auto input_type = hsigmoid_node->input_value(0).get_element_type(); - auto add_constant = ov::op::v0::Constant::create(input_type, ngraph::Shape{}, {3.0}); + auto add_constant = ov::op::v0::Constant::create(input_type, ov::Shape{}, {3.0}); auto add = std::make_shared(hsigmoid_node->input_value(0), add_constant); auto relu = std::make_shared(add); - auto min_constant = ov::op::v0::Constant::create(input_type, ngraph::Shape{}, {6.0}); + auto min_constant = ov::op::v0::Constant::create(input_type, ov::Shape{}, {6.0}); auto min = register_new_node(relu, min_constant); - auto mul_constant = ov::op::v0::Constant::create(input_type, ngraph::Shape{}, {(1.0 / 6.0)}); // const(1/6) + auto mul_constant = ov::op::v0::Constant::create(input_type, ov::Shape{}, {(1.0 / 6.0)}); // const(1/6) auto mul = std::make_shared(min, mul_constant); mul->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info(hsigmoid_node, {add_constant, add, relu, min_constant, min, min_constant, mul}); - ngraph::replace_node(m.get_match_root(), mul); + ov::copy_runtime_info(hsigmoid_node, {add_constant, add, relu, min_constant, min, min_constant, mul}); + ov::replace_node(m.get_match_root(), mul); return true; }; - auto m = std::make_shared(hsigmoid, matcher_name); + auto m = std::make_shared(hsigmoid, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/hswish_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/hswish_decomposition.cpp index b6155508727..ba5ab889bbb 100644 --- a/src/common/transformations/src/transformations/op_conversions/hswish_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/hswish_decomposition.cpp @@ -5,23 +5,23 @@ #include "transformations/op_conversions/hswish_decomposition.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/hswish.hpp" #include "openvino/op/minimum.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/relu.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::HSwishDecomposition::HSwishDecomposition() { MATCHER_SCOPE(HSwishDecomposition); // Decomposes HSwish(x) op into sub-graph x * (min(Relu(x + 3), 6) * const(1/6) - auto hswish = ngraph::pattern::wrap_type(); + auto hswish = ov::pass::pattern::wrap_type(); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto hswish_node = pattern_to_output.at(hswish).get_node_shared_ptr(); @@ -30,22 +30,22 @@ ov::pass::HSwishDecomposition::HSwishDecomposition() { } auto input_type = hswish_node->input_value(0).get_element_type(); - auto add_constant = ov::op::v0::Constant::create(input_type, ngraph::Shape{}, {3.0}); + auto add_constant = ov::op::v0::Constant::create(input_type, ov::Shape{}, {3.0}); auto add = std::make_shared(hswish_node->input_value(0), add_constant); auto relu = std::make_shared(add); - auto min_constant = ov::op::v0::Constant::create(input_type, ngraph::Shape{}, {6.0}); + auto min_constant = ov::op::v0::Constant::create(input_type, ov::Shape{}, {6.0}); auto min = register_new_node(relu, min_constant); auto mul_first = std::make_shared(hswish_node->input_value(0), min); - auto mul_constant = ov::op::v0::Constant::create(input_type, ngraph::Shape{}, {(1.0 / 6.0)}); // const(1/6) + auto mul_constant = ov::op::v0::Constant::create(input_type, ov::Shape{}, {(1.0 / 6.0)}); // const(1/6) auto mul_second = std::make_shared(mul_first, mul_constant); mul_second->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info(hswish_node, - {add_constant, add, relu, min_constant, min, mul_first, mul_constant, mul_second}); - ngraph::replace_node(m.get_match_root(), mul_second); + ov::copy_runtime_info(hswish_node, + {add_constant, add, relu, min_constant, min, mul_first, mul_constant, mul_second}); + ov::replace_node(m.get_match_root(), mul_second); return true; }; - auto m = std::make_shared(hswish, matcher_name); + auto m = std::make_shared(hswish, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/log_softmax_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/log_softmax_decomposition.cpp index 205a2af236a..f0656c6889b 100644 --- a/src/common/transformations/src/transformations/op_conversions/log_softmax_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/log_softmax_decomposition.cpp @@ -5,10 +5,9 @@ #include "transformations/op_conversions/log_softmax_decomposition.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/exp.hpp" #include "openvino/op/log.hpp" @@ -16,13 +15,14 @@ #include "openvino/op/reduce_max.hpp" #include "openvino/op/reduce_sum.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::LogSoftmaxDecomposition::LogSoftmaxDecomposition() { MATCHER_SCOPE(LogSoftmaxDecomposition); // Decomposes LogSoftmax(x, axis) op into sub-graph x - log(reduce_sum(exp(x), axis)) - auto log_softmax = ngraph::pattern::wrap_type(); + auto log_softmax = ov::pass::pattern::wrap_type(); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto log_softmax_node = std::dynamic_pointer_cast(pattern_to_output.at(log_softmax).get_node_shared_ptr()); @@ -31,10 +31,8 @@ ov::pass::LogSoftmaxDecomposition::LogSoftmaxDecomposition() { return false; } - auto axis1 = - ov::op::v0::Constant::create(element::Type_t::i64, ngraph::Shape{1}, {log_softmax_node->get_axis()}); - auto axis2 = - ov::op::v0::Constant::create(element::Type_t::i64, ngraph::Shape{1}, {log_softmax_node->get_axis()}); + auto axis1 = ov::op::v0::Constant::create(element::Type_t::i64, ov::Shape{1}, {log_softmax_node->get_axis()}); + auto axis2 = ov::op::v0::Constant::create(element::Type_t::i64, ov::Shape{1}, {log_softmax_node->get_axis()}); auto max = std::make_shared(log_softmax_node->input_value(0), axis1, true); auto sub = std::make_shared(log_softmax_node->input_value(0), max); auto exp = std::make_shared(sub); @@ -43,11 +41,11 @@ ov::pass::LogSoftmaxDecomposition::LogSoftmaxDecomposition() { auto sub_end = std::make_shared(sub, log); sub_end->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info(log_softmax_node, {axis1, axis2, max, sub, exp, sum, log, sub_end}); - ngraph::replace_node(m.get_match_root(), sub_end); + ov::copy_runtime_info(log_softmax_node, {axis1, axis2, max, sub, exp, sum, log, sub_end}); + ov::replace_node(m.get_match_root(), sub_end); return true; }; - auto m = std::make_shared(log_softmax, matcher_name); + auto m = std::make_shared(log_softmax, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/lstm_cell_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/lstm_cell_decomposition.cpp index c6d2e8731b3..2be430626c8 100644 --- a/src/common/transformations/src/transformations/op_conversions/lstm_cell_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/lstm_cell_decomposition.cpp @@ -5,12 +5,10 @@ #include "transformations/op_conversions/lstm_cell_decomposition.hpp" #include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/clamp.hpp" #include "openvino/op/constant.hpp" @@ -18,12 +16,14 @@ #include "openvino/op/matmul.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/split.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" ov::pass::LSTMCellDecomposition::LSTMCellDecomposition() { MATCHER_SCOPE(LSTMCellDecomposition); auto any_lstm = pattern::wrap_type(); - matcher_pass_callback callback = [this](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [this](ov::pass::pattern::Matcher& m) { auto lstm_cell = std::dynamic_pointer_cast(m.get_match_root()); if (!lstm_cell || transformation_callback(lstm_cell)) { return false; @@ -60,7 +60,7 @@ ov::pass::LSTMCellDecomposition::LSTMCellDecomposition() { i = clamp_i; c = clamp_c; o = clamp_o; - ngraph::copy_runtime_info(lstm_cell, {clamp_f, clamp_i, clamp_c, clamp_o}); + ov::copy_runtime_info(lstm_cell, {clamp_f, clamp_i, clamp_c, clamp_o}); } // ft = f(Xt*(Wf^T) + Ht-1*(Rf^T) + Wbf + Rbf) @@ -83,13 +83,13 @@ ov::pass::LSTMCellDecomposition::LSTMCellDecomposition() { out_H->set_friendly_name(lstm_cell->get_friendly_name() + ".0"); out_C->set_friendly_name(lstm_cell->get_friendly_name() + ".1"); - ngraph::copy_runtime_info( + ov::copy_runtime_info( lstm_cell, {Xt_W, Ht_R, add, split, mul1, mul2, out_H, hC, out_C, axis_node, XHB, f_t, i_t, c_t, o_t}); - ngraph::replace_node(lstm_cell, {out_H->output(0), out_C->output(0)}); + ov::replace_node(lstm_cell, {out_H->output(0), out_C->output(0)}); return true; }; - auto m = std::make_shared(any_lstm, matcher_name); + auto m = std::make_shared(any_lstm, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/mvn6_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/mvn6_decomposition.cpp index f45c919099e..a779d5de298 100644 --- a/src/common/transformations/src/transformations/op_conversions/mvn6_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/mvn6_decomposition.cpp @@ -5,10 +5,9 @@ #include "transformations/op_conversions/mvn6_decomposition.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" @@ -17,15 +16,16 @@ #include "openvino/op/reduce_mean.hpp" #include "openvino/op/sqrt.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::MVN6Decomposition::MVN6Decomposition() { MATCHER_SCOPE(MVN6Decomposition); // Decomposes MVN(x, axes) op if normalize_variance is false into sub-graph // x - ReduceMean(x, axes), if normalize_variance is true into sub-graph // (x - ReduceMean(x, axes)) / Sqrt(ReduceMean((x - ReduceMean(x, axes)) ^ 2)) - auto mvn = ngraph::pattern::wrap_type(); + auto mvn = ov::pass::pattern::wrap_type(); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto mvn_node = std::dynamic_pointer_cast(pattern_to_output.at(mvn).get_node_shared_ptr()); @@ -42,17 +42,17 @@ ov::pass::MVN6Decomposition::MVN6Decomposition() { if (!mvn_node->get_normalize_variance()) { mean_normalization->set_friendly_name(mvn_node->get_friendly_name()); - ngraph::copy_runtime_info(mvn_node, {mean, mean_normalization}); - ngraph::replace_node(mvn_node, mean_normalization); + ov::copy_runtime_info(mvn_node, {mean, mean_normalization}); + ov::replace_node(mvn_node, mean_normalization); } else { // (x - ReduceMean(x, axes)) ^ 2 - auto sqr_const = ov::op::v0::Constant::create(data.get_element_type(), ngraph::Shape{1}, {2}); + auto sqr_const = ov::op::v0::Constant::create(data.get_element_type(), ov::Shape{1}, {2}); auto sqr = std::make_shared(mean_normalization, sqr_const); // ReduceMean((x - ReduceMean(x, axes)) ^ 2) auto mean2 = std::make_shared(sqr, axes, true); auto eps = mvn_node->get_eps(); - auto eps_node = ov::op::v0::Constant::create(data.get_element_type(), ngraph::Shape{1}, {eps}); + auto eps_node = ov::op::v0::Constant::create(data.get_element_type(), ov::Shape{1}, {eps}); auto eps_mode = mvn_node->get_eps_mode(); std::shared_ptr eps_add; @@ -76,12 +76,12 @@ ov::pass::MVN6Decomposition::MVN6Decomposition() { } div->set_friendly_name(mvn_node->get_friendly_name()); - ngraph::copy_runtime_info(mvn_node, {mean, mean_normalization, sqr, mean2, eps_node, eps_add, sqrt, div}); - ngraph::replace_node(mvn_node, div); + ov::copy_runtime_info(mvn_node, {mean, mean_normalization, sqr, mean2, eps_node, eps_add, sqrt, div}); + ov::replace_node(mvn_node, div); } return true; }; - auto m = std::make_shared(mvn, matcher_name); + auto m = std::make_shared(mvn, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/normalize_l2_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/normalize_l2_decomposition.cpp index f6f89a35985..e31d8460a01 100644 --- a/src/common/transformations/src/transformations/op_conversions/normalize_l2_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/normalize_l2_decomposition.cpp @@ -5,10 +5,9 @@ #include "transformations/op_conversions/normalize_l2_decomposition.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" @@ -17,12 +16,13 @@ #include "openvino/op/power.hpp" #include "openvino/op/reduce_sum.hpp" #include "openvino/op/sqrt.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::NormalizeL2Decomposition::NormalizeL2Decomposition() { MATCHER_SCOPE(NormalizeL2Decomposition); - auto normalize_l2_pattern = ngraph::pattern::wrap_type(); + auto normalize_l2_pattern = ov::pass::pattern::wrap_type(); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto normalize_l2 = std::dynamic_pointer_cast(m.get_match_root()); if (!normalize_l2 || transformation_callback(normalize_l2)) { @@ -52,11 +52,11 @@ ov::pass::NormalizeL2Decomposition::NormalizeL2Decomposition() { auto div = std::make_shared(normalize_l2->input_value(0), sqrt); div->set_friendly_name(normalize_l2->get_friendly_name()); - ngraph::copy_runtime_info(normalize_l2, {power, reduce_sum, eps_node, sqrt, div}); - ngraph::replace_node(normalize_l2, div); + ov::copy_runtime_info(normalize_l2, {power, reduce_sum, eps_node, sqrt, div}); + ov::replace_node(normalize_l2, div); return true; }; - auto m = std::make_shared(normalize_l2_pattern, matcher_name); + auto m = std::make_shared(normalize_l2_pattern, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/reduce_l1_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/reduce_l1_decomposition.cpp index 099ff2ec2d5..8e6583f91a7 100644 --- a/src/common/transformations/src/transformations/op_conversions/reduce_l1_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/reduce_l1_decomposition.cpp @@ -5,20 +5,20 @@ #include "transformations/op_conversions/reduce_l1_decomposition.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/abs.hpp" #include "openvino/op/reduce_l1.hpp" #include "openvino/op/reduce_sum.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ReduceL1Decomposition::ReduceL1Decomposition() { MATCHER_SCOPE(ReduceL1Decomposition); // decomposes ReduceL1 operations into ReduceSum(abs(x)) - auto reduce_l1 = ngraph::pattern::wrap_type(); + auto reduce_l1 = ov::pass::pattern::wrap_type(); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto reduce_l1_node = std::dynamic_pointer_cast(pattern_to_output.at(reduce_l1).get_node_shared_ptr()); @@ -33,11 +33,11 @@ ov::pass::ReduceL1Decomposition::ReduceL1Decomposition() { reduce_l1_node->get_keep_dims()); reduce_sum->set_friendly_name(m.get_match_root()->get_friendly_name()); - ngraph::copy_runtime_info(reduce_l1_node, {abs, reduce_sum}); - ngraph::replace_node(m.get_match_root(), reduce_sum); + ov::copy_runtime_info(reduce_l1_node, {abs, reduce_sum}); + ov::replace_node(m.get_match_root(), reduce_sum); return true; }; - auto m = std::make_shared(reduce_l1, matcher_name); + auto m = std::make_shared(reduce_l1, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/reduce_l2_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/reduce_l2_decomposition.cpp index aeb83e071d3..2cace74a49b 100644 --- a/src/common/transformations/src/transformations/op_conversions/reduce_l2_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/reduce_l2_decomposition.cpp @@ -5,23 +5,23 @@ #include "transformations/op_conversions/reduce_l2_decomposition.hpp" #include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/power.hpp" #include "openvino/op/reduce_l2.hpp" #include "openvino/op/reduce_sum.hpp" #include "openvino/op/sqrt.hpp" #include "openvino/op/util/op_types.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ReduceL2Decomposition::ReduceL2Decomposition() { MATCHER_SCOPE(ReduceL2Decomposition); // decomposes ReduceL2 operations into sqrt(ReduceSum(x * x)) - auto reduce_l2 = ngraph::pattern::wrap_type(); + auto reduce_l2 = ov::pass::pattern::wrap_type(); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto reduce_l2_node = std::dynamic_pointer_cast(pattern_to_output.at(reduce_l2).get_node_shared_ptr()); @@ -41,11 +41,11 @@ ov::pass::ReduceL2Decomposition::ReduceL2Decomposition() { const auto reduce_l2_input_1 = reduce_l2_node->input_value(1).get_node(); if (ov::op::util::is_constant(reduce_l2_input_1)) rt_info_from_nodes.emplace_back(reduce_l2_input_1->shared_from_this()); - ngraph::copy_runtime_info(rt_info_from_nodes, {sqrt, reduce_sum, square, const_2}); - ngraph::replace_node(m.get_match_root(), sqrt); + ov::copy_runtime_info(rt_info_from_nodes, {sqrt, reduce_sum, square, const_2}); + ov::replace_node(m.get_match_root(), sqrt); return true; }; - auto m = std::make_shared(reduce_l2, matcher_name); + auto m = std::make_shared(reduce_l2, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/rnn_cell_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/rnn_cell_decomposition.cpp index 45fac6e0ea2..7290aab1d2a 100644 --- a/src/common/transformations/src/transformations/op_conversions/rnn_cell_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/rnn_cell_decomposition.cpp @@ -5,21 +5,20 @@ #include "transformations/op_conversions/rnn_cell_decomposition.hpp" #include -#include -#include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/clamp.hpp" #include "openvino/op/matmul.hpp" #include "openvino/op/rnn_cell.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" +#include "transformations/utils/utils.hpp" ov::pass::RNNCellDecomposition::RNNCellDecomposition() { MATCHER_SCOPE(RNNCellDecomposition); - auto rnn_cell = ngraph::pattern::wrap_type(); - matcher_pass_callback callback = [this](ngraph::pattern::Matcher& m) { + auto rnn_cell = ov::pass::pattern::wrap_type(); + matcher_pass_callback callback = [this](ov::pass::pattern::Matcher& m) { auto rnn_cell = std::dynamic_pointer_cast(m.get_match_root()); if (!rnn_cell || transformation_callback(rnn_cell)) { return false; @@ -43,15 +42,15 @@ ov::pass::RNNCellDecomposition::RNNCellDecomposition() { std::shared_ptr clamp = i_t; if (clip > 0.f) { clamp = std::make_shared(i_t, -clip, clip); - ngraph::copy_runtime_info(rnn_cell, clamp); + ov::copy_runtime_info(rnn_cell, clamp); } auto out = ov::op::util::activation(rnn_cell->get_activations()[0], clamp); out->set_friendly_name(rnn_cell->get_friendly_name()); - ngraph::copy_runtime_info(rnn_cell, {Xt_W, Ht_R, add, i_t, out}); - ngraph::replace_node(rnn_cell, out); + ov::copy_runtime_info(rnn_cell, {Xt_W, Ht_R, add, i_t, out}); + ov::replace_node(rnn_cell, out); return true; }; - auto m = std::make_shared(rnn_cell, matcher_name); + auto m = std::make_shared(rnn_cell, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.cpp b/src/common/transformations/src/transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.cpp index 4544a372d41..a458be4ecd3 100644 --- a/src/common/transformations/src/transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.cpp +++ b/src/common/transformations/src/transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.cpp @@ -4,10 +4,8 @@ #include "transformations/op_conversions/simplify_ctc_greedy_decoder_seq_len.hpp" -#include -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/broadcast.hpp" #include "openvino/op/concat.hpp" @@ -24,12 +22,13 @@ #include "openvino/op/shape_of.hpp" #include "openvino/op/squeeze.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::SimplifyCTCGreedyDecoderSeqLen::SimplifyCTCGreedyDecoderSeqLen() { MATCHER_SCOPE(SimplifyCTCGreedyDecoderSeqLen); auto decoder = pattern::wrap_type(); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto decoder_seq_len = std::dynamic_pointer_cast(m.get_match_root()); if (!decoder_seq_len) { return false; @@ -125,37 +124,37 @@ ov::pass::SimplifyCTCGreedyDecoderSeqLen::SimplifyCTCGreedyDecoderSeqLen() { auto output_seq_len = std::make_shared(output_seq_mask, seq_mask_axis); // Receive the second output with correct seq_len_type auto output_seq_len_i = std::make_shared(output_seq_len->output(0), sl_type); - ngraph::copy_runtime_info(decoder_seq_len, - {transpose, - decoder, - data_shape, - T, - N, - plusT, - plusT_scalar, - range1T, - mask_shape, - upper_bounds, - squeeze2_output_f, - squeeze1_output_f, - transpose_upper_bounds, - bool_seq_mask, - seq_mask, - transpose_seq_mask, - transpose_seq_mask_f, - output_i, - where_equal_minus1, - output_seq_mask, - output_seq_len, - output_seq_len_i}); + ov::copy_runtime_info(decoder_seq_len, + {transpose, + decoder, + data_shape, + T, + N, + plusT, + plusT_scalar, + range1T, + mask_shape, + upper_bounds, + squeeze2_output_f, + squeeze1_output_f, + transpose_upper_bounds, + bool_seq_mask, + seq_mask, + transpose_seq_mask, + transpose_seq_mask_f, + output_i, + where_equal_minus1, + output_seq_mask, + output_seq_len, + output_seq_len_i}); output_i->set_friendly_name(decoder_seq_len->get_friendly_name() + ".0"); output_seq_len_i->set_friendly_name(decoder_seq_len->get_friendly_name() + ".1"); - ngraph::replace_node(decoder_seq_len, {output_i->output(0), output_seq_len_i->output(0)}); + ov::replace_node(decoder_seq_len, {output_i->output(0), output_seq_len_i->output(0)}); return true; }; - auto m = std::make_shared(decoder, matcher_name); + auto m = std::make_shared(decoder, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/softmax_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/softmax_decomposition.cpp index 309a62ff673..a686fd0921c 100644 --- a/src/common/transformations/src/transformations/op_conversions/softmax_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/softmax_decomposition.cpp @@ -2,14 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/softmax_decomposition.hpp" + #include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" #include "openvino/op/exp.hpp" @@ -17,11 +16,13 @@ #include "openvino/op/reduce_sum.hpp" #include "openvino/op/softmax.hpp" #include "openvino/op/subtract.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::SoftmaxDecomposition::SoftmaxDecomposition() { MATCHER_SCOPE(SoftmaxDecomposition); auto softmax = pattern::wrap_type(); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto m_softmax = m.get_match_root(); Output input; int64_t softmax_axis; @@ -40,7 +41,7 @@ ov::pass::SoftmaxDecomposition::SoftmaxDecomposition() { return false; } - auto axis = ov::op::v0::Constant::create(ngraph::element::i64, ngraph::Shape{1}, {softmax_axis}); + auto axis = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{1}, {softmax_axis}); auto reduce_max = std::make_shared(input, axis, true); auto sub = std::make_shared(input, reduce_max); auto exp = std::make_shared(sub); @@ -53,6 +54,6 @@ ov::pass::SoftmaxDecomposition::SoftmaxDecomposition() { return true; }; - auto m = std::make_shared(softmax, matcher_name); + auto m = std::make_shared(softmax, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/softplus_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/softplus_decomposition.cpp index a324bf236ef..ba3a9cfc4a9 100644 --- a/src/common/transformations/src/transformations/op_conversions/softplus_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/softplus_decomposition.cpp @@ -5,16 +5,16 @@ #include "transformations/op_conversions/softplus_decomposition.hpp" #include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/exp.hpp" #include "openvino/op/log.hpp" #include "openvino/op/softplus.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::SoftPlusDecomposition::SoftPlusDecomposition() { MATCHER_SCOPE(SoftPlusDecomposition); @@ -22,7 +22,7 @@ ov::pass::SoftPlusDecomposition::SoftPlusDecomposition() { auto input = pattern::any_input(); auto softplus = std::make_shared(input); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto& pattern_to_output = m.get_pattern_value_map(); auto softplus_input = pattern_to_output.at(input); auto softplus_node = pattern_to_output.at(softplus).get_node_shared_ptr(); @@ -34,15 +34,15 @@ ov::pass::SoftPlusDecomposition::SoftPlusDecomposition() { auto exp = std::make_shared(softplus_input); auto add = std::make_shared( exp, - ov::op::v0::Constant::create(softplus_input.get_element_type(), ngraph::Shape{1}, {1.0})); + ov::op::v0::Constant::create(softplus_input.get_element_type(), ov::Shape{1}, {1.0})); auto log = std::make_shared(add); log->set_friendly_name(softplus_node->get_friendly_name()); - ngraph::copy_runtime_info(softplus_node, {exp, add, log}); - ngraph::replace_node(softplus_node, log); + ov::copy_runtime_info(softplus_node, {exp, add, log}); + ov::replace_node(softplus_node, log); return true; }; - auto m = std::make_shared(softplus, matcher_name); + auto m = std::make_shared(softplus, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/op_conversions/softsign_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/softsign_decomposition.cpp index 53fbb69a712..9a7c88b8ff6 100644 --- a/src/common/transformations/src/transformations/op_conversions/softsign_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/softsign_decomposition.cpp @@ -2,22 +2,23 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/op_conversions/softsign_decomposition.hpp" + #include -#include -#include -#include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/abs.hpp" #include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" #include "openvino/op/softsign.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::SoftSignDecomposition::SoftSignDecomposition() { MATCHER_SCOPE(SoftSignDecomposition); auto softsign = pattern::wrap_type(); - matcher_pass_callback callback = [=](ngraph::pattern::Matcher& m) { + matcher_pass_callback callback = [=](ov::pass::pattern::Matcher& m) { auto m_softsign = m.get_match_root(); if (transformation_callback(m_softsign)) { @@ -27,7 +28,7 @@ ov::pass::SoftSignDecomposition::SoftSignDecomposition() { const auto input = m_softsign->input_value(0); const auto& data_type = m_softsign->get_input_element_type(0); auto abs = std::make_shared(input); - auto constant = ov::op::v0::Constant::create(data_type, ngraph::Shape{1}, {1}); + auto constant = ov::op::v0::Constant::create(data_type, ov::Shape{1}, {1}); auto add = std::make_shared(abs, constant); auto div = std::make_shared(input, add); @@ -37,6 +38,6 @@ ov::pass::SoftSignDecomposition::SoftSignDecomposition() { return true; }; - auto m = std::make_shared(softsign, matcher_name); + auto m = std::make_shared(softsign, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/opset_conversions/convert_opset2_to_opset1.cpp b/src/common/transformations/src/transformations/opset_conversions/convert_opset2_to_opset1.cpp index f2eb1c04334..2c487861d06 100644 --- a/src/common/transformations/src/transformations/opset_conversions/convert_opset2_to_opset1.cpp +++ b/src/common/transformations/src/transformations/opset_conversions/convert_opset2_to_opset1.cpp @@ -5,16 +5,16 @@ #include "transformations/opset_conversions/convert_opset2_to_opset1.hpp" #include -#include #include #include "itt.hpp" +#include "openvino/pass/manager.hpp" #include "transformations/op_conversions/convert_batch_to_space.hpp" #include "transformations/op_conversions/convert_space_to_batch.hpp" -bool ov::pass::ConvertOpSet2ToOpSet1::run_on_model(const std::shared_ptr& f) { +bool ov::pass::ConvertOpSet2ToOpSet1::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(ConvertOpSet2ToOpSet1); - ngraph::pass::Manager manager(get_pass_config()); + ov::pass::Manager manager(get_pass_config()); manager.set_per_pass_validation(false); manager.register_pass(); diff --git a/src/common/transformations/src/transformations/opset_conversions/convert_opset3_to_opset2.cpp b/src/common/transformations/src/transformations/opset_conversions/convert_opset3_to_opset2.cpp index bb855532cf0..848db4b60df 100644 --- a/src/common/transformations/src/transformations/opset_conversions/convert_opset3_to_opset2.cpp +++ b/src/common/transformations/src/transformations/opset_conversions/convert_opset3_to_opset2.cpp @@ -5,19 +5,19 @@ #include "transformations/opset_conversions/convert_opset3_to_opset2.hpp" #include -#include #include #include "itt.hpp" +#include "openvino/pass/manager.hpp" #include "transformations/op_conversions/convert_broadcast3.hpp" #include "transformations/op_conversions/convert_shapeof3.hpp" #include "transformations/op_conversions/convert_shuffle_channels3.hpp" #include "transformations/op_conversions/convert_topk3.hpp" #include "transformations/op_conversions/softplus_decomposition.hpp" -bool ov::pass::ConvertOpSet3ToOpSet2::run_on_model(const std::shared_ptr& f) { +bool ov::pass::ConvertOpSet3ToOpSet2::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(ConvertOpSet3ToOpSet2); - ngraph::pass::Manager manager(get_pass_config()); + ov::pass::Manager manager(get_pass_config()); manager.set_per_pass_validation(false); manager.register_pass(); diff --git a/src/common/transformations/src/transformations/rt_info/fused_names_attribute.cpp b/src/common/transformations/src/transformations/rt_info/fused_names_attribute.cpp index a05b029e222..018addae9e0 100644 --- a/src/common/transformations/src/transformations/rt_info/fused_names_attribute.cpp +++ b/src/common/transformations/src/transformations/rt_info/fused_names_attribute.cpp @@ -4,15 +4,13 @@ #include "transformations/rt_info/fused_names_attribute.hpp" -#include - #include #include #include -#include #include -using namespace ngraph; +#include "openvino/core/node.hpp" + using namespace ov; std::string FusedNames::getNames() const { @@ -33,7 +31,7 @@ void FusedNames::fuseWith(const FusedNames& names) { } } -std::string ov::getFusedNames(const std::shared_ptr& node) { +std::string ov::getFusedNames(const std::shared_ptr& node) { if (node) { const auto& rtInfo = node->get_rt_info(); auto it_info = rtInfo.find(FusedNames::get_type_info_static()); @@ -46,7 +44,7 @@ std::string ov::getFusedNames(const std::shared_ptr& node) { return {}; } -std::vector ov::getFusedNamesVector(const std::shared_ptr& node) { +std::vector ov::getFusedNamesVector(const std::shared_ptr& node) { if (node) { const auto& rtInfo = node->get_rt_info(); auto it_info = rtInfo.find(FusedNames::get_type_info_static()); @@ -59,7 +57,7 @@ std::vector ov::getFusedNamesVector(const std::shared_ptrget_rt_info(); @@ -71,7 +69,7 @@ Any FusedNames::merge(const ngraph::NodeVector& nodes) const { return mergedNames; } -Any FusedNames::init(const std::shared_ptr& node) const { +Any FusedNames::init(const std::shared_ptr& node) const { return FusedNames{node->get_friendly_name()}; } diff --git a/src/common/transformations/src/transformations/rt_info/preprocessing_attribute.cpp b/src/common/transformations/src/transformations/rt_info/preprocessing_attribute.cpp index 1142d39df35..b7cfa8e0385 100644 --- a/src/common/transformations/src/transformations/rt_info/preprocessing_attribute.cpp +++ b/src/common/transformations/src/transformations/rt_info/preprocessing_attribute.cpp @@ -4,12 +4,12 @@ #include "transformations/rt_info/preprocessing_attribute.hpp" -#include "ngraph/node.hpp" +#include "openvino/core/node.hpp" -bool ov::is_preprocesing_node(const std::shared_ptr& node) { +bool ov::is_preprocesing_node(const std::shared_ptr& node) { return node->get_rt_info().count(PreprocessingAttribute::get_type_info_static()); } -void ov::set_is_preprocessing_node(std::shared_ptr node) { +void ov::set_is_preprocessing_node(std::shared_ptr node) { node->get_rt_info().emplace(PreprocessingAttribute::get_type_info_static(), PreprocessingAttribute{}); } diff --git a/src/common/transformations/src/transformations/rt_info/primitives_priority_attribute.cpp b/src/common/transformations/src/transformations/rt_info/primitives_priority_attribute.cpp index 24c03f62570..0f9ebd43ac2 100644 --- a/src/common/transformations/src/transformations/rt_info/primitives_priority_attribute.cpp +++ b/src/common/transformations/src/transformations/rt_info/primitives_priority_attribute.cpp @@ -9,14 +9,14 @@ #include #include #include -#include -#include #include -using namespace ov; -using namespace ngraph; +#include "openvino/core/node.hpp" +#include "openvino/opsets/opset1.hpp" -std::string ov::getPrimitivesPriority(const std::shared_ptr& node) { +using namespace ov; + +std::string ov::getPrimitivesPriority(const std::shared_ptr& node) { if (node) { const auto& rtInfo = node->get_rt_info(); auto it_info = rtInfo.find(PrimitivesPriority::get_type_info_static()); @@ -29,13 +29,13 @@ std::string ov::getPrimitivesPriority(const std::shared_ptr& node) return {}; } -Any PrimitivesPriority::merge(const ngraph::NodeVector& nodes) const { +Any PrimitivesPriority::merge(const ov::NodeVector& nodes) const { auto canBeMerged = [](const std::shared_ptr& node) -> bool { - if (std::dynamic_pointer_cast(node) || - std::dynamic_pointer_cast(node) || - std::dynamic_pointer_cast(node) || - std::dynamic_pointer_cast(node) || - std::dynamic_pointer_cast(node)) { + if (std::dynamic_pointer_cast(node) || + std::dynamic_pointer_cast(node) || + std::dynamic_pointer_cast(node) || + std::dynamic_pointer_cast(node) || + std::dynamic_pointer_cast(node)) { return true; } return false; diff --git a/src/common/transformations/src/transformations/smart_reshape/broadcast_const_range_replacement.cpp b/src/common/transformations/src/transformations/smart_reshape/broadcast_const_range_replacement.cpp index 44c1414248b..fdbd53e3c4c 100644 --- a/src/common/transformations/src/transformations/smart_reshape/broadcast_const_range_replacement.cpp +++ b/src/common/transformations/src/transformations/smart_reshape/broadcast_const_range_replacement.cpp @@ -2,14 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/smart_reshape/broadcast_const_range_replacement.hpp" + #include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/broadcast.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" @@ -18,6 +18,7 @@ #include "openvino/op/range.hpp" #include "openvino/op/select.hpp" #include "openvino/op/unsqueeze.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" ov::pass::BroadcastConstRangeReplacement::BroadcastConstRangeReplacement() { @@ -31,7 +32,7 @@ ov::pass::BroadcastConstRangeReplacement::BroadcastConstRangeReplacement() { // The transformation was requested only for models with BroadcastType::BIDIRECTIONAL // Further analysis is needed for other broadcast modes enablement const auto broadcast_ptr = std::dynamic_pointer_cast(broadcast); - if (!broadcast_ptr || broadcast_ptr->get_broadcast_spec().m_type != ngraph::op::BroadcastType::BIDIRECTIONAL) + if (!broadcast_ptr || broadcast_ptr->get_broadcast_spec().m_type != ov::op::BroadcastType::BIDIRECTIONAL) return false; const auto data_const_out = broadcast->get_input_source_output(0); @@ -69,9 +70,9 @@ ov::pass::BroadcastConstRangeReplacement::BroadcastConstRangeReplacement() { NodeRegistry node_registry; - const auto axis_node = node_registry.add(ov::op::v0::Constant::create(ngraph::element::i32, {}, {0})); + const auto axis_node = node_registry.add(ov::op::v0::Constant::create(ov::element::i32, {}, {0})); const auto target_dim_index_node = - node_registry.add(ov::op::v0::Constant::create(ngraph::element::i64, {}, {target_dim_neg_index})); + node_registry.add(ov::op::v0::Constant::create(ov::element::i64, {}, {target_dim_neg_index})); const auto gather_dim = node_registry.make(target_shape_out, target_dim_index_node, axis_node); @@ -96,7 +97,7 @@ ov::pass::BroadcastConstRangeReplacement::BroadcastConstRangeReplacement() { std::iota(final_shape_axes.begin(), final_shape_axes.end(), 0); final_shape_axes.erase(final_shape_axes.begin() + target_dim_index); const auto axes_to_unsqueeze = node_registry.add( - ov::op::v0::Constant::create(ngraph::element::i64, {final_shape_axes.size()}, final_shape_axes)); + ov::op::v0::Constant::create(ov::element::i64, {final_shape_axes.size()}, final_shape_axes)); replacement = node_registry.make(replacement, axes_to_unsqueeze); } @@ -105,6 +106,6 @@ ov::pass::BroadcastConstRangeReplacement::BroadcastConstRangeReplacement() { return false; }; - auto m = std::make_shared(broadcast_pattern_node, matcher_name); + auto m = std::make_shared(broadcast_pattern_node, matcher_name); this->register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/smart_reshape/lstm_states_broadcast.cpp b/src/common/transformations/src/transformations/smart_reshape/lstm_states_broadcast.cpp index 4fcfb6d8a72..d539f52beb7 100644 --- a/src/common/transformations/src/transformations/smart_reshape/lstm_states_broadcast.cpp +++ b/src/common/transformations/src/transformations/smart_reshape/lstm_states_broadcast.cpp @@ -115,11 +115,11 @@ bool broadcast_state_by_batch(ov::Input input, const shared_ptr( constant_copy, make_shared( - ngraph::NodeVector{batch_delivering_node, - ov::op::util::make_try_fold( - ov::op::util::make_try_fold(constant_copy), - ov::op::v0::Constant::create(ov::element::i64, ov::Shape{1}, {1}), - ov::op::v0::Constant::create(ov::element::i64, ov::Shape{}, {0}))}, + ov::NodeVector{batch_delivering_node, + ov::op::util::make_try_fold( + ov::op::util::make_try_fold(constant_copy), + ov::op::v0::Constant::create(ov::element::i64, ov::Shape{1}, {1}), + ov::op::v0::Constant::create(ov::element::i64, ov::Shape{}, {0}))}, 0)); input.replace_source_output(broadcast_by_batch->output(0)); return true; diff --git a/src/common/transformations/src/transformations/smart_reshape/matmul_sr.cpp b/src/common/transformations/src/transformations/smart_reshape/matmul_sr.cpp index 487b42a6e67..f3763eb47fe 100644 --- a/src/common/transformations/src/transformations/smart_reshape/matmul_sr.cpp +++ b/src/common/transformations/src/transformations/smart_reshape/matmul_sr.cpp @@ -5,13 +5,11 @@ #include "transformations/smart_reshape/matmul_sr.hpp" #include -#include -#include -#include -#include #include #include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/gather.hpp" @@ -19,14 +17,16 @@ #include "openvino/op/reshape.hpp" #include "openvino/op/shape_of.hpp" #include "openvino/op/transpose.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" namespace { -bool relax_hc_reshape_followed_by_matmul(const ngraph::pattern::PatternValueMap& pattern_to_output, - const std::shared_ptr& matmul_label, - const std::shared_ptr& reshape_label, - const std::shared_ptr& other_input_label, - const std::shared_ptr& reshape_pattern_label, +bool relax_hc_reshape_followed_by_matmul(const ov::pass::pattern::PatternValueMap& pattern_to_output, + const std::shared_ptr& matmul_label, + const std::shared_ptr& reshape_label, + const std::shared_ptr& other_input_label, + const std::shared_ptr& reshape_pattern_label, bool reshape_is_A_input) { const auto& reshape_rank = pattern_to_output.at(reshape_label).get_partial_shape().rank(); const auto& matmul = @@ -34,24 +34,24 @@ bool relax_hc_reshape_followed_by_matmul(const ngraph::pattern::PatternValueMap& if (!matmul || reshape_rank.is_dynamic() || reshape_rank.get_length() != 2) return false; const auto& shape_source = pattern_to_output.at(other_input_label); - if (ngraph::is_type(shape_source.get_node_shared_ptr()) || - ngraph::is_type(shape_source.get_node_shared_ptr())) + if (ov::is_type(shape_source.get_node_shared_ptr()) || + ov::is_type(shape_source.get_node_shared_ptr())) // avoiding loop creation return false; const auto& raw_idx = reshape_is_A_input ? (matmul->get_transpose_b() ? -1 : -2) : (matmul->get_transpose_a() ? -2 : -1); OPENVINO_SUPPRESS_DEPRECATED_START - const auto& idx = ngraph::normalize_axes(matmul->description(), {raw_idx}, reshape_rank); + const auto& idx = ov::normalize_axes(matmul->description(), {raw_idx}, reshape_rank); OPENVINO_SUPPRESS_DEPRECATED_END const auto& C = std::make_shared(std::make_shared(shape_source), - ov::op::v0::Constant::create(ngraph::element::i64, {idx.size()}, idx), - ov::op::v0::Constant::create(ngraph::element::i64, {}, {0})); - const auto& N = ov::op::v0::Constant::create(ngraph::element::i64, {1}, {-1}); + ov::op::v0::Constant::create(ov::element::i64, {idx.size()}, idx), + ov::op::v0::Constant::create(ov::element::i64, {}, {0})); + const auto& N = ov::op::v0::Constant::create(ov::element::i64, {1}, {-1}); const auto& pattern_vector = - reshape_is_A_input ? (matmul->get_transpose_a() ? ngraph::OutputVector({C, N}) : ngraph::OutputVector({N, C})) - : (matmul->get_transpose_b() ? ngraph::OutputVector({N, C}) : ngraph::OutputVector({C, N})); + reshape_is_A_input ? (matmul->get_transpose_a() ? ov::OutputVector({C, N}) : ov::OutputVector({N, C})) + : (matmul->get_transpose_b() ? ov::OutputVector({N, C}) : ov::OutputVector({C, N})); const auto& new_reshape_pattern = std::make_shared(pattern_vector, 0); auto reshape_pattern = pattern_to_output.at(reshape_pattern_label).get_node_shared_ptr(); @@ -68,8 +68,9 @@ ov::pass::ReshapeAMatMul::ReshapeAMatMul() { auto other_input_label = pattern::any_input(); auto reshape_input_label = pattern::any_input(); auto reshape_pattern_label = pattern::any_input(); - auto reshape_label = ngraph::pattern::wrap_type({reshape_input_label, reshape_pattern_label}); - auto matmul_label = ngraph::pattern::wrap_type({reshape_label, other_input_label}); + auto reshape_label = + ov::pass::pattern::wrap_type({reshape_input_label, reshape_pattern_label}); + auto matmul_label = ov::pass::pattern::wrap_type({reshape_label, other_input_label}); matcher_pass_callback callback = [=](pattern::Matcher& m) -> bool { const auto& pattern_to_output = m.get_pattern_value_map(); @@ -80,7 +81,7 @@ ov::pass::ReshapeAMatMul::ReshapeAMatMul() { reshape_pattern_label, true); }; - auto m = std::make_shared(matmul_label, matcher_name); + auto m = std::make_shared(matmul_label, matcher_name); register_matcher(m, callback); } @@ -89,8 +90,9 @@ ov::pass::ReshapeBMatMul::ReshapeBMatMul() { auto other_input_label = pattern::any_input(); auto reshape_input_label = pattern::any_input(); auto reshape_pattern_label = pattern::any_input(); - auto reshape_label = ngraph::pattern::wrap_type({reshape_input_label, reshape_pattern_label}); - auto matmul_label = ngraph::pattern::wrap_type({other_input_label, reshape_label}); + auto reshape_label = + ov::pass::pattern::wrap_type({reshape_input_label, reshape_pattern_label}); + auto matmul_label = ov::pass::pattern::wrap_type({other_input_label, reshape_label}); matcher_pass_callback callback = [=](pattern::Matcher& m) -> bool { const auto& pattern_to_output = m.get_pattern_value_map(); @@ -101,13 +103,13 @@ ov::pass::ReshapeBMatMul::ReshapeBMatMul() { reshape_pattern_label, false); }; - auto m = std::make_shared(matmul_label, matcher_name); + auto m = std::make_shared(matmul_label, matcher_name); register_matcher(m, callback); } ov::pass::TransposeMatMul::TransposeMatMul() { MATCHER_SCOPE(TransposeMatMul); - auto matmul_label = ngraph::pattern::wrap_type(); + auto matmul_label = ov::pass::pattern::wrap_type(); matcher_pass_callback callback = [=](pattern::Matcher& m) -> bool { const auto& pattern_to_output = m.get_pattern_value_map(); @@ -116,7 +118,7 @@ ov::pass::TransposeMatMul::TransposeMatMul() { if (!matmul) return false; - auto transpose_is_fusable = [](const std::shared_ptr& input) { + auto transpose_is_fusable = [](const std::shared_ptr& input) { const auto& input_rank = input->get_output_partial_shape(0).rank(); if (input_rank.is_static() && input_rank.get_length() >= 2) { if (auto transpose = std::dynamic_pointer_cast(input)) { @@ -161,6 +163,6 @@ ov::pass::TransposeMatMul::TransposeMatMul() { } return false; }; - auto m = std::make_shared(matmul_label, matcher_name); + auto m = std::make_shared(matmul_label, matcher_name); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/smart_reshape/mimic_set_batch_size.cpp b/src/common/transformations/src/transformations/smart_reshape/mimic_set_batch_size.cpp index 1a94a72b2f9..5174ca2a5b7 100644 --- a/src/common/transformations/src/transformations/smart_reshape/mimic_set_batch_size.cpp +++ b/src/common/transformations/src/transformations/smart_reshape/mimic_set_batch_size.cpp @@ -2,9 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include +#include "transformations/smart_reshape/mimic_set_batch_size.hpp" #include "itt.hpp" #include "openvino/op/ceiling.hpp" @@ -15,15 +13,15 @@ #include "openvino/op/multiply.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/shape_of.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" -using namespace ngraph; - -bool ov::pass::MimicSetBatchSize::run_on_model(const std::shared_ptr& f) { +bool ov::pass::MimicSetBatchSize::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(MimicSetBatchSize); // extracting ratio of out to in 0-index dimension value from the folded function auto specialized_function = f->clone(); - ngraph::pass::Manager manager; - manager.register_pass(); + ov::pass::Manager manager; + manager.register_pass(); manager.run_passes(specialized_function); std::map scale; @@ -53,8 +51,8 @@ bool ov::pass::MimicSetBatchSize::run_on_model(const std::shared_ptrget_input_element_type(1)); const auto& new_input_batch = std::make_shared( shape_of, - ov::op::v0::Constant::create(ngraph::element::i64, {1}, std::vector{0}), - ov::op::v0::Constant::create(ngraph::element::i64, {}, std::vector{0})); + ov::op::v0::Constant::create(ov::element::i64, {1}, std::vector{0}), + ov::op::v0::Constant::create(ov::element::i64, {}, std::vector{0})); const std::shared_ptr& new_output_batch = std::make_shared( std::make_shared(std::make_shared( @@ -66,8 +64,8 @@ bool ov::pass::MimicSetBatchSize::run_on_model(const std::shared_ptr( reshape->input_value(1), - ov::op::v0::Constant::create(ngraph::element::i64, {non_batch_dims.size()}, non_batch_dims), - ov::op::v0::Constant::create(ngraph::element::i64, {}, std::vector{0})); + ov::op::v0::Constant::create(ov::element::i64, {non_batch_dims.size()}, non_batch_dims), + ov::op::v0::Constant::create(ov::element::i64, {}, std::vector{0})); auto new_reshape_pattern = std::make_shared(OutputVector{new_output_batch, non_batch_dims_node}, 0); reshape->input(1).replace_source_output(new_reshape_pattern->output(0)); diff --git a/src/common/transformations/src/transformations/smart_reshape/proposal_scales_stridedslice.cpp b/src/common/transformations/src/transformations/smart_reshape/proposal_scales_stridedslice.cpp index e326347ac59..086a2cc16a0 100644 --- a/src/common/transformations/src/transformations/smart_reshape/proposal_scales_stridedslice.cpp +++ b/src/common/transformations/src/transformations/smart_reshape/proposal_scales_stridedslice.cpp @@ -2,35 +2,33 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include +#include "transformations/smart_reshape/proposal_scales_stridedslice.hpp" #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/parameter.hpp" #include "openvino/op/proposal.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/strided_slice.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/pattern/op/or.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" namespace { -bool crop_scales_for_proposal(const ngraph::pattern::PatternValueMap& pattern_to_output, - const std::shared_ptr& parameter_label, - const std::shared_ptr& proposal_label) { +bool crop_scales_for_proposal(const ov::pass::pattern::PatternValueMap& pattern_to_output, + const std::shared_ptr& parameter_label, + const std::shared_ptr& proposal_label) { const auto& parameter = pattern_to_output.at(parameter_label); const auto& proposal = pattern_to_output.at(proposal_label).get_node_shared_ptr(); auto cropped_scales = std::make_shared( proposal->input_value(2), - ov::op::v0::Constant::create(ngraph::element::i64, ngraph::Shape{1}, {0}), - ov::op::v0::Constant::create(ngraph::element::i64, - ngraph::Shape{1}, - {parameter.get_partial_shape()[1].get_length()}), - ov::op::v0::Constant::create(ngraph::element::i64, ngraph::Shape{1}, {1}), + ov::op::v0::Constant::create(ov::element::i64, ov::Shape{1}, {0}), + ov::op::v0::Constant::create(ov::element::i64, ov::Shape{1}, {parameter.get_partial_shape()[1].get_length()}), + ov::op::v0::Constant::create(ov::element::i64, ov::Shape{1}, {1}), std::vector{0}, std::vector{0}); @@ -43,51 +41,51 @@ bool crop_scales_for_proposal(const ngraph::pattern::PatternValueMap& pattern_to ov::pass::Proposal1Scales::Proposal1Scales() { // TODO: enable conditional compile // MATCHER_SCOPE(Proposal1Scales); - auto parameter_label = ngraph::pattern::wrap_type([](const Output& output) { + auto parameter_label = ov::pass::pattern::wrap_type([](const Output& output) { const auto& shape = output.get_partial_shape(); return shape.rank().is_static() && shape.rank().get_length() == 2 && shape[1].is_static() && (shape[1].get_length() == 3 || shape[1].get_length() == 4); }); - auto convert_label = ngraph::pattern::wrap_type({parameter_label}); + auto convert_label = ov::pass::pattern::wrap_type({parameter_label}); auto param_or_convert = - std::make_shared(ngraph::OutputVector{parameter_label, convert_label}); - auto reshape_label = ngraph::pattern::wrap_type( - {param_or_convert, ngraph::pattern::wrap_type()}, + std::make_shared(ov::OutputVector{parameter_label, convert_label}); + auto reshape_label = ov::pass::pattern::wrap_type( + {param_or_convert, ov::pass::pattern::wrap_type()}, [](const Output& output) { return output.get_partial_shape().rank().is_static() && output.get_partial_shape().rank().get_length() == 1; }); auto proposal_label = - ngraph::pattern::wrap_type({pattern::any_input(), pattern::any_input(), reshape_label}); + ov::pass::pattern::wrap_type({pattern::any_input(), pattern::any_input(), reshape_label}); matcher_pass_callback callback = [parameter_label, proposal_label](pattern::Matcher& m) -> bool { return crop_scales_for_proposal(m.get_pattern_value_map(), parameter_label, proposal_label); }; - auto m = std::make_shared(proposal_label /*, matcher_name */); + auto m = std::make_shared(proposal_label /*, matcher_name */); register_matcher(m, callback); } ov::pass::Proposal4Scales::Proposal4Scales() { // TODO: enable conditional compile // MATCHER_SCOPE(Proposal4Scales); - auto parameter_label = ngraph::pattern::wrap_type([](const Output& output) { + auto parameter_label = ov::pass::pattern::wrap_type([](const Output& output) { const auto& shape = output.get_partial_shape(); return shape.rank().is_static() && shape.rank().get_length() == 2 && shape[1].is_static() && (shape[1].get_length() == 3 || shape[1].get_length() == 4); }); - auto convert_label = ngraph::pattern::wrap_type({parameter_label}); + auto convert_label = ov::pass::pattern::wrap_type({parameter_label}); auto param_or_convert = - std::make_shared(ngraph::OutputVector{parameter_label, convert_label}); - auto reshape_label = ngraph::pattern::wrap_type( - {param_or_convert, ngraph::pattern::wrap_type()}, + std::make_shared(ov::OutputVector{parameter_label, convert_label}); + auto reshape_label = ov::pass::pattern::wrap_type( + {param_or_convert, ov::pass::pattern::wrap_type()}, [](const Output& output) { return output.get_partial_shape().rank().is_static() && output.get_partial_shape().rank().get_length() == 1; }); auto proposal_label = - ngraph::pattern::wrap_type({pattern::any_input(), pattern::any_input(), reshape_label}); + ov::pass::pattern::wrap_type({pattern::any_input(), pattern::any_input(), reshape_label}); matcher_pass_callback callback = [parameter_label, proposal_label](pattern::Matcher& m) -> bool { return crop_scales_for_proposal(m.get_pattern_value_map(), parameter_label, proposal_label); }; - auto m = std::make_shared(proposal_label /*, matcher_name */); + auto m = std::make_shared(proposal_label /*, matcher_name */); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/smart_reshape/reshape_to_1D.cpp b/src/common/transformations/src/transformations/smart_reshape/reshape_to_1D.cpp index a14ceb3f35c..a71dad1f49d 100644 --- a/src/common/transformations/src/transformations/smart_reshape/reshape_to_1D.cpp +++ b/src/common/transformations/src/transformations/smart_reshape/reshape_to_1D.cpp @@ -2,29 +2,28 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include +#include "transformations/smart_reshape/reshape_to_1D.hpp" #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" ov::pass::ReshapeTo1D::ReshapeTo1D() { // TODO: enable conditional compile // MATCHER_SCOPE(ReshapeTo1D); - auto reshape_label = ngraph::pattern::wrap_type( - {pattern::any_input(), ngraph::pattern::wrap_type()}, + auto reshape_label = ov::pass::pattern::wrap_type( + {pattern::any_input(), ov::pass::pattern::wrap_type()}, [](const Output& output) { return output.get_partial_shape().rank().is_static() && output.get_partial_shape().rank().get_length() == 1; }); matcher_pass_callback callback = [](pattern::Matcher& m) -> bool { - m.get_match_root()->input(1).replace_source_output( - ov::op::v0::Constant::create(ngraph::element::i64, {1}, {-1})); + m.get_match_root()->input(1).replace_source_output(ov::op::v0::Constant::create(ov::element::i64, {1}, {-1})); return true; }; - auto m = std::make_shared(reshape_label /*, matcher_name*/); + auto m = std::make_shared(reshape_label /*, matcher_name*/); register_matcher(m, callback); } diff --git a/src/common/transformations/src/transformations/smart_reshape/set_batch_size.cpp b/src/common/transformations/src/transformations/smart_reshape/set_batch_size.cpp index e1e261b0b7e..d1243ac0fcf 100644 --- a/src/common/transformations/src/transformations/smart_reshape/set_batch_size.cpp +++ b/src/common/transformations/src/transformations/smart_reshape/set_batch_size.cpp @@ -2,20 +2,22 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "transformations/smart_reshape/set_batch_size.hpp" -bool ov::pass::SetBatchSize::run_on_model(const std::shared_ptr& f) { +#include + +#include "itt.hpp" +#include "openvino/pass/constant_folding.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/smart_reshape/mimic_set_batch_size.hpp" +#include "transformations/smart_reshape/reshape_to_1D.hpp" +#include "transformations/smart_reshape/strided_slice_squeeze.hpp" + +bool ov::pass::SetBatchSize::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(SetBatchSize); - ngraph::pass::Manager manager; + ov::pass::Manager manager; // This pass must be called first in pipeline manager.register_pass(); manager.register_pass(); diff --git a/src/common/transformations/src/transformations/smart_reshape/shape_of_const_folding.cpp b/src/common/transformations/src/transformations/smart_reshape/shape_of_const_folding.cpp index 0549afc450b..17187ee57be 100644 --- a/src/common/transformations/src/transformations/smart_reshape/shape_of_const_folding.cpp +++ b/src/common/transformations/src/transformations/smart_reshape/shape_of_const_folding.cpp @@ -4,9 +4,8 @@ #include "transformations/smart_reshape/shape_of_const_folding.hpp" -#include - #include "itt.hpp" +#include "openvino/core/rt_info.hpp" #include "openvino/core/validation_util.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/shape_of.hpp" diff --git a/src/common/transformations/src/transformations/smart_reshape/smart_reshape.cpp b/src/common/transformations/src/transformations/smart_reshape/smart_reshape.cpp index eb7ed9e673f..c5825f6291f 100644 --- a/src/common/transformations/src/transformations/smart_reshape/smart_reshape.cpp +++ b/src/common/transformations/src/transformations/smart_reshape/smart_reshape.cpp @@ -2,24 +2,25 @@ // SPDX-License-Identifier: Apache-2.0 // +#include "transformations/smart_reshape/smart_reshape.hpp" + #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "itt.hpp" +#include "openvino/pass/manager.hpp" +#include "transformations/init_node_info.hpp" +#include "transformations/smart_reshape/broadcast_const_range_replacement.hpp" +#include "transformations/smart_reshape/lstm_states_broadcast.hpp" +#include "transformations/smart_reshape/matmul_sr.hpp" +#include "transformations/smart_reshape/proposal_scales_stridedslice.hpp" +#include "transformations/smart_reshape/reshape_sinking.hpp" +#include "transformations/smart_reshape/reshape_to_1D.hpp" +#include "transformations/smart_reshape/shape_of_const_folding.hpp" +#include "transformations/smart_reshape/strided_slice_squeeze.hpp" -bool ov::pass::SmartReshape::run_on_model(const std::shared_ptr& f) { +bool ov::pass::SmartReshape::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(SmartReshape); - ngraph::pass::Manager static_manager; + ov::pass::Manager static_manager; // This pass must be called first in pipeline static_manager.register_pass(); static_manager.register_pass(); @@ -35,7 +36,7 @@ bool ov::pass::SmartReshape::run_on_model(const std::shared_ptr(); static_manager.run_passes(f); - ngraph::pass::Manager dynamic_manager; + ov::pass::Manager dynamic_manager; // function revalidation will cause "fake" dynamism due to ShapeOf ops insertions // we turn it off to have access to originally static shapes dynamic_manager.set_per_pass_validation(false); diff --git a/src/common/transformations/src/transformations/smart_reshape/strided_slice_squeeze.cpp b/src/common/transformations/src/transformations/smart_reshape/strided_slice_squeeze.cpp index d6ca81f5c2f..5c5562187d4 100644 --- a/src/common/transformations/src/transformations/smart_reshape/strided_slice_squeeze.cpp +++ b/src/common/transformations/src/transformations/smart_reshape/strided_slice_squeeze.cpp @@ -2,25 +2,25 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include -#include -#include -#include -#include +#include "transformations/smart_reshape/strided_slice_squeeze.hpp" +#include "itt.hpp" +#include "openvino/core/rt_info.hpp" +#include "openvino/core/validation_util.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/squeeze.hpp" #include "openvino/op/strided_slice.hpp" #include "openvino/op/util/sub_graph_base.hpp" +#include "openvino/pass/pattern/matcher.hpp" +#include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations_visibility.hpp" ov::pass::StridedSliceSqueeze::StridedSliceSqueeze() { // TODO: enable conditional compile // MATCHER_SCOPE(StridedSliceSqueeze); - auto ss_label = ngraph::pattern::wrap_type(pattern::consumers_count(1)); - auto squeeze_label = - ngraph::pattern::wrap_type({ss_label, ngraph::pattern::wrap_type()}); + auto ss_label = ov::pass::pattern::wrap_type(pattern::consumers_count(1)); + auto squeeze_label = ov::pass::pattern::wrap_type( + {ss_label, ov::pass::pattern::wrap_type()}); matcher_pass_callback callback = [](pattern::Matcher& m) -> bool { const auto& squeeze = m.get_match_root(); @@ -112,16 +112,16 @@ ov::pass::StridedSliceSqueeze::StridedSliceSqueeze() { return replace_output_update_name(squeeze->output(0), new_slice->output(squeeze->input_value(0).get_index())); }; - auto m = std::make_shared(squeeze_label /*, matcher_name */); + auto m = std::make_shared(squeeze_label /*, matcher_name */); register_matcher(m, callback); } ov::pass::SqueezeStridedSlice::SqueezeStridedSlice() { // TODO: enable conditional compile // MATCHER_SCOPE(SqueezeStridedSlice); - auto squeeze_label = ngraph::pattern::wrap_type( - {pattern::any_input(), ngraph::pattern::wrap_type()}, + auto squeeze_label = ov::pass::pattern::wrap_type( + {pattern::any_input(), ov::pass::pattern::wrap_type()}, pattern::consumers_count(1)); - auto ss_label = ngraph::pattern::wrap_type( + auto ss_label = ov::pass::pattern::wrap_type( {squeeze_label, pattern::any_input(), pattern::any_input(), pattern::any_input()}); matcher_pass_callback callback = [](pattern::Matcher& m) -> bool { @@ -196,7 +196,7 @@ ov::pass::SqueezeStridedSlice::SqueezeStridedSlice() { copy_runtime_info(slice, new_slice); return true; }; - auto m = std::make_shared(ss_label /*, matcher_name */); + auto m = std::make_shared(ss_label /*, matcher_name */); register_matcher(m, callback); } @@ -215,8 +215,8 @@ bool squeezes_perform_the_same(std::shared_ptr lhs, std::sh const auto r_axes = std::dynamic_pointer_cast(rhs->get_input_node_shared_ptr(1)); if (l_axes && r_axes) { OPENVINO_SUPPRESS_DEPRECATED_START - return ngraph::normalize_axes(lhs->description(), l_axes->cast_vector(), rank) == - ngraph::normalize_axes(rhs->description(), r_axes->cast_vector(), rank); + return ov::normalize_axes(lhs->description(), l_axes->cast_vector(), rank) == + ov::normalize_axes(rhs->description(), r_axes->cast_vector(), rank); } OPENVINO_SUPPRESS_DEPRECATED_END return false; @@ -224,12 +224,12 @@ bool squeezes_perform_the_same(std::shared_ptr lhs, std::sh } // namespace -bool ov::pass::SharedSqueeze::run_on_model(const std::shared_ptr& f) { +bool ov::pass::SharedSqueeze::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(SharedSqueeze); bool graph_rewritten = false; - std::map, std::vector>> source_to_squeeze; + std::map, std::vector>> source_to_squeeze; for (const auto& node : f->get_ordered_ops()) { // Recursively apply transformation for sub-graph based operations if (auto sub_graph_node = std::dynamic_pointer_cast(node)) { diff --git a/src/common/transformations/src/transformations/utils/utils.cpp b/src/common/transformations/src/transformations/utils/utils.cpp index c06ff0fefd3..a62cd141b9f 100644 --- a/src/common/transformations/src/transformations/utils/utils.cpp +++ b/src/common/transformations/src/transformations/utils/utils.cpp @@ -8,14 +8,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include + +#include "openvino/core/validation_util.hpp" +#include "openvino/op/broadcast.hpp" +#include "openvino/op/constant.hpp" +#include "openvino/op/gather.hpp" +#include "openvino/op/reshape.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset3.hpp" namespace ov { namespace op { @@ -65,13 +65,12 @@ std::shared_ptr normalize_constant(const std::shared_ptr return reshapeTo(constant, const_shape); } -std::shared_ptr broadcastTo(const Output& input, const ngraph::Shape& shape) { - return std::make_shared( - input, - op::v0::Constant::create(ngraph::element::i64, Shape{shape.size()}, shape)); +std::shared_ptr broadcastTo(const Output& input, const ov::Shape& shape) { + return std::make_shared(input, + op::v0::Constant::create(ov::element::i64, Shape{shape.size()}, shape)); } -std::shared_ptr reshapeTo(const Output& input, const Shape& shape) { +std::shared_ptr reshapeTo(const Output& input, const Shape& shape) { return std::make_shared(input, op::v0::Constant::create(element::i64, Shape{shape.size()}, shape), true); @@ -86,17 +85,17 @@ bool constantIsEqualTo(const std::shared_ptr& const_node, floa return std::abs(res - value) < eps; } -bool has_f16_constants(const std::shared_ptr& function) { +bool has_f16_constants(const std::shared_ptr& function) { for (auto& layer : function->get_ops()) { if (std::dynamic_pointer_cast(layer) && - layer->output(0).get_element_type() == ngraph::element::f16) { + layer->output(0).get_element_type() == ov::element::f16) { return true; } } return false; } -bool check_for_broadcast(const ngraph::PartialShape& ref_shape, const ngraph::PartialShape& other_shape) { +bool check_for_broadcast(const ov::PartialShape& ref_shape, const ov::PartialShape& other_shape) { // Check that other_shape doesn't broadcast ref_shape if (ref_shape.rank().is_dynamic() || other_shape.rank().is_dynamic() || other_shape.size() > ref_shape.size()) { return true; @@ -117,8 +116,7 @@ bool check_for_broadcast(const ngraph::PartialShape& ref_shape, const ngraph::Pa return false; } -std::shared_ptr activation(const std::string& activation_name, - const ngraph::Output& apply_to) { +std::shared_ptr activation(const std::string& activation_name, const ov::Output& apply_to) { if (activation_name == "relu") { return std::make_shared(apply_to); } else if (activation_name == "sigmoid") { @@ -142,7 +140,7 @@ bool is_seq_len_provided(const std::shared_ptr& seq_len_input, int64_t max std::shared_ptr try_fold_unary_output(const std::shared_ptr& node) { const auto& num_outputs = node->get_output_size(); - NGRAPH_CHECK(num_outputs == 1, "Unary has unexpected number of outputs:" + std::to_string(num_outputs)); + OPENVINO_ASSERT(num_outputs == 1, "Unary has unexpected number of outputs:" + std::to_string(num_outputs)); OutputVector output(num_outputs); return node->constant_fold(output, node->input_values()) ? output[0].get_node_shared_ptr() : node; } @@ -162,23 +160,21 @@ std::vector> get_node_target_inputs(const std::shared_ptr& nod return result; } -std::shared_ptr node_to_get_shape_value_of_indices_from_shape_node( - const std::shared_ptr& shape_node, +std::shared_ptr node_to_get_shape_value_of_indices_from_shape_node( + const std::shared_ptr& shape_node, const std::vector& indices) { return make_try_fold(shape_node, - v0::Constant::create(ngraph::element::i64, {indices.size()}, indices), - v0::Constant::create(ngraph::element::i64, {}, {0})); + v0::Constant::create(ov::element::i64, {indices.size()}, indices), + v0::Constant::create(ov::element::i64, {}, {0})); } -std::shared_ptr node_to_get_shape_value_of_indices_from_shape_source( - const ngraph::Output& shape_source, - const std::vector& indices) { +std::shared_ptr node_to_get_shape_value_of_indices_from_shape_source(const ov::Output& shape_source, + const std::vector& indices) { const auto& shape_node = make_try_fold(shape_source); return node_to_get_shape_value_of_indices_from_shape_node(shape_node, indices); } -bool shapes_equal_except_dynamic_expected_batch(const ngraph::PartialShape& expected, - const ngraph::PartialShape& actual) { +bool shapes_equal_except_dynamic_expected_batch(const ov::PartialShape& expected, const ov::PartialShape& actual) { if (expected[0].is_static()) { return actual == expected; } else { @@ -197,7 +193,7 @@ void visit_shape_path(Node* node, std::unordered_set& visited, std::f auto curr_node = nodes.front(); nodes.pop_front(); // Do not check if already visited - if (ngraph::is_type(curr_node) || ngraph::is_type(curr_node)) { + if (ov::is_type(curr_node) || ov::is_type(curr_node)) { continue; }