From 988847f559501c63c486f0e081fdafa1cba8c88b Mon Sep 17 00:00:00 2001 From: Tomasz Jankowski Date: Tue, 24 Jan 2023 23:02:35 +0100 Subject: [PATCH] Transformation component transition to OV namespace (phase 4) (#13558) * Use openvino pass graph_rewrite * Replace use of ngraph::pass to ov::pass * Remove ngraph::pass aliases * Update after rebase * Fix post merge conflicts * Apply code style * Apply code style * Remove bypassing inclusion * Apply code style --- docs/snippets/example_ngraph_utils.cpp | 14 +- docs/snippets/lpt_intel_cpu_plugin.cpp | 4 +- .../src/compatibility/pyngraph/util.cpp | 2 +- .../core/offline_transformations.cpp | 6 +- src/common/legacy/src/cnn_network_impl.cpp | 8 +- .../src/convert_function_to_cnn_network.cpp | 10 +- .../src/ngraph_ops/deconvolution_ie.cpp | 12 +- src/common/legacy/src/ngraph_ops/pad_ie.cpp | 2 +- .../conv_bias_fusion.cpp | 4 +- ...onvert_hard_sigmoid_to_hard_sigmoid_ie.cpp | 2 +- .../convert_matmul_to_fc_or_gemm.cpp | 6 +- ...convert_mul_add_to_scaleshift_or_power.cpp | 16 +- .../convert_mul_or_add_finally.cpp | 18 +-- .../convert_one_hot_to_one_hot_ie.cpp | 2 +- .../convert_opset1_to_legacy.cpp | 22 +-- .../convert_power_to_power_ie.cpp | 4 +- .../convert_prelu_to_relu_ie.cpp | 2 +- .../convert_selu_to_selu_ie.cpp | 4 +- .../convert_swish_to_swish_ie.cpp | 2 +- .../reshape_1d_ops.cpp | 6 +- .../reshape_fully_connected.cpp | 2 +- .../include/low_precision/network_helper.hpp | 6 +- .../low_precision_transformations/src/add.cpp | 24 +-- .../src/concat.cpp | 2 +- .../src/convert.cpp | 2 +- .../src/convert_subtract_constant.cpp | 2 +- .../src/convolution.cpp | 10 +- .../src/convolution_backprop_data.cpp | 8 +- .../src/fuse_convert.cpp | 18 +-- .../src/fuse_multiply_to_fake_quantize.cpp | 2 +- .../src/fuse_subtract_to_fake_quantize.cpp | 2 +- .../src/low_precision.cpp | 10 +- .../src/mat_mul.cpp | 12 +- .../src/multiply.cpp | 12 +- .../src/multiply_to_group_convolution.cpp | 6 +- .../low_precision_transformations/src/mvn.cpp | 2 +- .../src/network_helper.cpp | 94 +++++------ .../src/normalize_l2.cpp | 10 +- .../src/split.cpp | 2 +- .../src/subtract.cpp | 2 +- ...quantization_parameters_transformation.cpp | 2 +- .../tests/avg_pool_transformation.cpp | 2 +- .../avg_pool_with_child_transformation.cpp | 2 +- .../convolution_with_incorrect_weights.cpp | 2 +- .../tests/get_dequantization_test.cpp | 2 +- .../lpt_avoid_shapeof_propagation_test.cpp | 2 +- ...kup_avg_pool_precisions_transformation.cpp | 2 +- .../tests/prelu_transformation.cpp | 2 +- ..._through_dequantization_transformation.cpp | 2 +- ..._through_dequantization_transformation.cpp | 2 +- .../tests/reshape_transformation.cpp | 2 +- .../tests/round_transformation.cpp | 2 +- .../tests/split_transformation.cpp | 2 +- .../tests/transpose_transformation.cpp | 2 +- .../tests/variadic_split_transformation.cpp | 2 +- .../src/pot_transformations.cpp | 8 +- src/common/snippets/src/op/subgraph.cpp | 8 +- .../snippets/src/pass/align_element_type.cpp | 2 +- .../snippets/tests/src/broadcast_fusion.cpp | 4 +- .../snippets/tests/src/lowering_utils.cpp | 4 +- src/common/snippets/tests/src/memory_ops.cpp | 6 +- .../snippets/tests/src/pass/merge_loops.cpp | 4 +- .../set_scalar_count_for_load_and_store.cpp | 4 +- src/common/snippets/tests/src/registers.cpp | 4 +- .../ov_ops/generate_proposals_ie_internal.hpp | 8 - .../ov_ops/multiclass_nms_ie_internal.hpp | 8 - .../include/ov_ops/nms_ie_internal.hpp | 8 - .../include/ov_ops/nms_static_shape_ie.hpp | 8 - .../include/ov_ops/type_relaxed.hpp | 8 - .../add_fake_quantize_fusion.hpp | 6 - .../align_eltwise_input_ranks.hpp | 6 - .../batch_to_space_fusion.hpp | 6 - .../common_optimizations/binarize_weights.hpp | 6 - .../broadcast_elementwise_fusion.hpp | 6 - .../common_optimizations/clamp_fusion.hpp | 6 - .../common_optimizations.hpp | 6 - .../concat_reduce_fusion.hpp | 8 - .../common_optimizations/conv_mul_fusion.hpp | 9 -- .../conv_to_binary_conv.hpp | 6 - .../convert_nms_gather_path_to_unsigned.hpp | 6 - .../convert_quantize_dequantize.hpp | 6 - .../depth_to_space_fusion.hpp | 6 - .../dilated_convolution_converter.hpp | 6 - ...isable_random_uniform_constant_folding.hpp | 6 - .../disable_shapeof_constant_folding.hpp | 6 - .../common_optimizations/divide_fusion.hpp | 6 - .../dropout_with_random_uniform_replacer.hpp | 6 - .../eliminate_unsqueeze_gather.hpp | 7 - .../common_optimizations/fq_mul_fusion.hpp | 6 - .../fq_reshape_fusion.hpp | 6 - .../common_optimizations/gelu_fusion.hpp | 11 -- .../common_optimizations/hsigmoid_fusion.hpp | 11 -- .../common_optimizations/hswish_fusion.hpp | 10 -- .../interpolate_sequence_fusion.hpp | 6 - .../leaky_relu_fusion.hpp | 6 - .../lin_op_sequence_fusion.hpp | 9 -- .../matmul_const_transposes_extraction.hpp | 6 - .../matmul_multiply_fusion.hpp | 6 - .../common_optimizations/mish_fusion.hpp | 6 - .../moc_transformations.hpp | 6 - .../common_optimizations/mul_conv_fusion.hpp | 9 -- .../mul_fake_quantize_fusion.hpp | 6 - .../common_optimizations/mvn_fusion.hpp | 8 - .../nearest_neighbor_upsampling_fusion.hpp | 6 - .../common_optimizations/nop_elimination.hpp | 16 -- .../normalize_l2_fusion.hpp | 6 - .../optimize_strided_slice.hpp | 9 -- .../common_optimizations/pad_fusion.hpp | 11 -- .../common_optimizations/prelu_fusion.hpp | 10 -- .../pull_transpose_through_fq.hpp | 6 - .../random_uniform_fusion.hpp | 6 - .../common_optimizations/reduce_merge.hpp | 6 - .../relu_fake_quantize_fusion.hpp | 6 - .../remove_filtering_boxes_by_size.hpp | 7 - .../reshape_sequence_fusion.hpp | 6 - .../common_optimizations/ric_fusion.hpp | 6 - .../shuffle_channels_fusion.hpp | 6 - .../simplify_shape_of_sub_graph.hpp | 11 -- ...ip_gather_before_transpose_and_reshape.hpp | 6 - .../common_optimizations/softmax_fusion.hpp | 6 - .../common_optimizations/softplus_fusion.hpp | 6 - .../softplus_to_mish_fusion.hpp | 6 - .../space_to_batch_fusion.hpp | 6 - ...plit_concat_pair_to_interpolate_fusion.hpp | 6 - .../split_squeeze_concat_fusion.hpp | 6 - .../strides_optimization.hpp | 9 -- .../common_optimizations/subtract_fusion.hpp | 6 - .../common_optimizations/swish_fusion.hpp | 10 -- ...anspose_reshape_elimination_for_matmul.hpp | 6 - .../transpose_sinking.hpp | 11 -- .../transpose_to_reshape.hpp | 6 - .../weights_dequantize_to_fake_quantize.hpp | 6 - .../wrap_interpolate_into_transposes.hpp | 6 - .../control_flow/unroll_if.hpp | 6 - .../control_flow/unroll_tensor_iterator.hpp | 6 - .../transformations/convert_precision.hpp | 6 - .../include/transformations/fix_rt_info.hpp | 6 - .../transformations/init_node_info.hpp | 6 - .../batch_norm_decomposition.hpp | 6 - .../bidirectional_sequences_decomposition.hpp | 9 -- .../op_conversions/convert_batch_to_space.hpp | 6 - .../op_conversions/convert_broadcast3.hpp | 6 - .../convert_broadcast_to_tiles.hpp | 6 - .../op_conversions/convert_convertlike.hpp | 6 - .../convert_deformable_conv_v8_to_v1.hpp | 6 - .../op_conversions/convert_depth_to_space.hpp | 6 - .../op_conversions/convert_divide.hpp | 7 - .../op_conversions/convert_gather_0d.hpp | 6 - .../convert_gather_downgrade.hpp | 7 - .../op_conversions/convert_gather_upgrade.hpp | 7 - .../op_conversions/convert_gelu.hpp | 6 - .../convert_gp9_to_gp_ie_internal.hpp | 6 - .../convert_interpolate1_to_interpolate4.hpp | 6 - .../convert_matrix_nms_to_matrix_nms_ie.hpp | 6 - .../convert_maxpool_downgrade.hpp | 6 - .../convert_maxpool_upgrade.hpp | 6 - .../convert_minimum_to_power_and_max.hpp | 6 - .../op_conversions/convert_mod.hpp | 6 - ...rt_multiclass_nms_to_multiclass_nms_ie.hpp | 6 - .../convert_multiclass_nms_upgrade.hpp | 6 - .../op_conversions/convert_mvn1_to_mvn6.hpp | 6 - .../op_conversions/convert_negative.hpp | 6 - .../convert_nms9_to_nms_ie_internal.hpp | 6 - .../convert_nms_to_nms_ie_internal.hpp | 6 - .../convert_pad_to_group_conv.hpp | 6 - .../convert_previous_nms_to_nms_5.hpp | 8 - .../convert_previous_nms_to_nms_9.hpp | 9 -- .../convert_prior_box_v8_to_v0.hpp | 6 - .../convert_reduce_to_pooling.hpp | 9 -- .../convert_reduce_to_reshape.hpp | 12 -- .../convert_roi_align_v3_to_v9.hpp | 6 - .../convert_roi_align_v9_to_v3.hpp | 6 - .../convert_scatter_elements_to_scatter.hpp | 6 - .../convert_sequences_to_tensor_iterator.hpp | 9 -- .../op_conversions/convert_shapeof3.hpp | 6 - .../convert_shuffle_channels3.hpp | 6 - .../convert_slice_to_strided_slice.hpp | 6 - .../convert_softmax_downgrade.hpp | 6 - .../convert_softmax_upgrade.hpp | 6 - .../op_conversions/convert_space_to_batch.hpp | 6 - .../op_conversions/convert_space_to_depth.hpp | 6 - .../op_conversions/convert_subtract.hpp | 6 - .../convert_ti_to_sequences.hpp | 9 -- .../op_conversions/convert_topk3.hpp | 6 - .../detection_output_downgrade.hpp | 6 - .../detection_output_upgrade.hpp | 6 - .../op_conversions/einsum_decomposition.hpp | 6 - .../op_conversions/fq_decomposition.hpp | 6 - .../gather_normalize_negative_indices.hpp | 6 - .../op_conversions/gelu7_downgrade.hpp | 6 - .../op_conversions/gru_cell_decomposition.hpp | 6 - .../op_conversions/hsigmoid_decomposition.hpp | 6 - .../op_conversions/hswish_decomposition.hpp | 6 - .../log_softmax_decomposition.hpp | 6 - .../lstm_cell_decomposition.hpp | 6 - .../op_conversions/mvn6_decomposition.hpp | 6 - .../normalize_l2_decomposition.hpp | 6 - .../reduce_l1_decomposition.hpp | 6 - .../reduce_l2_decomposition.hpp | 6 - .../op_conversions/rnn_cell_decomposition.hpp | 6 - .../simplify_ctc_greedy_decoder_seq_len.hpp | 6 - .../op_conversions/softmax_decomposition.hpp | 6 - .../op_conversions/softplus_decomposition.hpp | 6 - .../op_conversions/softsign_decomposition.hpp | 6 - .../convert_opset2_to_opset1.hpp | 6 - .../convert_opset3_to_opset2.hpp | 6 - .../rt_info/fused_names_attribute.hpp | 6 - .../include/transformations/serialize.hpp | 7 - .../broadcast_const_range_replacement.hpp | 6 - .../smart_reshape/matmul_sr.hpp | 8 - .../smart_reshape/mimic_set_batch_size.hpp | 6 - .../proposal_scales_stridedslice.hpp | 7 - .../smart_reshape/reshape_to_1D.hpp | 6 - .../smart_reshape/set_batch_size.hpp | 6 - .../smart_reshape/smart_reshape.hpp | 6 - .../smart_reshape/strided_slice_squeeze.hpp | 8 - .../include/transformations/utils/utils.hpp | 33 ---- .../add_fake_quantize_fusion.cpp | 2 +- .../common_optimizations.cpp | 10 +- .../concat_reduce_fusion.cpp | 5 +- .../convert_compression_only_to_legacy.cpp | 4 +- .../depth_to_space_fusion.cpp | 8 +- .../fused_names_cleanup.cpp | 2 +- .../common_optimizations/gelu_fusion.cpp | 7 +- ..._precision_sensitive_shapeof_subgraphs.cpp | 6 +- .../mul_fake_quantize_fusion.cpp | 2 +- .../common_optimizations/nop_elimination.cpp | 2 +- .../common_optimizations/prelu_fusion.cpp | 2 +- .../shuffle_channels_fusion.cpp | 4 +- .../transpose_sinking_general.cpp | 4 +- .../control_flow/unroll_tensor_iterator.cpp | 2 +- .../src/transformations/convert_precision.cpp | 29 ++-- .../op_conversions/convert_divide.cpp | 2 +- .../convert_interpolate1_to_interpolate4.cpp | 3 +- .../convert_maxpool_downgrade.cpp | 2 +- .../convert_sequences_to_tensor_iterator.cpp | 2 +- .../op_conversions/gru_cell_decomposition.cpp | 6 +- .../lstm_cell_decomposition.cpp | 10 +- .../op_conversions/rnn_cell_decomposition.cpp | 2 +- .../convert_opset2_to_opset1.cpp | 4 +- .../convert_opset3_to_opset2.cpp | 10 +- .../transformations/rt_info/attributes.cpp | 2 +- .../smart_reshape/mimic_set_batch_size.cpp | 2 +- .../smart_reshape/set_batch_size.cpp | 12 +- .../smart_reshape/smart_reshape.cpp | 26 ++-- .../smart_reshape/strided_slice_squeeze.cpp | 2 +- .../add_fake_quantize_fusion.cpp | 22 +-- .../align_eltwise_input_ranks.cpp | 2 +- .../augru_cell_fusion.cpp | 6 +- .../batch_to_space_fusion.cpp | 12 +- .../common_optimizations/binarize_weights.cpp | 20 +-- .../broadcast_elementwise_fusion_test.cpp | 6 +- .../common_optimizations/clamp_fusion.cpp | 12 +- .../concat_reduce_fusion.cpp | 18 +-- .../conv_to_binary_conv.cpp | 30 ++-- ...onvert_compression_only_to_legacy_test.cpp | 4 +- .../convert_convertlike.cpp | 12 +- .../common_optimizations/convert_divide.cpp | 26 ++-- ...nvert_nms_gather_path_to_unsigned_test.cpp | 10 +- .../convert_quantize_dequantize.cpp | 10 +- .../depth_to_space_fusion_test.cpp | 24 +-- .../dilated_convolution_converter.cpp | 8 +- .../dimension_tracking.cpp | 16 +- ...disable_shapeof_constant_folding_tests.cpp | 8 +- .../common_optimizations/divide_fusion.cpp | 8 +- .../division_by_zero_fp16_resolver_test.cpp | 12 +- ...pout_with_random_uniform_replacer_test.cpp | 16 +- .../eliminate_split_test.cpp | 6 +- .../eliminate_unsqueeze_gather.cpp | 2 +- .../fold_subgraph_empty_inputs_test.cpp | 14 +- .../fq_mul_fusion_test.cpp | 28 ++-- .../fq_reshape_fusion.cpp | 8 +- .../fused_names_cleanup.cpp | 4 +- .../common_optimizations/gelu_fusion.cpp | 34 ++-- .../common_optimizations/gru_cell_fusion.cpp | 4 +- .../hsigmoid_fusion_test.cpp | 20 +-- .../hswish_fusion_test.cpp | 36 ++--- .../interpolate_sequence_fusion_test.cpp | 10 +- .../leaky_relu_fusion.cpp | 6 +- .../lin_op_sequence_fusion_test.cpp | 8 +- .../common_optimizations/low_latency_test.cpp | 20 +-- .../low_latency_v2_test.cpp | 38 ++--- .../matmul_const_transposes_extraction.cpp | 10 +- .../matmul_multiply_fusion.cpp | 10 +- .../common_optimizations/mish_fusion_test.cpp | 4 +- .../mul_fake_quantize_fusion.cpp | 22 +-- .../common_optimizations/mvn_fusion_test.cpp | 22 +-- ...earest_neighbor_upsampling_fusion_test.cpp | 4 +- .../ngraph_fq_transpose_test.cpp | 6 +- .../common_optimizations/nop_elimination.cpp | 90 +++++------ .../normalize_l2_fusion_test.cpp | 20 +-- .../optimize_strided_slice_test.cpp | 58 +++---- .../tests/common_optimizations/pad_fusion.cpp | 34 ++-- .../preprocessing_fusion_tests.cpp | 74 ++++----- .../random_uniform_fusion_test.cpp | 12 +- .../common_optimizations/reduce_merge.cpp | 28 ++-- .../relu_fake_quantize_fusion.cpp | 4 +- ...ulti_subgraph_op_dangling_params_tests.cpp | 22 +-- .../reshape_prelu_test.cpp | 30 ++-- .../reshape_sequence_fusion.cpp | 34 ++-- .../shared_shapeof_test.cpp | 8 +- .../shuffle_channels_fusion_test.cpp | 4 +- .../simplify_second_input_of_reshape_test.cpp | 42 ++--- .../simplify_shape_of_sub_graph.cpp | 10 +- ...ther_before_transpose_and_reshape_test.cpp | 16 +- .../common_optimizations/softmax_fusion.cpp | 8 +- .../softplus_fusion_test.cpp | 6 +- .../space_to_batch_fusion.cpp | 12 +- ...concat_pair_to_interpolate_fusion_test.cpp | 28 ++-- .../split_squeeze_concat_fusion_test.cpp | 8 +- .../strides_optimization.cpp | 18 +-- .../common_optimizations/subtract_fusion.cpp | 12 +- .../swish_fusion_test.cpp | 12 +- ...anspose_reshape_elimination_for_matmul.cpp | 14 +- .../transpose_sinking_test.cpp | 20 +-- .../transpose_to_reshape_test.cpp | 8 +- .../weights_dequantize_to_fake_quantize.cpp | 4 +- .../wrap_interpolate_into_transposes_test.cpp | 24 +-- .../tests/const_folding_prior_box.cpp | 12 +- .../tests/control_flow/unroll_if_test.cpp | 20 +-- .../tests/control_flow/unroll_loop_test.cpp | 24 +-- .../unroll_tensor_iterator_test.cpp | 34 ++-- .../tests/legacy/conv_fusion_test.cpp | 28 ++-- .../tests/legacy/convert_convolution_test.cpp | 6 +- .../legacy/convert_deconvolution_test.cpp | 2 +- .../tests/legacy/convert_matmul_test.cpp | 16 +- .../convert_ngraph_to_cnn_network_tests.cpp | 19 ++- .../convert_strided_slice_to_crop_test.cpp | 6 +- .../tests/legacy/convert_tile_to_legacy.cpp | 4 +- .../legacy/keep_constant_inputs_tests.cpp | 6 +- .../tests/legacy/mul_add_conversion_test.cpp | 4 +- .../tests/legacy/reshape_fc_fusion_test.cpp | 8 +- .../tests/make_stateful_test.cpp | 10 +- .../batch_norm_decompositoin.cpp | 6 +- .../batch_to_space_decomposition_test.cpp | 8 +- .../bidirectional_sequences_decomposition.cpp | 24 +-- .../convert_broadcast3_test.cpp | 32 ++-- .../convert_broadcast_to_tiles_test.cpp | 4 +- .../convert_deformable_conv_v8_to_v1_test.cpp | 6 +- .../op_conversions/convert_gather_0d_test.cpp | 4 +- .../convert_gather_downgrade_test.cpp | 6 +- .../convert_gather_upgrade_test.cpp | 4 +- ...vert_interpolate1_to_interpolate4_test.cpp | 10 +- ...t_matrix_nms_to_matrix_nms_ie_internal.cpp | 4 +- .../convert_maxpool_downgrade_test.cpp | 2 +- .../convert_maxpool_upgrade_test.cpp | 4 +- ...lass_nms_to_multiclass_nms_ie_internal.cpp | 9 +- .../convert_multiclass_nms_upgrade_test.cpp | 6 +- .../convert_mvn1_to_mvn6_test.cpp | 8 +- .../convert_nms9_to_nms_ie_internal_test.cpp | 40 ++--- .../convert_nms_to_nms_ie_internal_test.cpp | 80 +++++----- .../convert_pad_to_group_conv.cpp | 10 +- .../convert_previous_nms_to_nms_5.cpp | 12 +- .../convert_previous_nms_to_nms_9.cpp | 16 +- .../convert_prior_box_v8_to_v0_test.cpp | 4 +- .../convert_reduce_to_pooling_test.cpp | 6 +- .../convert_roi_align_v3_to_v9_test.cpp | 2 +- .../convert_roi_align_v9_to_v3_test.cpp | 4 +- ...nvert_scatter_elements_to_scatter_test.cpp | 4 +- .../convert_sequences_to_ti_test.cpp | 24 +-- .../tests/op_conversions/convert_shapeof3.cpp | 4 +- .../convert_shuffle_channels3_test.cpp | 8 +- .../convert_softmax_downgrade_test.cpp | 8 +- .../convert_softmax_upgrade_test.cpp | 4 +- .../convert_ti_to_sequences_test.cpp | 36 ++--- .../op_conversions/convert_topk3_test.cpp | 8 +- .../detection_output_downgrade_test.cpp | 4 +- .../detection_output_upgrade_test.cpp | 4 +- .../op_conversions/fq_decomposition_test.cpp | 4 +- ...gather_normalize_negative_indices_test.cpp | 16 +- .../tests/op_conversions/gelu7_downgrade.cpp | 2 +- .../hsigmoid_decomposition_test.cpp | 2 +- .../hswish_decomposition_test.cpp | 2 +- .../log_softmax_decomposition_test.cpp | 2 +- .../mvn6_decomposition_test.cpp | 6 +- .../ngraph_depth_to_space_transform_test.cpp | 20 +-- .../ngraph_mode_decomposition_test.cpp | 4 +- .../normalize_l2_decomposition_test.cpp | 4 +- .../reduce_l1_decomposition_test.cpp | 2 +- .../reduce_l2_decomposition_test.cpp | 2 +- ...mplify_ctc_greedy_decoder_seq_len_test.cpp | 14 +- .../softplus_decomposition_test.cpp | 4 +- .../softsign_decomposition_test.cpp | 4 +- .../transformations/tests/prelu_fusion.cpp | 12 +- .../broadcast_const_range_replacement.cpp | 16 +- .../tests/type_relaxed_tests.cpp | 67 ++++---- .../tests/utils/convert_precision.cpp | 2 +- .../tests/utils/utils_test.cpp | 22 +-- src/core/src/model.cpp | 2 +- src/core/src/pass/convert_fp32_to_fp16.cpp | 2 +- src/core/tests/constant_folding.cpp | 6 +- .../tests/pass/serialization/custom_ops.cpp | 2 +- .../serialization/rt_info_serialization.cpp | 2 +- src/core/tests/threading.cpp | 12 +- .../ir/tests/rt_info_deserialization.cpp | 16 +- src/frontends/paddle/src/op/conv2d_utils.cpp | 4 +- .../paddle/tests/read_paddle_model_test.cpp | 2 +- src/inference/src/check_network_batchable.cpp | 2 +- src/inference/src/cnn_network_ngraph_impl.cpp | 15 +- src/inference/src/compilation_context.cpp | 2 +- src/inference/src/cpp/ie_infer_request.cpp | 2 +- .../interface/ie_iinfer_request_internal.cpp | 2 +- .../interface/ie_iplugin_internal.cpp | 6 +- src/inference/src/ie_network_reader.cpp | 2 +- .../tests/functional/matmul_sr_tests.cpp | 32 ++-- .../unit/ie_compilation_context_test.cpp | 4 +- src/inference/tests/unit/query_model_test.cpp | 35 ++--- src/plugins/auto/auto_schedule.cpp | 2 +- src/plugins/auto/plugin.cpp | 2 +- src/plugins/auto_batch/auto_batch.cpp | 8 +- src/plugins/hetero/executable_network.cpp | 4 +- src/plugins/intel_cpu/src/exec_network.cpp | 2 +- src/plugins/intel_cpu/src/extension.cpp | 8 +- src/plugins/intel_cpu/src/graph.cpp | 4 +- src/plugins/intel_cpu/src/infer_request.cpp | 4 +- .../convert_fq_rnn_to_quantized_rnn.cpp | 30 ++-- .../convert_matmul_to_fc.cpp | 4 +- .../convert_to_cpu_specific_opset.hpp | 6 +- .../convert_to_interaction.cpp | 2 +- .../ngraph_transformations/fc_bias_fusion.cpp | 2 +- .../rnn_sequences_optimization.cpp | 8 +- src/plugins/intel_cpu/src/nodes/if.cpp | 4 +- .../intel_cpu/src/nodes/multiclass_nms.cpp | 2 +- .../src/nodes/non_max_suppression.cpp | 4 +- .../intel_cpu/src/nodes/tensoriterator.cpp | 2 +- .../intel_cpu/src/transformation_pipeline.cpp | 4 +- .../behavior/ov_plugin/caching_tests.cpp | 6 +- .../behavior/plugin/caching_tests.cpp | 6 +- .../single_layer_tests/gru_sequence.cpp | 4 +- .../single_layer_tests/lstm_sequence.cpp | 4 +- .../single_layer_tests/rnn_sequence.cpp | 4 +- .../subgraph_tests/src/conv_sum_broadcast.cpp | 2 +- .../convert_matmul_test.cpp | 36 ++--- .../convert_to_interaction.cpp | 22 +-- .../convert_to_leaky_relu_test.cpp | 16 +- .../move_eltwise_up_data_movement_test.cpp | 4 +- .../optimize_sequence_transposes_test.cpp | 12 +- .../make_shape_inference.cpp | 2 +- src/plugins/intel_gna/src/gna_plugin.cpp | 42 ++--- src/plugins/intel_gna/src/ops/util/util.hpp | 2 +- .../src/transformations/broadcast_const.cpp | 4 +- .../convert_dwsc_to_scaleshifts.cpp | 6 +- .../decompose_2d_convolution.cpp | 4 +- .../insert_reshape_around_matmul.cpp | 2 +- .../transformations/substitute_softsign.cpp | 2 +- .../remove_permutations_NHWC_to_NCHW_pass.cpp | 4 +- .../single_layer_tests/gru_cell.cpp | 2 +- .../single_layer_tests/gru_sequence.cpp | 4 +- .../single_layer_tests/lstm_sequence.cpp | 4 +- .../transformations/gna_broadcast_const.cpp | 4 +- .../gna_convert_dwsc_to_scaleshifts.cpp | 8 +- ...onvert_matmul_to_pointwise_convolution.cpp | 2 +- ...na_convert_padded_to_valid_convolution.cpp | 2 +- .../gna_decompose_2d_convolution.cpp | 6 +- .../transformations/gna_decompose_mvn.cpp | 4 +- .../gna_handle_transposes_around_matmul.cpp | 2 +- .../transformations/gna_insert_copy_layer.cpp | 146 +++++++++--------- .../gna_insert_identity_layer.cpp | 4 +- .../gna_insert_reshape_around_matmul.cpp | 2 +- ...transpose_after_convolution_or_pooling.cpp | 8 +- .../tests/unit/transformations/gna_pwl.cpp | 4 +- .../transformations/gna_remove_convert.cpp | 6 +- .../gna_remove_extra_reshapes.cpp | 4 +- .../gna_remove_single_input_concat.cpp | 2 +- .../gna_reorder_activation_and_pooling.cpp | 6 +- ...lit_convolution_with_large_buffer_size.cpp | 2 +- .../transformations/gna_split_eltwise.cpp | 2 +- .../gna_substitute_softsign.cpp | 8 +- .../transformations/gna_swap_input_matmul.cpp | 2 +- .../gna_unfuse_reshape_and_transpose.cpp | 2 +- .../include/intel_gpu/plugin/program.hpp | 8 +- .../src/plugin/ops/ctc_greedy_decoder.cpp | 2 +- .../intel_gpu/src/plugin/ops/eltwise.cpp | 2 +- .../src/plugin/ops/embedding_bag.cpp | 4 +- .../src/plugin/ops/generate_proposals.cpp | 2 +- src/plugins/intel_gpu/src/plugin/ops/loop.cpp | 4 +- .../intel_gpu/src/plugin/ops/matrix_nms.cpp | 6 +- .../src/plugin/ops/multiclass_nms.cpp | 2 +- .../src/plugin/ops/non_max_suppression.cpp | 2 +- .../intel_gpu/src/plugin/ops/one_hot.cpp | 4 +- src/plugins/intel_gpu/src/plugin/ops/pad.cpp | 2 +- .../intel_gpu/src/plugin/ops/unary.cpp | 8 +- src/plugins/intel_gpu/src/plugin/plugin.cpp | 4 +- .../src/plugin/transformations_pipeline.cpp | 138 ++++++++--------- ...compose_reduce_for_false_keepdims_test.cpp | 2 +- .../src/template_executable_network.cpp | 2 +- src/plugins/template/src/template_plugin.cpp | 4 +- .../base_reference_cnn_test.cpp | 4 +- .../template_transformations_test.cpp | 2 +- .../shared/src/behavior/ov_plugin/remote.cpp | 4 +- .../add_transformation.cpp | 2 +- ...ntwise_branch_selection_transformation.cpp | 2 +- ...e_quantize_and_avg_pool_transformation.cpp | 2 +- ...e_quantize_and_max_pool_transformation.cpp | 2 +- ...ize_precision_selection_transformation.cpp | 2 +- .../fake_quantize_transformation.cpp | 2 +- ...uantize_and_scale_shift_transformation.cpp | 2 +- .../fuse_fake_quantize_transformation.cpp | 2 +- ...ltiply_to_fake_quantize_transformation.cpp | 2 +- ...btract_to_fake_quantize_transformation.cpp | 2 +- .../mat_mul_transformation.cpp | 2 +- .../mat_mul_with_constant_transformation.cpp | 2 +- .../multiply_transformation.cpp | 2 +- .../prelu_transformation.cpp | 2 +- .../relu_transformation.cpp | 2 +- .../squeeze_transformation.cpp | 2 +- .../unsqueeze_transformation.cpp | 2 +- .../shared/src/snippets/codegen_gelu.cpp | 2 +- .../src/base/ov_subgraph.cpp | 2 +- .../src/single_layer/gru_cell.cpp | 2 +- .../src/single_layer/gru_sequence.cpp | 4 +- .../src/single_layer/loop.cpp | 2 +- .../src/single_layer/lstm_cell.cpp | 2 +- .../src/single_layer/lstm_cell_basic.cpp | 2 +- .../src/single_layer/lstm_sequence.cpp | 4 +- .../src/single_layer/memory.cpp | 2 +- .../src/single_layer/rnn_cell.cpp | 2 +- .../src/single_layer/rnn_sequence.cpp | 4 +- .../src/single_layer/tensor_iterator.cpp | 2 +- .../src/subgraph/basic_lstm.cpp | 2 +- .../src/subgraph/conv_eltwise_fusion.cpp | 8 +- .../matmul_const_transposes_extraction.cpp | 4 +- .../src/subgraph/matmul_multiply_fusion.cpp | 4 +- .../src/subgraph/mul_conv_fusion.cpp | 8 +- .../common_test_utils/ngraph_test_utils.cpp | 2 +- .../lpt_ngraph_functions/common/builders.hpp | 6 +- .../lpt_ngraph_functions/reduce_function.hpp | 12 +- .../lpt_ngraph_functions/src/add_function.cpp | 48 +++--- ...oncat_quantization_parameters_function.cpp | 8 +- .../src/avg_pool_function.cpp | 2 +- .../src/clamp_function.cpp | 2 +- .../src/common/builders.cpp | 32 ++-- .../src/concat_function.cpp | 18 +-- .../convolution_backprop_data_function.cpp | 6 +- .../src/convolution_function.cpp | 24 +-- ...h_multi_parent_dequantization_function.cpp | 12 +- ...fake_quantize_and_convolution_function.cpp | 12 +- ...put_branches_with_convolution_function.cpp | 6 +- .../src/fake_quantize_function.cpp | 4 +- ..._quantize_precision_selection_function.cpp | 16 +- .../src/group_convolution_function.cpp | 6 +- .../markup_avg_pool_precisions_function.cpp | 6 +- .../src/mat_mul_function.cpp | 12 +- .../move_dequantization_after_function.cpp | 4 +- .../src/multiply_function.cpp | 6 +- ...multiply_to_group_convolution_function.cpp | 6 +- .../lpt_ngraph_functions/src/mvn_function.cpp | 4 +- .../src/normalize_dequantization_function.cpp | 2 +- .../src/normalize_l2_function.cpp | 4 +- .../lpt_ngraph_functions/src/pad_function.cpp | 10 +- .../src/precision_propagation_function.cpp | 14 +- .../src/prelu_function.cpp | 2 +- .../src/relu_function.cpp | 2 +- .../src/squeeze_function.cpp | 2 +- .../src/unsqueeze_function.cpp | 2 +- 555 files changed, 1975 insertions(+), 3041 deletions(-) delete mode 100644 src/common/transformations/include/transformations/serialize.hpp diff --git a/docs/snippets/example_ngraph_utils.cpp b/docs/snippets/example_ngraph_utils.cpp index 6cf9faf21a4..ce429f85e3e 100644 --- a/docs/snippets/example_ngraph_utils.cpp +++ b/docs/snippets/example_ngraph_utils.cpp @@ -97,10 +97,10 @@ void visualization_example(std::shared_ptr f) { void pass_manager_example1(std::shared_ptr f) { // ! [ngraph:disable_gelu] ov::pass::Manager manager; -manager.register_pass(); +manager.register_pass(); auto pass_config = manager.get_pass_config(); -pass_config->disable(); +pass_config->disable(); manager.run_passes(f); // ! [ngraph:disable_gelu] @@ -112,8 +112,8 @@ void pass_manager_example2(std::shared_ptr f) { // ! [ngraph:disable_callback] // Set callback to particular transformation with specific condition auto pass_config = manager.get_pass_config(); -pass_config->set_callback( +pass_config->set_callback( [](const std::shared_ptr &node) -> bool { return node->input_value(0).get_shape().size() <= 5lu && node->input_value(0).get_shape().size() == node->get_output_shape(0).size(); @@ -137,16 +137,16 @@ void pass_manager_example3(std::shared_ptr f) { // Example of disabled by default transformation { ov::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); } // Enable disabled by default transformation inside plugin { ov::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); auto pass_config = manager.get_pass_config(); - pass_config->enable(); + pass_config->enable(); manager.run_passes(f); } // ! [ngraph:disabled_by_default] diff --git a/docs/snippets/lpt_intel_cpu_plugin.cpp b/docs/snippets/lpt_intel_cpu_plugin.cpp index a1220462e2b..402f652f394 100644 --- a/docs/snippets/lpt_intel_cpu_plugin.cpp +++ b/docs/snippets/lpt_intel_cpu_plugin.cpp @@ -53,12 +53,12 @@ if (useLpt) { if (useLpt) { // convert not supported cases FakeQuantize -> Convert -> Convert -> Subtract -> Multiply to a single FakeQuantize - pass_config->set_callback([&defaultPrecisions](const std::shared_ptr &node) -> bool { + pass_config->set_callback([&defaultPrecisions](const std::shared_ptr &node) -> bool { return ngraph::pass::low_precision::NetworkHelper::areQuantizeAndDequantizeSupportedForMultiply(node, defaultPrecisions); }); // convert not supported cases FakeQuantize -> Convert -> Convert -> Subtract -> Multiply to a single FakeQuantize - pass_config->set_callback([&defaultPrecisions](const std::shared_ptr &node) -> bool { + pass_config->set_callback([&defaultPrecisions](const std::shared_ptr &node) -> bool { return ngraph::pass::low_precision::NetworkHelper::areQuantizeAndDequantizeSupportedForSubtract(node, defaultPrecisions); }); } diff --git a/src/bindings/python/src/compatibility/pyngraph/util.cpp b/src/bindings/python/src/compatibility/pyngraph/util.cpp index 007838bb484..042b0eea8ec 100644 --- a/src/bindings/python/src/compatibility/pyngraph/util.cpp +++ b/src/bindings/python/src/compatibility/pyngraph/util.cpp @@ -47,7 +47,7 @@ void regmodule_pyngraph_util(py::module m) { }); mod.def("get_ie_output_name", [](const ngraph::Output& output) { - return ngraph::op::util::get_ie_output_name(output); + return ov::op::util::get_ie_output_name(output); }); mod.def("shutdown", diff --git a/src/bindings/python/src/pyopenvino/core/offline_transformations.cpp b/src/bindings/python/src/pyopenvino/core/offline_transformations.cpp index 345dbeb5441..8b40b808dcb 100644 --- a/src/bindings/python/src/pyopenvino/core/offline_transformations.cpp +++ b/src/bindings/python/src/pyopenvino/core/offline_transformations.cpp @@ -36,8 +36,8 @@ void regmodule_offline_transformations(py::module m) { [](std::shared_ptr model, bool cf, bool smart_reshape) { ov::pass::Manager manager; if (smart_reshape) - manager.register_pass(); - manager.register_pass(cf); + manager.register_pass(); + manager.register_pass(cf); manager.run_passes(model); }, py::arg("model"), @@ -128,7 +128,7 @@ void regmodule_offline_transformations(py::module m) { "convert_sequence_to_tensor_iterator_transformation", [](std::shared_ptr model) { ov::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(model); }, py::arg("model")); diff --git a/src/common/legacy/src/cnn_network_impl.cpp b/src/common/legacy/src/cnn_network_impl.cpp index 361be4cebb3..9a4224a618c 100644 --- a/src/common/legacy/src/cnn_network_impl.cpp +++ b/src/common/legacy/src/cnn_network_impl.cpp @@ -101,10 +101,10 @@ CNNNetworkImpl::CNNNetworkImpl(const CNNNetwork & cnnnetwork) { auto graph = ngraph::clone_function(*ngraphImplPtr->getFunction()); ::ngraph::pass::Manager manager; - manager.register_pass<::ngraph::pass::InitNodeInfo>(); - manager.register_pass<::ngraph::pass::CommonOptimizations>(); - manager.register_pass<::ngraph::pass::ConvertOpSet3ToOpSet2>(); - manager.register_pass<::ngraph::pass::ConvertOpSet2ToOpSet1>(); + manager.register_pass<::ov::pass::InitNodeInfo>(); + manager.register_pass<::ov::pass::CommonOptimizations>(); + manager.register_pass<::ov::pass::ConvertOpSet3ToOpSet2>(); + manager.register_pass<::ov::pass::ConvertOpSet2ToOpSet1>(); manager.register_pass<::ngraph::pass::ConvertOpSet1ToLegacy>(); manager.run_passes(graph); diff --git a/src/common/legacy/src/convert_function_to_cnn_network.cpp b/src/common/legacy/src/convert_function_to_cnn_network.cpp index f1d0e974642..cfd0db3708f 100644 --- a/src/common/legacy/src/convert_function_to_cnn_network.cpp +++ b/src/common/legacy/src/convert_function_to_cnn_network.cpp @@ -157,7 +157,7 @@ CNNLayer::Ptr createSubGraphLayer(const std::shared_ptr& layer) { counter = 0; for (const auto& result : results) { - auto data = out_info_map.at(ngraph::op::util::get_ie_output_name(result->input_value(0))); + auto data = out_info_map.at(ov::op::util::get_ie_output_name(result->input_value(0))); temp_body.outputs[counter++] = data; } @@ -1841,7 +1841,7 @@ void convertFunctionToICNNNetwork(const std::shared_ptrsetName(graph->get_friendly_name()); const ngraph::NodeVector& nodes = graph->get_ops(); - bool keep_constants = keep_constant_inputs || ::ngraph::op::util::has_op_with_type<::ngraph::op::FakeQuantize>(graph); + bool keep_constants = keep_constant_inputs || ::ov::op::util::has_op_with_type<::ngraph::op::FakeQuantize>(graph); std::unordered_map> unique_names; auto can_change_name = [](const std::shared_ptr & node) -> bool { @@ -1902,7 +1902,7 @@ void convertFunctionToICNNNetwork(const std::shared_ptrparams[ExecGraphInfoSerialization::ORIGINAL_NAMES] = originalNames; } @@ -1959,7 +1959,7 @@ void convertFunctionToICNNNetwork(const std::shared_ptroutput(i)); + auto outName = ov::op::util::get_ie_output_name(layer->output(i)); DataPtr &ptr = cnnNetworkImpl->getData(outName.c_str()); @@ -2011,7 +2011,7 @@ void convertFunctionToICNNNetwork(const std::shared_ptr(layer)) { IE_ASSERT(layer->get_input_size() == 1); const auto &input = layer->input_value(0); - cnnNetworkImpl->addOutput(ngraph::op::util::get_ie_output_name(input)); + cnnNetworkImpl->addOutput(ov::op::util::get_ie_output_name(input)); continue; } diff --git a/src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp b/src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp index 2e303d5616b..4d9fe473a4c 100644 --- a/src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp @@ -82,11 +82,11 @@ void op::DeconvolutionIE::validate_and_infer_types() { } Output conv; if (m_output_shape) { - conv = std::make_shared>( + conv = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ element::f32 }, - ngraph::op::TemporaryReplaceOutputType(input_value(0), element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(weights, element::f32).get(), + ov::op::TemporaryReplaceOutputType(input_value(0), element::f32).get(), + ov::op::TemporaryReplaceOutputType(weights, element::f32).get(), m_output_shape, m_strides, m_pads_begin, @@ -95,11 +95,11 @@ void op::DeconvolutionIE::validate_and_infer_types() { m_auto_pad, m_output_padding); } else { - conv = std::make_shared>( + conv = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ element::f32 }, - ngraph::op::TemporaryReplaceOutputType(input_value(0), element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(weights, element::f32).get(), + ov::op::TemporaryReplaceOutputType(input_value(0), element::f32).get(), + ov::op::TemporaryReplaceOutputType(weights, element::f32).get(), m_strides, m_pads_begin, m_pads_end, diff --git a/src/common/legacy/src/ngraph_ops/pad_ie.cpp b/src/common/legacy/src/ngraph_ops/pad_ie.cpp index b9c7ce03c4c..632f1a48992 100644 --- a/src/common/legacy/src/ngraph_ops/pad_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/pad_ie.cpp @@ -28,7 +28,7 @@ op::PadIE::PadIE(const std::shared_ptr& pad) if (!const_node) { throw ngraph_error("Pad " + pad->get_friendly_name() + " with not constant pad_value is not allowed"); } - if (!util::get_single_value(const_node, m_pad_value)) { + if (!ov::op::util::get_single_value(const_node, m_pad_value)) { throw ngraph_error("Unsupported pad value"); } } diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/conv_bias_fusion.cpp b/src/common/legacy/src/transformations/convert_opset1_to_legacy/conv_bias_fusion.cpp index 8dd31db2fcc..643f4fbe6aa 100644 --- a/src/common/legacy/src/transformations/convert_opset1_to_legacy/conv_bias_fusion.cpp +++ b/src/common/legacy/src/transformations/convert_opset1_to_legacy/conv_bias_fusion.cpp @@ -96,7 +96,7 @@ bool conv_callback(ngraph::pattern::Matcher &m) { auto expected_shape = Shape(output_rank, 1); expected_shape[1] = channel_dim; - if (ngraph::op::util::check_for_broadcast(expected_shape, const_shape)) { + if (ov::op::util::check_for_broadcast(expected_shape, const_shape)) { return false; } @@ -104,7 +104,7 @@ bool conv_callback(ngraph::pattern::Matcher &m) { // the number of weights dimensions. Output final_const = m_const; if (is_scalar_multiplier) { - final_const = ngraph::op::util::broadcastTo(m_const, expected_shape); + final_const = ov::op::util::broadcastTo(m_const, expected_shape); } if (final_const.get_shape().size() > 1) { diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp index aa7edc3fc40..381b6c6f1a4 100644 --- a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp +++ b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp @@ -37,7 +37,7 @@ ngraph::pass::ConvertHardSigmoidToLegacyMatcher::ConvertHardSigmoidToLegacyMatch float alpha_value; float beta_value; - if (!ngraph::op::util::get_single_value(alpha, alpha_value) || !ngraph::op::util::get_single_value(beta, beta_value)) + if (!ov::op::util::get_single_value(alpha, alpha_value) || !ov::op::util::get_single_value(beta, beta_value)) return false; auto hard_sigmoid_ie = std::make_shared (hard_sigmoid->input(0).get_source_output(), diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp index 7346622caf8..5ec747c7bfe 100644 --- a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp +++ b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp @@ -229,13 +229,13 @@ ngraph::pass::ConvertMatMulToGemm::ConvertMatMulToGemm() { // Reshape first input (fc_input_a) Shape reshape_shape(shape_b.size() - shape_a.size(), 1); reshape_shape.insert(reshape_shape.end(), shape_a.begin(), shape_a.end()); - fc_input_a = op::util::reshapeTo(fc_input_a, reshape_shape); + fc_input_a = ov::op::util::reshapeTo(fc_input_a, reshape_shape); new_ops.push_back(fc_input_a.get_node_shared_ptr()); } else if (shape_b.size() < shape_a.size()) { // Reshape second input (fc_input_b) Shape reshape_shape(shape_a.size() - shape_b.size(), 1); reshape_shape.insert(reshape_shape.end(), shape_b.begin(), shape_b.end()); - fc_input_b = op::util::reshapeTo(fc_input_b, reshape_shape); + fc_input_b = ov::op::util::reshapeTo(fc_input_b, reshape_shape); new_ops.push_back(fc_input_b.get_node_shared_ptr()); } @@ -252,7 +252,7 @@ ngraph::pass::ConvertMatMulToGemm::ConvertMatMulToGemm() { reshape_output = std::make_shared(gemm, ngraph::opset1::Constant::create(element::i64, Shape{dim_indices.size()}, dim_indices)); } else { - reshape_output = op::util::reshapeTo(gemm, output_shape); + reshape_output = ov::op::util::reshapeTo(gemm, output_shape); } new_ops.push_back(reshape_output); diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp index 2ab846f1dfd..c464c78bafd 100644 --- a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp +++ b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp @@ -109,8 +109,8 @@ ngraph::pass::ConvertMulAddToScaleShiftOrPower::ConvertMulAddToScaleShiftOrPower } // Check that eltwise is not useless otherwise we remove it - if (ngraph::op::util::constantIsEqualTo(const_weights_node, 1) && - ngraph::op::util::constantIsEqualTo(const_bias_node, 0)) { + if (ov::op::util::constantIsEqualTo(const_weights_node, 1) && + ov::op::util::constantIsEqualTo(const_bias_node, 0)) { bool has_result_output = false; for (const auto & output : add_node->output(0).get_target_inputs()) { if (dynamic_cast(output.get_node())) { @@ -152,17 +152,17 @@ ngraph::pass::ConvertMulAddToScaleShiftOrPower::ConvertMulAddToScaleShiftOrPower if (res1 == CONVERSION_RESULT::SCALE_SHIFT || res2 == CONVERSION_RESULT::SCALE_SHIFT) { NodeVector new_ops; - auto weights_in = ngraph::op::util::normalize_constant(const_weights_node, output_shape); - auto biases_in = ngraph::op::util::normalize_constant(const_bias_node, output_shape); + auto weights_in = ov::op::util::normalize_constant(const_weights_node, output_shape); + auto biases_in = ov::op::util::normalize_constant(const_bias_node, output_shape); new_ops.push_back(weights_in); new_ops.push_back(biases_in); if (res1 == CONVERSION_RESULT::POWER) { - weights_in = ngraph::op::util::broadcastTo(weights_in, biases_in->get_shape()); + weights_in = ov::op::util::broadcastTo(weights_in, biases_in->get_shape()); new_ops.push_back(weights_in); } if (res2 == CONVERSION_RESULT::POWER) { - biases_in = ngraph::op::util::broadcastTo(biases_in, weights_in->get_shape()); + biases_in = ov::op::util::broadcastTo(biases_in, weights_in->get_shape()); new_ops.push_back(biases_in); } @@ -175,10 +175,10 @@ ngraph::pass::ConvertMulAddToScaleShiftOrPower::ConvertMulAddToScaleShiftOrPower ngraph::replace_node(m.get_match_root(), scaleshift); } else { float scale = 0.f, shift = 0.f; - if (!op::util::get_single_value(const_weights_node, scale)) { + if (!ov::op::util::get_single_value(const_weights_node, scale)) { return false; } - if (!op::util::get_single_value(const_bias_node, shift)) { + if (!ov::op::util::get_single_value(const_bias_node, shift)) { return false; } diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.cpp b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.cpp index b2a2176ce75..c1ff0bff868 100644 --- a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.cpp +++ b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.cpp @@ -112,8 +112,8 @@ ngraph::matcher_pass_callback get_callback() { }; // Check that eltwise is not useless and do not broadcast output otherwise we remove it - if (((std::is_same() && ngraph::op::util::constantIsEqualTo(const_node, 0)) || - (std::is_same() && ngraph::op::util::constantIsEqualTo(const_node, 1))) && + if (((std::is_same() && ov::op::util::constantIsEqualTo(const_node, 0)) || + (std::is_same() && ov::op::util::constantIsEqualTo(const_node, 1))) && !constant_broadcast_output(data_node.get_partial_shape(), const_node->get_shape())) { bool ret_status = ngraph::replace_output_update_name(lin_op->output(0), data_node); if (ret_status) { @@ -138,22 +138,22 @@ ngraph::matcher_pass_callback get_callback() { std::shared_ptr scaleshift; if (std::is_same()) { auto weights = ngraph::opset1::Constant::create(weights_et, weights_shape, {1}); - auto weights_in = ngraph::op::util::normalize_constant(weights, output_shape); - auto biases_in = ngraph::op::util::normalize_constant(const_node, output_shape); + auto weights_in = ov::op::util::normalize_constant(weights, output_shape); + auto biases_in = ov::op::util::normalize_constant(const_node, output_shape); scaleshift = std::make_shared(data_node, weights_in, biases_in); } else if (std::is_same()) { std::shared_ptr new_const_node = std::make_shared( - ngraph::op::util::normalize_constant(const_node, output_shape), + ov::op::util::normalize_constant(const_node, output_shape), ngraph::opset1::Constant::create(weights_et, ngraph::Shape{ 1 }, { -1 })); auto weights = ngraph::opset1::Constant::create(weights_et, weights_shape, {1}); - auto weights_in = ngraph::op::util::normalize_constant(weights, output_shape); + auto weights_in = ov::op::util::normalize_constant(weights, output_shape); auto biases_in = new_const_node; scaleshift = std::make_shared(data_node, weights_in, biases_in); } else if (std::is_same()) { auto bias = ngraph::opset1::Constant::create(weights_et, weights_shape, {0}); - auto weights_in = ngraph::op::util::normalize_constant(const_node, output_shape); - auto biases_in = ngraph::op::util::normalize_constant(bias, output_shape); + auto weights_in = ov::op::util::normalize_constant(const_node, output_shape); + auto biases_in = ov::op::util::normalize_constant(bias, output_shape); scaleshift = std::make_shared(data_node, weights_in, biases_in); } else { return false; @@ -164,7 +164,7 @@ ngraph::matcher_pass_callback get_callback() { ngraph::replace_node(m.get_match_root(), scaleshift); } else { float value; - if (!ngraph::op::util::get_single_value(const_node, value)) { + if (!ov::op::util::get_single_value(const_node, value)) { return false; } diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp index 27687c4396e..9ed207a6a66 100644 --- a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp +++ b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.cpp @@ -60,5 +60,5 @@ ngraph::pass::ConvertOneHotToOneHotIEMatcher::ConvertOneHotToOneHotIEMatcher() { } void ngraph::pass::ConvertOneHotToOneHotIEMatcher::detect_output_type(const std::shared_ptr &f) { - m_output_type = ngraph::op::util::has_f16_constants(f) ? element::Type_t::f16 : element::Type_t::f32; + m_output_type = ov::op::util::has_f16_constants(f) ? element::Type_t::f16 : element::Type_t::f32; } diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp index 4ee672af972..73f1ec73cb2 100644 --- a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp +++ b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp @@ -63,16 +63,16 @@ bool ngraph::pass::ConvertOpSet1ToLegacy::run_on_model(const std::shared_ptr(); - decomp->add_matcher(); - decomp->add_matcher(); - decomp->add_matcher(); - decomp->add_matcher(); - decomp->add_matcher(); + decomp->add_matcher(); + decomp->add_matcher(); + decomp->add_matcher(); + decomp->add_matcher(); + decomp->add_matcher(); decomp->set_name("ngraph::pass::LegacyDecompositions"); auto convert_matmul = manager.register_pass(); convert_matmul->add_matcher(); - convert_matmul->add_matcher(); + convert_matmul->add_matcher(); convert_matmul->add_matcher(); convert_matmul->set_name("ngraph::pass::ConvertMatMul"); @@ -103,7 +103,7 @@ bool ngraph::pass::ConvertOpSet1ToLegacy::run_on_model(const std::shared_ptradd_matcher(); anchor->add_matcher(); anchor->add_matcher(); - anchor->add_matcher(); + anchor->add_matcher(); anchor->add_matcher(); anchor->add_matcher(); anchor->add_matcher(); @@ -121,9 +121,9 @@ bool ngraph::pass::ConvertOpSet1ToLegacy::run_on_model(const std::shared_ptradd_matcher()->detect_output_type(f); anchor->add_matcher(); anchor->add_matcher(); - anchor->add_matcher(); - anchor->add_matcher(); - anchor->add_matcher(); + anchor->add_matcher(); + anchor->add_matcher(); + anchor->add_matcher(); anchor->add_matcher(); anchor->add_matcher(); anchor->add_matcher(); @@ -133,7 +133,7 @@ bool ngraph::pass::ConvertOpSet1ToLegacy::run_on_model(const std::shared_ptr(f)) { + if (!ov::op::util::has_op_with_type(f)) { manager.register_pass(); } manager.register_pass(); diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp index fbc5acd3bb1..ec8f6600c55 100644 --- a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp +++ b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.cpp @@ -27,12 +27,12 @@ ngraph::pass::ConvertPowerToPowerIEMatcher::ConvertPowerToPowerIEMatcher() { auto node = power->input(1).get_source_output().get_node_shared_ptr(); if (auto const_node = std::dynamic_pointer_cast(node)) { float value(0); - if (!ngraph::op::util::get_single_value(const_node, value)) { + if (!ov::op::util::get_single_value(const_node, value)) { return false; } //check broadcast influence - if (ngraph::op::util::check_for_broadcast(power->input(0).get_shape(), node->get_shape())) { + if (ov::op::util::check_for_broadcast(power->input(0).get_shape(), node->get_shape())) { return false; } diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp index 1da13185eec..3af1ef96c03 100644 --- a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp +++ b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.cpp @@ -27,7 +27,7 @@ ngraph::pass::ConvertPReLUToReLUIE::ConvertPReLUToReLUIE() { auto node = prelu->input(1).get_source_output().get_node_shared_ptr(); if (auto const_node = std::dynamic_pointer_cast(node)) { float value(0); - if (!ngraph::op::util::get_single_value(const_node, value)) { + if (!ov::op::util::get_single_value(const_node, value)) { return false; } diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp index 967dbb91e70..b54ab00047d 100644 --- a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp +++ b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.cpp @@ -35,8 +35,8 @@ ngraph::pass::ConvertSeluToSeluIEMatcher::ConvertSeluToSeluIEMatcher() { } float alpha, gamma; - if (!ngraph::op::util::get_single_value(alpha_const, alpha) || - !ngraph::op::util::get_single_value(gamma_const, gamma)) { + if (!ov::op::util::get_single_value(alpha_const, alpha) || + !ov::op::util::get_single_value(gamma_const, gamma)) { return false; } diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp index 9964183e875..e8adad5c99c 100644 --- a/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp +++ b/src/common/legacy/src/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.cpp @@ -29,7 +29,7 @@ ngraph::pass::ConvertSwishToSwishIEMatcher::ConvertSwishToSwishIEMatcher() { if (!beta_const) { return false; } - if (!ngraph::op::util::get_single_value(beta_const, beta_value)) { + if (!ov::op::util::get_single_value(beta_const, beta_value)) { return false; } } diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp b/src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp index c851309aa4e..6c6cad44860 100644 --- a/src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp +++ b/src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_1d_ops.cpp @@ -36,7 +36,7 @@ std::shared_ptr convert(const Output & data, std::shared_ptrinput_value(1).get_shape()); new_weights_shape.insert(new_weights_shape.begin() + 2, 1); - auto weights = op::util::reshapeTo(node->input_value(1), new_weights_shape); + auto weights = ov::op::util::reshapeTo(node->input_value(1), new_weights_shape); new_ops.push_back(weights); if (node->inputs().size() == 2) { @@ -124,7 +124,7 @@ matcher_pass_callback get_callback() { NodeVector new_ops; // Reshape(input_shape)->Op->Reshape(output_shape) - Output last = op::util::reshapeTo(node->input_value(0), input_shape); + Output last = ov::op::util::reshapeTo(node->input_value(0), input_shape); last.get_node_shared_ptr()->set_friendly_name(node->get_friendly_name() + "/reshape_begin"); new_ops.push_back(last.get_node_shared_ptr()); @@ -141,7 +141,7 @@ matcher_pass_callback get_callback() { last.get_node_shared_ptr()->set_friendly_name(node->get_friendly_name() + "/new"); new_ops.push_back(last.get_node_shared_ptr()); - last = op::util::reshapeTo(last, output_shape); + last = ov::op::util::reshapeTo(last, output_shape); last.get_node_shared_ptr()->set_friendly_name(node->get_friendly_name()); new_ops.push_back(last.get_node_shared_ptr()); diff --git a/src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp b/src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp index 6cd7f1a6823..d0fd58926e2 100644 --- a/src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp +++ b/src/common/legacy/src/transformations/convert_opset1_to_legacy/reshape_fully_connected.cpp @@ -56,7 +56,7 @@ ngraph::pass::ReshapeFullyConnected::ReshapeFullyConnected() { new_ops.push_back(fc_new); if (output_shape != output_shape_new) { - auto reshape_output = op::util::reshapeTo(fc_new, output_shape); + auto reshape_output = ov::op::util::reshapeTo(fc_new, output_shape); new_ops.push_back(reshape_output); reshape_output->set_friendly_name(fc->get_friendly_name()); fc_new->set_friendly_name(fc->get_friendly_name() + "/FC"); diff --git a/src/common/low_precision_transformations/include/low_precision/network_helper.hpp b/src/common/low_precision_transformations/include/low_precision/network_helper.hpp index 3e6e8a82884..a553e4a02a9 100644 --- a/src/common/low_precision_transformations/include/low_precision/network_helper.hpp +++ b/src/common/low_precision_transformations/include/low_precision/network_helper.hpp @@ -275,7 +275,7 @@ private: template std::shared_ptr NetworkHelper::setOutDataPrecisionForTypeRelaxed(std::shared_ptr layer, const element::Type& precision) { // check if it already exteded operation node - if (auto relaxed_layer = std::dynamic_pointer_cast(layer)) { + if (auto relaxed_layer = std::dynamic_pointer_cast(layer)) { relaxed_layer->set_overridden_output_type(precision); std::dynamic_pointer_cast(layer)->validate_and_infer_types(); return layer; @@ -287,7 +287,7 @@ std::shared_ptr NetworkHelper::setOutDataPrecisionForTypeRelaxed(std::shar template std::shared_ptr NetworkHelper::setOutDataPrecision(std::shared_ptr layer, const element::Type& precision) { // check if it already exteded operation node - if (auto relaxed_layer = std::dynamic_pointer_cast(layer)) { + if (auto relaxed_layer = std::dynamic_pointer_cast(layer)) { relaxed_layer->set_overridden_output_type(precision); std::dynamic_pointer_cast(layer)->validate_and_infer_types(); return layer; @@ -295,7 +295,7 @@ std::shared_ptr NetworkHelper::setOutDataPrecision(std::shared_ptr>(*layer, precision); + auto replacement = std::make_shared>(*layer, precision); copy_runtime_info(layer, replacement); replace_node(layer, replacement); return replacement; diff --git a/src/common/low_precision_transformations/src/add.cpp b/src/common/low_precision_transformations/src/add.cpp index 0465df61239..1130407283d 100644 --- a/src/common/low_precision_transformations/src/add.cpp +++ b/src/common/low_precision_transformations/src/add.cpp @@ -54,11 +54,11 @@ std::shared_ptr replaceToSubtract(const std::shared_ptr& auto constant = fold(add->input_value(constBranchIndex)); auto constOutput = constant->output(0); - const auto subtract = std::make_shared>( + const auto subtract = std::make_shared>( std::vector{element::f32, element::f32}, std::vector{ op->get_output_element_type(0) }, - ngraph::op::TemporaryReplaceOutputType(add->input_value(dataBranchIndex), element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(constOutput, element::f32).get(), + ov::op::TemporaryReplaceOutputType(add->input_value(dataBranchIndex), element::f32).get(), + ov::op::TemporaryReplaceOutputType(constOutput, element::f32).get(), add->get_autob()); NetworkHelper::copyInfo(add, subtract); @@ -80,11 +80,11 @@ std::shared_ptr fuseWithSubtract(const std::shared_ptr& add->get_input_node_shared_ptr(0)->input_value(1), add->input_value(1)); - const auto newSubtract = std::make_shared>( + const auto newSubtract = std::make_shared>( std::vector{element::f32, element::f32}, std::vector{ op->get_output_element_type(0) }, - ngraph::op::TemporaryReplaceOutputType(add->get_input_node_shared_ptr(0)->input_value(0), element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(newSubConst, element::f32).get()); + ov::op::TemporaryReplaceOutputType(add->get_input_node_shared_ptr(0)->input_value(0), element::f32).get(), + ov::op::TemporaryReplaceOutputType(newSubConst, element::f32).get()); NetworkHelper::copyInfo(add, newSubtract); replace_node(add, newSubtract); @@ -218,14 +218,14 @@ bool AddTransformation::transform(TransformationContext& context, ngraph::patter newSubtractFullPathValues), newMultiplyFullPathValues); - newAddOrSubtract = std::make_shared>( + newAddOrSubtract = std::make_shared>( std::vector{element::f32, element::f32}, std::vector{ element::f32 }, - ngraph::op::TemporaryReplaceOutputType(inputs[0], element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(inputs[1], element::f32).get()); - newMultiply = std::make_shared>( + ov::op::TemporaryReplaceOutputType(inputs[0], element::f32).get(), + ov::op::TemporaryReplaceOutputType(inputs[1], element::f32).get()); + newMultiply = std::make_shared>( std::vector{element::f32, element::f32}, std::vector{ add->get_output_element_type(0) }, - ngraph::op::TemporaryReplaceOutputType(newAddOrSubtract, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(multiplyEmptyPathValues, element::f32).get()); + ov::op::TemporaryReplaceOutputType(newAddOrSubtract, element::f32).get(), + ov::op::TemporaryReplaceOutputType(multiplyEmptyPathValues, element::f32).get()); NetworkHelper::insertDequantizationAfter(add, newMultiply, newAddOrSubtract); NetworkHelper::copyInfo(add, newAddOrSubtract); diff --git a/src/common/low_precision_transformations/src/concat.cpp b/src/common/low_precision_transformations/src/concat.cpp index c27c1bc3f11..e528a0796d4 100644 --- a/src/common/low_precision_transformations/src/concat.cpp +++ b/src/common/low_precision_transformations/src/concat.cpp @@ -178,7 +178,7 @@ bool ConcatTransformation::transform(TransformationContext& context, ngraph::pat } if (!mulConstants.empty()) { - const auto multiply = std::make_shared>( + const auto multiply = std::make_shared>( opset1::Multiply( lastDequantization, NetworkHelper::toScalarIfPossible(mulConstants.size() == 1ul ? diff --git a/src/common/low_precision_transformations/src/convert.cpp b/src/common/low_precision_transformations/src/convert.cpp index 6bf4478bc18..ffcbaacded4 100644 --- a/src/common/low_precision_transformations/src/convert.cpp +++ b/src/common/low_precision_transformations/src/convert.cpp @@ -48,7 +48,7 @@ bool ConvertTransformation::transform(TransformationContext& context, ngraph::pa const ngraph::element::Type precisionBefore = convert->get_input_element_type(0); - std::shared_ptr subtract = std::make_shared>( + std::shared_ptr subtract = std::make_shared>( convert->input_value(0), std::make_shared(precisionBefore, Shape{}, std::vector({ 0 }))); NetworkHelper::setOutDataPrecision(subtract, convert->get_output_element_type(0)); diff --git a/src/common/low_precision_transformations/src/convert_subtract_constant.cpp b/src/common/low_precision_transformations/src/convert_subtract_constant.cpp index 5440652fd04..dcb183847f2 100644 --- a/src/common/low_precision_transformations/src/convert_subtract_constant.cpp +++ b/src/common/low_precision_transformations/src/convert_subtract_constant.cpp @@ -67,7 +67,7 @@ ngraph::pass::low_precision::ConvertSubtractConstant::ConvertSubtractConstant(co auto resultSubtractConstant = NetworkHelper::round(subtractConstant, quantizePrecision); if (NetworkHelper::isScalarLike(resultSubtractConstant)) { resultSubtractConstant = NetworkHelper::toScalar(resultSubtractConstant); - if (op::util::constantIsEqualTo(resultSubtractConstant, 0.f)) { + if (ov::op::util::constantIsEqualTo(resultSubtractConstant, 0.f)) { resultSubtractConstant = nullptr; } } diff --git a/src/common/low_precision_transformations/src/convolution.cpp b/src/common/low_precision_transformations/src/convolution.cpp index e55eda85eee..46831f0586c 100644 --- a/src/common/low_precision_transformations/src/convolution.cpp +++ b/src/common/low_precision_transformations/src/convolution.cpp @@ -175,23 +175,23 @@ bool ConvolutionTransformation::transform(TransformationContext &context, ngraph auto conv = ov::as_type_ptr(copyNode); std::shared_ptr relaxedNewConvolution; if (conv) { - relaxedNewConvolution = std::make_shared>( + relaxedNewConvolution = std::make_shared>( *conv, std::vector{deqPrecision, deqPrecision}, std::vector{deqPrecision}); } else { - relaxedNewConvolution = std::make_shared>( + relaxedNewConvolution = std::make_shared>( *ov::as_type_ptr(copyNode), std::vector{deqPrecision, deqPrecision}, std::vector{deqPrecision}); } NetworkHelper::copyInfo(convolution, relaxedNewConvolution); - newMultiplyAfter = std::make_shared>( + newMultiplyAfter = std::make_shared>( std::vector{ deqPrecision, deqPrecision }, std::vector{ dequantization.multiply->get_output_element_type(0) }, - ngraph::op::TemporaryReplaceOutputType(relaxedNewConvolution, deqPrecision).get(), - ngraph::op::TemporaryReplaceOutputType(newMultiplyAfterConst, deqPrecision).get()); + ov::op::TemporaryReplaceOutputType(relaxedNewConvolution, deqPrecision).get(), + ov::op::TemporaryReplaceOutputType(newMultiplyAfterConst, deqPrecision).get()); NetworkHelper::insertDequantizationAfter(convolution, newMultiplyAfter, relaxedNewConvolution); convolution = newMultiplyAfter->input_value(0).get_node_shared_ptr(); diff --git a/src/common/low_precision_transformations/src/convolution_backprop_data.cpp b/src/common/low_precision_transformations/src/convolution_backprop_data.cpp index bae4c1359f3..c7f3e8d02e0 100644 --- a/src/common/low_precision_transformations/src/convolution_backprop_data.cpp +++ b/src/common/low_precision_transformations/src/convolution_backprop_data.cpp @@ -122,16 +122,16 @@ bool ConvolutionBackpropDataTransformation::transform(TransformationContext &con inputs[0] = dequantization.multiply->input_value(0); const auto copyNode = convolutionBackpropData->clone_with_new_inputs(inputs); - const auto relaxedConvolutionBackpropData = std::make_shared>( + const auto relaxedConvolutionBackpropData = std::make_shared>( *ov::as_type_ptr(copyNode), std::vector{deqPrecision, deqPrecision}, std::vector{deqPrecision}); - newMultiplyAfter = std::make_shared>( + newMultiplyAfter = std::make_shared>( std::vector{ deqPrecision, deqPrecision }, std::vector{ dequantization.multiply->get_output_element_type(0) }, - ngraph::op::TemporaryReplaceOutputType(relaxedConvolutionBackpropData, deqPrecision).get(), - ngraph::op::TemporaryReplaceOutputType(newMultiplyAfterConst, deqPrecision).get()); + ov::op::TemporaryReplaceOutputType(relaxedConvolutionBackpropData, deqPrecision).get(), + ov::op::TemporaryReplaceOutputType(newMultiplyAfterConst, deqPrecision).get()); NetworkHelper::insertDequantizationAfter(convolutionBackpropData, newMultiplyAfter, relaxedConvolutionBackpropData); convolutionBackpropData = newMultiplyAfter->get_input_node_shared_ptr(0); diff --git a/src/common/low_precision_transformations/src/fuse_convert.cpp b/src/common/low_precision_transformations/src/fuse_convert.cpp index 2e157f76d5d..1780d85bc1e 100644 --- a/src/common/low_precision_transformations/src/fuse_convert.cpp +++ b/src/common/low_precision_transformations/src/fuse_convert.cpp @@ -54,10 +54,10 @@ std::shared_ptr removeConvertIfPossibleForSubtract( const element::Type precisionBeforeConvert = convert->input(0).get_element_type(); if (NetworkHelper::checkConstantValuePrecision(precisionBeforeConvert, subtract->get_input_node_shared_ptr(1))) { - newSubtract = std::make_shared>( + newSubtract = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{}, - ngraph::op::TemporaryReplaceOutputType(convert->input_value(0), element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(subtract->input_value(1), element::f32).get()); + ov::op::TemporaryReplaceOutputType(convert->input_value(0), element::f32).get(), + ov::op::TemporaryReplaceOutputType(subtract->input_value(1), element::f32).get()); NetworkHelper::setOutDataPrecisionForTypeRelaxed(newSubtract, subtract->get_output_element_type(0)); replace_node(subtract, newSubtract); } @@ -86,17 +86,17 @@ bool FuseConvertTransformation::transform(TransformationContext& context, ngraph auto subtract = ov::as_type_ptr(op); newOp = removeConvertIfPossibleForSubtract(convert, subtract); } else if (ov::is_type(op)) { - newOp = std::make_shared>( + newOp = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{}, - ngraph::op::TemporaryReplaceOutputType(convert->input_value(0), element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(op->input_value(1), element::f32).get()); + ov::op::TemporaryReplaceOutputType(convert->input_value(0), element::f32).get(), + ov::op::TemporaryReplaceOutputType(op->input_value(1), element::f32).get()); NetworkHelper::setOutDataPrecisionForTypeRelaxed(newOp, op->get_output_element_type(0)); replace_node(op, newOp); } else if (ov::is_type(op)) { - newOp = std::make_shared>( + newOp = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{}, - ngraph::op::TemporaryReplaceOutputType(convert->input_value(0), element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(op->input_value(1), element::f32).get()); + ov::op::TemporaryReplaceOutputType(convert->input_value(0), element::f32).get(), + ov::op::TemporaryReplaceOutputType(op->input_value(1), element::f32).get()); NetworkHelper::setOutDataPrecisionForTypeRelaxed(newOp, op->get_output_element_type(0)); replace_node(op, newOp); } diff --git a/src/common/low_precision_transformations/src/fuse_multiply_to_fake_quantize.cpp b/src/common/low_precision_transformations/src/fuse_multiply_to_fake_quantize.cpp index 10098245d8f..89f0edbde7d 100644 --- a/src/common/low_precision_transformations/src/fuse_multiply_to_fake_quantize.cpp +++ b/src/common/low_precision_transformations/src/fuse_multiply_to_fake_quantize.cpp @@ -68,7 +68,7 @@ bool FuseMultiplyToFakeQuantizeTransformation::transform(TransformationContext& NetworkHelper::copyInfo(fakeQuantize->get_input_node_shared_ptr(3), outputLowConst_f32); NetworkHelper::copyInfo(fakeQuantize->get_input_node_shared_ptr(4), outputHighConst_f32); - auto newFakeQuantize = std::make_shared>( + auto newFakeQuantize = std::make_shared>( opset1::FakeQuantize( fakeQuantize->input_value(0), inputLow, diff --git a/src/common/low_precision_transformations/src/fuse_subtract_to_fake_quantize.cpp b/src/common/low_precision_transformations/src/fuse_subtract_to_fake_quantize.cpp index f5586ffcf1f..bc5419bf810 100644 --- a/src/common/low_precision_transformations/src/fuse_subtract_to_fake_quantize.cpp +++ b/src/common/low_precision_transformations/src/fuse_subtract_to_fake_quantize.cpp @@ -67,7 +67,7 @@ bool FuseSubtractToFakeQuantizeTransformation::transform(TransformationContext& NetworkHelper::copyInfo(fakeQuantize->get_input_node_shared_ptr(3), outputLowConst_f32); NetworkHelper::copyInfo(fakeQuantize->get_input_node_shared_ptr(4), outputHighConst_f32); - auto newFakeQuantize = std::make_shared>( + auto newFakeQuantize = std::make_shared>( opset1::FakeQuantize( fakeQuantize->input_value(0), inputLow, diff --git a/src/common/low_precision_transformations/src/low_precision.cpp b/src/common/low_precision_transformations/src/low_precision.cpp index 2cb6c3d0ad3..dd642dc22cf 100644 --- a/src/common/low_precision_transformations/src/low_precision.cpp +++ b/src/common/low_precision_transformations/src/low_precision.cpp @@ -109,7 +109,7 @@ void make_matcher_type_relaxed(ngraph::pass::GraphRewrite* transformation) { if (!l_node) { THROW_TRANSFORMATION_EXCEPTION << "unexpected operation type for type relaxed conversion"; } - if (std::dynamic_pointer_cast(l_node)) { + if (std::dynamic_pointer_cast(l_node)) { return false; } @@ -125,7 +125,7 @@ void make_matcher_type_relaxed(ngraph::pass::GraphRewrite* transformation) { outputPrecisions.push_back(output.get_element_type()); } - auto replacement = std::make_shared>(*l_node, inputPrecisions, outputPrecisions); + auto replacement = std::make_shared>(*l_node, inputPrecisions, outputPrecisions); copy_runtime_info(l_node, replacement); replace_node(l_node, replacement); @@ -178,11 +178,11 @@ bool ngraph::pass::low_precision::MarkupOptimizations::run_on_model(const std::s if (!quantizationRestrictions.empty()) { markup.register_pass(quantizationRestrictions); } - if (ngraph::op::util::has_op_with_type(f)) { + if (ov::op::util::has_op_with_type(f)) { markup.register_pass(params.defaultPrecisions); } markup.register_pass(params); - if (ngraph::op::util::has_op_with_type(f)) { + if (ov::op::util::has_op_with_type(f)) { markup.register_pass(params.defaultPrecisions); markup.register_pass(params.defaultPrecisions); } @@ -201,8 +201,8 @@ bool ngraph::pass::low_precision::LowPrecision::run_on_model(const std::shared_p const std::vector supportedTypes = {ngraph::element::i8, ngraph::element::u8}; ADD_MATCHER(prerequisites, PullReshapeThroughDequantization, supportedTypes) ADD_MATCHER(prerequisites, PullTransposeThroughDequantization, supportedTypes) - using namespace ngraph::pass; using namespace ngraph::pass::low_precision; + using namespace ov::pass; ADD_MATCHER(prerequisites, LinOpSequenceFusion) ADD_MATCHER(prerequisites, MoveFakeQuantize) diff --git a/src/common/low_precision_transformations/src/mat_mul.cpp b/src/common/low_precision_transformations/src/mat_mul.cpp index 0ce809df1db..c8970fb2d73 100644 --- a/src/common/low_precision_transformations/src/mat_mul.cpp +++ b/src/common/low_precision_transformations/src/mat_mul.cpp @@ -80,10 +80,10 @@ bool MatMulTransformation::transform(TransformationContext &context, ngraph::pat dequantization2 = NetworkHelper::getDequantization(matMul, defaultPrecisions, 1); } - const std::shared_ptr newMatMul = std::make_shared>( + const std::shared_ptr newMatMul = std::make_shared>( std::vector({ deqPrecision, deqPrecision }), std::vector({ deqPrecision }), - ngraph::op::TemporaryReplaceOutputType(dequantization1.data, deqPrecision).get(), - ngraph::op::TemporaryReplaceOutputType(dequantization2.data, deqPrecision).get(), + ov::op::TemporaryReplaceOutputType(dequantization1.data, deqPrecision).get(), + ov::op::TemporaryReplaceOutputType(dequantization2.data, deqPrecision).get(), matMul->get_transpose_a(), matMul->get_transpose_b()); NetworkHelper::copyInfo(matMul, newMatMul); @@ -162,11 +162,11 @@ bool MatMulTransformation::transform(TransformationContext &context, ngraph::pat mulConst1, foldConvert(mulConst2, element::f32))); - const auto newMultiply = std::make_shared>( + const auto newMultiply = std::make_shared>( std::vector{ deqPrecision, deqPrecision }, std::vector{ dequantization1.multiply->get_output_element_type(0) }, - ngraph::op::TemporaryReplaceOutputType(parent, deqPrecision).get(), - ngraph::op::TemporaryReplaceOutputType(newMulConst, deqPrecision).get()); + ov::op::TemporaryReplaceOutputType(parent, deqPrecision).get(), + ov::op::TemporaryReplaceOutputType(newMulConst, deqPrecision).get()); newMultiply->set_friendly_name(newMatMul->get_friendly_name() + "/DequantizationMultiply"); diff --git a/src/common/low_precision_transformations/src/multiply.cpp b/src/common/low_precision_transformations/src/multiply.cpp index 0aaae7b5788..c11c41776e3 100644 --- a/src/common/low_precision_transformations/src/multiply.cpp +++ b/src/common/low_precision_transformations/src/multiply.cpp @@ -82,11 +82,11 @@ bool MultiplyTransformation::transform(TransformationContext& context, ngraph::p auto multiplyParentParent = multiplyParent.get_node_shared_ptr()->input_value(multiplyBranch.second); auto multiplyParentConst = multiplyParent.get_node_shared_ptr()->input_value(multiplyBranch.second == 0 ? 1 : 0); - newMultiply = std::make_shared>( + newMultiply = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ multiply->get_output_element_type(0) }, - ngraph::op::TemporaryReplaceOutputType(multiplyParentParent, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType( + ov::op::TemporaryReplaceOutputType(multiplyParentParent, element::f32).get(), + ov::op::TemporaryReplaceOutputType( fold( foldConvert(multiplyParentConst, element::f32), foldConvert(constParent, element::f32)), @@ -133,11 +133,11 @@ bool MultiplyTransformation::transform(TransformationContext& context, ngraph::p dequantizationFullPath.subtract, newMultiplyValuesFullPath); - newMultiply = std::make_shared>( + newMultiply = std::make_shared>( std::vector{element::f32, element::f32}, std::vector{ multiply->get_output_element_type(0) }, - ngraph::op::TemporaryReplaceOutputType(inputs[0], element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(inputs[1], element::f32).get()); + ov::op::TemporaryReplaceOutputType(inputs[0], element::f32).get(), + ov::op::TemporaryReplaceOutputType(inputs[1], element::f32).get()); NetworkHelper::copyInfo(multiply, newMultiply); } diff --git a/src/common/low_precision_transformations/src/multiply_to_group_convolution.cpp b/src/common/low_precision_transformations/src/multiply_to_group_convolution.cpp index 4982330db4c..222c4e2341d 100644 --- a/src/common/low_precision_transformations/src/multiply_to_group_convolution.cpp +++ b/src/common/low_precision_transformations/src/multiply_to_group_convolution.cpp @@ -115,11 +115,11 @@ bool MultiplyToGroupConvolutionTransformation::transform(TransformationContext& ngraph::CoordinateDiff pads(spatialDimsSize, 0ul); ngraph::Strides dilations(spatialDimsSize, 1ul); - const auto convolution = std::make_shared>( + const auto convolution = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ element::f32 }, - ngraph::op::TemporaryReplaceOutputType(dequantization.data, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(weightsNode, element::f32).get(), + ov::op::TemporaryReplaceOutputType(dequantization.data, element::f32).get(), + ov::op::TemporaryReplaceOutputType(weightsNode, element::f32).get(), strides, pads, pads, diff --git a/src/common/low_precision_transformations/src/mvn.cpp b/src/common/low_precision_transformations/src/mvn.cpp index e059d0efbb0..a58038b856d 100644 --- a/src/common/low_precision_transformations/src/mvn.cpp +++ b/src/common/low_precision_transformations/src/mvn.cpp @@ -166,7 +166,7 @@ bool MVNTransformation::transform(TransformationContext &context, ngraph::patter NetworkHelper::setOutDataPrecisionForTypeRelaxed(newMVN, deqPrecision); NetworkHelper::copyInfo(mvn, newMVN); - auto newMultiply = std::make_shared>( + auto newMultiply = std::make_shared>( opset1::Multiply(newMVN, newScalesConst), mvn->get_output_element_type(0)); ngraph::copy_runtime_info({ mvn, newMultiply }, newMultiply); diff --git a/src/common/low_precision_transformations/src/network_helper.cpp b/src/common/low_precision_transformations/src/network_helper.cpp index 379288fb5a3..2c17304548d 100644 --- a/src/common/low_precision_transformations/src/network_helper.cpp +++ b/src/common/low_precision_transformations/src/network_helper.cpp @@ -108,7 +108,7 @@ std::shared_ptr NetworkHelper::foldDequantizationConstant( inputs[0] = foldingConstant; const auto op = operation->clone_with_new_inputs(inputs); - if (std::dynamic_pointer_cast(op)) { + if (std::dynamic_pointer_cast(op)) { setOutDataPrecisionForTypeRelaxed(op, inputs[0].get_element_type()); } @@ -266,18 +266,18 @@ std::shared_ptr NetworkHelper::swapMultiplyAndAdd(std::shared_ptroutput(0); - std::shared_ptr newAdd = std::make_shared>( + std::shared_ptr newAdd = std::make_shared>( std::vector{element::f32, element::f32}, std::vector{ x.get_element_type() }, - ngraph::op::TemporaryReplaceOutputType(inputs[0], element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(inputs[1], element::f32).get()); + ov::op::TemporaryReplaceOutputType(inputs[0], element::f32).get(), + ov::op::TemporaryReplaceOutputType(inputs[1], element::f32).get()); copyInfo(addAfterMultiply, newAdd); - auto newMultiply = std::make_shared>( + auto newMultiply = std::make_shared>( std::vector{element::f32, element::f32}, std::vector{ multiply->get_output_element_type(0) }, - ngraph::op::TemporaryReplaceOutputType(newAdd->output(0), element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(a->output(0), element::f32).get()); + ov::op::TemporaryReplaceOutputType(newAdd->output(0), element::f32).get(), + ov::op::TemporaryReplaceOutputType(a->output(0), element::f32).get()); copyInfo({ multiply, newMultiply }, newMultiply); replace_node(addAfterMultiply, newMultiply); @@ -454,7 +454,7 @@ std::shared_ptr NetworkHelper::optimizeMultipliesAfter } auto nextMultiplyInput = *multiply->output(0).get_target_inputs().begin(); - auto nextMultiply = ov::as_type_ptr>(nextMultiplyInput.get_node()->shared_from_this()); + auto nextMultiply = ov::as_type_ptr>(nextMultiplyInput.get_node()->shared_from_this()); if (nextMultiply) { auto constant2 = getConstantInput(nextMultiply); if (!constant2 || constant2->output(0).get_target_inputs().size() != 1) { @@ -474,11 +474,11 @@ std::shared_ptr NetworkHelper::optimizeMultipliesAfter auto inputPrecision1 = nextMultiply->get_origin_input_type(1); auto outputPrecision = nextMultiply->get_overridden_output_type(0); auto newMultiply = - std::make_shared>( + std::make_shared>( std::vector{ inputPrecision0, inputPrecision1 }, std::vector{ outputPrecision }, - ngraph::op::TemporaryReplaceOutputType(newInput, inputPrecision0).get(), - ngraph::op::TemporaryReplaceOutputType(multiplyResult, inputPrecision1).get()); + ov::op::TemporaryReplaceOutputType(newInput, inputPrecision0).get(), + ov::op::TemporaryReplaceOutputType(multiplyResult, inputPrecision1).get()); copy_runtime_info(multiply, newMultiply); replace_node(nextMultiply, newMultiply); return newMultiply; @@ -653,14 +653,14 @@ std::shared_ptr NetworkHelper::fuseConvert(const std::shar } - std::shared_ptr newFakeQuantize = std::make_shared>( + std::shared_ptr newFakeQuantize = std::make_shared>( std::vector{ element::f32, element::f32, element::f32, element::f32, element::f32 }, std::vector{}, - ngraph::op::TemporaryReplaceOutputType(fakeQuantize->input_value(0), element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(fakeQuantize->input_value(1), element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(fakeQuantize->input_value(2), element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(fakeQuantize->input_value(3), element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(fakeQuantize->input_value(4), element::f32).get(), + ov::op::TemporaryReplaceOutputType(fakeQuantize->input_value(0), element::f32).get(), + ov::op::TemporaryReplaceOutputType(fakeQuantize->input_value(1), element::f32).get(), + ov::op::TemporaryReplaceOutputType(fakeQuantize->input_value(2), element::f32).get(), + ov::op::TemporaryReplaceOutputType(fakeQuantize->input_value(3), element::f32).get(), + ov::op::TemporaryReplaceOutputType(fakeQuantize->input_value(4), element::f32).get(), fakeQuantize->get_levels()); NetworkHelper::setOutDataPrecisionForTypeRelaxed(newFakeQuantize, node->get_output_element_type(0)); newFakeQuantize->set_friendly_name(node->get_friendly_name()); @@ -718,10 +718,10 @@ std::shared_ptr NetworkHelper::foldFakeQuantize( ov::is_type(fq->get_input_node_shared_ptr(2)) && ov::is_type(fq->get_input_node_shared_ptr(3)) && ov::is_type(fq->get_input_node_shared_ptr(4)) && - op::util::constantIsEqualTo(ov::as_type_ptr(fq->get_input_node_shared_ptr(1)), 0.f) && - op::util::constantIsEqualTo(ov::as_type_ptr(fq->get_input_node_shared_ptr(2)), 254.f) && - op::util::constantIsEqualTo(ov::as_type_ptr(fq->get_input_node_shared_ptr(3)), -127.f) && - op::util::constantIsEqualTo(ov::as_type_ptr(fq->get_input_node_shared_ptr(4)), 127.f)) { + ov::op::util::constantIsEqualTo(ov::as_type_ptr(fq->get_input_node_shared_ptr(1)), 0.f) && + ov::op::util::constantIsEqualTo(ov::as_type_ptr(fq->get_input_node_shared_ptr(2)), 254.f) && + ov::op::util::constantIsEqualTo(ov::as_type_ptr(fq->get_input_node_shared_ptr(3)), -127.f) && + ov::op::util::constantIsEqualTo(ov::as_type_ptr(fq->get_input_node_shared_ptr(4)), 127.f)) { const auto type1 = fq->input_value(0).get_element_type(); const auto type2 = fq->input_value(3).get_element_type(); if (type1.is_real() && type2.is_real()) { @@ -879,7 +879,7 @@ std::shared_ptr NetworkHelper::composeFakeQuantize(const s std::shared_ptr newFakeQuantize = fakeQuantize; if (dequantization.convert != nullptr) { - const std::shared_ptr replacement = std::make_shared>( + const std::shared_ptr replacement = std::make_shared>( newFakeQuantize->input_value(0), newFakeQuantize->input_value(1), newFakeQuantize->input_value(2), @@ -899,7 +899,7 @@ std::shared_ptr NetworkHelper::composeFakeQuantize(const s dequantization.subtractConstant : foldConvert(dequantization.subtractConstant->output(0), dequantization.subtractConvert->get_destination_type()); - const std::shared_ptr replacement = std::make_shared>( + const std::shared_ptr replacement = std::make_shared>( newFakeQuantize->input_value(0), newFakeQuantize->input_value(1), newFakeQuantize->input_value(2), @@ -933,7 +933,7 @@ std::shared_ptr NetworkHelper::composeFakeQuantize(const s return output; }; - const std::shared_ptr replacement = std::make_shared>( + const std::shared_ptr replacement = std::make_shared>( newFakeQuantize->input_value(0ul), newFakeQuantize->input_value(1ul), newFakeQuantize->input_value(2ul), @@ -1058,7 +1058,7 @@ std::tuple, std::shared_ptr> NetworkHelper::decompos // Build a substitution sub-graph: std::shared_ptr newFQ = fold_fake_quantize( - std::make_shared>( + std::make_shared>( fq->input_value(0), getSingleConsumerConstant(fq->input_value(1)), getSingleConsumerConstant(fq->input_value(2)), @@ -1098,18 +1098,18 @@ std::tuple, std::shared_ptr> NetworkHelper::decompos // TODO: why type relaxed? const std::shared_ptr sub = shift == nullptr ? nullptr : - std::make_shared>(convert2 == nullptr ? newFQ : convert2, shift); + std::make_shared>(convert2 == nullptr ? newFQ : convert2, shift); if (sub != nullptr) { sub->set_friendly_name(newFQ->get_friendly_name() + "/DequantizationSubtract"); ngraph::copy_runtime_info({ newFQ, sub }, sub); } const auto dequantize = - std::make_shared>( + std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ fq->get_output_element_type(0) }, - ngraph::op::TemporaryReplaceOutputType(sub == nullptr ? (convert2 == nullptr ? newFQ : convert2) : sub, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(scale, element::f32).get()); + ov::op::TemporaryReplaceOutputType(sub == nullptr ? (convert2 == nullptr ? newFQ : convert2) : sub, element::f32).get(), + ov::op::TemporaryReplaceOutputType(scale, element::f32).get()); dequantize->set_friendly_name(newFQ->get_friendly_name() + "/DequantizationMultiply"); ngraph::copy_runtime_info({ newFQ, dequantize }, dequantize); @@ -1129,7 +1129,7 @@ std::shared_ptr NetworkHelper::updateFakeQuantize( auto newOutMin = std::make_shared(fq->get_output_element_type(0), Shape{}, min); auto newOutMax = std::make_shared(fq->get_output_element_type(0), Shape{}, max); - std::shared_ptr newFQ = std::make_shared>( + std::shared_ptr newFQ = std::make_shared>( fq->input_value(0), newInMin, newInMax, @@ -1174,7 +1174,7 @@ FakeQuantizeDequantization NetworkHelper::makeDequantization( std::shared_ptr subtract; std::shared_ptr subtractConstant; if (std::abs(dequantizationSub) > 1e-6) { - subtract = std::make_shared>( + subtract = std::make_shared>( parent, std::make_shared(deqPrecision, ngraph::Shape({}), std::vector({ dequantizationSub }))); subtract->set_output_type(0, deqPrecision, subtract->get_output_partial_shape(0)); @@ -1183,7 +1183,7 @@ FakeQuantizeDequantization NetworkHelper::makeDequantization( // mandatory auto multiplyConstant = std::make_shared(deqPrecision, ngraph::Shape({}), std::vector({ dequantizationMul })); - auto multiply = std::make_shared>( + auto multiply = std::make_shared>( opset1::Multiply(parent, multiplyConstant), originalPrecision); @@ -1233,7 +1233,7 @@ FakeQuantizeDequantization NetworkHelper::createDequantizationFromFakeQuantize( std::shared_ptr shiftConst = ov::as_type_ptr(shift); if (isScalarLike(shiftConst)) { auto scalar = toScalar(shiftConst); - if (op::util::constantIsEqualTo(scalar, 0)) { + if (ov::op::util::constantIsEqualTo(scalar, 0)) { shift = nullptr; } } @@ -1254,7 +1254,7 @@ FakeQuantizeDequantization NetworkHelper::createDequantizationFromFakeQuantize( std::shared_ptr subtract; if (shift != nullptr) { - subtract = std::make_shared>(parent, shift); + subtract = std::make_shared>(parent, shift); subtract->set_output_type(0, deqPrecision, subtract->get_output_partial_shape(0)); parent = subtract; } else { @@ -1525,7 +1525,7 @@ bool NetworkHelper::isZeroConst(const std::shared_ptr& node) { if (NetworkHelper::isScalarLike(constant)) { auto scalar = NetworkHelper::toScalar(constant); - if (op::util::constantIsEqualTo(scalar, 0)) { + if (ov::op::util::constantIsEqualTo(scalar, 0)) { return true; } else { return false; @@ -1573,7 +1573,7 @@ std::shared_ptr NetworkHelper::optimizeSubtract(std::shared_ptrget_input_node_shared_ptr(0)); roundedShift = nullptr; } @@ -1583,7 +1583,7 @@ std::shared_ptr NetworkHelper::optimizeSubtract(std::shared_ptr>(data, roundedShift->output(0)); + replacement = std::make_shared>(data, roundedShift->output(0)); NetworkHelper::copyInfo(subtract, replacement); NetworkHelper::setOutDataPrecisionForTypeRelaxed(replacement, convertOutputType); replace_node(subtract, replacement); @@ -1624,7 +1624,7 @@ NetworkHelper::InsertDequantizationResult NetworkHelper::moveDequantizationAfter newOperation->set_friendly_name(operation->get_friendly_name()); ngraph::copy_runtime_info(operation, newOperation); - if (const auto op = std::dynamic_pointer_cast(newOperation)) { + if (const auto op = std::dynamic_pointer_cast(newOperation)) { op->set_overridden_output_type(updatePrecision ? newOperation->get_input_element_type(0) : dequantization.multiplyConstant->get_element_type()); @@ -1651,10 +1651,10 @@ NetworkHelper::InsertDequantizationResult NetworkHelper::moveDequantizationAfter dequantization.subtractConstant->get_element_type(); } - parent = std::make_shared>( + parent = std::make_shared>( element::TypeVector{ element::f32, element::f32 }, element::TypeVector{ element::f32 }, - op::TemporaryReplaceOutputType(parent, element::f32).get(), - op::TemporaryReplaceOutputType(foldConvert(dequantization.subtractConstant, parentPrecision), element::f32).get()); + ov::op::TemporaryReplaceOutputType(parent, element::f32).get(), + ov::op::TemporaryReplaceOutputType(foldConvert(dequantization.subtractConstant, parentPrecision), element::f32).get()); ngraph::copy_runtime_info({ newOperation, parent }, parent); } else { // Subtract constant could be changed (including a shape) before propagation in some cases @@ -1674,7 +1674,7 @@ NetworkHelper::InsertDequantizationResult NetworkHelper::moveDequantizationAfter dequantization.multiplyConstant->get_element_type(); } - parent = std::make_shared>( + parent = std::make_shared>( opset1::Multiply(parent, foldConvert(dequantization.multiplyConstant, parentPrecision)), dequantization.multiply->get_output_element_type(0)); ngraph::copy_runtime_info({ newOperation, parent }, parent); @@ -1743,10 +1743,10 @@ NetworkHelper::InsertDequantizationResult NetworkHelper::moveDequantizationBefor dequantization.subtractConstant->get_element_type(); } auto subtractConstant = subtractConstants.size() ? subtractConstants[0][i] : dequantization.subtractConstant; - parent = std::make_shared>( + parent = std::make_shared>( std::vector{element::f32, element::f32}, std::vector{ element::f32 }, - ngraph::op::TemporaryReplaceOutputType(parent, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType( + ov::op::TemporaryReplaceOutputType(parent, element::f32).get(), + ov::op::TemporaryReplaceOutputType( subtractConstant->output(0).get_element_type() == parentPrecision ? subtractConstant : foldConvert(subtractConstant, parentPrecision), element::f32).get()); @@ -1769,7 +1769,7 @@ NetworkHelper::InsertDequantizationResult NetworkHelper::moveDequantizationBefor ", multiply dequantization constant " << multiplyConstant->get_friendly_name() << ":" << multiplyConstant->get_element_type(); } - parent = std::make_shared>( + parent = std::make_shared>( opset1::Multiply(parent, multiplyConstant->output(0).get_element_type() == parentPrecision ? multiplyConstant : @@ -1791,7 +1791,7 @@ NetworkHelper::InsertDequantizationResult NetworkHelper::moveDequantizationBefor } replace_node(dequantization.multiply, newOperation); - if (const auto op = std::dynamic_pointer_cast(newOperation)) { + if (const auto op = std::dynamic_pointer_cast(newOperation)) { op->set_overridden_output_type(updatePrecision ? newOperation->get_input_element_type(0) : dequantization.multiplyConstant->get_element_type()); diff --git a/src/common/low_precision_transformations/src/normalize_l2.cpp b/src/common/low_precision_transformations/src/normalize_l2.cpp index c747758ed7e..d9b6a2d9d00 100644 --- a/src/common/low_precision_transformations/src/normalize_l2.cpp +++ b/src/common/low_precision_transformations/src/normalize_l2.cpp @@ -125,20 +125,20 @@ bool NormalizeL2Transformation::transform(TransformationContext &context, ngraph } } - auto newNormalize = std::make_shared>( + auto newNormalize = std::make_shared>( std::vector{ element::f32, axes->output(0).get_element_type() }, std::vector{deqPrecision}, - ngraph::op::TemporaryReplaceOutputType(dequantization.subtract == nullptr ? dequantization.data : dequantization.subtract, element::f32).get(), + ov::op::TemporaryReplaceOutputType(dequantization.subtract == nullptr ? dequantization.data : dequantization.subtract, element::f32).get(), axes, normalize->get_eps(), normalize->get_eps_mode()); NetworkHelper::copyInfo(normalize, newNormalize); - auto newMultiply = std::make_shared>( + auto newMultiply = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{normalize->get_output_element_type(0)}, - ngraph::op::TemporaryReplaceOutputType(newNormalize, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(newScalesConst, element::f32).get()); + ov::op::TemporaryReplaceOutputType(newNormalize, element::f32).get(), + ov::op::TemporaryReplaceOutputType(newScalesConst, element::f32).get()); NetworkHelper::insertDequantizationAfter(normalize, newMultiply, newNormalize); ngraph::copy_runtime_info({ normalize, newMultiply }, newMultiply); diff --git a/src/common/low_precision_transformations/src/split.cpp b/src/common/low_precision_transformations/src/split.cpp index 6fca1bb773c..aec4408d38d 100644 --- a/src/common/low_precision_transformations/src/split.cpp +++ b/src/common/low_precision_transformations/src/split.cpp @@ -95,7 +95,7 @@ bool SplitTransformation::transform(TransformationContext& context, ngraph::patt parent = subtract; } - const auto multiply = std::make_shared>(parent, splitedMul[i]); + const auto multiply = std::make_shared>(parent, splitedMul[i]); NetworkHelper::setOutDataPrecisionForTypeRelaxed(multiply, dequantization.multiply->get_output_element_type(0)); copy_runtime_info({ newSplit, multiply }, multiply); diff --git a/src/common/low_precision_transformations/src/subtract.cpp b/src/common/low_precision_transformations/src/subtract.cpp index 1d2248b9aa4..80a78951c64 100644 --- a/src/common/low_precision_transformations/src/subtract.cpp +++ b/src/common/low_precision_transformations/src/subtract.cpp @@ -85,7 +85,7 @@ bool SubtractTransformation::transform(TransformationContext& context, ngraph::p // std::shared_ptr newSubtract = NetworkHelper::optimizeElementwise(subtract); subtract->set_output_type(0, originalPrecision, subtract->get_output_partial_shape(0)); - replace_node(subtract, std::make_shared>( + replace_node(subtract, std::make_shared>( subtract->input_value(0), subtract->input_value(1))); } diff --git a/src/common/low_precision_transformations/tests/align_concat_quantization_parameters_transformation.cpp b/src/common/low_precision_transformations/tests/align_concat_quantization_parameters_transformation.cpp index 5ece6abbb26..2efbe05fae8 100644 --- a/src/common/low_precision_transformations/tests/align_concat_quantization_parameters_transformation.cpp +++ b/src/common/low_precision_transformations/tests/align_concat_quantization_parameters_transformation.cpp @@ -123,7 +123,7 @@ public: }; TEST_P(AlignConcatQuantizationParametersTransformation, CompareFunctions) { - InitNodeInfo().run_on_model(actualFunction); + ov::pass::InitNodeInfo().run_on_model(actualFunction); actualFunction->validate_nodes_and_infer_types(); auto res = compare_functions(actualFunction, referenceFunction, true, true); diff --git a/src/common/low_precision_transformations/tests/avg_pool_transformation.cpp b/src/common/low_precision_transformations/tests/avg_pool_transformation.cpp index a9e2016c767..391f2e4fa9a 100644 --- a/src/common/low_precision_transformations/tests/avg_pool_transformation.cpp +++ b/src/common/low_precision_transformations/tests/avg_pool_transformation.cpp @@ -104,7 +104,7 @@ public: }; TEST_P(AvgPoolTransformation, CompareFunctions) { - InitNodeInfo().run_on_model(actualFunction); + ov::pass::InitNodeInfo().run_on_model(actualFunction); actualFunction->validate_nodes_and_infer_types(); auto res = compare_functions(actualFunction, referenceFunction, true, true); diff --git a/src/common/low_precision_transformations/tests/avg_pool_with_child_transformation.cpp b/src/common/low_precision_transformations/tests/avg_pool_with_child_transformation.cpp index 0cc093645ec..a90f42629ee 100644 --- a/src/common/low_precision_transformations/tests/avg_pool_with_child_transformation.cpp +++ b/src/common/low_precision_transformations/tests/avg_pool_with_child_transformation.cpp @@ -104,7 +104,7 @@ public: }; TEST_P(AvgPoolWithChildTransformation, CompareFunctions) { - InitNodeInfo().run_on_model(actualFunction); + ov::pass::InitNodeInfo().run_on_model(actualFunction); actualFunction->validate_nodes_and_infer_types(); auto res = compare_functions(actualFunction, referenceFunction, true, true); diff --git a/src/common/low_precision_transformations/tests/convolution_with_incorrect_weights.cpp b/src/common/low_precision_transformations/tests/convolution_with_incorrect_weights.cpp index 7fdb15d8edf..3d07741df40 100644 --- a/src/common/low_precision_transformations/tests/convolution_with_incorrect_weights.cpp +++ b/src/common/low_precision_transformations/tests/convolution_with_incorrect_weights.cpp @@ -91,7 +91,7 @@ public: }; TEST_P(ConvolutionWithIncorrectWeightsTransformation, CompareFunctions) { - ngraph::pass::InitNodeInfo().run_on_model(actualFunction); + ov::pass::InitNodeInfo().run_on_model(actualFunction); actualFunction->validate_nodes_and_infer_types(); auto res = compare_functions(actualFunction, referenceFunction, true); diff --git a/src/common/low_precision_transformations/tests/get_dequantization_test.cpp b/src/common/low_precision_transformations/tests/get_dequantization_test.cpp index 4f77f4d402d..f3acdd1565d 100644 --- a/src/common/low_precision_transformations/tests/get_dequantization_test.cpp +++ b/src/common/low_precision_transformations/tests/get_dequantization_test.cpp @@ -69,7 +69,7 @@ std::vector subDataInput = {0ul, 1ul}; std::vector mulDataInput = {0ul, 1ul}; TEST_P(GetDequantizationTestTransformation, CompareFunctions) { - InitNodeInfo().run_on_model(actualFunction); + ov::pass::InitNodeInfo().run_on_model(actualFunction); actualFunction->validate_nodes_and_infer_types(); auto res = compare_functions(actualFunction, referenceFunction, true); diff --git a/src/common/low_precision_transformations/tests/lpt_avoid_shapeof_propagation_test.cpp b/src/common/low_precision_transformations/tests/lpt_avoid_shapeof_propagation_test.cpp index 8efaa33e2c2..678bb511ccc 100644 --- a/src/common/low_precision_transformations/tests/lpt_avoid_shapeof_propagation_test.cpp +++ b/src/common/low_precision_transformations/tests/lpt_avoid_shapeof_propagation_test.cpp @@ -372,7 +372,7 @@ TEST(LPT, AvoidDequantizationToShapeOfPropagationMVNTransformation) { auto convert = std::make_shared(input, element::f32); auto mul = std::make_shared(convert, opset1::Constant::create(element::f32, {}, {2.f})); - auto MVN = std::make_shared>(mul); + auto MVN = std::make_shared>(mul); auto shapeOf = std::make_shared(MVN); auto result1 = std::make_shared(MVN); diff --git a/src/common/low_precision_transformations/tests/markup_avg_pool_precisions_transformation.cpp b/src/common/low_precision_transformations/tests/markup_avg_pool_precisions_transformation.cpp index 71f35ae8679..3432b5ee4a9 100644 --- a/src/common/low_precision_transformations/tests/markup_avg_pool_precisions_transformation.cpp +++ b/src/common/low_precision_transformations/tests/markup_avg_pool_precisions_transformation.cpp @@ -129,7 +129,7 @@ public: }; TEST_P(MarkupAvgPoolPrecisionsTransformation, CompareFunctions) { - InitNodeInfo().run_on_function(actualFunction); + ov::pass::InitNodeInfo().run_on_function(actualFunction); actualFunction->validate_nodes_and_infer_types(); const auto avgPoolOperations = LayerTransformation::get(actualFunction); diff --git a/src/common/low_precision_transformations/tests/prelu_transformation.cpp b/src/common/low_precision_transformations/tests/prelu_transformation.cpp index 9a203f1c47a..fcf3e2258c3 100644 --- a/src/common/low_precision_transformations/tests/prelu_transformation.cpp +++ b/src/common/low_precision_transformations/tests/prelu_transformation.cpp @@ -85,7 +85,7 @@ protected: }; TEST_P(PReluTransformation, CompareFunctions) { - InitNodeInfo().run_on_model(actualFunction); + ov::pass::InitNodeInfo().run_on_model(actualFunction); actualFunction->validate_nodes_and_infer_types(); auto res = compare_functions(actualFunction, referenceFunction, true, true); ASSERT_TRUE(res.first) << res.second; diff --git a/src/common/low_precision_transformations/tests/pull_reshape_through_dequantization_transformation.cpp b/src/common/low_precision_transformations/tests/pull_reshape_through_dequantization_transformation.cpp index b35b3dd39d2..14e8f4361ce 100644 --- a/src/common/low_precision_transformations/tests/pull_reshape_through_dequantization_transformation.cpp +++ b/src/common/low_precision_transformations/tests/pull_reshape_through_dequantization_transformation.cpp @@ -89,7 +89,7 @@ public: const std::vector supportedTypes = {ngraph::element::i8, ngraph::element::u8}; decomp->add_matcher(supportedTypes); decomp->add_matcher(supportedTypes); - decomp->add_matcher(); + decomp->add_matcher(); manager.run_passes(actualFunction); referenceFunction = ngraph::builder::subgraph::FakeQuantizeAndConvolutionFunction::get( diff --git a/src/common/low_precision_transformations/tests/pull_transpose_through_dequantization_transformation.cpp b/src/common/low_precision_transformations/tests/pull_transpose_through_dequantization_transformation.cpp index b87f1c23303..8b5d9a0b644 100644 --- a/src/common/low_precision_transformations/tests/pull_transpose_through_dequantization_transformation.cpp +++ b/src/common/low_precision_transformations/tests/pull_transpose_through_dequantization_transformation.cpp @@ -84,7 +84,7 @@ public: const std::vector supportedTypes = {ngraph::element::i8, ngraph::element::u8}; decomp->add_matcher(supportedTypes); decomp->add_matcher(supportedTypes); - decomp->add_matcher(); + decomp->add_matcher(); manager.run_passes(actualFunction); referenceFunction = ngraph::builder::subgraph::FakeQuantizeAndConvolutionFunction::get( diff --git a/src/common/low_precision_transformations/tests/reshape_transformation.cpp b/src/common/low_precision_transformations/tests/reshape_transformation.cpp index 1c5aab6f403..205ce7cc47a 100644 --- a/src/common/low_precision_transformations/tests/reshape_transformation.cpp +++ b/src/common/low_precision_transformations/tests/reshape_transformation.cpp @@ -84,7 +84,7 @@ public: }; TEST_P(ReshapeTransformation, CompareFunctions) { - InitNodeInfo().run_on_model(actualFunction); + ov::pass::InitNodeInfo().run_on_model(actualFunction); actualFunction->validate_nodes_and_infer_types(); auto res = compare_functions(actualFunction, referenceFunction, true, true); ASSERT_TRUE(res.first) << res.second; diff --git a/src/common/low_precision_transformations/tests/round_transformation.cpp b/src/common/low_precision_transformations/tests/round_transformation.cpp index a48ba07e03e..ac2e6d21117 100644 --- a/src/common/low_precision_transformations/tests/round_transformation.cpp +++ b/src/common/low_precision_transformations/tests/round_transformation.cpp @@ -43,7 +43,7 @@ public: if (roundedConst->get_element_type() == testValues.inputPrecision) { const auto replacement = - std::make_shared>(dequantization.data, roundedConst); + std::make_shared>(dequantization.data, roundedConst); ngraph::pass::low_precision::NetworkHelper::copyInfo(dequantization.subtract, replacement); ngraph::pass::low_precision::NetworkHelper::setOutDataPrecisionForTypeRelaxed( replacement, diff --git a/src/common/low_precision_transformations/tests/split_transformation.cpp b/src/common/low_precision_transformations/tests/split_transformation.cpp index 2ad85f1492f..9dbc5960ef8 100644 --- a/src/common/low_precision_transformations/tests/split_transformation.cpp +++ b/src/common/low_precision_transformations/tests/split_transformation.cpp @@ -89,7 +89,7 @@ public: }; TEST_P(SplitTransformation, CompareFunctions) { - InitNodeInfo().run_on_model(actualFunction); + ov::pass::InitNodeInfo().run_on_model(actualFunction); actualFunction->validate_nodes_and_infer_types(); auto res = compare_functions(actualFunction, referenceFunction, true, false); diff --git a/src/common/low_precision_transformations/tests/transpose_transformation.cpp b/src/common/low_precision_transformations/tests/transpose_transformation.cpp index 063e2e5c1f5..d44a0991f6c 100644 --- a/src/common/low_precision_transformations/tests/transpose_transformation.cpp +++ b/src/common/low_precision_transformations/tests/transpose_transformation.cpp @@ -86,7 +86,7 @@ public: }; TEST_P(TransposeTransformation, CompareFunctions) { - InitNodeInfo().run_on_model(actualFunction); + ov::pass::InitNodeInfo().run_on_model(actualFunction); actualFunction->validate_nodes_and_infer_types(); auto res = compare_functions(actualFunction, referenceFunction, true, true); ASSERT_TRUE(res.first) << res.second; diff --git a/src/common/low_precision_transformations/tests/variadic_split_transformation.cpp b/src/common/low_precision_transformations/tests/variadic_split_transformation.cpp index 4b0492161e3..3775ac933ea 100644 --- a/src/common/low_precision_transformations/tests/variadic_split_transformation.cpp +++ b/src/common/low_precision_transformations/tests/variadic_split_transformation.cpp @@ -84,7 +84,7 @@ public: }; TEST_P(VariadicSplitTransformation, CompareFunctions) { - InitNodeInfo().run_on_model(actualFunction); + ov::pass::InitNodeInfo().run_on_model(actualFunction); actualFunction->validate_nodes_and_infer_types(); auto res = compare_functions(actualFunction, referenceFunction, true, false); diff --git a/src/common/offline_transformations/src/pot_transformations.cpp b/src/common/offline_transformations/src/pot_transformations.cpp index 55d430f91e0..c08a53ebd4d 100644 --- a/src/common/offline_transformations/src/pot_transformations.cpp +++ b/src/common/offline_transformations/src/pot_transformations.cpp @@ -13,10 +13,10 @@ bool ngraph::pass::POTTransformations::run_on_model(const std::shared_ptr& f) { ngraph::pass::Manager manager(get_pass_config()); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); return false; } diff --git a/src/common/snippets/src/op/subgraph.cpp b/src/common/snippets/src/op/subgraph.cpp index 7cfd6a46605..4ea864ed92f 100644 --- a/src/common/snippets/src/op/subgraph.cpp +++ b/src/common/snippets/src/op/subgraph.cpp @@ -61,7 +61,7 @@ void snippets::op::Subgraph::init_config() { config.m_is_quantized = config.m_is_quantized || ov::is_type(op); config.m_has_type_relaxed_ops = config.m_has_type_relaxed_ops || - std::dynamic_pointer_cast(op); + std::dynamic_pointer_cast(op); config.m_is_needed_to_align_precision = config.m_is_needed_to_align_precision || is_quantized() || has_type_relaxed_ops() || @@ -225,7 +225,7 @@ auto snippets::op::Subgraph::wrap_node_as_subgraph(const std::shared_ptr& target_output_node, const Output& replacement_output_node) { NGRAPH_SUPPRESS_DEPRECATED_START auto& out_tensor = target_output_node.get_tensor(); - const std::string new_name = ngraph::op::util::get_ie_output_name(replacement_output_node); + const std::string new_name = ov::op::util::get_ie_output_name(replacement_output_node); if (ov::descriptor::get_ov_tensor_legacy_name(out_tensor).empty()) { ov::descriptor::set_ov_tensor_legacy_name(out_tensor, new_name); } @@ -391,11 +391,11 @@ void snippets::op::Subgraph::align_element_types(const BlockedShapeVector& outpu ngraph::pass::Manager manager; if (config.m_is_needed_to_align_precision) { manager.register_pass(execution_element_type); - manager.register_pass(); + manager.register_pass(); // TODO [100041] : In some cases AlignElementType pass can insert extra Convert because // the pass doesn't know real precisions in real time. // We call EliminateConverts pass to remove them - manager.register_pass(); + manager.register_pass(); } manager.run_passes(body_ptr()); } diff --git a/src/common/snippets/src/pass/align_element_type.cpp b/src/common/snippets/src/pass/align_element_type.cpp index 469c82ffe22..46bf86c0972 100644 --- a/src/common/snippets/src/pass/align_element_type.cpp +++ b/src/common/snippets/src/pass/align_element_type.cpp @@ -70,7 +70,7 @@ bool ngraph::snippets::pass::AlignElementType::run_on_model(const std::shared_pt rewritten |= true; } } - if (auto tr_node = std::dynamic_pointer_cast(op)) { + if (auto tr_node = std::dynamic_pointer_cast(op)) { tr_node->set_overridden_output_type(exec_type, 0); rewritten |= true; } diff --git a/src/common/snippets/tests/src/broadcast_fusion.cpp b/src/common/snippets/tests/src/broadcast_fusion.cpp index 9e5373c6af3..d448a7fa86e 100644 --- a/src/common/snippets/tests/src/broadcast_fusion.cpp +++ b/src/common/snippets/tests/src/broadcast_fusion.cpp @@ -32,7 +32,7 @@ TEST(TransformationTests, FuseLoadWithBroadcastMoveByX) { f = std::make_shared(NodeVector{store}, ParameterVector{data0, data1}); pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -73,7 +73,7 @@ TEST(TransformationTests, NoFuseLoadWithBroadcastMoveMultipleUsers) { f = std::make_shared(NodeVector{store0, store1}, ParameterVector{data0, data1, data2}); pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/snippets/tests/src/lowering_utils.cpp b/src/common/snippets/tests/src/lowering_utils.cpp index a07fb4c0884..5f1d56036ab 100644 --- a/src/common/snippets/tests/src/lowering_utils.cpp +++ b/src/common/snippets/tests/src/lowering_utils.cpp @@ -51,7 +51,7 @@ LoweringTests::LoweringTests() : TransformationTestsF() { } void LoweringTests::SetUp() { - manager.register_pass(); + manager.register_pass(); } void LoweringTests::TearDown() { @@ -131,4 +131,4 @@ std::shared_ptr LoweringTests::getTokenizedSubgr } // namespace snippets } // namespace test -} // namespace ov \ No newline at end of file +} // namespace ov diff --git a/src/common/snippets/tests/src/memory_ops.cpp b/src/common/snippets/tests/src/memory_ops.cpp index f42f36a75da..5a458702fc4 100644 --- a/src/common/snippets/tests/src/memory_ops.cpp +++ b/src/common/snippets/tests/src/memory_ops.cpp @@ -27,7 +27,7 @@ TEST(TransformationTests, InsertLoadStore) { f = std::make_shared(NodeVector{neg}, ParameterVector{data}); pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.register_pass(); m.run_passes(f); @@ -53,7 +53,7 @@ TEST(TransformationTests, InsertLoadTwise) { f = std::make_shared(NodeVector{neg}, ParameterVector{data}); pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.register_pass(); m.run_passes(f); @@ -78,7 +78,7 @@ TEST(TransformationTests, InsertStoreTwise) { f = std::make_shared(NodeVector{neg}, ParameterVector{data}); pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.register_pass(); m.run_passes(f); diff --git a/src/common/snippets/tests/src/pass/merge_loops.cpp b/src/common/snippets/tests/src/pass/merge_loops.cpp index be398f2107f..048b3e52a76 100644 --- a/src/common/snippets/tests/src/pass/merge_loops.cpp +++ b/src/common/snippets/tests/src/pass/merge_loops.cpp @@ -55,7 +55,7 @@ TEST(TransformationTests, UnaryEltwisesLoops) { f = std::make_shared(OutputVector{outer_loop_end_down->output(0)}, ParameterVector{data}); pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -130,7 +130,7 @@ TEST(TransformationTests, BinaryEltwisesLoops) { f = std::make_shared(OutputVector{outer_loop_end_down->output(0)}, ParameterVector{data0, data1, data2}); pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } diff --git a/src/common/snippets/tests/src/pass/set_scalar_count_for_load_and_store.cpp b/src/common/snippets/tests/src/pass/set_scalar_count_for_load_and_store.cpp index 005147b5cda..9bb45a81fce 100644 --- a/src/common/snippets/tests/src/pass/set_scalar_count_for_load_and_store.cpp +++ b/src/common/snippets/tests/src/pass/set_scalar_count_for_load_and_store.cpp @@ -42,7 +42,7 @@ TEST(TransformationTests, SetScalarCountForLoad) { f = std::make_shared(NodeVector{store}, ParameterVector{data}); pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -76,7 +76,7 @@ TEST(TransformationTests, SetScalarCountForStore) { f = std::make_shared(NodeVector{store}, ParameterVector{data}); pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/snippets/tests/src/registers.cpp b/src/common/snippets/tests/src/registers.cpp index 41b94db5e3f..54fdf3aff9c 100644 --- a/src/common/snippets/tests/src/registers.cpp +++ b/src/common/snippets/tests/src/registers.cpp @@ -37,7 +37,7 @@ TEST(TransformationTests, AssignRegisters) { f->get_result()->set_friendly_name("r00"); pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -126,7 +126,7 @@ TEST(TransformationTests, AssignRegisters2) { f->get_result()->set_friendly_name("res00"); pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); 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 36758456230..68ebf321ddd 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 @@ -38,11 +38,3 @@ public: } // namespace internal } // namespace op } // namespace ov - -namespace ngraph { -namespace op { -namespace internal { -using ov::op::internal::GenerateProposalsIEInternal; -} // namespace internal -} // namespace op -} // namespace ngraph 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 5fe4c3cdac0..26750bc17a5 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 @@ -35,11 +35,3 @@ public: } // namespace internal } // namespace op } // namespace ov - -namespace ngraph { -namespace op { -namespace internal { -using ov::op::internal::MulticlassNmsIEInternal; -} // namespace internal -} // namespace op -} // namespace ngraph 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 d932335a680..9c4cb3be04a 100644 --- a/src/common/transformations/include/ov_ops/nms_ie_internal.hpp +++ b/src/common/transformations/include/ov_ops/nms_ie_internal.hpp @@ -60,11 +60,3 @@ private: } // namespace internal } // namespace op } // namespace ov - -namespace ngraph { -namespace op { -namespace internal { -using ov::op::internal::NonMaxSuppressionIEInternal; -} // namespace internal -} // namespace op -} // namespace ngraph 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 e725f14d4a3..0c4f38628dc 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 @@ -116,11 +116,3 @@ void NmsStaticShapeIE::validate_and_infer_types() { } // namespace internal } // namespace op } // namespace ov - -namespace ngraph { -namespace op { -namespace internal { -using ov::op::internal::NmsStaticShapeIE; -} // namespace internal -} // namespace op -} // namespace ngraph diff --git a/src/common/transformations/include/ov_ops/type_relaxed.hpp b/src/common/transformations/include/ov_ops/type_relaxed.hpp index 42f7e1585f9..47a791a4b0b 100644 --- a/src/common/transformations/include/ov_ops/type_relaxed.hpp +++ b/src/common/transformations/include/ov_ops/type_relaxed.hpp @@ -337,11 +337,3 @@ OPENVINO_SUPPRESS_DEPRECATED_END } // namespace op } // namespace ov - -namespace ngraph { -namespace op { -using ov::op::TemporaryReplaceOutputType; -using ov::op::TypeRelaxed; -using ov::op::TypeRelaxedBase; -} // namespace op -} // namespace ngraph 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 edd8266de79..fb2283dc2de 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 @@ -29,9 +29,3 @@ public: OPENVINO_RTTI("AddFakeQuantizeFusion", "0"); AddFakeQuantizeFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::AddFakeQuantizeFusion; -} // namespace pass -} // namespace ngraph 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 bd82e05030c..203f493b3fd 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 @@ -23,9 +23,3 @@ public: } // namespace pass } // namespace ov - -namespace ngraph { -namespace pass { -using ov::pass::AlignEltwiseInputRanks; -} // namespace pass -} // namespace ngraph 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 fdb8fedcf56..66c3de32beb 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 @@ -33,9 +33,3 @@ public: OPENVINO_RTTI("BatchToSpaceFusion", "0"); BatchToSpaceFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::BatchToSpaceFusion; -} // namespace pass -} // namespace ngraph 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 c8e638a61b3..1fdc63f2b45 100644 --- a/src/common/transformations/include/transformations/common_optimizations/binarize_weights.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/binarize_weights.hpp @@ -79,9 +79,3 @@ public: OPENVINO_RTTI("BinarizeWeights", "0"); BinarizeWeights(); }; - -namespace ngraph { -namespace pass { -using ov::pass::BinarizeWeights; -} // namespace pass -} // namespace ngraph 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 8387cd4c4b6..008b8df6382 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 @@ -26,9 +26,3 @@ public: OPENVINO_RTTI("BroadcastElementwiseFusion", "0"); BroadcastElementwiseFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::BroadcastElementwiseFusion; -} // namespace pass -} // namespace ngraph 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 b256796dfa0..b192030caf0 100644 --- a/src/common/transformations/include/transformations/common_optimizations/clamp_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/clamp_fusion.hpp @@ -31,9 +31,3 @@ public: OPENVINO_RTTI("ClampFusion", "0"); ClampFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ClampFusion; -} // namespace pass -} // namespace ngraph 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 57327b8a929..df1c4cc8815 100644 --- a/src/common/transformations/include/transformations/common_optimizations/common_optimizations.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/common_optimizations.hpp @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("CommonOptimizations", "0"); bool run_on_model(const std::shared_ptr& f) override; }; - -namespace ngraph { -namespace pass { -using ov::pass::CommonOptimizations; -} // namespace pass -} // namespace ngraph 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 347b1074016..8da66c34528 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 @@ -79,11 +79,3 @@ public: OPENVINO_RTTI("ConcatReduceFusion", "0"); ConcatReduceFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConcatReduceFusion; -using ov::pass::PullSqueezeThroughEltwise; -using ov::pass::ReplaceConcatReduceByMinOrMax; -} // namespace pass -} // namespace ngraph 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 2864c8e442c..2056dc52b21 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 @@ -43,12 +43,3 @@ public: OPENVINO_RTTI("GroupConvolutionBackpropDataMultiplyFusion", "0"); GroupConvolutionBackpropDataMultiplyFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvolutionBackpropDataMultiplyFusion; -using ov::pass::ConvolutionMultiplyFusion; -using ov::pass::GroupConvolutionBackpropDataMultiplyFusion; -using ov::pass::GroupConvolutionMultiplyFusion; -} // namespace pass -} // namespace ngraph 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 54b8453ca6d..50df78ed3e1 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 @@ -75,9 +75,3 @@ public: OPENVINO_RTTI("ConvToBinaryConv", "0"); ConvToBinaryConv(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvToBinaryConv; -} // namespace pass -} // namespace ngraph 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 40e7c2c4e23..865b4d881cb 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 @@ -30,9 +30,3 @@ public: OPENVINO_RTTI("ConvertNmsGatherPathToUnsigned", "0"); ConvertNmsGatherPathToUnsigned(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertNmsGatherPathToUnsigned; -} // namespace pass -} // namespace ngraph 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 f54427fe2c2..59b9d5e914a 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 @@ -33,9 +33,3 @@ public: OPENVINO_RTTI("ConvertQuantizeDequantize", "0"); ConvertQuantizeDequantize(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertQuantizeDequantize; -} // namespace pass -} // namespace ngraph 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 f43973e3e41..dec44602382 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 @@ -44,9 +44,3 @@ public: OPENVINO_RTTI("DepthToSpaceFusion", "0"); DepthToSpaceFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::DepthToSpaceFusion; -} // namespace pass -} // namespace ngraph 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 003395b4f53..9f09155525a 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 @@ -31,9 +31,3 @@ public: OPENVINO_RTTI("DilatedConvolutionConverter", "0"); DilatedConvolutionConverter(); }; - -namespace ngraph { -namespace pass { -using ov::pass::DilatedConvolutionConverter; -} // namespace pass -} // namespace ngraph 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 f281f467c2f..92a0984a1db 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 @@ -26,9 +26,3 @@ public: OPENVINO_RTTI("DisableRandomUniformConstantFolding", "0"); DisableRandomUniformConstantFolding(); }; - -namespace ngraph { -namespace pass { -using ov::pass::DisableRandomUniformConstantFolding; -} // namespace pass -} // namespace ngraph 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 d13e3868296..c3fda78a7ad 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 @@ -21,9 +21,3 @@ public: OPENVINO_RTTI("DisableShapeOfConstantFolding", "0"); DisableShapeOfConstantFolding(); }; - -namespace ngraph { -namespace pass { -using ov::pass::DisableShapeOfConstantFolding; -} // namespace pass -} // namespace ngraph 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 3973cd129b0..8ffffeea446 100644 --- a/src/common/transformations/include/transformations/common_optimizations/divide_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/divide_fusion.hpp @@ -26,9 +26,3 @@ public: OPENVINO_RTTI("DivideFusion", "0"); DivideFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::DivideFusion; -} // namespace pass -} // namespace ngraph 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 71564e0c20a..e860e1232a3 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 @@ -39,9 +39,3 @@ public: OPENVINO_RTTI("DropoutWithRandomUniformReplacer", "0"); DropoutWithRandomUniformReplacer(); }; - -namespace ngraph { -namespace pass { -using ov::pass::DropoutWithRandomUniformReplacer; -} // namespace pass -} // namespace ngraph 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 a71550f5e9d..f396fff6661 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 @@ -40,10 +40,3 @@ public: OPENVINO_RTTI("EliminateGatherUnsqueeze", "0"); EliminateGatherUnsqueeze(); }; - -namespace ngraph { -namespace pass { -using ov::pass::EliminateGatherUnsqueeze; -using ov::pass::EliminateUnsqueezeGather; -} // namespace pass -} // namespace ngraph 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 c47e070f466..2f9d09272d1 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 @@ -29,9 +29,3 @@ public: OPENVINO_RTTI("FakeQuantizeMulFusion", "0"); FakeQuantizeMulFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::FakeQuantizeMulFusion; -} // namespace pass -} // namespace ngraph 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 c0b91f3f4fd..1927d5ef709 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 @@ -29,9 +29,3 @@ public: OPENVINO_RTTI("FakeQuantizeReshapeFusion", "0"); FakeQuantizeReshapeFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::FakeQuantizeReshapeFusion; -} // namespace pass -} // namespace ngraph 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 edf10b05e95..887658f124b 100644 --- a/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/gelu_fusion.hpp @@ -92,14 +92,3 @@ public: add_matcher(); } }; - -namespace ngraph { -namespace pass { -using ov::pass::GeluFusion; -using ov::pass::GeluFusionWithErfFour; -using ov::pass::GeluFusionWithErfOne; -using ov::pass::GeluFusionWithErfThree; -using ov::pass::GeluFusionWithErfTwo; -using ov::pass::GeluFusionWithTanh; -} // namespace pass -} // namespace ngraph 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 e6aaa471d81..31604d4e7c9 100644 --- a/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/hsigmoid_fusion.hpp @@ -87,14 +87,3 @@ public: add_matcher(); } }; - -namespace ngraph { -namespace pass { -using ov::pass::HSigmoidFusion; -using ov::pass::HSigmoidFusionWithClampDiv; -using ov::pass::HSigmoidFusionWithClampMul; -using ov::pass::HSigmoidFusionWithoutRelu; -using ov::pass::HSigmoidFusionWithReluDiv; -using ov::pass::HSigmoidFusionWithReluMul; -} // namespace pass -} // namespace ngraph 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 52f0bdf1cbc..f7ac37ded86 100644 --- a/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/hswish_fusion.hpp @@ -75,13 +75,3 @@ public: add_matcher(); } }; - -namespace ngraph { -namespace pass { -using ov::pass::HSwishFusion; -using ov::pass::HSwishFusionWithClamp; -using ov::pass::HSwishFusionWithHSigmoid; -using ov::pass::HSwishFusionWithReluDiv; -using ov::pass::HSwishFusionWithReluMul; -} // namespace pass -} // namespace ngraph 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 4425bf83705..67adc3fd3af 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 @@ -28,9 +28,3 @@ public: OPENVINO_RTTI("InterpolateSequenceFusion", "0"); InterpolateSequenceFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::InterpolateSequenceFusion; -} // namespace pass -} // namespace ngraph 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 a12589a2871..748d88dee78 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 @@ -28,9 +28,3 @@ public: OPENVINO_RTTI("LeakyReluFusion", "0"); LeakyReluFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::LeakyReluFusion; -} // namespace pass -} // namespace ngraph 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 a86b81b82c8..18d91bc05d8 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 @@ -51,12 +51,3 @@ public: add_matcher(); } }; - -namespace ngraph { -namespace pass { -using ov::pass::AddAddFusion; -using ov::pass::AddMultiplyFusion; -using ov::pass::LinOpSequenceFusion; -using ov::pass::MultiplyMultiplyFusion; -} // namespace pass -} // namespace ngraph 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 61317c33d2e..2edfad58df5 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 @@ -24,9 +24,3 @@ public: } // namespace pass } // namespace ov - -namespace ngraph { -namespace pass { -using ov::pass::MatMulConstTransposesExtraction; -} // namespace pass -} // namespace ngraph 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 0f17008a8ac..98ccea5ce0e 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 @@ -61,9 +61,3 @@ public: OPENVINO_RTTI("MatMulMultiplyFusion", "0"); MatMulMultiplyFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::MatMulMultiplyFusion; -} // namespace pass -} // namespace ngraph 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 f264e613d7a..66f794980c9 100644 --- a/src/common/transformations/include/transformations/common_optimizations/mish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/mish_fusion.hpp @@ -28,9 +28,3 @@ public: OPENVINO_RTTI("MishFusion", "0"); MishFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::MishFusion; -} // namespace pass -} // namespace ngraph 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 27bb6c0ef8d..62bb1ec7e8d 100644 --- a/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/moc_transformations.hpp @@ -41,9 +41,3 @@ public: bool run_on_model(const std::shared_ptr& m) override; }; - -namespace ngraph { -namespace pass { -using ov::pass::MOCTransformations; -} // namespace pass -} // namespace ngraph 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 960dcba6485..389524a68e3 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 @@ -100,12 +100,3 @@ public: OPENVINO_RTTI("MultiplyGroupConvolutionBackpropDataFusion", "0"); MultiplyGroupConvolutionBackpropDataFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::MultiplyConvolutionBackpropDataFusion; -using ov::pass::MultiplyConvolutionFusion; -using ov::pass::MultiplyGroupConvolutionBackpropDataFusion; -using ov::pass::MultiplyGroupConvolutionFusion; -} // namespace pass -} // namespace ngraph 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 8beae05356f..6928167fde9 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 @@ -29,9 +29,3 @@ public: OPENVINO_RTTI("MulFakeQuantizeFusion", "0"); MulFakeQuantizeFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::MulFakeQuantizeFusion; -} // namespace pass -} // namespace ngraph 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 cb4ce359271..85cbadd50dd 100644 --- a/src/common/transformations/include/transformations/common_optimizations/mvn_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/mvn_fusion.hpp @@ -55,11 +55,3 @@ public: add_matcher(); } }; - -namespace ngraph { -namespace pass { -using ov::pass::MVNFusion; -using ov::pass::MVNFusionWithConstantsInside; -using ov::pass::MVNFusionWithoutConstants; -} // namespace pass -} // namespace ngraph 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 39f42bbe50c..0a816bdad13 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 @@ -27,9 +27,3 @@ public: OPENVINO_RTTI("NearestNeighborUpsamplingFusion", "0"); NearestNeighborUpsamplingFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::NearestNeighborUpsamplingFusion; -} // namespace pass -} // namespace ngraph 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 bd2cd001b15..387d3eb9016 100644 --- a/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/nop_elimination.hpp @@ -130,19 +130,3 @@ public: OPENVINO_RTTI("EliminateSplitConcat", "0"); EliminateSplitConcat(); }; - -namespace ngraph { -namespace pass { -using ov::pass::EliminateConcat; -using ov::pass::EliminateConvert; -using ov::pass::EliminateConvertNonZero; -using ov::pass::EliminateEltwise; -using ov::pass::EliminatePad; -using ov::pass::EliminateScatterUpdate; -using ov::pass::EliminateSplit; -using ov::pass::EliminateSplitConcat; -using ov::pass::EliminateSqueeze; -using ov::pass::EliminateTranspose; -using ov::pass::NopElimination; -} // namespace pass -} // namespace ngraph 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 42be6c6ad61..b3ffd3c040b 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 @@ -34,9 +34,3 @@ public: OPENVINO_RTTI("NormalizeL2Fusion", "0"); NormalizeL2Fusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::NormalizeL2Fusion; -} // namespace pass -} // namespace ngraph 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 aef2cfa7ff9..20cf7a0ca84 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 @@ -70,12 +70,3 @@ public: private: bool m_use_shapes = true; }; - -namespace ngraph { -namespace pass { -using ov::pass::GroupedStridedSliceOptimizer; -using ov::pass::SharedStridedSliceEraser; -using ov::pass::StridedSliceOptimization; -using ov::pass::UselessStridedSliceEraser; -} // namespace pass -} // namespace ngraph 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 3bc4c006fd5..88c042c071c 100644 --- a/src/common/transformations/include/transformations/common_optimizations/pad_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/pad_fusion.hpp @@ -99,14 +99,3 @@ public: add_matcher(); } }; - -namespace ngraph { -namespace pass { -using ov::pass::PadFusion; -using ov::pass::PadFusionAvgPool; -using ov::pass::PadFusionConvolution; -using ov::pass::PadFusionConvolutionBackpropData; -using ov::pass::PadFusionGroupConvolution; -using ov::pass::PadFusionGroupConvolutionBackpropData; -} // namespace pass -} // namespace ngraph 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 2f9b441fd8f..7008f998e29 100644 --- a/src/common/transformations/include/transformations/common_optimizations/prelu_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/prelu_fusion.hpp @@ -113,13 +113,3 @@ public: add_matcher(); } }; - -namespace ngraph { -namespace pass { -using ov::pass::PReluFusion; -using ov::pass::PReluFusionMultiplyAdd; -using ov::pass::PReluFusionMultiplySub; -using ov::pass::PReluFusionNegativeAdd; -using ov::pass::PReluFusionNegativeSub; -} // namespace pass -} // namespace ngraph 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 91c7393e0eb..9e9f519c11c 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 @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("PullTransposeThroughFQUp", "0"); PullTransposeThroughFQUp(); }; - -namespace ngraph { -namespace pass { -using ov::pass::PullTransposeThroughFQUp; -} // namespace pass -} // namespace ngraph 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 f397f9b0ce6..b7fa81358ac 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 @@ -26,9 +26,3 @@ public: OPENVINO_RTTI("RandomUniformFusion", "0"); RandomUniformFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::RandomUniformFusion; -} // namespace pass -} // namespace ngraph 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 f11fc05af80..511ad80487e 100644 --- a/src/common/transformations/include/transformations/common_optimizations/reduce_merge.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/reduce_merge.hpp @@ -66,9 +66,3 @@ public: OPENVINO_RTTI("ReduceMerge", "0"); ReduceMerge(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ReduceMerge; -} // namespace pass -} // namespace ngraph 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 51a639b6981..3adb867deb3 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 @@ -28,9 +28,3 @@ public: OPENVINO_RTTI("ReluFakeQuantizeFusion", "0"); ReluFakeQuantizeFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ReluFakeQuantizeFusion; -} // namespace pass -} // namespace ngraph 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 2882a9bc44a..ed5f97e20d9 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 @@ -29,10 +29,3 @@ public: OPENVINO_RTTI("RemoveFilteringBoxesBySize", "0"); RemoveFilteringBoxesBySize(); }; - -namespace ngraph { -namespace pass { -using ov::pass::FuseFilteringBoxesBySize; -using ov::pass::RemoveFilteringBoxesBySize; -} // namespace pass -} // namespace ngraph 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 40a0e7d1c83..b9f1caac1e0 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 @@ -26,9 +26,3 @@ public: OPENVINO_RTTI("ReshapeSequenceFusion", "0"); ReshapeSequenceFusion(bool use_shape_for_elimination = true); }; - -namespace ngraph { -namespace pass { -using ov::pass::ReshapeSequenceFusion; -} // namespace pass -} // namespace ngraph 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 f64107ec5a5..99c658aaa0d 100644 --- a/src/common/transformations/include/transformations/common_optimizations/ric_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/ric_fusion.hpp @@ -27,9 +27,3 @@ public: OPENVINO_RTTI("ReverseInputChannelsFusion", "0"); bool run_on_model(const std::shared_ptr&) override; }; - -namespace ngraph { -namespace pass { -using ov::pass::ReverseInputChannelsFusion; -} // namespace pass -} // namespace ngraph 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 451eaaac857..e2aefa3ff51 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 @@ -36,9 +36,3 @@ public: OPENVINO_RTTI("ShuffleChannelsFusion", "0"); ShuffleChannelsFusion(const bool reshape_constants_check); }; - -namespace ngraph { -namespace pass { -using ov::pass::ShuffleChannelsFusion; -} // namespace pass -} // namespace ngraph 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 77a93bb76c7..079b2a62764 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 @@ -88,14 +88,3 @@ public: OPENVINO_RTTI("SimplifySecondInputOfReshape", "0"); SimplifySecondInputOfReshape(); }; - -namespace ngraph { -namespace pass { -using ov::pass::GatherNopElimination; -using ov::pass::GroupedGatherElimination; -using ov::pass::SharedShapeOf; -using ov::pass::SimplifyGatherShapeOf; -using ov::pass::SimplifySecondInputOfReshape; -using ov::pass::SimplifyShapeOfSubGraph; -} // namespace pass -} // namespace ngraph 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 bf17e8032e5..b36b45ef6f5 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 @@ -28,9 +28,3 @@ public: OPENVINO_RTTI("SkipGatherBeforeTransposeAndReshape", "0"); SkipGatherBeforeTransposeAndReshape(); }; - -namespace ngraph { -namespace pass { -using ov::pass::SkipGatherBeforeTransposeAndReshape; -} // namespace pass -} // namespace ngraph 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 d1896259c3c..965c6a97475 100644 --- a/src/common/transformations/include/transformations/common_optimizations/softmax_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/softmax_fusion.hpp @@ -74,9 +74,3 @@ public: OPENVINO_RTTI("SoftmaxFusion", "0"); SoftmaxFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::SoftmaxFusion; -} // namespace pass -} // namespace ngraph 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 d87e9ed15f6..4319d9cbc35 100644 --- a/src/common/transformations/include/transformations/common_optimizations/softplus_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/softplus_fusion.hpp @@ -27,9 +27,3 @@ public: OPENVINO_RTTI("SoftPlusFusion", "0"); SoftPlusFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::SoftPlusFusion; -} // namespace pass -} // namespace ngraph 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 fa819a9859d..96b14c160c4 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 @@ -28,9 +28,3 @@ public: OPENVINO_RTTI("SoftPlusToMishFusion", "0"); SoftPlusToMishFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::SoftPlusToMishFusion; -} // namespace pass -} // namespace ngraph 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 8bdbd4d9403..f365391f7e6 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 @@ -34,9 +34,3 @@ public: OPENVINO_RTTI("SpaceToBatchFusion", "0"); SpaceToBatchFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::SpaceToBatchFusion; -} // namespace pass -} // namespace ngraph 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 64f0e313986..17334152a3e 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 @@ -28,9 +28,3 @@ public: OPENVINO_RTTI("SplitConcatPairToInterpolateFusion", "0"); SplitConcatPairToInterpolateFusion(bool use_shape_for_elimination = true); }; - -namespace ngraph { -namespace pass { -using ov::pass::SplitConcatPairToInterpolateFusion; -} // namespace pass -} // namespace ngraph 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 19187982de0..cf88edb79dc 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 @@ -28,9 +28,3 @@ public: OPENVINO_RTTI("SplitSqueezeConcatFusion", "0"); SplitSqueezeConcatFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::SplitSqueezeConcatFusion; -} // namespace pass -} // namespace ngraph 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 ec907a5041f..1ab842d2703 100644 --- a/src/common/transformations/include/transformations/common_optimizations/strides_optimization.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/strides_optimization.hpp @@ -64,12 +64,3 @@ public: OPENVINO_RTTI("StridesOptimization", "0"); StridesOptimization(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvStridesPropagation; -using ov::pass::StridesOptimization; -using ov::pass::SupportedNodesStridesPropagation; -using ov::pass::UnsupportedNodesStridesPropagation; -} // namespace pass -} // namespace ngraph 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 e7f47a6e829..f60a1c05e25 100644 --- a/src/common/transformations/include/transformations/common_optimizations/subtract_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/subtract_fusion.hpp @@ -26,9 +26,3 @@ public: OPENVINO_RTTI("SubtractFusion", "0"); SubtractFusion(); }; - -namespace ngraph { -namespace pass { -using ov::pass::SubtractFusion; -} // namespace pass -} // namespace ngraph 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 0318973dd07..22b565950ff 100644 --- a/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/swish_fusion.hpp @@ -75,13 +75,3 @@ public: add_matcher(); } }; - -namespace ngraph { -namespace pass { -using ov::pass::SwishFusion; -using ov::pass::SwishFusionWithBeta; -using ov::pass::SwishFusionWithoutBeta; -using ov::pass::SwishFusionWithSigmoid; -using ov::pass::SwishFusionWithSigmoidWithBeta; -} // namespace pass -} // namespace ngraph diff --git a/src/common/transformations/include/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp b/src/common/transformations/include/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp index 92cb555e26f..2f2ac35e415 100644 --- a/src/common/transformations/include/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/transpose_reshape_elimination_for_matmul.hpp @@ -29,9 +29,3 @@ public: OPENVINO_RTTI("TransposeReshapeEliminationForMatmul", "0"); TransposeReshapeEliminationForMatmul(); }; - -namespace ngraph { -namespace pass { -using ov::pass::TransposeReshapeEliminationForMatmul; -} // namespace pass -} // namespace ngraph 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 6fd7b1321e6..22e991d0172 100644 --- a/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp +++ b/src/common/transformations/include/transformations/common_optimizations/transpose_sinking.hpp @@ -90,14 +90,3 @@ public: add_matcher(); } }; - -namespace ngraph { -namespace pass { -using ov::pass::TransposeConvert; -using ov::pass::TransposeEltwise; -using ov::pass::TransposeFQReduction; -using ov::pass::TransposeFuse; -using ov::pass::TransposeReduction; -using ov::pass::TransposeSinking; -} // namespace pass -} // namespace ngraph 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 af191b2a486..b0689263da7 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 @@ -27,9 +27,3 @@ public: OPENVINO_RTTI("TransposeToReshape", "0"); TransposeToReshape(); }; - -namespace ngraph { -namespace pass { -using ov::pass::TransposeToReshape; -} // namespace pass -} // namespace ngraph 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 b95e9b49618..8e03253b609 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 @@ -30,9 +30,3 @@ public: OPENVINO_RTTI("WeightsDequantizeToFakeQuantize", "0"); WeightsDequantizeToFakeQuantize(); }; - -namespace ngraph { -namespace pass { -using ov::pass::WeightsDequantizeToFakeQuantize; -} // namespace pass -} // namespace ngraph 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 56b9b38dbcb..a54743f815a 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 @@ -37,9 +37,3 @@ public: OPENVINO_RTTI("WrapInterpolateIntoTransposes", "0"); WrapInterpolateIntoTransposes(); }; - -namespace ngraph { -namespace pass { -using ov::pass::WrapInterpolateIntoTransposes; -} // namespace pass -} // namespace ngraph 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 36dac8e3743..2b309f81fb9 100644 --- a/src/common/transformations/include/transformations/control_flow/unroll_if.hpp +++ b/src/common/transformations/include/transformations/control_flow/unroll_if.hpp @@ -29,9 +29,3 @@ public: OPENVINO_RTTI("UnrollIf", "0"); bool run_on_model(const std::shared_ptr& m) override; }; - -namespace ngraph { -namespace pass { -using ov::pass::UnrollIf; -} // namespace pass -} // namespace ngraph 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 4a2f377ac37..f33f9551fb4 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 @@ -30,9 +30,3 @@ public: OPENVINO_RTTI("UnrollTensorIterator", "0"); bool run_on_model(const std::shared_ptr& m) override; }; - -namespace ngraph { -namespace pass { -using ov::pass::UnrollTensorIterator; -} // namespace pass -} // namespace ngraph diff --git a/src/common/transformations/include/transformations/convert_precision.hpp b/src/common/transformations/include/transformations/convert_precision.hpp index bc9ce5b68ff..eea9bf82168 100644 --- a/src/common/transformations/include/transformations/convert_precision.hpp +++ b/src/common/transformations/include/transformations/convert_precision.hpp @@ -94,9 +94,3 @@ private: type_to_fuse_map m_additional_type_to_fuse_map; bool m_keep_precision_sensitive_in_fp32; }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertPrecision; -} // namespace pass -} // namespace ngraph diff --git a/src/common/transformations/include/transformations/fix_rt_info.hpp b/src/common/transformations/include/transformations/fix_rt_info.hpp index 702d9319af2..97c45c9af5f 100644 --- a/src/common/transformations/include/transformations/fix_rt_info.hpp +++ b/src/common/transformations/include/transformations/fix_rt_info.hpp @@ -36,9 +36,3 @@ public: OPENVINO_RTTI("FixRtInfo", "0"); bool run_on_model(const std::shared_ptr& m) override; }; - -namespace ngraph { -namespace pass { -using ov::pass::FixRtInfo; -} // namespace pass -} // namespace ngraph diff --git a/src/common/transformations/include/transformations/init_node_info.hpp b/src/common/transformations/include/transformations/init_node_info.hpp index b4f0a34f78f..900247b0ac5 100644 --- a/src/common/transformations/include/transformations/init_node_info.hpp +++ b/src/common/transformations/include/transformations/init_node_info.hpp @@ -38,9 +38,3 @@ public: OPENVINO_RTTI("InitNodeInfo", "0"); bool run_on_model(const std::shared_ptr& m) override; }; - -namespace ngraph { -namespace pass { -using ov::pass::InitNodeInfo; -} // namespace pass -} // namespace ngraph 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 f2e75f7ee11..d36e3a96859 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 @@ -23,9 +23,3 @@ public: OPENVINO_RTTI("BatchNormDecomposition", "0"); BatchNormDecomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::BatchNormDecomposition; -} // namespace pass -} // namespace ngraph 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 8a4479b2355..5df54c68d12 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 @@ -73,12 +73,3 @@ public: add_matcher(); } }; - -namespace ngraph { -namespace pass { -using ov::pass::BidirectionalGRUSequenceDecomposition; -using ov::pass::BidirectionalLSTMSequenceDecomposition; -using ov::pass::BidirectionalRNNSequenceDecomposition; -using ov::pass::BidirectionalSequenceDecomposition; -} // namespace pass -} // namespace ngraph 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 984dcfad1c6..a1727362186 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 @@ -44,9 +44,3 @@ private: void convert_batch_to_space(); void convert_batch_to_space_by_elements(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertBatchToSpace; -} // namespace pass -} // namespace ngraph 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 506e17fdb6c..93c75804da6 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_broadcast3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_broadcast3.hpp @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("ConvertBroadcast3", "0"); ConvertBroadcast3(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertBroadcast3; -} // namespace pass -} // namespace ngraph 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 3a6e5e3ead5..0dedd021895 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 @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("ConvertBroadcastToTiles", "0"); ConvertBroadcastToTiles(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertBroadcastToTiles; -} // namespace pass -} // namespace ngraph 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 86ff4442128..162bc87bdec 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_convertlike.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_convertlike.hpp @@ -20,9 +20,3 @@ public: OPENVINO_RTTI("ConvertConvertLike", "0"); ConvertConvertLike(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertConvertLike; -} // namespace pass -} // namespace ngraph 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 e28bada0428..f3de3888f02 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 @@ -24,9 +24,3 @@ public: OPENVINO_RTTI("ConvertDeformableConv8To1", "0"); ConvertDeformableConv8To1(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertDeformableConv8To1; -} // namespace pass -} // namespace ngraph 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 00b1b956051..bf61e54e7e6 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 @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("ConvertDepthToSpace", "0"); ConvertDepthToSpace(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertDepthToSpace; -} // namespace pass -} // namespace ngraph 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 40c21fb8411..7736ba0d28a 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_divide.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_divide.hpp @@ -29,10 +29,3 @@ public: OPENVINO_RTTI("ConvertDivideWithConstant", "0"); ConvertDivideWithConstant(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertDivide; -using ov::pass::ConvertDivideWithConstant; -} // namespace pass -} // namespace ngraph 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 8d594481925..4679d7de254 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 @@ -27,9 +27,3 @@ public: OPENVINO_RTTI("ConvertGather0D", "0"); ConvertGather0D(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertGather0D; -} // namespace pass -} // namespace ngraph 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 0c8d3db78ec..0dd08d49abb 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 @@ -35,10 +35,3 @@ public: OPENVINO_RTTI("ConvertGather8ToGather7", "0"); ConvertGather8ToGather7(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertGather7ToGather1; -using ov::pass::ConvertGather8ToGather7; -} // namespace pass -} // namespace ngraph 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 36d09e1d5da..0efe5703a77 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 @@ -36,10 +36,3 @@ public: OPENVINO_RTTI("ConvertGather7ToGather8", "0"); ConvertGather7ToGather8(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertGather1ToGather7; -using ov::pass::ConvertGather7ToGather8; -} // namespace pass -} // namespace ngraph 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 872c0084619..ed5554f921d 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_gelu.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_gelu.hpp @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("ConvertGELU", "0"); ConvertGELU(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertGELU; -} // namespace pass -} // namespace ngraph 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 1813c130901..381e6b66d24 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 @@ -20,9 +20,3 @@ public: OPENVINO_RTTI("ConvertGP9ToGPIEInternal", "0"); ConvertGP9ToGPIEInternal(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertGP9ToGPIEInternal; -} // namespace pass -} // namespace ngraph 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 d3e4efe823c..598d4371f73 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 @@ -27,9 +27,3 @@ public: OPENVINO_RTTI("ConvertInterpolate1ToInterpolate4", "0"); ConvertInterpolate1ToInterpolate4(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertInterpolate1ToInterpolate4; -} // namespace pass -} // namespace ngraph 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 05cbee4cf26..fc68c2e795a 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 @@ -23,9 +23,3 @@ public: OPENVINO_RTTI("ConvertMatrixNmsToMatrixNmsIE", "0"); ConvertMatrixNmsToMatrixNmsIE(bool force_i32_output_type = true); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertMatrixNmsToMatrixNmsIE; -} // namespace pass -} // namespace ngraph 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 d8e1b5a598e..6bfcef078b0 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 @@ -24,9 +24,3 @@ public: OPENVINO_RTTI("ConvertMaxPool8ToMaxPool1"); ConvertMaxPool8ToMaxPool1(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertMaxPool8ToMaxPool1; -} // namespace pass -} // namespace ngraph 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 25078f26fa7..d0eebc6acc3 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 @@ -25,9 +25,3 @@ public: OPENVINO_RTTI("ConvertMaxPool1ToMaxPool8"); ConvertMaxPool1ToMaxPool8(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertMaxPool1ToMaxPool8; -} // namespace pass -} // namespace ngraph 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 06bc0ebbc43..b12ea47f237 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 @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("ConvertMinimum", "0"); ConvertMinimum(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertMinimum; -} // namespace pass -} // namespace ngraph 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 ff6236ebdc5..fe745923b4e 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_mod.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_mod.hpp @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("ConvertMod", "0"); ConvertMod(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertMod; -} // namespace pass -} // namespace ngraph 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 41433192384..4bab06d8fc6 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 @@ -20,9 +20,3 @@ public: OPENVINO_RTTI("public", "0"); ConvertMulticlassNmsToMulticlassNmsIE(bool force_i32_output_type = true); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertMulticlassNmsToMulticlassNmsIE; -} // namespace pass -} // namespace ngraph 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 e745e013782..496055fad5a 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 @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("ConvertMulticlassNms8ToMulticlassNms9", "0"); ConvertMulticlassNms8ToMulticlassNms9(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertMulticlassNms8ToMulticlassNms9; -} // namespace pass -} // namespace ngraph 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 c76b91cdcdb..10353167d83 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 @@ -24,9 +24,3 @@ public: OPENVINO_RTTI("ConvertMVN1ToMVN6", "0"); ConvertMVN1ToMVN6(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertMVN1ToMVN6; -} // namespace pass -} // namespace ngraph 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 87e48b4c296..abbe0117ad5 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_negative.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_negative.hpp @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("ConvertNegative", "0"); ConvertNegative(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertNegative; -} // namespace pass -} // namespace ngraph 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 5c9c43713e3..52f357b920d 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 @@ -23,9 +23,3 @@ public: OPENVINO_RTTI("ConvertNMS9ToNMSIEInternal", "0"); ConvertNMS9ToNMSIEInternal(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertNMS9ToNMSIEInternal; -} // namespace pass -} // namespace ngraph 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 fb1be6bc659..7cad680fc05 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 @@ -23,9 +23,3 @@ public: OPENVINO_RTTI("ConvertNMSToNMSIEInternal", "0"); ConvertNMSToNMSIEInternal(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertNMSToNMSIEInternal; -} // namespace pass -} // namespace ngraph 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 29557090c17..80e52771838 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 @@ -31,9 +31,3 @@ public: OPENVINO_RTTI("ConvertPadToGroupConvolution", "0"); ConvertPadToGroupConvolution(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertPadToGroupConvolution; -} // namespace pass -} // namespace ngraph 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 082334f8000..2817b26a7cd 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 @@ -36,11 +36,3 @@ public: OPENVINO_RTTI("ConvertNMS4ToNMS5", "0"); ConvertNMS4ToNMS5(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertNMS1ToNMS5; -using ov::pass::ConvertNMS3ToNMS5; -using ov::pass::ConvertNMS4ToNMS5; -} // namespace pass -} // namespace ngraph 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 ccccbb53aec..b75ffe87250 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 @@ -43,12 +43,3 @@ public: OPENVINO_RTTI("ConvertNMS5ToNMS9", "0"); ConvertNMS5ToNMS9(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertNMS1ToNMS9; -using ov::pass::ConvertNMS3ToNMS9; -using ov::pass::ConvertNMS4ToNMS9; -using ov::pass::ConvertNMS5ToNMS9; -} // namespace pass -} // namespace ngraph 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 8484a013160..47092b8d86b 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 @@ -24,9 +24,3 @@ public: OPENVINO_RTTI("ConvertPriorBox8To0", "0"); ConvertPriorBox8To0(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertPriorBox8To0; -} // namespace pass -} // namespace ngraph 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 20b9ed53948..d3e4b4ab1e2 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 @@ -265,12 +265,3 @@ ov::matcher_pass_callback ConvertReduceBase::convert_reduce_to_pooling() { return true; }; } - -namespace ngraph { -namespace pass { -using ov::pass::ConvertReduceMaxToPooling; -using ov::pass::ConvertReduceMeanToPooling; -using ov::pass::ConvertReduceSumToPooling; -using ov::pass::ConvertReduceToPooling; -} // namespace pass -} // namespace ngraph 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 1ed7055f412..674f01a3170 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 @@ -114,15 +114,3 @@ ov::matcher_pass_callback CvtReduceBase::convert_reduce_to_reshape() { return false; }; } - -namespace ngraph { -namespace pass { -using ov::pass::ConvertReduceLogicalAndToReshape; -using ov::pass::ConvertReduceLogicalOrToReshape; -using ov::pass::ConvertReduceMaxToReshape; -using ov::pass::ConvertReduceMeanToReshape; -using ov::pass::ConvertReduceMinToReshape; -using ov::pass::ConvertReduceSumToReshape; -using ov::pass::ConvertReduceToReshape; -} // namespace pass -} // namespace ngraph 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 9ecfacd1fbc..765c14179ed 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 @@ -24,9 +24,3 @@ public: OPENVINO_RTTI("ConvertROIAlign3To9", "0"); ConvertROIAlign3To9(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertROIAlign3To9; -} // namespace pass -} // namespace ngraph 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 072239897f7..00befe0cb1c 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 @@ -24,9 +24,3 @@ public: OPENVINO_RTTI("ConvertROIAlign9To3", "0"); ConvertROIAlign9To3(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertROIAlign9To3; -} // namespace pass -} // namespace ngraph 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 9866a0e209d..af25d9413e7 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 @@ -26,9 +26,3 @@ public: OPENVINO_RTTI("ConvertScatterElementsToScatter", "0"); ConvertScatterElementsToScatter(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertScatterElementsToScatter; -} // namespace pass -} // namespace ngraph 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 6197b8264c4..3dedec4fa13 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 @@ -61,12 +61,3 @@ public: OPENVINO_RTTI("ConvertSequenceToTensorIterator", "0"); ConvertSequenceToTensorIterator(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertGRUSequenceToTensorIterator; -using ov::pass::ConvertLSTMSequenceToTensorIterator; -using ov::pass::ConvertRNNSequenceToTensorIterator; -using ov::pass::ConvertSequenceToTensorIterator; -} // namespace pass -} // namespace ngraph 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 aad2ad610ee..76fd27d8134 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_shapeof3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_shapeof3.hpp @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("ConvertShapeOf3", "0"); ConvertShapeOf3(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertShapeOf3; -} // namespace pass -} // namespace ngraph 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 bd3f5e3c599..e03ac37c728 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 @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("ConvertShuffleChannels3", "0"); ConvertShuffleChannels3(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertShuffleChannels3; -} // namespace pass -} // namespace ngraph 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 0b951c89a06..9f024ac2f53 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 @@ -24,9 +24,3 @@ public: OPENVINO_RTTI("SliceToStridedSlice", "0"); SliceToStridedSlice(bool use_shapes); }; - -namespace ngraph { -namespace pass { -using ov::pass::SliceToStridedSlice; -} // namespace pass -} // namespace ngraph 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 cc492ba2e7a..08eefe9e954 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 @@ -24,9 +24,3 @@ public: OPENVINO_RTTI("ConvertSoftMax8ToSoftMax1", "0"); ConvertSoftMax8ToSoftMax1(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertSoftMax8ToSoftMax1; -} // namespace pass -} // namespace ngraph 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 88596a70380..5ad549a58c3 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 @@ -25,9 +25,3 @@ public: OPENVINO_RTTI("ConvertSoftMax1ToSoftMax8", "0"); ConvertSoftMax1ToSoftMax8(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertSoftMax1ToSoftMax8; -} // namespace pass -} // namespace ngraph 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 dfa49543b76..536fa1548ae 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 @@ -44,9 +44,3 @@ private: void convert_space_to_batch(); void convert_space_to_batch_by_elements(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertSpaceToBatch; -} // namespace pass -} // namespace ngraph 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 73b87122a10..1a092977d25 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 @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("ConvertSpaceToDepth", "0"); ConvertSpaceToDepth(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertSpaceToDepth; -} // namespace pass -} // namespace ngraph 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 f8ba12d626a..c6e2b640408 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_subtract.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_subtract.hpp @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("ConvertSubtract", "0"); ConvertSubtract(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertSubtract; -} // namespace pass -} // namespace ngraph 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 3b8e05788ce..315731560ed 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 @@ -61,12 +61,3 @@ public: OPENVINO_RTTI("ConvertTensorIteratorToSequence", "0"); ConvertTensorIteratorToSequence(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertTensorIteratorToGRUSequence; -using ov::pass::ConvertTensorIteratorToLSTMSequence; -using ov::pass::ConvertTensorIteratorToRNNSequence; -using ov::pass::ConvertTensorIteratorToSequence; -} // namespace pass -} // namespace ngraph 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 25dffb3ff3f..acfa45c46ff 100644 --- a/src/common/transformations/include/transformations/op_conversions/convert_topk3.hpp +++ b/src/common/transformations/include/transformations/op_conversions/convert_topk3.hpp @@ -22,9 +22,3 @@ public: OPENVINO_RTTI("ConvertTopK3", "0"); ConvertTopK3(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertTopK3; -} // namespace pass -} // namespace ngraph 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 7593b6e3e09..862a5fee200 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 @@ -25,9 +25,3 @@ public: OPENVINO_RTTI("ConvertDetectionOutput8ToDetectionOutput1", "0"); ConvertDetectionOutput8ToDetectionOutput1(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertDetectionOutput8ToDetectionOutput1; -} // namespace pass -} // namespace ngraph 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 0dac3d01563..8b2a2eb71d7 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 @@ -25,9 +25,3 @@ public: OPENVINO_RTTI("ConvertDetectionOutput1ToDetectionOutput8", "0"); ConvertDetectionOutput1ToDetectionOutput8(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertDetectionOutput1ToDetectionOutput8; -} // namespace pass -} // namespace ngraph 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 a07b78e7bc8..33cae60db52 100644 --- a/src/common/transformations/include/transformations/op_conversions/einsum_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/einsum_decomposition.hpp @@ -26,9 +26,3 @@ public: OPENVINO_RTTI("EinsumDecomposition", "0"); EinsumDecomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::EinsumDecomposition; -} // namespace pass -} // namespace ngraph 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 7450d1f23a2..19bd51f4824 100644 --- a/src/common/transformations/include/transformations/op_conversions/fq_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/fq_decomposition.hpp @@ -47,9 +47,3 @@ public: OPENVINO_RTTI("FakeQuantizeDecomposition", "0"); FakeQuantizeDecomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::FakeQuantizeDecomposition; -} // namespace pass -} // namespace ngraph 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 7eed227b865..3fc31433874 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 @@ -27,9 +27,3 @@ public: OPENVINO_RTTI("GatherNegativeConstIndicesNormalize", "0"); GatherNegativeConstIndicesNormalize(); }; - -namespace ngraph { -namespace pass { -using ov::pass::GatherNegativeConstIndicesNormalize; -} // namespace pass -} // namespace ngraph 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 8a25a12e5f9..bfbdc670e8d 100644 --- a/src/common/transformations/include/transformations/op_conversions/gelu7_downgrade.hpp +++ b/src/common/transformations/include/transformations/op_conversions/gelu7_downgrade.hpp @@ -26,9 +26,3 @@ public: OPENVINO_RTTI("Gelu7Downgrade", "0"); Gelu7Downgrade(); }; - -namespace ngraph { -namespace pass { -using ov::pass::Gelu7Downgrade; -} // namespace pass -} // namespace ngraph 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 0a77b208a43..3076010fb9b 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 @@ -38,9 +38,3 @@ public: OPENVINO_RTTI("GRUCellDecomposition", "0"); GRUCellDecomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::GRUCellDecomposition; -} // namespace pass -} // namespace ngraph 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 650bbbd7e13..84b822d2cc8 100644 --- a/src/common/transformations/include/transformations/op_conversions/hsigmoid_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/hsigmoid_decomposition.hpp @@ -24,9 +24,3 @@ public: OPENVINO_RTTI("HSigmoidDecomposition", "0"); HSigmoidDecomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::HSigmoidDecomposition; -} // namespace pass -} // namespace ngraph 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 98d1aa1879f..30c4711c90e 100644 --- a/src/common/transformations/include/transformations/op_conversions/hswish_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/hswish_decomposition.hpp @@ -24,9 +24,3 @@ public: OPENVINO_RTTI("HSwishDecomposition", "0"); HSwishDecomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::HSwishDecomposition; -} // namespace pass -} // namespace ngraph 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 dcfee429e24..3e0ab216a5a 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 @@ -24,9 +24,3 @@ public: OPENVINO_RTTI("LogSoftmaxDecomposition", "0"); LogSoftmaxDecomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::LogSoftmaxDecomposition; -} // namespace pass -} // namespace ngraph 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 5d7ec9be862..605c0b7be66 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 @@ -39,9 +39,3 @@ public: OPENVINO_RTTI("LSTMCellDecomposition", "0"); LSTMCellDecomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::LSTMCellDecomposition; -} // namespace pass -} // namespace ngraph 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 c7663d2e7f0..230b0ff6b8e 100644 --- a/src/common/transformations/include/transformations/op_conversions/mvn6_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/mvn6_decomposition.hpp @@ -26,9 +26,3 @@ public: OPENVINO_RTTI("MVN6Decomposition", "0"); MVN6Decomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::MVN6Decomposition; -} // namespace pass -} // namespace ngraph 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 0c02e56ad25..7d1d3442585 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 @@ -27,9 +27,3 @@ public: OPENVINO_RTTI("NormalizeL2Decomposition", "0"); NormalizeL2Decomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::NormalizeL2Decomposition; -} // namespace pass -} // namespace ngraph 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 51f0d842123..03be100ac05 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 @@ -27,9 +27,3 @@ public: OPENVINO_RTTI("ReduceL1Decomposition", "0"); ReduceL1Decomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ReduceL1Decomposition; -} // namespace pass -} // namespace ngraph 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 f0221cefa32..5a3c51f7ebb 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 @@ -27,9 +27,3 @@ public: OPENVINO_RTTI("ReduceL2Decomposition", "0"); ReduceL2Decomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ReduceL2Decomposition; -} // namespace pass -} // namespace ngraph 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 df9d6928eb6..70b98f65837 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 @@ -33,9 +33,3 @@ public: OPENVINO_RTTI("RNNCellDecomposition", "0"); RNNCellDecomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::RNNCellDecomposition; -} // namespace pass -} // namespace ngraph 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 1b059bfd3e0..42e4e536632 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 @@ -39,9 +39,3 @@ public: OPENVINO_RTTI("SimplifyCTCGreedyDecoderSeqLen", "0"); SimplifyCTCGreedyDecoderSeqLen(); }; - -namespace ngraph { -namespace pass { -using ov::pass::SimplifyCTCGreedyDecoderSeqLen; -} // namespace pass -} // namespace ngraph 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 1e17c56db1c..b611f36fac8 100644 --- a/src/common/transformations/include/transformations/op_conversions/softmax_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/softmax_decomposition.hpp @@ -71,9 +71,3 @@ public: OPENVINO_RTTI("SoftmaxDecomposition", "0"); SoftmaxDecomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::SoftmaxDecomposition; -} // namespace pass -} // namespace ngraph 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 0d46560d5e8..9e089b60b93 100644 --- a/src/common/transformations/include/transformations/op_conversions/softplus_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/softplus_decomposition.hpp @@ -27,9 +27,3 @@ public: OPENVINO_RTTI("SoftPlusDecomposition", "0"); SoftPlusDecomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::SoftPlusDecomposition; -} // namespace pass -} // namespace ngraph 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 23c63a71086..5f762eecc23 100644 --- a/src/common/transformations/include/transformations/op_conversions/softsign_decomposition.hpp +++ b/src/common/transformations/include/transformations/op_conversions/softsign_decomposition.hpp @@ -42,9 +42,3 @@ public: OPENVINO_RTTI("SoftSignDecomposition", "0"); SoftSignDecomposition(); }; - -namespace ngraph { -namespace pass { -using ov::pass::SoftSignDecomposition; -} // namespace pass -} // namespace ngraph 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 4b7cfabde04..1b4f95564fa 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 @@ -21,9 +21,3 @@ public: OPENVINO_RTTI("ConvertOpSet2ToOpSet1", "0"); bool run_on_model(const std::shared_ptr& m) override; }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertOpSet2ToOpSet1; -} // namespace pass -} // namespace ngraph 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 e3d0f0cd0c1..43dc4ed714f 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 @@ -21,9 +21,3 @@ public: OPENVINO_RTTI("ConvertOpSet3ToOpSet2", "0"); bool run_on_model(const std::shared_ptr& m) override; }; - -namespace ngraph { -namespace pass { -using ov::pass::ConvertOpSet3ToOpSet2; -} // namespace pass -} // namespace ngraph 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 9b2455ce942..38636da5be8 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 @@ -88,9 +88,3 @@ TRANSFORMATIONS_API std::string getFusedNames(const std::shared_ptr& n TRANSFORMATIONS_API std::vector getFusedNamesVector(const std::shared_ptr& node); } // namespace ov - -namespace ngraph { -using ov::FusedNames; -using ov::getFusedNames; -using ov::getFusedNamesVector; -} // namespace ngraph diff --git a/src/common/transformations/include/transformations/serialize.hpp b/src/common/transformations/include/transformations/serialize.hpp deleted file mode 100644 index 412964128bf..00000000000 --- a/src/common/transformations/include/transformations/serialize.hpp +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#include 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 18d4551c98d..9cd4aee2bbd 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 @@ -26,9 +26,3 @@ public: OPENVINO_RTTI("BroadcastConstRangeReplacement", "0"); BroadcastConstRangeReplacement(); }; - -namespace ngraph { -namespace pass { -using ov::pass::BroadcastConstRangeReplacement; -} // namespace pass -} // namespace ngraph 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 7ed4d2ded02..24fc8f3369e 100644 --- a/src/common/transformations/include/transformations/smart_reshape/matmul_sr.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/matmul_sr.hpp @@ -43,11 +43,3 @@ public: OPENVINO_RTTI("TransposeMatMul", "0"); TransposeMatMul(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ReshapeAMatMul; -using ov::pass::ReshapeBMatMul; -using ov::pass::TransposeMatMul; -} // namespace pass -} // namespace ngraph 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 f12410046d4..7cea10a4357 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 @@ -36,9 +36,3 @@ public: OPENVINO_RTTI("MimicSetBatchSize", "0"); bool run_on_model(const std::shared_ptr& m) override; }; - -namespace ngraph { -namespace pass { -using ov::pass::MimicSetBatchSize; -} // namespace pass -} // namespace ngraph 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 29c838c07b7..8cdbae0bd86 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 @@ -45,10 +45,3 @@ public: OPENVINO_RTTI("Proposal4Scales", "0"); Proposal4Scales(); }; - -namespace ngraph { -namespace pass { -using ov::pass::Proposal1Scales; -using ov::pass::Proposal4Scales; -} // namespace pass -} // namespace ngraph 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 b13f6164f36..6c11d69b401 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 @@ -28,9 +28,3 @@ public: OPENVINO_RTTI("ReshapeTo1D", "0"); ReshapeTo1D(); }; - -namespace ngraph { -namespace pass { -using ov::pass::ReshapeTo1D; -} // namespace pass -} // namespace ngraph 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 e4b6f446f3f..7b246da02b7 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 @@ -26,9 +26,3 @@ public: OPENVINO_RTTI("SetBatchSize", "0"); bool run_on_model(const std::shared_ptr& m) override; }; - -namespace ngraph { -namespace pass { -using ov::pass::SetBatchSize; -} // namespace pass -} // namespace ngraph 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 d7db94dbf59..24ef53add29 100644 --- a/src/common/transformations/include/transformations/smart_reshape/smart_reshape.hpp +++ b/src/common/transformations/include/transformations/smart_reshape/smart_reshape.hpp @@ -23,9 +23,3 @@ public: OPENVINO_RTTI("SmartReshape", "0"); bool run_on_model(const std::shared_ptr& m) override; }; - -namespace ngraph { -namespace pass { -using ov::pass::SmartReshape; -} // namespace pass -} // namespace ngraph 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 2ccd671cf1d..e19af7e982e 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 @@ -55,11 +55,3 @@ public: OPENVINO_RTTI("SharedSqueeze", "0"); bool run_on_model(const std::shared_ptr& m) override; }; - -namespace ngraph { -namespace pass { -using ov::pass::SharedSqueeze; -using ov::pass::SqueezeStridedSlice; -using ov::pass::StridedSliceSqueeze; -} // namespace pass -} // namespace ngraph diff --git a/src/common/transformations/include/transformations/utils/utils.hpp b/src/common/transformations/include/transformations/utils/utils.hpp index 7c3137dd4b7..2e24ea15d7b 100644 --- a/src/common/transformations/include/transformations/utils/utils.hpp +++ b/src/common/transformations/include/transformations/utils/utils.hpp @@ -215,36 +215,3 @@ TRANSFORMATIONS_API bool can_eliminate_eltwise_node(const std::shared_ptr& } // namespace util } // namespace op } // namespace ov - -namespace ngraph { -namespace op { -namespace util { -using ov::op::util::activation; -using ov::op::util::broadcastTo; -using ov::op::util::can_eliminate_eltwise_node; -using ov::op::util::check_for_broadcast; -using ov::op::util::clone_try_fold; -using ov::op::util::constantIsEqualTo; -using ov::op::util::create_ie_output_name; -using ov::op::util::eltwise_fold; -using ov::op::util::get_ie_output_name; -using ov::op::util::get_node_target_inputs; -using ov::op::util::get_single_value; -using ov::op::util::has_constant_value; -using ov::op::util::has_decompression_converts; -using ov::op::util::has_f16_constants; -using ov::op::util::has_op_with_type; -using ov::op::util::is_dequantization_subgraph; -using ov::op::util::is_seq_len_provided; -using ov::op::util::make_try_fold; -using ov::op::util::node_to_get_shape_value_of_indices_from_shape_node; -using ov::op::util::node_to_get_shape_value_of_indices_from_shape_source; -using ov::op::util::normalize_constant; -using ov::op::util::normalize_single_value; -using ov::op::util::reshapeTo; -using ov::op::util::shapes_equal_except_dynamic_expected_batch; -using ov::op::util::try_fold_unary_output; -using ov::op::util::visit_shape_path; -} // namespace util -} // namespace op -} // namespace ngraph 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 b3e637ae7df..38d4e20e360 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 @@ -42,7 +42,7 @@ ov::pass::AddFakeQuantizeFusion::AddFakeQuantizeFusion() { return false; auto const_shape = add_const->get_shape(); - if (ngraph::op::util::check_for_broadcast(input.get_partial_shape(), const_shape)) { + if (ov::op::util::check_for_broadcast(input.get_partial_shape(), const_shape)) { // We can't eliminate Add if Constant input broadcasts another input shape because // when we reconnect input from Add to FQ won't broadcast given input, so it will result // in shape collision. 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 e6006da39d0..d431f5bdbc8 100644 --- a/src/common/transformations/src/transformations/common_optimizations/common_optimizations.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/common_optimizations.cpp @@ -139,7 +139,7 @@ bool ov::pass::CommonOptimizations::run_on_model(const std::shared_ptrset_name("ngraph::pass::CommonFusions"); - manager.register_pass(); + manager.register_pass(); REGISTER_DISABLED_PASS(manager, ConvertPadToGroupConvolution) REGISTER_DISABLED_PASS(manager, ConvertInterpolate1ToInterpolate4) @@ -163,10 +163,10 @@ bool ov::pass::CommonOptimizations::run_on_model(const std::shared_ptradd_matcher(); + decomp->add_matcher(); ADD_MATCHER(decomp, SimplifyCTCGreedyDecoderSeqLen) ADD_MATCHER(decomp, EinsumDecomposition) - decomp->add_matcher(); + decomp->add_matcher(); ADD_MATCHER(decomp, SoftSignDecomposition) ADD_MATCHER(decomp, GatherNegativeConstIndicesNormalize) ADD_MATCHER(decomp, DropoutWithRandomUniformReplacer) @@ -179,7 +179,7 @@ bool ov::pass::CommonOptimizations::run_on_model(const std::shared_ptr(); + manager.register_pass(); REGISTER_PASS(manager, UnrollIf) auto multiply_fusions = manager.register_pass(); @@ -225,7 +225,7 @@ bool ov::pass::CommonOptimizations::run_on_model(const std::shared_ptr(); + manager.register_pass(); REGISTER_PASS(manager, Validate) manager.run_passes(f); 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 1000f9f43bc..576f8f211de 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 @@ -55,8 +55,7 @@ ov::pass::PullSqueezeThroughEltwise::PullSqueezeThroughEltwise() { ngraph::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 = - ngraph::op::util::clone_try_fold(squeeze, {eltwise_input, squeeze->input_value(1)}); + const auto new_input_node = ov::op::util::clone_try_fold(squeeze, {eltwise_input, squeeze->input_value(1)}); if (!is_type(new_input_node)) register_new_node(as_type_ptr(new_input_node)); @@ -65,7 +64,7 @@ ov::pass::PullSqueezeThroughEltwise::PullSqueezeThroughEltwise() { eltwise_inputs.push_back(new_input_node); } - const auto new_eltwise = ngraph::op::util::clone_try_fold(eltwise, eltwise_inputs); + 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); diff --git a/src/common/transformations/src/transformations/common_optimizations/convert_compression_only_to_legacy.cpp b/src/common/transformations/src/transformations/common_optimizations/convert_compression_only_to_legacy.cpp index 5f11d0394ee..73c283d9a5e 100644 --- a/src/common/transformations/src/transformations/common_optimizations/convert_compression_only_to_legacy.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/convert_compression_only_to_legacy.cpp @@ -32,11 +32,11 @@ ov::pass::EnableDecompressionConvertConstantFolding::EnableDecompressionConvertC bool ov::pass::ConvertCompressedOnlyToLegacy::run_on_model(const std::shared_ptr& f) { RUN_ON_MODEL_SCOPE(ConvertCompressedOnlyToLegacy); - if (ngraph::op::util::has_decompression_converts(f)) { + if (ov::op::util::has_decompression_converts(f)) { Manager manager(get_pass_config()); const precisions_array convert_precision_list{{ov::element::f32, ov::element::f16}}; - manager.register_pass(convert_precision_list); + manager.register_pass(convert_precision_list); using namespace ov::pass; REGISTER_PASS(manager, EnableDecompressionConvertConstantFolding) REGISTER_PASS(manager, ConstantFolding) 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 71c7903d0a4..5c6d3489780 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 @@ -37,7 +37,7 @@ bool check_block_first(const ngraph::PartialShape& shape_input, for (int i = 2; i < input_rank.get_length(); ++i) expected_shape.push_back(shape_input[i]); - if (!ngraph::op::util::shapes_equal_except_dynamic_expected_batch(expected_shape, shape_reshape_before)) { + if (!ov::op::util::shapes_equal_except_dynamic_expected_batch(expected_shape, shape_reshape_before)) { return false; } @@ -58,7 +58,7 @@ bool check_block_first(const ngraph::PartialShape& shape_input, for (int i = 2; i < input_rank.get_length(); ++i) expected_shape.push_back(shape_input[i] * possible_block_size); - if (!ngraph::op::util::shapes_equal_except_dynamic_expected_batch(expected_shape, shape_reshape_after)) { + if (!ov::op::util::shapes_equal_except_dynamic_expected_batch(expected_shape, shape_reshape_after)) { return false; } @@ -87,7 +87,7 @@ bool check_depth_first(const ngraph::PartialShape& shape_input, for (int i = 2; i < input_rank.get_length(); ++i) expected_shape.push_back(shape_input[i]); - if (!ngraph::op::util::shapes_equal_except_dynamic_expected_batch(expected_shape, shape_reshape_before)) { + if (!ov::op::util::shapes_equal_except_dynamic_expected_batch(expected_shape, shape_reshape_before)) { return false; } @@ -107,7 +107,7 @@ bool check_depth_first(const ngraph::PartialShape& shape_input, for (int i = 2; i < input_rank.get_length(); ++i) expected_shape.push_back(shape_input[i] * possible_block_size); - if (!ngraph::op::util::shapes_equal_except_dynamic_expected_batch(expected_shape, shape_reshape_after)) { + if (!ov::op::util::shapes_equal_except_dynamic_expected_batch(expected_shape, shape_reshape_after)) { return false; } 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 61faa79392a..700a41ffe0a 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 @@ -12,7 +12,7 @@ bool ov::pass::FusedNamesCleanup::run_on_model(const std::shared_ptr& for (auto& node : f->get_ordered_ops()) { RTMap& rt_info = node->get_rt_info(); - auto it = rt_info.find(ngraph::FusedNames::get_type_info_static()); + auto it = rt_info.find(ov::FusedNames::get_type_info_static()); if (it != rt_info.end()) { rt_info.erase(it); } 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 2b00395c107..718d94f2f57 100644 --- a/src/common/transformations/src/transformations/common_optimizations/gelu_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/gelu_fusion.cpp @@ -229,10 +229,9 @@ ov::pass::GeluFusionWithErfFour::GeluFusionWithErfFour() { } constexpr auto sqrt2 = static_cast(M_SQRT2); - bool valid_constant_values = - ngraph::op::util::has_constant_value(mul1_const_value, 1.0f / sqrt2, 0.001f) && - ngraph::op::util::has_constant_value(add_const_value, 0.5f) && - ngraph::op::util::has_constant_value(mul2_const_value, 0.5f); + bool valid_constant_values = ov::op::util::has_constant_value(mul1_const_value, 1.0f / sqrt2, 0.001f) && + ov::op::util::has_constant_value(add_const_value, 0.5f) && + ov::op::util::has_constant_value(mul2_const_value, 0.5f); if (!valid_constant_values) { return false; diff --git a/src/common/transformations/src/transformations/common_optimizations/mark_precision_sensitive_shapeof_subgraphs.cpp b/src/common/transformations/src/transformations/common_optimizations/mark_precision_sensitive_shapeof_subgraphs.cpp index b027c606aa7..2dccd2d3be9 100644 --- a/src/common/transformations/src/transformations/common_optimizations/mark_precision_sensitive_shapeof_subgraphs.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/mark_precision_sensitive_shapeof_subgraphs.cpp @@ -64,9 +64,9 @@ bool ov::pass::MarkPrecisionSensitiveShapeOfSubgraphs::run_on_model(const shared // visit_shape_path shouldn't depend on "visited" nodes because we can approach Divide // earlier from some non precision sensitive path. So we use dedicated "precision_sensitive_visited" // set for precision sensitive nodes, so they can be visited twice and finally marked-up. - ngraph::op::util::visit_shape_path(input.get_source_output().get_node(), - precision_sensitive_visited, - m_markup_func); + ov::op::util::visit_shape_path(input.get_source_output().get_node(), + precision_sensitive_visited, + m_markup_func); } } 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 a542f12eda9..605888a3da8 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 @@ -41,7 +41,7 @@ ov::pass::MulFakeQuantizeFusion::MulFakeQuantizeFusion() { return false; auto const_shape = mul_const->get_shape(); - if (ngraph::op::util::check_for_broadcast(input.get_partial_shape(), const_shape)) { + if (ov::op::util::check_for_broadcast(input.get_partial_shape(), const_shape)) { // We can't eliminate Multiply if Constant input broadcasts another input shape because // when we reconnect input from Multiply to FQ won't broadcast given input, so it will result // in shape collision. 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 885f2729e8f..b189f33e05f 100644 --- a/src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp @@ -743,7 +743,7 @@ pass::EliminateScatterUpdate::EliminateScatterUpdate() { this->register_matcher(m, callback); } -ngraph::pass::NopElimination::NopElimination(bool use_shape_for_elimination) { +ov::pass::NopElimination::NopElimination(bool use_shape_for_elimination) { // shape-agnostic transformations ADD_MATCHER_FOR_THIS(EliminatePad) ADD_MATCHER_FOR_THIS(EliminateConvert) 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 b02ffe83e67..aca526da31a 100644 --- a/src/common/transformations/src/transformations/common_optimizations/prelu_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/prelu_fusion.cpp @@ -84,7 +84,7 @@ static std::function)> constant_value(const fl return false; } float value; - if (!ngraph::op::util::get_single_value(node, value)) { + if (!ov::op::util::get_single_value(node, value)) { return false; } return value == target_value; 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 5448fced044..8e1f95c2616 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 @@ -51,7 +51,7 @@ bool check_shapes(const ngraph::PartialShape& pshape_input, pshape_input[3]}; } - if (!ngraph::op::util::shapes_equal_except_dynamic_expected_batch(expected_reshape_before, pshape_reshape_before)) { + if (!ov::op::util::shapes_equal_except_dynamic_expected_batch(expected_reshape_before, pshape_reshape_before)) { return false; } @@ -70,7 +70,7 @@ bool check_shapes(const ngraph::PartialShape& pshape_input, } // y = reshape(x'', [N, C, H, W]) - if (!ngraph::op::util::shapes_equal_except_dynamic_expected_batch(pshape_input, pshape_reshape_after)) { + if (!ov::op::util::shapes_equal_except_dynamic_expected_batch(pshape_input, pshape_reshape_after)) { return false; } diff --git a/src/common/transformations/src/transformations/common_optimizations/transpose_sinking_general.cpp b/src/common/transformations/src/transformations/common_optimizations/transpose_sinking_general.cpp index 343857a0486..f4f437e4d82 100644 --- a/src/common/transformations/src/transformations/common_optimizations/transpose_sinking_general.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/transpose_sinking_general.cpp @@ -26,7 +26,7 @@ ov::pass::TransposeSinkingGeneralForward::TransposeSinkingGeneralForward() { add_matcher(); add_matcher(); add_matcher(); - add_matcher(); + add_matcher(); } ov::pass::TransposeSinkingGeneralBackward::TransposeSinkingGeneralBackward() { @@ -36,7 +36,7 @@ ov::pass::TransposeSinkingGeneralBackward::TransposeSinkingGeneralBackward() { add_matcher(); add_matcher(); add_matcher(); - add_matcher(); + add_matcher(); } bool ov::pass::TransposeSinkingGeneral::run_on_model(const std::shared_ptr& f) { 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 b7db1d25956..b86f2625da2 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 @@ -118,7 +118,7 @@ bool ov::pass::UnrollTensorIterator::run_on_model(const std::shared_ptr& node, type_relaxed->set_overridden_output_type(to); return true; } else if (auto casted = std::dynamic_pointer_cast(node)) { - auto relaxed_op = std::make_shared>(*casted, - ov::element::TypeVector{}, - ov::element::TypeVector{to}); + auto relaxed_op = + std::make_shared>(*casted, ov::element::TypeVector{}, ov::element::TypeVector{to}); replace_node(node, relaxed_op); return true; } @@ -75,7 +74,7 @@ bool fuse_type_to_logical(const std::shared_ptr& node, ngraph::ele type_relaxed->set_origin_input_type(ov::element::boolean, 1); return true; } else if (auto casted = std::dynamic_pointer_cast(node)) { - auto relaxed_op = std::make_shared>( + auto relaxed_op = std::make_shared>( *casted, ov::element::TypeVector{ov::element::boolean, ov::element::boolean}, ov::element::TypeVector{to}); @@ -92,9 +91,9 @@ bool fuse_type_to_reduce_logical(const std::shared_ptr& node, ngra type_relaxed->set_origin_input_type(ov::element::boolean, 0); return true; } else if (auto casted = std::dynamic_pointer_cast(node)) { - auto relaxed_op = std::make_shared>(*casted, - ov::element::TypeVector{ov::element::boolean}, - ov::element::TypeVector{to}); + auto relaxed_op = std::make_shared>(*casted, + ov::element::TypeVector{ov::element::boolean}, + ov::element::TypeVector{to}); replace_node(node, relaxed_op); return true; } @@ -445,9 +444,8 @@ bool fuse_type_to_nms5(const std::shared_ptr& node, ngraph::elemen output_types.emplace_back(output.get_element_type()); } output_types[idx] = to; - auto relaxed_op = std::make_shared>(*nms, - ov::element::TypeVector{}, - output_types); + auto relaxed_op = + std::make_shared>(*nms, ov::element::TypeVector{}, output_types); replace_node(node, relaxed_op); return true; } @@ -473,9 +471,8 @@ bool fuse_type_to_nms9(const std::shared_ptr& node, ngraph::elemen output_types.emplace_back(output.get_element_type()); } output_types[idx] = to; - auto relaxed_op = std::make_shared>(*nms, - ov::element::TypeVector{}, - output_types); + auto relaxed_op = + std::make_shared>(*nms, ov::element::TypeVector{}, output_types); replace_node(node, relaxed_op); return true; } @@ -588,9 +585,9 @@ bool fuse_type_to_shapeof_v0(const std::shared_ptr& node, ngraph:: type_relaxed->set_overridden_output_type(to); return true; } else if (auto casted = std::dynamic_pointer_cast(node)) { - auto relaxed_op = std::make_shared>(*casted, - ov::element::TypeVector{}, - ov::element::TypeVector{to}); + auto relaxed_op = std::make_shared>(*casted, + ov::element::TypeVector{}, + ov::element::TypeVector{to}); replace_node(node, relaxed_op); return true; } 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 4918e64f22d..66bf50691b6 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_divide.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_divide.cpp @@ -41,7 +41,7 @@ bool convert_divide(std::shared_ptr node) { 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 (ngraph::op::util::can_eliminate_eltwise_node(mul, mul->input_value(0), mul->input_value(1))) { + 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); } else { 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 7e860e5393d..ed2210d03ca 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 @@ -30,8 +30,7 @@ ov::pass::ConvertInterpolate1ToInterpolate4::ConvertInterpolate1ToInterpolate4() std::vector axes{attrsV0.axes.begin(), attrsV0.axes.end()}; const auto& out_dims = std::make_shared(interpolationV0->input_value(1), element::f32); const auto& in_dims = std::make_shared( - ngraph::op::util::node_to_get_shape_value_of_indices_from_shape_source(interpolationV0->input_value(0), - axes), + ov::op::util::node_to_get_shape_value_of_indices_from_shape_source(interpolationV0->input_value(0), axes), element::f32); std::shared_ptr scales = std::make_shared(out_dims, in_dims); 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 849cc669001..b6637e5094b 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 @@ -39,7 +39,7 @@ pass::ConvertMaxPool8ToMaxPool1::ConvertMaxPool8ToMaxPool1() { maxpool_v8_node->get_rounding_type(), maxpool_v8_node->get_auto_pad()); - auto out_name = ngraph::op::util::create_ie_output_name(maxpool_v8_node->output(0)); + auto out_name = ov::op::util::create_ie_output_name(maxpool_v8_node->output(0)); maxpool_v1_node->set_friendly_name(maxpool_v8_node->get_friendly_name()); maxpool_v8_node->output(0).replace(maxpool_v1_node->output(0)); 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 f1dde1c5767..cf8d23ad380 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 @@ -78,7 +78,7 @@ bool convert_sequence_to_ti(const std::shared_ptr& sequence, } auto max_seq_len = X_pshape[1].get_length(); - bool enable_mask = ngraph::op::util::is_seq_len_provided(seq_lengths.get_node_shared_ptr(), max_seq_len); + 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; 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 fd21e451e02..51f64866d54 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 @@ -59,9 +59,9 @@ ov::pass::GRUCellDecomposition::GRUCellDecomposition() { } // zt = f(Xt*(Wz^T) + Ht-1*(Rz^T) + Wbz + Rbz) - auto z_t = ngraph::op::util::activation(gru_cell->get_activations()[0], clamp_z); + auto z_t = ov::op::util::activation(gru_cell->get_activations()[0], clamp_z); // rt = f(Xt*(Wr^T) + Ht-1*(Rr^T) + Wbr + Rbr) - auto r_t = ngraph::op::util::activation(gru_cell->get_activations()[0], clamp_r); + auto r_t = ov::op::util::activation(gru_cell->get_activations()[0], clamp_r); std::shared_ptr _h; if (gru_cell->get_linear_before_reset()) { @@ -85,7 +85,7 @@ ov::pass::GRUCellDecomposition::GRUCellDecomposition() { clamp_h = std::make_shared(_h, -clip, clip); ngraph::copy_runtime_info(gru_cell, clamp_h); } - auto h_t = ngraph::op::util::activation(gru_cell->get_activations()[1], clamp_h); + auto h_t = ov::op::util::activation(gru_cell->get_activations()[1], clamp_h); // Ht = (1 - zt) (.) ht + zt (.) Ht-1 auto one = opset4::Constant::create(z_t->get_element_type(), Shape{1}, {1.f}); 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 05be853daf1..f984e0c1099 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 @@ -62,10 +62,10 @@ ov::pass::LSTMCellDecomposition::LSTMCellDecomposition() { // it = f(Xt*(Wi^T) + Ht-1*(Ri^T) + Wbi + Rbi) // ct = g(Xt*(Wc^T) + Ht-1*(Rc^T) + Wbc + Rbc) // ot = f(Xt*(Wo^T) + Ht-1*(Ro^T) + Wbo + Rbo) - auto f_t = ngraph::op::util::activation(lstm_cell->get_activations()[0], f); - auto i_t = ngraph::op::util::activation(lstm_cell->get_activations()[0], i); - auto c_t = ngraph::op::util::activation(lstm_cell->get_activations()[1], c); - auto o_t = ngraph::op::util::activation(lstm_cell->get_activations()[0], o); + auto f_t = ov::op::util::activation(lstm_cell->get_activations()[0], f); + auto i_t = ov::op::util::activation(lstm_cell->get_activations()[0], i); + auto c_t = ov::op::util::activation(lstm_cell->get_activations()[1], c); + auto o_t = ov::op::util::activation(lstm_cell->get_activations()[0], o); // Ct = ft (.) Ct-1 + it (.) ct auto mul1 = std::make_shared(f_t, C_t); @@ -73,7 +73,7 @@ ov::pass::LSTMCellDecomposition::LSTMCellDecomposition() { auto out_C = std::make_shared(mul1, mul2); // H = ot (.) h(Ct) - auto hC = ngraph::op::util::activation(lstm_cell->get_activations()[2], out_C); + auto hC = ov::op::util::activation(lstm_cell->get_activations()[2], out_C); auto out_H = std::make_shared(o_t, hC); out_H->set_friendly_name(lstm_cell->get_friendly_name() + ".0"); 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 69f289b15de..10258b19cf1 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 @@ -42,7 +42,7 @@ ov::pass::RNNCellDecomposition::RNNCellDecomposition() { clamp = std::make_shared(i_t, -clip, clip); ngraph::copy_runtime_info(rnn_cell, clamp); } - auto out = ngraph::op::util::activation(rnn_cell->get_activations()[0], 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); 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 22a2d773841..f2eb1c04334 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 @@ -17,8 +17,8 @@ bool ov::pass::ConvertOpSet2ToOpSet1::run_on_model(const std::shared_ptr(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); 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 9798a72b406..bb855532cf0 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 @@ -20,11 +20,11 @@ bool ov::pass::ConvertOpSet3ToOpSet2::run_on_model(const std::shared_ptr(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); diff --git a/src/common/transformations/src/transformations/rt_info/attributes.cpp b/src/common/transformations/src/transformations/rt_info/attributes.cpp index 4efedff7997..98946d0a1df 100644 --- a/src/common/transformations/src/transformations/rt_info/attributes.cpp +++ b/src/common/transformations/src/transformations/rt_info/attributes.cpp @@ -5,7 +5,7 @@ #include "transformations/rt_info/attributes.hpp" ov::pass::Attributes::Attributes() { - register_factory(); + register_factory(); register_factory(); register_factory(); register_factory(); 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 143bd0aa217..7f31aa96998 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 @@ -11,7 +11,7 @@ using namespace ngraph; -bool ngraph::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 = ngraph::clone_function(*f); 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 c570fa7cb3f..e1e261b0b7e 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 @@ -12,16 +12,16 @@ #include #include -bool ngraph::pass::SetBatchSize::run_on_model(const std::shared_ptr& f) { +bool ov::pass::SetBatchSize::run_on_model(const std::shared_ptr& f) { RUN_ON_FUNCTION_SCOPE(SetBatchSize); ngraph::pass::Manager manager; // This pass must be called first in pipeline - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); return true; } 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 08e82a422d0..eb7ed9e673f 100644 --- a/src/common/transformations/src/transformations/smart_reshape/smart_reshape.cpp +++ b/src/common/transformations/src/transformations/smart_reshape/smart_reshape.cpp @@ -17,20 +17,20 @@ #include "itt.hpp" -bool ngraph::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; // This pass must be called first in pipeline - static_manager.register_pass(); - static_manager.register_pass(); - static_manager.register_pass(); - static_manager.register_pass(); - static_manager.register_pass(); - static_manager.register_pass(); - static_manager.register_pass(); - static_manager.register_pass(); - static_manager.register_pass(); - static_manager.register_pass(); + static_manager.register_pass(); + static_manager.register_pass(); + static_manager.register_pass(); + static_manager.register_pass(); + static_manager.register_pass(); + static_manager.register_pass(); + static_manager.register_pass(); + static_manager.register_pass(); + static_manager.register_pass(); + static_manager.register_pass(); static_manager.register_pass(); static_manager.register_pass(); static_manager.run_passes(f); @@ -39,8 +39,8 @@ bool ngraph::pass::SmartReshape::run_on_model(const std::shared_ptr(); - dynamic_manager.register_pass(); + dynamic_manager.register_pass(); + dynamic_manager.register_pass(); dynamic_manager.register_pass(); dynamic_manager.run_passes(f); 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 d57a677f24d..a0e142b7cee 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 @@ -214,7 +214,7 @@ bool squeezes_perform_the_same(std::shared_ptr lhs, std::sh } // namespace -bool ngraph::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; diff --git a/src/common/transformations/tests/common_optimizations/add_fake_quantize_fusion.cpp b/src/common/transformations/tests/common_optimizations/add_fake_quantize_fusion.cpp index a6c66e43ebc..116d7ba1be6 100644 --- a/src/common/transformations/tests/common_optimizations/add_fake_quantize_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/add_fake_quantize_fusion.cpp @@ -32,7 +32,7 @@ TEST_F(TransformationTestsF, AddFakeQuantizeFusion) { auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(add, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -64,7 +64,7 @@ TEST_F(TransformationTestsF, AddFakeQuantizeFusionWithConvolutionAndScalarConsta auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(add, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data, filter}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -96,7 +96,7 @@ TEST_F(TransformationTestsF, AddFakeQuantizeFusionConstantOnFirstInput) { auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(add, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -121,7 +121,7 @@ TEST_F(TransformationTestsF, AddFakeQuantizeFusionConstantWithEqualValues) { auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(add, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -146,7 +146,7 @@ TEST_F(TransformationTestsF, AddFakeQuantizeFusionReshape) { auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(add, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -171,7 +171,7 @@ TEST_F(TransformationTestsF, AddFakeQuantizeFusionWithPerChannelConstant) { auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(add, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -195,7 +195,7 @@ TEST_F(TransformationTestsF, NegativeAddFakeQuantizeFusionNotAConstant) { auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(add, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data, add_2nd_input}); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, NegativeAddFakeQuantizeFusionWithConvolutionAndNonScalarConstant) { @@ -216,7 +216,7 @@ TEST_F(TransformationTestsF, NegativeAddFakeQuantizeFusionWithConvolutionAndNonS auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(add, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data, filter}); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, NegativeAddFakeQuantizeFusionLowPrecision) { @@ -231,7 +231,7 @@ TEST_F(TransformationTestsF, NegativeAddFakeQuantizeFusionLowPrecision) { auto fq = std::make_shared(add, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); function_ref = clone_function(*function); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, NegativeAddFakeQuantizeFusionWithNonPerChannelConstant) { @@ -245,7 +245,7 @@ TEST_F(TransformationTestsF, NegativeAddFakeQuantizeFusionWithNonPerChannelConst auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(add, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, AddFakeQuantizeFusionWithBroadcastingConstant) { @@ -258,5 +258,5 @@ TEST_F(TransformationTestsF, AddFakeQuantizeFusionWithBroadcastingConstant) { auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(add, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } diff --git a/src/common/transformations/tests/common_optimizations/align_eltwise_input_ranks.cpp b/src/common/transformations/tests/common_optimizations/align_eltwise_input_ranks.cpp index 270f2a22cdd..16f3ce89895 100644 --- a/src/common/transformations/tests/common_optimizations/align_eltwise_input_ranks.cpp +++ b/src/common/transformations/tests/common_optimizations/align_eltwise_input_ranks.cpp @@ -38,7 +38,7 @@ TEST_P(AlignEltwiseInputRanksTest, FusionTest) { auto fq = std::make_shared(add, low, high, low, high, 256); function = std::make_shared(NodeVector{less, logical_or, fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } if (can_align) { diff --git a/src/common/transformations/tests/common_optimizations/augru_cell_fusion.cpp b/src/common/transformations/tests/common_optimizations/augru_cell_fusion.cpp index a9f60a25c97..9e45f8b14de 100644 --- a/src/common/transformations/tests/common_optimizations/augru_cell_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/augru_cell_fusion.cpp @@ -83,7 +83,7 @@ shared_ptr gen_reference(size_t batch, size_t hidden_size, size_t input_s auto B = make_shared(OutputVector{split_bias_r_z->output(1), split_bias_r_z->output(0), Bh}, 1); auto squeeze_B = make_shared(B, axis_0); - auto cell = make_shared(X, H, Wzrh, Rzrh, squeeze_B, A, hidden_size); + auto cell = make_shared(X, H, Wzrh, Rzrh, squeeze_B, A, hidden_size); return make_shared(OutputVector{cell}, params); } } // namespace @@ -100,7 +100,7 @@ TEST_P(AUGRUFusionTest, AUGRUCellPattern) { const auto& p = GetParam(); { model = gen_model(p.batch, p.hidden_size, p.input_size, false); - manager.register_pass(); + manager.register_pass(); } { model_ref = gen_reference(p.batch, p.hidden_size, p.input_size); } @@ -117,7 +117,7 @@ TEST_P(AUGRUFusionTestDyn, AUGRUCellPatternDynamicShapes) { model = gen_model(p.batch, p.hidden_size, p.input_size, true); // the transformation won't be applied because we can't determine hidden_size/input_size, // they are dynamic. - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/common_optimizations/batch_to_space_fusion.cpp b/src/common/transformations/tests/common_optimizations/batch_to_space_fusion.cpp index 88a25557d74..e68dcca8cea 100644 --- a/src/common/transformations/tests/common_optimizations/batch_to_space_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/batch_to_space_fusion.cpp @@ -37,7 +37,7 @@ TEST_F(TransformationTestsF, BatchToSpaceFusionTranspose) { auto trans_after = std::make_shared(slice, op::Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); function = std::make_shared(NodeVector{trans_after}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -70,7 +70,7 @@ TEST_F(TransformationTestsF, BatchToSpaceFusionReshape) { op::Constant::create(element::i64, Shape{4}, {1, 2, 4, 14}), false); function = std::make_shared(NodeVector{reshape_after}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -101,7 +101,7 @@ TEST_F(TransformationTestsF, NegativeBatchToSpaceFusionInvalidTransposePerm) { auto trans_after = std::make_shared(slice, op::Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); function = std::make_shared(NodeVector{trans_after}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -140,7 +140,7 @@ TEST_F(TransformationTestsF, NegativeBatchToSpaceFusionInvalidMode) { auto trans_after = std::make_shared(slice, op::Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); function = std::make_shared(NodeVector{trans_after}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -180,7 +180,7 @@ TEST_F(TransformationTestsF, NegativeBatchToSpaceFusionInvalidRank) { auto trans_after = std::make_shared(slice, op::Constant::create(element::i64, Shape{5}, {1, 0, 2, 3, 4})); function = std::make_shared(NodeVector{trans_after}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, Shape{16, 3, 4, 8, 8}); @@ -199,6 +199,6 @@ TEST_F(TransformationTestsF, NegativeBatchToSpaceFusionInvalidRank) { auto trans_after = std::make_shared(slice, op::Constant::create(element::i64, Shape{5}, {1, 0, 2, 3, 4})); function_ref = std::make_shared(NodeVector{trans_after}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/common_optimizations/binarize_weights.cpp b/src/common/transformations/tests/common_optimizations/binarize_weights.cpp index 8ef2db14c92..9c263167749 100644 --- a/src/common/transformations/tests/common_optimizations/binarize_weights.cpp +++ b/src/common/transformations/tests/common_optimizations/binarize_weights.cpp @@ -48,8 +48,8 @@ TEST_F(TransformationTestsF, BinarizeWeightsActivationsOutputLowZero) { Strides{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { @@ -104,8 +104,8 @@ TEST_F(TransformationTestsF, BinarizeWeightsActivationsOutputLowNegative) { Strides{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { @@ -160,8 +160,8 @@ TEST_F(TransformationTestsF, NegativeBinarizeWeightsInvalidLevels) { Strides{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { @@ -222,8 +222,8 @@ TEST_F(TransformationTestsF, NegativeBinarizeWeightsInvalidActivationsOutputLowH Strides{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { @@ -284,8 +284,8 @@ TEST_F(TransformationTestsF, NegativeBinarizeWeightsInvalidOutputLowHigh) { Strides{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/broadcast_elementwise_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/broadcast_elementwise_fusion_test.cpp index 9e6c1975f2f..ced067a80f4 100644 --- a/src/common/transformations/tests/common_optimizations/broadcast_elementwise_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/broadcast_elementwise_fusion_test.cpp @@ -24,7 +24,7 @@ using TargetShape = Shape; void eliminate_broadcast_test(std::shared_ptr f, std::shared_ptr f_ref) { pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); auto res = compare_functions(f, f_ref); ASSERT_TRUE(res.first) << res.second; @@ -310,7 +310,7 @@ TEST_F(TransformationTestsF, BroadcastElementwiseFusionWithShapeOf) { auto elementwise = std::make_shared(input, broadcast); function = std::make_shared(ngraph::NodeVector{elementwise}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -330,6 +330,6 @@ TEST_F(TransformationTestsF, BroadcastElementwiseFusionWithShapeOfNeg) { function = std::make_shared(ngraph::NodeVector{elementwise, broadcast}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/common_optimizations/clamp_fusion.cpp b/src/common/transformations/tests/common_optimizations/clamp_fusion.cpp index fdea2d30615..db50035bbef 100644 --- a/src/common/transformations/tests/common_optimizations/clamp_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/clamp_fusion.cpp @@ -29,7 +29,7 @@ TEST_F(TransformationTestsF, ClampFusion) { auto min = std::make_shared(max, max_const); function = std::make_shared(NodeVector{min}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -48,7 +48,7 @@ TEST_F(TransformationTestsF, ClampFusionScalars) { auto min = std::make_shared(max, max_const); function = std::make_shared(NodeVector{min}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -67,7 +67,7 @@ TEST_F(TransformationTestsF, ClampFusionNonConstMin) { auto min = std::make_shared(max, max_const); function = std::make_shared(NodeVector{min}, ParameterVector{data, min_val}); - manager.register_pass(); + manager.register_pass(); } { @@ -90,7 +90,7 @@ TEST_F(TransformationTestsF, ClampFusionMinMax) { function = std::make_shared(NodeVector{max}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -109,7 +109,7 @@ TEST_F(TransformationTestsF, ClampFusionMinMaxScalars) { auto max = std::make_shared(min, min_const); function = std::make_shared(NodeVector{max}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -128,7 +128,7 @@ TEST_F(TransformationTestsF, ClampFusionMinMaxNonConstMax) { auto max = std::make_shared(min, max_val); function = std::make_shared(NodeVector{max}, ParameterVector{data, max_val}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/concat_reduce_fusion.cpp b/src/common/transformations/tests/common_optimizations/concat_reduce_fusion.cpp index c7f9ff39f18..f319d189436 100644 --- a/src/common/transformations/tests/common_optimizations/concat_reduce_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/concat_reduce_fusion.cpp @@ -37,7 +37,7 @@ TEST_F(TransformationTestsF, ConcatReduceMaxFusionDynamicShape) { std::make_shared(concat, opset8::Constant::create(element::i64, Shape{}, {reduce_axis})); function = std::make_shared(NodeVector{reduce_max}, ParameterVector{left_input, right_input}); - manager.register_pass(); + manager.register_pass(); } { auto left_input = std::make_shared(element::f32, shape); @@ -69,7 +69,7 @@ TEST_F(TransformationTestsF, ConcatReduceMaxFusionKeepDimsDynamicShape) { true); function = std::make_shared(NodeVector{reduce_max}, ParameterVector{left_input, right_input}); - manager.register_pass(); + manager.register_pass(); } { auto left_input = std::make_shared(element::f32, shape); @@ -106,7 +106,7 @@ TEST_F(TransformationTestsF, ConcatReduceMaxFusionDynamicRank) { std::make_shared(concat, opset8::Constant::create(element::i64, Shape{}, {reduce_axis})); function = std::make_shared(NodeVector{reduce_max}, ParameterVector{left_input, right_input}); - manager.register_pass(); + manager.register_pass(); } { auto left_input = std::make_shared(element::f32, shape); @@ -136,7 +136,7 @@ TEST_F(TransformationTestsF, ConcatReduceMinFusionDynamicShape) { std::make_shared(concat, opset8::Constant::create(element::i64, Shape{}, {reduce_axis})); function = std::make_shared(NodeVector{reduce_max}, ParameterVector{left_input, right_input}); - manager.register_pass(); + manager.register_pass(); } { auto left_input = std::make_shared(element::f32, shape); @@ -166,7 +166,7 @@ TEST_F(TransformationTestsF, ConcatReduceMinFusionDynamicRank) { std::make_shared(concat, opset8::Constant::create(element::i64, Shape{}, {reduce_axis})); function = std::make_shared(NodeVector{reduce_max}, ParameterVector{left_input, right_input}); - manager.register_pass(); + manager.register_pass(); } { auto left_input = std::make_shared(element::f32, shape); @@ -192,7 +192,7 @@ TEST_F(TransformationTestsF, PullSqueezeThroughEltwiseStaticShape) { auto squeeze = std::make_shared(add, opset8::Constant::create(element::i64, Shape{}, {0})); function = std::make_shared(NodeVector{squeeze}, ParameterVector{left_input, right_input}); - manager.register_pass(); + manager.register_pass(); } { auto left_input = std::make_shared(element::f32, shape); @@ -230,7 +230,7 @@ TEST_F(TransformationTestsF, PullSqueezeThroughEltwiseSqueezeEliminationStaticSh auto squeeze = std::make_shared(add, opset8::Constant::create(element::i64, Shape{}, {0})); function = std::make_shared(NodeVector{squeeze}, ParameterVector{left_input, right_input}); - manager.register_pass(); + manager.register_pass(); } { auto left_input = std::make_shared(element::f32, shape); @@ -258,7 +258,7 @@ TEST_F(TransformationTestsF, PullSqueezeThroughEltwiseSqueezeEliminationDynamicS auto squeeze = std::make_shared(add, opset8::Constant::create(element::i64, Shape{}, {0})); function = std::make_shared(NodeVector{squeeze}, ParameterVector{left_input, right_input}); - manager.register_pass(); + manager.register_pass(); } { auto left_input = std::make_shared(element::f32, shape); @@ -286,7 +286,7 @@ TEST_F(TransformationTestsF, PullSqueezeThroughEltwiseSqueezeEliminationDynamicR auto squeeze = std::make_shared(add, opset8::Constant::create(element::i64, Shape{}, {0})); function = std::make_shared(NodeVector{squeeze}, ParameterVector{left_input, right_input}); - manager.register_pass(); + manager.register_pass(); } { auto left_input = std::make_shared(element::f32, shape); diff --git a/src/common/transformations/tests/common_optimizations/conv_to_binary_conv.cpp b/src/common/transformations/tests/common_optimizations/conv_to_binary_conv.cpp index e1861577682..4ad3ebffccd 100644 --- a/src/common/transformations/tests/common_optimizations/conv_to_binary_conv.cpp +++ b/src/common/transformations/tests/common_optimizations/conv_to_binary_conv.cpp @@ -42,9 +42,9 @@ TEST(TransformationTests, ConvToBinaryConvOutputLowZeroOutputHighOne) { f = std::make_shared(NodeVector{conv}, ParameterVector{data}); pass::Manager m; - m.register_pass(); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -101,9 +101,9 @@ TEST(TransformationTests, ConvToBinaryConvOutputLowMinusOneOutputHighOne) { f = std::make_shared(NodeVector{conv}, ParameterVector{data}); pass::Manager m; - m.register_pass(); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -158,9 +158,9 @@ TEST(TransformationTests, NegativeConvToBinaryConvInvalidWeights) { f = std::make_shared(NodeVector{conv}, ParameterVector{data}); pass::Manager m; - m.register_pass(); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -211,9 +211,9 @@ TEST(TransformationTests, NegativeConvToBinaryConvInvalidLevels) { f = std::make_shared(NodeVector{conv}, ParameterVector{data}); pass::Manager m; - m.register_pass(); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -264,9 +264,9 @@ TEST(TransformationTests, NegativeConvToBinaryConvOutputLowHigh) { f = std::make_shared(NodeVector{conv}, ParameterVector{data}); pass::Manager m; - m.register_pass(); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } diff --git a/src/common/transformations/tests/common_optimizations/convert_compression_only_to_legacy_test.cpp b/src/common/transformations/tests/common_optimizations/convert_compression_only_to_legacy_test.cpp index 24ec7c40e84..ea3f3444022 100644 --- a/src/common/transformations/tests/common_optimizations/convert_compression_only_to_legacy_test.cpp +++ b/src/common/transformations/tests/common_optimizations/convert_compression_only_to_legacy_test.cpp @@ -39,7 +39,7 @@ TEST(TransformationTests, ConvertCompressionOnlyToLegacy) { f = std::make_shared(ov::NodeVector{conv}, ov::ParameterVector{input}); ov::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -83,7 +83,7 @@ TEST(TransformationTests, ConvertCompressionOnlyToLegacyNoConvertion) { f = std::make_shared(ov::NodeVector{conv}, ov::ParameterVector{input}); ov::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/common_optimizations/convert_convertlike.cpp b/src/common/transformations/tests/common_optimizations/convert_convertlike.cpp index 9ba209e70d7..5b11c961cef 100644 --- a/src/common/transformations/tests/common_optimizations/convert_convertlike.cpp +++ b/src/common/transformations/tests/common_optimizations/convert_convertlike.cpp @@ -28,8 +28,8 @@ TEST(TransformationTests, ConvertConvertLike) { f = std::make_shared(ngraph::NodeVector{cvtlike}, ngraph::ParameterVector{data}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -57,8 +57,8 @@ TEST(TransformationTests, ConvertConvertLike2) { f = std::make_shared(ngraph::NodeVector{cvtlike}, ngraph::ParameterVector{data, data2}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -84,8 +84,8 @@ TEST(TransformationTests, ConvertConvertLike_Negative) { f = std::make_shared(ngraph::NodeVector{cvtlike}, ngraph::ParameterVector{data, like}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } diff --git a/src/common/transformations/tests/common_optimizations/convert_divide.cpp b/src/common/transformations/tests/common_optimizations/convert_divide.cpp index 459722f12db..59dad02e2d4 100644 --- a/src/common/transformations/tests/common_optimizations/convert_divide.cpp +++ b/src/common/transformations/tests/common_optimizations/convert_divide.cpp @@ -29,7 +29,7 @@ TEST_F(TransformationTestsF, ConvertDivide) { function = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -50,7 +50,7 @@ TEST_F(TransformationTestsF, ConvertDivideInverse) { function = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -71,7 +71,7 @@ TEST_F(TransformationTestsF, ConvertDivideNegative) { function = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -95,7 +95,7 @@ TEST_F(TransformationTestsF, ConvertDivideScalar) { NGRAPH_CHECK(divide->get_output_partial_shape(0).rank().get_length() == 0); - manager.register_pass(); + manager.register_pass(); } { @@ -121,7 +121,7 @@ TEST_F(TransformationTestsF, ConvertDivideWithConstantPositive) { auto divide = std::make_shared(data, divide_constant); function = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -142,7 +142,7 @@ TEST_F(TransformationTestsF, ConvertDivideWithConstantNegative) { function = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{data1, data2}); - manager.register_pass(); + manager.register_pass(); } { @@ -159,7 +159,7 @@ TEST_F(TransformationTestsF, ConvertDivideWithConstantNegative) { TEST_F(TransformationTestsF, ConvertDivideFP16ShapeOfSubgraphNegative) { { auto data = std::make_shared(ngraph::element::f16, ngraph::Shape{1, 3, 22, 22}); - auto gather = ngraph::op::util::node_to_get_shape_value_of_indices_from_shape_source(data, {2, 3}); + auto gather = ov::op::util::node_to_get_shape_value_of_indices_from_shape_source(data, {2, 3}); auto convert = std::make_shared(gather, ngraph::element::f16); auto divide_constant = ngraph::opset1::Constant::create(ngraph::element::f16, ngraph::Shape{1}, {0.5}); auto divide = std::make_shared(convert, divide_constant); @@ -177,7 +177,7 @@ TEST_F(TransformationTestsF, ConvertDivideFP16ShapeOfSubgraphNegative) { function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{data}); manager.register_pass(); - manager.register_pass(); + manager.register_pass(); } } @@ -222,7 +222,7 @@ TEST_F(TransformationTestsF, ConvertDivide_If) { manager.register_pass(); auto decomp = manager.register_pass(); - decomp->add_matcher(); + decomp->add_matcher(); } comparator.enable(FunctionsComparator::CmpValues::ATTRIBUTES); } @@ -237,7 +237,7 @@ TEST_F(TransformationTestsF, ConvertDivideFP16ShapeOfSubgraphNegative2) { // special visited set for precision sensitive nodes which needs to be tested as well. So in the worst case // we will traverse each node twice. auto data = std::make_shared(ngraph::element::f16, ngraph::Shape{1, 3, 22, 22}); - auto gather = ngraph::op::util::node_to_get_shape_value_of_indices_from_shape_source(data, {2, 3}); + auto gather = ov::op::util::node_to_get_shape_value_of_indices_from_shape_source(data, {2, 3}); auto convert = std::make_shared(gather, ngraph::element::f16); auto divide_constant = ngraph::opset1::Constant::create(ngraph::element::f16, ngraph::Shape{1}, {0.5}); auto divide = std::make_shared(convert, divide_constant); @@ -261,14 +261,14 @@ TEST_F(TransformationTestsF, ConvertDivideFP16ShapeOfSubgraphNegative2) { ngraph::ParameterVector{data, data2}); manager.register_pass(); - manager.register_pass(); + manager.register_pass(); } } TEST_F(TransformationTestsF, ConvertDivideFP32ShapeOfSubgraphNegative) { { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{1, 3, 22, 22}); - auto gather = ngraph::op::util::node_to_get_shape_value_of_indices_from_shape_source(data, {2, 3}); + auto gather = ov::op::util::node_to_get_shape_value_of_indices_from_shape_source(data, {2, 3}); auto convert = std::make_shared(gather, ngraph::element::f32); auto divide_constant = ngraph::opset1::Constant::create(ngraph::element::f32, ngraph::Shape{1}, {0.5}); auto divide = std::make_shared(convert, divide_constant); @@ -286,6 +286,6 @@ TEST_F(TransformationTestsF, ConvertDivideFP32ShapeOfSubgraphNegative) { function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{data}); manager.register_pass(); - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/common_optimizations/convert_nms_gather_path_to_unsigned_test.cpp b/src/common/transformations/tests/common_optimizations/convert_nms_gather_path_to_unsigned_test.cpp index 05e09a3e976..5d6b1294f33 100644 --- a/src/common/transformations/tests/common_optimizations/convert_nms_gather_path_to_unsigned_test.cpp +++ b/src/common/transformations/tests/common_optimizations/convert_nms_gather_path_to_unsigned_test.cpp @@ -46,7 +46,7 @@ TEST_F(TransformationTestsF, test_convert_to_unsigned_nms_gather_1) { function = make_shared(NodeVector{gather}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -106,7 +106,7 @@ TEST_F(TransformationTestsF, test_convert_to_unsigned_nms_gather_2) { function = make_shared(NodeVector{gather}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -161,7 +161,7 @@ TEST_F(TransformationTestsF, test_convert_to_unsigned_nms_gather_with_onnx_slice function = make_shared(NodeVector{gather}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -200,8 +200,8 @@ TEST(TransformationTests, test_convert_to_unsigned_nms_gather_3) { shared_ptr f = make_shared(NodeVector{gather}, ParameterVector{boxes, scores}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); ASSERT_EQ(count_ops_of_type(f), 0); diff --git a/src/common/transformations/tests/common_optimizations/convert_quantize_dequantize.cpp b/src/common/transformations/tests/common_optimizations/convert_quantize_dequantize.cpp index e0c1cdc76c4..6d32e4ac352 100644 --- a/src/common/transformations/tests/common_optimizations/convert_quantize_dequantize.cpp +++ b/src/common/transformations/tests/common_optimizations/convert_quantize_dequantize.cpp @@ -77,9 +77,9 @@ void positive_test(const Shape& data_shape, levels); pass::Manager m; - m.register_pass(); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -225,8 +225,8 @@ void negative_test(const Shape& data_shape, scale_values, levels); pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } diff --git a/src/common/transformations/tests/common_optimizations/depth_to_space_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/depth_to_space_fusion_test.cpp index 7ddb9da0c98..e6ccc4ea74e 100644 --- a/src/common/transformations/tests/common_optimizations/depth_to_space_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/depth_to_space_fusion_test.cpp @@ -41,9 +41,9 @@ TEST_F(TransformationTestsF, DepthToSpaceFusionDepthFirst) { }; auto pass_config = manager.get_pass_config(); - pass_config->set_callback(callback); + pass_config->set_callback(callback); - manager.register_pass(); + manager.register_pass(); } { @@ -80,9 +80,9 @@ TEST_F(TransformationTestsF, DepthToSpaceFusionDepthFirstDynamicBatch) { }; auto pass_config = manager.get_pass_config(); - pass_config->set_callback(callback); + pass_config->set_callback(callback); - manager.register_pass(); + manager.register_pass(); } { @@ -119,9 +119,9 @@ TEST_F(TransformationTestsF, DepthToSpaceFusionBlockFirst) { }; auto pass_config = manager.get_pass_config(); - pass_config->set_callback(callback); + pass_config->set_callback(callback); - manager.register_pass(); + manager.register_pass(); } { @@ -158,9 +158,9 @@ TEST_F(TransformationTestsF, DepthToSpaceFusionBlockFirstDynamicBatch) { }; auto pass_config = manager.get_pass_config(); - pass_config->set_callback(callback); + pass_config->set_callback(callback); - manager.register_pass(); + manager.register_pass(); } { @@ -196,9 +196,9 @@ TEST_F(TransformationTestsF, DepthToSpaceFusionDynamicShape) { }; auto pass_config = manager.get_pass_config(); - pass_config->set_callback(callback); + pass_config->set_callback(callback); - manager.register_pass(); + manager.register_pass(); } { @@ -243,9 +243,9 @@ TEST_F(TransformationTestsF, DepthToSpaceFusionSeveralConsumers) { }; auto pass_config = manager.get_pass_config(); - pass_config->set_callback(callback); + pass_config->set_callback(callback); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/dilated_convolution_converter.cpp b/src/common/transformations/tests/common_optimizations/dilated_convolution_converter.cpp index b73b6b691f6..4d58defe848 100644 --- a/src/common/transformations/tests/common_optimizations/dilated_convolution_converter.cpp +++ b/src/common/transformations/tests/common_optimizations/dilated_convolution_converter.cpp @@ -42,7 +42,7 @@ TEST_F(TransformationTestsF, DilatedConvolutionConverter) { op::Constant::create(element::i64, Shape{4}, {0, 0, 1, 1})); function = std::make_shared(NodeVector{batch_to_space}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, Shape{1, 4, 10, 10}); @@ -83,7 +83,7 @@ TEST_F(TransformationTestsF, NegativeDilatedConvolutionConverterPadsLessThanCrop op::Constant::create(element::i64, Shape{4}, {0, 0, 2, 3})); function = std::make_shared(NodeVector{batch_to_space}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } } @@ -109,7 +109,7 @@ TEST_F(TransformationTestsF, NegativeDilatedConvolutionConverterNonZeroPadsForNC op::Constant::create(element::i64, Shape{4}, {0, 0, 1, 1})); function = std::make_shared(NodeVector{batch_to_space}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } } @@ -135,7 +135,7 @@ TEST_F(TransformationTestsF, DilatedGroupConvolutionConverter) { op::Constant::create(element::i64, Shape{4}, {0, 0, 1, 1})); function = std::make_shared(NodeVector{batch_to_space}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, Shape{1, 4, 10, 10}); diff --git a/src/common/transformations/tests/common_optimizations/dimension_tracking.cpp b/src/common/transformations/tests/common_optimizations/dimension_tracking.cpp index 7440d6192fa..6bad3e7fa70 100644 --- a/src/common/transformations/tests/common_optimizations/dimension_tracking.cpp +++ b/src/common/transformations/tests/common_optimizations/dimension_tracking.cpp @@ -74,7 +74,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_Transpose_and_Convolution) { const auto& f = std::make_shared(ov::NodeVector{conv}, ov::ParameterVector{data}); ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -101,7 +101,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_SingleMultiply) { const auto& f = std::make_shared(ov::NodeVector{mul}, ov::ParameterVector{data}); ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -131,7 +131,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_Two_Outputs) { const auto& f = std::make_shared(ov::NodeVector{conv, transpose}, ov::ParameterVector{data}); ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -161,7 +161,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_TwoOutputsReversed) { const auto& f = std::make_shared(ov::NodeVector{transpose, conv}, ov::ParameterVector{data}); ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -195,7 +195,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_IndependentBranchesConcated) { const auto& f = std::make_shared(ov::NodeVector{concat}, ov::ParameterVector{data}); ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -228,7 +228,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_TwoConvNetwork) { const auto& f = std::make_shared(ov::NodeVector{conv_0, conv_1}, ov::ParameterVector{data}); ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -256,7 +256,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_NegativeTracking) { const auto& f = std::make_shared(ov::NodeVector{reshape}, ov::ParameterVector{data}); ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(false, false); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -276,7 +276,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_AutoBatch_LabelPropagation_DO_deta auto& data = f->get_parameters()[0]; ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(true); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/common_optimizations/disable_shapeof_constant_folding_tests.cpp b/src/common/transformations/tests/common_optimizations/disable_shapeof_constant_folding_tests.cpp index 7b34732859a..40fdb79732e 100644 --- a/src/common/transformations/tests/common_optimizations/disable_shapeof_constant_folding_tests.cpp +++ b/src/common/transformations/tests/common_optimizations/disable_shapeof_constant_folding_tests.cpp @@ -26,8 +26,8 @@ TEST_F(TransformationTestsF, DisableShapeOfConstantFolding) { auto reshape = std::make_shared(data, abs, false); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { @@ -49,8 +49,8 @@ TEST_F(TransformationTestsF, ShapeOfShapeOfConstantFolding) { auto mul = std::make_shared(reshape, rank); function = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/divide_fusion.cpp b/src/common/transformations/tests/common_optimizations/divide_fusion.cpp index a5c9f2decf4..2673bad266f 100644 --- a/src/common/transformations/tests/common_optimizations/divide_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/divide_fusion.cpp @@ -30,8 +30,8 @@ TEST(TransformationTests, DivideFusion) { f = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{data1, data2}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -63,8 +63,8 @@ TEST(TransformationTests, DivideFusionNegative) { f = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{data1, data2}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } diff --git a/src/common/transformations/tests/common_optimizations/division_by_zero_fp16_resolver_test.cpp b/src/common/transformations/tests/common_optimizations/division_by_zero_fp16_resolver_test.cpp index a9dc0cfa21c..a0a54b70bc3 100644 --- a/src/common/transformations/tests/common_optimizations/division_by_zero_fp16_resolver_test.cpp +++ b/src/common/transformations/tests/common_optimizations/division_by_zero_fp16_resolver_test.cpp @@ -29,7 +29,7 @@ TEST_F(TransformationTestsF, DivisionByZeroMinimalPattern) { function = std::make_shared(NodeVector{divide}, ParameterVector{input_1, input_2}); - manager.register_pass(); + manager.register_pass(); } { @@ -58,7 +58,7 @@ TEST_F(TransformationTestsF, PowWithNegativeExponent) { function = std::make_shared(NodeVector{mul}, ParameterVector{input_1, input_2}); - manager.register_pass(); + manager.register_pass(); } { @@ -90,7 +90,7 @@ TEST_F(TransformationTestsF, PowWithPositiveExponent) { function = std::make_shared(NodeVector{mul}, ParameterVector{input_1, input_2}); - manager.register_pass(); + manager.register_pass(); } { @@ -120,7 +120,7 @@ TEST_F(TransformationTestsF, DivisionByZeroMinimalPatternUnchanged) { function = std::make_shared(NodeVector{divide}, ParameterVector{input_1, input_2}); - manager.register_pass(); + manager.register_pass(); } { @@ -151,7 +151,7 @@ TEST_F(TransformationTestsF, DivisionByZeroInL2NormWithSqrtAndWithMax) { function = std::make_shared(NodeVector{divide}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -186,7 +186,7 @@ TEST_F(TransformationTestsF, DivisionByZeroInL2NormWithSqrtAndWithAdd) { function = std::make_shared(NodeVector{divide}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/dropout_with_random_uniform_replacer_test.cpp b/src/common/transformations/tests/common_optimizations/dropout_with_random_uniform_replacer_test.cpp index 7c1afccb34d..88a38930727 100644 --- a/src/common/transformations/tests/common_optimizations/dropout_with_random_uniform_replacer_test.cpp +++ b/src/common/transformations/tests/common_optimizations/dropout_with_random_uniform_replacer_test.cpp @@ -33,7 +33,7 @@ TEST_F(TransformationTestsF, DropoutWithRandomUniformReplacerCase1) { function = std::make_shared(ngraph::NodeVector{floor}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -66,7 +66,7 @@ TEST_F(TransformationTestsF, DropoutWithRandomUniformReplacerCase2) { function = std::make_shared(ngraph::NodeVector{floor}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -100,7 +100,7 @@ TEST_F(TransformationTestsF, DropoutWithRandomUniformReplacerWithConvert) { function = std::make_shared(ngraph::NodeVector{floor}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -134,7 +134,7 @@ TEST_F(TransformationTestsF, DropoutWithRandomUniformReplacerAddConstNegative) { function = std::make_shared(ngraph::NodeVector{floor}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -172,7 +172,7 @@ TEST_F(TransformationTestsF, DropoutWithRandomUniformReplacerNonFloatRUNegative) function = std::make_shared(ngraph::NodeVector{floor}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -210,7 +210,7 @@ TEST_F(TransformationTestsF, DropoutWithRandomUniformReplacerInvalidMinNegative) function = std::make_shared(ngraph::NodeVector{floor}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -248,7 +248,7 @@ TEST_F(TransformationTestsF, DropoutWithRandomUniformReplacerInvalidMaxNegative) function = std::make_shared(ngraph::NodeVector{floor}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -286,7 +286,7 @@ TEST_F(TransformationTestsF, DropoutWithRandomUniformReplacerInvalidAddConstRank function = std::make_shared(ngraph::NodeVector{floor}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/eliminate_split_test.cpp b/src/common/transformations/tests/common_optimizations/eliminate_split_test.cpp index a8fd8308aa7..82c0a2105a6 100644 --- a/src/common/transformations/tests/common_optimizations/eliminate_split_test.cpp +++ b/src/common/transformations/tests/common_optimizations/eliminate_split_test.cpp @@ -23,7 +23,7 @@ TEST_F(TransformationTestsF, EliminateSplit) { auto res = std::make_shared(split); function = std::make_shared(ngraph::NodeVector{res}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, ngraph::PartialShape::dynamic()); @@ -47,7 +47,7 @@ TEST_F(TransformationTestsF, EliminateSplitNegative) { function = std::make_shared(ngraph::NodeVector{res1, res2, res3}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -68,7 +68,7 @@ TEST_F(TransformationTestsF, EliminateSequenceOfSplits) { function = std::make_shared(ngraph::NodeVector{res1, res2, res3}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/eliminate_unsqueeze_gather.cpp b/src/common/transformations/tests/common_optimizations/eliminate_unsqueeze_gather.cpp index 7b6b679ef0b..4d949e067bc 100644 --- a/src/common/transformations/tests/common_optimizations/eliminate_unsqueeze_gather.cpp +++ b/src/common/transformations/tests/common_optimizations/eliminate_unsqueeze_gather.cpp @@ -45,7 +45,7 @@ protected: "Actual"); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(function); return function; diff --git a/src/common/transformations/tests/common_optimizations/fold_subgraph_empty_inputs_test.cpp b/src/common/transformations/tests/common_optimizations/fold_subgraph_empty_inputs_test.cpp index f34c3543f69..43ed70c4673 100644 --- a/src/common/transformations/tests/common_optimizations/fold_subgraph_empty_inputs_test.cpp +++ b/src/common/transformations/tests/common_optimizations/fold_subgraph_empty_inputs_test.cpp @@ -39,7 +39,7 @@ TEST_F(TransformationTestsF, FoldLoopEmptyInputs) { auto loop_res = std::make_shared(loop->get_iter_value(abs)); function = std::make_shared(OutputVector{loop_res}, ParameterVector{a}); - manager.register_pass(); + manager.register_pass(); } { auto body = std::make_shared(OutputVector{condition, abs}, ParameterVector{ai}); @@ -83,7 +83,7 @@ TEST_F(TransformationTestsF, FoldLoopManyEmptyInputs) { auto loop_res = std::make_shared(loop->get_iter_value(concat)); function = std::make_shared(OutputVector{loop_res}, ParameterVector{a, b, c}); - manager.register_pass(); + manager.register_pass(); } { auto body = std::make_shared(OutputVector{condition, concat}, ParameterVector{ai, bi, ci}); @@ -119,7 +119,7 @@ TEST_F(TransformationTestsF, FoldLoopEmptyMergedInputs) { auto loop_res = std::make_shared(loop->get_iter_value(concat)); function = std::make_shared(OutputVector{loop_res}, ParameterVector{x_init}); - manager.register_pass(); + manager.register_pass(); } { auto body = std::make_shared(OutputVector{condition, concat}, ParameterVector{xi}); @@ -152,7 +152,7 @@ TEST_F(TransformationTestsF, FoldLoopSkipEmptyConstants) { auto loop_res = std::make_shared(loop->get_iter_value(abs)); function = std::make_shared(OutputVector{loop_res}, ParameterVector{}); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, FoldLoopSkipDynamicInputs) { @@ -175,7 +175,7 @@ TEST_F(TransformationTestsF, FoldLoopSkipDynamicInputs) { auto loop_res = std::make_shared(loop->get_iter_value(abs)); function = std::make_shared(OutputVector{loop_res}, ParameterVector{a}); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, FoldLoopSkipNonEmptyInputs) { @@ -198,7 +198,7 @@ TEST_F(TransformationTestsF, FoldLoopSkipNonEmptyInputs) { auto loop_res = std::make_shared(loop->get_iter_value(abs)); function = std::make_shared(OutputVector{loop_res}, ParameterVector{a}); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, FoldIfManyEmptyInputs) { @@ -229,7 +229,7 @@ TEST_F(TransformationTestsF, FoldIfManyEmptyInputs) { auto res = if_op->set_output(then_op_res, else_op_res); function = std::make_shared(OutputVector{res}, ParameterVector{X, Z}); - manager.register_pass(); + manager.register_pass(); } { auto then_body = std::make_shared(OutputVector{then_op_res}, ParameterVector{Zt}); diff --git a/src/common/transformations/tests/common_optimizations/fq_mul_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/fq_mul_fusion_test.cpp index 47ea0e97322..a23ecbb3ad9 100644 --- a/src/common/transformations/tests/common_optimizations/fq_mul_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/fq_mul_fusion_test.cpp @@ -76,8 +76,8 @@ TEST_P(FQMulFusion, ExpectFusion) { auto unh = std::make_shared(); ngraph::pass::Manager manager; manager.register_pass(unh); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass(unh); manager.run_passes(m_function); @@ -221,8 +221,8 @@ TEST(FQMulFusion_NonConstInputs, AllInputsNonConst) { ngraph::ParameterVector{data, in_low, in_high, out_low, out_high}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); ASSERT_NO_THROW(check_rt_info(function)); @@ -259,8 +259,8 @@ TEST(FQMulFusion_NonConstInputs, FQ_out_high_const) { ngraph::ParameterVector{data, in_low, in_high, out_low}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); ASSERT_NO_THROW(check_rt_info(function)); @@ -296,8 +296,8 @@ TEST(FQMulFusion_FQ_Mul_inputs, FQ_out_to_mul_input_2) { std::make_shared(ngraph::OutputVector{expected_fq}, ngraph::ParameterVector{}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); ASSERT_NO_THROW(check_rt_info(function)); @@ -333,8 +333,8 @@ TEST(FQMulFusion_FQ_Mul_inputs, FQ_out_to_mul_input_2_param) { std::make_shared(ngraph::OutputVector{expected_fq}, ngraph::ParameterVector{out_high}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); ASSERT_NO_THROW(check_rt_info(function)); @@ -360,8 +360,8 @@ TEST(TransformationTests, FakeQuantizeMultiplyFusionNegative) { auto function = std::make_shared(ngraph::OutputVector{mul}, ngraph::ParameterVector{out_high}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); ASSERT_NO_THROW(check_rt_info(function)); @@ -398,8 +398,8 @@ TEST(TransformationTests, FakeQuantizeMultiplyFusionMulConstWithEqualValues) { ngraph::ParameterVector{data, in_low, in_high}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); ASSERT_NO_THROW(check_rt_info(function)); diff --git a/src/common/transformations/tests/common_optimizations/fq_reshape_fusion.cpp b/src/common/transformations/tests/common_optimizations/fq_reshape_fusion.cpp index d2fec6ded21..a69f608341b 100644 --- a/src/common/transformations/tests/common_optimizations/fq_reshape_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/fq_reshape_fusion.cpp @@ -126,8 +126,8 @@ TEST_P(nGraphFQReshapeFusionTests, ReshapeMatMul) { auto unh = std::make_shared(); ngraph::pass::Manager manager; manager.register_pass(unh); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass(unh); manager.run_passes(f); @@ -220,6 +220,6 @@ TEST_F(TransformationTestsF, FQReshapeGroupConvolution) { function = get_function(params); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } diff --git a/src/common/transformations/tests/common_optimizations/fused_names_cleanup.cpp b/src/common/transformations/tests/common_optimizations/fused_names_cleanup.cpp index 1f41ea27518..bd764b309fb 100644 --- a/src/common/transformations/tests/common_optimizations/fused_names_cleanup.cpp +++ b/src/common/transformations/tests/common_optimizations/fused_names_cleanup.cpp @@ -30,8 +30,8 @@ TEST(TransformationTests, FusedNamesCleanup) { function = std::make_shared(NodeVector{add2}, ParameterVector{data}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); ASSERT_NO_THROW(check_rt_info(function)); diff --git a/src/common/transformations/tests/common_optimizations/gelu_fusion.cpp b/src/common/transformations/tests/common_optimizations/gelu_fusion.cpp index c9be7bff104..33fdd06b0e3 100644 --- a/src/common/transformations/tests/common_optimizations/gelu_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/gelu_fusion.cpp @@ -40,7 +40,7 @@ TEST_F(TransformationTestsF, GeluFusionPatternOne) { function = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -66,7 +66,7 @@ TEST_F(TransformationTestsF, GeluFusionPatternTwo) { function = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -92,7 +92,7 @@ TEST_F(TransformationTestsF, GeluFusionPatternThree) { function = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -145,7 +145,7 @@ TEST_F(TransformationTestsF, GeluFusionPatternIncorrectDivConstValue) { function = std::make_shared(NodeVector{mul}, ParameterVector{data}); function_ref = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } } @@ -166,7 +166,7 @@ TEST_F(TransformationTestsF, GeluFusionPatternTooShortDivConstValue) { function = std::make_shared(NodeVector{mul}, ParameterVector{data}); function_ref = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } } @@ -195,7 +195,7 @@ TEST_F(TransformationTestsF, GeluFusionTanhWithTanh_equal_const_values) { auto mul_3 = std::make_shared(input, mul_2); function = std::make_shared(NodeVector{mul_3}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -230,7 +230,7 @@ TEST_F(TransformationTestsF, GeluFusionTanhWithTanh_params_no_conversion) { function = std::make_shared( NodeVector{mul_3}, ParameterVector{input, pow_param, mul_0_param, mul_1_param, add_1_param, mul_2_param}); - manager.register_pass(); + manager.register_pass(); } } @@ -260,7 +260,7 @@ TEST_F(TransformationTestsF, GeluFusionTanhWithTanh_epsilon_pow_value) { auto mul_3 = std::make_shared(input, mul_2); function = std::make_shared(NodeVector{mul_3}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -295,7 +295,7 @@ TEST_F(TransformationTestsF, GeluFusionTanhWithTanh_wrong_pow_value) { auto mul_3 = std::make_shared(input, mul_2); function = std::make_shared(NodeVector{mul_3}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -324,7 +324,7 @@ TEST_F(TransformationTestsF, GeluFusionTanhWithTanh_epsilon_mul_0_value) { auto mul_3 = std::make_shared(input, mul_2); function = std::make_shared(NodeVector{mul_3}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -359,7 +359,7 @@ TEST_F(TransformationTestsF, GeluFusionTanhWithTanh_wrong_mul_0_value) { auto mul_3 = std::make_shared(input, mul_2); function = std::make_shared(NodeVector{mul_3}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -387,7 +387,7 @@ TEST_F(TransformationTestsF, GeluFusionTanhWithTanh_epsilon_mul_1_value) { auto mul_3 = std::make_shared(input, mul_2); function = std::make_shared(NodeVector{mul_3}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -422,7 +422,7 @@ TEST_F(TransformationTestsF, GeluFusionTanhWithTanh_wrong_mul_1_value) { auto mul_3 = std::make_shared(input, mul_2); function = std::make_shared(NodeVector{mul_3}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -452,7 +452,7 @@ TEST_F(TransformationTestsF, GeluFusionTanhWithTanh_epsilon_add_1_value) { auto mul_3 = std::make_shared(input, mul_2); function = std::make_shared(NodeVector{mul_3}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -487,7 +487,7 @@ TEST_F(TransformationTestsF, GeluFusionTanhWithTanh_wrong_add_1_value) { auto mul_3 = std::make_shared(input, mul_2); function = std::make_shared(NodeVector{mul_3}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -517,7 +517,7 @@ TEST_F(TransformationTestsF, GeluFusionTanhWithTanh_epsilon_mul_2_value) { auto mul_3 = std::make_shared(input, mul_2); function = std::make_shared(NodeVector{mul_3}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -552,6 +552,6 @@ TEST_F(TransformationTestsF, GeluFusionTanhWithTanh_wrong_mul_2_value) { auto mul_3 = std::make_shared(input, mul_2); function = std::make_shared(NodeVector{mul_3}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/common_optimizations/gru_cell_fusion.cpp b/src/common/transformations/tests/common_optimizations/gru_cell_fusion.cpp index 2a557e2a4db..bca45d7a47f 100644 --- a/src/common/transformations/tests/common_optimizations/gru_cell_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/gru_cell_fusion.cpp @@ -160,7 +160,7 @@ TEST_P(GRUFusionTest, GRUCellPattern) { p.use_bias_add_1, p.use_bias_add_2, false); - manager.register_pass(); + manager.register_pass(); } { @@ -192,7 +192,7 @@ TEST_P(GRUFusionTestDyn, GRUCellPatternDynamicShapes) { false, false, true); - manager.register_pass(); // the transformation won't be applied + manager.register_pass(); // the transformation won't be applied } } diff --git a/src/common/transformations/tests/common_optimizations/hsigmoid_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/hsigmoid_fusion_test.cpp index f1a4ca9571b..e0121771650 100644 --- a/src/common/transformations/tests/common_optimizations/hsigmoid_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/hsigmoid_fusion_test.cpp @@ -31,7 +31,7 @@ TEST_F(TransformationTestsF, HSigmoidFusionWithReluDivF16) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -56,7 +56,7 @@ TEST_F(TransformationTestsF, HSigmoidFusionWithReluDivF32) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -81,7 +81,7 @@ TEST_F(TransformationTestsF, HSigmoidFusionWithReluMul) { function = std::make_shared(ngraph::NodeVector{mul_second}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -108,7 +108,7 @@ TEST_F(TransformationTestsF, HSigmoidFusionWithoutRelu) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -132,7 +132,7 @@ TEST_F(TransformationTestsF, HSigmoidFusionWithClampMul) { function = std::make_shared(ngraph::NodeVector{mul_first}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -156,7 +156,7 @@ TEST_F(TransformationTestsF, HSigmoidFusionWithClampDiv) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -182,7 +182,7 @@ TEST_F(TransformationTestsF, HSigmoidFusionWithReluMulWrongConstValue) { function = std::make_shared(ngraph::NodeVector{mul_second}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -214,7 +214,7 @@ TEST_F(TransformationTestsF, HSigmoidFusionWithReluDivWrongConstValue) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -246,7 +246,7 @@ TEST_F(TransformationTestsF, HSigmoidFusionWithoutReluWrongConstValue) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -277,7 +277,7 @@ TEST_F(TransformationTestsF, HSigmoidFusionWithClampWrongConstValue) { function = std::make_shared(ngraph::NodeVector{mul_first}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/hswish_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/hswish_fusion_test.cpp index fb1661eaea0..f92d78e0e24 100644 --- a/src/common/transformations/tests/common_optimizations/hswish_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/hswish_fusion_test.cpp @@ -34,7 +34,7 @@ TEST_F(TransformationTestsF, HSwishFusionWithReluDivF16) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -60,7 +60,7 @@ TEST_F(TransformationTestsF, HSwishFusionWithReluDivF32) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -86,7 +86,7 @@ TEST_F(TransformationTestsF, HSwishFusionWithReluMul) { function = std::make_shared(ngraph::NodeVector{mul_second}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -115,8 +115,8 @@ TEST_F(TransformationTestsF, HSwishFusionWithoutRelu) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); auto gr = manager.register_pass(); - gr->add_matcher(); - gr->add_matcher(); + gr->add_matcher(); + gr->add_matcher(); } { @@ -142,8 +142,8 @@ TEST_F(TransformationTestsF, HSwishFusionWithClampMul) { function = std::make_shared(ngraph::NodeVector{mul_second}, ngraph::ParameterVector{input}); auto gr = manager.register_pass(); - gr->add_matcher(); - gr->add_matcher(); + gr->add_matcher(); + gr->add_matcher(); } { @@ -169,8 +169,8 @@ TEST_F(TransformationTestsF, HSwishFusionWithClampDiv) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); auto gr = manager.register_pass(); - gr->add_matcher(); - gr->add_matcher(); + gr->add_matcher(); + gr->add_matcher(); } { @@ -197,7 +197,7 @@ TEST_F(TransformationTestsF, HSwishFusionWithReluMulWrongConstValue) { function = std::make_shared(ngraph::NodeVector{mul_second}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -231,7 +231,7 @@ TEST_F(TransformationTestsF, HSwishFusionWithReluDivWrongConstValue) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -266,8 +266,8 @@ TEST_F(TransformationTestsF, HSwishFusionWithoutReluWrongConstValue) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); auto gr = manager.register_pass(); - gr->add_matcher(); - gr->add_matcher(); + gr->add_matcher(); + gr->add_matcher(); } { @@ -301,8 +301,8 @@ TEST_F(TransformationTestsF, HSwishFusionWithClampWrongConstValue) { function = std::make_shared(ngraph::NodeVector{mul_second}, ngraph::ParameterVector{input}); auto gr = manager.register_pass(); - gr->add_matcher(); - gr->add_matcher(); + gr->add_matcher(); + gr->add_matcher(); } { @@ -329,7 +329,7 @@ TEST_F(TransformationTestsF, HSwishFusionWithHSigmoidMul) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -353,7 +353,7 @@ TEST_F(TransformationTestsF, HSwishFusionWithClamp) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); auto gr = manager.register_pass(); - gr->add_matcher(); + gr->add_matcher(); } { @@ -379,7 +379,7 @@ TEST_F(TransformationTestsF, HSwishFusionWithClampWithWrongConstant) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); auto gr = manager.register_pass(); - gr->add_matcher(); + gr->add_matcher(); } { diff --git a/src/common/transformations/tests/common_optimizations/interpolate_sequence_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/interpolate_sequence_fusion_test.cpp index 37952e1904e..9343798b618 100644 --- a/src/common/transformations/tests/common_optimizations/interpolate_sequence_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/interpolate_sequence_fusion_test.cpp @@ -88,7 +88,7 @@ TEST_F(TransformationTestsF, InterpolateSequenceFusion4D1) { function = std::make_shared(ngraph::NodeVector{snd_interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -205,7 +205,7 @@ TEST_F(TransformationTestsF, InterpolateSequenceFusion4D2) { function = std::make_shared(ngraph::NodeVector{third_interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -315,7 +315,7 @@ TEST_F(TransformationTestsF, InterpolateSequenceFusion4D3) { function = std::make_shared(ngraph::NodeVector{snd_interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -424,7 +424,7 @@ TEST_F(TransformationTestsF, InterpolateSequenceFusion5D1) { function = std::make_shared(ngraph::NodeVector{third_interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -542,7 +542,7 @@ TEST_F(TransformationTestsF, InterpolateSequenceFusion5D2) { function = std::make_shared(ngraph::NodeVector{third_interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); diff --git a/src/common/transformations/tests/common_optimizations/leaky_relu_fusion.cpp b/src/common/transformations/tests/common_optimizations/leaky_relu_fusion.cpp index ac41bd9d7b7..13cb0d5d84c 100644 --- a/src/common/transformations/tests/common_optimizations/leaky_relu_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/leaky_relu_fusion.cpp @@ -28,7 +28,7 @@ TEST_F(TransformationTestsF, LeakyReluFusionConstant) { auto max = std::make_shared(data, multiply); function = std::make_shared(NodeVector{max}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -47,7 +47,7 @@ TEST_F(TransformationTestsF, LeakyReluFusionScalar) { auto max = std::make_shared(data, multiply); function = std::make_shared(NodeVector{max}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -66,7 +66,7 @@ TEST_F(TransformationTestsF, LeakyReluFusionParameter) { auto max = std::make_shared(data, multiply); function = std::make_shared(NodeVector{max}, ParameterVector{data, alpha}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/lin_op_sequence_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/lin_op_sequence_fusion_test.cpp index 4c0f6cac8b6..b11fe4bc845 100644 --- a/src/common/transformations/tests/common_optimizations/lin_op_sequence_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/lin_op_sequence_fusion_test.cpp @@ -38,7 +38,7 @@ TEST_F(TransformationTestsF, MulAddMulAddFusion) { auto add2 = std::make_shared(mul2, add2_const); function = std::make_shared(ngraph::NodeVector{add2}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -65,7 +65,7 @@ TEST_F(TransformationTestsF, MulMulMulFusion) { auto mul3 = std::make_shared(mul2, mul3_const); function = std::make_shared(ngraph::NodeVector{mul2}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -90,7 +90,7 @@ TEST_F(TransformationTestsF, AddAddAddFusion) { auto add3 = std::make_shared(add2, add3_const); function = std::make_shared(ngraph::NodeVector{add3}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -117,7 +117,7 @@ TEST_F(TransformationTestsF, MulAddAddMulFusion) { auto mul2 = std::make_shared(add2, mul2_const); function = std::make_shared(ngraph::NodeVector{mul2}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/low_latency_test.cpp b/src/common/transformations/tests/common_optimizations/low_latency_test.cpp index 67b35697776..dd0d4b8fdd1 100644 --- a/src/common/transformations/tests/common_optimizations/low_latency_test.cpp +++ b/src/common/transformations/tests/common_optimizations/low_latency_test.cpp @@ -72,11 +72,11 @@ TEST(TransformationTests, LowLatencyLSTM) { ngraph::ParameterVector{X, H_init, C_init}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_START manager.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_END - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); } { @@ -159,11 +159,11 @@ TEST(TransformationTests, LowLatencyGRU) { f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_START manager.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_END - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -241,11 +241,11 @@ TEST(TransformationTests, LowLatencyRNN) { f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_START manager.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_END - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -337,11 +337,11 @@ TEST(TransformationTests, LowLatencyLSTMReshape) { f->validate_nodes_and_infer_types(); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_START manager.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_END - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); } { @@ -438,11 +438,11 @@ TEST(TransformationTests, LowLatencyLSTM_Loop) { ngraph::ParameterVector{X, H_init, C_init}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_START manager.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_END - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); } { diff --git a/src/common/transformations/tests/common_optimizations/low_latency_v2_test.cpp b/src/common/transformations/tests/common_optimizations/low_latency_v2_test.cpp index 7cde06baefe..3faf75eed0c 100644 --- a/src/common/transformations/tests/common_optimizations/low_latency_v2_test.cpp +++ b/src/common/transformations/tests/common_optimizations/low_latency_v2_test.cpp @@ -97,8 +97,8 @@ TEST(TransformationTests, LowLatency2_LSTM) { f = std::make_shared(NodeVector{res_ti_1, res_ti_2}, ParameterVector{X, H_init, C_init}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -183,8 +183,8 @@ TEST(TransformationTests, LowLatency2_GRU) { f = std::make_shared(NodeVector{res_ti_1}, ParameterVector{X, Y}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); @@ -264,8 +264,8 @@ TEST(TransformationTests, LowLatency2_RNN) { f = std::make_shared(NodeVector{res_ti_1}, ParameterVector{X, Y}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); @@ -342,8 +342,8 @@ TEST(TransformationTests, LowLatency2_LSTMReshape) { f->validate_nodes_and_infer_types(); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -427,8 +427,8 @@ TEST(TransformationTests, LowLatency2_LSTM_Loop) { f = std::make_shared(NodeVector{res_ti_1, res_ti_2}, ParameterVector{X, H_init, C_init}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -506,8 +506,8 @@ TEST(TransformationTests, LowLatency2_LSTM_several_iterations) { f = std::make_shared(NodeVector{res_ti_1, res_ti_2}, ParameterVector{X, H, C}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -621,8 +621,8 @@ TEST(TransformationTests, LowLatency2_LSTM_Loop_Reshape) { f->validate_nodes_and_infer_types(); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -702,8 +702,8 @@ TEST(TransformationTests, LowLatency2_LSTM_Loop_several_iterations) { f = std::make_shared(NodeVector{res_ti_1, res_ti_2}, ParameterVector{X, H_init, C_init}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(true); + manager.register_pass(); + manager.register_pass(true); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -821,20 +821,20 @@ TEST(TransformationTests, LowLatencyLSTM_LLTv1_LLTv2) { auto f_2 = ngraph::clone_function(*f); pass::Manager manager_2; - manager_2.register_pass(); + manager_2.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_START manager_2.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_END EXPECT_NO_THROW(manager_2.run_passes(f_2)); pass::Manager manager; - manager.register_pass(); + manager.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_START manager.register_pass(); NGRAPH_SUPPRESS_DEPRECATED_END // LLT v2 doesn't insert Assign/ReadValue ops, they are already inserted // but unrolls TI/Loop - manager.register_pass(); + manager.register_pass(); EXPECT_NO_THROW(manager.run_passes(f)); } diff --git a/src/common/transformations/tests/common_optimizations/matmul_const_transposes_extraction.cpp b/src/common/transformations/tests/common_optimizations/matmul_const_transposes_extraction.cpp index d261d09c66c..a343186c777 100644 --- a/src/common/transformations/tests/common_optimizations/matmul_const_transposes_extraction.cpp +++ b/src/common/transformations/tests/common_optimizations/matmul_const_transposes_extraction.cpp @@ -20,7 +20,7 @@ TEST_F(TransformationTestsF, MatMulConstTransposesExtractionConstantWeights) { auto matmul = std::make_shared(data, weights, true); function = std::make_shared(matmul, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -43,7 +43,7 @@ TEST_F(TransformationTestsF, MatMulConstTransposesExtractionFQOnWeights) { auto matmul = std::make_shared(data, fq); function = std::make_shared(matmul, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -66,7 +66,7 @@ TEST_F(TransformationTestsF, NegativeMatMulConstTransposesExtractionInvalidRank) auto weights = opset8::Constant::create(element::f32, Shape{3}, {1, 2, 3}); auto matmul = std::make_shared(data, weights, true); function = std::make_shared(matmul, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES); } @@ -75,7 +75,7 @@ TEST_F(TransformationTestsF, NegativeMatMulConstTransposesExtractionTransposeBSe auto weights = opset8::Constant::create(element::f32, Shape{1, 2, 3}, {1, 2, 3, 4, 5, 6}); auto matmul = std::make_shared(data, weights, true, true); function = std::make_shared(matmul, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES); } @@ -84,6 +84,6 @@ TEST_F(TransformationTestsF, NegativeMatMulConstTransposesExtractionNonUnitDims) auto weights = opset8::Constant::create(element::f32, Shape{2, 3, 2}, {1, 2, 3, 4, 5, 6, 2, 3, 4, 5, 6, 7}); auto matmul = std::make_shared(data, weights, true); function = std::make_shared(matmul, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES); } diff --git a/src/common/transformations/tests/common_optimizations/matmul_multiply_fusion.cpp b/src/common/transformations/tests/common_optimizations/matmul_multiply_fusion.cpp index eccd3af4c15..e97664ab79c 100644 --- a/src/common/transformations/tests/common_optimizations/matmul_multiply_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/matmul_multiply_fusion.cpp @@ -22,7 +22,7 @@ TEST_F(TransformationTestsF, MatMulMultiplyFusionConstantWeightsScalarConstant) auto mul = std::make_shared(matmul, mul_const); function = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -43,7 +43,7 @@ TEST_F(TransformationTestsF, MatMulMultiplyFusionConstantWeightsNonScalarConstan auto mul = std::make_shared(matmul, mul_const); function = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -64,7 +64,7 @@ TEST_F(TransformationTestsF, MatMulMultiplyFusionConstantTransposedWeightsNonSca auto mul = std::make_shared(matmul, mul_const); function = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -85,7 +85,7 @@ TEST_F(TransformationTestsF, MatMulMultiplyFusionNonConstantTransposedWeightsNon auto mul = std::make_shared(matmul, mul_const); function = std::make_shared(NodeVector{mul}, ParameterVector{data, weights}); - manager.register_pass(); + manager.register_pass(); } { @@ -121,7 +121,7 @@ TEST_P(MatMulMultiplyFusionDynamicShapes, FusionTest) { auto mul = std::make_shared(matmul, mul_const); function = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } if (can_fuse) { diff --git a/src/common/transformations/tests/common_optimizations/mish_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/mish_fusion_test.cpp index aa17cc376a5..fcbd5bcbf7a 100644 --- a/src/common/transformations/tests/common_optimizations/mish_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/mish_fusion_test.cpp @@ -32,7 +32,7 @@ TEST_F(TransformationTestsF, MishFusing) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input0}); - manager.register_pass(); + manager.register_pass(); } { @@ -52,7 +52,7 @@ TEST_F(TransformationTestsF, MishWithSoftPlusFusing) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input0}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/mul_fake_quantize_fusion.cpp b/src/common/transformations/tests/common_optimizations/mul_fake_quantize_fusion.cpp index 79414b57df9..55c5e98e44a 100644 --- a/src/common/transformations/tests/common_optimizations/mul_fake_quantize_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/mul_fake_quantize_fusion.cpp @@ -32,7 +32,7 @@ TEST_F(TransformationTestsF, MulFakeQuantizeFusionPositiveConstant) { auto output_high = opset5::Constant::create(element::f32, Shape{1}, {10}); auto fq = std::make_shared(mul, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -57,7 +57,7 @@ TEST_F(TransformationTestsF, MulFakeQuantizeFusionConstantOnFirstInput) { auto output_high = opset5::Constant::create(element::f32, Shape{1}, {10}); auto fq = std::make_shared(mul, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -82,7 +82,7 @@ TEST_F(TransformationTestsF, MulFakeQuantizeFusionReshape) { auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(mul, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -107,7 +107,7 @@ TEST_F(TransformationTestsF, MulFakeQuantizeFusionConstantNonScalarWithEqualValu auto output_high = opset5::Constant::create(element::f32, Shape{1}, {10}); auto fq = std::make_shared(mul, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -132,7 +132,7 @@ TEST_F(TransformationTestsF, MulFakeQuantizeFusionWithPerChannelConstant) { auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(mul, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -156,7 +156,7 @@ TEST_F(TransformationTestsF, NegativeMulFakeQuantizeFusionNotAConstant) { auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(mul, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data, mul_2nd_input}); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, NegativeMulFakeQuantizeFusionLowPrecision) { @@ -171,7 +171,7 @@ TEST_F(TransformationTestsF, NegativeMulFakeQuantizeFusionLowPrecision) { auto fq = std::make_shared(mul, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); function_ref = clone_function(*function); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, NegativeMulFakeQuantizeFusionConstantAllNegative) { @@ -186,7 +186,7 @@ TEST_F(TransformationTestsF, NegativeMulFakeQuantizeFusionConstantAllNegative) { auto fq = std::make_shared(mul, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); function_ref = clone_function(*function); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, NegativeMulFakeQuantizeFusionConstantSomeNegative) { @@ -201,7 +201,7 @@ TEST_F(TransformationTestsF, NegativeMulFakeQuantizeFusionConstantSomeNegative) auto fq = std::make_shared(mul, input_low, input_high, output_low, output_high, 20); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); function_ref = clone_function(*function); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, NegativeMulFakeQuantizeFusionWithNonPerChannelConstant) { @@ -215,7 +215,7 @@ TEST_F(TransformationTestsF, NegativeMulFakeQuantizeFusionWithNonPerChannelConst auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(mul, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, MulFakeQuantizeFusionWithBroadcastingConstant) { @@ -228,5 +228,5 @@ TEST_F(TransformationTestsF, MulFakeQuantizeFusionWithBroadcastingConstant) { auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(mul, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } diff --git a/src/common/transformations/tests/common_optimizations/mvn_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/mvn_fusion_test.cpp index e933404742b..269209ec6e7 100644 --- a/src/common/transformations/tests/common_optimizations/mvn_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/mvn_fusion_test.cpp @@ -40,7 +40,7 @@ TEST_F(TransformationTestsF, MVNFusionTestOutside) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -73,7 +73,7 @@ TEST_F(TransformationTestsF, MVNFusionTestReuseSub) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -107,7 +107,7 @@ TEST_F(TransformationTestsF, MVNFusionTestWithConvert) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -139,7 +139,7 @@ TEST_F(TransformationTestsF, MVNFusionTestSqrt) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -170,7 +170,7 @@ TEST_F(TransformationTestsF, MVNFusionTestAltDiv) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -206,7 +206,7 @@ TEST_F(TransformationTestsF, MVNFusionTestInsideSqrt) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -238,7 +238,7 @@ TEST_F(TransformationTestsF, MVNFusionTestReuseSubInsideSqrt) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -271,7 +271,7 @@ TEST_F(TransformationTestsF, MVNFusionTestWithConvertInsideSqrt) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -302,7 +302,7 @@ TEST_F(TransformationTestsF, MVNFusionTestSqrtInsideSqrt) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -332,7 +332,7 @@ TEST_F(TransformationTestsF, MVNFusionTestAltDivInsideSqrt) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -366,7 +366,7 @@ TEST_F(TransformationTestsF, MVNFusionTestWithParametersInside) { function = std::make_shared(ngraph::NodeVector{add}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/nearest_neighbor_upsampling_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/nearest_neighbor_upsampling_fusion_test.cpp index a95551cb775..407f7d401a6 100644 --- a/src/common/transformations/tests/common_optimizations/nearest_neighbor_upsampling_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/nearest_neighbor_upsampling_fusion_test.cpp @@ -75,7 +75,7 @@ TEST_F(TransformationTestsF, NearestNeighborUpsamplingFusionSpatial2D1) { auto reshape_2 = std::make_shared(mul, concat_2, true); function = std::make_shared(ngraph::NodeVector{reshape_2}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; @@ -159,7 +159,7 @@ TEST_F(TransformationTestsF, NearestNeighborUpsamplingFusionSpatial3D1) { auto reshape_2 = std::make_shared(mul, concat_2, true); function = std::make_shared(ngraph::NodeVector{reshape_2}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; diff --git a/src/common/transformations/tests/common_optimizations/ngraph_fq_transpose_test.cpp b/src/common/transformations/tests/common_optimizations/ngraph_fq_transpose_test.cpp index 29f8092d4b2..2e66744a9df 100644 --- a/src/common/transformations/tests/common_optimizations/ngraph_fq_transpose_test.cpp +++ b/src/common/transformations/tests/common_optimizations/ngraph_fq_transpose_test.cpp @@ -37,7 +37,7 @@ TEST_F(TransformationTestsF, FQTransposeTest1) { function = std::make_shared(ngraph::NodeVector{transpose}, ngraph::ParameterVector{}); - manager.register_pass(); + manager.register_pass(); manager.register_pass([](std::shared_ptr f) { check_rt_info(f); }); @@ -74,8 +74,8 @@ TEST_F(TransformationTestsF, FQTransposeNegativeCase) { }; function = create_graph(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass([](std::shared_ptr f) { check_rt_info(f); }); diff --git a/src/common/transformations/tests/common_optimizations/nop_elimination.cpp b/src/common/transformations/tests/common_optimizations/nop_elimination.cpp index 1a72c0910f0..90108411d87 100644 --- a/src/common/transformations/tests/common_optimizations/nop_elimination.cpp +++ b/src/common/transformations/tests/common_optimizations/nop_elimination.cpp @@ -38,7 +38,7 @@ TEST(nop_elimination, eliminate_convert) { } pass::Manager pass_manager; - pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(f); ASSERT_EQ(count_ops_of_type(f), 0); @@ -57,8 +57,8 @@ TEST(nop_elimination, convert_type_agnostic) { } pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(f); ASSERT_EQ(count_ops_of_type(f), 0); @@ -74,14 +74,14 @@ TEST(nop_elimination, eliminate_broadcast) { } pass::Manager pass_manager; - pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(f); ASSERT_EQ(count_ops_of_type(f), 0); } TEST(nop_elimination, pass_property) { - auto pass = std::make_shared(); + auto pass = std::make_shared(); ASSERT_FALSE(pass->get_property(pass::PassProperty::CHANGE_DYNAMIC_STATE)); } @@ -102,7 +102,7 @@ TEST(nop_elimination, reshape_elimination_v1) { auto nopass_func_zero = generate_func(true); pass::Manager pass_manager; - pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(func); pass_manager.run_passes(func_zero); ASSERT_TRUE(count_ops_of_type(nopass_func) == 2); @@ -133,8 +133,8 @@ TEST(nop_elimination, squeeze_reshape_elimination_check_info) { } pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(f); bool movement_are_missing = true; @@ -168,8 +168,8 @@ TEST(nop_elimination, squeeze_unsqueeze_elimination) { } pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(f); bool movement_are_missing = true; @@ -188,7 +188,7 @@ TEST(nop_elimination, reshape_elimination_v1_dynamic) { auto abs = std::make_shared(reshape_v1); auto f = std::make_shared(NodeVector{abs}, ParameterVector{arg, pattern}); pass::Manager pass_manager; - pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(f); ASSERT_TRUE(count_ops_of_type(f) == 1); } @@ -213,8 +213,8 @@ TEST(nop_elimination, reshape_elimination_v1_check_consumer_count) { } pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(f); ASSERT_TRUE(count_ops_of_type(f) == 2); @@ -226,8 +226,8 @@ TEST(nop_elimination, concat_elimination_single_node) { auto f = make_shared(make_shared(NodeVector{A}, a), ParameterVector{A}); pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(f); ASSERT_EQ(count_ops_of_type(f), 1); @@ -240,8 +240,8 @@ TEST(nop_elimination, concat_elimination_single_input) { auto f = make_shared(make_shared(B), ParameterVector{A}); pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(f); ASSERT_EQ(count_ops_of_type(f), 0); @@ -254,8 +254,8 @@ TEST(nop_elimination, concat_elimination_single_input_dynamic) { auto f = make_shared(make_shared(B), ParameterVector{A}); pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(f); ASSERT_EQ(count_ops_of_type(f), 0); @@ -269,8 +269,8 @@ TEST(nop_elimination, unsqueeze_elimination) { auto f = make_shared(unsqueeze, ParameterVector{A}); pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(f); ASSERT_EQ(count_ops_of_type(f), 1); @@ -340,8 +340,8 @@ TEST(nop_elimination, squeeze_unsqueeze_overlap_elimination) { auto optimized_f = clone_function(*baseline_f); pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(optimized_f); auto ps = baseline_f->get_results()[0]->get_output_partial_shape(0); @@ -532,8 +532,8 @@ TEST(nop_elimination, squeeze_squeeze_overlap_elimination) { auto optimized_f = clone_function(*baseline_f); pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(optimized_f); auto ps = baseline_f->get_results()[0]->get_output_partial_shape(0); auto ps_r = optimized_f->get_results()[0]->get_output_partial_shape(0); @@ -566,8 +566,8 @@ TEST(nop_elimination, unsqueeze_unsqueeze_overlap_elimination) { auto optimized_f = clone_function(*baseline_f); pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(optimized_f); auto ps = baseline_f->get_results()[0]->get_output_partial_shape(0); auto ps_r = optimized_f->get_results()[0]->get_output_partial_shape(0); @@ -597,7 +597,7 @@ TEST(nop_elimination, unsqueeze_squeeze_elimination) { auto baseline_f = generate_func(shape, axes_val); auto optimized_f = generate_func(shape, axes_val); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); @@ -626,7 +626,7 @@ TEST(nop_elimination, reshape_unsqueeze_elimination) { auto baseline_f = make_shared(make_shared(B1), ParameterVector{A}); auto optimized_f = clone_function(*baseline_f); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); @@ -654,7 +654,7 @@ TEST(nop_elimination, reshape_squeeze_elimination) { auto baseline_f = make_shared(make_shared(B1), ParameterVector{A}); auto optimized_f = clone_function(*baseline_f); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); @@ -681,7 +681,7 @@ TEST(nop_elimination, reshape_reshape_elimination) { auto baseline_f = make_shared(make_shared(B1), ParameterVector{A}); auto optimized_f = clone_function(*baseline_f); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 2); @@ -707,7 +707,7 @@ TEST(nop_elimination, squeeze_reshape_elimination) { auto baseline_f = make_shared(make_shared(B1), ParameterVector{A}); auto optimized_f = clone_function(*baseline_f); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); @@ -734,7 +734,7 @@ TEST(nop_elimination, unsqueeze_reshape_elimination) { auto baseline_f = make_shared(make_shared(B1), ParameterVector{A}); auto optimized_f = clone_function(*baseline_f); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); @@ -757,7 +757,7 @@ TEST(nop_elimination, squeeze_unsqueeze_elimination_negative) { auto baseline_f = make_shared(squeeze, ParameterVector{input}); auto optimized_f = clone_function(*baseline_f); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); ASSERT_EQ(count_ops_of_type(optimized_f), 1); @@ -779,7 +779,7 @@ TEST(nop_elimination, topk_convert_elimination) { auto baseline_f = make_shared(make_shared(C), ParameterVector{A}); auto optimized_f = clone_function(*baseline_f); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(optimized_f); ASSERT_EQ(count_ops_of_type(baseline_f), 1); @@ -831,8 +831,8 @@ TEST(nop_elimination, gather_3d_indices_constant_axis_1) { auto optimized_f = clone_function(*baseline_f); pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(optimized_f); auto ps = baseline_f->get_results()[0]->get_output_partial_shape(0); @@ -1017,7 +1017,7 @@ TEST_P(EliminateEltwiseTests, eliminate_eltwise) { auto abs = make_shared(node); function = make_shared(abs, ParameterVector{parameter}); - manager.register_pass(); + manager.register_pass(); if (can_fuse) { auto abs = make_shared(parameter); @@ -1106,7 +1106,7 @@ TEST_F(TransformationTestsF, eliminate_eltwise_dequantization_subgraph) { function_ref = make_shared(mul, ParameterVector{}); } - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES); comparator.enable(FunctionsComparator::CmpValues::ACCURACY); @@ -1192,8 +1192,8 @@ TEST_P(SplitConcatElimination, eliminate_split_concat_subgraph) { auto model = make_shared(ResultVector{res}, ParameterVector{params}); pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(model); // the transformation won't be applied if split_len is not equal to 1 @@ -1242,8 +1242,8 @@ TEST(SplitConcatElimination, split_inputs_not_in_order) { auto model = make_shared(ResultVector{res}, ParameterVector{param}); pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(model); // the transformation shouldn't be applied EXPECT_EQ(count_ops_of_type(model), 1) << "SplitConcatElimination transformation has failed. " @@ -1268,8 +1268,8 @@ TEST(SplitConcatElimination, no_sequence_found) { auto model = make_shared(ResultVector{res}, ParameterVector{param, param_2}); pass::Manager pass_manager; - pass_manager.register_pass(); - pass_manager.register_pass(); + pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.run_passes(model); // the transformation shouldn't be applied EXPECT_EQ(count_ops_of_type(model), 1) << "SplitConcatElimination transformation has failed. " diff --git a/src/common/transformations/tests/common_optimizations/normalize_l2_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/normalize_l2_fusion_test.cpp index 0520bcc6d76..851f8ff0ea3 100644 --- a/src/common/transformations/tests/common_optimizations/normalize_l2_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/normalize_l2_fusion_test.cpp @@ -33,7 +33,7 @@ TEST_F(TransformationTestsF, NormalizeL2FusionWithMax) { auto divide = std::make_shared(input, sqrt); function = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -66,7 +66,7 @@ TEST_F(TransformationTestsF, NormalizeL2FusionWithMaxIncorrectExp) { function = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -85,7 +85,7 @@ TEST_F(TransformationTestsF, NormalizeL2FusionWithMaxIncorrectEpsValueShape) { function = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -105,7 +105,7 @@ TEST_F(TransformationTestsF, NormalizeL2FusionWithAdd) { function = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -137,7 +137,7 @@ TEST_F(TransformationTestsF, NormalizeL2FusionWithAddIncorrectExp) { auto divide = std::make_shared(input, sqrt); function = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -155,7 +155,7 @@ TEST_F(TransformationTestsF, NormalizeL2FusionWithAddIncorrectEpsValueShape) { auto divide = std::make_shared(input, sqrt); function = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -174,7 +174,7 @@ TEST_F(TransformationTestsF, NormalizeL2FusionWithMaxMul) { auto mul = std::make_shared(input, unsqrt); function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -207,7 +207,7 @@ TEST_F(TransformationTestsF, NormalizeL2FusionWithMaxMulIncorrectSecondExp) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } comparator.enable(FunctionsComparator::CmpValues::ACCURACY); comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES); @@ -229,7 +229,7 @@ TEST_F(TransformationTestsF, NormalizeL2FusionWithMaxSqrtAsPower) { auto divide = std::make_shared(input, sqrt); function = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -263,6 +263,6 @@ TEST_F(TransformationTestsF, NormalizeL2FusionWithMaxSqrtAsPowerIncorrectPowerEx function = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/common_optimizations/optimize_strided_slice_test.cpp b/src/common/transformations/tests/common_optimizations/optimize_strided_slice_test.cpp index 3bb3f1bc986..a02d0f02ac4 100644 --- a/src/common/transformations/tests/common_optimizations/optimize_strided_slice_test.cpp +++ b/src/common/transformations/tests/common_optimizations/optimize_strided_slice_test.cpp @@ -37,7 +37,7 @@ TEST_F(TransformationTestsF, OptimizeSS_UselessDeletion_Negative1) { auto ss = std::make_shared(data, begin, end, stride, begin_mask, end_mask); function = std::make_shared(ngraph::NodeVector{ss}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } } @@ -56,7 +56,7 @@ TEST_F(TransformationTestsF, OptimizeSS_UselessDeletion_Negative2) { auto ss = std::make_shared(relu, begin, end, stride, begin_mask, end_mask); function = std::make_shared(ngraph::NodeVector{ss}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } } @@ -75,7 +75,7 @@ TEST_F(TransformationTestsF, OptimizeSS_UselessDeletion) { auto ss = std::make_shared(relu, begin, end, stride, begin_mask, end_mask); function = std::make_shared(ngraph::NodeVector{ss}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } { @@ -99,7 +99,7 @@ TEST_F(TransformationTestsF, OptimizeSS_SkipUselessDeletionRevertCase) { auto relu = std::make_shared(ss); function = std::make_shared(ngraph::NodeVector{relu}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } { @@ -131,7 +131,7 @@ TEST_F(TransformationTestsF, OptimizeSS_Usefull_Test) { auto ss = std::make_shared(data, begin, end, stride, begin_mask, end_mask); function = std::make_shared(ngraph::NodeVector{ss}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } { @@ -172,7 +172,7 @@ TEST_F(TransformationTestsF, OptimizeSS_Shared_Test) { auto concat = std::make_shared(ngraph::NodeVector{ss1, ss2}, 0); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{source}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } { @@ -226,7 +226,7 @@ TEST_F(TransformationTestsF, OptimizeSS_NotShared_Test) { auto concat = std::make_shared(ngraph::NodeVector{ss1, ss2}, 0); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{source}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } { @@ -288,7 +288,7 @@ TEST_F(TransformationTestsF, OptimizeSS_Groupped_Test) { auto concat = std::make_shared(ngraph::NodeVector{ss1, ss2}, 1); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{source}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } { @@ -320,7 +320,7 @@ TEST_F(TransformationTestsF, OptimizeSS_UselessDeletion_use_shapes_false) { auto ss = std::make_shared(relu, begin, end, stride, begin_mask, end_mask); function = std::make_shared(ngraph::NodeVector{ss}, ngraph::ParameterVector{data}); - manager.register_pass(false); + manager.register_pass(false); manager.register_pass(); } // No UselessStridedSliceEraser transformation if use_shapes == false @@ -349,7 +349,7 @@ TEST_F(TransformationTestsF, OptimizeSS_Shared_Test_use_shapes_false) { auto concat = std::make_shared(ngraph::NodeVector{ss1, ss2}, 0); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{source}); - manager.register_pass(false); + manager.register_pass(false); manager.register_pass(); } // No SharedStridedSliceEraser transformation if use_shapes == false @@ -378,7 +378,7 @@ TEST_F(TransformationTestsF, OptimizeSS_Groupped_Test_use_shapes_false) { auto concat = std::make_shared(ngraph::NodeVector{ss1, ss2}, 1); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{source}); - manager.register_pass(false); + manager.register_pass(false); manager.register_pass(); } // No GroupedStridedSliceOptimizer transformation if use_shapes == false @@ -394,7 +394,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_default_axes) { auto slice = std::make_shared(data, begin, end, step); function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{2, 4, 3, 5}); @@ -427,7 +427,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_axes_const_sorted_full) { auto slice = std::make_shared(data, begin, end, step, axes); function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{2, 4, 3, 5}); @@ -460,7 +460,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_all_const) { auto slice = std::make_shared(data, begin, end, step, axes); function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{}); - manager.register_pass(); + manager.register_pass(); } { auto data = ngraph::opset8::Constant::create(ngraph::element::f32, ngraph::Shape{4}, {2, 3, 4, 5}); @@ -490,7 +490,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_all_const_fold) { auto slice = std::make_shared(data, begin, end, step, axes); function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } { @@ -514,7 +514,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_sss_params_axes_const_sorted_le function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data, begin, end, step}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{2, 4, 3, 5}); @@ -557,7 +557,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_sss_params_axes_const_unsorted) function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data, begin, end, step}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{2, 4, 3, 5}); @@ -601,7 +601,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_sss_params_axes_const_negative_ function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data, begin, end, step}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{2, 4, 3, 5}); @@ -639,7 +639,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_sss_params_dyn_shape_axes_const function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data, begin, end, step}); - manager.register_pass(); + manager.register_pass(); } { auto data_shape = ov::PartialShape{ov::Dimension(-1), ov::Dimension(2, 6), 4, ov::Dimension(-1)}; @@ -687,7 +687,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_sss_params_static_shape_axes_co function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data, begin, end, step}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{2, 4, 3, 5}); @@ -731,7 +731,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_dyn_rank_axes_const_positive) { function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data, begin, end, step}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ov::PartialShape::dynamic()); @@ -765,7 +765,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_dyn_rank_axes_const_negative) { function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data, begin, end, step}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } // No transformation for negative axes and dynamic data rank @@ -783,7 +783,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_axes_param) { auto slice = std::make_shared(data, begin, end, step, axes); function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data, axes}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } // No transformation for non-const axes input @@ -808,7 +808,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_begin_param_shape_of_use_shapes auto slice = std::make_shared(shape_of_data, begin, end, step, axes); function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data, begin}); - manager.register_pass(true); + manager.register_pass(true); manager.register_pass(); } { @@ -851,7 +851,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_begin_param_shape_of_use_shapes function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data, begin}); manager.register_pass(); - manager.register_pass(false); + manager.register_pass(false); manager.register_pass(); } { @@ -894,7 +894,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_const_fold_params_slice_shape_o function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data}); manager.register_pass(); - manager.register_pass(true); + manager.register_pass(true); manager.register_pass(); } { @@ -925,7 +925,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_const_fold_params_slice_shape_o function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data}); manager.register_pass(); - manager.register_pass(false); + manager.register_pass(false); manager.register_pass(); } { @@ -954,7 +954,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_slice_all_use_shapes_true) { auto slice = std::make_shared(relu, begin, end, step); function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data}); - manager.register_pass(true); + manager.register_pass(true); manager.register_pass(); } { @@ -994,7 +994,7 @@ TEST_F(TransformationTestsF, SliceToStridedSlice_slice_all_use_shapes_false) { auto slice = std::make_shared(relu, begin, end, step); function = std::make_shared(ngraph::NodeVector{slice}, ngraph::ParameterVector{data}); - manager.register_pass(false); + manager.register_pass(false); manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/pad_fusion.cpp b/src/common/transformations/tests/common_optimizations/pad_fusion.cpp index 7e136b9ce30..631b86cb9fe 100644 --- a/src/common/transformations/tests/common_optimizations/pad_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/pad_fusion.cpp @@ -36,7 +36,7 @@ TEST_F(TransformationTestsF, PadElimination) { CoordinateDiff{1, 1}, Shape{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i32, data_shape); @@ -67,7 +67,7 @@ TEST_F(TransformationTestsF, PadFusionAvgPoolExcludePad) { true, op::RoundingType::FLOOR); function = std::make_shared(NodeVector{avg_pool}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i32, data_shape); @@ -98,7 +98,7 @@ TEST_F(TransformationTestsF, PadFusionAvgPoolDontExcludePad) { false, op::RoundingType::FLOOR); function = std::make_shared(NodeVector{avg_pool}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i32, data_shape); @@ -129,7 +129,7 @@ TEST_F(TransformationTestsF, PadFusionConvolution) { CoordinateDiff{1, 1}, Shape{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i32, data_shape); @@ -162,7 +162,7 @@ TEST_F(TransformationTestsF, PadFusionConvolutionBackpropData) { Shape{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -194,7 +194,7 @@ TEST_F(TransformationTestsF, PadFusionGroupConvolution) { Shape{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -225,7 +225,7 @@ TEST_F(TransformationTestsF, PadFusionGroupConvolutionBackpropData) { CoordinateDiff{4, 3}, Shape{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -257,7 +257,7 @@ TEST_F(TransformationTestsF, PadFusionAvgPoolNonConstPadValue) { true, op::RoundingType::FLOOR); function = std::make_shared(NodeVector{avg_pool}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -290,7 +290,7 @@ TEST_F(TransformationTestsF, PadFusionConvolutionNonConstPadValue) { CoordinateDiff{1, 1}, Shape{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -325,7 +325,7 @@ TEST_F(TransformationTestsF, PadFusionConvolutionBackpropDataNonConstPadValue) { Shape{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -359,7 +359,7 @@ TEST_F(TransformationTestsF, PadFusionGroupConvolutionNonConstPadValue) { Shape{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -392,7 +392,7 @@ TEST_F(TransformationTestsF, PadFusionGroupConvolutionBackpropDataNonConstPadVal CoordinateDiff{4, 3}, Shape{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -422,7 +422,7 @@ TEST_F(TransformationTestsF, NegativePadFusionNonConstantPadMode) { CoordinateDiff{1, 1}, Shape{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i32, data_shape); @@ -456,7 +456,7 @@ TEST_F(TransformationTestsF, NegativePadFusionNonZeroPadValue) { CoordinateDiff{1, 1}, Shape{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i32, data_shape); @@ -491,7 +491,7 @@ TEST_F(TransformationTestsF, NegativePadFusionPadForBatchSize) { CoordinateDiff{1, 1}, Shape{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i32, data_shape); @@ -525,7 +525,7 @@ TEST_F(TransformationTestsF, NegativePadFusionAvgPoolExcludePadNonZeroPads) { true, op::RoundingType::FLOOR); function = std::make_shared(NodeVector{avg_pool}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i32, data_shape); @@ -561,7 +561,7 @@ TEST_F(TransformationTestsF, NegativePadFusionConvolutionBackpropDataTooSmallPad Shape{1, 1}); function = std::make_shared(NodeVector{conv}, ParameterVector{data, filters}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); diff --git a/src/common/transformations/tests/common_optimizations/preprocessing_fusion_tests.cpp b/src/common/transformations/tests/common_optimizations/preprocessing_fusion_tests.cpp index e791b43b48e..12703ea3637 100644 --- a/src/common/transformations/tests/common_optimizations/preprocessing_fusion_tests.cpp +++ b/src/common/transformations/tests/common_optimizations/preprocessing_fusion_tests.cpp @@ -157,7 +157,7 @@ TEST_F(TransformationTestsF, RICFusionSimple) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { @@ -198,7 +198,7 @@ TEST_F(TransformationTestsF, RICFusionHard) { apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { auto input = create_param({-1, -1, -1, -1}); @@ -237,7 +237,7 @@ TEST_F(TransformationTestsF, RICFusionDynamic) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { @@ -260,7 +260,7 @@ TEST_F(TransformationTestsF, RICFusionEltwise1) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { @@ -285,7 +285,7 @@ TEST_F(TransformationTestsF, RICFusionEltwise2) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { @@ -309,7 +309,7 @@ TEST_F(TransformationTestsF, RICFusionEltwise3) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { @@ -333,7 +333,7 @@ TEST_F(TransformationTestsF, RICFusionEltwise4) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { @@ -358,7 +358,7 @@ TEST_F(TransformationTestsF, RICFusionEltwise5) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { @@ -384,7 +384,7 @@ TEST_F(TransformationTestsF, RICFusionEltwiseNegative) { function = std::make_shared(NodeVector{conv}, ParameterVector{input, input2}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } } @@ -398,7 +398,7 @@ TEST_F(TransformationTestsF, RICFusionEltwiseTwoRIC) { function = std::make_shared(NodeVector{conv}, ParameterVector{input, input2}); apply_reverse_input_channels(function, {{0, "NCHW"}, {1, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { auto input = create_param({1, 3, 64, 64}); @@ -422,7 +422,7 @@ TEST_F(TransformationTestsF, RICFusionEltwiseNegative3) { function = std::make_shared(NodeVector{shapeof}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } } @@ -436,7 +436,7 @@ TEST_F(TransformationTestsF, RICFusionGroupConv) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { auto input = create_param({1, 3, 64, 64}); @@ -463,7 +463,7 @@ TEST_F(TransformationTestsF, RICFusionGroupConvNegative) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } } @@ -477,7 +477,7 @@ TEST_F(TransformationTestsF, RICFusionTranspose) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NHWC"}}); - manager.register_pass(); + manager.register_pass(); } { @@ -503,7 +503,7 @@ TEST_F(TransformationTestsF, RICFusionFQOnTheWay) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { @@ -535,7 +535,7 @@ TEST_F(TransformationTestsF, RICFusionFQOnTheWay2) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { @@ -575,7 +575,7 @@ TEST_F(TransformationTestsF, RICFusionFQOnTheWay3) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { @@ -608,7 +608,7 @@ TEST_F(TransformationTestsF, RICFusionShapeOf) { function = std::make_shared(NodeVector{shape_of}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { @@ -631,7 +631,7 @@ TEST_F(TransformationTestsF, RICFusionGatherDetectionNegative) { auto conv = create_conv(relu, {6, 3, 3, 3}); function = std::make_shared(NodeVector{conv}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -644,7 +644,7 @@ TEST_F(TransformationTestsF, RICFusionGatherDetectionNegative2) { auto conv = create_conv(relu, {6, 3, 3, 3}); function = std::make_shared(NodeVector{conv}, ParameterVector{input, input2}); - manager.register_pass(); + manager.register_pass(); } } @@ -656,7 +656,7 @@ TEST_F(TransformationTestsF, RICFusionGatherDetectionNegative3) { auto conv = create_conv(relu, {6, 1, 3, 3}); function = std::make_shared(NodeVector{conv}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -668,7 +668,7 @@ TEST_F(TransformationTestsF, RICFusionGatherDetectionNegative4) { auto conv = create_conv(relu, {6, 2, 3, 3}); function = std::make_shared(NodeVector{conv}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -681,7 +681,7 @@ TEST_F(TransformationTestsF, RICFusionSplitConcatDetectionNegative) { auto conv = create_conv(relu, {6, 3, 3, 3}); function = std::make_shared(NodeVector{conv}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -695,7 +695,7 @@ TEST_F(TransformationTestsF, RICFusionSplitConcatDetectionNegative2) { auto conv = create_conv(relu, {6, 3, 3, 3}); function = std::make_shared(NodeVector{conv}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -708,7 +708,7 @@ TEST_F(TransformationTestsF, RICFusionSplitConcatDetectionNegative3) { auto conv = create_conv(relu, {6, 3, 3, 3}); function = std::make_shared(OutputVector{conv, split->output(0)}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -727,7 +727,7 @@ TEST_F(TransformationTestsF, FuseConvertLayout) { p.input(0).preprocess().convert_layout({2, 0, 1}); p.build(); - manager.register_pass(); + manager.register_pass(); } { @@ -754,7 +754,7 @@ TEST_F(TransformationTestsF, FuseScaleValue) { p.input(0).preprocess().scale(1.3f); p.build(); - manager.register_pass(false); + manager.register_pass(false); } { @@ -783,7 +783,7 @@ TEST_F(TransformationTestsF, FuseScaleValues) { p.input(0).preprocess().scale({1.3f, 0.2f, 4.1f}); p.build(); - manager.register_pass(false); + manager.register_pass(false); } { @@ -851,7 +851,7 @@ TEST_F(TransformationTestsF, RICFusionConvertMultiply) { function = std::make_shared(conv, ParameterVector{parameter}); apply_reverse_input_channels(function, {{0, "NCHW"}}); } - manager.register_pass(); + manager.register_pass(); { auto parameter = std::make_shared(element::f32, Shape{1, 3, 14, 14}); std::shared_ptr activations = @@ -909,7 +909,7 @@ TEST_F(TransformationTestsF, RICFusionConvertMultiplyGroupConv) { function = std::make_shared(NodeVector{conv}, ParameterVector{data}); apply_reverse_input_channels(function, {{0, "NCHW"}}); } - manager.register_pass(); + manager.register_pass(); { auto data = std::make_shared(element::f32, data_shape); std::shared_ptr weights = opset8::Constant::create(element::f32, Shape{3, 3, 1, 4, 4}, {-2}); @@ -974,7 +974,7 @@ TEST_F(TransformationTestsF, RICFusionConvertMultiplyNegative1) { function = std::make_shared(conv, ParameterVector{parameter}); apply_reverse_input_channels(function, {{0, "NCHW"}}); } - manager.register_pass(); + manager.register_pass(); { auto parameter = std::make_shared(element::f32, Shape{1, 3, 14, 14}); std::shared_ptr activations = @@ -1047,7 +1047,7 @@ TEST_F(TransformationTestsF, RICFusionConvertMultiplyNegativeBroadcast) { function = std::make_shared(conv, ParameterVector{parameter}); apply_reverse_input_channels(function, {{0, "NCHW"}}); } - manager.register_pass(); + manager.register_pass(); { auto parameter = std::make_shared(element::f32, Shape{1, 3, 14, 14}); std::shared_ptr activations = @@ -1107,7 +1107,7 @@ TEST_F(TransformationTestsF, RICFusionNegativeUnsupported) { function = std::make_shared(NodeVector{conv}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } } @@ -1146,7 +1146,7 @@ TEST_F(TransformationTestsF, RICFusionConvertMultiplyNonScalarFQInput) { function = std::make_shared(conv, ParameterVector{parameter}); apply_reverse_input_channels(function, {{0, "NCHW"}}); } - manager.register_pass(); + manager.register_pass(); { auto parameter = std::make_shared(element::f32, Shape{1, 3, 14, 14}); auto gather = @@ -1221,7 +1221,7 @@ TEST_F(TransformationTestsF, RICFusionConvertMultiplySkipIfFQLowNonConst) { function = std::make_shared(conv, ParameterVector{parameter, input_low}); apply_reverse_input_channels(function, {{0, "NCHW"}}); } - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, RICFusionTwoConvolutions) { @@ -1232,7 +1232,7 @@ TEST_F(TransformationTestsF, RICFusionTwoConvolutions) { function = std::make_shared(NodeVector{conv2}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { auto conv1_with_gather = create_conv_with_gather(input, create_weights({3, 3, 1, 1}), {2, 1, 0}); @@ -1251,7 +1251,7 @@ TEST_F(TransformationTestsF, RICFusionTwoConvolutionsTheSameWeights) { function = std::make_shared(NodeVector{conv2}, ParameterVector{input}); apply_reverse_input_channels(function, {{0, "NCHW"}}); - manager.register_pass(); + manager.register_pass(); } { auto conv1_with_gather = create_conv_with_gather(input, weights, {2, 1, 0}); diff --git a/src/common/transformations/tests/common_optimizations/random_uniform_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/random_uniform_fusion_test.cpp index ade62d2c624..904fc773103 100644 --- a/src/common/transformations/tests/common_optimizations/random_uniform_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/random_uniform_fusion_test.cpp @@ -34,7 +34,7 @@ TEST_F(TransformationTestsF, RandomUniformMulFusing) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -69,7 +69,7 @@ TEST_F(TransformationTestsF, RandomUniformAddFusing) { function = std::make_shared(ngraph::NodeVector{add}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -105,7 +105,7 @@ TEST_F(TransformationTestsF, RandomUniformWithConvertMulFusing) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -143,7 +143,7 @@ TEST_F(TransformationTestsF, RandomUniformWithConvertAddFusing) { function = std::make_shared(ngraph::NodeVector{add}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -180,7 +180,7 @@ TEST_F(TransformationTestsF, RandomUniformFusingInvalidRUType) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -218,7 +218,7 @@ TEST_F(TransformationTestsF, RandomUniformFusingInvalidConstShape) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/reduce_merge.cpp b/src/common/transformations/tests/common_optimizations/reduce_merge.cpp index 54697b4679a..23ea6e8e03f 100644 --- a/src/common/transformations/tests/common_optimizations/reduce_merge.cpp +++ b/src/common/transformations/tests/common_optimizations/reduce_merge.cpp @@ -22,7 +22,7 @@ TEST_F(TransformationTestsF, ReduceMergeReduceL1) { function = std::make_shared(OutputVector{std::make_shared(reduce1, reduce2_axis, true)}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, Shape{3, 2}); @@ -43,7 +43,7 @@ TEST_F(TransformationTestsF, ReduceMergeReduceL2) { function = std::make_shared(OutputVector{std::make_shared(reduce1, reduce2_axis, true)}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, Shape{3, 2}); @@ -64,7 +64,7 @@ TEST_F(TransformationTestsF, ReduceMergeReduceLogicalAnd) { function = std::make_shared( OutputVector{std::make_shared(reduce1, reduce2_axis, true)}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::boolean, Shape{3, 2}); @@ -85,7 +85,7 @@ TEST_F(TransformationTestsF, ReduceMergeReduceLogicalOr) { function = std::make_shared( OutputVector{std::make_shared(reduce1, reduce2_axis, true)}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::boolean, Shape{1}); @@ -106,7 +106,7 @@ TEST_F(TransformationTestsF, ReduceMergeReduceMax) { function = std::make_shared(OutputVector{std::make_shared(reduce1, reduce2_axis, true)}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i64, Shape{3, 2}); @@ -127,7 +127,7 @@ TEST_F(TransformationTestsF, ReduceMergeReduceMean) { function = std::make_shared(OutputVector{std::make_shared(reduce1, reduce2_axis, true)}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i64, Shape{3, 2}); @@ -148,7 +148,7 @@ TEST_F(TransformationTestsF, ReduceMergeReduceMin) { function = std::make_shared(OutputVector{std::make_shared(reduce1, reduce2_axis, true)}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i64, Shape{3, 2}); @@ -169,7 +169,7 @@ TEST_F(TransformationTestsF, ReduceMergeReduceProd) { function = std::make_shared(OutputVector{std::make_shared(reduce1, reduce2_axis, true)}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i64, Shape{3, 2}); @@ -190,7 +190,7 @@ TEST_F(TransformationTestsF, ReduceMergeReduceSum) { function = std::make_shared(OutputVector{std::make_shared(reduce1, reduce2_axis, true)}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i64, Shape{3, 2}); @@ -211,7 +211,7 @@ TEST_F(TransformationTestsF, ReduceMergeNoReduceDiffKeepDims) { function = std::make_shared(OutputVector{std::make_shared(reduce1, reduce2_axis, false)}, ParameterVector{A}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i64, Shape{3, 2}); @@ -235,7 +235,7 @@ TEST_F(TransformationTestsF, ReduceMergeNotPassInvalidAxes) { function = std::make_shared(OutputVector{std::make_shared(reduce1, reduce2_axis, false)}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, Shape{3, 2}); @@ -260,7 +260,7 @@ TEST_F(TransformationTestsF, ReduceMergeDynamicShapes) { function = std::make_shared(OutputVector{std::make_shared(reduce1, reduce2_axis, true)}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = @@ -283,7 +283,7 @@ TEST_F(TransformationTestsF, ReduceMerge3ReducesL1) { auto reduce3_axis = op::Constant::create(element::i64, Shape{1}, {1}); auto reduce3 = std::make_shared(reduce2, reduce3_axis, true); function = std::make_shared(OutputVector{reduce3}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i64, Shape{3, 2, 4}); @@ -303,7 +303,7 @@ TEST_F(TransformationTestsF, ReduceMergeConcatAxes) { auto axis2 = std::make_shared(element::i64, Shape{1}); auto reduce2 = std::make_shared(reduce1, axis2, true); function = std::make_shared(OutputVector{reduce2}, ParameterVector{data, axis1, axis2}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i64, Shape{3, 2, 4}); diff --git a/src/common/transformations/tests/common_optimizations/relu_fake_quantize_fusion.cpp b/src/common/transformations/tests/common_optimizations/relu_fake_quantize_fusion.cpp index df61cf61145..82c231160ef 100644 --- a/src/common/transformations/tests/common_optimizations/relu_fake_quantize_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/relu_fake_quantize_fusion.cpp @@ -30,7 +30,7 @@ TEST_F(TransformationTestsF, ReluFakeQuantizeFusion) { auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(relu, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -54,7 +54,7 @@ TEST_F(TransformationTestsF, ReluFakeQuantizeFusionNegativeInputLow) { auto output_high = opset5::Constant::create(element::f32, Shape{}, {10}); auto fq = std::make_shared(relu, input_low, input_high, output_low, output_high, 11); function = std::make_shared(NodeVector{fq}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); diff --git a/src/common/transformations/tests/common_optimizations/remove_multi_subgraph_op_dangling_params_tests.cpp b/src/common/transformations/tests/common_optimizations/remove_multi_subgraph_op_dangling_params_tests.cpp index 08c2d0e047c..eb87973f9bf 100644 --- a/src/common/transformations/tests/common_optimizations/remove_multi_subgraph_op_dangling_params_tests.cpp +++ b/src/common/transformations/tests/common_optimizations/remove_multi_subgraph_op_dangling_params_tests.cpp @@ -42,7 +42,7 @@ TEST_F(TransformationTestsF, RemoveLoopDanglingParameters) { auto loop_res = std::make_shared(loop->get_iter_value(abs)); function = std::make_shared(OutputVector{loop_res}, ParameterVector{a, b}); - manager.register_pass(); + manager.register_pass(); } { auto body = std::make_shared(OutputVector{condition, abs}, ParameterVector{bi}); @@ -81,7 +81,7 @@ TEST_F(TransformationTestsF, RemoveLoopManyDanglingParameters) { auto loop_res = std::make_shared(loop->get_iter_value(abs)); function = std::make_shared(OutputVector{loop_res}, ParameterVector{a, b, c}); - manager.register_pass(); + manager.register_pass(); } { auto body = std::make_shared(OutputVector{condition, abs}, ParameterVector{bi}); @@ -124,7 +124,7 @@ TEST_F(TransformationTestsF, RemoveLoopManyDanglingParameters2) { auto loop_res = std::make_shared(loop->get_iter_value(abs)); function = std::make_shared(OutputVector{loop_res}, ParameterVector{a, b, c, d}); - manager.register_pass(); + manager.register_pass(); } { auto body = std::make_shared(OutputVector{condition, abs}, ParameterVector{bi, di}); @@ -159,8 +159,8 @@ TEST_F(TransformationTestsF, RemoveLoopDanglingParametersIfConcatEmptyTensor) { auto loop_res = std::make_shared(loop->get_iter_value(concat)); function = std::make_shared(OutputVector{loop_res}, ParameterVector{a, b}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { auto concat = std::make_shared(NodeVector{ai}, 0); @@ -199,7 +199,7 @@ TEST_F(TransformationTestsF, RemoveIfDanglingParametersFromBodiesAndInputs) { auto res = if_op->set_output(then_op_res, else_op_res); function = std::make_shared(OutputVector{res}, ParameterVector{X, Y}); - manager.register_pass(); + manager.register_pass(); } { auto then_body = std::make_shared(OutputVector{then_op_res}, ParameterVector{Xte}); @@ -240,7 +240,7 @@ TEST_F(TransformationTestsF, RemoveIfDanglingParametersOnlyFromBodies) { auto res = if_op->set_output(then_op_res, else_op_res); function = std::make_shared(OutputVector{res}, ParameterVector{X, Y}); - manager.register_pass(); + manager.register_pass(); } { auto then_body = std::make_shared(OutputVector{then_op_res}, ParameterVector{Xt}); @@ -286,7 +286,7 @@ TEST_F(TransformationTestsF, RemoveIfManyDanglingParameters) { auto res = if_op->set_output(then_op_res, else_op_res); function = std::make_shared(OutputVector{res}, ParameterVector{X, Y, Z}); - manager.register_pass(); + manager.register_pass(); } { auto then_body = std::make_shared(OutputVector{then_op_res}, ParameterVector{Xt, Zt}); @@ -332,7 +332,7 @@ TEST_F(TransformationTestsF, RemoveIfDanglingParamFromOneBodyAndUpdateAllDescrip auto res = if_op->set_output(then_op_res, else_op_res); function = std::make_shared(OutputVector{res}, ParameterVector{X, Y, Z}); - manager.register_pass(); + manager.register_pass(); } { auto then_body = std::make_shared(OutputVector{then_op_res}, ParameterVector{Zt}); @@ -368,7 +368,7 @@ TEST_F(TransformationTestsF, RemoveTensorIteratorDanglingParameter) { auto res = std::make_shared(out); function = std::make_shared(OutputVector{res}, ParameterVector{X, Y, M}); - manager.register_pass(); + manager.register_pass(); } { auto body = std::make_shared(OutputVector{Zo}, ParameterVector{Xi, Yi}); @@ -407,7 +407,7 @@ TEST_F(TransformationTestsF, RemoveTensorIteratorManyDanglingParameters) { auto res = std::make_shared(out); function = std::make_shared(OutputVector{res}, ParameterVector{X, Y, Z, M}); - manager.register_pass(); + manager.register_pass(); } { auto body = std::make_shared(OutputVector{Zo}, ParameterVector{Xi, Zi}); diff --git a/src/common/transformations/tests/common_optimizations/reshape_prelu_test.cpp b/src/common/transformations/tests/common_optimizations/reshape_prelu_test.cpp index 7b6bc04194a..068832a50ce 100644 --- a/src/common/transformations/tests/common_optimizations/reshape_prelu_test.cpp +++ b/src/common/transformations/tests/common_optimizations/reshape_prelu_test.cpp @@ -28,7 +28,7 @@ TEST(TransformationTests, ReshapePReluTest1) { f = std::make_shared(ngraph::NodeVector{prelu}, ngraph::ParameterVector{input}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -59,7 +59,7 @@ TEST(TransformationTests, ReshapePReluTest2) { f = std::make_shared(ngraph::NodeVector{prelu}, ngraph::ParameterVector{input}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -91,7 +91,7 @@ TEST(TransformationTests, ReshapePReluTest3) { f = std::make_shared(ngraph::NodeVector{prelu}, ngraph::ParameterVector{input}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -121,7 +121,7 @@ TEST(TransformationTests, ReshapePReluTest4) { f_ref = f; ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -141,7 +141,7 @@ TEST(TransformationTests, ReshapePReluTest5) { f_ref = f; ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -161,7 +161,7 @@ TEST(TransformationTests, ReshapePReluTest6) { f_ref = f; ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -175,15 +175,15 @@ TEST(TransformationTests, ReshapePReluTest7) { { auto input = std::make_shared(ngraph::element::u8, ngraph::Shape{1, 3, 16, 16}); auto slope = ngraph::opset1::Constant::create(ngraph::element::f32, ngraph::Shape{3}, {-2.f, -1.f, -2.f}); - auto relaxed_prelu = std::make_shared>( + auto relaxed_prelu = std::make_shared>( ngraph::element::TypeVector{ngraph::element::f32, ngraph::element::f32}, ngraph::element::TypeVector{ngraph::element::f32}, - ngraph::op::TemporaryReplaceOutputType(input, ngraph::element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(slope, ngraph::element::f32).get()); + ov::op::TemporaryReplaceOutputType(input, ngraph::element::f32).get(), + ov::op::TemporaryReplaceOutputType(slope, ngraph::element::f32).get()); f = std::make_shared(ngraph::NodeVector{relaxed_prelu}, ngraph::ParameterVector{input}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -192,11 +192,11 @@ TEST(TransformationTests, ReshapePReluTest7) { auto input = std::make_shared(ngraph::element::u8, ngraph::Shape{1, 3, 16, 16}); auto slope = ngraph::opset1::Constant::create(ngraph::element::f32, ngraph::Shape{1, 3, 1, 1}, {-2.f, -1.f, -2.f}); - auto relaxed_prelu = std::make_shared>( + auto relaxed_prelu = std::make_shared>( ngraph::element::TypeVector{ngraph::element::f32, ngraph::element::f32}, ngraph::element::TypeVector{ngraph::element::f32}, - ngraph::op::TemporaryReplaceOutputType(input, ngraph::element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(slope, ngraph::element::f32).get()); + ov::op::TemporaryReplaceOutputType(input, ngraph::element::f32).get(), + ov::op::TemporaryReplaceOutputType(slope, ngraph::element::f32).get()); f_ref = std::make_shared(ngraph::NodeVector{relaxed_prelu}, ngraph::ParameterVector{input}); } @@ -214,7 +214,7 @@ TEST(TransformationTests, ReshapePReluTest8) { f = std::make_shared(ngraph::NodeVector{prelu}, ngraph::ParameterVector{input}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -242,7 +242,7 @@ TEST(TransformationTests, ReshapePReluTest9) { f = std::make_shared(ngraph::NodeVector{prelu}, ngraph::ParameterVector{input, slope}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } diff --git a/src/common/transformations/tests/common_optimizations/reshape_sequence_fusion.cpp b/src/common/transformations/tests/common_optimizations/reshape_sequence_fusion.cpp index 0b9e1372f07..3815048652a 100644 --- a/src/common/transformations/tests/common_optimizations/reshape_sequence_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/reshape_sequence_fusion.cpp @@ -32,7 +32,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusion1) { auto c = reshape(b, {6}); function = std::make_shared(OutputVector{c}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -49,7 +49,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusion2) { auto b = reshape(a, {6}); function = std::make_shared(OutputVector{b}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -69,7 +69,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusion3_special_zero_true) { auto reshape_b = std::make_shared(reshape_a, reshape_b_pattern, special_zero); function = std::make_shared(OutputVector{reshape_b}, ParameterVector{data, target_shape_param}); - manager.register_pass(); + manager.register_pass(); } { const bool special_zero = true; @@ -91,7 +91,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusion3_special_zero_false) { auto reshape_b = std::make_shared(reshape_a, reshape_b_pattern, special_zero); function = std::make_shared(OutputVector{reshape_b}, ParameterVector{data, target_shape_param}); - manager.register_pass(); + manager.register_pass(); } { const bool special_zero = false; @@ -113,7 +113,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusion4_i32_special_zero_true) { auto reshape_b = std::make_shared(reshape_a, reshape_b_pattern, special_zero); function = std::make_shared(OutputVector{reshape_b}, ParameterVector{data, target_shape_param}); - manager.register_pass(); + manager.register_pass(); } { const bool special_zero = true; @@ -135,7 +135,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusion4_i32_special_zero_false) { auto reshape_b = std::make_shared(reshape_a, reshape_b_pattern, special_zero); function = std::make_shared(OutputVector{reshape_b}, ParameterVector{data, target_shape_param}); - manager.register_pass(); + manager.register_pass(); } { const bool special_zero = false; @@ -157,7 +157,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusion4_i64_special_zero_true) { auto reshape_b = std::make_shared(reshape_a, reshape_b_pattern, special_zero); function = std::make_shared(OutputVector{reshape_b}, ParameterVector{data, target_shape_param}); - manager.register_pass(); + manager.register_pass(); } { const bool special_zero = true; @@ -179,7 +179,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusion4_i64_special_zero_false) { auto reshape_b = std::make_shared(reshape_a, reshape_b_pattern, special_zero); function = std::make_shared(OutputVector{reshape_b}, ParameterVector{data, target_shape_param}); - manager.register_pass(); + manager.register_pass(); } { const bool special_zero = false; @@ -201,7 +201,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusion5_special_zero_true) { auto reshape_b = std::make_shared(reshape_a, reshape_b_pattern, special_zero); function = std::make_shared(OutputVector{reshape_b}, ParameterVector{data, target_shape_param}); - manager.register_pass(); + manager.register_pass(); } { const bool special_zero = true; @@ -223,7 +223,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusion5_special_zero_false) { auto reshape_b = std::make_shared(reshape_a, reshape_b_pattern, special_zero); function = std::make_shared(OutputVector{reshape_b}, ParameterVector{data, target_shape_param}); - manager.register_pass(); + manager.register_pass(); } { const bool special_zero = false; @@ -242,7 +242,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusionNeg1) { auto b = reshape(a, {6}); function = std::make_shared(OutputVector{b}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } } @@ -253,7 +253,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusionNeg2) { auto b = reshape(a, {6}); function = std::make_shared(OutputVector{b}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } } @@ -264,7 +264,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusionNeg3) { auto b = reshape(a, {6}); function = std::make_shared(OutputVector{a, b}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } } @@ -275,7 +275,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusionNeg4) { auto b = reshape(a, {0, 3}); function = std::make_shared(OutputVector{b}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } } @@ -288,7 +288,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusionNeg5_special_zero_true) { auto reshape_b = std::make_shared(reshape_a, reshape_b_pattern, special_zero); function = std::make_shared(OutputVector{reshape_b}, ParameterVector{data, reshape_b_pattern}); - manager.register_pass(); + manager.register_pass(); } } @@ -301,7 +301,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusionNeg5_special_zero_false) { auto reshape_b = std::make_shared(reshape_a, reshape_b_pattern, special_zero); function = std::make_shared(OutputVector{reshape_b}, ParameterVector{data, reshape_b_pattern}); - manager.register_pass(); + manager.register_pass(); } } @@ -313,7 +313,7 @@ TEST_F(TransformationTestsF, ReshapeSequenceFusionEliminate) { auto b = reshape(a, {1, 2, 3}); function = std::make_shared(OutputVector{b}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/shared_shapeof_test.cpp b/src/common/transformations/tests/common_optimizations/shared_shapeof_test.cpp index 148d172142c..b7e9ce5da72 100644 --- a/src/common/transformations/tests/common_optimizations/shared_shapeof_test.cpp +++ b/src/common/transformations/tests/common_optimizations/shared_shapeof_test.cpp @@ -48,7 +48,7 @@ TEST_F(TransformationTestsF, SharedShapeOfTest) { auto concat = std::make_shared(inputs_of_concat, 0); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -88,7 +88,7 @@ TEST_F(TransformationTestsF, SharedShapeOfTestI64Only) { auto concat = std::make_shared(inputs_of_concat, 0); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -126,7 +126,7 @@ TEST_F(TransformationTestsF, SharedShapeOfTestI32Only) { auto concat = std::make_shared(inputs_of_concat, 0); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -177,7 +177,7 @@ TEST_F(TransformationTestsF, SharedShapeOfTestMixed) { auto concat = std::make_shared(inputs_of_concat, 0); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); diff --git a/src/common/transformations/tests/common_optimizations/shuffle_channels_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/shuffle_channels_fusion_test.cpp index 4977d8d3e15..16b3d51c8b0 100644 --- a/src/common/transformations/tests/common_optimizations/shuffle_channels_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/shuffle_channels_fusion_test.cpp @@ -68,8 +68,8 @@ public: ngraph::pass::Manager manager; auto pass_config = manager.get_pass_config(); manager.register_pass(unh); - manager.register_pass(); - manager.register_pass(values.check_values); + manager.register_pass(); + manager.register_pass(values.check_values); manager.register_pass(unh); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/common_optimizations/simplify_second_input_of_reshape_test.cpp b/src/common/transformations/tests/common_optimizations/simplify_second_input_of_reshape_test.cpp index d42402ad65a..bcaad619031 100644 --- a/src/common/transformations/tests/common_optimizations/simplify_second_input_of_reshape_test.cpp +++ b/src/common/transformations/tests/common_optimizations/simplify_second_input_of_reshape_test.cpp @@ -45,7 +45,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest1) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -70,7 +70,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest2) { auto reshape = std::make_shared(fq, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -96,7 +96,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest3) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -122,7 +122,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest4) { auto reshape = std::make_shared(fq, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -147,7 +147,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest5) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -171,7 +171,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest6) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -196,7 +196,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest7) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -222,7 +222,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest8) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -246,7 +246,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest9) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } comparator.enable(FunctionsComparator::CONST_VALUES); } @@ -266,7 +266,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest10) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -301,7 +301,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest11) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -327,7 +327,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest12) { auto reshape = std::make_shared(gelu, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -352,7 +352,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest13) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -376,7 +376,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest14) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -401,7 +401,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest15) { auto reshape = std::make_shared(gelu, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -427,7 +427,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest16) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -458,7 +458,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest17) { auto reshape = std::make_shared(data_2, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data_1, data_2}); - manager.register_pass(); + manager.register_pass(); } comparator.enable(FunctionsComparator::CONST_VALUES); } @@ -482,7 +482,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest18) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -519,7 +519,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest19) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -564,7 +564,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest20) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data, data_copy}); - manager.register_pass(); + manager.register_pass(); } { @@ -601,7 +601,7 @@ TEST_F(TransformationTestsF, SimplifySecondInputOfReshapeTest21) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); diff --git a/src/common/transformations/tests/common_optimizations/simplify_shape_of_sub_graph.cpp b/src/common/transformations/tests/common_optimizations/simplify_shape_of_sub_graph.cpp index 2142f05ee53..f77d79dc7ec 100644 --- a/src/common/transformations/tests/common_optimizations/simplify_shape_of_sub_graph.cpp +++ b/src/common/transformations/tests/common_optimizations/simplify_shape_of_sub_graph.cpp @@ -65,7 +65,7 @@ TEST_F(TransformationTestsF, ShapeSubGraphTestGatherv7) { auto reshape = std::make_shared(data, concat, false); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -105,7 +105,7 @@ TEST_F(TransformationTestsF, ShapeSubGraphTestGatherv8) { auto reshape = std::make_shared(data, concat, false); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -142,7 +142,7 @@ TEST_F(TransformationTestsF, ShapeNopSubGraphTestGatherv7) { auto reshape = std::make_shared(data, concat, false); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -171,7 +171,7 @@ TEST_F(TransformationTestsF, ShapeNopSubGraphTestGatherv8) { auto reshape = std::make_shared(data, concat, false); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -196,6 +196,6 @@ TEST_F(TransformationTestsF, GroupedGatherEliminationNegative) { auto reshape = std::make_shared(data, concat, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/common_optimizations/skip_gather_before_transpose_and_reshape_test.cpp b/src/common/transformations/tests/common_optimizations/skip_gather_before_transpose_and_reshape_test.cpp index a3fb278bf7f..2c9acac0de1 100644 --- a/src/common/transformations/tests/common_optimizations/skip_gather_before_transpose_and_reshape_test.cpp +++ b/src/common/transformations/tests/common_optimizations/skip_gather_before_transpose_and_reshape_test.cpp @@ -33,7 +33,7 @@ TEST_F(TransformationTestsF, SkipGatherBeforeTransposeAndReshapeStaticShapeFpDat auto reshape = std::make_shared(transpose, reshape_const, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -64,7 +64,7 @@ TEST_F(TransformationTestsF, SkipGatherBeforeTransposeAndReshapeStaticShapeIntDa auto reshape = std::make_shared(transpose, reshape_const, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::i64, data_shape); @@ -95,7 +95,7 @@ TEST_F(TransformationTestsF, SkipGatherBeforeTransposeAndReshapeDynamicShapeStat auto reshape = std::make_shared(transpose, reshape_const, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(element::f32, data_shape); @@ -126,7 +126,7 @@ TEST_F(TransformationTestsF, SkipGatherBeforeTransposeAndReshapeIncorrectGatherA auto reshape = std::make_shared(transpose, reshape_const, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } } @@ -146,7 +146,7 @@ TEST_F(TransformationTestsF, SkipGatherBeforeTransposeAndReshapeDynamicBatch) { auto reshape = std::make_shared(transpose, reshape_const, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } } @@ -166,7 +166,7 @@ TEST_F(TransformationTestsF, SkipGatherBeforeTransposeAndReshapeDynamicRank) { auto reshape = std::make_shared(transpose, reshape_const, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } } @@ -186,7 +186,7 @@ TEST_F(TransformationTestsF, SkipGatherBeforeTransposeAndReshapeBatchNotEqualTo1 auto reshape = std::make_shared(transpose, reshape_const, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } } @@ -206,6 +206,6 @@ TEST_F(TransformationTestsF, SkipGatherBeforeTransposeAndReshapeUnsuitableReshap auto reshape = std::make_shared(transpose, reshape_const, true); function = std::make_shared(NodeVector{reshape}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } } \ No newline at end of file diff --git a/src/common/transformations/tests/common_optimizations/softmax_fusion.cpp b/src/common/transformations/tests/common_optimizations/softmax_fusion.cpp index b655e740945..4027c8500fe 100644 --- a/src/common/transformations/tests/common_optimizations/softmax_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/softmax_fusion.cpp @@ -38,8 +38,8 @@ TEST_P(SoftmaxFusionFixture, SoftmaxFusion) { auto unh = std::make_shared(); pass::Manager m; m.register_pass(unh); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.register_pass(unh); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -92,8 +92,8 @@ TEST_P(NegativeSoftmaxFusionFixture, NegativeSoftmaxFusion) { auto unh = std::make_shared(); pass::Manager m; m.register_pass(unh); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.register_pass(unh); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/common_optimizations/softplus_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/softplus_fusion_test.cpp index 38b609b948d..eee45032be6 100644 --- a/src/common/transformations/tests/common_optimizations/softplus_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/softplus_fusion_test.cpp @@ -27,7 +27,7 @@ TEST_F(TransformationTestsF, SoftPlusFusing) { function = std::make_shared(ngraph::NodeVector{log}, ngraph::ParameterVector{input0}); - manager.register_pass(); + manager.register_pass(); } { @@ -49,7 +49,7 @@ TEST_F(TransformationTestsF, SoftPlusFusingDynamic) { function = std::make_shared(ngraph::NodeVector{log}, ngraph::ParameterVector{input0}); - manager.register_pass(); + manager.register_pass(); } { @@ -71,7 +71,7 @@ TEST_F(TransformationTestsF, SoftPlusFusingNegative) { function = std::make_shared(ngraph::NodeVector{log}, ngraph::ParameterVector{input0}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/space_to_batch_fusion.cpp b/src/common/transformations/tests/common_optimizations/space_to_batch_fusion.cpp index 4671c66c1d6..9eb1efd58be 100644 --- a/src/common/transformations/tests/common_optimizations/space_to_batch_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/space_to_batch_fusion.cpp @@ -37,7 +37,7 @@ TEST_F(TransformationTestsF, SpaceToBatchFusionTranspose) { op::Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); function = std::make_shared(NodeVector{trans_after}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -69,7 +69,7 @@ TEST_F(TransformationTestsF, SpaceToBatchFusionReshape) { op::Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); function = std::make_shared(NodeVector{trans_after}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -101,7 +101,7 @@ TEST_F(TransformationTestsF, NegativeSpaceToBatchFusionInvalidTransposePerm) { op::Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); function = std::make_shared(NodeVector{trans_after}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -139,7 +139,7 @@ TEST_F(TransformationTestsF, NegativeSpaceToBatchFusionInvalidPad) { op::Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); function = std::make_shared(NodeVector{trans_after}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -177,7 +177,7 @@ TEST_F(TransformationTestsF, NegativeSpaceToBatchFusionInvalidMode) { op::Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); function = std::make_shared(NodeVector{trans_after}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -215,7 +215,7 @@ TEST_F(TransformationTestsF, NegativeSpaceToBatchFusionInvalidRank) { op::Constant::create(element::i64, Shape{5}, {1, 0, 2, 3, 4})); function = std::make_shared(NodeVector{trans_after}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/split_concat_pair_to_interpolate_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/split_concat_pair_to_interpolate_fusion_test.cpp index bc51cd716b0..9e2c251e49c 100644 --- a/src/common/transformations/tests/common_optimizations/split_concat_pair_to_interpolate_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/split_concat_pair_to_interpolate_fusion_test.cpp @@ -38,7 +38,7 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionSpatial2D1) { auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(false); + manager.register_pass(false); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; @@ -99,7 +99,7 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionSpatial2D2) { auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(false); + manager.register_pass(false); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; @@ -160,7 +160,7 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionSpatial3D1) { auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(false); + manager.register_pass(false); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; @@ -220,7 +220,7 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionSpatial3D2) { auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(false); + manager.register_pass(false); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; @@ -281,7 +281,7 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionTwoSplitsOneConca auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input1, input2}); - manager.register_pass(); + manager.register_pass(); } { auto input1 = std::make_shared(ngraph::element::f32, ngraph::Shape{1, 13, 13, 3, 2}); @@ -325,7 +325,7 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionSpatial2D1WithCon auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; @@ -375,7 +375,7 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionSpatial2D2WithCon auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; @@ -426,7 +426,7 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionSpatial3D1WithCon auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; @@ -477,7 +477,7 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionSpatial3D2WithCon auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; @@ -529,7 +529,7 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionSpatial2D1Dynamic auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(false); + manager.register_pass(false); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; @@ -593,7 +593,7 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionSpatial2D2Dynamic auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(false); + manager.register_pass(false); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; @@ -658,7 +658,7 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionSpatial3D1Dynamic auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(false); + manager.register_pass(false); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; @@ -722,7 +722,7 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionSpatial3D2Dynamic auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(false); + manager.register_pass(false); } { ngraph::opset8::Interpolate::InterpolateAttrs attrs; @@ -784,6 +784,6 @@ TEST_F(TransformationTestsF, SplitConcatPairToInterpolateFusionSplitWithEmptyPor auto concat = std::make_shared(concat_inputs_vec, axis); function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input1}); - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/common_optimizations/split_squeeze_concat_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/split_squeeze_concat_fusion_test.cpp index 69d23af9f2c..335f463085b 100644 --- a/src/common/transformations/tests/common_optimizations/split_squeeze_concat_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/split_squeeze_concat_fusion_test.cpp @@ -36,7 +36,7 @@ TEST_F(TransformationTestsF, SplitSqueezeConcatFusion) { function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -74,7 +74,7 @@ TEST_F(TransformationTestsF, SplitSqueezeConcatFusionNegativeCaseNotAllSplitOutp function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); function_ref = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -117,7 +117,7 @@ TEST_F(TransformationTestsF, SplitSqueezeConcatFusionNegativeCaseSplitOutputsGoI function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); function_ref = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -160,7 +160,7 @@ TEST_F(TransformationTestsF, SplitSqueezeConcatFusionNegativeCaseSplitAxisDiffer function = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); function_ref = std::make_shared(ngraph::NodeVector{concat}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/strides_optimization.cpp b/src/common/transformations/tests/common_optimizations/strides_optimization.cpp index 8c7c543d9b1..c6d546101db 100644 --- a/src/common/transformations/tests/common_optimizations/strides_optimization.cpp +++ b/src/common/transformations/tests/common_optimizations/strides_optimization.cpp @@ -38,7 +38,7 @@ TEST_F(TransformationTestsF, StridesOptimization1) { ngraph::Strides{}); function = std::make_shared(ngraph::NodeVector{conv_2}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{1, 3, 224, 224}); @@ -81,7 +81,7 @@ TEST_F(TransformationTestsF, StridesOptimization2) { ngraph::Strides{}); function = std::make_shared(ngraph::NodeVector{conv_2}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{1, 3, 224, 224}); @@ -124,7 +124,7 @@ TEST_F(TransformationTestsF, StridesOptimization3) { ngraph::Strides{}); function = std::make_shared(ngraph::NodeVector{conv_2}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{1, 3, 224, 224}); @@ -178,7 +178,7 @@ TEST_F(TransformationTestsF, StridesOptimization4) { ngraph::Strides{}); function = std::make_shared(ngraph::NodeVector{conv_3}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{1, 3, 224, 224}); @@ -235,7 +235,7 @@ TEST_F(TransformationTestsF, StridesOptimization5) { ngraph::Strides{}); function = std::make_shared(ngraph::NodeVector{conv_2}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{1, 3, 224, 224}); @@ -305,7 +305,7 @@ TEST_F(TransformationTestsF, StridesOptimization6) { ngraph::Strides{}); function = std::make_shared(ngraph::NodeVector{conv_4}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{1, 3, 224, 224}); @@ -382,7 +382,7 @@ TEST_F(TransformationTestsF, StridesOptimization7) { function = std::make_shared(ngraph::NodeVector{conv_3, conv_4}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{1, 3, 224, 224}); @@ -468,7 +468,7 @@ TEST_F(TransformationTestsF, StridesOptimization8) { function = std::make_shared(ngraph::NodeVector{conv_3}, ngraph::ParameterVector{data, data_2}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{1, 3, 224, 224}); @@ -570,7 +570,7 @@ TEST_F(TransformationTestsF, StridesOptimization9) { function = std::make_shared(ngraph::NodeVector{conv_3}, ngraph::ParameterVector{data, data_2, data_3}); - manager.register_pass(); + manager.register_pass(); } { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{1, 3, 224, 224}); diff --git a/src/common/transformations/tests/common_optimizations/subtract_fusion.cpp b/src/common/transformations/tests/common_optimizations/subtract_fusion.cpp index d3dfee8f977..1bdbbebcb14 100644 --- a/src/common/transformations/tests/common_optimizations/subtract_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/subtract_fusion.cpp @@ -31,8 +31,8 @@ TEST(TransformationTests, SubtractFusionMultiply) { f = std::make_shared(ngraph::NodeVector{add}, ngraph::ParameterVector{data1, data2}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -64,8 +64,8 @@ TEST(TransformationTests, SubtractFusionMultiplyNegative) { f = std::make_shared(ngraph::NodeVector{add}, ngraph::ParameterVector{data1, data2}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -98,8 +98,8 @@ TEST(TransformationTests, SubtractFusionNeg) { f = std::make_shared(ngraph::NodeVector{add}, ngraph::ParameterVector{data1, data2}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } diff --git a/src/common/transformations/tests/common_optimizations/swish_fusion_test.cpp b/src/common/transformations/tests/common_optimizations/swish_fusion_test.cpp index b33422452a7..170ef1393aa 100644 --- a/src/common/transformations/tests/common_optimizations/swish_fusion_test.cpp +++ b/src/common/transformations/tests/common_optimizations/swish_fusion_test.cpp @@ -31,7 +31,7 @@ TEST_F(TransformationTestsF, SwishFusionWithBeta) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input, beta}); - manager.register_pass(); + manager.register_pass(); } { @@ -57,7 +57,7 @@ TEST_F(TransformationTestsF, SwishFusionWithoutBeta) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -81,7 +81,7 @@ TEST_F(TransformationTestsF, SwishFusionWithoutBetaNonOneAddConstant) { function = std::make_shared(ngraph::NodeVector{div}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -108,7 +108,7 @@ TEST_F(TransformationTestsF, SwishFusionWithSigmoid) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -131,7 +131,7 @@ TEST_F(TransformationTestsF, SwishFusionWithSigmoidWithBeta) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input, beta}); - manager.register_pass(); + manager.register_pass(); } { @@ -157,7 +157,7 @@ TEST_F(TransformationTestsF, SwishFusionWithSigmoidWithBetaConstant) { function = std::make_shared(ngraph::NodeVector{mul}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/common_optimizations/transpose_reshape_elimination_for_matmul.cpp b/src/common/transformations/tests/common_optimizations/transpose_reshape_elimination_for_matmul.cpp index 627451edd23..64105f67ca6 100644 --- a/src/common/transformations/tests/common_optimizations/transpose_reshape_elimination_for_matmul.cpp +++ b/src/common/transformations/tests/common_optimizations/transpose_reshape_elimination_for_matmul.cpp @@ -34,8 +34,8 @@ TEST_F(TransformationTestsF, TransposeReshapeEliminationForMatMul) { auto const_tranpose_after = opset1::Constant::create(element::i32, Shape{3}, {2, 0, 1}); auto tranpose_after = std::make_shared(reshape_after, const_tranpose_after); function = std::make_shared(NodeVector{tranpose_after}, ParameterVector{data_1, data_2}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { auto data_1 = std::make_shared(element::f32, data_shape_1); @@ -61,7 +61,7 @@ TEST_F(TransformationTestsF, TransposeReshapeEliminationForMatMul_TransposedA) { auto const_tranpose_after = opset1::Constant::create(element::i32, Shape{3}, {2, 0, 1}); auto tranpose_after = std::make_shared(reshape_after, const_tranpose_after); function = std::make_shared(NodeVector{tranpose_after}, ParameterVector{data_1, data_2}); - manager.register_pass(); + manager.register_pass(); } { auto data_1 = std::make_shared(element::f32, data_shape_1); @@ -87,7 +87,7 @@ TEST_F(TransformationTestsF, TransposeReshapeEliminationForMatMul_TransposedB) { auto const_tranpose_after = opset1::Constant::create(element::i32, Shape{3}, {1, 0, 2}); auto tranpose_after = std::make_shared(reshape_after, const_tranpose_after); function = std::make_shared(NodeVector{tranpose_after}, ParameterVector{data_1, data_2}); - manager.register_pass(); + manager.register_pass(); } { auto data_1 = std::make_shared(element::f32, data_shape_1); @@ -113,7 +113,7 @@ TEST_F(TransformationTestsF, TransposeReshapeEliminationForMatMul_TransposedAB) auto const_tranpose_after = opset1::Constant::create(element::i32, Shape{3}, {1, 0, 2}); auto tranpose_after = std::make_shared(reshape_after, const_tranpose_after); function = std::make_shared(NodeVector{tranpose_after}, ParameterVector{data_1, data_2}); - manager.register_pass(); + manager.register_pass(); } { auto data_1 = std::make_shared(element::f32, data_shape_1); @@ -131,8 +131,8 @@ TEST_F(TransformationTestsF, TransposeReshapeEliminationForMatMul_Einsum) { auto data_2 = std::make_shared(element::f32, data_shape_2); auto einsum = std::make_shared(OutputVector{data_1, data_2}, "kl,mlj->mkj"); function = std::make_shared(NodeVector{einsum}, ParameterVector{data_1, data_2}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { auto data_1 = std::make_shared(element::f32, data_shape_1); diff --git a/src/common/transformations/tests/common_optimizations/transpose_sinking_test.cpp b/src/common/transformations/tests/common_optimizations/transpose_sinking_test.cpp index bde9f1c9584..17078d50372 100644 --- a/src/common/transformations/tests/common_optimizations/transpose_sinking_test.cpp +++ b/src/common/transformations/tests/common_optimizations/transpose_sinking_test.cpp @@ -99,9 +99,9 @@ TEST_P(TransposeSinkingFQ, TransposeFQReduce) { auto unh = std::make_shared(); ngraph::pass::Manager manager; manager.register_pass(unh); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass(unh); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -218,8 +218,8 @@ TEST_P(TransposeSinking, TransposeReduction) { auto unh = std::make_shared(); ngraph::pass::Manager manager; manager.register_pass(unh); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass(unh); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -291,7 +291,7 @@ TEST_F(TransformationTestsF, TransposeFuseEliminatesTranspose) { auto add = std::make_shared(transpose2, add_const); function = std::make_shared(ngraph::NodeVector{add}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -315,7 +315,7 @@ TEST_F(TransformationTestsF, TransposeFuses) { result->set_layout("NC..."); function = std::make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -340,7 +340,7 @@ TEST_F(TransformationTestsF, TransposeReduceNegative) { auto sub = std::make_shared(transpose, reduce_mean); function = std::make_shared(ngraph::NodeVector{sub}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } @@ -353,7 +353,7 @@ TEST_F(TransformationTestsF, TransposeConvert) { auto convert = std::make_shared(transpose, element::f16); function = std::make_shared(ngraph::NodeVector{convert}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -378,6 +378,6 @@ TEST_F(TransformationTestsF, TransposeConvertNegativeConsumers) { function = std::make_shared(ngraph::NodeVector{convert, transpose}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/common_optimizations/transpose_to_reshape_test.cpp b/src/common/transformations/tests/common_optimizations/transpose_to_reshape_test.cpp index 2cf2a4f8513..7f4389d9b32 100644 --- a/src/common/transformations/tests/common_optimizations/transpose_to_reshape_test.cpp +++ b/src/common/transformations/tests/common_optimizations/transpose_to_reshape_test.cpp @@ -110,8 +110,8 @@ TEST_P(TransposeToReshapeTests, CompareFunctions) { auto unh = std::make_shared(); pass::Manager m; m.register_pass(unh); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.register_pass(unh); m.run_passes(f); f->validate_nodes_and_infer_types(); @@ -210,9 +210,9 @@ TEST(TransformationTests, replace_transpose_with_reshape) { auto unh = std::make_shared(); pass::Manager m; m.register_pass(unh); - m.register_pass(); + m.register_pass(); m.register_pass(); - m.register_pass(); + m.register_pass(); m.register_pass(unh); m.run_passes(optimized_f); diff --git a/src/common/transformations/tests/common_optimizations/weights_dequantize_to_fake_quantize.cpp b/src/common/transformations/tests/common_optimizations/weights_dequantize_to_fake_quantize.cpp index 379bb8e37d1..4acf68979e2 100644 --- a/src/common/transformations/tests/common_optimizations/weights_dequantize_to_fake_quantize.cpp +++ b/src/common/transformations/tests/common_optimizations/weights_dequantize_to_fake_quantize.cpp @@ -96,8 +96,8 @@ TEST_P(TranslateNewWeightFormatToOldOne, ReshapeMatMul) { auto unh = std::make_shared(); ngraph::pass::Manager m; m.register_pass(unh); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.register_pass(unh); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/common_optimizations/wrap_interpolate_into_transposes_test.cpp b/src/common/transformations/tests/common_optimizations/wrap_interpolate_into_transposes_test.cpp index 7b904b30140..072d492180f 100644 --- a/src/common/transformations/tests/common_optimizations/wrap_interpolate_into_transposes_test.cpp +++ b/src/common/transformations/tests/common_optimizations/wrap_interpolate_into_transposes_test.cpp @@ -41,7 +41,7 @@ TEST_F(TransformationTestsF, WrapInterpolateIntoTransposes4DScales) { std::make_shared(input, sizes_node, scales_node, axis_node, attrs); function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -88,7 +88,7 @@ TEST_F(TransformationTestsF, WrapInterpolateIntoTransposes4DSizes) { std::make_shared(input, sizes_node, scales_node, axis_node, attrs); function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -135,7 +135,7 @@ TEST_F(TransformationTestsF, WrapInterpolateIntoTransposes5DScales) { std::make_shared(input, sizes_node, scales_node, axis_node, attrs); function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -182,7 +182,7 @@ TEST_F(TransformationTestsF, WrapInterpolateIntoTransposes5DSizes) { std::make_shared(input, sizes_node, scales_node, axis_node, attrs); function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -229,7 +229,7 @@ TEST_F(TransformationTestsF, WrapInterpolateIntoTransposes4DScalesDynamic) { std::make_shared(input, sizes_node, scales_node, axis_node, attrs); function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -276,7 +276,7 @@ TEST_F(TransformationTestsF, WrapInterpolateIntoTransposes4DSizesDynamic) { std::make_shared(input, sizes_node, scales_node, axis_node, attrs); function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -327,7 +327,7 @@ TEST_F(TransformationTestsF, WrapInterpolateIntoTransposes5DScalesDynamic) { std::make_shared(input, sizes_node, scales_node, axis_node, attrs); function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -378,7 +378,7 @@ TEST_F(TransformationTestsF, WrapInterpolateIntoTransposes5DSizesDynamic) { std::make_shared(input, sizes_node, scales_node, axis_node, attrs); function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -433,7 +433,7 @@ TEST_F(TransformationTestsF, WrapInterpolateIntoTransposes4DScalesNotApplicable) std::make_shared(input, sizes_node, scales_node, gather_node, attrs); function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -488,7 +488,7 @@ TEST_F(TransformationTestsF, WrapInterpolateIntoTransposes4DSizesNotApplicable) std::make_shared(input, sizes_node, scales_node, gather_node, attrs); function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -543,7 +543,7 @@ TEST_F(TransformationTestsF, WrapInterpolateIntoTransposes5DScalesNotApplicable) std::make_shared(input, sizes_node, scales_node, gather_node, attrs); function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); @@ -598,7 +598,7 @@ TEST_F(TransformationTestsF, WrapInterpolateIntoTransposes5DSizesNotApplicable) std::make_shared(input, sizes_node, scales_node, gather_node, attrs); function = std::make_shared(ngraph::NodeVector{interpolate}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { auto input = std::make_shared(ngraph::element::f32, input_shape); diff --git a/src/common/transformations/tests/const_folding_prior_box.cpp b/src/common/transformations/tests/const_folding_prior_box.cpp index 3a003ce5f6d..dbee29a41fe 100644 --- a/src/common/transformations/tests/const_folding_prior_box.cpp +++ b/src/common/transformations/tests/const_folding_prior_box.cpp @@ -39,7 +39,7 @@ TEST(TransformationTests, ConstFoldingPriorBox) { auto res = std::make_shared(pb); f = std::make_shared(ngraph::NodeVector{res}, ngraph::ParameterVector{in}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -89,7 +89,7 @@ TEST(TransformationTests, ConstFoldingPriorBoxClustered) { auto res = std::make_shared(pb); f = std::make_shared(ngraph::NodeVector{res}, ngraph::ParameterVector{in}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -165,7 +165,7 @@ TEST(TransformationTests, ConstFoldingPriorBoxSubgraph) { auto res = std::make_shared(pb); f = std::make_shared(ngraph::NodeVector{res}, ngraph::ParameterVector{in, in_2}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -229,7 +229,7 @@ TEST(TransformationTests, ConstFoldingPriorBoxClusteredSubgraph) { auto res = std::make_shared(pb); f = std::make_shared(ngraph::NodeVector{res}, ngraph::ParameterVector{in, in_2}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -287,7 +287,7 @@ TEST(TransformationTests, ConstFoldingPriorBox8) { auto res = std::make_shared(pb); f = std::make_shared(ngraph::NodeVector{res}, ngraph::ParameterVector{in}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -362,7 +362,7 @@ TEST(TransformationTests, ConstFoldingPriorBox8Subgraph) { auto res = std::make_shared(pb); f = std::make_shared(ngraph::NodeVector{res}, ngraph::ParameterVector{in, in_2}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/control_flow/unroll_if_test.cpp b/src/common/transformations/tests/control_flow/unroll_if_test.cpp index 0f66ecaa69e..3912d09d544 100644 --- a/src/common/transformations/tests/control_flow/unroll_if_test.cpp +++ b/src/common/transformations/tests/control_flow/unroll_if_test.cpp @@ -58,8 +58,8 @@ TEST(TransformationTests, UnrollIfCondIsTrue) { f = create_if_model(true); ov::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -77,8 +77,8 @@ TEST(TransformationTests, UnrollIfCondIsFalse) { f = create_if_model(false); ov::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -116,8 +116,8 @@ TEST(TransformationTests, UnrollIfWithSplitInput) { f = std::make_shared(ov::NodeVector{if_result}, ov::ParameterVector{X, Y}); ov::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -160,8 +160,8 @@ TEST(TransformationTests, UnrollNestedIfThenBody) { f = std::make_shared(ov::NodeVector{if_result}, ov::ParameterVector{X, Y}); ov::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -201,8 +201,8 @@ TEST(TransformationTests, UnrollIfCondIsTrueMultiOutput) { f = std::make_shared(ngraph::NodeVector{if_result}, ngraph::ParameterVector{data}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/control_flow/unroll_loop_test.cpp b/src/common/transformations/tests/control_flow/unroll_loop_test.cpp index 692ae801726..0e73b87c721 100644 --- a/src/common/transformations/tests/control_flow/unroll_loop_test.cpp +++ b/src/common/transformations/tests/control_flow/unroll_loop_test.cpp @@ -67,8 +67,8 @@ TEST(TransformationTests, UnrollLoopGRUCell) { f = std::make_shared(NodeVector{res_ti_1}, ParameterVector{X, Y}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -153,8 +153,8 @@ TEST(TransformationTests, UnrollLoopRNNCell) { f = std::make_shared(NodeVector{res_ti_1}, ParameterVector{X, Y}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -242,8 +242,8 @@ TEST(TransformationTests, UnrollLoopLSTMCell) { f = std::make_shared(NodeVector{res_ti_1}, ParameterVector{X, Y, Z}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -329,8 +329,8 @@ TEST(TransformationTests, UnrollLoopGRUCellSingleIteration) { f = std::make_shared(NodeVector{res_ti_1}, ParameterVector{X, Y}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -409,8 +409,8 @@ TEST(TransformationTests, UnrollLoopRNNCellSingleIteration) { f = std::make_shared(NodeVector{res_ti_1}, ParameterVector{X, Y}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -491,8 +491,8 @@ TEST(TransformationTests, UnrollLoopLSTMCellSingleIteration) { f = std::make_shared(NodeVector{res_ti_1}, ParameterVector{X, Y, Z}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/control_flow/unroll_tensor_iterator_test.cpp b/src/common/transformations/tests/control_flow/unroll_tensor_iterator_test.cpp index d91f9646126..409321e74ff 100644 --- a/src/common/transformations/tests/control_flow/unroll_tensor_iterator_test.cpp +++ b/src/common/transformations/tests/control_flow/unroll_tensor_iterator_test.cpp @@ -62,8 +62,8 @@ TEST(TransformationTests, UnrollTensorIteratorGRUCell) { f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -142,8 +142,8 @@ TEST(TransformationTests, UnrollTensorIteratorRNNCell) { f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -225,8 +225,8 @@ TEST(TransformationTests, UnrollTensorIteratorLSTMCell) { f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y, Z}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -306,8 +306,8 @@ TEST(TransformationTests, UnrollTensorIteratorGRUCellSingleIteration) { f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -380,8 +380,8 @@ TEST(TransformationTests, UnrollTensorIteratorRNNCellSingleIteration) { f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -456,8 +456,8 @@ TEST(TransformationTests, UnrollTensorIteratorLSTMCellSingleIterationSingleItera f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y, Z}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -541,9 +541,9 @@ TEST(TransformationTests, CheckTensorNamesAfterConvertToTIAndUnrolling) { collect_legacy_tensor_names(f, names_before); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); // inserts Unsqueeze after TI - m.register_pass(); + m.register_pass(); + m.register_pass(); // inserts Unsqueeze after TI + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -609,8 +609,8 @@ TEST(TransformationTests, CheckTensorNamesAfterUnrolling) { collect_legacy_tensor_names(f, names_before); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/legacy/conv_fusion_test.cpp b/src/common/transformations/tests/legacy/conv_fusion_test.cpp index a1f3453f033..f2380edc59f 100644 --- a/src/common/transformations/tests/legacy/conv_fusion_test.cpp +++ b/src/common/transformations/tests/legacy/conv_fusion_test.cpp @@ -108,17 +108,17 @@ private: const_node = ngraph::opset5::Constant::create(ngraph::element::f32, eltwise_shape, {1.1}); if (eltwise_type == ngraph::opset5::Add::get_type_info_static()) { if (eltwise_shape.size() != 1) { - const_node = ngraph::op::util::reshapeTo(const_node, ngraph::Shape{ngraph::shape_size(eltwise_shape)}); + const_node = ov::op::util::reshapeTo(const_node, ngraph::Shape{ngraph::shape_size(eltwise_shape)}); } conv = conv.get_node_shared_ptr()->copy_with_new_inputs({input, weights, const_node}); } else if (eltwise_type == ngraph::opset5::Multiply::get_type_info_static()) { if (eltwise_shape.size() > 1) { - const_node = ngraph::op::util::reshapeTo(const_node, ngraph::Shape{ngraph::shape_size(eltwise_shape)}); + const_node = ov::op::util::reshapeTo(const_node, ngraph::Shape{ngraph::shape_size(eltwise_shape)}); } ngraph::Shape const_shape(weights_shape.size(), 1); const_shape[0] = weights_shape[0]; - weights = std::make_shared(weights, - ngraph::op::util::reshapeTo(const_node, const_shape)); + weights = + std::make_shared(weights, ov::op::util::reshapeTo(const_node, const_shape)); conv = conv.get_node_shared_ptr()->copy_with_new_inputs({input, weights}); } else { throw ngraph::ngraph_error("Unsupported element type"); @@ -133,7 +133,7 @@ TEST_P(ConvFusionTests, CompareFunctions) { auto unh = std::make_shared(); ngraph::pass::Manager manager; manager.register_pass(unh); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.register_pass(); manager.register_pass(unh); @@ -370,8 +370,8 @@ TEST_F(TransformationTestsF, WeightsWithReshape) { opset5::Constant::create(element::f32, Shape{4, 1, 1}, std::vector(4, 2))); function = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { @@ -406,7 +406,7 @@ TEST_F(TransformationTestsF, NegativeWeightsWithReshape) { opset5::Constant::create(element::f32, Shape{4, 1, 1}, std::vector(4, 2))); function = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -446,8 +446,8 @@ TEST_F(TransformationTestsF, WeightsWithReshapeScalarMultiplier) { auto mul = std::make_shared(conv, opset5::Constant::create(element::f32, Shape{1}, {2.0f})); function = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { @@ -478,8 +478,8 @@ TEST_F(TransformationTestsF, WeightsWithoutReshape) { opset5::Constant::create(element::f32, Shape{4, 1, 1}, std::vector(4, 2))); function = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { @@ -520,8 +520,8 @@ TEST_F(TransformationTestsF, WeightsWithFakeQuantizeAndReshape) { opset5::Constant::create(element::f32, Shape{6, 1, 1}, std::vector(6, 2))); function = std::make_shared(NodeVector{mul}, ParameterVector{data}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/legacy/convert_convolution_test.cpp b/src/common/transformations/tests/legacy/convert_convolution_test.cpp index a2e95210ca4..88354dd466a 100644 --- a/src/common/transformations/tests/legacy/convert_convolution_test.cpp +++ b/src/common/transformations/tests/legacy/convert_convolution_test.cpp @@ -80,7 +80,7 @@ private: TEST_P(ConvertConvolutionTest, CompareFunctions) { const auto orig_shape = f->get_output_partial_shape(0); pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(f); @@ -155,7 +155,7 @@ TEST(ConvertConvolutionTest, GroupConvolutionWithReshape) { } pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -220,7 +220,7 @@ TEST(ConvertConvolutionTest, GroupConvolutionWithReshapeNeg) { } pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(f); // FIXME: 42956 diff --git a/src/common/transformations/tests/legacy/convert_deconvolution_test.cpp b/src/common/transformations/tests/legacy/convert_deconvolution_test.cpp index ee4a9b20fce..241c9073ce2 100644 --- a/src/common/transformations/tests/legacy/convert_deconvolution_test.cpp +++ b/src/common/transformations/tests/legacy/convert_deconvolution_test.cpp @@ -78,7 +78,7 @@ private: TEST_P(ConvertDeconvolutionTest, CompareFunctions) { const auto orig_shape = f->get_output_partial_shape(0); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/legacy/convert_matmul_test.cpp b/src/common/transformations/tests/legacy/convert_matmul_test.cpp index 481bc003c1f..62eb8e6ac24 100644 --- a/src/common/transformations/tests/legacy/convert_matmul_test.cpp +++ b/src/common/transformations/tests/legacy/convert_matmul_test.cpp @@ -42,7 +42,7 @@ TEST_F(TransformationTestsF, ConvertMatMulTest1) { auto input1 = std::make_shared(ngraph::element::f32, ngraph::Shape{3, 1, 2}); auto input2 = std::make_shared(ngraph::element::f32, ngraph::Shape{2, 1}); - auto reshape = ngraph::op::util::reshapeTo(input2, {1, 2, 1}); + auto reshape = ov::op::util::reshapeTo(input2, {1, 2, 1}); auto matmul = std::make_shared(input1, reshape, false, false); @@ -71,9 +71,9 @@ TEST_F(TransformationTestsF, ConvertMatMulTest2) { auto usnqueeze_input2 = std::make_shared( input2, ngraph::opset1::Constant::create(ngraph::element::i64, ngraph::Shape{1}, {1})); - auto reshape = ngraph::op::util::reshapeTo(usnqueeze_input2, {1, 2, 1}); + auto reshape = ov::op::util::reshapeTo(usnqueeze_input2, {1, 2, 1}); auto matmul = std::make_shared(input1, reshape, false, false); - auto reshape_output = ngraph::op::util::reshapeTo(matmul, {3, 1}); + auto reshape_output = ov::op::util::reshapeTo(matmul, {3, 1}); function_ref = std::make_shared(ngraph::NodeVector{reshape_output}, ngraph::ParameterVector{input1, input2}); @@ -99,9 +99,9 @@ TEST_F(TransformationTestsF, ConvertMatMulTest3) { auto usnqueeze_input1 = std::make_shared( input1, ngraph::opset1::Constant::create(ngraph::element::i64, ngraph::Shape{1}, {0})); - auto reshape = ngraph::op::util::reshapeTo(usnqueeze_input1, {1, 1, 2}); + auto reshape = ov::op::util::reshapeTo(usnqueeze_input1, {1, 1, 2}); auto matmul = std::make_shared(reshape, input2, false, false); - auto reshape_output = ngraph::op::util::reshapeTo(matmul, {3, 1}); + auto reshape_output = ov::op::util::reshapeTo(matmul, {3, 1}); function_ref = std::make_shared(ngraph::NodeVector{reshape_output}, ngraph::ParameterVector{input1, input2}); @@ -167,9 +167,9 @@ TEST_F(TransformationTestsF, ConvertMatMulTest6) { auto input1 = std::make_shared(ngraph::element::f32, ngraph::Shape{3, 2, 2}); auto input2 = ngraph::opset1::Constant::create(ngraph::element::f32, ngraph::Shape{2, 2}, {1}); auto input3 = ngraph::opset1::Constant::create(ngraph::element::f32, ngraph::Shape{2}, {1}); - auto reshape_begin = ngraph::op::util::reshapeTo(input1, ngraph::Shape{6, 2}); + auto reshape_begin = ov::op::util::reshapeTo(input1, ngraph::Shape{6, 2}); auto fc = std::make_shared(reshape_begin, input2, input3, ngraph::Shape{6, 2}); - auto reshape_end = ngraph::op::util::reshapeTo(fc, ngraph::Shape{3, 2, 2}); + auto reshape_end = ov::op::util::reshapeTo(fc, ngraph::Shape{3, 2, 2}); function_ref = std::make_shared(ngraph::NodeVector{reshape_end}, ngraph::ParameterVector{input1}); @@ -219,7 +219,7 @@ TEST(TransformationTests, ConvertMatMulDynamic) { auto f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{input1}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.register_pass(); m.register_pass(); diff --git a/src/common/transformations/tests/legacy/convert_ngraph_to_cnn_network_tests.cpp b/src/common/transformations/tests/legacy/convert_ngraph_to_cnn_network_tests.cpp index bf4d5ceca8a..622760fe189 100644 --- a/src/common/transformations/tests/legacy/convert_ngraph_to_cnn_network_tests.cpp +++ b/src/common/transformations/tests/legacy/convert_ngraph_to_cnn_network_tests.cpp @@ -36,7 +36,7 @@ TEST(ConvertFunctionToCNNNetworkTests, ConvertPReLUNetwork) { f = std::make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{param1, param2}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); } @@ -68,7 +68,7 @@ TEST(ConvertFunctionToCNNNetworkTests, ConvertConvolutionNetwork) { f = std::make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{param1, param2}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); } @@ -170,15 +170,15 @@ TEST(ConvertFunctionToCNNNetworkTests, ConvertTopKWithOneInput) { f = std::make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{param}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); } ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); static const precisions_array convert_precision_list{ {ngraph::element::i64, ngraph::element::i32}, @@ -189,10 +189,9 @@ TEST(ConvertFunctionToCNNNetworkTests, ConvertTopKWithOneInput) { {ngraph::element::boolean, ngraph::element::u8}, }; - manager.register_pass(convert_precision_list); + manager.register_pass(convert_precision_list); manager.register_pass(); - manager.register_pass( - precisions_array{{ngraph::element::i64, ngraph::element::i32}}); + manager.register_pass(precisions_array{{ngraph::element::i64, ngraph::element::i32}}); manager.run_passes(f); diff --git a/src/common/transformations/tests/legacy/convert_strided_slice_to_crop_test.cpp b/src/common/transformations/tests/legacy/convert_strided_slice_to_crop_test.cpp index 880b36b1aef..5089d3fc632 100644 --- a/src/common/transformations/tests/legacy/convert_strided_slice_to_crop_test.cpp +++ b/src/common/transformations/tests/legacy/convert_strided_slice_to_crop_test.cpp @@ -64,7 +64,7 @@ TEST_F(TransformationTestsF, ConvertStridedSliceToCropTests1) { auto crop = std::make_shared(input, axes, dim, offset); crop->set_friendly_name("strided_slice/Crop"); - auto reshape = ngraph::op::util::reshapeTo(crop, {1, 384, 640}); + auto reshape = ov::op::util::reshapeTo(crop, {1, 384, 640}); reshape->set_friendly_name("strided_slice"); function_ref = std::make_shared(ngraph::NodeVector{reshape}, ngraph::ParameterVector{input}); @@ -109,7 +109,7 @@ TEST_F(TransformationTestsF, ConvertStridedSliceToCropTests2) { auto crop = std::make_shared(input, axes, dim, offset); crop->set_friendly_name("strided_slice/Crop"); - auto reshape = ngraph::op::util::reshapeTo(crop, {1, 384, 640}); + auto reshape = ov::op::util::reshapeTo(crop, {1, 384, 640}); reshape->set_friendly_name("strided_slice"); function_ref = std::make_shared(ngraph::NodeVector{reshape}, ngraph::ParameterVector{input}); @@ -209,7 +209,7 @@ TEST_F(TransformationTestsF, ConvertStridedSliceToCropNoneZeroBeginValuesWithMas std::vector dim = {1, 1, 2, 2}; std::vector offset = {0, 0, 0, 0}; - auto reshape = ngraph::op::util::reshapeTo(input, {1, 1, 2, 4}); + auto reshape = ov::op::util::reshapeTo(input, {1, 1, 2, 4}); reshape->set_friendly_name("strided_slice/Reshape_for_Crop"); auto crop = std::make_shared(reshape, axes, dim, offset); diff --git a/src/common/transformations/tests/legacy/convert_tile_to_legacy.cpp b/src/common/transformations/tests/legacy/convert_tile_to_legacy.cpp index b78bb776256..1108051cb64 100644 --- a/src/common/transformations/tests/legacy/convert_tile_to_legacy.cpp +++ b/src/common/transformations/tests/legacy/convert_tile_to_legacy.cpp @@ -27,7 +27,7 @@ TEST(TransformationTests, ConvertTileToLegacyDynamic1) { auto f = std::make_shared(NodeVector{tile}, ParameterVector{data}); pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); ASSERT_NO_THROW(manager.run_passes(f)); ASSERT_NO_THROW(check_rt_info(f)); @@ -40,7 +40,7 @@ TEST(TransformationTests, ConvertTileToLegacyDynamic2) { auto f = std::make_shared(NodeVector{tile}, ParameterVector{data}); pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); ASSERT_NO_THROW(manager.run_passes(f)); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/legacy/keep_constant_inputs_tests.cpp b/src/common/transformations/tests/legacy/keep_constant_inputs_tests.cpp index 0e3a7bf715b..6a7025d7e42 100644 --- a/src/common/transformations/tests/legacy/keep_constant_inputs_tests.cpp +++ b/src/common/transformations/tests/legacy/keep_constant_inputs_tests.cpp @@ -46,9 +46,9 @@ void transformNetwork(InferenceEngine::CNNNetwork& clonedNetwork, bool keep_cons if (clonedNetwork.getFunction()) { auto nGraphFunc = clonedNetwork.getFunction(); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(nGraphFunc); IE_SUPPRESS_DEPRECATED_START diff --git a/src/common/transformations/tests/legacy/mul_add_conversion_test.cpp b/src/common/transformations/tests/legacy/mul_add_conversion_test.cpp index 78e8cb40a8b..6e855ba8546 100644 --- a/src/common/transformations/tests/legacy/mul_add_conversion_test.cpp +++ b/src/common/transformations/tests/legacy/mul_add_conversion_test.cpp @@ -149,7 +149,7 @@ TEST_P(MulAddConversionTests, CompareFunctions) { ngraph::pass::Manager manager; manager.register_pass(unh); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.register_pass(unh); manager.register_pass([](std::shared_ptr f) { @@ -170,7 +170,7 @@ TEST_P(MulOrAddConversionTests, CompareFunctions) { ngraph::pass::Manager manager; manager.register_pass(unh); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.register_pass(unh); manager.register_pass([](std::shared_ptr f) { diff --git a/src/common/transformations/tests/legacy/reshape_fc_fusion_test.cpp b/src/common/transformations/tests/legacy/reshape_fc_fusion_test.cpp index c63a63720a6..873516890f8 100644 --- a/src/common/transformations/tests/legacy/reshape_fc_fusion_test.cpp +++ b/src/common/transformations/tests/legacy/reshape_fc_fusion_test.cpp @@ -38,7 +38,7 @@ TEST(TransformationTests, ReshapeFCFusiuonTest1) { auto unh = std::make_shared(); ngraph::pass::Manager m; m.register_pass(unh); - m.register_pass(); + m.register_pass(); m.register_pass(); m.register_pass(unh); m.run_passes(f); @@ -62,7 +62,7 @@ TEST(TransformationTests, ReshapeFCFusiuonTest2) { auto unh = std::make_shared(); ngraph::pass::Manager m; m.register_pass(unh); - m.register_pass(); + m.register_pass(); m.register_pass(); m.register_pass(unh); m.run_passes(f); @@ -86,7 +86,7 @@ TEST(TransformationTests, ReshapeFCFusiuonTest3) { auto unh = std::make_shared(); ngraph::pass::Manager m; m.register_pass(unh); - m.register_pass(); + m.register_pass(); m.register_pass(); m.register_pass(unh); m.run_passes(f); @@ -108,7 +108,7 @@ TEST(TransformationTests, ReshapeFCFusiuonDynamic) { auto unh = std::make_shared(); ngraph::pass::Manager m; m.register_pass(unh); - m.register_pass(); + m.register_pass(); m.register_pass(); m.register_pass(unh); m.run_passes(f); diff --git a/src/common/transformations/tests/make_stateful_test.cpp b/src/common/transformations/tests/make_stateful_test.cpp index 98f900d1b15..6b388235075 100644 --- a/src/common/transformations/tests/make_stateful_test.cpp +++ b/src/common/transformations/tests/make_stateful_test.cpp @@ -119,7 +119,7 @@ TEST(TransformationTests, make_stateful_by_tensor_name) { std::map tensor_names = {{"x", "res0"}, {"y", "res1"}}; ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(tensor_names); manager.run_passes(f); @@ -139,7 +139,7 @@ TEST(TransformationTests, make_stateful_by_param_res) { {f->get_parameters()[1], f->get_results()[1]}}; ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(pairs); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -170,7 +170,7 @@ TEST(TransformationTests, make_stateful_dynamic_shapes) { f->validate_nodes_and_infer_types(); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(pair_names); try { @@ -190,7 +190,7 @@ TEST(TransformationTests, make_stateful_one_out_to_several_results_by_tensor_nam std::map tensor_names = {{"x", "res0"}, {"y", "res1"}}; ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(tensor_names); manager.run_passes(f); @@ -210,7 +210,7 @@ TEST(TransformationTests, make_stateful_one_out_to_several_results_by_param_res) {f->get_parameters()[1], f->get_results()[1]}}; ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(pairs); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/op_conversions/batch_norm_decompositoin.cpp b/src/common/transformations/tests/op_conversions/batch_norm_decompositoin.cpp index f19b6e30b90..3a03174f5e8 100644 --- a/src/common/transformations/tests/op_conversions/batch_norm_decompositoin.cpp +++ b/src/common/transformations/tests/op_conversions/batch_norm_decompositoin.cpp @@ -29,7 +29,7 @@ TEST_F(TransformationTestsF, BatchNormDecompositionStaticRankOpset1) { auto batch_norm = std::make_shared(input, gamma, beta, mean, var, 0.001); function = std::make_shared(ngraph::NodeVector{batch_norm}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CONST_VALUES); } { @@ -57,7 +57,7 @@ TEST_F(TransformationTestsF, BatchNormDecompositionStaticRankOpset5) { auto batch_norm = std::make_shared(input, gamma, beta, mean, var, 0.001); function = std::make_shared(ngraph::NodeVector{batch_norm}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); comparator.enable(FunctionsComparator::CONST_VALUES); } { @@ -84,6 +84,6 @@ TEST_F(TransformationTestsF, BatchNormDecompositionDynamicRank) { broadcast->set_friendly_name("broadcast"); function = std::make_shared(ngraph::NodeVector{broadcast}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/op_conversions/batch_to_space_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/batch_to_space_decomposition_test.cpp index 4abb63d7b14..d351a607341 100644 --- a/src/common/transformations/tests/op_conversions/batch_to_space_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/batch_to_space_decomposition_test.cpp @@ -34,7 +34,7 @@ TEST_F(TransformationTestsF, BatchToSpaceDecompositionByElements) { function = std::make_shared(ngraph::NodeVector{batch_to_space}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -92,7 +92,7 @@ TEST_F(TransformationTestsF, SpaceToBatchDecompositionByElements) { function = std::make_shared(ngraph::NodeVector{batch_to_space}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -158,7 +158,7 @@ TEST_F(TransformationTestsF, SpaceToBatchDecomposition) { function = std::make_shared(ngraph::NodeVector{batch_to_space}, ngraph::ParameterVector{data}); - manager.register_pass(false); + manager.register_pass(false); } { @@ -194,7 +194,7 @@ TEST_F(TransformationTestsF, BatchToSpaceDecomposition) { function = std::make_shared(ngraph::NodeVector{batch_to_space}, ngraph::ParameterVector{data}); - manager.register_pass(false); + manager.register_pass(false); } { diff --git a/src/common/transformations/tests/op_conversions/bidirectional_sequences_decomposition.cpp b/src/common/transformations/tests/op_conversions/bidirectional_sequences_decomposition.cpp index 8b6a7e42776..f2616d41490 100644 --- a/src/common/transformations/tests/op_conversions/bidirectional_sequences_decomposition.cpp +++ b/src/common/transformations/tests/op_conversions/bidirectional_sequences_decomposition.cpp @@ -83,8 +83,8 @@ TEST(TransformationTests, BidirectionalSequenceDecompositionLSTM) { ngraph::ParameterVector{ins.X, ins.H, ins.C}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -152,8 +152,8 @@ TEST(TransformationTests, BidirectionalSequenceDecompositionGRU) { ngraph::ParameterVector{ins.X, ins.H}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -216,8 +216,8 @@ TEST(TransformationTests, BidirectionalSequenceDecompositionRNN) { ngraph::ParameterVector{ins.X, ins.H}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -289,8 +289,8 @@ TEST(TransformationTests, BidirectionalSequenceDecompositionLSTMDisabled) { }; ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.get_pass_config()->set_callback(transformations_callback); m.run_passes(f); @@ -342,8 +342,8 @@ TEST(TransformationTests, BidirectionalSequenceDecompositionGRUDisabled) { }; ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.get_pass_config()->set_callback(transformations_callback); m.run_passes(f); @@ -393,8 +393,8 @@ TEST(TransformationTests, BidirectionalSequenceDecompositionRNNDisabled) { }; ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.get_pass_config()->set_callback(transformations_callback); m.run_passes(f); diff --git a/src/common/transformations/tests/op_conversions/convert_broadcast3_test.cpp b/src/common/transformations/tests/op_conversions/convert_broadcast3_test.cpp index a0733196a8d..fea33dac067 100644 --- a/src/common/transformations/tests/op_conversions/convert_broadcast3_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_broadcast3_test.cpp @@ -31,8 +31,8 @@ using TargetShape = Shape; void convert_broadcast3_test(std::shared_ptr f, std::shared_ptr f_ref) { pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); auto res = compare_functions(f, f_ref); @@ -347,8 +347,8 @@ TEST(TransformationTests, ConvertBroadcast3WithNumpyModeToBroadcast1) { f = std::make_shared(ngraph::NodeVector{broadcast}, ngraph::ParameterVector{input1}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -388,8 +388,8 @@ TEST(TransformationTests, ConvertBroadcast3WithPDPDModeToBroadcast1) { f = std::make_shared(ngraph::NodeVector{broadcast}, ngraph::ParameterVector{input1}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -433,8 +433,8 @@ TEST(TransformationTests, ConvertBroadcast3WithExplicitModeToBroadcast1) { f = std::make_shared(ngraph::NodeVector{broadcast}, ngraph::ParameterVector{input1}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -479,8 +479,8 @@ TEST(TransformationTests, ConvertBroadcast3WithBidirectionalModeToBroadcast1Cons f = std::make_shared(ngraph::NodeVector{broadcast}, ngraph::ParameterVector{input1}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -518,8 +518,8 @@ TEST(TransformationTests, ConvertBroadcast3WithBidirectionalModeToBroadcast1Cons f = std::make_shared(NodeVector{broadcast}, ParameterVector{input1}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -559,8 +559,8 @@ TEST(TransformationTests, ConvertBroadcast3WithBidirectionalModeToMultiply) { f = std::make_shared(NodeVector{broadcast}, ParameterVector{input1}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -603,8 +603,8 @@ TEST(TransformationTests, ConvertBroadcast3WithBidirectionalModeToLogicalAnd) { f = std::make_shared(NodeVector{broadcast}, ParameterVector{input1}); pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } diff --git a/src/common/transformations/tests/op_conversions/convert_broadcast_to_tiles_test.cpp b/src/common/transformations/tests/op_conversions/convert_broadcast_to_tiles_test.cpp index 7b78f214c8a..c1d98d3d9b5 100644 --- a/src/common/transformations/tests/op_conversions/convert_broadcast_to_tiles_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_broadcast_to_tiles_test.cpp @@ -30,8 +30,8 @@ TEST(TransformationTests, ConvertBroadcastToTilesDynamic) { auto f = std::make_shared(ngraph::NodeVector{broadcast}, ngraph::ParameterVector{input1}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); ASSERT_NO_THROW(manager.run_passes(f)); ASSERT_NO_THROW(check_rt_info(f)); } diff --git a/src/common/transformations/tests/op_conversions/convert_deformable_conv_v8_to_v1_test.cpp b/src/common/transformations/tests/op_conversions/convert_deformable_conv_v8_to_v1_test.cpp index 833912a04a7..67a588a68e1 100644 --- a/src/common/transformations/tests/op_conversions/convert_deformable_conv_v8_to_v1_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_deformable_conv_v8_to_v1_test.cpp @@ -41,7 +41,7 @@ TEST_F(TransformationTestsF, ConvertDeformableConv8to1) { dilations); function = std::make_shared(NodeVector{deformable_conv}, ParameterVector{data, filter, offsets}); - manager.register_pass(); + manager.register_pass(); } { @@ -98,7 +98,7 @@ TEST_F(TransformationTestsF, ConvertDeformableConv8to1_mask) { std::make_shared(NodeVector{deformable_conv}, ParameterVector{data, filter, mask, offsets}); pass::Manager manager; - manager.register_pass(); + manager.register_pass(); } } @@ -131,6 +131,6 @@ TEST_F(TransformationTestsF, ConvertDeformableConv8to1_bilinear_interpolation_pa function = std::make_shared(NodeVector{deformable_conv}, ParameterVector{data, filter, offsets}); pass::Manager manager; - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/op_conversions/convert_gather_0d_test.cpp b/src/common/transformations/tests/op_conversions/convert_gather_0d_test.cpp index bd2b09bfb99..7510406b6db 100644 --- a/src/common/transformations/tests/op_conversions/convert_gather_0d_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_gather_0d_test.cpp @@ -29,7 +29,7 @@ TEST_F(TransformationTestsF, ConvertGather0DStatic1) { function = std::make_shared(NodeVector{gather}, ParameterVector{input, indices}); pass::Manager manager; - manager.register_pass(); + manager.register_pass(); } { @@ -50,7 +50,7 @@ TEST_F(TransformationTestsF, ConvertGather0DStatic2) { auto gather = std::make_shared(input, indices, axis_const); function = std::make_shared(NodeVector{gather}, ParameterVector{input, indices}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/convert_gather_downgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_gather_downgrade_test.cpp index b80977413b7..7e99d032b5e 100644 --- a/src/common/transformations/tests/op_conversions/convert_gather_downgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_gather_downgrade_test.cpp @@ -28,7 +28,7 @@ TEST_F(TransformationTestsF, ConvertGather7toGather1) { function = std::make_shared(ngraph::NodeVector{gather_v7}, ngraph::ParameterVector{data, indices}); - manager.register_pass(); + manager.register_pass(); } { @@ -53,7 +53,7 @@ TEST_F(TransformationTestsF, ConvertGather7toGather1_nonzero_batch_dims) { function = std::make_shared(ngraph::NodeVector{gather_v7}, ngraph::ParameterVector{data, indices}); - manager.register_pass(); + manager.register_pass(); } } @@ -69,7 +69,7 @@ TEST_F(TransformationTestsF, ConvertGather8toGather7) { function = std::make_shared(ngraph::NodeVector{gather_v8}, ngraph::ParameterVector{data, indices}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/convert_gather_upgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_gather_upgrade_test.cpp index 538e9219b60..ac3f1b7e51f 100644 --- a/src/common/transformations/tests/op_conversions/convert_gather_upgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_gather_upgrade_test.cpp @@ -29,7 +29,7 @@ TEST_F(TransformationTestsF, ConvertGather1toGather7) { function = std::make_shared(ngraph::NodeVector{gather_v1}, ngraph::ParameterVector{data, indices}); - manager.register_pass(); + manager.register_pass(); } { @@ -55,7 +55,7 @@ TEST_F(TransformationTestsF, ConvertGather7toGather8) { function = std::make_shared(ngraph::NodeVector{gather_v7}, ngraph::ParameterVector{data, indices}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/convert_interpolate1_to_interpolate4_test.cpp b/src/common/transformations/tests/op_conversions/convert_interpolate1_to_interpolate4_test.cpp index 4110729bfd2..54329d3840f 100644 --- a/src/common/transformations/tests/op_conversions/convert_interpolate1_to_interpolate4_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_interpolate1_to_interpolate4_test.cpp @@ -37,7 +37,7 @@ TEST_F(TransformationTestsF, ConvertInterpolate1ToInterpolate4) { function = std::make_shared(NodeVector{interpolate1}, ParameterVector{data_node}); - manager.register_pass(); + manager.register_pass(); } { @@ -85,7 +85,7 @@ TEST_F(TransformationTestsF, ConvertInterpolate1ToInterpolate4_1) { function = std::make_shared(NodeVector{interpolate1}, ParameterVector{data_node}); - manager.register_pass(); + manager.register_pass(); } { @@ -131,9 +131,9 @@ TEST(TransformationTests, DynamiShapeInterpolate1To4) { auto f = std::make_shared(NodeVector{interpolate1}, ParameterVector{data_node, out_shape_node}); auto manager = ov::pass::Manager(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); - ASSERT_TRUE(ngraph::op::util::has_op_with_type(f)); + ASSERT_TRUE(ov::op::util::has_op_with_type(f)); } diff --git a/src/common/transformations/tests/op_conversions/convert_matrix_nms_to_matrix_nms_ie_internal.cpp b/src/common/transformations/tests/op_conversions/convert_matrix_nms_to_matrix_nms_ie_internal.cpp index 2ea1921bfd7..4397c4eace7 100644 --- a/src/common/transformations/tests/op_conversions/convert_matrix_nms_to_matrix_nms_ie_internal.cpp +++ b/src/common/transformations/tests/op_conversions/convert_matrix_nms_to_matrix_nms_ie_internal.cpp @@ -42,14 +42,14 @@ public: function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } { auto boxes = std::make_shared(element_type, Shape{1, 1000, 4}); auto scores = std::make_shared(element_type, Shape{1, 1, 1000}); - auto nms = std::make_shared>( + auto nms = std::make_shared>( boxes, scores, opset8::MatrixNms::Attributes()); diff --git a/src/common/transformations/tests/op_conversions/convert_maxpool_downgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_maxpool_downgrade_test.cpp index f4074e8df58..70da7dbc457 100644 --- a/src/common/transformations/tests/op_conversions/convert_maxpool_downgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_maxpool_downgrade_test.cpp @@ -27,7 +27,7 @@ TEST_F(TransformationTestsF, ConvertMaxPool8ToMaxPool1) { auto result = std::make_shared(maxpool_8->output(0)); function = std::make_shared(ngraph::NodeVector{result}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/convert_maxpool_upgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_maxpool_upgrade_test.cpp index 02408d93e2d..3e6f8779ef5 100644 --- a/src/common/transformations/tests/op_conversions/convert_maxpool_upgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_maxpool_upgrade_test.cpp @@ -27,7 +27,7 @@ TEST_F(TransformationTestsF, ConvertMaxPool1ToMaxPool8) { function = std::make_shared(ngraph::OutputVector{maxpool_1->output(0)}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -52,7 +52,7 @@ TEST_F(TransformationTestsF, negative_ConvertMaxPool1ToMaxPool8_dynamic_rank) { function = std::make_shared(ngraph::OutputVector{maxpool_1->output(0)}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie_internal.cpp b/src/common/transformations/tests/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie_internal.cpp index 4681e92c9ec..48d0cbf8a89 100644 --- a/src/common/transformations/tests/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie_internal.cpp +++ b/src/common/transformations/tests/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie_internal.cpp @@ -31,15 +31,16 @@ TEST_F(TransformationTestsF, ConvertMulticlassNmsToMulticlassNmsIE) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } { auto boxes = std::make_shared(element::f32, Shape{1, 1000, 4}); auto scores = std::make_shared(element::f32, Shape{1, 1, 1000}); - auto nms = - std::make_shared(boxes, scores, opset9::MulticlassNms::Attributes()); + auto nms = std::make_shared(boxes, + scores, + opset9::MulticlassNms::Attributes()); function_ref = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); } diff --git a/src/common/transformations/tests/op_conversions/convert_multiclass_nms_upgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_multiclass_nms_upgrade_test.cpp index f56d3259cf6..892265675ce 100644 --- a/src/common/transformations/tests/op_conversions/convert_multiclass_nms_upgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_multiclass_nms_upgrade_test.cpp @@ -28,7 +28,7 @@ TEST_F(TransformationTestsF, ConvertMulticlassNms8ToMulticlassNms9) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -49,7 +49,7 @@ TEST_F(TransformationTestsF, ConvertMulticlassNms8ToMulticlassNms9_dynamic_rank) function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -73,7 +73,7 @@ TEST_F(TransformationTestsF, ConvertMulticlassNms8ToMulticlassNms9_dynamic_dims) function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/convert_mvn1_to_mvn6_test.cpp b/src/common/transformations/tests/op_conversions/convert_mvn1_to_mvn6_test.cpp index a42628322a7..912fd9c513a 100644 --- a/src/common/transformations/tests/op_conversions/convert_mvn1_to_mvn6_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_mvn1_to_mvn6_test.cpp @@ -25,7 +25,7 @@ TEST_F(TransformationTestsF, ConvertMVN1ToMVN6) { function = std::make_shared(ngraph::NodeVector{mvn}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -45,7 +45,7 @@ TEST_F(TransformationTestsF, ConvertMVN1ToMVN6_across_channels) { function = std::make_shared(ngraph::NodeVector{mvn}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -65,7 +65,7 @@ TEST_F(TransformationTestsF, ConvertMVN1ToMVN6_5D) { function = std::make_shared(ngraph::NodeVector{mvn}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -88,7 +88,7 @@ class ConvertMVN1ToMVN6_OutOfFloat32Eps : public testing::WithParamInterface(); + manager.register_pass(); const auto& params = GetParam(); { diff --git a/src/common/transformations/tests/op_conversions/convert_nms9_to_nms_ie_internal_test.cpp b/src/common/transformations/tests/op_conversions/convert_nms9_to_nms_ie_internal_test.cpp index 1bb2afb26aa..1104731f86d 100644 --- a/src/common/transformations/tests/op_conversions/convert_nms9_to_nms_ie_internal_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_nms9_to_nms_ie_internal_test.cpp @@ -39,8 +39,8 @@ TEST_F(TransformationTestsF, ConvertPreviousNMSToNMSIEInternal) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass(); // as inside test infrastructure we can not predict output names for given Function @@ -54,14 +54,14 @@ TEST_F(TransformationTestsF, ConvertPreviousNMSToNMSIEInternal) { auto max_output_boxes_per_class = opset1::Constant::create(element::i64, Shape{1}, {10}); auto iou_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.75}); auto score_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.7}); - auto nms = std::make_shared(boxes, - scores, - max_output_boxes_per_class, - iou_threshold, - score_threshold, - 0, - true, - element::i32); + auto nms = std::make_shared(boxes, + scores, + max_output_boxes_per_class, + iou_threshold, + score_threshold, + 0, + true, + element::i32); auto convert = std::make_shared(nms->output(0), element::i64); function_ref = std::make_shared(NodeVector{convert}, ParameterVector{boxes, scores}); @@ -88,7 +88,7 @@ TEST_F(TransformationTestsF, ConvertNMS9ToNMSIEInternal) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } @@ -99,15 +99,15 @@ TEST_F(TransformationTestsF, ConvertNMS9ToNMSIEInternal) { auto iou_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.75}); auto score_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.7}); auto soft_nms_sigma = opset1::Constant::create(element::f32, Shape{1}, {0.5}); - auto nms = std::make_shared(boxes, - scores, - max_output_boxes_per_class, - iou_threshold, - score_threshold, - soft_nms_sigma, - 0, - true, - element::i32); + auto nms = std::make_shared(boxes, + scores, + max_output_boxes_per_class, + iou_threshold, + score_threshold, + soft_nms_sigma, + 0, + true, + element::i32); function_ref = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); } diff --git a/src/common/transformations/tests/op_conversions/convert_nms_to_nms_ie_internal_test.cpp b/src/common/transformations/tests/op_conversions/convert_nms_to_nms_ie_internal_test.cpp index 1ca13f8bd26..098672f9be7 100644 --- a/src/common/transformations/tests/op_conversions/convert_nms_to_nms_ie_internal_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_nms_to_nms_ie_internal_test.cpp @@ -42,8 +42,8 @@ TEST_F(TransformationTestsF, ConvertNMS1ToNMSIEInternal) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass(); // as inside test infrastructure we can not predict output names for given Function @@ -57,14 +57,14 @@ TEST_F(TransformationTestsF, ConvertNMS1ToNMSIEInternal) { auto max_output_boxes_per_class = opset1::Constant::create(element::i64, Shape{1}, {10}); auto iou_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.75}); auto score_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.7}); - auto nms = std::make_shared(boxes, - scores, - max_output_boxes_per_class, - iou_threshold, - score_threshold, - 0, - true, - element::i32); + auto nms = std::make_shared(boxes, + scores, + max_output_boxes_per_class, + iou_threshold, + score_threshold, + 0, + true, + element::i32); auto convert = std::make_shared(nms->output(0), element::i64); function_ref = std::make_shared(NodeVector{convert}, ParameterVector{boxes, scores}); @@ -89,8 +89,8 @@ TEST_F(TransformationTestsF, ConvertNMS3ToNMSIEInternal) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass(); } @@ -100,14 +100,14 @@ TEST_F(TransformationTestsF, ConvertNMS3ToNMSIEInternal) { auto max_output_boxes_per_class = opset1::Constant::create(element::i32, Shape{1}, {10}); auto iou_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.75}); auto score_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.7}); - auto nms = std::make_shared(boxes, - scores, - max_output_boxes_per_class, - iou_threshold, - score_threshold, - 0, - true, - element::i32); + auto nms = std::make_shared(boxes, + scores, + max_output_boxes_per_class, + iou_threshold, + score_threshold, + 0, + true, + element::i32); function_ref = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); } @@ -131,8 +131,8 @@ TEST_F(TransformationTestsF, ConvertNMS4ToNMSIEInternal) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass(); } @@ -142,14 +142,14 @@ TEST_F(TransformationTestsF, ConvertNMS4ToNMSIEInternal) { auto max_output_boxes_per_class = opset1::Constant::create(element::i32, Shape{1}, {10}); auto iou_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.75}); auto score_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.7}); - auto nms = std::make_shared(boxes, - scores, - max_output_boxes_per_class, - iou_threshold, - score_threshold, - 0, - true, - element::i32); + auto nms = std::make_shared(boxes, + scores, + max_output_boxes_per_class, + iou_threshold, + score_threshold, + 0, + true, + element::i32); function_ref = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); } @@ -175,7 +175,7 @@ TEST_F(TransformationTestsF, ConvertNMS5ToNMSIEInternal) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); } @@ -186,15 +186,15 @@ TEST_F(TransformationTestsF, ConvertNMS5ToNMSIEInternal) { auto iou_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.75}); auto score_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.7}); auto soft_nms_sigma = opset1::Constant::create(element::f32, Shape{1}, {0.5}); - auto nms = std::make_shared(boxes, - scores, - max_output_boxes_per_class, - iou_threshold, - score_threshold, - soft_nms_sigma, - 0, - true, - element::i32); + auto nms = std::make_shared(boxes, + scores, + max_output_boxes_per_class, + iou_threshold, + score_threshold, + soft_nms_sigma, + 0, + true, + element::i32); function_ref = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); } diff --git a/src/common/transformations/tests/op_conversions/convert_pad_to_group_conv.cpp b/src/common/transformations/tests/op_conversions/convert_pad_to_group_conv.cpp index e76c524118d..ad85dc5494a 100644 --- a/src/common/transformations/tests/op_conversions/convert_pad_to_group_conv.cpp +++ b/src/common/transformations/tests/op_conversions/convert_pad_to_group_conv.cpp @@ -29,7 +29,7 @@ TEST_F(TransformationTestsF, ConvertPadToConv) { auto pad = std::make_shared(input, pad_begin, pad_end, pad_value, pad_mode); function = std::make_shared(NodeVector{pad}, ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -56,7 +56,7 @@ TEST_F(TransformationTestsF, ConvertPadToConvNeg1) { function = get_function(); function_ref = get_function(); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, ConvertPadToConvNeg2) { @@ -72,7 +72,7 @@ TEST_F(TransformationTestsF, ConvertPadToConvNeg2) { function = get_function(); function_ref = get_function(); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, ConvertPadToConvNeg3) { @@ -88,7 +88,7 @@ TEST_F(TransformationTestsF, ConvertPadToConvNeg3) { function = get_function(); function_ref = get_function(); - manager.register_pass(); + manager.register_pass(); } TEST_F(TransformationTestsF, ConvertPadToConvNeg4) { @@ -104,5 +104,5 @@ TEST_F(TransformationTestsF, ConvertPadToConvNeg4) { function = get_function(); function_ref = get_function(); - manager.register_pass(); + manager.register_pass(); } diff --git a/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_5.cpp b/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_5.cpp index 3aab60ece8d..9fcccf4af5d 100644 --- a/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_5.cpp +++ b/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_5.cpp @@ -39,7 +39,7 @@ TEST_F(TransformationTestsF, ConvertNMS4FiveInputsToNMS5) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -71,7 +71,7 @@ TEST_F(TransformationTestsF, ConvertNMS4TwoInputsToNMS5) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -109,7 +109,7 @@ TEST_F(TransformationTestsF, ConvertNMS3FiveInputsToNMS5) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -141,7 +141,7 @@ TEST_F(TransformationTestsF, ConvertNMS3TwoInputsToNMS5) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -179,7 +179,7 @@ TEST_F(TransformationTestsF, ConvertNMS1FiveInputsToNMS5) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -211,7 +211,7 @@ TEST_F(TransformationTestsF, ConvertNMS1TwoInputsToNMS5) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_9.cpp b/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_9.cpp index e08d21cb463..2c06207d936 100644 --- a/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_9.cpp +++ b/src/common/transformations/tests/op_conversions/convert_previous_nms_to_nms_9.cpp @@ -42,7 +42,7 @@ TEST_F(TransformationTestsF, ConvertNMS5SixInputsToNMS9) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -76,7 +76,7 @@ TEST_F(TransformationTestsF, ConvertNMS5TwoInputsToNMS9) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -116,7 +116,7 @@ TEST_F(TransformationTestsF, ConvertNMS4FiveInputsToNMS9) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -150,7 +150,7 @@ TEST_F(TransformationTestsF, ConvertNMS4TwoInputsToNMS9) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -190,7 +190,7 @@ TEST_F(TransformationTestsF, ConvertNMS3FiveInputsToNMS9) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -224,7 +224,7 @@ TEST_F(TransformationTestsF, ConvertNMS3TwoInputsToNMS9) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -264,7 +264,7 @@ TEST_F(TransformationTestsF, ConvertNMS1FiveInputsToNMS9) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { @@ -298,7 +298,7 @@ TEST_F(TransformationTestsF, ConvertNMS1TwoInputsToNMS9) { function = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/convert_prior_box_v8_to_v0_test.cpp b/src/common/transformations/tests/op_conversions/convert_prior_box_v8_to_v0_test.cpp index 530a9e3bc01..a3caaeb1660 100644 --- a/src/common/transformations/tests/op_conversions/convert_prior_box_v8_to_v0_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_prior_box_v8_to_v0_test.cpp @@ -34,7 +34,7 @@ TEST_F(TransformationTestsF, ConvertPriorBox8To0) { auto prior_box = std::make_shared(input, image, attrs); function = std::make_shared(NodeVector{prior_box}, ParameterVector{input, image}); - manager.register_pass(); + manager.register_pass(); } { @@ -72,6 +72,6 @@ TEST_F(TransformationTestsF, ConvertPriorBox8To0_min_max_aspect_ratios_order) { auto prior_box = std::make_shared(input, image, attrs); function = std::make_shared(NodeVector{prior_box}, ParameterVector{input, image}); - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/op_conversions/convert_reduce_to_pooling_test.cpp b/src/common/transformations/tests/op_conversions/convert_reduce_to_pooling_test.cpp index 80caf7c4122..6f3b1c447ca 100644 --- a/src/common/transformations/tests/op_conversions/convert_reduce_to_pooling_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_reduce_to_pooling_test.cpp @@ -138,8 +138,8 @@ TEST_P(ConvertReduceToPoolingTests, CompareFunctions) { auto unh = std::make_shared(); ngraph::pass::Manager m; m.register_pass(unh); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.register_pass(unh); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -212,7 +212,7 @@ INSTANTIATE_TEST_SUITE_P(ReduceToReshapePoolReshape, TEST(ConvertReduceToPooling, Negative) { auto f = ConvertReduceToPoolingTests::get_initial_function(ngraph::PartialShape::dynamic(), {3}, MAX, true); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); ASSERT_NO_THROW(manager.run_passes(f)); } diff --git a/src/common/transformations/tests/op_conversions/convert_roi_align_v3_to_v9_test.cpp b/src/common/transformations/tests/op_conversions/convert_roi_align_v3_to_v9_test.cpp index 2536287c307..a66a8227806 100644 --- a/src/common/transformations/tests/op_conversions/convert_roi_align_v3_to_v9_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_roi_align_v3_to_v9_test.cpp @@ -44,7 +44,7 @@ TEST_F(TransformationTestsF, ConvertROIAlign3To9) { "avg"); function = std::make_shared(NodeVector{roi_align}, ParameterVector{data, rois, batch_indices}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/convert_roi_align_v9_to_v3_test.cpp b/src/common/transformations/tests/op_conversions/convert_roi_align_v9_to_v3_test.cpp index 5242a014036..4a73dbd8cd5 100644 --- a/src/common/transformations/tests/op_conversions/convert_roi_align_v9_to_v3_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_roi_align_v9_to_v3_test.cpp @@ -45,7 +45,7 @@ TEST_F(TransformationTestsF, ConvertROIAlign9To3) { pooling_mode); function = std::make_shared(NodeVector{roi_align}, ParameterVector{data, rois, batch_indices}); - manager.register_pass(); + manager.register_pass(); } { @@ -105,6 +105,6 @@ TEST_F(TransformationTestsF, ConvertROIAlign9To3_aligned_mode) { aligned_mode); function = std::make_shared(NodeVector{roi_align}, ParameterVector{data, rois, batch_indices}); - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/op_conversions/convert_scatter_elements_to_scatter_test.cpp b/src/common/transformations/tests/op_conversions/convert_scatter_elements_to_scatter_test.cpp index 722c8fc496c..038dbb62b09 100644 --- a/src/common/transformations/tests/op_conversions/convert_scatter_elements_to_scatter_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_scatter_elements_to_scatter_test.cpp @@ -84,8 +84,8 @@ void test(std::shared_ptr f, std::shared_ptr auto unh = std::make_shared(); ngraph::pass::Manager manager; manager.register_pass(unh); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass(unh); manager.register_pass([](std::shared_ptr f) { check_rt_info(f); diff --git a/src/common/transformations/tests/op_conversions/convert_sequences_to_ti_test.cpp b/src/common/transformations/tests/op_conversions/convert_sequences_to_ti_test.cpp index f7d771237ad..8385a48a188 100644 --- a/src/common/transformations/tests/op_conversions/convert_sequences_to_ti_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_sequences_to_ti_test.cpp @@ -53,8 +53,8 @@ TEST(TransformationTests, ConvertLSTMSequenceToTensorIterator) { f = std::make_shared(ngraph::NodeVector{Y_out, Ho, Co}, ngraph::ParameterVector{X, Y, Z}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -161,8 +161,8 @@ TEST(TransformationTests, ConvertLSTMSequenceToTensorIteratorDynamic) { f = std::make_shared(ngraph::NodeVector{Y_out, Ho, Co}, ngraph::ParameterVector{X, Y, Z}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -266,8 +266,8 @@ TEST(TransformationTests, ConvertRNNSequenceToTensorIterator) { f = std::make_shared(ngraph::NodeVector{Y_out, Ho}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -356,8 +356,8 @@ TEST(TransformationTests, ConvertRNNSequenceToTensorIteratorDynamic) { f = std::make_shared(ngraph::NodeVector{Y_out, Ho}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -445,8 +445,8 @@ TEST(TransformationTests, ConvertGRUSequenceToTensorIterator) { f = std::make_shared(ngraph::NodeVector{Y_out, Ho}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -535,8 +535,8 @@ TEST(TransformationTests, ConvertGRUSequenceToTensorIteratorDynamic) { f = std::make_shared(ngraph::NodeVector{Y_out, Ho}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } diff --git a/src/common/transformations/tests/op_conversions/convert_shapeof3.cpp b/src/common/transformations/tests/op_conversions/convert_shapeof3.cpp index ee780135395..a3f1df4d2cc 100644 --- a/src/common/transformations/tests/op_conversions/convert_shapeof3.cpp +++ b/src/common/transformations/tests/op_conversions/convert_shapeof3.cpp @@ -25,7 +25,7 @@ TEST_F(TransformationTestsF, ConvertShapeOf3WithI64) { function = std::make_shared(ngraph::NodeVector{shapeof}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -43,7 +43,7 @@ TEST_F(TransformationTestsF, ConvertShapeOf3WithI32) { function = std::make_shared(ngraph::NodeVector{shapeof}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/convert_shuffle_channels3_test.cpp b/src/common/transformations/tests/op_conversions/convert_shuffle_channels3_test.cpp index b2a259bbfee..5791c1493bc 100644 --- a/src/common/transformations/tests/op_conversions/convert_shuffle_channels3_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_shuffle_channels3_test.cpp @@ -28,7 +28,7 @@ TEST_F(TransformationTestsF, ConvertShuffleChannelsAxis0) { int64_t group = 4; auto ps = ::PartialShape{12, Dimension::dynamic(), Dimension::dynamic(), Dimension::dynamic()}; function = buildInputGraph(0, group, ps); - manager.register_pass(); + manager.register_pass(); auto input = std::make_shared<::opset3::Parameter>(::element::f32, ps); @@ -58,7 +58,7 @@ TEST_F(TransformationTestsF, ConvertShuffleChannelsAxis1) { int64_t group = 4; auto ps = ::PartialShape{Dimension::dynamic(), 12, Dimension::dynamic(), Dimension::dynamic()}; function = buildInputGraph(1, group, ps); - manager.register_pass(); + manager.register_pass(); auto input = std::make_shared<::opset3::Parameter>(::element::f32, ps); @@ -89,7 +89,7 @@ TEST_F(TransformationTestsF, ConvertShuffleChannelsAxis2) { int64_t group = 4; auto ps = ::PartialShape{Dimension::dynamic(), Dimension::dynamic(), 12, Dimension::dynamic()}; function = buildInputGraph(2, group, ps); - manager.register_pass(); + manager.register_pass(); auto input = std::make_shared<::opset3::Parameter>(::element::f32, ps); @@ -120,7 +120,7 @@ TEST_F(TransformationTestsF, ConvertShuffleChannelsLastAxis) { int64_t group = 4; auto ps = ::PartialShape{Dimension::dynamic(), Dimension::dynamic(), Dimension::dynamic(), 12}; function = buildInputGraph(-1, group, ps); - manager.register_pass(); + manager.register_pass(); auto input = std::make_shared<::opset3::Parameter>(::element::f32, ps); diff --git a/src/common/transformations/tests/op_conversions/convert_softmax_downgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_softmax_downgrade_test.cpp index 9e1c9f5f192..f292212c06e 100644 --- a/src/common/transformations/tests/op_conversions/convert_softmax_downgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_softmax_downgrade_test.cpp @@ -24,7 +24,7 @@ TEST_F(TransformationTestsF, ConvertSoftMax8ToSoftMax1) { auto softmax_8 = std::make_shared(data, axis); function = std::make_shared(ngraph::NodeVector{softmax_8}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -43,7 +43,7 @@ TEST_F(TransformationTestsF, ConvertSoftMax8ToSoftMax1_negative_axis) { auto softmax_8 = std::make_shared(data, axis); function = std::make_shared(ngraph::NodeVector{softmax_8}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -62,7 +62,7 @@ TEST_F(TransformationTestsF, ConvertSoftMax8ToSoftMax1_input_rank_5) { auto softmax_8 = std::make_shared(data, axis); function = std::make_shared(ngraph::NodeVector{softmax_8}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -81,7 +81,7 @@ TEST_F(TransformationTestsF, negative_ConvertSoftMax8ToSoftMax1_dynamic_rank) { auto softmax_8 = std::make_shared(data, axis); function = std::make_shared(ngraph::NodeVector{softmax_8}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/convert_softmax_upgrade_test.cpp b/src/common/transformations/tests/op_conversions/convert_softmax_upgrade_test.cpp index 2381dae7327..8d090d89794 100644 --- a/src/common/transformations/tests/op_conversions/convert_softmax_upgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_softmax_upgrade_test.cpp @@ -24,7 +24,7 @@ TEST_F(TransformationTestsF, ConvertSoftMax1ToSoftMax8) { auto softmax_1 = std::make_shared(data, axis); function = std::make_shared(ngraph::NodeVector{softmax_1}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -43,7 +43,7 @@ TEST_F(TransformationTestsF, ConvertSoftMax1ToSoftMax8_dynamic_rank) { auto softmax_1 = std::make_shared(data, axis); function = std::make_shared(ngraph::NodeVector{softmax_1}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/convert_ti_to_sequences_test.cpp b/src/common/transformations/tests/op_conversions/convert_ti_to_sequences_test.cpp index 9a6dd077cb1..4a85594faf4 100644 --- a/src/common/transformations/tests/op_conversions/convert_ti_to_sequences_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_ti_to_sequences_test.cpp @@ -91,8 +91,8 @@ TEST(TransformationTests, ConvertTensorIteratorToLSTMSequence) { ngraph::ParameterVector{X, Y, Z}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -187,8 +187,8 @@ TEST(TransformationTests, ConvertTensorIteratorToLSTMSequenceDynamicReshapeCase) f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y, Z}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -277,8 +277,8 @@ TEST(TransformationTests, ConvertTensorIteratorToLSTMSequenceDynamicSqueezeCase) f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y, Z}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -363,8 +363,8 @@ TEST(TransformationTests, ConvertTensorIteratorToRNNSequence) { f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -443,8 +443,8 @@ TEST(TransformationTests, ConvertTensorIteratorToRNNSequenceDynamicReshapeCase) f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -524,8 +524,8 @@ TEST(TransformationTests, ConvertTensorIteratorToRNNSequenceDynamicSqueezeCase) f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -604,8 +604,8 @@ TEST(TransformationTests, ConvertTensorIteratorToGRUSequence) { f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -684,8 +684,8 @@ TEST(TransformationTests, ConvertTensorIteratorToGRUSequenceDynamicReshapeCase) f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -765,8 +765,8 @@ TEST(TransformationTests, ConvertTensorIteratorToGRUSequenceDynamicSqueezeCase) f = std::make_shared(ngraph::NodeVector{res_ti_1}, ngraph::ParameterVector{X, Y}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } diff --git a/src/common/transformations/tests/op_conversions/convert_topk3_test.cpp b/src/common/transformations/tests/op_conversions/convert_topk3_test.cpp index 794e4cb8bb4..733fb0f67e2 100644 --- a/src/common/transformations/tests/op_conversions/convert_topk3_test.cpp +++ b/src/common/transformations/tests/op_conversions/convert_topk3_test.cpp @@ -31,7 +31,7 @@ TEST_F(TransformationTestsF, ConvertTopK3I32Output0) { // due to the 'compare_functions' limitation we will check only one output function = std::make_shared(ngraph::OutputVector{topk->output(0)}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -56,7 +56,7 @@ TEST_F(TransformationTestsF, ConvertTopK3I32Output1) { // due to the 'compare_functions' limitation we will check only one output function = std::make_shared(ngraph::OutputVector{topk->output(1)}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -80,7 +80,7 @@ TEST_F(TransformationTestsF, ConvertTopK3I64Output0) { // due to the 'compare_functions' limitation we will check only one output function = std::make_shared(ngraph::OutputVector{topk->output(0)}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -105,7 +105,7 @@ TEST_F(TransformationTestsF, ConvertTopK3I64Output1) { // due to the 'compare_functions' limitation we will check only one output function = std::make_shared(ngraph::OutputVector{topk->output(1)}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/detection_output_downgrade_test.cpp b/src/common/transformations/tests/op_conversions/detection_output_downgrade_test.cpp index b828df54030..2da63d70e95 100644 --- a/src/common/transformations/tests/op_conversions/detection_output_downgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/detection_output_downgrade_test.cpp @@ -93,7 +93,7 @@ TEST(TransformationTests, DetectionOutput8ToDetectionOutput1) { ngraph::ParameterVector{box_logits, class_preds, proposals}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); } @@ -165,7 +165,7 @@ TEST(TransformationTests, DetectionOutput8ToDetectionOutput1FiveArguments) { ngraph::ParameterVector{box_logits, class_preds, proposals, ad_class_preds, ad_box_preds}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); } diff --git a/src/common/transformations/tests/op_conversions/detection_output_upgrade_test.cpp b/src/common/transformations/tests/op_conversions/detection_output_upgrade_test.cpp index a2d269c0158..faddc37b038 100644 --- a/src/common/transformations/tests/op_conversions/detection_output_upgrade_test.cpp +++ b/src/common/transformations/tests/op_conversions/detection_output_upgrade_test.cpp @@ -91,7 +91,7 @@ TEST(TransformationTests, DetectionOutput1ToDetectionOutput8) { ngraph::ParameterVector{box_logits, class_preds, proposals}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); } @@ -162,7 +162,7 @@ TEST(TransformationTests, DetectionOutput1ToDetectionOutput8FiveArguments) { ngraph::ParameterVector{box_logits, class_preds, proposals, ad_class_preds, ad_box_preds}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(f); } diff --git a/src/common/transformations/tests/op_conversions/fq_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/fq_decomposition_test.cpp index 41cb9589654..7580f827e95 100644 --- a/src/common/transformations/tests/op_conversions/fq_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/fq_decomposition_test.cpp @@ -84,8 +84,8 @@ protected: f = std::make_shared(ngraph::NodeVector{fq}, ngraph::ParameterVector{data}); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/op_conversions/gather_normalize_negative_indices_test.cpp b/src/common/transformations/tests/op_conversions/gather_normalize_negative_indices_test.cpp index 61a75eec2ad..dc4b42efa97 100644 --- a/src/common/transformations/tests/op_conversions/gather_normalize_negative_indices_test.cpp +++ b/src/common/transformations/tests/op_conversions/gather_normalize_negative_indices_test.cpp @@ -27,7 +27,7 @@ TEST_F(TransformationTestsF, GatherNegativeIndicesNormalize) { function = std::make_shared(ngraph::NodeVector{gather}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -62,7 +62,7 @@ TEST_F(TransformationTestsF, GatherNegativeIndicesNormalize_neg_axis) { function = std::make_shared(ngraph::NodeVector{gather}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -97,7 +97,7 @@ TEST_F(TransformationTestsF, GatherNegativeIndicesNormalize_dif_input_types) { function = std::make_shared(ngraph::NodeVector{gather}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -133,7 +133,7 @@ TEST_F(TransformationTestsF, GatherNegativeIndicesNormalize_static_axis_dim) { function = std::make_shared(ngraph::NodeVector{gather}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -160,7 +160,7 @@ TEST_F(TransformationTestsF, GatherNegativeIndicesNormalize_static_axis_dim_neg_ function = std::make_shared(ngraph::NodeVector{gather}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -188,7 +188,7 @@ TEST_F(TransformationTestsF, GatherNegativeIndicesNormalize_non_static_axis_dim) function = std::make_shared(ngraph::NodeVector{gather}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -215,7 +215,7 @@ TEST_F(TransformationTestsF, GatherNegativeIndicesNormalize_positive_ind) { function = std::make_shared(ngraph::NodeVector{gather}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -240,7 +240,7 @@ TEST_F(TransformationTestsF, GatherNegativeIndicesNormalize_non_static_rank) { function = std::make_shared(ngraph::NodeVector{gather}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/gelu7_downgrade.cpp b/src/common/transformations/tests/op_conversions/gelu7_downgrade.cpp index cccefe6941e..8a14a99c2f9 100644 --- a/src/common/transformations/tests/op_conversions/gelu7_downgrade.cpp +++ b/src/common/transformations/tests/op_conversions/gelu7_downgrade.cpp @@ -22,7 +22,7 @@ TEST_F(TransformationTestsF, Gelu7Downgrade) { function = std::make_shared(ngraph::NodeVector{gelu}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/hsigmoid_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/hsigmoid_decomposition_test.cpp index 3be12a5ef0f..d0eac837943 100644 --- a/src/common/transformations/tests/op_conversions/hsigmoid_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/hsigmoid_decomposition_test.cpp @@ -25,7 +25,7 @@ TEST_F(TransformationTestsF, HSigmoidDecompositionTest) { function = std::make_shared(ngraph::NodeVector{hsigmoid}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/hswish_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/hswish_decomposition_test.cpp index 7f1de2c5789..41feac5614b 100644 --- a/src/common/transformations/tests/op_conversions/hswish_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/hswish_decomposition_test.cpp @@ -25,7 +25,7 @@ TEST_F(TransformationTestsF, HSwishDecompositionTest) { function = std::make_shared(ngraph::NodeVector{hswish}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/log_softmax_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/log_softmax_decomposition_test.cpp index 5e715c81bbb..091502eb920 100644 --- a/src/common/transformations/tests/op_conversions/log_softmax_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/log_softmax_decomposition_test.cpp @@ -24,7 +24,7 @@ TEST_F(TransformationTestsF, LogSoftmaxDecomposition) { function = std::make_shared(ngraph::NodeVector{log_softmax}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/mvn6_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/mvn6_decomposition_test.cpp index 7af323f4c61..84139a1c7a1 100644 --- a/src/common/transformations/tests/op_conversions/mvn6_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/mvn6_decomposition_test.cpp @@ -26,7 +26,7 @@ TEST_F(TransformationTestsF, MVN6Decomposition_No_Variance) { function = std::make_shared(ngraph::NodeVector{mvn}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -49,7 +49,7 @@ TEST_F(TransformationTestsF, MVN6Decomposition_Inside_Sqrt) { function = std::make_shared(ngraph::NodeVector{mvn}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -81,7 +81,7 @@ TEST_F(TransformationTestsF, MVN6Decomposition_Outside_Sqrt) { function = std::make_shared(ngraph::NodeVector{mvn}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/ngraph_depth_to_space_transform_test.cpp b/src/common/transformations/tests/op_conversions/ngraph_depth_to_space_transform_test.cpp index 7bca3fa32be..2c13cceedd1 100644 --- a/src/common/transformations/tests/op_conversions/ngraph_depth_to_space_transform_test.cpp +++ b/src/common/transformations/tests/op_conversions/ngraph_depth_to_space_transform_test.cpp @@ -33,8 +33,8 @@ TEST(TransformationTests, TestDepthToSpaceTransformBlockFirst) { 2); f = std::make_shared(ngraph::NodeVector{depth_to_space}, ngraph::ParameterVector{input}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -79,8 +79,8 @@ TEST(TransformationTests, TestDepthToSpaceTransformDepthFirst) { 2); f = std::make_shared(ngraph::NodeVector{depth_to_space}, ngraph::ParameterVector{input}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -125,8 +125,8 @@ TEST(TransformationTests, TestSpaceToDepthTransformBlockFirst) { 2); f = std::make_shared(ngraph::NodeVector{space_to_depth}, ngraph::ParameterVector{input}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -171,8 +171,8 @@ TEST(TransformationTests, TestSpaceToDepthTransformDepthFirst) { 2); f = std::make_shared(ngraph::NodeVector{space_to_depth}, ngraph::ParameterVector{input}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -217,7 +217,7 @@ TEST(TransformationTests, TestSpaceToDepthDynamic) { 2); f = std::make_shared(ngraph::NodeVector{space_to_depth}, ngraph::ParameterVector{input}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); ASSERT_NO_THROW(m.run_passes(f)); } } @@ -233,7 +233,7 @@ TEST(TransformationTests, TestDepthToSpaceDynamic) { 2); f = std::make_shared(ngraph::NodeVector{depth_to_space}, ngraph::ParameterVector{input}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); ASSERT_NO_THROW(m.run_passes(f)); } } diff --git a/src/common/transformations/tests/op_conversions/ngraph_mode_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/ngraph_mode_decomposition_test.cpp index 5d7f3ec31ac..e2338eec5c5 100644 --- a/src/common/transformations/tests/op_conversions/ngraph_mode_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/ngraph_mode_decomposition_test.cpp @@ -34,8 +34,8 @@ TEST(TransformationTests, ModDecompositionTests) { auto unh = std::make_shared(); ngraph::pass::Manager m; m.register_pass(unh); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.register_pass(unh); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); diff --git a/src/common/transformations/tests/op_conversions/normalize_l2_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/normalize_l2_decomposition_test.cpp index 9766bdd83f4..377faaa25db 100644 --- a/src/common/transformations/tests/op_conversions/normalize_l2_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/normalize_l2_decomposition_test.cpp @@ -28,7 +28,7 @@ TEST_F(TransformationTestsF, NormalizeL2DecomositionFusionWithMax) { function = std::make_shared(ngraph::NodeVector{normalize_l2}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { @@ -58,7 +58,7 @@ TEST_F(TransformationTestsF, NormalizeL2DecomositionFusionWithAdd) { function = std::make_shared(ngraph::NodeVector{normalize_l2}, ngraph::ParameterVector{input}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/reduce_l1_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/reduce_l1_decomposition_test.cpp index 0d484c836aa..6c07c026e0c 100644 --- a/src/common/transformations/tests/op_conversions/reduce_l1_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/reduce_l1_decomposition_test.cpp @@ -26,7 +26,7 @@ TEST_F(TransformationTestsF, ReduceL1DecompositionTest) { function = std::make_shared(ngraph::NodeVector{reduce_l1}, ngraph::ParameterVector{data, axes}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/reduce_l2_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/reduce_l2_decomposition_test.cpp index 6f188d486b4..8a1137e852a 100644 --- a/src/common/transformations/tests/op_conversions/reduce_l2_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/reduce_l2_decomposition_test.cpp @@ -25,7 +25,7 @@ TEST_F(TransformationTestsF, ReduceL2DecompositionTest) { function = std::make_shared(ngraph::NodeVector{reduce_l2}, ngraph::ParameterVector{data, axes}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/simplify_ctc_greedy_decoder_seq_len_test.cpp b/src/common/transformations/tests/op_conversions/simplify_ctc_greedy_decoder_seq_len_test.cpp index 86e992f078e..3609fad67cd 100644 --- a/src/common/transformations/tests/op_conversions/simplify_ctc_greedy_decoder_seq_len_test.cpp +++ b/src/common/transformations/tests/op_conversions/simplify_ctc_greedy_decoder_seq_len_test.cpp @@ -29,7 +29,7 @@ TEST_F(TransformationTestsF, SimplifyCTCGreedyDecoderSeqLenTest) { function = std::make_shared(ngraph::NodeVector{res_1, res_2}, ngraph::ParameterVector{data, seq_len}); - manager.register_pass(); + manager.register_pass(); } { @@ -116,7 +116,7 @@ TEST_F(TransformationTestsF, SimplifyCTCGreedyDecoderSeqLenDynamicInputShapeTest function = std::make_shared(ngraph::NodeVector{res_1, res_2}, ngraph::ParameterVector{data, seq_len}); - manager.register_pass(); + manager.register_pass(); } { @@ -204,7 +204,7 @@ TEST_F(TransformationTestsF, SimplifyCTCGreedyDecoderSeqLenDynamicBatchTest) { function = std::make_shared(ngraph::NodeVector{res_1, res_2}, ngraph::ParameterVector{data, seq_len}); - manager.register_pass(); + manager.register_pass(); } { @@ -296,7 +296,7 @@ TEST_F(TransformationTestsF, SimplifyCTCGreedyDecoderSeqLenDynamicSeqLenTest) { function = std::make_shared(ngraph::NodeVector{res_1, res_2}, ngraph::ParameterVector{data, seq_len}); - manager.register_pass(); + manager.register_pass(); } { @@ -389,7 +389,7 @@ TEST_F(TransformationTestsF, SimplifyCTCGreedyDecoderSeqLenWrongBlankIndexTest) function = std::make_shared(ngraph::NodeVector{res_1, res_2}, ngraph::ParameterVector{data, seq_len}); - manager.register_pass(); + manager.register_pass(); } { @@ -431,7 +431,7 @@ TEST_F(TransformationTestsF, SimplifyCTCGreedyDecoderSeqLenDynamicSeqLenWithBlan function = std::make_shared(ngraph::NodeVector{res_1, res_2}, ngraph::ParameterVector{data, seq_len}); - manager.register_pass(); + manager.register_pass(); } { @@ -524,7 +524,7 @@ TEST_F(TransformationTestsF, SimplifyCTCGreedyDecoderSeqLenDynamicSeqLenParamWit function = std::make_shared(ngraph::NodeVector{res_1, res_2}, ngraph::ParameterVector{data, seq_len, blank_index}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/softplus_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/softplus_decomposition_test.cpp index 324dc639d8e..755d8084fe3 100644 --- a/src/common/transformations/tests/op_conversions/softplus_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/softplus_decomposition_test.cpp @@ -24,7 +24,7 @@ TEST_F(TransformationTestsF, SoftPlusDecompositionFP32) { function = std::make_shared(ngraph::NodeVector{softplus}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -46,7 +46,7 @@ TEST_F(TransformationTestsF, SoftPlusDecompositionFP16) { function = std::make_shared(ngraph::NodeVector{softplus}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/op_conversions/softsign_decomposition_test.cpp b/src/common/transformations/tests/op_conversions/softsign_decomposition_test.cpp index c917d8f8778..e62d4cc0be4 100644 --- a/src/common/transformations/tests/op_conversions/softsign_decomposition_test.cpp +++ b/src/common/transformations/tests/op_conversions/softsign_decomposition_test.cpp @@ -22,7 +22,7 @@ TEST_F(TransformationTestsF, SoftSignDecomposition) { function = std::make_shared(ngraph::NodeVector{softsign}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -44,7 +44,7 @@ TEST_F(TransformationTestsF, SoftSignDecompositionFP16) { function = std::make_shared(ngraph::NodeVector{softsign}, ngraph::ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { diff --git a/src/common/transformations/tests/prelu_fusion.cpp b/src/common/transformations/tests/prelu_fusion.cpp index 9f2e6147d9b..bc1227052be 100644 --- a/src/common/transformations/tests/prelu_fusion.cpp +++ b/src/common/transformations/tests/prelu_fusion.cpp @@ -31,7 +31,7 @@ TEST_F(TransformationTestsF, PReluFusionNegativeAdd) { function = std::make_shared(NodeVector{add}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -54,7 +54,7 @@ TEST_F(TransformationTestsF, PReluFusionNegativeSub) { function = std::make_shared(NodeVector{sub}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -78,7 +78,7 @@ TEST_F(TransformationTestsF, PReluFusionMultiplyAdd) { function = std::make_shared(NodeVector{add}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -102,7 +102,7 @@ TEST_F(TransformationTestsF, PReluFusionMultiplySub) { function = std::make_shared(NodeVector{sub}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } { @@ -126,8 +126,8 @@ TEST_F(TransformationTestsF, PReluFusionFail) { function = std::make_shared(NodeVector{sub}, ParameterVector{data}); - manager.register_pass(); + manager.register_pass(); } function_ref = ngraph::clone_function(*function); -} \ No newline at end of file +} diff --git a/src/common/transformations/tests/smart_reshape/broadcast_const_range_replacement.cpp b/src/common/transformations/tests/smart_reshape/broadcast_const_range_replacement.cpp index c3686236c1a..973bc0be50d 100644 --- a/src/common/transformations/tests/smart_reshape/broadcast_const_range_replacement.cpp +++ b/src/common/transformations/tests/smart_reshape/broadcast_const_range_replacement.cpp @@ -32,7 +32,7 @@ TEST_F(TransformationTestsF, BroadcastConstRangeReplacement_dim_match) { function = std::make_shared(OutputVector{broadcast_node}, ParameterVector{}); - manager.register_pass(); + manager.register_pass(); } { constexpr auto elem_count = 236; @@ -88,7 +88,7 @@ TEST_F(TransformationTestsF, BroadcastConstRangeReplacement_dim_one) { function = std::make_shared(OutputVector{broadcast_node}, ParameterVector{}); - manager.register_pass(); + manager.register_pass(); } { constexpr auto elem_count = 236; @@ -147,7 +147,7 @@ TEST_F(TransformationTestsF, BroadcastConstRangeReplacement_target_shapeof) { function = std::make_shared(OutputVector{broadcast_node}, ParameterVector{data_param}); - manager.register_pass(); + manager.register_pass(); } { constexpr auto elem_count = 236; @@ -208,7 +208,7 @@ TEST_F(TransformationTestsF, BroadcastConstRangeReplacement_target_shapeof_mixed function = std::make_shared(OutputVector{broadcast_node}, ParameterVector{data_param}); - manager.register_pass(); + manager.register_pass(); } { constexpr auto elem_count = 236; @@ -267,7 +267,7 @@ TEST_F(TransformationTestsF, BroadcastConstRangeReplacementNeg_other_mode) { function = std::make_shared(OutputVector{broadcast_node}, ParameterVector{}); - manager.register_pass(); + manager.register_pass(); } } @@ -287,7 +287,7 @@ TEST_F(TransformationTestsF, BroadcastConstRangeReplacementNeg_reversed_sequence function = std::make_shared(OutputVector{broadcast_node}, ParameterVector{}); - manager.register_pass(); + manager.register_pass(); } } @@ -307,7 +307,7 @@ TEST_F(TransformationTestsF, BroadcastConstRangeReplacementNeg_too_small) { function = std::make_shared(OutputVector{broadcast_node}, ParameterVector{}); - manager.register_pass(); + manager.register_pass(); } } @@ -327,7 +327,7 @@ TEST_F(TransformationTestsF, BroadcastConstRangeReplacementNeg_too_big) { function = std::make_shared(OutputVector{broadcast_node}, ParameterVector{}); - manager.register_pass(); + manager.register_pass(); } } diff --git a/src/common/transformations/tests/type_relaxed_tests.cpp b/src/common/transformations/tests/type_relaxed_tests.cpp index c8f55cf6573..af8491eec3f 100644 --- a/src/common/transformations/tests/type_relaxed_tests.cpp +++ b/src/common/transformations/tests/type_relaxed_tests.cpp @@ -24,7 +24,7 @@ TEST_F(TypeRelaxedTests, noOverrideCopyCtor) { element::Type type(element::Type_t::f32); auto param = make_shared(type, shape); auto op = ngraph::opset1::Relu(param); - auto relaxed_op = make_shared>(op); + auto relaxed_op = make_shared>(op); auto result = make_shared(relaxed_op); ngraph::ParameterVector params = {param}; @@ -48,7 +48,7 @@ TEST_F(TypeRelaxedTests, overrideOutputCopyCtor) { auto param = make_shared(input_type, shape); auto op = ngraph::opset1::Relu(param); auto relaxed_op = - make_shared>(op, TypeVector{}, TypeVector{overriden_type}); + make_shared>(op, TypeVector{}, TypeVector{overriden_type}); auto result = make_shared(relaxed_op); ngraph = make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{param}); @@ -69,7 +69,7 @@ TEST_F(TypeRelaxedTests, overrideInputCopyCtor) { auto param = make_shared(input_type, shape); auto op = ngraph::opset1::Relu(param); auto relaxed_op = - make_shared>(op, TypeVector{overriden_type}, TypeVector{}); + make_shared>(op, TypeVector{overriden_type}, TypeVector{}); auto result = make_shared(relaxed_op); ngraph = make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{param}); @@ -90,12 +90,12 @@ TEST_F(TypeRelaxedTests, mixedInputsAutoOutput) { ngraph::PartialShape shape({1, 3, 22, 22}); auto param1 = make_shared(input_type1, shape); auto param2 = make_shared(input_type2, shape); - auto op = ngraph::opset1::Add(ngraph::op::TemporaryReplaceOutputType(param1->output(0), overriden_type).get(), - ngraph::op::TemporaryReplaceOutputType(param2->output(0), overriden_type).get()); + auto op = ngraph::opset1::Add(ov::op::TemporaryReplaceOutputType(param1->output(0), overriden_type).get(), + ov::op::TemporaryReplaceOutputType(param2->output(0), overriden_type).get()); auto relaxed_op = - make_shared>(op, - TypeVector{overriden_type, overriden_type}, - TypeVector{}); + make_shared>(op, + TypeVector{overriden_type, overriden_type}, + TypeVector{}); auto result = make_shared(relaxed_op); ngraph = make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{param1, param2}); @@ -117,11 +117,11 @@ TEST_F(TypeRelaxedTests, mixedInputsAutoOutputForwardCtor) { ngraph::PartialShape shape({1, 3, 22, 22}); auto param1 = make_shared(input_type1, shape); auto param2 = make_shared(input_type2, shape); - auto relaxed_op = make_shared>( + auto relaxed_op = make_shared>( TypeVector{overriden_type, overriden_type}, TypeVector{}, - ngraph::op::TemporaryReplaceOutputType(param1, overriden_type).get(), - ngraph::op::TemporaryReplaceOutputType(param2, overriden_type).get()); + ov::op::TemporaryReplaceOutputType(param1, overriden_type).get(), + ov::op::TemporaryReplaceOutputType(param2, overriden_type).get()); auto result = make_shared(relaxed_op); ngraph = make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{param1, param2}); @@ -142,12 +142,11 @@ TEST_F(TypeRelaxedTests, notSupportedTypeOverride) { ngraph::PartialShape shape({1, 3, 22, 22}); auto param1 = make_shared(overriden_type, shape); auto param2 = make_shared(overriden_type, shape); - auto op = ngraph::opset1::LogicalAnd(ngraph::op::TemporaryReplaceOutputType(param1, orig_type).get(), - ngraph::op::TemporaryReplaceOutputType(param2, orig_type).get()); - auto relaxed_op = - make_shared>(op, - TypeVector{orig_type, orig_type}, - TypeVector{overriden_type}); + auto op = ngraph::opset1::LogicalAnd(ov::op::TemporaryReplaceOutputType(param1, orig_type).get(), + ov::op::TemporaryReplaceOutputType(param2, orig_type).get()); + auto relaxed_op = make_shared>(op, + TypeVector{orig_type, orig_type}, + TypeVector{overriden_type}); auto result = make_shared(relaxed_op); ngraph = make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{param1, param2}); @@ -169,12 +168,11 @@ TEST_F(TypeRelaxedTests, notSupportedTypeOverridePartially) { ngraph::PartialShape shape({1, 3, 22, 22}); auto param1 = make_shared(some_type, shape); auto param2 = make_shared(overriden_type, ngraph::PartialShape{1}); - auto op = - ngraph::opset1::Reshape(param1, ngraph::op::TemporaryReplaceOutputType(param2, orig_type).get(), false); + auto op = ngraph::opset1::Reshape(param1, ov::op::TemporaryReplaceOutputType(param2, orig_type).get(), false); auto relaxed_op = - make_shared>(op, - TypeVector{element::undefined, orig_type}, - TypeVector{}); + make_shared>(op, + TypeVector{element::undefined, orig_type}, + TypeVector{}); auto result = make_shared(relaxed_op); ngraph = make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{param1, param2}); @@ -197,7 +195,7 @@ TEST_F(TypeRelaxedTests, multiOutputTypeOverride) { auto op = ngraph::opset1::Split(param1, ngraph::opset1::Constant::create(ngraph::element::i64, ngraph::Shape{}, {1}), 3); - auto relaxed_op = make_shared>( + auto relaxed_op = make_shared>( op, TypeVector{}, TypeVector{overriden_type, overriden_type, overriden_type}); @@ -219,7 +217,7 @@ TEST_F(TypeRelaxedTests, setGetTypes) { auto param1 = make_shared(element::u8, shape); auto param2 = make_shared(element::u8, shape); // create TypeRelaxed without any type adjustment, the same behaviour as for opset1::Add - auto relaxed_op = make_shared>(param1, param2); + auto relaxed_op = make_shared>(param1, param2); auto result = make_shared(relaxed_op); ngraph = make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{param1, param2}); @@ -309,7 +307,7 @@ TEST_F(TypeRelaxedTests, OneOutputMultipleInputPorts) { auto param1 = make_shared(element::boolean, ngraph::Shape{1, 3, 22, 22}); auto op = ngraph::opset1::Select(param1, param1, param1); auto relaxed_op = - make_shared>(op, TypeVector{}, TypeVector{element::i64}); + make_shared>(op, TypeVector{}, TypeVector{element::i64}); f = make_shared(ngraph::OutputVector{relaxed_op}, ngraph::ParameterVector{param1}); @@ -335,7 +333,7 @@ TEST_F(TypeRelaxedTests, ConstantFoldingCheck) { auto const2 = ngraph::opset1::Constant::create(element::i32, ngraph::Shape{}, {2}); auto equal = ngraph::opset1::Equal(const1, const2); auto relaxed_equal = - make_shared>(equal, TypeVector{}, TypeVector{element::u8}); + make_shared>(equal, TypeVector{}, TypeVector{element::u8}); f = make_shared(ngraph::OutputVector{relaxed_equal}, ngraph::ParameterVector{}); ngraph::pass::Manager manager; @@ -352,9 +350,8 @@ TEST_F(TypeRelaxedTests, ConstantFoldingCheck1) { auto const1 = ngraph::opset1::Constant::create(element::i32, ngraph::Shape{}, {2}); auto const2 = ngraph::opset1::Constant::create(element::i32, ngraph::Shape{}, {2}); auto equal = ngraph::opset1::Equal(const1, const2); - auto relaxed_equal = make_shared>(equal, - TypeVector{}, - TypeVector{element::boolean}); + auto relaxed_equal = + make_shared>(equal, TypeVector{}, TypeVector{element::boolean}); f = make_shared(ngraph::OutputVector{relaxed_equal}, ngraph::ParameterVector{}); ngraph::pass::Manager manager; @@ -372,11 +369,11 @@ TEST_F(TypeRelaxedTests, ConstantFoldingCheck2) { auto const2 = ngraph::opset1::Constant::create(element::i8, ngraph::Shape{}, {2}); auto original_input_types = TypeVector{element::i32, element::i32}; - auto relaxed_equal = std::make_shared>( + auto relaxed_equal = std::make_shared>( ngraph::element::TypeVector{element::i32, element::i32}, ngraph::element::TypeVector{element::u8}, - ngraph::op::TemporaryReplaceOutputType(const1, element::i32).get(), - ngraph::op::TemporaryReplaceOutputType(const2, element::i32).get()); + ov::op::TemporaryReplaceOutputType(const1, element::i32).get(), + ov::op::TemporaryReplaceOutputType(const2, element::i32).get()); f = make_shared(ngraph::OutputVector{relaxed_equal}, ngraph::ParameterVector{}); ngraph::pass::Manager manager; @@ -395,9 +392,9 @@ TEST_F(TypeRelaxedTests, ConstantFoldingCheck3) { auto equal = ngraph::opset1::Equal(const1, const2); auto original_input_types = TypeVector{element::f32, element::f32}; - auto relaxed_equal = make_shared>(equal, - original_input_types, - TypeVector{element::u8}); + auto relaxed_equal = make_shared>(equal, + original_input_types, + TypeVector{element::u8}); f = make_shared(ngraph::OutputVector{relaxed_equal}, ngraph::ParameterVector{}); ngraph::pass::Manager manager; diff --git a/src/common/transformations/tests/utils/convert_precision.cpp b/src/common/transformations/tests/utils/convert_precision.cpp index 1764ad8738f..9ba053f8b8c 100644 --- a/src/common/transformations/tests/utils/convert_precision.cpp +++ b/src/common/transformations/tests/utils/convert_precision.cpp @@ -322,7 +322,7 @@ TEST(TransformationTests, ConvertPrecision_Unique10) { static const precisions_array precisions = {{element::i64, element::i32}, {element::f16, element::f32}}; - manager.register_pass(precisions); + manager.register_pass(precisions); manager.run_passes(model); } diff --git a/src/common/transformations/tests/utils/utils_test.cpp b/src/common/transformations/tests/utils/utils_test.cpp index b754cbd9bef..5afe40851ef 100644 --- a/src/common/transformations/tests/utils/utils_test.cpp +++ b/src/common/transformations/tests/utils/utils_test.cpp @@ -45,30 +45,30 @@ bool has_constant_value(const std::shared_ptr& node, const bool valu TEST(TransformationTests, HasConstantValueHelper) { auto float32_scalar = ngraph::opset4::Constant::create(ngraph::element::f32, ngraph::Shape{}, {1.234f}); - ASSERT_TRUE(ngraph::op::util::has_constant_value(float32_scalar, 1.234f)); - ASSERT_TRUE(ngraph::op::util::has_constant_value(float32_scalar, 1.23f, 0.005f)); - ASSERT_FALSE(ngraph::op::util::has_constant_value(float32_scalar, 1.23f, 0.003f)); + ASSERT_TRUE(ov::op::util::has_constant_value(float32_scalar, 1.234f)); + ASSERT_TRUE(ov::op::util::has_constant_value(float32_scalar, 1.23f, 0.005f)); + ASSERT_FALSE(ov::op::util::has_constant_value(float32_scalar, 1.23f, 0.003f)); auto float32_1D = ngraph::opset4::Constant::create(ngraph::element::f32, ngraph::Shape{1}, {1.234f}); - ASSERT_TRUE(ngraph::op::util::has_constant_value(float32_scalar, 1.234f)); + ASSERT_TRUE(ov::op::util::has_constant_value(float32_scalar, 1.234f)); auto int64_scalar = ngraph::opset4::Constant::create(ngraph::element::i64, ngraph::Shape{}, {12}); - ASSERT_TRUE(ngraph::op::util::has_constant_value(int64_scalar, 12)); + ASSERT_TRUE(ov::op::util::has_constant_value(int64_scalar, 12)); auto bool_scalar = ngraph::opset4::Constant::create(ngraph::element::boolean, ngraph::Shape{}, {true}); - ASSERT_TRUE(ngraph::op::util::has_constant_value(bool_scalar, true)); + ASSERT_TRUE(ov::op::util::has_constant_value(bool_scalar, true)); - ASSERT_FALSE(ngraph::op::util::has_constant_value(nullptr, 0)); + ASSERT_FALSE(ov::op::util::has_constant_value(nullptr, 0)); auto float32_2D = ngraph::opset4::Constant::create(ngraph::element::f32, ngraph::Shape{2}, {1.2f, 3.4f}); - ASSERT_FALSE(ngraph::op::util::has_constant_value(float32_2D, 1.2f)); + ASSERT_FALSE(ov::op::util::has_constant_value(float32_2D, 1.2f)); float32_scalar = ngraph::opset4::Constant::create(ngraph::element::f32, ngraph::Shape{}, {1.234f}); - ASSERT_FALSE(ngraph::op::util::has_constant_value(float32_scalar, 1.235f)); + ASSERT_FALSE(ov::op::util::has_constant_value(float32_scalar, 1.235f)); float32_1D = ngraph::opset4::Constant::create(ngraph::element::f32, ngraph::Shape{1}, {1.234f}); - ASSERT_FALSE(ngraph::op::util::has_constant_value(float32_scalar, 1.235f)); + ASSERT_FALSE(ov::op::util::has_constant_value(float32_scalar, 1.235f)); int64_scalar = ngraph::opset4::Constant::create(ngraph::element::i64, ngraph::Shape{}, {12}); - ASSERT_FALSE(ngraph::op::util::has_constant_value(int64_scalar, 13)); + ASSERT_FALSE(ov::op::util::has_constant_value(int64_scalar, 13)); } diff --git a/src/core/src/model.cpp b/src/core/src/model.cpp index 88138ec30cd..abc98d46b28 100644 --- a/src/core/src/model.cpp +++ b/src/core/src/model.cpp @@ -881,7 +881,7 @@ void ov::Model::reshape(const std::map, ov::PartialShape>& try { ov::pass::Manager ssr_manager; - ssr_manager.register_pass(); + ssr_manager.register_pass(); ssr_manager.run_passes(shared_from_this()); reshape_only(new_param_shapes); diff --git a/src/core/src/pass/convert_fp32_to_fp16.cpp b/src/core/src/pass/convert_fp32_to_fp16.cpp index 1c8b70e72fb..9b1c7ce36d8 100644 --- a/src/core/src/pass/convert_fp32_to_fp16.cpp +++ b/src/core/src/pass/convert_fp32_to_fp16.cpp @@ -15,7 +15,7 @@ using namespace std; bool ov::pass::ConvertFP32ToFP16::run_on_model(const std::shared_ptr& f) { RUN_ON_MODEL_SCOPE(ConvertFP32ToFP16); ov::pass::Manager m(get_pass_config()); - m.register_pass(precisions_array{{ngraph::element::f32, ngraph::element::f16}}); + m.register_pass(precisions_array{{ngraph::element::f32, ngraph::element::f16}}); m.run_passes(f); return false; } diff --git a/src/core/tests/constant_folding.cpp b/src/core/tests/constant_folding.cpp index 923d62a910d..878c0bb52b5 100644 --- a/src/core/tests/constant_folding.cpp +++ b/src/core/tests/constant_folding.cpp @@ -57,7 +57,7 @@ std::ostream& operator<<(std::ostream& os, const std::vector& s) { void run_constant_folding(std::shared_ptr& model) { pass::Manager pass_manager; - pass_manager.register_pass(); + pass_manager.register_pass(); pass_manager.register_pass(); pass_manager.run_passes(model); } @@ -73,7 +73,7 @@ static void check_names(const std::shared_ptr& node, // Check fused name ASSERT_TRUE(!expected_fused_names.empty()); - std::vector fused_names = ngraph::getFusedNamesVector(node); + std::vector fused_names = ov::getFusedNamesVector(node); if (exact) { std::vector expected_sorted = expected_fused_names; std::sort(fused_names.begin(), fused_names.end()); @@ -3331,7 +3331,7 @@ TEST(constant_folding, disable_constant_folding) { // will request values from this sub-graph and ConstantFolding pass will try to use this pre-calculated values // to fold it. But in our case we are disabling CF for this sub-graph first and then enable CF to check that all // checks inside ConstantFolding transformation are working and doesn't cache anytihng. - auto gather = op::util::node_to_get_shape_value_of_indices_from_shape_source(data, {2, 3}); + auto gather = ov::op::util::node_to_get_shape_value_of_indices_from_shape_source(data, {2, 3}); auto convert = std::make_shared(gather, element::f16); auto divide_constant = op::Constant::create(element::f16, Shape{1}, {0.5}); auto divide = std::make_shared(convert, divide_constant); diff --git a/src/core/tests/pass/serialization/custom_ops.cpp b/src/core/tests/pass/serialization/custom_ops.cpp index 92f4de65154..08f2ed73f37 100644 --- a/src/core/tests/pass/serialization/custom_ops.cpp +++ b/src/core/tests/pass/serialization/custom_ops.cpp @@ -8,8 +8,8 @@ #include "common_test_utils/common_utils.hpp" #include "common_test_utils/file_utils.hpp" #include "common_test_utils/ngraph_test_utils.hpp" +#include "ngraph/pass/serialize.hpp" #include "openvino/runtime/core.hpp" -#include "transformations/serialize.hpp" class CustomOpsSerializationTest : public ::testing::Test { protected: diff --git a/src/core/tests/pass/serialization/rt_info_serialization.cpp b/src/core/tests/pass/serialization/rt_info_serialization.cpp index 347ece1248b..67a5e62e4c7 100644 --- a/src/core/tests/pass/serialization/rt_info_serialization.cpp +++ b/src/core/tests/pass/serialization/rt_info_serialization.cpp @@ -7,10 +7,10 @@ #include #include "common_test_utils/ngraph_test_utils.hpp" +#include "ngraph/pass/serialize.hpp" #include "openvino/frontend/manager.hpp" #include "openvino/opsets/opset8.hpp" #include "transformations/rt_info/attributes.hpp" -#include "transformations/serialize.hpp" class RTInfoSerializationTest : public CommonTestUtils::TestsCommon { protected: diff --git a/src/core/tests/threading.cpp b/src/core/tests/threading.cpp index dfcab79235a..b2150552704 100644 --- a/src/core/tests/threading.cpp +++ b/src/core/tests/threading.cpp @@ -24,9 +24,9 @@ std::shared_ptr create_complex_function(size_t wide = 50) { const auto& split_subgraph = [](const ov::Output& input) -> ov::OutputVector { auto relu = std::make_shared(input); auto type_relaxed = - std::make_shared>(std::vector{element::f32}, - std::vector{element::f32}, - relu); + std::make_shared>(std::vector{element::f32}, + std::vector{element::f32}, + relu); auto axis_node = ov::opset8::Constant::create(ov::element::i64, Shape{}, {1}); auto split = std::make_shared(type_relaxed, axis_node, 2); return split->outputs(); @@ -34,9 +34,9 @@ std::shared_ptr create_complex_function(size_t wide = 50) { const auto& concat_subgraph = [](const ov::OutputVector& inputs) -> ov::Output { auto concat = std::make_shared(inputs, 1); auto type_relaxed = - std::make_shared>(std::vector{element::f32}, - std::vector{element::f32}, - concat); + std::make_shared>(std::vector{element::f32}, + std::vector{element::f32}, + concat); auto relu = std::make_shared(concat); return relu->output(0); }; diff --git a/src/frontends/ir/tests/rt_info_deserialization.cpp b/src/frontends/ir/tests/rt_info_deserialization.cpp index 5cf9ffe12f6..ff1b1128b29 100644 --- a/src/frontends/ir/tests/rt_info_deserialization.cpp +++ b/src/frontends/ir/tests/rt_info_deserialization.cpp @@ -108,7 +108,7 @@ TEST_F(RTInfoDeserialization, node_v10) { ASSERT_NE(nullptr, f); auto check_rt_info = [](const ov::RTMap& info) { - EXPECT_FALSE(info.count(ngraph::FusedNames::get_type_info_static())); + EXPECT_FALSE(info.count(ov::FusedNames::get_type_info_static())); const std::string& key_old_api_order = ov::OldApiMapOrder::get_type_info_static(); EXPECT_FALSE(info.count(key_old_api_order)); @@ -352,7 +352,7 @@ TEST_F(RTInfoDeserialization, input_and_output_v10) { ASSERT_NE(nullptr, f); auto check_rt_info = [](const ov::RTMap& info) { - ASSERT_FALSE(info.count(ngraph::FusedNames::get_type_info_static())); + ASSERT_FALSE(info.count(ov::FusedNames::get_type_info_static())); }; auto check_version = [](const std::shared_ptr& f, int ref_version) { @@ -498,8 +498,8 @@ TEST_F(RTInfoDeserialization, node_v11) { ASSERT_NE(nullptr, f); auto check_fused_names = [](const ov::RTMap& info, const std::string& names) { - ASSERT_TRUE(info.count(ngraph::FusedNames::get_type_info_static())); - auto fused_names_attr = info.at(ngraph::FusedNames::get_type_info_static()).as(); + ASSERT_TRUE(info.count(ov::FusedNames::get_type_info_static())); + auto fused_names_attr = info.at(ov::FusedNames::get_type_info_static()).as(); EXPECT_EQ(fused_names_attr.getNames(), names); }; auto check_old_api_map_order = [](const ov::RTMap& info, const std::vector& order) { @@ -568,7 +568,7 @@ TEST_F(RTInfoDeserialization, node_v11) { auto round = std::make_shared(convert_param, ov::opset8::Round::RoundMode::HALF_TO_EVEN); // TODO: runtime information should migrate as well? - round->get_rt_info()[ngraph::FusedNames::get_type_info_static()] = ngraph::FusedNames("Round1,Round2"); + round->get_rt_info()[ov::FusedNames::get_type_info_static()] = ov::FusedNames("Round1,Round2"); // TODO: No guarantee that exactly 'convert, then transpose' will be added by implicit post-processing auto constant_result = @@ -706,7 +706,7 @@ TEST_F(RTInfoDeserialization, node_v11_uint8) { auto transpose_param = std::make_shared(param, constant_param); auto round = std::make_shared(transpose_param, ov::opset8::Round::RoundMode::HALF_TO_EVEN); - round->get_rt_info()[ngraph::FusedNames::get_type_info_static()] = ngraph::FusedNames("Round1,Round2"); + round->get_rt_info()[ov::FusedNames::get_type_info_static()] = ov::FusedNames("Round1,Round2"); auto constant_result = std::make_shared(ov::element::u64, ov::Shape{4}, std::vector{0, 3, 1, 2}); auto transpose_result = std::make_shared(round, constant_result); @@ -918,9 +918,9 @@ TEST_F(RTInfoDeserialization, input_and_output_v11) { check_version(f, 11); auto check_fused_names = [](const ov::RTMap& info, const std::string& names) { - const std::string& key = ngraph::FusedNames::get_type_info_static(); + const std::string& key = ov::FusedNames::get_type_info_static(); ASSERT_TRUE(info.count(key)); - auto fused_names_attr = info.at(key).as(); + auto fused_names_attr = info.at(key).as(); ASSERT_EQ(fused_names_attr.getNames(), names); }; diff --git a/src/frontends/paddle/src/op/conv2d_utils.cpp b/src/frontends/paddle/src/op/conv2d_utils.cpp index 718cc39f698..a0567375e49 100644 --- a/src/frontends/paddle/src/op/conv2d_utils.cpp +++ b/src/frontends/paddle/src/op/conv2d_utils.cpp @@ -71,10 +71,10 @@ std::shared_ptr get_reshaped_filter(const Output& filters, const int * The final grouped filters' layout is [groups, grouped_O, I, W, H] */ const std::vector o_indices{0}; - auto filter_o_node = ngraph::op::util::node_to_get_shape_value_of_indices_from_shape_source(filters, o_indices); + auto filter_o_node = ov::op::util::node_to_get_shape_value_of_indices_from_shape_source(filters, o_indices); const std::vector ihw_indices{1, 2, 3}; - auto filter_ihw_node = ngraph::op::util::node_to_get_shape_value_of_indices_from_shape_source(filters, ihw_indices); + auto filter_ihw_node = ov::op::util::node_to_get_shape_value_of_indices_from_shape_source(filters, ihw_indices); auto groups_node = opset6::Constant::create(element::i64, Shape{1}, {groups}); auto grouped_o_node = std::make_shared(filter_o_node, groups_node); diff --git a/src/frontends/paddle/tests/read_paddle_model_test.cpp b/src/frontends/paddle/tests/read_paddle_model_test.cpp index a0fe9aa939a..6035691a855 100644 --- a/src/frontends/paddle/tests/read_paddle_model_test.cpp +++ b/src/frontends/paddle/tests/read_paddle_model_test.cpp @@ -16,7 +16,7 @@ #include "frontend/shared/include/utils.hpp" #include "openvino/openvino.hpp" #include "openvino/opsets/opset1.hpp" -#include "transformations/serialize.hpp" +#include "openvino/pass/serialize.hpp" TEST(Paddle_Reader_Tests, ImportBasicModelToCore) { auto model = std::string(TEST_PADDLE_MODELS_DIRNAME) + "relu/relu.pdmodel"; diff --git a/src/inference/src/check_network_batchable.cpp b/src/inference/src/check_network_batchable.cpp index 1ae34b29591..5e60a58d7ce 100644 --- a/src/inference/src/check_network_batchable.cpp +++ b/src/inference/src/check_network_batchable.cpp @@ -18,7 +18,7 @@ NetworkBatchAbility is_model_batchable(const std::shared_ptr& m auto function = model->clone(); // find the batch dim ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(true, strictly_track_dims); m.run_passes(function); bool any_batched_inputs = false; diff --git a/src/inference/src/cnn_network_ngraph_impl.cpp b/src/inference/src/cnn_network_ngraph_impl.cpp index 75cd24d96e8..39046e3a0b0 100644 --- a/src/inference/src/cnn_network_ngraph_impl.cpp +++ b/src/inference/src/cnn_network_ngraph_impl.cpp @@ -148,9 +148,8 @@ CNNNetworkNGraphImpl::CNNNetworkNGraphImpl(const std::shared_ptr& nGra _new_api(newAPI) { { ov::pass::Manager m; - using namespace ngraph::pass; - REGISTER_PASS(m, FixRtInfo) using namespace ov::pass; + REGISTER_PASS(m, FixRtInfo) REGISTER_PASS(m, EliminateScatterUpdate) REGISTER_PASS(m, RemoveConcatZeroDimInput) REGISTER_PASS(m, RemoveMultiSubGraphOpDanglingParams) @@ -215,7 +214,7 @@ CNNNetworkNGraphImpl::CNNNetworkNGraphImpl(const CNNNetwork& network) { _ngraph_function = ngraph::clone_function(*network.getFunction()); { ov::pass::Manager m; - using namespace ngraph::pass; + using namespace ov::pass; REGISTER_PASS(m, FixRtInfo) m.run_passes(_ngraph_function); } @@ -326,7 +325,7 @@ StatusCode CNNNetworkNGraphImpl::addOutput(const std::string& layerName, } void CNNNetworkNGraphImpl::addOutput(const ::ngraph::Output<::ngraph::Node>& output) { - auto dataName = ngraph::op::util::create_ie_output_name(output); + auto dataName = ov::op::util::create_ie_output_name(output); DataPtr data; if (_data.count(dataName)) data = _data[dataName]; @@ -399,7 +398,7 @@ StatusCode CNNNetworkNGraphImpl::reshape(const std::map(shape[0]) / static_cast(getBatchSize())))}; inShapes[parameter->get_friendly_name()] = shape; } - ngraph::pass::Manager ssr_manager; - using namespace ngraph::pass; + ov::pass::Manager ssr_manager; + using namespace ov::pass; REGISTER_PASS(ssr_manager, SetBatchSize) ssr_manager.run_passes(_ngraph_function); diff --git a/src/inference/src/compilation_context.cpp b/src/inference/src/compilation_context.cpp index 5d245c592c6..2e5a79a4cf5 100644 --- a/src/inference/src/compilation_context.cpp +++ b/src/inference/src/compilation_context.cpp @@ -74,7 +74,7 @@ std::string NetworkCompilationContext::computeHash(CNNNetwork& network, uint64_t seed = 0; // 1. Calculate hash on function ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(seed); m.run_passes(network.getFunction()); diff --git a/src/inference/src/cpp/ie_infer_request.cpp b/src/inference/src/cpp/ie_infer_request.cpp index 16670231da1..fadb6b59dee 100644 --- a/src/inference/src/cpp/ie_infer_request.cpp +++ b/src/inference/src/cpp/ie_infer_request.cpp @@ -237,7 +237,7 @@ std::string get_legacy_name_from_port(const ov::Output& port) { if (auto node = std::dynamic_pointer_cast(p.get_node_shared_ptr())) { p = node->input_value(0); } - return ngraph::op::util::create_ie_output_name(p); + return ov::op::util::create_ie_output_name(p); } } // namespace diff --git a/src/inference/src/cpp_interfaces/interface/ie_iinfer_request_internal.cpp b/src/inference/src/cpp_interfaces/interface/ie_iinfer_request_internal.cpp index 4538e924e0c..0f966366759 100644 --- a/src/inference/src/cpp_interfaces/interface/ie_iinfer_request_internal.cpp +++ b/src/inference/src/cpp_interfaces/interface/ie_iinfer_request_internal.cpp @@ -39,7 +39,7 @@ IInferRequestInternal::IInferRequestInternal(const std::vector& output) -> InferenceEngine::DataPtr { - auto name = ngraph::op::util::get_ie_output_name(output); + auto name = ov::op::util::get_ie_output_name(output); auto shape = output.get_partial_shape(); auto rank = shape.rank().is_static() ? shape.rank().get_length() : -1; SizeVector dims(1, 0); diff --git a/src/inference/src/cpp_interfaces/interface/ie_iplugin_internal.cpp b/src/inference/src/cpp_interfaces/interface/ie_iplugin_internal.cpp index a65db624dbd..55720602407 100644 --- a/src/inference/src/cpp_interfaces/interface/ie_iplugin_internal.cpp +++ b/src/inference/src/cpp_interfaces/interface/ie_iplugin_internal.cpp @@ -320,7 +320,7 @@ std::unordered_set GetRemovedNodes(const std::shared_ptrget_ops()) { transformedNodeNames.emplace(node->get_friendly_name()); - for (auto&& fusedLayerName : ngraph::getFusedNamesVector(node)) + for (auto&& fusedLayerName : ov::getFusedNamesVector(node)) transformedNodeNames.emplace(fusedLayerName); } @@ -357,7 +357,7 @@ std::unordered_set GetSupportedNodes( std::unordered_set unsupported; auto get_names_set = [](const std::shared_ptr& op) -> std::unordered_set { - auto fused_names = ngraph::getFusedNamesVector(op); + auto fused_names = ov::getFusedNamesVector(op); std::unordered_set names(fused_names.begin(), fused_names.end()); names.insert(op->get_friendly_name()); return names; @@ -506,7 +506,7 @@ void SetExeNetworkInfo(const std::shared_ptr& exeNet for (const auto& result : function->get_results()) { auto fake_param = std::make_shared(result->get_output_element_type(0), result->get_output_partial_shape(0)); - const std::string res_name = ngraph::op::util::create_ie_output_name(result->input_value(0)); + const std::string res_name = ov::op::util::create_ie_output_name(result->input_value(0)); fake_param->set_friendly_name(res_name); fake_param->set_element_type( InferenceEngine::details::convertPrecision(outputsInfo.at(res_name)->getPrecision())); diff --git a/src/inference/src/ie_network_reader.cpp b/src/inference/src/ie_network_reader.cpp index c72cb175f48..d0547135a68 100644 --- a/src/inference/src/ie_network_reader.cpp +++ b/src/inference/src/ie_network_reader.cpp @@ -306,7 +306,7 @@ CNNNetwork convert_to_cnnnetwork(std::shared_ptr& function, // we need to add operation names as tensor names for inputs and outputs { for (const auto& result : function->get_results()) { - auto res_name = ngraph::op::util::create_ie_output_name(result->input_value(0)); + auto res_name = ov::op::util::create_ie_output_name(result->input_value(0)); OPENVINO_ASSERT( leaf_names.find(res_name) == leaf_names.end() || result->output(0).get_names().find(res_name) != result->output(0).get_names().end(), diff --git a/src/inference/tests/functional/matmul_sr_tests.cpp b/src/inference/tests/functional/matmul_sr_tests.cpp index 5f59bdb4f72..1bfccfba2b2 100644 --- a/src/inference/tests/functional/matmul_sr_tests.cpp +++ b/src/inference/tests/functional/matmul_sr_tests.cpp @@ -100,8 +100,8 @@ TEST(SmartReshapeTransposeMatMulTests, TransposeAMatMulFuse) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{data_A, data_B}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -127,8 +127,8 @@ TEST(SmartReshapeTransposeMatMulTests, TransposeBMatMulFuse) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{data_A, data_B}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -154,8 +154,8 @@ TEST(SmartReshapeTransposeMatMulTests, TransposeAMatMulWithAttrFuse) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{data_A, data_B}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -181,8 +181,8 @@ TEST(SmartReshapeTransposeMatMulTests, TransposeBMatMulWithAttrFuse) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{data_A, data_B}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -207,8 +207,8 @@ TEST(SmartReshapeTransposeMatMulTests, TransposeAMatMulSideAttrFuse) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{data_A, data_B}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -234,8 +234,8 @@ TEST(SmartReshapeTransposeMatMulTests, TransposeBMatMulSideAttrFuse) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{data_A, data_B}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -262,8 +262,8 @@ TEST(SmartReshapeTransposeMatMulTests, TransposeBothMatMulFuse) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{data_A, data_B}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } @@ -297,8 +297,8 @@ TEST(SmartReshapeTransposeMatMulTests, TransposeBothMatMulWithAttrFuse) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{data_A, data_B}); ngraph::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); } diff --git a/src/inference/tests/unit/ie_compilation_context_test.cpp b/src/inference/tests/unit/ie_compilation_context_test.cpp index 4c77f762866..c1236f1e7e2 100644 --- a/src/inference/tests/unit/ie_compilation_context_test.cpp +++ b/src/inference/tests/unit/ie_compilation_context_test.cpp @@ -212,10 +212,10 @@ TEST(NetworkContext_CNNNetwork, HashWithPrimitivesPriority) { TEST(NetworkContext_CNNNetwork, HashWithFusedNames) { auto setFusedEmpty = [&](Node::RTMap& rtInfo) { - rtInfo[ngraph::FusedNames::get_type_info_static()] = ngraph::FusedNames(); + rtInfo[ov::FusedNames::get_type_info_static()] = ov::FusedNames(); }; auto setFused = [&](Node::RTMap& rtInfo, const std::string& name) { - rtInfo[ngraph::FusedNames::get_type_info_static()] = ngraph::FusedNames(name); + rtInfo[ov::FusedNames::get_type_info_static()] = ov::FusedNames(name); }; checkCustomRt(setFusedEmpty, setFused); } diff --git a/src/inference/tests/unit/query_model_test.cpp b/src/inference/tests/unit/query_model_test.cpp index aa8fcd38158..fff953eec6c 100644 --- a/src/inference/tests/unit/query_model_test.cpp +++ b/src/inference/tests/unit/query_model_test.cpp @@ -73,7 +73,7 @@ TEST_F(GetSupportedNodesTest, UnsupportedCompressedConstantCF) { Run( [&](std::shared_ptr& model) { ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(model); }, @@ -108,7 +108,7 @@ TEST_F(GetSupportedNodesTest, ConstantSubgraphCF) { Run( [&](std::shared_ptr& model) { ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(model); }, @@ -142,10 +142,9 @@ TEST_F(GetSupportedNodesTest, SupportedCompressedConstantNop) { Run( [&](std::shared_ptr& model) { ov::pass::Manager m; - m.register_pass(); - m.register_pass( - precisions_array{{ngraph::element::f16, ngraph::element::f32}}); - m.register_pass(); + m.register_pass(); + m.register_pass(precisions_array{{ngraph::element::f16, ngraph::element::f32}}); + m.register_pass(); m.run_passes(model); }, [&](const std::shared_ptr& op) { @@ -170,7 +169,7 @@ TEST_F(GetSupportedNodesTest, SupportedConstantInsertAdditionalOp) { Run( [&](std::shared_ptr& model) { ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(model); for (auto& op : model->get_ops()) { if (std::dynamic_pointer_cast(op) != nullptr) { @@ -222,7 +221,7 @@ TEST_F(GetSupportedNodesTest, PartiallySupportedCompressedConstant) { Run( [&](std::shared_ptr& model) { ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(model); }, @@ -263,9 +262,9 @@ TEST_F(GetSupportedNodesTest, ConstantSubgraphSupported) { Run( [&](std::shared_ptr& model) { ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); - m.register_pass(); + m.register_pass(); m.run_passes(model); }, [&](const std::shared_ptr& op) { @@ -304,7 +303,7 @@ TEST_F(GetSupportedNodesTest, UnmarkedSupportedInputsOutputs) { Run( [&](std::shared_ptr& model) { ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(model); }, @@ -322,12 +321,12 @@ TEST_F(GetSupportedNodesTest, WrongFusedNamesInOriginalModel) { auto weights = ov::opset9::Constant::create(ov::element::Type_t::f32, {10, 84}, {1}); weights->set_friendly_name("weights"); auto matmul = std::make_shared(param, weights, false, true); - matmul->get_rt_info()[ngraph::FusedNames::get_type_info_static()] = ngraph::FusedNames("add"); + matmul->get_rt_info()[ov::FusedNames::get_type_info_static()] = ov::FusedNames("add"); matmul->set_friendly_name("matmul"); auto constant = ngraph::op::Constant::create(ov::element::f32, {1, 10}, {1}); constant->set_friendly_name("constant"); auto add = std::make_shared(matmul, constant); - add->get_rt_info()[ngraph::FusedNames::get_type_info_static()] = ngraph::FusedNames("matmul"); + add->get_rt_info()[ov::FusedNames::get_type_info_static()] = ov::FusedNames("matmul"); add->set_friendly_name("add"); auto result = std::make_shared(add); result->set_friendly_name("result"); @@ -361,8 +360,8 @@ TEST_F(GetSupportedNodesTest, FusedNamesSupportedUnsupportedBoth) { Run( [&](std::shared_ptr& model) { ov::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); }, [&](const std::shared_ptr& op) { @@ -410,8 +409,8 @@ TEST_F(GetSupportedNodesTest, ShapeOfNonConstantNode) { Run( [&](std::shared_ptr& model) { ov::pass::Manager m; - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); m.run_passes(model); }, [&](const std::shared_ptr& op) { @@ -419,4 +418,4 @@ TEST_F(GetSupportedNodesTest, ShapeOfNonConstantNode) { (std::dynamic_pointer_cast(op) != nullptr); }, {"input", "slope_compressed", "slope", "prelu"}); // keep dummy only since it has no unsupported consumers -} \ No newline at end of file +} diff --git a/src/plugins/auto/auto_schedule.cpp b/src/plugins/auto/auto_schedule.cpp index f92d93428c1..5637b28d38c 100644 --- a/src/plugins/auto/auto_schedule.cpp +++ b/src/plugins/auto/auto_schedule.cpp @@ -15,7 +15,7 @@ namespace MultiDevicePlugin { namespace { std::string GetNetworkPrecision(const IE::CNNNetwork& network) { auto nGraphFunc = network.getFunction(); - bool isINTModel = ngraph::op::util::has_op_with_type + bool isINTModel = ov::op::util::has_op_with_type (nGraphFunc); if (isINTModel) { return METRIC_VALUE(INT8); diff --git a/src/plugins/auto/plugin.cpp b/src/plugins/auto/plugin.cpp index beba839d490..021f926dd1e 100644 --- a/src/plugins/auto/plugin.cpp +++ b/src/plugins/auto/plugin.cpp @@ -34,7 +34,7 @@ namespace { std::string GetNetworkPrecision(const InferenceEngine::CNNNetwork &network) { auto nGraphFunc = network.getFunction(); - bool isINTModel = ngraph::op::util::has_op_with_type(nGraphFunc); + bool isINTModel = ov::op::util::has_op_with_type(nGraphFunc); if (isINTModel) { return METRIC_VALUE(INT8); } diff --git a/src/plugins/auto_batch/auto_batch.cpp b/src/plugins/auto_batch/auto_batch.cpp index 7a968765bb6..d1d12946343 100644 --- a/src/plugins/auto_batch/auto_batch.cpp +++ b/src/plugins/auto_batch/auto_batch.cpp @@ -851,7 +851,7 @@ InferenceEngine::IExecutableNetworkInternal::Ptr AutoBatchInferencePlugin::LoadN auto function = clonedNetwork.getFunction(); // find the batch dim ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(false, check_dims); m.run_passes(function); // do not reshape/re-batch originally batched networks and when there are no inputs with the N* layouts @@ -869,7 +869,7 @@ InferenceEngine::IExecutableNetworkInternal::Ptr AutoBatchInferencePlugin::LoadN if (static_shape[0] != 1) IE_THROW(NotImplemented) << "Auto-batching does not reshape/re-batch originally batched networks!"; batched_inputs.insert( - ngraph::op::util::get_ie_output_name(params[input_id]->output(0))); // batched dim for the input + ov::op::util::get_ie_output_name(params[input_id]->output(0))); // batched dim for the input } else { // if the 0-th dim is not for the batch, then we support only the case when NONE dimension is batch for (size_t s = 1; s < shape.size(); s++) @@ -889,8 +889,8 @@ InferenceEngine::IExecutableNetworkInternal::Ptr AutoBatchInferencePlugin::LoadN if (shape[0] != 1) IE_THROW(NotImplemented) << "Auto-batching does not reshape/re-batch originally batched networks!"; const auto& node = output->input_value(0); - batched_outputs.insert(ngraph::op::util::get_ie_output_name( - ov::Output(node.get_node(), node.get_index()))); + batched_outputs.insert( + ov::op::util::get_ie_output_name(ov::Output(node.get_node(), node.get_index()))); } else { // if the 0-th dim is not for the batch, then we support only the case when NONE dimension is batch for (size_t s = 1; s < shape.size(); s++) diff --git a/src/plugins/hetero/executable_network.cpp b/src/plugins/hetero/executable_network.cpp index 368a068d9a3..21458c3ec81 100644 --- a/src/plugins/hetero/executable_network.cpp +++ b/src/plugins/hetero/executable_network.cpp @@ -482,7 +482,7 @@ HeteroExecutableNetwork::HeteroExecutableNetwork(const InferenceEngine::CNNNetwo if (!InferenceEngine::details::contains(externalOutputsData, output.first)) { for (auto&& result : subgraph._results) { auto source_output = result->input_value(0); - auto output_name = ngraph::op::util::create_ie_output_name(source_output); + auto output_name = ov::op::util::create_ie_output_name(source_output); if (output_name == output.first) { output.second->setPrecision( InferenceEngine::details::convertPrecision(toLegacyType(source_output.get_element_type()))); @@ -675,7 +675,7 @@ void HeteroExecutableNetwork::Export(std::ostream& heteroModel) { const auto serializeNode = [&](const std::shared_ptr& node, pugi::xml_node& xml_node) { const bool is_result = ov::is_type(node); const std::string name = - is_result ? ngraph::op::util::create_ie_output_name(node->input_value(0)) : node->get_friendly_name(); + is_result ? ov::op::util::create_ie_output_name(node->input_value(0)) : node->get_friendly_name(); xml_node.append_attribute("operation_name").set_value(name.c_str()); xml_node.append_attribute("element_type").set_value(node->get_output_element_type(0).get_type_name().c_str()); diff --git a/src/plugins/intel_cpu/src/exec_network.cpp b/src/plugins/intel_cpu/src/exec_network.cpp index 117cd6263ed..8450c0d1960 100644 --- a/src/plugins/intel_cpu/src/exec_network.cpp +++ b/src/plugins/intel_cpu/src/exec_network.cpp @@ -76,7 +76,7 @@ ExecNetwork::ExecNetwork(const InferenceEngine::CNNNetwork &network, if (function == nullptr) { IE_THROW() << "CPU plug-in doesn't support not ngraph-based model!"; } - bool isFloatModel = !ngraph::op::util::has_op_with_type(function); + bool isFloatModel = !ov::op::util::has_op_with_type(function); _cfg.isNewApi = !isLegacyAPI(); _mutex = std::make_shared(); diff --git a/src/plugins/intel_cpu/src/extension.cpp b/src/plugins/intel_cpu/src/extension.cpp index 2e27effd8b5..fd0c07ea55b 100644 --- a/src/plugins/intel_cpu/src/extension.cpp +++ b/src/plugins/intel_cpu/src/extension.cpp @@ -62,7 +62,7 @@ std::map Extension::getOpSets() { auto type_relaxed_opset = []() { ngraph::OpSet opset; -#define NGRAPH_OP(NAME, NAMESPACE) opset.insert>(); +#define NGRAPH_OP(NAME, NAMESPACE) opset.insert>(); NGRAPH_OP(Add, ngraph::op::v1) NGRAPH_OP(AvgPool, ngraph::op::v1) NGRAPH_OP(Clamp, ngraph::op::v0) @@ -117,11 +117,11 @@ std::map Extension::getOpSets() { ngraph::OpSet opset; #define NGRAPH_OP(NAME, NAMESPACE) opset.insert(); - NGRAPH_OP(NonMaxSuppressionIEInternal, ngraph::op::internal) - NGRAPH_OP(MulticlassNmsIEInternal, ngraph::op::internal) + NGRAPH_OP(NonMaxSuppressionIEInternal, ov::op::internal) + NGRAPH_OP(MulticlassNmsIEInternal, ov::op::internal) NGRAPH_OP(AUGRUCell, ov::op::internal) NGRAPH_OP(AUGRUSequence, ov::op::internal) - NGRAPH_OP(NmsStaticShapeIE, ngraph::op::internal) + NGRAPH_OP(NmsStaticShapeIE, ov::op::internal) #undef NGRAPH_OP return opset; diff --git a/src/plugins/intel_cpu/src/graph.cpp b/src/plugins/intel_cpu/src/graph.cpp index b2c5a2db8b0..2c7ddc13467 100644 --- a/src/plugins/intel_cpu/src/graph.cpp +++ b/src/plugins/intel_cpu/src/graph.cpp @@ -151,7 +151,7 @@ void Graph::Replicate(const std::shared_ptr &subgraph) { if (op->get_type_info() == ngraph::op::v0::Result::get_type_info_static()) { const auto prev = op->input_value(0); - const std::string inputID = ngraph::op::util::get_ie_output_name(prev); + const std::string inputID = ov::op::util::get_ie_output_name(prev); outputNodesMap[inputID] = node; } @@ -265,7 +265,7 @@ void Graph::Replicate(const CNNNetwork &network) { if (op->get_type_info() == ngraph::op::v0::Result::get_type_info_static()) { const auto &input = op->input_value(0); - const auto name = ngraph::op::util::get_ie_output_name(input); + const auto name = ov::op::util::get_ie_output_name(input); if (outputsInfo.count(name) != 0) { outputNodesMap[name] = node; diff --git a/src/plugins/intel_cpu/src/infer_request.cpp b/src/plugins/intel_cpu/src/infer_request.cpp index b9a35826f56..ce143e76269 100644 --- a/src/plugins/intel_cpu/src/infer_request.cpp +++ b/src/plugins/intel_cpu/src/infer_request.cpp @@ -632,10 +632,10 @@ InferRequest::InferRequest(const std::vector>& i ExecNetwork::Ptr execNetwork) : InferRequestBase(inputs, outputs, execNetwork) { for (const std::shared_ptr& in : inputs) { - modelInputsMap[ngraph::op::util::get_ie_output_name(ngraph::Output(in))] = in; + modelInputsMap[ov::op::util::get_ie_output_name(ngraph::Output(in))] = in; } for (const std::shared_ptr& out : outputs) { - modelOutputsMap[ngraph::op::util::get_ie_output_name(out->input_value(0))] = out; + modelOutputsMap[ov::op::util::get_ie_output_name(out->input_value(0))] = out; } CreateInferRequest(); diff --git a/src/plugins/intel_cpu/src/ngraph_transformations/convert_fq_rnn_to_quantized_rnn.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_fq_rnn_to_quantized_rnn.cpp index 75ac60961a5..4cfb98deb13 100644 --- a/src/plugins/intel_cpu/src/ngraph_transformations/convert_fq_rnn_to_quantized_rnn.cpp +++ b/src/plugins/intel_cpu/src/ngraph_transformations/convert_fq_rnn_to_quantized_rnn.cpp @@ -105,16 +105,16 @@ ov::intel_cpu::ConvertFqRnnToQuantizedRnn::ConvertFqRnnToQuantizedRnn() { const auto& sequence_length = pattern_map.at(sequence_length_m); // @todo prototype removal of unnecessary fq between two consequtive rnn nodes - auto rnn_quantized_tr = std::make_shared>( + auto rnn_quantized_tr = std::make_shared>( element::TypeVector{ element::f32, element::f32, element::f32, element::f32, element::f32, element::f32, element::f32 }, element::TypeVector{ element::f32, element::f32, element::f32 }, - ngraph::op::TemporaryReplaceOutputType(activation, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(hidden_state, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(cell_state, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(sequence_length, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(weights, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(r_weights, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(bias, element::f32).get(), + op::TemporaryReplaceOutputType(activation, element::f32).get(), + op::TemporaryReplaceOutputType(hidden_state, element::f32).get(), + op::TemporaryReplaceOutputType(cell_state, element::f32).get(), + op::TemporaryReplaceOutputType(sequence_length, element::f32).get(), + op::TemporaryReplaceOutputType(weights, element::f32).get(), + op::TemporaryReplaceOutputType(r_weights, element::f32).get(), + op::TemporaryReplaceOutputType(bias, element::f32).get(), lstm_seq->get_hidden_size(), lstm_seq->get_direction(), lstm_seq->get_activations_alpha(), @@ -127,15 +127,15 @@ ov::intel_cpu::ConvertFqRnnToQuantizedRnn::ConvertFqRnnToQuantizedRnn() { } else if (const auto gru_seq = ngraph::as_type_ptr(rnn)) { const auto& sequence_length = pattern_map.at(sequence_length_m); - auto rnn_quantized_tr = std::make_shared>( + auto rnn_quantized_tr = std::make_shared>( std::vector{ element::f32, element::f32, element::f32, element::f32, element::f32, element::f32}, std::vector{ element::f32, element::f32 }, - ngraph::op::TemporaryReplaceOutputType(activation, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(hidden_state, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(sequence_length, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(weights, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(r_weights, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(bias, element::f32).get(), + op::TemporaryReplaceOutputType(activation, element::f32).get(), + op::TemporaryReplaceOutputType(hidden_state, element::f32).get(), + op::TemporaryReplaceOutputType(sequence_length, element::f32).get(), + op::TemporaryReplaceOutputType(weights, element::f32).get(), + op::TemporaryReplaceOutputType(r_weights, element::f32).get(), + op::TemporaryReplaceOutputType(bias, element::f32).get(), gru_seq->get_hidden_size(), gru_seq->get_direction(), gru_seq->get_activations(), diff --git a/src/plugins/intel_cpu/src/ngraph_transformations/convert_matmul_to_fc.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_matmul_to_fc.cpp index d3ebf2a9946..20b17c26713 100644 --- a/src/plugins/intel_cpu/src/ngraph_transformations/convert_matmul_to_fc.cpp +++ b/src/plugins/intel_cpu/src/ngraph_transformations/convert_matmul_to_fc.cpp @@ -111,7 +111,7 @@ ov::intel_cpu::ConvertMatMulToFC::ConvertMatMulToFC() { std::swap(*(transpose_order.end() - 1), *(transpose_order.end() - 2)); auto transpose_const = ngraph::opset1::Constant::create(ngraph::element::i64, ngraph::Shape{ transpose_order.size() }, transpose_order); - auto transpose = ngraph::op::util::make_try_fold(node, transpose_const); + auto transpose = ov::op::util::make_try_fold(node, transpose_const); if (!ngraph::is_type(transpose)) { new_ops.push_back(transpose_const); MatcherPass::register_new_node(transpose); @@ -146,7 +146,7 @@ ov::intel_cpu::ConvertMatMulToFC::ConvertMatMulToFC() { NGRAPH_CHECK(K.is_static()); std::vector reshape_shape_values = { -1ll, static_cast(K.get_length()) }; auto reshape_shape = ngraph::opset1::Constant::create(ngraph::element::i64, ngraph::Shape{ 2 }, reshape_shape_values); - fc_input_b = ngraph::op::util::make_try_fold(fc_input_b, reshape_shape, false); + fc_input_b = ov::op::util::make_try_fold(fc_input_b, reshape_shape, false); if (!std::dynamic_pointer_cast(fc_input_b.get_node_shared_ptr())) { new_ops.push_back(reshape_shape); } diff --git a/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_cpu_specific_opset.hpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_cpu_specific_opset.hpp index 8f54aadea7b..64d62530e2c 100644 --- a/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_cpu_specific_opset.hpp +++ b/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_cpu_specific_opset.hpp @@ -37,13 +37,13 @@ inline void ConvertToCPUSpecificOpset(std::shared_ptr &nGraphF manager.register_pass(); manager.register_pass(); manager.register_pass(); - if (!ngraph::op::util::has_op_with_type(nGraphFunc)) { + if (!ov::op::util::has_op_with_type(nGraphFunc)) { manager.register_pass(); } // after transformation "MoveEltwiseUpThroughDataMov" there can be Reshape sequences that should be eliminated or fused - manager.register_pass(); + manager.register_pass(); manager.register_pass(); - manager.register_pass(precisions_array {{ ngraph::element::i64, ngraph::element::i32 }}); + manager.register_pass(precisions_array {{ ngraph::element::i64, ngraph::element::i32 }}); manager.run_passes(nGraphFunc); diff --git a/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_interaction.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_interaction.cpp index 2f20df06c7c..8df9ebcc43a 100644 --- a/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_interaction.cpp +++ b/src/plugins/intel_cpu/src/ngraph_transformations/convert_to_interaction.cpp @@ -115,7 +115,7 @@ ov::intel_cpu::FuseFQtoInteraction::FuseFQtoInteraction() { inter_node->set_output_type(0, fq_node->get_output_element_type(0), inter_node->get_output_partial_shape(0)); auto replacement = - std::make_shared>(*inter_node, + std::make_shared>(*inter_node, fq_node->get_output_element_type(0)); copy_runtime_info(inter_node, replacement); replace_node(inter_node, replacement); diff --git a/src/plugins/intel_cpu/src/ngraph_transformations/fc_bias_fusion.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/fc_bias_fusion.cpp index f07540a2be6..0bba5f8ecbc 100644 --- a/src/plugins/intel_cpu/src/ngraph_transformations/fc_bias_fusion.cpp +++ b/src/plugins/intel_cpu/src/ngraph_transformations/fc_bias_fusion.cpp @@ -54,7 +54,7 @@ ov::intel_cpu::FullyConnectedBiasFusion::FullyConnectedBiasFusion() { std::shared_ptr final_bias = bias; if (bias_shape.size() >= 2) { auto reshape_const = ngraph::opset1::Constant::create(ngraph::element::i64, ngraph::Shape{ 1 }, { -1 }); - final_bias = ngraph::op::util::make_try_fold(final_bias, reshape_const, true); + final_bias = ov::op::util::make_try_fold(final_bias, reshape_const, true); new_ops.push_back(final_bias); } diff --git a/src/plugins/intel_cpu/src/ngraph_transformations/rnn_sequences_optimization.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/rnn_sequences_optimization.cpp index 9d3d004b2f2..85c75e2e4ab 100644 --- a/src/plugins/intel_cpu/src/ngraph_transformations/rnn_sequences_optimization.cpp +++ b/src/plugins/intel_cpu/src/ngraph_transformations/rnn_sequences_optimization.cpp @@ -54,8 +54,8 @@ namespace { if (seqAxis == 0) { ngraph::Output in_0 = sequenceOp->get_input_node_shared_ptr(0)->input_value(0); - auto shapeBeforeTranspose = ngraph::op::util::make_try_fold(in_0); - auto newInShape = ngraph::op::util::make_try_fold(shapeBeforeTranspose, + auto shapeBeforeTranspose = ov::op::util::make_try_fold(in_0); + auto newInShape = ov::op::util::make_try_fold(shapeBeforeTranspose, ngraph::opset1::Constant::create(ngraph::element::i32, { 3 }, { 1, 0, 2 }), ngraph::opset1::Constant::create(ngraph::element::i32, {}, { 0 })); auto reshape1 = std::make_shared(in_0, newInShape, false); @@ -67,8 +67,8 @@ namespace { return false; auto transposeAfter = seqTargetInputs.begin()->get_node()->shared_from_this(); - auto lstmOutShape = ngraph::op::util::make_try_fold(sequenceOp->output(0)); - auto newOutShape = ngraph::op::util::make_try_fold(lstmOutShape, + auto lstmOutShape = ov::op::util::make_try_fold(sequenceOp->output(0)); + auto newOutShape = ov::op::util::make_try_fold(lstmOutShape, ngraph::opset1::Constant::create(ngraph::element::i32, { 4 }, { 2, 1, 0, 3 }), ngraph::opset1::Constant::create(ngraph::element::i32, {}, { 0 })); diff --git a/src/plugins/intel_cpu/src/nodes/if.cpp b/src/plugins/intel_cpu/src/nodes/if.cpp index 0d1fc38c4ac..b1f93795cf8 100644 --- a/src/plugins/intel_cpu/src/nodes/if.cpp +++ b/src/plugins/intel_cpu/src/nodes/if.cpp @@ -99,7 +99,7 @@ void If::getSupportedDescriptors() { const auto &outMapThen = subGraphThen.GetOutputNodesMap(); for (const auto& out : ifOp->get_then_body()->get_results()) { const auto prev = out->input_value(0); - const std::string inputID = ngraph::op::util::get_ie_output_name(prev); + const std::string inputID = ov::op::util::get_ie_output_name(prev); auto outNode = outMapThen.find(inputID); if (outNode != outMapThen.end()) { auto outMem = outNode->second->getParentEdgeAt(0)->getMemoryPtr(); @@ -113,7 +113,7 @@ void If::getSupportedDescriptors() { const auto &outMapElse = subGraphElse.GetOutputNodesMap(); for (const auto& out : ifOp->get_else_body()->get_results()) { const auto prev = out->input_value(0); - const std::string inputID = ngraph::op::util::get_ie_output_name(prev); + const std::string inputID = ov::op::util::get_ie_output_name(prev); auto outNode = outMapElse.find(inputID); if (outNode != outMapElse.end()) { auto outMem = outNode->second->getParentEdgeAt(0)->getMemoryPtr(); diff --git a/src/plugins/intel_cpu/src/nodes/multiclass_nms.cpp b/src/plugins/intel_cpu/src/nodes/multiclass_nms.cpp index dacadb2225f..54c95b2114c 100644 --- a/src/plugins/intel_cpu/src/nodes/multiclass_nms.cpp +++ b/src/plugins/intel_cpu/src/nodes/multiclass_nms.cpp @@ -32,7 +32,7 @@ bool MultiClassNms::isSupportedOperation(const std::shared_ptr& if (!one_of(op->get_type_info(), ov::op::v9::MulticlassNms::get_type_info_static(), ov::op::v8::MulticlassNms::get_type_info_static(), - ngraph::op::internal::MulticlassNmsIEInternal::get_type_info_static())) { + ov::op::internal::MulticlassNmsIEInternal::get_type_info_static())) { errorMessage = "Node is not an instance of MulticlassNms from opset v8 or v9."; return false; } diff --git a/src/plugins/intel_cpu/src/nodes/non_max_suppression.cpp b/src/plugins/intel_cpu/src/nodes/non_max_suppression.cpp index 2a4fcb20d49..780e6eb4607 100644 --- a/src/plugins/intel_cpu/src/nodes/non_max_suppression.cpp +++ b/src/plugins/intel_cpu/src/nodes/non_max_suppression.cpp @@ -557,7 +557,7 @@ bool NonMaxSuppression::isSupportedOperation(const std::shared_ptrget_type_info(), NonMaxSuppressionV9::get_type_info_static(), - ngraph::op::internal::NonMaxSuppressionIEInternal::get_type_info_static())) { + ov::op::internal::NonMaxSuppressionIEInternal::get_type_info_static())) { errorMessage = "Only NonMaxSuppression v9 and NonMaxSuppressionIEInternal are supported"; return false; } @@ -595,7 +595,7 @@ NonMaxSuppression::NonMaxSuppression(const std::shared_ptr& op, co boxEncodingType = static_cast(nms9->get_box_encoding()); sortResultDescending = nms9->get_sort_result_descending(); // TODO [DS NMS]: remove when nodes from models where nms is not last node in model supports DS - } else if (const auto nmsIe = std::dynamic_pointer_cast(op)) { + } else if (const auto nmsIe = std::dynamic_pointer_cast(op)) { boxEncodingType = nmsIe->m_center_point_box ? NMSBoxEncodeType::CENTER : NMSBoxEncodeType::CORNER; sortResultDescending = nmsIe->m_sort_result_descending; } else { diff --git a/src/plugins/intel_cpu/src/nodes/tensoriterator.cpp b/src/plugins/intel_cpu/src/nodes/tensoriterator.cpp index a62010ead57..febb93d16c9 100644 --- a/src/plugins/intel_cpu/src/nodes/tensoriterator.cpp +++ b/src/plugins/intel_cpu/src/nodes/tensoriterator.cpp @@ -377,7 +377,7 @@ void TensorIterator::getSupportedDescriptors() { const auto &outMap = sub_graph.GetOutputNodesMap(); for (const auto &out : tiOp->get_function()->get_results()) { const auto prev = out->input_value(0); - const auto inputID = ngraph::op::util::create_ie_output_name(prev); + const auto inputID = ov::op::util::create_ie_output_name(prev); auto outNode = outMap.find(inputID); if (outNode != outMap.end()) { auto outMem = outNode->second->getParentEdgeAt(0)->getMemoryPtr(); diff --git a/src/plugins/intel_cpu/src/transformation_pipeline.cpp b/src/plugins/intel_cpu/src/transformation_pipeline.cpp index 293e6fc500f..c9ced8c070a 100644 --- a/src/plugins/intel_cpu/src/transformation_pipeline.cpp +++ b/src/plugins/intel_cpu/src/transformation_pipeline.cpp @@ -344,8 +344,8 @@ void Transformations::PreLpt(const std::vector& defaultPrecis return node::NormalizeL2::isSupportedOperation(node, errorMsg); }); - pass_config->enable(); - pass_config->set_callback( + pass_config->enable(); + pass_config->set_callback( [](const_node_ptr &node) -> bool { return node->input_value(0).get_partial_shape().rank().get_length() <= 5; }); diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/caching_tests.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/caching_tests.cpp index 621d992e266..10a5a5bd06d 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/caching_tests.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/caching_tests.cpp @@ -45,7 +45,7 @@ namespace { auto max_output_boxes_per_class = ov::op::v0::Constant::create(element::i32, Shape{1}, {10}); auto iou_threshold = ov::op::v0::Constant::create(element::f32, Shape{1}, {0.75}); auto score_threshold = ov::op::v0::Constant::create(element::f32, Shape{1}, {0.7}); - auto nms = std::make_shared(boxes, scores, max_output_boxes_per_class, + auto nms = std::make_shared(boxes, scores, max_output_boxes_per_class, iou_threshold, score_threshold, 0, true, element::i32); auto res = std::make_shared(nms); auto func = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); @@ -58,7 +58,7 @@ namespace { ov::op::v8::MatrixNms::Attributes attr; // convert_precision does not support internal op 'NmsStaticShapeIE' attr.output_type = element::i32; - auto nms = std::make_shared>(boxes, scores, attr); + auto nms = std::make_shared>(boxes, scores, attr); auto res = std::make_shared(nms); auto func = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); return func; @@ -69,7 +69,7 @@ namespace { auto scores = std::make_shared(element::f32, Shape{1, 1, 1000}); ov::op::util::MulticlassNmsBase::Attributes attr; attr.output_type = element::i32; - auto nms = std::make_shared(boxes, scores, attr); + auto nms = std::make_shared(boxes, scores, attr); auto res = std::make_shared(nms); auto func = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); return func; diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/caching_tests.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/caching_tests.cpp index 68fbd1bf386..e2d517232d3 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/caching_tests.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/caching_tests.cpp @@ -45,7 +45,7 @@ namespace { auto max_output_boxes_per_class = opset1::Constant::create(element::i32, Shape{1}, {10}); auto iou_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.75}); auto score_threshold = opset1::Constant::create(element::f32, Shape{1}, {0.7}); - auto nms = std::make_shared(boxes, scores, max_output_boxes_per_class, + auto nms = std::make_shared(boxes, scores, max_output_boxes_per_class, iou_threshold, score_threshold, 0, true, element::i32); auto res = std::make_shared(nms); auto func = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); @@ -58,7 +58,7 @@ namespace { ov::op::v8::MatrixNms::Attributes attr; // convert_precision does not support internal op 'NmsStaticShapeIE' attr.output_type = element::i32; - auto nms = std::make_shared>(boxes, scores, attr); + auto nms = std::make_shared>(boxes, scores, attr); auto res = std::make_shared(nms); auto func = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); return func; @@ -69,7 +69,7 @@ namespace { auto scores = std::make_shared(element::f32, Shape{1, 1, 1000}); op::util::MulticlassNmsBase::Attributes attr; attr.output_type = element::i32; - auto nms = std::make_shared(boxes, scores, attr); + auto nms = std::make_shared(boxes, scores, attr); auto res = std::make_shared(nms); auto func = std::make_shared(NodeVector{nms}, ParameterVector{boxes, scores}); return func; diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_sequence.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_sequence.cpp index aeda5b96060..1022dffedb9 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gru_sequence.cpp @@ -138,8 +138,8 @@ protected: if (seqMode != ngraph::helpers::SequenceTestsMode::PURE_SEQ) { ov::pass::Manager manager; if (direction == ov::op::RecurrentSequenceDirection::BIDIRECTIONAL) - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); bool ti_found = ngraph::helpers::is_tensor_iterator_exist(function); EXPECT_EQ(ti_found, true); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_sequence.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_sequence.cpp index da0d608c1a6..fdc37a616e7 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/lstm_sequence.cpp @@ -146,8 +146,8 @@ protected: if (seqMode != ngraph::helpers::SequenceTestsMode::PURE_SEQ) { ov::pass::Manager manager; if (direction == ngraph::op::RecurrentSequenceDirection::BIDIRECTIONAL) - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); bool ti_found = ngraph::helpers::is_tensor_iterator_exist(function); EXPECT_EQ(ti_found, true); diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_sequence.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_sequence.cpp index b1f37ef9237..6c8afa38348 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_sequence.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rnn_sequence.cpp @@ -132,8 +132,8 @@ protected: if (seqMode != ngraph::helpers::SequenceTestsMode::PURE_SEQ) { ngraph::pass::Manager manager; if (direction == ov::op::RecurrentSequenceDirection::BIDIRECTIONAL) - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); bool ti_found = ngraph::helpers::is_tensor_iterator_exist(function); EXPECT_EQ(ti_found, true); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp index 09e92510bd1..35d91a7d80b 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp @@ -164,7 +164,7 @@ public: using namespace ngraph; auto inputParamsFP32 = builder::makeDynamicParams(element::f32, { inputParams.front()->get_partial_shape() }); - auto convolutionNodeRelaxed = std::make_shared>( + auto convolutionNodeRelaxed = std::make_shared>( *as_type_ptr(builder::makeConvolution(inputParamsFP32.front(), element::f32, _kernel, _stride, _padBegin, _padEnd, _dilation, ngraph::op::PadType::EXPLICIT, _convOutChannels)), element::f32); diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_matmul_test.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_matmul_test.cpp index 6bdd37ca50f..86db19dfa95 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_matmul_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_matmul_test.cpp @@ -32,7 +32,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest1) { f = std::make_shared(ngraph::NodeVector{ matmul }, ngraph::ParameterVector{ input1 }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -61,7 +61,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest2) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{input1, input2}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -88,7 +88,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest3) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{input1}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -115,7 +115,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest4) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{input1}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -141,7 +141,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest5) { auto f = std::make_shared(ngraph::NodeVector{ matmul }, ngraph::ParameterVector{ input1 }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); ASSERT_NO_THROW(m.run_passes(f)); } @@ -154,7 +154,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest6) { auto f = std::make_shared(ngraph::NodeVector{ matmul }, ngraph::ParameterVector{ input1 }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); ASSERT_NO_THROW(m.run_passes(f)); ASSERT_NO_THROW(check_rt_info(f)); @@ -169,7 +169,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest7) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{input1}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -196,7 +196,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest8) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{input1}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -209,7 +209,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest8) { auto fc = std::make_shared(input1, input2, ngraph::Rank(2)); auto a_shape = std::make_shared(input1); - auto I = ngraph::op::util::node_to_get_shape_value_of_indices_from_shape_node(a_shape, {0, 1}); + auto I = ov::op::util::node_to_get_shape_value_of_indices_from_shape_node(a_shape, {0, 1}); auto O = ngraph::opset1::Constant::create(ngraph::element::i64, { 1 }, { 3 }); auto output_shape = std::make_shared(ngraph::OutputVector{I, O}, 0); @@ -231,7 +231,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest9) { ngraph::pass::Manager m; auto pass_config = m.get_pass_config(); - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -257,7 +257,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest10) { auto f = std::make_shared(ngraph::NodeVector{ matmul }, ngraph::ParameterVector{ input1 }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); ASSERT_NO_THROW(m.run_passes(f)); } @@ -275,7 +275,7 @@ TEST(TransformationTests, FullyConnectedBiasFusionTest1) { f = std::make_shared(ngraph::NodeVector{add}, ngraph::ParameterVector{input1}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.register_pass([](std::shared_ptr f) { check_rt_info(f); @@ -308,7 +308,7 @@ TEST(TransformationTests, FullyConnectedBiasFusionTest2) { f = std::make_shared(ngraph::NodeVector{add}, ngraph::ParameterVector{input1}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.register_pass([](std::shared_ptr f) { check_rt_info(f); @@ -341,7 +341,7 @@ TEST(TransformationTests, FullyConnectedBiasFusionTest3) { f = std::make_shared(ngraph::NodeVector{add}, ngraph::ParameterVector{input1}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.register_pass([](std::shared_ptr f) { check_rt_info(f); @@ -374,7 +374,7 @@ TEST(TransformationTests, FullyConnectedBiasFusionTest4) { f = std::make_shared(ngraph::NodeVector{add}, ngraph::ParameterVector{input1}); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.register_pass([](std::shared_ptr f) { check_rt_info(f); @@ -434,7 +434,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest_second_input_rank_adj_1) { f = std::make_shared(ngraph::NodeVector{matmul}, ngraph::ParameterVector{input1}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -460,7 +460,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest_second_input_rank_adj_2) { f = std::make_shared(ngraph::NodeVector{ matmul }, ngraph::ParameterVector{ input1 }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); ASSERT_NO_THROW(check_rt_info(f)); @@ -488,7 +488,7 @@ TEST(TransformationTests, ConvertMatMulToFCTest_second_input_rank_adj_3) { f = std::make_shared(ngraph::NodeVector{ add }, ngraph::ParameterVector{ input1 }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.register_pass(); m.run_passes(f); diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_interaction.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_interaction.cpp index 5eb4e4752a7..a8e179ca50c 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_interaction.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_interaction.cpp @@ -113,7 +113,7 @@ static std::shared_ptr makeInteraction(const ov::PartialShape& inputS auto input_high = std::make_shared(element::f32, ov::Shape{1}, std::vector{5.08965}); auto output_low = std::make_shared(element::f32, ov::Shape{1}, std::vector{-128}); auto output_high = std::make_shared(element::f32, ov::Shape{1}, std::vector{127}); - auto fq = std::make_shared>( + auto fq = std::make_shared>( opset8::FakeQuantize(concat2, input_low, input_high, output_low, output_high, 256), element::i8); model = std::make_shared(fq, inputsParams, "interaction"); @@ -132,9 +132,9 @@ TEST(TransformationTests, ConvertToInteractionTest1) { { f = makeInteraction(inputShape); pass::Manager m; - m.register_pass(); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -166,9 +166,9 @@ TEST(TransformationTests, FuseFQtoInteractionTest1) { { f = makeInteraction(inputShape, false, true); pass::Manager m; - m.register_pass(); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); + m.register_pass(); m.register_pass(); m.register_pass(); m.run_passes(f); @@ -184,7 +184,7 @@ TEST(TransformationTests, FuseFQtoInteractionTest1) { features.push_back(sparse_feat); inputsParams.push_back(sparse_feat); } - auto interaction = std::make_shared>( + auto interaction = std::make_shared>( ov::intel_cpu::InteractionNode(features), element::i8); f_ref = std::make_shared(interaction, inputsParams, "interaction"); } @@ -202,9 +202,9 @@ TEST(TransformationTests, FuseFQtoInteractionTest2) { { f = makeInteraction(inputShape, true); pass::Manager m; - m.register_pass(); - m.register_pass(); - m.register_pass(); + m.register_pass(); + m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_leaky_relu_test.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_leaky_relu_test.cpp index a83ede4472d..6e74e89018d 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_leaky_relu_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_leaky_relu_test.cpp @@ -29,7 +29,7 @@ TEST(TransformationTests, ConvertToLeakyReluTest1) { f = std::make_shared(ngraph::NodeVector{ prelu }, ngraph::ParameterVector{ input }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -54,7 +54,7 @@ TEST(TransformationTests, ConvertToLeakyReluTest2) { f = std::make_shared(ngraph::NodeVector{ prelu }, ngraph::ParameterVector{ input }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -79,7 +79,7 @@ TEST(TransformationTests, ConvertToLeakyReluTest3) { f = std::make_shared(ngraph::NodeVector{ prelu }, ngraph::ParameterVector{ input }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -100,15 +100,15 @@ TEST(TransformationTests, ConvertToLeakyReluTest4) { { auto input = std::make_shared(ngraph::element::u8, ngraph::Shape{ 1, 3, 16, 16 }); auto slope = ngraph::opset1::Constant::create(ngraph::element::f32, ngraph::Shape{}, { -2.f }); - auto relaxed_prelu = std::make_shared>( + auto relaxed_prelu = std::make_shared>( ngraph::element::TypeVector{ ngraph::element::f32, ngraph::element::f32 }, ngraph::element::TypeVector{ ngraph::element::f32 }, - ngraph::op::TemporaryReplaceOutputType(input, ngraph::element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(slope, ngraph::element::f32).get()); + ov::op::TemporaryReplaceOutputType(input, ngraph::element::f32).get(), + ov::op::TemporaryReplaceOutputType(slope, ngraph::element::f32).get()); f = std::make_shared(ngraph::NodeVector{ relaxed_prelu }, ngraph::ParameterVector{ input }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -135,7 +135,7 @@ TEST(TransformationTests, ConvertToLeakyReluTest5) { f_ref = f; ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_eltwise_up_data_movement_test.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_eltwise_up_data_movement_test.cpp index add810570df..7ac2fadbc64 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_eltwise_up_data_movement_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_eltwise_up_data_movement_test.cpp @@ -62,7 +62,7 @@ TEST_F(MoveEltwiseUpThroughDataMovTest, TypeRelaxedEltwise) { auto transpose = std::make_shared(intermediate_op, transpose_const); auto mul_const = ngraph::opset8::Constant::create(ngraph::element::f32, {}, {2.f}); - auto multiply = std::make_shared>(transpose, mul_const); + auto multiply = std::make_shared>(transpose, mul_const); function = std::make_shared(ngraph::NodeVector{multiply}, ngraph::ParameterVector{input}); manager.register_pass(); @@ -72,7 +72,7 @@ TEST_F(MoveEltwiseUpThroughDataMovTest, TypeRelaxedEltwise) { auto intermediate_op = std::make_shared(input, 0, 6); auto mul_const = ngraph::opset8::Constant::create(ngraph::element::f32, {}, {2.f}); - auto multiply = std::make_shared>(intermediate_op, mul_const); + auto multiply = std::make_shared>(intermediate_op, mul_const); auto transpose_const = ngraph::opset8::Constant::create(ngraph::element::i64, ngraph::Shape{input_order.size()}, input_order); auto transpose = std::make_shared(multiply, transpose_const); diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/optimize_sequence_transposes_test.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/optimize_sequence_transposes_test.cpp index df5fe13ea07..55342f19fbb 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/optimize_sequence_transposes_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/optimize_sequence_transposes_test.cpp @@ -55,7 +55,7 @@ TEST(TransformationTests, OptimizeLSTMSequenceTransposesTest) { f = std::make_shared(ngraph::ResultVector{ Y_out, Ho, Co }, ngraph::ParameterVector{ X, Y, Z }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -130,7 +130,7 @@ TEST(TransformationTests, OptimizeLSTMSequenceTransposesDynamicTest) { f = std::make_shared(ngraph::ResultVector{ Y_out, Ho, Co }, ngraph::ParameterVector{ X, Y, Z }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -205,7 +205,7 @@ TEST(TransformationTests, OptimizeRNNSequenceTransposesTest) { f = std::make_shared(ngraph::ResultVector{ Y_out, Ho }, ngraph::ParameterVector{ X, Y }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -274,7 +274,7 @@ TEST(TransformationTests, OptimizeRNNSequenceTransposesDynamicTest) { f = std::make_shared(ngraph::ResultVector{ Y_out, Ho }, ngraph::ParameterVector{ X, Y }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -346,7 +346,7 @@ TEST(TransformationTests, OptimizeGRUSequenceTransposesTest) { f = std::make_shared(ngraph::ResultVector{ Y_out, Ho }, ngraph::ParameterVector{ X, Y }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } @@ -415,7 +415,7 @@ TEST(TransformationTests, OptimizeGRUSequenceTransposesDynamicTest) { f = std::make_shared(ngraph::ResultVector{ Y_out, Ho }, ngraph::ParameterVector{ X, Y }); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(f); } diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/make_shape_inference.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/make_shape_inference.cpp index 3cf5f7b7850..f79ce70d1cb 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/make_shape_inference.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/make_shape_inference.cpp @@ -23,7 +23,7 @@ TEST(StaticShapeInferenceTest, MakeShapeInference) { auto inp1 = std::make_shared(element::i8, PartialShape{-1, -1, -1, -1}); auto inp2 = std::make_shared(element::i8, PartialShape{-1, -1, -1, -1}); - auto matMulRelaxed = std::make_shared>( + auto matMulRelaxed = std::make_shared>( *as_type_ptr(ngraph::builder::makeMatMul(inp1_f32, inp2_f32, false, false)), element::f32); diff --git a/src/plugins/intel_gna/src/gna_plugin.cpp b/src/plugins/intel_gna/src/gna_plugin.cpp index fecc84cce8e..6274b62c716 100644 --- a/src/plugins/intel_gna/src/gna_plugin.cpp +++ b/src/plugins/intel_gna/src/gna_plugin.cpp @@ -461,7 +461,7 @@ void GNAPlugin::UpdateInputs(const std::vector>& void GNAPlugin::UpdateOutputs(const std::vector>& results) { OV_ITT_SCOPED_TASK(itt::domains::GNA_LT, "UpdateOutputs"); for (const auto& result : results) { - const std::string ie_name = ngraph::op::util::create_ie_output_name(result->input_value(0)); + const std::string ie_name = ov::op::util::create_ie_output_name(result->input_value(0)); outputs_[ie_name].name = ie_name; outputs_[ie_name].tensor_names = result->get_output_tensor(0).get_names(); } @@ -660,28 +660,28 @@ void GNAPlugin::LoadNetwork(const CNNNetwork& _network) { CNNNetwork clonedNetwork = InferenceEngine::cloneNetwork(_network); const auto& graph = clonedNetwork.getFunction(); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); - fake_quantized = ngraph::op::util::has_op_with_type(graph); + fake_quantized = ov::op::util::has_op_with_type(graph); // In OV API 2.0(IRv10) default convertion to fp32 (inputs, outputs and weights) is disabled // and we need to run the ConvertPrecision transformation to support old networks. - manager.register_pass( + manager.register_pass( precisions_array{{ngraph::element::f16, ngraph::element::f32}}); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.register_pass(); manager.register_pass(effectiveGnaCompileTargetValue, config.gnaPrecision); manager.register_pass(effectiveGnaCompileTargetValue, config.gnaPrecision); manager.register_pass(effectiveGnaCompileTargetValue, config.gnaPrecision); // TODO enable this transformation for networks with convolutions - if (!ngraph::op::util::has_op_with_type(graph)) { + if (!ov::op::util::has_op_with_type(graph)) { manager.register_pass(); manager.register_pass(); manager.register_pass(); @@ -706,8 +706,8 @@ void GNAPlugin::LoadNetwork(const CNNNetwork& _network) { manager.register_pass(); manager.register_pass(); manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.register_pass(); manager.register_pass(); @@ -739,7 +739,7 @@ void GNAPlugin::LoadNetwork(const CNNNetwork& _network) { manager.register_pass(config.gnaFlags.pwlMaxErrorPercent); manager.register_pass(config.gnaFlags.pwlMaxErrorPercent); } - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.register_pass(); manager.register_pass(); @@ -750,19 +750,19 @@ void GNAPlugin::LoadNetwork(const CNNNetwork& _network) { pass_config->disable(); pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); // Consider to enable after per-channel quantization on FakeQuantize layer is supported in GNAPlugin, see issue // 52034 - pass_config->disable(); + pass_config->disable(); // TransposeReduction can be enabled when Transpose-Conv-Transpose patterns will be handled in ngraph // transformations - pass_config->disable(); + pass_config->disable(); // Operations Max and Min aren't supported - pass_config->disable(); - // pass_config->disable(); + pass_config->disable(); + // pass_config->disable(); manager.run_passes(graph); convertedNetwork = InferenceEngine::details::convertFunctionToICNNNetwork(graph, clonedNetwork); isNgraphPassesUsed = true; diff --git a/src/plugins/intel_gna/src/ops/util/util.hpp b/src/plugins/intel_gna/src/ops/util/util.hpp index 93521347280..bb6603a49ea 100644 --- a/src/plugins/intel_gna/src/ops/util/util.hpp +++ b/src/plugins/intel_gna/src/ops/util/util.hpp @@ -159,7 +159,7 @@ static bool is_power_activation(const ov::Node* node) noexcept { if (!const_node) return false; float value; - if (!ngraph::op::util::get_single_value(const_node, value)) { + if (!ov::op::util::get_single_value(const_node, value)) { return true; } return (1.0f != value); diff --git a/src/plugins/intel_gna/src/transformations/broadcast_const.cpp b/src/plugins/intel_gna/src/transformations/broadcast_const.cpp index 849adf7c759..58ca3a3f773 100644 --- a/src/plugins/intel_gna/src/transformations/broadcast_const.cpp +++ b/src/plugins/intel_gna/src/transformations/broadcast_const.cpp @@ -66,14 +66,14 @@ bool DoTransformation(Node const_node_1, Node const_node_2, Node eltwise_node) { auto broadcast_const = ngraph::opset8::Constant::create(ngraph::element::Type_t::i64, ngraph::Shape{eltwise_out_shape.size()}, eltwise_out_shape); - auto new_const_node_1 = ngraph::op::util::make_try_fold(const_node_1, + auto new_const_node_1 = ov::op::util::make_try_fold(const_node_1, broadcast_const, GetBroadcastType(eltwise_node)); ngraph::replace_node(const_node_1, new_const_node_1); if (const_node_2) { - auto new_const_node_2 = ngraph::op::util::make_try_fold(const_node_2, + auto new_const_node_2 = ov::op::util::make_try_fold(const_node_2, broadcast_const, GetBroadcastType(eltwise_node)); diff --git a/src/plugins/intel_gna/src/transformations/convert_dwsc_to_scaleshifts.cpp b/src/plugins/intel_gna/src/transformations/convert_dwsc_to_scaleshifts.cpp index c8cbabb9344..7f1cf8d7f28 100644 --- a/src/plugins/intel_gna/src/transformations/convert_dwsc_to_scaleshifts.cpp +++ b/src/plugins/intel_gna/src/transformations/convert_dwsc_to_scaleshifts.cpp @@ -40,7 +40,7 @@ static std::shared_ptr DecomposeDWSC(std::shared_ptrget_shape()); - reshaped_bias = ngraph::op::util::make_try_fold(bias_const, + reshaped_bias = ov::op::util::make_try_fold(bias_const, ngraph::opset7::Constant::create(ngraph::element::i64, ngraph::Shape{2}, ngraph::Shape{1, bias_size}), false); } @@ -124,10 +124,10 @@ static bool Convert(std::shared_ptr leading_transpose, auto filters_const = std::dynamic_pointer_cast(dwsc->get_input_node_shared_ptr(1)); auto filters_size = shape_size(filters_const->get_shape()); - auto transposed_filters_const = ngraph::op::util::make_try_fold(filters_const, + auto transposed_filters_const = ov::op::util::make_try_fold(filters_const, ngraph::opset7::Constant::create(ngraph::element::i64, ngraph::Shape{5}, ngraph::Shape{4, 1, 2, 3, 0})); - auto flat_filters_plane = ngraph::op::util::make_try_fold(transposed_filters_const, + auto flat_filters_plane = ov::op::util::make_try_fold(transposed_filters_const, ngraph::opset7::Constant::create(ngraph::element::i64, ngraph::Shape{2}, ngraph::Shape{1, filters_size}), false); copy_runtime_info(dwsc, {flat_input_plane, transposed_filters_const, flat_filters_plane}); diff --git a/src/plugins/intel_gna/src/transformations/decompose_2d_convolution.cpp b/src/plugins/intel_gna/src/transformations/decompose_2d_convolution.cpp index 85e541a3bae..87931027398 100644 --- a/src/plugins/intel_gna/src/transformations/decompose_2d_convolution.cpp +++ b/src/plugins/intel_gna/src/transformations/decompose_2d_convolution.cpp @@ -182,7 +182,7 @@ static std::vector> Split2DConvFilters(std::shared } for (auto &new_filter : result) - new_filter = ngraph::op::util::make_try_fold(new_filter, + new_filter = ov::op::util::make_try_fold(new_filter, ngraph::opset7::Constant::create(ngraph::element::i64, ngraph::Shape{4}, reshape_shape), false); return result; @@ -314,7 +314,7 @@ static std::shared_ptr Create1DConv(const GraphData& graph_data, c // Bias & fake quantize if (graph_data.bias_const && conv_index == 0) { auto bias_size = shape_size(graph_data.bias_const->get_shape()); - auto reshaped_bias_const = ngraph::op::util::make_try_fold(graph_data.bias_const, + auto reshaped_bias_const = ov::op::util::make_try_fold(graph_data.bias_const, ngraph::opset7::Constant::create(ngraph::element::i64, ngraph::Shape{4}, ngraph::Shape{1, bias_size, 1, 1}), false); last_conv_block_op = std::make_shared(conv, reshaped_bias_const); copy_runtime_info(graph_data.conv, last_conv_block_op); diff --git a/src/plugins/intel_gna/src/transformations/insert_reshape_around_matmul.cpp b/src/plugins/intel_gna/src/transformations/insert_reshape_around_matmul.cpp index e08917de74e..dce863b98fd 100644 --- a/src/plugins/intel_gna/src/transformations/insert_reshape_around_matmul.cpp +++ b/src/plugins/intel_gna/src/transformations/insert_reshape_around_matmul.cpp @@ -57,7 +57,7 @@ static bool InsertReshape( if (add_input->get_output_shape(0).size() != 2) { auto consumers = add_input->output(0).get_target_inputs(); std::vector before_shape = {-1, static_cast(add_input->get_output_shape(0).back())}; - auto reshape_add_input = ngraph::op::util::make_try_fold(add_input, + auto reshape_add_input = ov::op::util::make_try_fold(add_input, std::make_shared(ngraph::element::Type_t::i64, ngraph::Shape{before_shape.size()}, before_shape), false); reshape_add_input->set_friendly_name(reshape_add_input->get_friendly_name() + "/reshape_before_add"); ngraph::copy_runtime_info(add_node, reshape_add_input); diff --git a/src/plugins/intel_gna/src/transformations/substitute_softsign.cpp b/src/plugins/intel_gna/src/transformations/substitute_softsign.cpp index cc09fa59e83..83887df27ec 100644 --- a/src/plugins/intel_gna/src/transformations/substitute_softsign.cpp +++ b/src/plugins/intel_gna/src/transformations/substitute_softsign.cpp @@ -39,7 +39,7 @@ public: return false; float value; - if (!ngraph::op::util::get_single_value(node, value)) { + if (!ov::op::util::get_single_value(node, value)) { return false; } diff --git a/src/plugins/intel_gna/tests/functional/pass_tests/remove_permutations_NHWC_to_NCHW_pass.cpp b/src/plugins/intel_gna/tests/functional/pass_tests/remove_permutations_NHWC_to_NCHW_pass.cpp index cc062418516..ae915f367eb 100644 --- a/src/plugins/intel_gna/tests/functional/pass_tests/remove_permutations_NHWC_to_NCHW_pass.cpp +++ b/src/plugins/intel_gna/tests/functional/pass_tests/remove_permutations_NHWC_to_NCHW_pass.cpp @@ -173,7 +173,7 @@ class RemovePermutationsNHWCToNCHWPassTest : public testing::WithParamInterface< function = std::make_shared(results, params, "RemovePermutationsTest"); if (transpose_to_reshape) { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(function); } } @@ -304,7 +304,7 @@ class RemovePermutationsWithPoolAndActTest : public testing::WithParamInterface< if (transpose_to_reshape) { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(function); } } diff --git a/src/plugins/intel_gna/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp b/src/plugins/intel_gna/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp index d0c32356876..bc3b75dc78e 100644 --- a/src/plugins/intel_gna/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp +++ b/src/plugins/intel_gna/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp @@ -51,7 +51,7 @@ protected: function = std::make_shared(results, params, "gru_cell"); if (should_decompose) { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(function); } } diff --git a/src/plugins/intel_gna/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp b/src/plugins/intel_gna/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp index b090f61c3e0..e97c2e50524 100644 --- a/src/plugins/intel_gna/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp +++ b/src/plugins/intel_gna/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp @@ -65,8 +65,8 @@ protected: if (!is_pure_sequence) { ngraph::pass::Manager manager; if (direction == ngraph::op::RecurrentSequenceDirection::BIDIRECTIONAL) - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); bool ti_found = is_tensor_iterator_exist(function); EXPECT_EQ(ti_found, true); diff --git a/src/plugins/intel_gna/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp b/src/plugins/intel_gna/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp index 502629b69ab..316cce19e6a 100644 --- a/src/plugins/intel_gna/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp +++ b/src/plugins/intel_gna/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp @@ -61,8 +61,8 @@ protected: if (!is_pure_sequence) { ngraph::pass::Manager manager; if (direction == ngraph::op::RecurrentSequenceDirection::BIDIRECTIONAL) - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); bool ti_found = is_tensor_iterator_exist(function); EXPECT_EQ(ti_found, true); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_broadcast_const.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_broadcast_const.cpp index b7daf6aa8bf..77ae1ad1b76 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_broadcast_const.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_broadcast_const.cpp @@ -224,7 +224,7 @@ void BroadcastConstTestFixture::SetUp() { void execute_test(std::shared_ptr function, std::shared_ptr reference_function) { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(function); ASSERT_NO_THROW(check_rt_info(function)); @@ -239,7 +239,7 @@ void execute_cloned_test(std::shared_ptr function) { auto reference_function = ngraph::clone_function(*function); ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(function); ASSERT_NO_THROW(check_rt_info(function)); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_convert_dwsc_to_scaleshifts.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_convert_dwsc_to_scaleshifts.cpp index d3b66616767..62ebe9b2568 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_convert_dwsc_to_scaleshifts.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_convert_dwsc_to_scaleshifts.cpp @@ -248,7 +248,7 @@ std::shared_ptr DecomposeDWSC(std::shared_ptrget_shape()); - reshaped_bias = ngraph::op::util::make_try_fold(bias_const, + reshaped_bias = ov::op::util::make_try_fold(bias_const, ngraph::opset7::Constant::create(ngraph::element::i64, ngraph::Shape{2}, ngraph::Shape{1, bias_size}), false); } @@ -323,10 +323,10 @@ std::shared_ptr ConvertDWSCToScaleShiftsTestFixture::get_refer auto filters_const = std::dynamic_pointer_cast(dwsc->get_input_node_shared_ptr(1)); auto filters_size = ngraph::shape_size(filters_const->get_shape()); - auto transposed_filters_const = ngraph::op::util::make_try_fold(filters_const, + auto transposed_filters_const = ov::op::util::make_try_fold(filters_const, ngraph::opset7::Constant::create(ngraph::element::i64, ngraph::Shape{5}, ngraph::Shape{4, 1, 2, 3, 0})); - auto flat_filters_plane = ngraph::op::util::make_try_fold(transposed_filters_const, + auto flat_filters_plane = ov::op::util::make_try_fold(transposed_filters_const, ngraph::opset7::Constant::create(ngraph::element::i64, ngraph::Shape{2}, ngraph::Shape{1, filters_size}), false); // Convert DWSC to a set of diagonal layers @@ -344,7 +344,7 @@ std::shared_ptr ConvertDWSCToScaleShiftsTestFixture::get_refer void execute_test(modelType model, std::shared_ptr function, std::shared_ptr reference_function) { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(function); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_convert_matmul_to_pointwise_convolution.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_convert_matmul_to_pointwise_convolution.cpp index c5c3401aaa5..70b89181c81 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_convert_matmul_to_pointwise_convolution.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_convert_matmul_to_pointwise_convolution.cpp @@ -265,7 +265,7 @@ void execute_test(std::shared_ptr function, std::shared_ptr ngraph::pass::Manager createPassManager() { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); return manager; } diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_convert_padded_to_valid_convolution.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_convert_padded_to_valid_convolution.cpp index 5987935d5de..28d1837d0db 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_convert_padded_to_valid_convolution.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_convert_padded_to_valid_convolution.cpp @@ -419,7 +419,7 @@ std::shared_ptr ConvertPaddedToValidConvTestFixture::get_refer void execute_test(std::shared_ptr function, std::shared_ptr reference_function) { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(function); const FunctionsComparator func_comparator = FunctionsComparator::with_default().enable(FunctionsComparator::ATTRIBUTES); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_2d_convolution.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_2d_convolution.cpp index d45d8ae5ec4..300abd7ba0f 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_2d_convolution.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_2d_convolution.cpp @@ -336,7 +336,7 @@ std::shared_ptr ReshapeBiasConst(std::shared_ptrget_shape()); - return ngraph::op::util::make_try_fold(add_const, + return ov::op::util::make_try_fold(add_const, ngraph::opset7::Constant::create(ngraph::element::i64, ngraph::Shape{4}, ngraph::Shape{1, bias_size, 1, 1}), false); } @@ -388,7 +388,7 @@ static std::vector> Split2DConvFilters(std::shared } for (auto& new_filter : result) - new_filter = ngraph::op::util::make_try_fold(new_filter, + new_filter = ov::op::util::make_try_fold(new_filter, ngraph::opset7::Constant::create(ngraph::element::i64, ngraph::Shape{4}, reshape_shape), false); return result; @@ -725,7 +725,7 @@ std::shared_ptr Decompose2DConvTestFixture::get_reference(cons void execute_test(modelType model, std::shared_ptr function, std::shared_ptr reference_function) { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); InferenceEngine::Precision gnaPrecision = InferenceEngine::Precision::I16; switch (model) { diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_mvn.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_mvn.cpp index 574422d2c4a..124957de40d 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_mvn.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_decompose_mvn.cpp @@ -225,8 +225,8 @@ namespace { void execute_test(std::shared_ptr function, std::shared_ptr reference_function) { ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(function); const FunctionsComparator func_comparator = FunctionsComparator::with_default().enable(FunctionsComparator::ATTRIBUTES); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_handle_transposes_around_matmul.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_handle_transposes_around_matmul.cpp index 8f03211d1ea..b7fd2602511 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_handle_transposes_around_matmul.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_handle_transposes_around_matmul.cpp @@ -284,7 +284,7 @@ namespace { void RunTest(const std::shared_ptr& func, const std::shared_ptr& reference_func) { { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); ASSERT_NO_THROW(check_rt_info(func)); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_copy_layer.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_copy_layer.cpp index efec8d82d99..690371363c2 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_copy_layer.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_copy_layer.cpp @@ -108,7 +108,7 @@ public: void Validate() override { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(m_func); @@ -167,7 +167,7 @@ public: } void Validate() override { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(m_func); @@ -210,7 +210,7 @@ TEST(TransformationTests, InsertCopyLayerMultiParamConcatTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -237,8 +237,8 @@ TEST(TransformationTests, InsertCopyLayerMultiParamNFLConcatTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); - auto reshape1 = ngraph::op::util::reshapeTo(params, shape); - auto reshape2 = ngraph::op::util::reshapeTo(params, shape); + auto reshape1 = ov::op::util::reshapeTo(params, shape); + auto reshape2 = ov::op::util::reshapeTo(params, shape); ngraph::OutputVector concat_inputs{reshape1, reshape2}; auto concat = std::make_shared(concat_inputs, axis); @@ -250,8 +250,8 @@ TEST(TransformationTests, InsertCopyLayerMultiParamNFLConcatTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); - auto reshape1 = ngraph::op::util::reshapeTo(params, shape); - auto reshape2 = ngraph::op::util::reshapeTo(params, shape); + auto reshape1 = ov::op::util::reshapeTo(params, shape); + auto reshape2 = ov::op::util::reshapeTo(params, shape); auto copy1 = std::make_shared(reshape1); auto copy2 = std::make_shared(reshape2); @@ -264,7 +264,7 @@ TEST(TransformationTests, InsertCopyLayerMultiParamNFLConcatTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -292,8 +292,8 @@ TEST(TransformationTests, InsertCopyLayerMultiParamMultiNFLConcatTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); - auto reshape1 = ngraph::op::util::reshapeTo(params, shape); - auto reshape2 = ngraph::op::util::reshapeTo(params, shape); + auto reshape1 = ov::op::util::reshapeTo(params, shape); + auto reshape2 = ov::op::util::reshapeTo(params, shape); ngraph::OutputVector concat_inputs{reshape1, reshape2}; auto concat1 = std::make_shared(concat_inputs, axis); @@ -308,8 +308,8 @@ TEST(TransformationTests, InsertCopyLayerMultiParamMultiNFLConcatTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); - auto reshape1 = ngraph::op::util::reshapeTo(params, shape); - auto reshape2 = ngraph::op::util::reshapeTo(params, shape); + auto reshape1 = ov::op::util::reshapeTo(params, shape); + auto reshape2 = ov::op::util::reshapeTo(params, shape); auto copy1 = std::make_shared(reshape1); auto copy2 = std::make_shared(reshape2); @@ -325,7 +325,7 @@ TEST(TransformationTests, InsertCopyLayerMultiParamMultiNFLConcatTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -386,7 +386,7 @@ TEST(TransformationTests, InsertCopyLayerMultiConstConcatTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -449,7 +449,7 @@ TEST(TransformationTests, InsertCopyLayerMultiLayerConcatTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -479,8 +479,8 @@ TEST(TransformationTests, InsertCopyLayerMultiLayerNFLConcatTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); auto add = std::make_shared(params, params); - auto reshape1 = ngraph::op::util::reshapeTo(add, shape); - auto reshape2 = ngraph::op::util::reshapeTo(add, shape); + auto reshape1 = ov::op::util::reshapeTo(add, shape); + auto reshape2 = ov::op::util::reshapeTo(add, shape); ngraph::OutputVector concat_inputs{reshape1, reshape2}; auto concat = std::make_shared(concat_inputs, axis); auto result = std::make_shared(concat); @@ -492,9 +492,9 @@ TEST(TransformationTests, InsertCopyLayerMultiLayerNFLConcatTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); auto add = std::make_shared(params, params); - auto reshape1 = ngraph::op::util::reshapeTo(add, shape); + auto reshape1 = ov::op::util::reshapeTo(add, shape); auto reshape_copy = std::make_shared(reshape1); - auto reshape2 = ngraph::op::util::reshapeTo(add, shape); + auto reshape2 = ov::op::util::reshapeTo(add, shape); ngraph::OutputVector concat_inputs{reshape_copy, reshape2}; auto concat = std::make_shared(concat_inputs, axis); @@ -507,8 +507,8 @@ TEST(TransformationTests, InsertCopyLayerMultiLayerNFLConcatTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); auto add = std::make_shared(params, params); - auto reshape1 = ngraph::op::util::reshapeTo(add, shape); - auto reshape2 = ngraph::op::util::reshapeTo(add, shape); + auto reshape1 = ov::op::util::reshapeTo(add, shape); + auto reshape2 = ov::op::util::reshapeTo(add, shape); auto reshape_copy = std::make_shared(reshape2); ngraph::OutputVector concat_inputs{reshape1, reshape_copy}; @@ -520,7 +520,7 @@ TEST(TransformationTests, InsertCopyLayerMultiLayerNFLConcatTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -581,7 +581,7 @@ TEST(TransformationTests, InsertCopyLayerMultiParamMemoryTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -639,7 +639,7 @@ TEST(TransformationTests, InsertCopyLayerMultiParamConcatMemoryTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -669,8 +669,8 @@ TEST(TransformationTests, InsertCopyLayerMultiParamNFLConcatMemoryTest) { { auto variable = std::make_shared(ov::op::util::VariableInfo{shape2, ngraph::element::i64, variable_name}); auto input = std::make_shared(ngraph::element::i64, in_shape); - auto reshape1 = ngraph::op::util::reshapeTo(input, shape1); - auto reshape2 = ngraph::op::util::reshapeTo(input, shape2); + auto reshape1 = ov::op::util::reshapeTo(input, shape1); + auto reshape2 = ov::op::util::reshapeTo(input, shape2); auto init_value = ngraph::builder::makeConstant(ngraph::element::i64, shape2, std::vector{0}); auto read_value = std::make_shared(init_value, variable); @@ -689,8 +689,8 @@ TEST(TransformationTests, InsertCopyLayerMultiParamNFLConcatMemoryTest) { { auto variable = std::make_shared(ov::op::util::VariableInfo{shape2, ngraph::element::i64, variable_name}); auto input = std::make_shared(ngraph::element::i64, in_shape); - auto reshape1 = ngraph::op::util::reshapeTo(input, shape1); - auto reshape2 = ngraph::op::util::reshapeTo(input, shape2); + auto reshape1 = ov::op::util::reshapeTo(input, shape1); + auto reshape2 = ov::op::util::reshapeTo(input, shape2); auto copy1 = std::make_shared(reshape1); auto copy2 = std::make_shared(reshape2); @@ -709,7 +709,7 @@ TEST(TransformationTests, InsertCopyLayerMultiParamNFLConcatMemoryTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -741,7 +741,7 @@ TEST(TransformationTests, InsertCopyLayerMultiLayerConcatMemoryTest) { { auto variable = std::make_shared(ov::op::util::VariableInfo{out_shape, ngraph::element::i64, variable_name}); auto input = std::make_shared(ngraph::element::i64, in_shape); - auto reshape = ngraph::op::util::reshapeTo(input, shape); + auto reshape = ov::op::util::reshapeTo(input, shape); auto crop = std::make_shared(reshape, axes, dim, offset); auto init_value = ngraph::builder::makeConstant(ngraph::element::i64, out_shape, std::vector{0}); @@ -760,7 +760,7 @@ TEST(TransformationTests, InsertCopyLayerMultiLayerConcatMemoryTest) { { auto variable = std::make_shared(ov::op::util::VariableInfo{out_shape, ngraph::element::i64, variable_name}); auto input = std::make_shared(ngraph::element::i64, in_shape); - auto reshape = ngraph::op::util::reshapeTo(input, shape); + auto reshape = ov::op::util::reshapeTo(input, shape); auto crop = std::make_shared(reshape, axes, dim, offset); auto copy = std::make_shared(crop); @@ -778,7 +778,7 @@ TEST(TransformationTests, InsertCopyLayerMultiLayerConcatMemoryTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -812,9 +812,9 @@ TEST(TransformationTests, InsertCopyLayerCropMemoryTest) { { auto variable = std::make_shared(ov::op::util::VariableInfo{shape2, ngraph::element::i64, variable_name}); auto input = std::make_shared(ngraph::element::i64, in_shape); - auto reshape1 = ngraph::op::util::reshapeTo(input, shape1); + auto reshape1 = ov::op::util::reshapeTo(input, shape1); auto crop = std::make_shared(reshape1, axes, dim, offset); - auto reshape2 = ngraph::op::util::reshapeTo(crop, shape2); + auto reshape2 = ov::op::util::reshapeTo(crop, shape2); auto init_value = ngraph::builder::makeConstant(ngraph::element::i64, shape2, std::vector{0}); auto read_value = std::make_shared(init_value, variable); @@ -832,9 +832,9 @@ TEST(TransformationTests, InsertCopyLayerCropMemoryTest) { { auto variable = std::make_shared(ov::op::util::VariableInfo{shape2, ngraph::element::i64, variable_name}); auto input = std::make_shared(ngraph::element::i64, in_shape); - auto reshape1 = ngraph::op::util::reshapeTo(input, shape1); + auto reshape1 = ov::op::util::reshapeTo(input, shape1); auto crop = std::make_shared(reshape1, axes, dim, offset); - auto reshape2 = ngraph::op::util::reshapeTo(crop, shape2); + auto reshape2 = ov::op::util::reshapeTo(crop, shape2); auto copy = std::make_shared(reshape2); auto init_value = ngraph::builder::makeConstant(ngraph::element::i64, shape2, std::vector{0}); @@ -851,7 +851,7 @@ TEST(TransformationTests, InsertCopyLayerCropMemoryTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -916,7 +916,7 @@ TEST(TransformationTests, InsertCopyLayerCropNFLMemoryTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -983,7 +983,7 @@ TEST(TransformationTests, InsertCopyLayerConcatMemoryTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -1018,7 +1018,7 @@ TEST(TransformationTests, InsertCopyLayerConcatNFLMemoryTest) { auto input1 = std::make_shared(ngraph::element::i64, in_shape); auto input2 = std::make_shared(ngraph::element::i64, in_shape); auto concat = std::make_shared(ngraph::OutputVector{input1, input2}, axis); - auto reshape = ngraph::op::util::reshapeTo(concat, shape); + auto reshape = ov::op::util::reshapeTo(concat, shape); auto init_value = ngraph::builder::makeConstant(ngraph::element::i64, shape, std::vector{0}); auto read_value = std::make_shared(init_value, variable); @@ -1038,7 +1038,7 @@ TEST(TransformationTests, InsertCopyLayerConcatNFLMemoryTest) { auto input1 = std::make_shared(ngraph::element::i64, in_shape); auto input2 = std::make_shared(ngraph::element::i64, in_shape); auto concat = std::make_shared(ngraph::OutputVector{input1, input2}, axis); - auto reshape = ngraph::op::util::reshapeTo(concat, shape); + auto reshape = ov::op::util::reshapeTo(concat, shape); auto copy = std::make_shared(reshape); auto init_value = ngraph::builder::makeConstant(ngraph::element::i64, shape, std::vector{0}); @@ -1055,7 +1055,7 @@ TEST(TransformationTests, InsertCopyLayerConcatNFLMemoryTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -1115,7 +1115,7 @@ TEST(TransformationTests, InsertCopyLayerSplitMemoryTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -1146,7 +1146,7 @@ TEST(TransformationTests, InsertCopyLayerSplitNFLMemoryTest) { auto variable = std::make_shared(ov::op::util::VariableInfo{out_shape, ngraph::element::i64, variable_name}); auto input = std::make_shared(ngraph::element::i64, in_shape); auto split = ngraph::builder::makeSplit(input, ngraph::element::i64, 2, axis); - auto reshape = ngraph::op::util::reshapeTo(split, shape); + auto reshape = ov::op::util::reshapeTo(split, shape); auto init_value = ngraph::builder::makeConstant(ngraph::element::i64, out_shape, std::vector{0}); auto read_value = std::make_shared(init_value, variable); auto assign = std::make_shared(reshape, variable); @@ -1164,7 +1164,7 @@ TEST(TransformationTests, InsertCopyLayerSplitNFLMemoryTest) { auto variable = std::make_shared(ov::op::util::VariableInfo{out_shape, ngraph::element::i64, variable_name}); auto input = std::make_shared(ngraph::element::i64, in_shape); auto split = ngraph::builder::makeSplit(input, ngraph::element::i64, 2, axis); - auto reshape = ngraph::op::util::reshapeTo(split, shape); + auto reshape = ov::op::util::reshapeTo(split, shape); auto copy = std::make_shared(reshape); auto init_value = ngraph::builder::makeConstant(ngraph::element::i64, out_shape, std::vector{0}); auto read_value = std::make_shared(init_value, variable); @@ -1180,7 +1180,7 @@ TEST(TransformationTests, InsertCopyLayerSplitNFLMemoryTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -1213,7 +1213,7 @@ TEST(TransformationTests, InsertCopyLayerCropConcatTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); - auto reshape = ngraph::op::util::reshapeTo(params, shape); + auto reshape = ov::op::util::reshapeTo(params, shape); auto crop = std::make_shared(reshape, axes, dim, offset); auto const_value = ngraph::builder::makeConstant(ngraph::element::i64, out_shape, std::vector{1}); auto concat = std::make_shared(ngraph::OutputVector{crop, const_value}, axis); @@ -1225,7 +1225,7 @@ TEST(TransformationTests, InsertCopyLayerCropConcatTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); - auto reshape = ngraph::op::util::reshapeTo(params, shape); + auto reshape = ov::op::util::reshapeTo(params, shape); auto crop = std::make_shared(reshape, axes, dim, offset); auto copy = std::make_shared(crop); auto const_value = ngraph::builder::makeConstant(ngraph::element::i64, out_shape, std::vector{1}); @@ -1237,7 +1237,7 @@ TEST(TransformationTests, InsertCopyLayerCropConcatTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -1264,7 +1264,7 @@ TEST(TransformationTests, InsertCopyLayerNonfuncTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); - auto reshape = ngraph::op::util::reshapeTo(params, shape); + auto reshape = ov::op::util::reshapeTo(params, shape); auto result = std::make_shared(reshape); func = std::make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{params}, @@ -1274,7 +1274,7 @@ TEST(TransformationTests, InsertCopyLayerNonfuncTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); auto copy = std::make_shared(params); - auto reshape = ngraph::op::util::reshapeTo(copy, shape); + auto reshape = ov::op::util::reshapeTo(copy, shape); auto result = std::make_shared(reshape); ref_func = std::make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{params}, @@ -1282,7 +1282,7 @@ TEST(TransformationTests, InsertCopyLayerNonfuncTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -1309,8 +1309,8 @@ TEST(TransformationTests, InsertCopyLayerNonfuncTwoSubgraphsTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); - auto reshape1 = ngraph::op::util::reshapeTo(params, shape); - auto reshape2 = ngraph::op::util::reshapeTo(params, shape); + auto reshape1 = ov::op::util::reshapeTo(params, shape); + auto reshape2 = ov::op::util::reshapeTo(params, shape); auto result1 = std::make_shared(reshape1); auto result2 = std::make_shared(reshape2); func = std::make_shared(ngraph::ResultVector{result1, result2}, @@ -1321,8 +1321,8 @@ TEST(TransformationTests, InsertCopyLayerNonfuncTwoSubgraphsTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); auto copy = std::make_shared(params); - auto reshape1 = ngraph::op::util::reshapeTo(copy, shape); - auto reshape2 = ngraph::op::util::reshapeTo(copy, shape); + auto reshape1 = ov::op::util::reshapeTo(copy, shape); + auto reshape2 = ov::op::util::reshapeTo(copy, shape); auto result1 = std::make_shared(reshape1); auto result2 = std::make_shared(reshape2); ref_func = std::make_shared(ngraph::ResultVector{result1, result2}, @@ -1331,7 +1331,7 @@ TEST(TransformationTests, InsertCopyLayerNonfuncTwoSubgraphsTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -1358,7 +1358,7 @@ TEST(TransformationTests, InsertCopyLayerNonfuncTwoResultsTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); - auto reshape = ngraph::op::util::reshapeTo(params, shape); + auto reshape = ov::op::util::reshapeTo(params, shape); auto result1 = std::make_shared(reshape); auto result2 = std::make_shared(reshape); func = std::make_shared(ngraph::ResultVector{result1, result2}, @@ -1369,7 +1369,7 @@ TEST(TransformationTests, InsertCopyLayerNonfuncTwoResultsTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); auto copy = std::make_shared(params); - auto reshape = ngraph::op::util::reshapeTo(copy, shape); + auto reshape = ov::op::util::reshapeTo(copy, shape); auto result1 = std::make_shared(reshape); auto result2 = std::make_shared(reshape); ref_func = std::make_shared(ngraph::ResultVector{result1, result2}, @@ -1378,7 +1378,7 @@ TEST(TransformationTests, InsertCopyLayerNonfuncTwoResultsTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -1407,8 +1407,8 @@ TEST(TransformationTests, InsertCopyLayerNFLBranchTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); - auto reshape = ngraph::op::util::reshapeTo(params, shape); - auto reshape2 = ngraph::op::util::reshapeTo(reshape, shape); + auto reshape = ov::op::util::reshapeTo(params, shape); + auto reshape2 = ov::op::util::reshapeTo(reshape, shape); auto result = std::make_shared(reshape2); auto relu = std::make_shared(reshape); @@ -1421,9 +1421,9 @@ TEST(TransformationTests, InsertCopyLayerNFLBranchTest) { { auto params = std::make_shared(ngraph::element::i64, in_shape); - auto reshape = ngraph::op::util::reshapeTo(params, shape); + auto reshape = ov::op::util::reshapeTo(params, shape); auto copy = std::make_shared(reshape); - auto reshape2 = ngraph::op::util::reshapeTo(copy, shape); + auto reshape2 = ov::op::util::reshapeTo(copy, shape); auto result = std::make_shared(reshape2); auto relu = std::make_shared(reshape); @@ -1435,7 +1435,7 @@ TEST(TransformationTests, InsertCopyLayerNFLBranchTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -1464,11 +1464,11 @@ TEST(TransformationTests, InsertCopyLayerNFLvsFLSubgraphTestt) { { auto params = std::make_shared(ngraph::element::i64, in_shape); - auto reshape = ngraph::op::util::reshapeTo(params, shape); + auto reshape = ov::op::util::reshapeTo(params, shape); auto result = std::make_shared(reshape); auto relu = std::make_shared(params); - auto reshape2 = ngraph::op::util::reshapeTo(relu, shape); + auto reshape2 = ov::op::util::reshapeTo(relu, shape); auto result_relu = std::make_shared(reshape2); func = std::make_shared(ngraph::ResultVector{result, result_relu}, @@ -1479,11 +1479,11 @@ TEST(TransformationTests, InsertCopyLayerNFLvsFLSubgraphTestt) { { auto params = std::make_shared(ngraph::element::i64, in_shape); auto copy = std::make_shared(params); - auto reshape = ngraph::op::util::reshapeTo(copy, shape); + auto reshape = ov::op::util::reshapeTo(copy, shape); auto result = std::make_shared(reshape); auto relu = std::make_shared(params); - auto reshape2 = ngraph::op::util::reshapeTo(relu, shape); + auto reshape2 = ov::op::util::reshapeTo(relu, shape); auto result_relu = std::make_shared(reshape2); ref_func = std::make_shared(ngraph::ResultVector{result, result_relu}, @@ -1492,7 +1492,7 @@ TEST(TransformationTests, InsertCopyLayerNFLvsFLSubgraphTestt) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -1522,7 +1522,7 @@ TEST(TransformationTests, InsertCopyLayerSplitNFLConcatTest) { { auto params = std::make_shared(ngraph::element::i64, input_shape); auto split = ngraph::builder::makeSplit(params, ngraph::element::i64, 1, axis); - auto reshape = ngraph::op::util::reshapeTo(split->output(0), shape); + auto reshape = ov::op::util::reshapeTo(split->output(0), shape); auto const_value = ngraph::builder::makeConstant(ngraph::element::i64, shape, std::vector{1}); auto concat = std::make_shared(ngraph::OutputVector{reshape, const_value}, axis); auto result = std::make_shared(concat); @@ -1533,7 +1533,7 @@ TEST(TransformationTests, InsertCopyLayerSplitNFLConcatTest) { { auto params = std::make_shared(ngraph::element::i64, input_shape); auto split = ngraph::builder::makeSplit(params, ngraph::element::i64, 1, axis); - auto reshape = ngraph::op::util::reshapeTo(split->output(0), shape); + auto reshape = ov::op::util::reshapeTo(split->output(0), shape); auto copy = std::make_shared(reshape); auto const_value = ngraph::builder::makeConstant(ngraph::element::i64, shape, std::vector{1}); auto concat = std::make_shared(ngraph::OutputVector{copy, const_value}, axis); @@ -1545,7 +1545,7 @@ TEST(TransformationTests, InsertCopyLayerSplitNFLConcatTest) { } ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_identity_layer.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_identity_layer.cpp index 1ec4d667445..512bab9f425 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_identity_layer.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_identity_layer.cpp @@ -32,7 +32,7 @@ public: void InsertIdentityLayerTest::Validate() { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(m_low_precision); m.register_pass(); m.register_pass(); @@ -602,7 +602,7 @@ public: } void Validate() override { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(m_func); ASSERT_NO_THROW(check_rt_info(m_func)); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_reshape_around_matmul.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_reshape_around_matmul.cpp index ecbab17ad76..53d66e15913 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_reshape_around_matmul.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_reshape_around_matmul.cpp @@ -113,7 +113,7 @@ namespace { void RunTest(const std::shared_ptr& func, const std::shared_ptr& reference_func) { { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.register_pass(); m.register_pass(); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_transpose_after_convolution_or_pooling.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_transpose_after_convolution_or_pooling.cpp index b091efc72b4..49f52c79ddb 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_insert_transpose_after_convolution_or_pooling.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_insert_transpose_after_convolution_or_pooling.cpp @@ -46,7 +46,7 @@ TEST(TransformationTests, InsertTransposeAfterConvOrPoolTestStartConvolution) { func = std::make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{input_params_convolution}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); ASSERT_NO_THROW(check_rt_info(func)); @@ -122,7 +122,7 @@ TEST(TransformationTests, InsertTransposeAfterConvOrPoolTestStartMaxPool) { func = std::make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{input_params}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); ASSERT_NO_THROW(check_rt_info(func)); @@ -199,7 +199,7 @@ TEST(TransformationTests, InsertTransposeAfterConvOrPoolTestInputRank3) { func = std::make_shared(ngraph::ResultVector{result}, ngraph::ParameterVector{input_params_convolution}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); ASSERT_NO_THROW(check_rt_info(func)); @@ -275,7 +275,7 @@ TEST(TransformationTests, InsertTransposeAfterConvOrPoolTest1dOutput) { func = CreatePoolConvFunction(ngraph::Shape{1, 3, 1, 8}, ngraph::Strides{1, 8}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); ASSERT_NO_THROW(check_rt_info(func)); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_pwl.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_pwl.cpp index fe11f113be7..119fd0d1eeb 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_pwl.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_pwl.cpp @@ -200,7 +200,7 @@ template inline void GnaPWlTestsFixture::run() { { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(_max_error_percent); m.run_passes(_function_under_test); ASSERT_NO_THROW(check_rt_info(_function_under_test)); @@ -276,4 +276,4 @@ TEST(GnaPwlTest, Power) { test_instance.run(); } } -} // namespace \ No newline at end of file +} // namespace diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_remove_convert.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_remove_convert.cpp index b6d9f88f6fc..8d683f193f0 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_remove_convert.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_remove_convert.cpp @@ -82,7 +82,7 @@ void RemoveInputConvertTest::SetUp() { void RemoveInputConvertTest::Validate() { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func_); ASSERT_NO_THROW(check_rt_info(func_)); @@ -134,7 +134,7 @@ public: } void Validate() override { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func_); ASSERT_NO_THROW(check_rt_info(func_)); @@ -176,7 +176,7 @@ public: } void Validate() override { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.register_pass(); m.run_passes(func_); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_remove_extra_reshapes.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_remove_extra_reshapes.cpp index bcc4a73c1e2..fcacd2df2a0 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_remove_extra_reshapes.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_remove_extra_reshapes.cpp @@ -34,7 +34,7 @@ TEST(TransformationTests, RemoveExtraReshapesTestReshapeNotEqualInputOutput) { reference_func = ngraph::clone_function(*func); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); ASSERT_NO_THROW(check_rt_info(func)); @@ -63,7 +63,7 @@ TEST(TransformationTests, RemoveExtraReshapesTestReshapeEqualInputOutput) { ngraph::ParameterVector{input_params}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); ASSERT_NO_THROW(check_rt_info(func)); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_remove_single_input_concat.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_remove_single_input_concat.cpp index 6efdc584655..3976d67d807 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_remove_single_input_concat.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_remove_single_input_concat.cpp @@ -113,7 +113,7 @@ void RemoveSingleInputConcatFixture::SetUp() { ngraph::pass::Manager createPassManager() { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); return manager; } diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_reorder_activation_and_pooling.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_reorder_activation_and_pooling.cpp index 6d9892807df..ee67fcbff31 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_reorder_activation_and_pooling.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_reorder_activation_and_pooling.cpp @@ -169,7 +169,7 @@ std::shared_ptr ConvolutionActivationPoolTestFixture::get_refe void execute_test(std::shared_ptr function, std::shared_ptr reference_function) { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(function); const FunctionsComparator func_comparator = FunctionsComparator::with_default().enable(FunctionsComparator::ATTRIBUTES); @@ -237,7 +237,7 @@ TEST(TransformationTests, ReorderActivationAndPoolingTestConvFqMp) { ngraph::ParameterVector{input_params_convolution}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); @@ -328,7 +328,7 @@ TEST(TransformationTests, ReorderActivationAndPoolingTestConvAddFqMp) { ngraph::ParameterVector{input_params_convolution, input_params_add}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_split_convolution_with_large_buffer_size.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_split_convolution_with_large_buffer_size.cpp index 9daece022d6..d096597c3bb 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_split_convolution_with_large_buffer_size.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_split_convolution_with_large_buffer_size.cpp @@ -287,7 +287,7 @@ void execute_test(std::shared_ptr function, template ngraph::pass::Manager createPassManager() { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); return manager; } diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_split_eltwise.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_split_eltwise.cpp index 07d987e6d28..d6c8264656a 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_split_eltwise.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_split_eltwise.cpp @@ -133,7 +133,7 @@ void SplitEltwiseTestSuiteFixture::SetUp() { void execute_test(std::shared_ptr function, std::shared_ptr reference_function) { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.run_passes(function); const FunctionsComparator func_comparator = FunctionsComparator::with_default().enable(FunctionsComparator::ATTRIBUTES); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_substitute_softsign.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_substitute_softsign.cpp index f73344f7fda..c0102656d9f 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_substitute_softsign.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_substitute_softsign.cpp @@ -51,7 +51,7 @@ TEST(TransformationTests, SubstituteSoftSignMulPower) { func = std::make_shared(ngraph::ResultVector{results}, ngraph::ParameterVector{input_params}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); ASSERT_NO_THROW(check_rt_info(func)); @@ -82,7 +82,7 @@ TEST(TransformationTests, SubstituteSoftSignDivide) { func = std::make_shared(ngraph::ResultVector{results}, ngraph::ParameterVector{input_params}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); ASSERT_NO_THROW(check_rt_info(func)); @@ -116,7 +116,7 @@ TEST(TransformationTests, SubstituteSoftSignMulPowerInvalidAddConst) { func = std::make_shared(ngraph::ResultVector{results}, ngraph::ParameterVector{input_params}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); ASSERT_NO_THROW(check_rt_info(func)); @@ -150,7 +150,7 @@ TEST(TransformationTests, SubstituteSoftSignMulPowerInvalidPowerConst) { func = std::make_shared(ngraph::ResultVector{results}, ngraph::ParameterVector{input_params}); ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(func); ASSERT_NO_THROW(check_rt_info(func)); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_swap_input_matmul.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_swap_input_matmul.cpp index bd7eb8a6040..2544ee8f421 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_swap_input_matmul.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_swap_input_matmul.cpp @@ -87,7 +87,7 @@ static std::shared_ptr CreateMatMulFunction(const ngraph::Shap static void Execute(std::shared_ptr function, std::shared_ptr reference_function) { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(); m.register_pass(); m.register_pass(); diff --git a/src/plugins/intel_gna/tests/unit/transformations/gna_unfuse_reshape_and_transpose.cpp b/src/plugins/intel_gna/tests/unit/transformations/gna_unfuse_reshape_and_transpose.cpp index 6eef913e46f..7e2a87bda3f 100644 --- a/src/plugins/intel_gna/tests/unit/transformations/gna_unfuse_reshape_and_transpose.cpp +++ b/src/plugins/intel_gna/tests/unit/transformations/gna_unfuse_reshape_and_transpose.cpp @@ -182,7 +182,7 @@ void UnfuseReshapeAndTransposeTestSuiteFixture::SetUp() { void execute_test(std::shared_ptr function, std::shared_ptr reference_function) { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.register_pass(); manager.register_pass(); manager.run_passes(function); diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/program.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/program.hpp index 012f9404a31..b03b6ab6b03 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/program.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/program.hpp @@ -34,11 +34,11 @@ enum class eltwise_mode : int32_t; #define REGISTER_FACTORY_IMPL(op_version, op_name) \ void __register ## _ ## op_name ## _ ## op_version(); \ void __register ## _ ## op_name ## _ ## op_version() { \ - Program::RegisterFactory( \ - [](Program& p, const std::shared_ptr& op) { \ - auto op_casted = std::dynamic_pointer_cast(op); \ + Program::RegisterFactory( \ + [](Program& p, const std::shared_ptr& op) { \ + auto op_casted = std::dynamic_pointer_cast(op); \ if (!op_casted) \ - IE_THROW() << "Invalid ngraph Node type passed into " << __PRETTY_FUNCTION__; \ + IE_THROW() << "Invalid ov Node type passed into " << __PRETTY_FUNCTION__; \ Create##op_name##Op(p, op_casted); \ }); \ } diff --git a/src/plugins/intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp b/src/plugins/intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp index f4d93037895..65337876efe 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp @@ -52,7 +52,7 @@ static void CreateCommonCTCGreedyDecoderOp(Program& p, const std::shared_ptrget_friendly_name() << " (" << op->get_type_name() << ")"; } float val; - if (ngraph::shape_size(blank_index_node->get_output_shape(0)) != 1 || !ngraph::op::util::get_single_value(blank_index_node, val)) { + if (ngraph::shape_size(blank_index_node->get_output_shape(0)) != 1 || !ov::op::util::get_single_value(blank_index_node, val)) { IE_THROW() << "Unsupported parameter size in " << op->get_friendly_name() << " (" << op->get_type_name() << ")"; } blank_index = static_cast(val); diff --git a/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp b/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp index 75b8137652e..ab7f8f1498e 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp @@ -158,7 +158,7 @@ static void CreatePowerOp(Program& p, const std::shared_ptrget_output_shape(0)) == 1) { float pow; - if (!ngraph::op::util::get_single_value(power_node, pow)) + if (!ov::op::util::get_single_value(power_node, pow)) IE_THROW() << "Invalid parameter size in " << op->get_friendly_name() << " (" << op->get_type_name() << ")"; CreateUnaryEltwiseOp(p, op, cldnn::activation_func::pow, {pow}); return; diff --git a/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp b/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp index be8efffe6ab..81b050fff40 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp @@ -30,7 +30,7 @@ static void CreateEmbeddingBagOffsetsSumOp(Program& p, const std::shared_ptrget_output_shape(0)) != 1 || !ngraph::op::util::get_single_value(index_node, val)) + if (ngraph::shape_size(index_node->get_output_shape(0)) != 1 || !ov::op::util::get_single_value(index_node, val)) IE_THROW() << "Unsupported parameter size in " << op->get_friendly_name() << " (" << op->get_type_name() << ")"; defaultIndex = static_cast(val); @@ -122,7 +122,7 @@ static void CreateEmbeddingSegmentsSumOp(Program& p, const std::shared_ptrget_output_shape(0)) != 1 || !ngraph::op::util::get_single_value(index_node, val)) + if (ngraph::shape_size(index_node->get_output_shape(0)) != 1 || !ov::op::util::get_single_value(index_node, val)) IE_THROW() << "Unsupported parameter size in " << op->get_friendly_name() << " (" << op->get_type_name() << ")"; defaultIndex = static_cast(val); diff --git a/src/plugins/intel_gpu/src/plugin/ops/generate_proposals.cpp b/src/plugins/intel_gpu/src/plugin/ops/generate_proposals.cpp index c0fcb2ff17d..d7d59342109 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/generate_proposals.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/generate_proposals.cpp @@ -15,7 +15,7 @@ namespace intel_gpu { static void CreateGenerateProposalsIEInternalOp( Program& p, - const std::shared_ptr& op) { + const std::shared_ptr& op) { validate_inputs_count(op, {4}); if (op->get_output_size() != 3) { IE_THROW() << "GenerateProposals requires 3 outputs"; diff --git a/src/plugins/intel_gpu/src/plugin/ops/loop.cpp b/src/plugins/intel_gpu/src/plugin/ops/loop.cpp index f87b63831d9..b44e16a9cb3 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/loop.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/loop.cpp @@ -66,7 +66,7 @@ static void CreateLoopOp(Program& p, const std::shared_ptr& op) { if (special_body_ports.current_iteration_input_idx >= 0) { auto current_iteration_input = body_inputs.at(special_body_ports.current_iteration_input_idx); body_current_iteration_id = layer_type_name_ID(current_iteration_input); - std::string input_name = ngraph::op::util::create_ie_output_name(current_iteration_input); + std::string input_name = ov::op::util::create_ie_output_name(current_iteration_input); const auto networkInput = networkInputs.at(input_name); auto precision = InferenceEngine::details::convertPrecision(current_iteration_input->get_element_type()); networkInput->setPrecision(precision); @@ -76,7 +76,7 @@ static void CreateLoopOp(Program& p, const std::shared_ptr& op) { if (special_body_ports.body_condition_output_idx >= 0) { auto body_condition_output = body_outputs.at(special_body_ports.body_condition_output_idx)->get_input_node_shared_ptr(0); body_execution_condition_id = layer_type_name_ID(body_condition_output); - std::string output_name = ngraph::op::util::create_ie_output_name(body_condition_output); + std::string output_name = ov::op::util::create_ie_output_name(body_condition_output); const auto networkOutput = networkOutputs.at(output_name); networkOutput->setPrecision(InferenceEngine::Precision::I64); } diff --git a/src/plugins/intel_gpu/src/plugin/ops/matrix_nms.cpp b/src/plugins/intel_gpu/src/plugin/ops/matrix_nms.cpp index 1b238f8a861..9be9bf63b01 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/matrix_nms.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/matrix_nms.cpp @@ -11,19 +11,19 @@ #include "intel_gpu/primitives/mutable_data.hpp" #include "ov_ops/nms_static_shape_ie.hpp" -namespace ngraph { +namespace ov { namespace op { namespace internal { using NmsStaticShapeIE8 = ov::op::internal::NmsStaticShapeIE; } } // namespace op -} // namespace ngraph +} // namespace ov namespace ov { namespace intel_gpu { namespace { -void CreateNmsStaticShapeIE8Op(Program& p, const std::shared_ptr& op) { +void CreateNmsStaticShapeIE8Op(Program& p, const std::shared_ptr& op) { validate_inputs_count(op, {2}); auto inputs = p.GetInputInfo(op); diff --git a/src/plugins/intel_gpu/src/plugin/ops/multiclass_nms.cpp b/src/plugins/intel_gpu/src/plugin/ops/multiclass_nms.cpp index 7b7a09f128a..7f92c8bc191 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/multiclass_nms.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/multiclass_nms.cpp @@ -14,7 +14,7 @@ namespace ov { namespace intel_gpu { -static void CreateMulticlassNmsIEInternalOp(Program& p, const std::shared_ptr& op) { +static void CreateMulticlassNmsIEInternalOp(Program& p, const std::shared_ptr& op) { validate_inputs_count(op, {2, 3}); auto inputs = p.GetInputInfo(op); diff --git a/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp b/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp index 1e7039a1c6c..f60a83bfd68 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp @@ -17,7 +17,7 @@ namespace ov { namespace intel_gpu { -static void CreateNonMaxSuppressionIEInternalOp(Program& p, const std::shared_ptr& op) { +static void CreateNonMaxSuppressionIEInternalOp(Program& p, const std::shared_ptr& op) { validate_inputs_count(op, {2, 3, 4, 5, 6}); auto inputs = p.GetInputInfo(op); std::vector reordered_inputs; diff --git a/src/plugins/intel_gpu/src/plugin/ops/one_hot.cpp b/src/plugins/intel_gpu/src/plugin/ops/one_hot.cpp index 70ae482717d..092914dd650 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/one_hot.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/one_hot.cpp @@ -29,8 +29,8 @@ static void CreateOneHotOp(Program& p, const std::shared_ptrget_friendly_name() << " (" << op->get_type_name() << ")"; } diff --git a/src/plugins/intel_gpu/src/plugin/ops/pad.cpp b/src/plugins/intel_gpu/src/plugin/ops/pad.cpp index 2ea5c688610..971094e3cd4 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/pad.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/pad.cpp @@ -22,7 +22,7 @@ static void CreatePadOp(Program& p, const std::shared_ptr& if (op->get_input_size() == 4) { auto const_node = std::dynamic_pointer_cast(op->get_input_node_shared_ptr(3)); OPENVINO_ASSERT(const_node, "Unsupported const node type in ", op->get_friendly_name(), " (", op->get_type_name(), ")"); - ngraph::op::util::get_single_value(const_node, pad_value); + ov::op::util::get_single_value(const_node, pad_value); } auto tilePrim = cldnn::border(layerName, diff --git a/src/plugins/intel_gpu/src/plugin/ops/unary.cpp b/src/plugins/intel_gpu/src/plugin/ops/unary.cpp index f4d1c89718f..5758997c8d8 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/unary.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/unary.cpp @@ -80,7 +80,7 @@ static void CreatePReluOp(Program& p, const std::shared_ptrget_friendly_name() << " (" << op->get_type_name() << ")"; CreateUnaryEltwiseOp(p, op, cldnn::activation_func::relu_negative_slope, {slope}); } else if (out_shape.size() >= 2) { @@ -172,7 +172,7 @@ static void CreateHardSigmoidOp(Program& p, const std::shared_ptrget_output_shape(0)) == 1 && ngraph::shape_size(beta_node->get_output_shape(0)) == 1) { float alpha, beta; - if (!ngraph::op::util::get_single_value(alpha_node, alpha) || !ngraph::op::util::get_single_value(beta_node, beta)) { + if (!ov::op::util::get_single_value(alpha_node, alpha) || !ov::op::util::get_single_value(beta_node, beta)) { IE_THROW() << "Unsupported parameter size in " << op->get_friendly_name() << " (" << op->get_type_name() << ")"; } CreateUnaryEltwiseOp(p, op, cldnn::activation_func::hard_sigmoid, {alpha, beta}); @@ -198,7 +198,7 @@ static void CreateSeluOp(Program& p, const std::shared_ptr if (ngraph::shape_size(alpha_node->get_output_shape(0)) == 1 && ngraph::shape_size(lambda_node->get_output_shape(0)) == 1) { float alpha, lambda; - if (!ngraph::op::util::get_single_value(alpha_node, alpha) || !ngraph::op::util::get_single_value(lambda_node, lambda)) { + if (!ov::op::util::get_single_value(alpha_node, alpha) || !ov::op::util::get_single_value(lambda_node, lambda)) { IE_THROW() << "Unsupported parameter size in " << op->get_friendly_name() << " (" << op->get_type_name() << ")"; } CreateUnaryEltwiseOp(p, op, cldnn::activation_func::selu, {alpha, lambda}); @@ -238,7 +238,7 @@ static void CreateSwishOp(Program& p, const std::shared_ptrget_output_shape(0)) == 1) { float beta; - if (!ngraph::op::util::get_single_value(beta_node, beta)) { + if (!ov::op::util::get_single_value(beta_node, beta)) { IE_THROW() << "Unsupported parameter size in " << op->get_friendly_name() << " (" << op->get_type_name() << ")"; } CreateUnaryEltwiseOp(p, op, cldnn::activation_func::swish, {beta}); diff --git a/src/plugins/intel_gpu/src/plugin/plugin.cpp b/src/plugins/intel_gpu/src/plugin/plugin.cpp index 9399d2c6d83..a3125afe3e1 100644 --- a/src/plugins/intel_gpu/src/plugin/plugin.cpp +++ b/src/plugins/intel_gpu/src/plugin/plugin.cpp @@ -700,7 +700,7 @@ uint32_t Plugin::get_max_batch_size(const std::map& opti auto function = InferenceEngine::details::cloneNetwork(cloned_network).getFunction(); ov::pass::Manager m; - m.register_pass(); + m.register_pass(); m.register_pass(true, false); m.run_passes(function); const auto& params = function->get_parameters(); @@ -717,7 +717,7 @@ uint32_t Plugin::get_max_batch_size(const std::map& opti for (size_t s = 0; s < shape.size(); s++) { if (ov::DimensionTracker::get_label(shape[s])) { // batched dim for the input - auto batched_input_id = ngraph::op::util::get_ie_output_name(params[input_id]->output(0)); + auto batched_input_id = ov::op::util::get_ie_output_name(params[input_id]->output(0)); GPU_DEBUG_LOG << "[MAX_BATCH_SIZE] detected batched input " << batched_input_id << "[" << s << "]" << std::endl; batched_inputs.insert(std::make_pair(batched_input_id, s)); diff --git a/src/plugins/intel_gpu/src/plugin/transformations_pipeline.cpp b/src/plugins/intel_gpu/src/plugin/transformations_pipeline.cpp index 6bb90f34851..e86b587999e 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations_pipeline.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations_pipeline.cpp @@ -138,43 +138,43 @@ void TransformationsPipeline::apply(std::shared_ptr func) { std::vector{ ngraph::element::i8, ngraph::element::u8, ngraph::element::i4, ngraph::element::u4 }); } - manager.register_pass(); + manager.register_pass(); manager.register_pass(); - manager.register_pass(); + manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); if (!enable_loop_unrolling) { - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); if (enable_loop_unrolling) { - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); precisions_array convert_precision_list { {ngraph::element::f64, ngraph::element::f32}, @@ -234,7 +234,7 @@ void TransformationsPipeline::apply(std::shared_ptr func) { } manager.register_pass(); - manager.register_pass(convert_precision_list); + manager.register_pass(convert_precision_list); auto pass_config = manager.get_pass_config(); pass_config->disable(); @@ -245,42 +245,42 @@ void TransformationsPipeline::apply(std::shared_ptr func) { pass_config->enable(); // SpaceToDepth/DepthToSpace node implementation supports only equal input/output tensors with rank <= 5 - pass_config->set_callback( + pass_config->set_callback( [](const_node_ptr &node) -> bool { return node->input_value(0).get_partial_shape().size() <= 5lu && node->input_value(0).get_partial_shape().size() == node->get_output_partial_shape(0).size(); }); - pass_config->set_callback( + pass_config->set_callback( [](const_node_ptr &node) -> bool { const auto & rank = node->input(0).get_partial_shape().rank().get_length(); return rank <= 5; }); // Convert reduce to reshape expected to be optimized out - manager.register_pass(); + manager.register_pass(); if (device_info.supports_immad) { // oneDNN reduction is used - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); manager.register_pass(); manager.register_pass(); } else { - pass_config->set_callback( + pass_config->set_callback( [](const_node_ptr &node) -> bool { return disableReduceDecomposition(node); }); - pass_config->set_callback( + pass_config->set_callback( [](const_node_ptr &node) -> bool { return disableReduceDecomposition(node); }); - pass_config->set_callback( + pass_config->set_callback( [](const_node_ptr &node) -> bool { return disableReduceDecomposition(node); }); @@ -318,29 +318,29 @@ void TransformationsPipeline::apply(std::shared_ptr func) { return lstm_seq->get_clip() == 0.0f && lstm_seq->get_activations() == std::vector{"sigmoid", "tanh", "tanh"} && max_seq_len < 16 && - !ngraph::op::util::is_seq_len_provided(lstm_seq->get_input_node_shared_ptr(3), + !ov::op::util::is_seq_len_provided(lstm_seq->get_input_node_shared_ptr(3), max_seq_len); } return false; }; - pass_config->set_callback( + pass_config->set_callback( [isCellPrimitiveSupported](const_node_ptr &node) -> bool { return isCellPrimitiveSupported(node); }); if (enable_loop_unrolling) { - pass_config->set_callback( + pass_config->set_callback( [isSequencePrimitiveSupported](const_node_ptr &node) -> bool { return isSequencePrimitiveSupported(node); }); } - pass_config->set_callback( + pass_config->set_callback( [](const_node_ptr &node) -> bool { const auto mvn = std::dynamic_pointer_cast(node); if (mvn != nullptr && node->get_input_size() == 2) { @@ -365,8 +365,8 @@ void TransformationsPipeline::apply(std::shared_ptr func) { return false; }); - pass_config->enable(); - pass_config->set_callback( + pass_config->enable(); + pass_config->set_callback( [](const_node_ptr &node) -> bool { // Condition to filter out axes such as [0, 1, 2] which is not supported currently. const auto norm = ov::as_type_ptr(node); @@ -394,33 +394,33 @@ void TransformationsPipeline::apply(std::shared_ptr func) { return true; }); - pass_config->enable(); - pass_config->set_callback( + pass_config->enable(); + pass_config->set_callback( [](const_node_ptr &node) -> bool { return node->input_value(0).get_partial_shape().rank().get_length() <= 5; }); // List of enabled/disabled transformations - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->disable(); - pass_config->enable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->disable(); + pass_config->enable(); - pass_config->enable(); + pass_config->enable(); if (enableInt8) { - pass_config->set_callback([&defaultPrecisions](const_node_ptr &node) -> bool { + pass_config->set_callback([&defaultPrecisions](const_node_ptr &node) -> bool { return ngraph::pass::low_precision::NetworkHelper::areQuantizeAndDequantizeSupportedForMultiply(node, defaultPrecisions); }); } @@ -548,9 +548,9 @@ void TransformationsPipeline::apply(std::shared_ptr func) { // TODO: check why we have these reshapes manager.register_pass(); - manager.register_pass(); + manager.register_pass(); auto pass_config = manager.get_pass_config(); - pass_config->set_callback( + pass_config->set_callback( [enable_loop_unrolling](const std::shared_ptr &node) -> bool { auto sub_graph_op = std::dynamic_pointer_cast(node); int64_t num_iter = sub_graph_op->get_num_iterations(); diff --git a/src/plugins/intel_gpu/tests/transformations/decompose_reduce_for_false_keepdims_test.cpp b/src/plugins/intel_gpu/tests/transformations/decompose_reduce_for_false_keepdims_test.cpp index a4b330e4d25..ddfaa9f89f9 100644 --- a/src/plugins/intel_gpu/tests/transformations/decompose_reduce_for_false_keepdims_test.cpp +++ b/src/plugins/intel_gpu/tests/transformations/decompose_reduce_for_false_keepdims_test.cpp @@ -86,7 +86,7 @@ public: TEST_P(ReduceDecomposeTests, CompareFunctions) { ngraph::pass::Manager m; m.set_per_pass_validation(false); - m.register_pass(); + m.register_pass(); m.register_pass(); m.run_passes(fc); diff --git a/src/plugins/template/src/template_executable_network.cpp b/src/plugins/template/src/template_executable_network.cpp index c69863aac00..ffa90519d5b 100644 --- a/src/plugins/template/src/template_executable_network.cpp +++ b/src/plugins/template/src/template_executable_network.cpp @@ -118,7 +118,7 @@ void TemplatePlugin::ExecutableNetwork::CompileNetwork(const std::shared_ptrget_results()) { const auto& input = result->input_value(0); - auto name = ngraph::op::util::get_ie_output_name(input); + auto name = ov::op::util::get_ie_output_name(input); if (_outputIndex.emplace(name, idx).second) idx++; } diff --git a/src/plugins/template/src/template_plugin.cpp b/src/plugins/template/src/template_plugin.cpp index f9abf277ad8..e96d714bde0 100644 --- a/src/plugins/template/src/template_plugin.cpp +++ b/src/plugins/template/src/template_plugin.cpp @@ -66,7 +66,7 @@ void TransformNetwork(std::shared_ptr& function, passManager.register_pass(inputInfoMap); // TODO: add post-processing based on outputsInfoMap // Example: register CommonOptimizations transformation from transformations library - passManager.register_pass(); + passManager.register_pass(); // G-API supports only FP32 networks for pre-processing bool needF16toF32 = false; for (const auto& param : function->get_parameters()) { @@ -78,7 +78,7 @@ void TransformNetwork(std::shared_ptr& function, } } if (needF16toF32) { - passManager.register_pass( + passManager.register_pass( precisions_array{{ngraph::element::f16, ngraph::element::f32}}); } // Example: register plugin specific transformation diff --git a/src/plugins/template/tests/functional/subgraph_reference/base_reference_cnn_test.cpp b/src/plugins/template/tests/functional/subgraph_reference/base_reference_cnn_test.cpp index a31eddb6324..df225ad0ca1 100644 --- a/src/plugins/template/tests/functional/subgraph_reference/base_reference_cnn_test.cpp +++ b/src/plugins/template/tests/functional/subgraph_reference/base_reference_cnn_test.cpp @@ -46,7 +46,7 @@ void ReferenceCNNTest::LoadNetworkLegacy() { inputInfo[param->get_friendly_name()]->setPrecision(InferenceEngine::details::convertPrecision(param->get_element_type())); } for (const auto& result : function->get_results()) { - outputInfo[ngraph::op::util::create_ie_output_name(result->input_value(0))]->setPrecision( + outputInfo[ov::op::util::create_ie_output_name(result->input_value(0))]->setPrecision( InferenceEngine::details::convertPrecision(result->get_element_type())); } legacy_exec_network = legacy_core->LoadNetwork(legacy_network, targetDevice); @@ -101,7 +101,7 @@ void ReferenceCNNTest::InferLegacy() { void ReferenceCNNTest::Validate() { for (const auto& result : function->get_results()) { - auto name = ngraph::op::util::create_ie_output_name(result->input_value(0)); + auto name = ov::op::util::create_ie_output_name(result->input_value(0)); outputs_ov20.emplace_back(inferRequest.get_tensor(name)); auto outBlob = legacy_infer_request.GetBlob(name); auto outMem = outBlob->buffer(); diff --git a/src/plugins/template/tests/functional/transformations/template_transformations_test.cpp b/src/plugins/template/tests/functional/transformations/template_transformations_test.cpp index a35ef9e0571..a8cf7e47850 100644 --- a/src/plugins/template/tests/functional/transformations/template_transformations_test.cpp +++ b/src/plugins/template/tests/functional/transformations/template_transformations_test.cpp @@ -31,7 +31,7 @@ TEST(TransformationTests, DISABLED_TemplateTest) { f = std::make_shared(ngraph::NodeVector{divide}, ngraph::ParameterVector{data}); // This transformation init runtime info attributes - ngraph::pass::InitNodeInfo().run_on_model(f); + ov::pass::InitNodeInfo().run_on_model(f); // Run transformation // ngraph::pass::MyTransformation().run_on_function(f); diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/remote.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/remote.cpp index dda48f75e79..15f22cd5028 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/remote.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/remote.cpp @@ -111,12 +111,12 @@ TEST_P(OVRemoteTest, inferWithRemoteNoThrow) { {// Host accessable output if input is remote by default ov::Tensor tensor; ASSERT_NO_THROW(tensor = infer_request.get_tensor( - ngraph::op::util::create_ie_output_name(output->input_value(0)))); + ov::op::util::create_ie_output_name(output->input_value(0)))); ASSERT_NO_THROW(tensor.data()); } {// Infer with remote on input and outputs auto output_remote_tensor = context.create_tensor(output->get_element_type(), output->get_shape(), tensor_parameters); - ASSERT_NO_THROW(infer_request.set_tensor(ngraph::op::util::create_ie_output_name(output->input_value(0)), output_remote_tensor)); + ASSERT_NO_THROW(infer_request.set_tensor(ov::op::util::create_ie_output_name(output->input_value(0)), output_remote_tensor)); ASSERT_NO_THROW(infer_request.infer()); } } diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp index 4a9be3be7b5..024c8a3d34a 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/add_transformation.cpp @@ -62,7 +62,7 @@ void AddTransformation::SetUp() { precision, inputShape, param.broadcast, param.fakeQuantize1, param.fakeQuantize2); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } TEST_P(AddTransformation, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp index cb82a393948..95acaa2b051 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/elementwise_branch_selection_transformation.cpp @@ -67,7 +67,7 @@ void ElementwiseBranchSelectionTransformation::SetUp() { param.branch2.fakeQuantizeAfter, param.fakeQuantizeAfter); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } void ElementwiseBranchSelectionTransformation::Run() { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp index 237eef42577..bd77f795048 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp @@ -40,7 +40,7 @@ void FakeQuantizeAndAvgPoolTransformation::SetUp() { inputShape, fakeQuantize); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } TEST_P(FakeQuantizeAndAvgPoolTransformation, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp index 4d07fcab261..b86d33e9af5 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp @@ -39,7 +39,7 @@ void FakeQuantizeAndMaxPoolTransformation::SetUp() { inputShape, fakeQuantize); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } TEST_P(FakeQuantizeAndMaxPoolTransformation, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp index c301d1717ec..42e3f413578 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp @@ -44,7 +44,7 @@ void FakeQuantizePrecisionSelectionTransformation::SetUp() { testValues.actual.fakeQuantizeOnWeights }); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } TEST_P(FakeQuantizePrecisionSelectionTransformation, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp index e8b46fd3d7b..e6a0893a44c 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fake_quantize_transformation.cpp @@ -49,7 +49,7 @@ void FakeQuantizeTransformation::SetUp() { testParams.fakequantize, true); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } void FakeQuantizeTransformation::Run() { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp index 99f062bb60e..a72c49b932d 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp @@ -39,7 +39,7 @@ void FuseFakeQuantizeAndScaleShiftTransformation::SetUp() { inputShape, fakeQuantizeOnData); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } TEST_P(FuseFakeQuantizeAndScaleShiftTransformation, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_transformation.cpp index 14a57b553c6..f7c02dc0899 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_fake_quantize_transformation.cpp @@ -46,7 +46,7 @@ void FuseFakeQuantizeTransformation::SetUp() { testValues.actual.precisionAfterDequantization, testValues.actual.fakeQuantizeOnData); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } TEST_P(FuseFakeQuantizeTransformation, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp index 1f672f0b17a..13e88dc976e 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp @@ -35,7 +35,7 @@ void FuseMultiplyToFakeQuantizeTransformation::SetUp() { testValues.actual.fakeQuantizeOnData, testValues.actual.dequantization); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } TEST_P(FuseMultiplyToFakeQuantizeTransformation, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp index 442d62b3a90..211c027bc82 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp @@ -35,7 +35,7 @@ void FuseSubtractToFakeQuantizeTransformation::SetUp() { testValues.actual.fakeQuantizeOnData, testValues.actual.dequantization); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } TEST_P(FuseSubtractToFakeQuantizeTransformation, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp index 2349f7529ae..56e0caf1ac5 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp @@ -71,7 +71,7 @@ void MatMulTransformation::SetUp() { testValues.inputShape2, testValues.fqOnData2); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } void MatMulTransformation::Run() { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp index a093a65c4a9..6542e1da04c 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -70,7 +70,7 @@ void MatMulWithConstantTransformation::SetUp() { testValues.fqOnWeights, testValues.deqOnWeights); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } void MatMulWithConstantTransformation::Run() { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp index b3d89d4ab12..af4af2109b0 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/multiply_transformation.cpp @@ -66,7 +66,7 @@ void MultiplyTransformation::SetUp() { param.fakeQuantizeAfter, param.secondInputIsConstant); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } void MultiplyTransformation::Run() { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp index 7fba1dee691..bb541cd67a5 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/prelu_transformation.cpp @@ -54,7 +54,7 @@ void PReluTransformation::SetUp() { function = ngraph::builder::subgraph::PReluFunction::getOriginal(inputShape, precision, testValues.fakeQuantize); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } TEST_P(PReluTransformation, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp index c7956e6db06..75ac5037aec 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/relu_transformation.cpp @@ -54,7 +54,7 @@ void ReluTransformation::SetUp() { function = ngraph::builder::subgraph::ReluFunction::getOriginal(inputShape, precision, testValues.fakeQuantize); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } TEST_P(ReluTransformation, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp index 4dab460a7a0..3e2ec51d2e8 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp @@ -75,7 +75,7 @@ void SqueezeTransformation::SetUp() { squeezeParam.fakeQuantize, squeezeParam.squeezeAxes); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } TEST_P(SqueezeTransformation, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp index ef26589e0c7..0f457537df3 100644 --- a/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp +++ b/src/tests/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp @@ -75,7 +75,7 @@ void UnsqueezeTransformation::SetUp() { unsqueezeParam.fakeQuantize, unsqueezeParam.unsqueezeAxes); - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); } TEST_P(UnsqueezeTransformation, CompareWithRefImpl) { diff --git a/src/tests/functional/plugin/shared/src/snippets/codegen_gelu.cpp b/src/tests/functional/plugin/shared/src/snippets/codegen_gelu.cpp index c090c160e87..db3d313d253 100644 --- a/src/tests/functional/plugin/shared/src/snippets/codegen_gelu.cpp +++ b/src/tests/functional/plugin/shared/src/snippets/codegen_gelu.cpp @@ -64,7 +64,7 @@ namespace snippets { "CodegenGelu"); if (useSubgraph) { - ngraph::pass::InitNodeInfo().run_on_function(function); + ov::pass::InitNodeInfo().run_on_function(function); ngraph::pass::ConstantFolding().run_on_function(function); } } diff --git a/src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp b/src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp index 135abd0def9..0af0c3d7e64 100644 --- a/src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp +++ b/src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp @@ -306,7 +306,7 @@ std::vector SubgraphBaseTest::calculate_refs() { precisions.push_back({ ngraph::element::f16, ngraph::element::f32}); } pass::Manager manager; - manager.register_pass(precisions); + manager.register_pass(precisions); manager.run_passes(functionToProcess); functionToProcess->validate_nodes_and_infer_types(); diff --git a/src/tests/functional/shared_test_classes/src/single_layer/gru_cell.cpp b/src/tests/functional/shared_test_classes/src/single_layer/gru_cell.cpp index 419bf62bb70..9be4d815487 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/gru_cell.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/gru_cell.cpp @@ -69,7 +69,7 @@ void GRUCellTest::SetUp() { function = std::make_shared(results, params, "gru_cell"); if (should_decompose) { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(function); } } diff --git a/src/tests/functional/shared_test_classes/src/single_layer/gru_sequence.cpp b/src/tests/functional/shared_test_classes/src/single_layer/gru_sequence.cpp index cb5fe881bde..de7513609ec 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/gru_sequence.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/gru_sequence.cpp @@ -87,8 +87,8 @@ namespace LayerTestsDefinitions { if (!is_pure_sequence) { ngraph::pass::Manager manager; if (direction == ngraph::op::RecurrentSequenceDirection::BIDIRECTIONAL) - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); bool ti_found = is_tensor_iterator_exist(function); EXPECT_EQ(ti_found, true); diff --git a/src/tests/functional/shared_test_classes/src/single_layer/loop.cpp b/src/tests/functional/shared_test_classes/src/single_layer/loop.cpp index 00523ead111..b97050242c2 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/loop.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/loop.cpp @@ -258,7 +258,7 @@ namespace LayerTestsDefinitions { params); if (unrolling) { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(function); } } diff --git a/src/tests/functional/shared_test_classes/src/single_layer/lstm_cell.cpp b/src/tests/functional/shared_test_classes/src/single_layer/lstm_cell.cpp index 7ef2dea0d91..29c7523adec 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/lstm_cell.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/lstm_cell.cpp @@ -63,7 +63,7 @@ void LSTMCellTest::SetUp() { function = std::make_shared(results, params, "lstm_cell"); if (should_decompose) { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(function); } } diff --git a/src/tests/functional/shared_test_classes/src/single_layer/lstm_cell_basic.cpp b/src/tests/functional/shared_test_classes/src/single_layer/lstm_cell_basic.cpp index cfb385d163a..e39468ae515 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/lstm_cell_basic.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/lstm_cell_basic.cpp @@ -70,7 +70,7 @@ void LSTMCellBasicTest::SetUp() { function = std::make_shared(results, params, "lstm_cell"); if (should_decompose) { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(function); } } diff --git a/src/tests/functional/shared_test_classes/src/single_layer/lstm_sequence.cpp b/src/tests/functional/shared_test_classes/src/single_layer/lstm_sequence.cpp index a836f27cc0c..009d7355eea 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/lstm_sequence.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/lstm_sequence.cpp @@ -87,8 +87,8 @@ namespace LayerTestsDefinitions { if (!is_pure_sequence) { ngraph::pass::Manager manager; if (direction == ngraph::op::RecurrentSequenceDirection::BIDIRECTIONAL) - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); bool ti_found = is_tensor_iterator_exist(function); EXPECT_EQ(ti_found, true); diff --git a/src/tests/functional/shared_test_classes/src/single_layer/memory.cpp b/src/tests/functional/shared_test_classes/src/single_layer/memory.cpp index 2692bdaf9b3..a487b77122e 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/memory.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/memory.cpp @@ -131,7 +131,7 @@ namespace LayerTestsDefinitions { // evaluate method is not implemented for TI op. ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(function); const auto &outInfo = executableNetwork.GetOutputsInfo(); diff --git a/src/tests/functional/shared_test_classes/src/single_layer/rnn_cell.cpp b/src/tests/functional/shared_test_classes/src/single_layer/rnn_cell.cpp index c6868c4eaec..1eee6dfaadc 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/rnn_cell.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/rnn_cell.cpp @@ -57,7 +57,7 @@ void RNNCellTest::SetUp() { function = std::make_shared(results, params, "rnn_cell"); if (should_decompose) { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(function); } } diff --git a/src/tests/functional/shared_test_classes/src/single_layer/rnn_sequence.cpp b/src/tests/functional/shared_test_classes/src/single_layer/rnn_sequence.cpp index 081cb02ac8a..63a13cb2c1e 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/rnn_sequence.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/rnn_sequence.cpp @@ -85,8 +85,8 @@ namespace LayerTestsDefinitions { if (!is_pure_sequence) { ngraph::pass::Manager manager; if (direction == ngraph::op::RecurrentSequenceDirection::BIDIRECTIONAL) - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(function); bool ti_found = ngraph::helpers::is_tensor_iterator_exist(function); EXPECT_EQ(ti_found, true); diff --git a/src/tests/functional/shared_test_classes/src/single_layer/tensor_iterator.cpp b/src/tests/functional/shared_test_classes/src/single_layer/tensor_iterator.cpp index 2b75f1d941f..bc07ffb0967 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/tensor_iterator.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/tensor_iterator.cpp @@ -217,7 +217,7 @@ namespace LayerTestsDefinitions { } if (should_decompose) { ngraph::pass::Manager m; - m.register_pass(); + m.register_pass(); m.run_passes(function); } } diff --git a/src/tests/functional/shared_test_classes/src/subgraph/basic_lstm.cpp b/src/tests/functional/shared_test_classes/src/subgraph/basic_lstm.cpp index 84928a95b41..f60c97603e9 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/basic_lstm.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/basic_lstm.cpp @@ -48,7 +48,7 @@ void Basic_LSTM_S::SetUp() { function = GetNetwork(size_params.first, size_params.second, num_cells, weights_range, netPrecision, &hidden_memory_init, &cell_memory_init); if (decompose) { ngraph::pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(function); } } diff --git a/src/tests/functional/shared_test_classes/src/subgraph/conv_eltwise_fusion.cpp b/src/tests/functional/shared_test_classes/src/subgraph/conv_eltwise_fusion.cpp index 663e02bb21a..9b997dbf8c3 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/conv_eltwise_fusion.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/conv_eltwise_fusion.cpp @@ -64,10 +64,10 @@ void ConvEltwiseFusion::SetUp() { std::shared_ptr eltwise; if (eltwise_type == ngraph::opset4::Multiply::get_type_info_static()) { eltwise = std::make_shared(conv, eltwise_const); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); } else if (eltwise_type == ngraph::opset4::Add::get_type_info_static()) { eltwise = std::make_shared(conv, eltwise_const); manager.register_pass(); diff --git a/src/tests/functional/shared_test_classes/src/subgraph/matmul_const_transposes_extraction.cpp b/src/tests/functional/shared_test_classes/src/subgraph/matmul_const_transposes_extraction.cpp index dbbcf5524db..625b53c4a40 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/matmul_const_transposes_extraction.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/matmul_const_transposes_extraction.cpp @@ -40,7 +40,7 @@ void MatMulConstTransposesExtractionTest::SetUp() { auto transformed_function = clone_function(*function); pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(transformed_function); bool functions_equal; @@ -87,7 +87,7 @@ void QuantizedMatMulConstTransposesExtractionTest::SetUp() { auto transformed_function = clone_function(*function); pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(transformed_function); bool functions_equal; diff --git a/src/tests/functional/shared_test_classes/src/subgraph/matmul_multiply_fusion.cpp b/src/tests/functional/shared_test_classes/src/subgraph/matmul_multiply_fusion.cpp index 009ec1c139d..cb14ef1c713 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/matmul_multiply_fusion.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/matmul_multiply_fusion.cpp @@ -44,7 +44,7 @@ void MatMulMultiplyFusion::SetUp() { auto transformed_function = clone_function(*function); pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(transformed_function); bool functions_equal; @@ -101,7 +101,7 @@ void QuantizedMatMulMultiplyFusion::SetUp() { auto transformed_function = clone_function(*function); pass::Manager manager; - manager.register_pass(); + manager.register_pass(); manager.run_passes(transformed_function); bool functions_equal; diff --git a/src/tests/functional/shared_test_classes/src/subgraph/mul_conv_fusion.cpp b/src/tests/functional/shared_test_classes/src/subgraph/mul_conv_fusion.cpp index e044ea6b2f2..60563479ed0 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/mul_conv_fusion.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/mul_conv_fusion.cpp @@ -57,10 +57,10 @@ void MulConvFusion::SetUp() { auto cloned_function = ngraph::clone_function(*function); ngraph::pass::Manager manager; - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); - manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); + manager.register_pass(); manager.run_passes(cloned_function); bool functions_equal = false; diff --git a/src/tests/ie_test_utils/common_test_utils/ngraph_test_utils.cpp b/src/tests/ie_test_utils/common_test_utils/ngraph_test_utils.cpp index bbf3c183bef..96bd699f868 100644 --- a/src/tests/ie_test_utils/common_test_utils/ngraph_test_utils.cpp +++ b/src/tests/ie_test_utils/common_test_utils/ngraph_test_utils.cpp @@ -21,7 +21,7 @@ TransformationTestsF::TransformationTestsF() void TransformationTestsF::SetUp() { manager.register_pass(m_unh); - manager.register_pass(); + manager.register_pass(); } void TransformationTestsF::TearDown() { diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/common/builders.hpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/common/builders.hpp index 74d89d3463f..ba643989184 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/common/builders.hpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/common/builders.hpp @@ -48,10 +48,10 @@ std::shared_ptr makeElementwise(const std::shared_ptr data, if ((description.outPrecision == element::undefined) || (description.outPrecision == data->get_output_element_type(0))) { operation = std::make_shared(data, operationConst); } else { - operation = std::make_shared>( + operation = std::make_shared>( std::vector{element::f32, element::f32}, std::vector{}, - ngraph::op::TemporaryReplaceOutputType(data, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(operationConst, element::f32).get()); + ov::op::TemporaryReplaceOutputType(data, element::f32).get(), + ov::op::TemporaryReplaceOutputType(operationConst, element::f32).get()); ngraph::pass::low_precision::NetworkHelper::setOutDataPrecision(operation, description.outPrecision); } diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/reduce_function.hpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/reduce_function.hpp index f031edff02e..e61ccbb5640 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/reduce_function.hpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/reduce_function.hpp @@ -34,11 +34,11 @@ public: constantValues); const auto reducePrecision = dequantization->get_output_element_type(0); - const std::shared_ptr reduce = std::make_shared>( + const std::shared_ptr reduce = std::make_shared>( std::vector{ reducePrecision, constant->get_element_type() }, std::vector{ reducePrecision }, - ngraph::op::TemporaryReplaceOutputType(dequantization, reducePrecision).get(), - ngraph::op::TemporaryReplaceOutputType(constant, constant->get_element_type()).get(), + ov::op::TemporaryReplaceOutputType(dequantization, reducePrecision).get(), + ov::op::TemporaryReplaceOutputType(constant, constant->get_element_type()).get(), keepDims); reduce->set_friendly_name("Output"); @@ -114,11 +114,11 @@ public: ngraph::Shape{ constantValues.size() }, constantValues); - const std::shared_ptr reduce = std::make_shared>( + const std::shared_ptr reduce = std::make_shared>( std::vector{ precisionAfterOperation, constant->get_element_type() }, std::vector{ precisionAfterOperation }, - ngraph::op::TemporaryReplaceOutputType(dequantization, precisionAfterOperation).get(), - ngraph::op::TemporaryReplaceOutputType(constant, constant->get_element_type()).get(), + ov::op::TemporaryReplaceOutputType(dequantization, precisionAfterOperation).get(), + ov::op::TemporaryReplaceOutputType(constant, constant->get_element_type()).get(), keepDims); std::shared_ptr lastOperation = makeDequantization(reduce, dequantizationAfter); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/add_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/add_function.cpp index 33da1b22cbf..f607ef12250 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/add_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/add_function.cpp @@ -72,11 +72,11 @@ std::shared_ptr AddFunction::getOriginal( } auto parent = input2; if (additionalLayer == "convolution") { - parent = std::make_shared>( + parent = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ precision }, - ngraph::op::TemporaryReplaceOutputType(parent, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType( + ov::op::TemporaryReplaceOutputType(parent, element::f32).get(), + ov::op::TemporaryReplaceOutputType( std::make_shared(element::i8, Shape{ 1, 4, 1, 1 }, std::vector{0.8f, 0.8f, 0.8f, 0.8f}), element::f32).get(), ngraph::Strides{ 1, 1 }, @@ -86,11 +86,11 @@ std::shared_ptr AddFunction::getOriginal( } std::shared_ptr additional_output = nullptr; if (additionalLayer == "convolution_multiconsumers") { - parent = std::make_shared>( + parent = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ precision }, - ngraph::op::TemporaryReplaceOutputType(parent, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType( + ov::op::TemporaryReplaceOutputType(parent, element::f32).get(), + ov::op::TemporaryReplaceOutputType( std::make_shared(element::i8, Shape{ 1, 4, 1, 1 }, std::vector{0.8f, 0.8f, 0.8f, 0.8f}), element::f32).get(), ngraph::Strides{ 1, 1 }, @@ -100,11 +100,11 @@ std::shared_ptr AddFunction::getOriginal( additional_output = parent; } if (additionalLayer == "group_convolution") { - parent = std::make_shared< ngraph::op::TypeRelaxed>( + parent = std::make_shared< ov::op::TypeRelaxed>( std::vector{ element::f32, element::f32 }, std::vector{ precision }, - ngraph::op::TemporaryReplaceOutputType(parent, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType( + ov::op::TemporaryReplaceOutputType(parent, element::f32).get(), + ov::op::TemporaryReplaceOutputType( std::make_shared(element::i8, Shape{ 4, 1, 1, 1, 1 }, std::vector{0.8f, 0.8f, 0.8f, 0.8f}), element::f32).get(), ngraph::Strides{ 1, 1 }, @@ -241,11 +241,11 @@ std::shared_ptr AddFunction::getReference( } auto parent = input2; if (additionalLayer == "convolution") { - parent = std::make_shared>( + parent = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ precision }, - ngraph::op::TemporaryReplaceOutputType(parent, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType( + ov::op::TemporaryReplaceOutputType(parent, element::f32).get(), + ov::op::TemporaryReplaceOutputType( std::make_shared(element::i8, Shape{ 1, 4, 1, 1 }, std::vector{0.8f, 0.8f, 0.8f, 0.8f}), element::f32).get(), ngraph::Strides{ 1, 1 }, @@ -255,11 +255,11 @@ std::shared_ptr AddFunction::getReference( } std::shared_ptr additional_output = nullptr; if (additionalLayer == "convolution_multiconsumers") { - parent = std::make_shared>( + parent = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ precision }, - ngraph::op::TemporaryReplaceOutputType(parent, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType( + ov::op::TemporaryReplaceOutputType(parent, element::f32).get(), + ov::op::TemporaryReplaceOutputType( std::make_shared(element::i8, Shape{ 1, 4, 1, 1 }, std::vector{0.8f, 0.8f, 0.8f, 0.8f}), element::f32).get(), ngraph::Strides{ 1, 1 }, @@ -269,11 +269,11 @@ std::shared_ptr AddFunction::getReference( additional_output = parent; } if (additionalLayer == "group_convolution") { - parent = std::make_shared< ngraph::op::TypeRelaxed>( + parent = std::make_shared< ov::op::TypeRelaxed>( std::vector{ element::f32, element::f32 }, std::vector{ precision }, - ngraph::op::TemporaryReplaceOutputType(parent, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType( + ov::op::TemporaryReplaceOutputType(parent, element::f32).get(), + ov::op::TemporaryReplaceOutputType( std::make_shared(element::i8, Shape{ 4, 1, 1, 1, 1 }, std::vector{0.8f, 0.8f, 0.8f, 0.8f}), element::f32).get(), ngraph::Strides{ 1, 1 }, @@ -296,16 +296,16 @@ std::shared_ptr AddFunction::getReference( const auto dequantizationOp2 = ov::is_type(parent) ? parent : makeDequantization(parent, dequantizationStructure2); const std::shared_ptr add = operationType == "Add" ? - std::dynamic_pointer_cast(std::make_shared>( + std::dynamic_pointer_cast(std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ element::f32 }, - ngraph::op::TemporaryReplaceOutputType(dequantizationOp1, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(dequantizationOp2, element::f32).get())) : - std::make_shared>( + ov::op::TemporaryReplaceOutputType(dequantizationOp1, element::f32).get(), + ov::op::TemporaryReplaceOutputType(dequantizationOp2, element::f32).get())) : + std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ element::f32 }, - ngraph::op::TemporaryReplaceOutputType(dequantizationOp1, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(dequantizationOp2, element::f32).get()); + ov::op::TemporaryReplaceOutputType(dequantizationOp1, element::f32).get(), + ov::op::TemporaryReplaceOutputType(dequantizationOp2, element::f32).get()); NetworkHelper::setOutDataPrecisionForTypeRelaxed(add, dequantizationAfter.empty() ? precision : element::f32); auto& rtInfo = add->get_rt_info(); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/align_concat_quantization_parameters_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/align_concat_quantization_parameters_function.cpp index 07820fd9ade..18c8e861778 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/align_concat_quantization_parameters_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/align_concat_quantization_parameters_function.cpp @@ -106,8 +106,8 @@ std::shared_ptr AlignConcatQuantizationParametersFunction::get fakeQuantizeOnWeights->set_friendly_name("fakeQuantizeOnWeights"); parent = std::make_shared( - ngraph::op::TemporaryReplaceOutputType(parent, precision).get(), - ngraph::op::TemporaryReplaceOutputType(fakeQuantizeOnWeights, precision).get(), + ov::op::TemporaryReplaceOutputType(parent, precision).get(), + ov::op::TemporaryReplaceOutputType(fakeQuantizeOnWeights, precision).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, @@ -217,8 +217,8 @@ std::shared_ptr AlignConcatQuantizationParametersFunction::get std::vector(outputChannels * inputChannels, 127)); parent = std::make_shared( - ngraph::op::TemporaryReplaceOutputType(parent, precision).get(), - ngraph::op::TemporaryReplaceOutputType(onWeights, precision).get(), + ov::op::TemporaryReplaceOutputType(parent, precision).get(), + ov::op::TemporaryReplaceOutputType(onWeights, precision).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/avg_pool_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/avg_pool_function.cpp index 43257d51d5d..04b525f3f16 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/avg_pool_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/avg_pool_function.cpp @@ -105,7 +105,7 @@ std::shared_ptr AvgPoolFunction::getReference( const auto deqBefore = makeDequantization(input, dequantizationBefore); auto outPrecision = precisionAfterOperation; - const std::shared_ptr avgPool = std::make_shared>( + const std::shared_ptr avgPool = std::make_shared>( opset1::AvgPool( deqBefore, Strides{ 1, 1 }, diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/clamp_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/clamp_function.cpp index a1eaffdda3b..10af8234758 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/clamp_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/clamp_function.cpp @@ -83,7 +83,7 @@ std::shared_ptr ClampFunction::getReference( std::shared_ptr quantizationOpBefore = makeDequantization(input, dequantizationBefore); - std::shared_ptr clamp = std::make_shared>(quantizationOpBefore, 0, 10); + std::shared_ptr clamp = std::make_shared>(quantizationOpBefore, 0, 10); ngraph::pass::low_precision::NetworkHelper::setOutDataPrecision(clamp, precisionAfterOperation); const std::shared_ptr quantizationOpAfter = makeDequantization(clamp, dequantizationAfter); quantizationOpAfter->set_friendly_name("output"); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/common/builders.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/common/builders.cpp index c838719f68c..187a7b7e2ea 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/common/builders.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/common/builders.cpp @@ -85,17 +85,17 @@ std::shared_ptr makeDequantization( subtract = std::make_shared(subtractConst, parent); } else { if (dequantizationOperations.subtract.constantIndex == 1ul) { - subtract = std::make_shared>( + subtract = std::make_shared>( std::vector{element::f32, element::f32}, std::vector{ element::f32 }, - ngraph::op::TemporaryReplaceOutputType(parent, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(subtractConst, element::f32).get()); + ov::op::TemporaryReplaceOutputType(parent, element::f32).get(), + ov::op::TemporaryReplaceOutputType(subtractConst, element::f32).get()); } else { - subtract = std::make_shared>( + subtract = std::make_shared>( std::vector{element::f32, element::f32}, std::vector{ element::f32 }, - ngraph::op::TemporaryReplaceOutputType(subtractConst, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(parent, element::f32).get()); + ov::op::TemporaryReplaceOutputType(subtractConst, element::f32).get(), + ov::op::TemporaryReplaceOutputType(parent, element::f32).get()); } ngraph::pass::low_precision::NetworkHelper::setOutDataPrecision(subtract, dequantizationOperations.subtract.outPrecision); @@ -167,16 +167,16 @@ std::shared_ptr makeMultiply(const Output& parent, const Dequantizat // TODO: use templates newMultiply = multiply.constantIndex == 1ul ? - std::make_shared>( + std::make_shared>( std::vector{element::f32, element::f32}, std::vector{ multiply.outPrecision }, - ngraph::op::TemporaryReplaceOutputType(parent, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(constant, element::f32).get()) : - std::make_shared>( + ov::op::TemporaryReplaceOutputType(parent, element::f32).get(), + ov::op::TemporaryReplaceOutputType(constant, element::f32).get()) : + std::make_shared>( std::vector{element::f32, element::f32}, std::vector{ multiply.outPrecision }, - ngraph::op::TemporaryReplaceOutputType(constant, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(parent, element::f32).get()); + ov::op::TemporaryReplaceOutputType(constant, element::f32).get(), + ov::op::TemporaryReplaceOutputType(parent, element::f32).get()); } return newMultiply; @@ -242,7 +242,7 @@ std::shared_ptr makeFakeQuantizeTypeRelaxed( const ngraph::element::Type precision, const FakeQuantizeOnData& fqOnData) { const std::shared_ptr fq = makeFakeQuantize(output, precision, fqOnData); - return std::make_shared>( + return std::make_shared>( *fq, fqOnData.outputPrecision == element::undefined ? precision : fqOnData.outputPrecision); } @@ -339,7 +339,7 @@ std::shared_ptr makeFakeQuantizeTypeRelaxed( const ngraph::element::Type constantPrecision, const FakeQuantizeOnDataWithConstant& fqOnData) { const std::shared_ptr fq = makeFakeQuantize(input, constantPrecision, fqOnData); - return std::make_shared>( + return std::make_shared>( *fq, fqOnData.outputPrecision == ngraph::element::undefined ? constantPrecision : fqOnData.outputPrecision); } @@ -380,8 +380,8 @@ std::shared_ptr makeConvolution( } const auto convolution = std::make_shared( - ngraph::op::TemporaryReplaceOutputType(parent, precision).get(), - ngraph::op::TemporaryReplaceOutputType(weights, precision).get(), + ov::op::TemporaryReplaceOutputType(parent, precision).get(), + ov::op::TemporaryReplaceOutputType(weights, precision).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/concat_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/concat_function.cpp index ed6a313ced6..9063879dce6 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/concat_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/concat_function.cpp @@ -871,7 +871,7 @@ std::shared_ptr ConcatFunction::getReference( input2->set_friendly_name("input2"); const auto fakeQuantize2 = ngraph::builder::subgraph::makeFakeQuantizeTypeRelaxed(input2, precision, fqOnData2); - const std::shared_ptr concat = std::make_shared>( + const std::shared_ptr concat = std::make_shared>( ngraph::OutputVector{ fakeQuantize1->output(0), fakeQuantize2->output(0) }, 1); auto& rtInfo = concat->get_rt_info(); rtInfo["Variant::std::string"] = "concat"; @@ -1166,11 +1166,11 @@ std::shared_ptr ConcatFunction::getReferenceWithNeighbors( convShape[1] = inputShape[1].get_length() + inputShape[1].get_length(); convShape[0] = convShape[1] * 2; convShape[2] = convShape[3] = 1; - auto convolutionAddition = std::make_shared>( + auto convolutionAddition = std::make_shared>( element::TypeVector{ element::f32, element::f32 }, element::TypeVector{ element::f32 }, - op::TemporaryReplaceOutputType(mainBranch, element::f32).get(), - op::TemporaryReplaceOutputType(opset1::Constant::create(element::i8, convShape, {1}), element::f32).get(), + ov::op::TemporaryReplaceOutputType(mainBranch, element::f32).get(), + ov::op::TemporaryReplaceOutputType(opset1::Constant::create(element::i8, convShape, {1}), element::f32).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, @@ -1211,11 +1211,11 @@ std::shared_ptr ConcatFunction::getReferenceWithNeighbors( convShape[0] = inputShape[1].get_length() * 2; convShape[1] = inputShape[1].get_length(); convShape[2] = convShape[3] = 1; - auto convolutionNeighbor = std::make_shared>( + auto convolutionNeighbor = std::make_shared>( element::TypeVector{ element::f32, element::f32 }, element::TypeVector{ element::f32 }, - op::TemporaryReplaceOutputType(neighbor, element::f32).get(), - op::TemporaryReplaceOutputType(opset1::Constant::create(element::i8, convShape, {1}), element::f32).get(), + ov::op::TemporaryReplaceOutputType(neighbor, element::f32).get(), + ov::op::TemporaryReplaceOutputType(opset1::Constant::create(element::i8, convShape, {1}), element::f32).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, @@ -1390,10 +1390,10 @@ std::shared_ptr ConcatFunction::getReferenceWithIntermediateAv const std::shared_ptr parent1 = makeDequantization(concat, dequantizationAfter1); parent1->set_friendly_name("concat"); - std::shared_ptr parent2 = std::make_shared>( + std::shared_ptr parent2 = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ element::f32 }, - ngraph::op::TemporaryReplaceOutputType(intermediateOp, element::f32).get(), + ov::op::TemporaryReplaceOutputType(intermediateOp, element::f32).get(), Strides{ 1, 1 }, Shape{ 1, 1 }, Shape{ 0, 0 }, diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_backprop_data_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_backprop_data_function.cpp index eaf5445590c..9a5224348cf 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_backprop_data_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_backprop_data_function.cpp @@ -147,11 +147,11 @@ std::shared_ptr ConvolutionBackpropDataFunction::getReference( dequantizationStructure.multiply.outPrecision = netPrecision; const auto activations = makeDequantization(input, dequantizationStructure); - auto convolutionBackpropData = std::make_shared>( + auto convolutionBackpropData = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ dequantizationAfter.empty() ? netPrecision : element::f32 }, - ngraph::op::TemporaryReplaceOutputType(activations, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(weights, element::f32).get(), + ov::op::TemporaryReplaceOutputType(activations, element::f32).get(), + ov::op::TemporaryReplaceOutputType(weights, element::f32).get(), Strides{ 1, 1 }, CoordinateDiff{ 0, 0 }, CoordinateDiff{ 0, 0 }, diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_function.cpp index acd75cc25a9..551d0398dc5 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_function.cpp @@ -96,13 +96,13 @@ std::shared_ptr ConvolutionFunction::getOriginal( } auto convolutionOriginal = ngraph::opset1::Convolution( - ngraph::op::TemporaryReplaceOutputType(dequantization, netPrecision).get(), - ngraph::op::TemporaryReplaceOutputType(onWeights, netPrecision).get(), + ov::op::TemporaryReplaceOutputType(dequantization, netPrecision).get(), + ov::op::TemporaryReplaceOutputType(onWeights, netPrecision).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::Strides{ 1, 1 }); - std::shared_ptr convolution = std::make_shared>( + std::shared_ptr convolution = std::make_shared>( convolutionOriginal, std::vector{ netPrecision, netPrecision }, std::vector{ netPrecision }); @@ -221,14 +221,14 @@ std::shared_ptr ConvolutionFunction::getReferenceWithIncorrect weightsValues); auto convolutionOriginal = ngraph::opset1::Convolution( - ngraph::op::TemporaryReplaceOutputType(deqBefore, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(weights, element::f32).get(), + ov::op::TemporaryReplaceOutputType(deqBefore, element::f32).get(), + ov::op::TemporaryReplaceOutputType(weights, element::f32).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::Strides{ 1, 1 }); - std::shared_ptr convolution = std::make_shared>( + std::shared_ptr convolution = std::make_shared>( convolutionOriginal, std::vector{ element::f32, element::f32 }, std::vector{}); @@ -289,14 +289,14 @@ std::shared_ptr ConvolutionFunction::getReference( fakeQuantizeOnWeights.outputHighValues); auto convolutionOriginal = ngraph::opset1::Convolution( - ngraph::op::TemporaryReplaceOutputType(deqBefore, netPrecision).get(), - ngraph::op::TemporaryReplaceOutputType(onWeights, netPrecision).get(), + ov::op::TemporaryReplaceOutputType(deqBefore, netPrecision).get(), + ov::op::TemporaryReplaceOutputType(onWeights, netPrecision).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::Strides{ 1, 1 }); - std::shared_ptr convolution = std::make_shared>( + std::shared_ptr convolution = std::make_shared>( convolutionOriginal, std::vector{ netPrecision, netPrecision }, std::vector{ netPrecision }); @@ -360,14 +360,14 @@ std::shared_ptr ConvolutionFunction::get( fakeQuantizeOnWeights.outputLowValues, fakeQuantizeOnWeights.outputHighValues); auto convolutionOriginal = ngraph::opset1::Convolution( - ngraph::op::TemporaryReplaceOutputType(parentOnData, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(parentOnWeights, element::f32).get(), + ov::op::TemporaryReplaceOutputType(parentOnData, element::f32).get(), + ov::op::TemporaryReplaceOutputType(parentOnWeights, element::f32).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::Strides{ 1, 1 }); - const std::shared_ptr convolution = std::make_shared>( + const std::shared_ptr convolution = std::make_shared>( convolutionOriginal, std::vector{ element::f32, element::f32 }, std::vector{}); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/elementwise_with_multi_parent_dequantization_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/elementwise_with_multi_parent_dequantization_function.cpp index f64a0b4cdbc..b639adc0eea 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/elementwise_with_multi_parent_dequantization_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/elementwise_with_multi_parent_dequantization_function.cpp @@ -25,10 +25,10 @@ std::shared_ptr ElementwiseWithMultiParentDequantizationFuncti const ngraph::builder::subgraph::DequantizationOperations& dequantization2) { const auto input1_1 = std::make_shared(precision1, inputShape); const auto input1_2 = std::make_shared(precision1, ngraph::Shape({ inputShape[0], inputShape[1], 1, 1 })); - const std::shared_ptr multiply1 = std::make_shared>( + const std::shared_ptr multiply1 = std::make_shared>( opset1::Multiply( - ngraph::op::TemporaryReplaceOutputType(input1_1, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(input1_2, element::f32).get()), + ov::op::TemporaryReplaceOutputType(input1_1, element::f32).get(), + ov::op::TemporaryReplaceOutputType(input1_2, element::f32).get()), std::vector{element::f32, element::f32}, std::vector{}); @@ -36,10 +36,10 @@ std::shared_ptr ElementwiseWithMultiParentDequantizationFuncti const auto input2_1 = std::make_shared(precision1, inputShape); const auto input2_2 = std::make_shared(precision1, ngraph::Shape({ inputShape[0], inputShape[1], 1, 1 })); - const std::shared_ptr multiply2 = std::make_shared>( + const std::shared_ptr multiply2 = std::make_shared>( opset1::Multiply( - ngraph::op::TemporaryReplaceOutputType(input2_1, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(input2_2, element::f32).get()), + ov::op::TemporaryReplaceOutputType(input2_1, element::f32).get(), + ov::op::TemporaryReplaceOutputType(input2_2, element::f32).get()), std::vector{element::f32, element::f32}, std::vector{}); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_convolution_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_convolution_function.cpp index ef513091825..92aa6cb4b96 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_convolution_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_convolution_function.cpp @@ -188,10 +188,10 @@ std::shared_ptr FakeQuantizeAndConvolutionFunction::get( std::shared_ptr lastOperation; if (operation == "Convolution") { - lastOperation = std::make_shared>( + lastOperation = std::make_shared>( ngraph::opset1::Convolution( - ngraph::op::TemporaryReplaceOutputType(parentOnActivation, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(parentOnWeights, element::f32).get(), + ov::op::TemporaryReplaceOutputType(parentOnActivation, element::f32).get(), + ov::op::TemporaryReplaceOutputType(parentOnWeights, element::f32).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, @@ -199,10 +199,10 @@ std::shared_ptr FakeQuantizeAndConvolutionFunction::get( std::vector{ element::f32, element::f32 }, std::vector{}); } else if (operation == "GroupConvolution") { - lastOperation = std::make_shared>( + lastOperation = std::make_shared>( ngraph::opset1::GroupConvolution( - ngraph::op::TemporaryReplaceOutputType(parentOnActivation, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(parentOnWeights, element::f32).get(), + ov::op::TemporaryReplaceOutputType(parentOnActivation, element::f32).get(), + ov::op::TemporaryReplaceOutputType(parentOnWeights, element::f32).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_two_output_branches_with_convolution_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_two_output_branches_with_convolution_function.cpp index 3082d6e66aa..ee2c271f693 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_two_output_branches_with_convolution_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_and_two_output_branches_with_convolution_function.cpp @@ -28,10 +28,10 @@ std::shared_ptr createConvolution( std::vector(outputChannelsCount * inputChannelsCount, 1)); const std::shared_ptr convolution = typeRelaxed ? - std::make_shared>( + std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{}, - ngraph::op::TemporaryReplaceOutputType(parent, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(fqOnWeights.empty() ? + ov::op::TemporaryReplaceOutputType(parent, element::f32).get(), + ov::op::TemporaryReplaceOutputType(fqOnWeights.empty() ? weights : ngraph::builder::makeFakeQuantize( weights, precision, fqOnWeights.quantizationLevel, fqOnWeights.constantShape, diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_function.cpp index ecf11cd687a..a4e95724dfd 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_function.cpp @@ -94,9 +94,9 @@ std::shared_ptr FakeQuantizeFunction::getReference( std::shared_ptr lastOperation = fakeQuantize; if (addNotPrecisionPreservedOperation) { - lastOperation = std::make_shared>( + lastOperation = std::make_shared>( std::vector{element::f32}, std::vector{element::f32}, - ngraph::op::TemporaryReplaceOutputType(fakeQuantize, element::f32).get(), + ov::op::TemporaryReplaceOutputType(fakeQuantize, element::f32).get(), Strides{ 1, 1 }, Shape{ 1, 1 }, Shape{ 1, 1 }, diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_precision_selection_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_precision_selection_function.cpp index f8859010129..eeae254ec5e 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_precision_selection_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_precision_selection_function.cpp @@ -42,7 +42,7 @@ std::shared_ptr FakeQuantizePrecisionSelectionFunction::getOri fakeQuantize, Strides{ 1, 1 }, Shape{ 1, 1 }, Shape{ 0, 0 }, Shape{ 2, 2 }, op::RoundingType::FLOOR)) : - std::make_shared>( + std::make_shared>( opset1::PRelu( fakeQuantize, std::make_shared(element::f32, Shape{}, std::vector{ 0.01 })), @@ -80,7 +80,7 @@ std::shared_ptr FakeQuantizePrecisionSelectionFunction::getOri std::shared_ptr branch2Last; { // just another branch - branch2Last = std::make_shared>( + branch2Last = std::make_shared>( opset1::PRelu( fakeQuantize, std::make_shared(element::f32, Shape{}, std::vector{ 0.01 })), @@ -114,7 +114,7 @@ std::shared_ptr FakeQuantizePrecisionSelectionFunction::getRef fakeQuantize, Strides{ 1, 1 }, Shape{ 1, 1 }, Shape{ 0, 0 }, Shape{ 2, 2 }, op::RoundingType::FLOOR)) : - std::make_shared>( + std::make_shared>( fakeQuantize, std::make_shared(element::f32, Shape{}, std::vector{ 0.01 })); @@ -138,10 +138,10 @@ std::shared_ptr FakeQuantizePrecisionSelectionFunction::getRef values.fakeQuantizeOnWeights.outputLowValues, values.fakeQuantizeOnWeights.outputHighValues); - std::shared_ptr convolution = std::make_shared>( + std::shared_ptr convolution = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{}, - ngraph::op::TemporaryReplaceOutputType(branch1Pooling, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(onWeights, element::f32).get(), + ov::op::TemporaryReplaceOutputType(branch1Pooling, element::f32).get(), + ov::op::TemporaryReplaceOutputType(onWeights, element::f32).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, @@ -153,7 +153,7 @@ std::shared_ptr FakeQuantizePrecisionSelectionFunction::getRef // just another branch - std::shared_ptr branch2PRelu = std::make_shared>( + std::shared_ptr branch2PRelu = std::make_shared>( fakeQuantize, std::make_shared(element::f32, Shape{}, std::vector{ 0.01 })); @@ -165,7 +165,7 @@ std::shared_ptr FakeQuantizePrecisionSelectionFunction::getRef ngraph::pass::low_precision::NetworkHelper::setOutDataPrecision(fakeQuantize, values.fakeQuantizeOnDataOutPrecision); if (values.operationBeforeLimitedOperationIsPrecisionTransparent) { - auto intermediateOpTr = std::dynamic_pointer_cast(branch1Pooling); + auto intermediateOpTr = std::dynamic_pointer_cast(branch1Pooling); if (intermediateOpTr != nullptr) { ngraph::pass::low_precision::NetworkHelper::setOutDataPrecisionForTypeRelaxed(branch1Pooling, values.fakeQuantizeOnDataOutPrecision); } else { diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/group_convolution_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/group_convolution_function.cpp index bdf09cfc6cb..6072546ce7b 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/group_convolution_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/group_convolution_function.cpp @@ -303,14 +303,14 @@ std::shared_ptr GroupConvolutionFunction::get( } auto convolutionOriginal = ngraph::opset1::GroupConvolution( - ngraph::op::TemporaryReplaceOutputType(deqBefore, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(weights, element::f32).get(), + ov::op::TemporaryReplaceOutputType(deqBefore, element::f32).get(), + ov::op::TemporaryReplaceOutputType(weights, element::f32).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::Strides{ 1, 1 }); - std::shared_ptr convolution = std::make_shared>( + std::shared_ptr convolution = std::make_shared>( convolutionOriginal, std::vector{ element::f32, element::f32 }, std::vector{}); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/markup_avg_pool_precisions_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/markup_avg_pool_precisions_function.cpp index ba3e8d3f622..6e7c1761625 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/markup_avg_pool_precisions_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/markup_avg_pool_precisions_function.cpp @@ -36,8 +36,8 @@ std::shared_ptr createConvolution( fakeQuantizeOnWeights->set_friendly_name("fakeQuantizeOnWeights"); auto convolution = std::make_shared( - ngraph::op::TemporaryReplaceOutputType(parent, precision).get(), - ngraph::op::TemporaryReplaceOutputType(fakeQuantizeOnWeights, precision).get(), + ov::op::TemporaryReplaceOutputType(parent, precision).get(), + ov::op::TemporaryReplaceOutputType(fakeQuantizeOnWeights, precision).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, @@ -193,7 +193,7 @@ std::shared_ptr MarkupAvgPoolPrecisionsFunction::getReference( const auto deqBefore = makeDequantization(input, dequantizationBefore); auto outPrecision = precisionAfterOperation; - const std::shared_ptr avgPool = std::make_shared>( + const std::shared_ptr avgPool = std::make_shared>( opset1::AvgPool( deqBefore, Strides{ 1, 1 }, diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_function.cpp index d13ce43377a..57692a3ea0f 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_function.cpp @@ -234,10 +234,10 @@ std::shared_ptr MatMulFunction::getReference( auto dequantization1Op = makeDequantization(input1, deqSructure1); auto dequantization2Op = makeDequantization(input2, deqSructure2); - std::shared_ptr matMul = std::make_shared>( + std::shared_ptr matMul = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ element::f32 }, - ngraph::op::TemporaryReplaceOutputType(dequantization1Op, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(dequantization2Op, element::f32).get(), + ov::op::TemporaryReplaceOutputType(dequantization1Op, element::f32).get(), + ov::op::TemporaryReplaceOutputType(dequantization2Op, element::f32).get(), false, false); @@ -273,10 +273,10 @@ std::shared_ptr MatMulFunction::getReference( weights.shape, weights.values); - const std::shared_ptr matMul = std::make_shared>( + const std::shared_ptr matMul = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{}, - ngraph::op::TemporaryReplaceOutputType(lastDequantizationBefore, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(weightsConst, element::f32).get(), + ov::op::TemporaryReplaceOutputType(lastDequantizationBefore, element::f32).get(), + ov::op::TemporaryReplaceOutputType(weightsConst, element::f32).get(), false, false); matMul->set_friendly_name("matMul"); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/move_dequantization_after_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/move_dequantization_after_function.cpp index a388cf05b47..8c39a5cbffb 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/move_dequantization_after_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/move_dequantization_after_function.cpp @@ -28,7 +28,7 @@ namespace subgraph { Shape{ 0, 0 }, Shape{ 2, 2 }, op::RoundingType::FLOOR); - const auto targetOp = std::make_shared>( + const auto targetOp = std::make_shared>( op, std::vector{ element::f32, element::f32 }, std::vector{}); @@ -57,7 +57,7 @@ namespace subgraph { Shape{ 0, 0 }, Shape{ 2, 2 }, op::RoundingType::FLOOR); - const auto targetOp = std::make_shared>( + const auto targetOp = std::make_shared>( op, std::vector{ element::f32, element::f32 }, std::vector{}); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_function.cpp index 96f6594f77b..83c90c5bd21 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_function.cpp @@ -49,10 +49,10 @@ std::shared_ptr MultiplyFunction::get( const BranchNodes branchNodes2 = getBranch(actualValues.branch2); auto multiplyOriginal = opset1::Multiply( - ngraph::op::TemporaryReplaceOutputType(branchNodes1.dequantization, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(branchNodes2.dequantization, element::f32).get()); + ov::op::TemporaryReplaceOutputType(branchNodes1.dequantization, element::f32).get(), + ov::op::TemporaryReplaceOutputType(branchNodes2.dequantization, element::f32).get()); - const std::shared_ptr multiply = std::make_shared>( + const std::shared_ptr multiply = std::make_shared>( multiplyOriginal, std::vector{element::f32, element::f32}, std::vector{precision}); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_to_group_convolution_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_to_group_convolution_function.cpp index 952c2022122..1987416e1df 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_to_group_convolution_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_to_group_convolution_function.cpp @@ -78,11 +78,11 @@ std::shared_ptr MultiplyToGroupConvolutionFunction::getReferen ngraph::CoordinateDiff pads(spatialDimsSize, 0ul); ngraph::Strides dilations(spatialDimsSize, 1ul); - const auto gconv = std::make_shared>( + const auto gconv = std::make_shared>( std::vector{ element::f32, element::f32 }, std::vector{ element::f32 }, - ngraph::op::TemporaryReplaceOutputType(input, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(weights, element::f32).get(), + ov::op::TemporaryReplaceOutputType(input, element::f32).get(), + ov::op::TemporaryReplaceOutputType(weights, element::f32).get(), strides, pads, pads, diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mvn_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mvn_function.cpp index 84453b4f533..46d2138db16 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mvn_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mvn_function.cpp @@ -77,11 +77,11 @@ std::shared_ptr MVNFunction::getReference( const std::shared_ptr dequantizationOpBefore = makeDequantization(input, deqBeforeStructure); std::shared_ptr mvn; if (opset_version == 2) { - mvn = std::make_shared>( + mvn = std::make_shared>( op::MVN(dequantizationOpBefore, reductionAxes, normalizeVariance), dequantizationAfter.empty() ? precision : element::f32); } else if (opset_version == 6) { - mvn = std::make_shared>( + mvn = std::make_shared>( opset6::MVN(dequantizationOpBefore, std::make_shared(element::i64, Shape{reductionAxes.size()}, reductionAxes.to_vector()), normalizeVariance, diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_dequantization_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_dequantization_function.cpp index ea719d8f9be..09a762f28ea 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_dequantization_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_dequantization_function.cpp @@ -27,7 +27,7 @@ namespace subgraph { Shape{ 0, 0 }, Shape{ 2, 2 }, op::RoundingType::FLOOR); - const auto targetOp = std::make_shared>( + const auto targetOp = std::make_shared>( op, std::vector{ element::f32, element::f32 }, std::vector{}); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_l2_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_l2_function.cpp index f129f3eb4e0..74aad58608a 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_l2_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_l2_function.cpp @@ -105,10 +105,10 @@ std::shared_ptr NormalizeL2Function::getReference( const auto deqBefore = makeDequantization(input, deqBeforeStructure); const auto axesNode = std::make_shared(ngraph::element::i64, ngraph::Shape{ axes.size() }, axes); - const auto normalizeL2 = std::make_shared>( + const auto normalizeL2 = std::make_shared>( std::vector{ element::f32, axesNode->output(0).get_element_type() }, std::vector{dequantizationAfter.empty() ? precision : element::f32}, - ngraph::op::TemporaryReplaceOutputType(deqBefore, element::f32).get(), + ov::op::TemporaryReplaceOutputType(deqBefore, element::f32).get(), axesNode, 1e-6, epsMode); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/pad_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/pad_function.cpp index 58708252fe5..bed8d17dbd0 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/pad_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/pad_function.cpp @@ -33,13 +33,13 @@ std::shared_ptr PadFunction::get( const auto padsEndConst = opset1::Constant::create(element::u64, Shape{ padsEnd.size() }, padsEnd); const auto padsValueConst = opset1::Constant::create(deqBefore->get_output_element_type(0), Shape{}, { padValue }); - const auto pad = std::make_shared>( + const auto pad = std::make_shared>( std::vector{ precisionAfterOperation, element::u64, element::u64, precisionAfterOperation}, std::vector{ precisionAfterOperation }, - op::TemporaryReplaceOutputType(deqBefore, precisionAfterOperation).get(), - op::TemporaryReplaceOutputType(padsBeginConst, element::u64).get(), - op::TemporaryReplaceOutputType(padsEndConst, element::u64).get(), - op::TemporaryReplaceOutputType(padsValueConst, precisionAfterOperation).get(), + ov::op::TemporaryReplaceOutputType(deqBefore, precisionAfterOperation).get(), + ov::op::TemporaryReplaceOutputType(padsBeginConst, element::u64).get(), + ov::op::TemporaryReplaceOutputType(padsEndConst, element::u64).get(), + ov::op::TemporaryReplaceOutputType(padsValueConst, precisionAfterOperation).get(), mode); const auto deqAfter = makeDequantization(pad, dequantizationAfter); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/precision_propagation_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/precision_propagation_function.cpp index 3f848a3dcbf..adbf69a1ab7 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/precision_propagation_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/precision_propagation_function.cpp @@ -134,8 +134,8 @@ std::shared_ptr PrecisionPropagationFunction::getOriginalWithN fakeQuantizeOnWeights->set_friendly_name("fakeQuantizeOnWeights"); result2 = std::make_shared( - ngraph::op::TemporaryReplaceOutputType(result2, precision).get(), - ngraph::op::TemporaryReplaceOutputType(fakeQuantizeOnWeights, precision).get(), + ov::op::TemporaryReplaceOutputType(result2, precision).get(), + ov::op::TemporaryReplaceOutputType(fakeQuantizeOnWeights, precision).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, @@ -238,11 +238,11 @@ std::shared_ptr PrecisionPropagationFunction::getReferenceWith shape, std::vector(ngraph::shape_size(shape), 128.f)); - auto subtract = std::make_shared>( + auto subtract = std::make_shared>( std::vector{element::f32, element::f32}, std::vector{ element::f32 }, - ngraph::op::TemporaryReplaceOutputType(result2, element::f32).get(), - ngraph::op::TemporaryReplaceOutputType(subtractConst, element::f32).get()); + ov::op::TemporaryReplaceOutputType(result2, element::f32).get(), + ov::op::TemporaryReplaceOutputType(subtractConst, element::f32).get()); result2 = subtract; } @@ -251,8 +251,8 @@ std::shared_ptr PrecisionPropagationFunction::getReferenceWith fakeQuantizeOnWeights->set_friendly_name("fakeQuantizeOnWeights"); result2 = std::make_shared( - ngraph::op::TemporaryReplaceOutputType(result2, precision).get(), - ngraph::op::TemporaryReplaceOutputType(fakeQuantizeOnWeights, precision).get(), + ov::op::TemporaryReplaceOutputType(result2, precision).get(), + ov::op::TemporaryReplaceOutputType(fakeQuantizeOnWeights, precision).get(), ngraph::Strides{ 1, 1 }, ngraph::CoordinateDiff{ 0, 0 }, ngraph::CoordinateDiff{ 0, 0 }, diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/prelu_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/prelu_function.cpp index a3bc04f04ce..7676427ff7a 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/prelu_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/prelu_function.cpp @@ -57,7 +57,7 @@ std::shared_ptr PReluFunction::getReference( const std::shared_ptr quantizationOpBefore = makeDequantization(input, dequantizationBefore); const auto slope = std::make_shared(precisionBeforeDequantization, Shape{}, std::vector { 0.1f }); - const auto prelu = std::make_shared< op::TypeRelaxed>( + const auto prelu = std::make_shared>( ngraph::opset1::PRelu(quantizationOpBefore, slope), precisionAfterOperation); const std::shared_ptr quantizationOpAfter = makeDequantization(prelu, dequantizationAfter); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/relu_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/relu_function.cpp index 871b9d04323..b4e2bcf5a9c 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/relu_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/relu_function.cpp @@ -57,7 +57,7 @@ std::shared_ptr ReluFunction::getReference( if (quantizationOpBefore->get_output_element_type(0) == precisionAfterOperation) { relu = std::make_shared(quantizationOpBefore); } else { - relu = std::make_shared>(quantizationOpBefore); + relu = std::make_shared>(quantizationOpBefore); ngraph::pass::low_precision::NetworkHelper::setOutDataPrecision(relu, precisionAfterOperation); } const std::shared_ptr quantizationOpAfter = makeDequantization(relu, dequantizationAfter); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/squeeze_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/squeeze_function.cpp index ea85efe8fef..931ccb55073 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/squeeze_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/squeeze_function.cpp @@ -62,7 +62,7 @@ std::shared_ptr SqueezeFunction::getReference( const auto input = std::make_shared(precisionBeforeDequantization, inputShape); const std::shared_ptr dequantizationOpBefore = makeDequantization(input, dequantizationBefore); - const auto squeeze = std::make_shared>( + const auto squeeze = std::make_shared>( op::Squeeze(dequantizationOpBefore, std::make_shared(element::i64, Shape{ axes.size() }, axes)), precisionAfterOperation); const std::shared_ptr dequantizationOpAfter = makeDequantization(squeeze, dequantizationAfter); diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/unsqueeze_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/unsqueeze_function.cpp index 92062acdeec..8aeee5a9995 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/unsqueeze_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/unsqueeze_function.cpp @@ -62,7 +62,7 @@ std::shared_ptr UnsqueezeFunction::getReference( const auto input = std::make_shared(precisionBeforeDequantization, inputShape); const std::shared_ptr dequantizationOpBefore = makeDequantization(input, dequantizationBefore); - const auto unsqueeze = std::make_shared>( + const auto unsqueeze = std::make_shared>( op::v0::Unsqueeze(dequantizationOpBefore, std::make_shared(element::i64, Shape{ axes.size() }, axes)), precisionAfterOperation); const std::shared_ptr dequantizationOpAfter = makeDequantization(unsqueeze, dequantizationAfter);