From 090bf9205f62ae5c2de0388745d2f0001d619f87 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Sat, 9 Mar 2024 21:16:37 +0400 Subject: [PATCH] Revert "Delete opset headers from transformations/utils" (#23350) Reverts openvinotoolkit/openvino#22725 To fix RHEL build --- .../src/compress_quantize_weigths.cpp | 2 - .../include/transformations/utils/utils.hpp | 16 +++--- .../eliminate_unsqueeze_gather.cpp | 4 -- .../fold_subgraph_empty_inputs.cpp | 1 - .../common_optimizations/gelu_fusion.cpp | 1 - ..._precision_sensitive_shapeof_subgraphs.cpp | 1 - .../common_optimizations/nop_elimination.cpp | 8 --- .../pull_through_reduce.cpp | 2 - .../reduce_reshape_fusion.cpp | 2 - ...ip_gather_before_transpose_and_reshape.cpp | 1 - .../strides_optimization.cpp | 1 - .../transpose_sinking.cpp | 3 -- .../flush_fp32_subnormals_to_zero.cpp | 2 +- ...convert_nms_rotated_to_nms_ie_internal.cpp | 1 - .../convert_ti_to_sequences.cpp | 11 ++--- .../group_normalization_decomposition.cpp | 1 - .../dereshape_matmul.cpp | 2 - .../reshape_optimizations.cpp | 1 - .../src/transformations/utils/utils.cpp | 38 ++++++-------- .../fuse_rotary_positional_embeddings.cpp | 4 -- .../common_optimizations/gelu_fusion.cpp | 1 - .../common_optimizations/nop_elimination.cpp | 3 -- .../tests/op_conversions/convert_subtract.cpp | 1 - .../dereshape_matmul.cpp | 5 -- .../ts_reset_no_sinking_attribute.cpp | 11 ++--- src/core/tests/pass/constant_folding.cpp | 49 ------------------- .../embedding_segments_feature_fusing.cpp | 3 -- .../gru_block_cell_replacer.cpp | 1 - src/plugins/auto/src/plugin.cpp | 3 -- .../auto/tests/unit/dynamic_output_test.cpp | 2 +- .../intel_cpu/src/cpu_streams_calculation.cpp | 1 - src/plugins/intel_cpu/src/nodes/rnn.cpp | 6 --- src/plugins/intel_cpu/src/nodes/split.cpp | 2 - .../intel_cpu/src/nodes/tensoriterator.cpp | 2 - .../intel_cpu/src/transformations/utils.cpp | 3 +- .../intel_cpu/src/utils/ngraph_utils.hpp | 1 - .../arm/convert_group_conv.cpp | 1 - .../arm/convert_group_conv1d.cpp | 1 - .../intel_gpu/src/plugin/ops/eltwise.cpp | 5 -- src/plugins/intel_gpu/src/plugin/ops/loop.cpp | 1 - .../intel_gpu/src/plugin/ops/unary.cpp | 2 - .../convert_fc_to_compressed.cpp | 1 - .../transformations/indirect_kv_cache.cpp | 1 - .../transformations/kv_cache_fusion.cpp | 2 - .../clamp_fp16_output_test.cpp | 2 - .../convert_binary_conv_to_conv_test.cpp | 1 - .../indirect_kv_cache_test.cpp | 1 - .../transformations/kv_cache_fusion_test.cpp | 2 - .../ov_snippets_models/src/subgraph_mha.cpp | 16 +++--- 49 files changed, 42 insertions(+), 190 deletions(-) diff --git a/src/common/offline_transformations/src/compress_quantize_weigths.cpp b/src/common/offline_transformations/src/compress_quantize_weigths.cpp index f2d3526a9bd..765ebb9ab6e 100644 --- a/src/common/offline_transformations/src/compress_quantize_weigths.cpp +++ b/src/common/offline_transformations/src/compress_quantize_weigths.cpp @@ -11,8 +11,6 @@ #include "openvino/op/fake_convert.hpp" #include "openvino/op/fake_quantize.hpp" #include "openvino/op/multiply.hpp" -#include "openvino/op/negative.hpp" -#include "openvino/op/power.hpp" #include "openvino/op/subtract.hpp" #include "openvino/pass/constant_folding.hpp" #include "openvino/pass/pattern/op/or.hpp" diff --git a/src/common/transformations/include/transformations/utils/utils.hpp b/src/common/transformations/include/transformations/utils/utils.hpp index fc293b9afe9..f1e270823ba 100644 --- a/src/common/transformations/include/transformations/utils/utils.hpp +++ b/src/common/transformations/include/transformations/utils/utils.hpp @@ -13,8 +13,8 @@ #include "openvino/core/descriptor_tensor.hpp" #include "openvino/core/rt_info.hpp" -#include "openvino/op/constant.hpp" -#include "openvino/op/convert.hpp" +#include "openvino/opsets/opset4.hpp" +#include "openvino/opsets/opset8.hpp" #include "openvino/pass/graph_rewrite.hpp" #include "transformations/rt_info/attributes.hpp" #include "transformations_visibility.hpp" @@ -65,7 +65,7 @@ bool has_op_with_type(const std::shared_ptr& function) { inline bool has_decompression_converts(const std::shared_ptr& function) { for (const auto& op : function->get_ops()) { - if (std::dynamic_pointer_cast(op)) { + if (std::dynamic_pointer_cast(op)) { if (ov::is_decompression(op)) return true; } @@ -133,7 +133,7 @@ bool has_constant_value(const std::shared_ptr& node, return false; } - auto constant = std::dynamic_pointer_cast(node); + auto constant = std::dynamic_pointer_cast(node); if (!constant) { return false; } @@ -167,7 +167,7 @@ bool has_constant_value(const std::shared_ptr& node, return false; } - auto constant = std::dynamic_pointer_cast(node); + auto constant = std::dynamic_pointer_cast(node); if (!constant) { return false; } @@ -184,18 +184,18 @@ bool has_constant_value(const std::shared_ptr& node, return const_values == values; } -TRANSFORMATIONS_API bool get_single_value(const std::shared_ptr& const_node, +TRANSFORMATIONS_API bool get_single_value(const std::shared_ptr& const_node, float& value, bool check_value_range = true); -TRANSFORMATIONS_API std::shared_ptr normalize_constant(const std::shared_ptr& constant, +TRANSFORMATIONS_API std::shared_ptr normalize_constant(const std::shared_ptr& constant, const PartialShape& shape); TRANSFORMATIONS_API std::shared_ptr broadcastTo(const Output& input, const Shape& shape); TRANSFORMATIONS_API std::shared_ptr reshapeTo(const Output& input, const Shape& shape); -TRANSFORMATIONS_API bool constantIsEqualTo(const std::shared_ptr& const_node, +TRANSFORMATIONS_API bool constantIsEqualTo(const std::shared_ptr& const_node, float value, float eps = 1e-5); diff --git a/src/common/transformations/src/transformations/common_optimizations/eliminate_unsqueeze_gather.cpp b/src/common/transformations/src/transformations/common_optimizations/eliminate_unsqueeze_gather.cpp index e887929cd0a..90efaa9b692 100644 --- a/src/common/transformations/src/transformations/common_optimizations/eliminate_unsqueeze_gather.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/eliminate_unsqueeze_gather.cpp @@ -9,10 +9,6 @@ #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/unsqueeze.hpp" -#include "openvino/op/util/binary_elementwise_arithmetic.hpp" -#include "openvino/op/util/binary_elementwise_comparison.hpp" -#include "openvino/op/util/binary_elementwise_logical.hpp" -#include "openvino/op/util/gather_base.hpp" #include "openvino/pass/pattern/op/or.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/fold_subgraph_empty_inputs.cpp b/src/common/transformations/src/transformations/common_optimizations/fold_subgraph_empty_inputs.cpp index fafb592095e..75d600993cc 100644 --- a/src/common/transformations/src/transformations/common_optimizations/fold_subgraph_empty_inputs.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/fold_subgraph_empty_inputs.cpp @@ -11,7 +11,6 @@ #include "itt.hpp" #include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" -#include "openvino/op/util/multi_subgraph_base.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" 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 d9869740424..7f7915f7965 100644 --- a/src/common/transformations/src/transformations/common_optimizations/gelu_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/gelu_fusion.cpp @@ -17,7 +17,6 @@ #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" #include "openvino/op/erf.hpp" -#include "openvino/op/gelu.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/parameter.hpp" #include "openvino/op/power.hpp" 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 93c4e534caa..65f617885d1 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 @@ -10,7 +10,6 @@ #include "itt.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" -#include "openvino/op/util/multi_subgraph_base.hpp" #include "openvino/op/util/precision_sensitive_attribute.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/rt_info/disable_fp16_compression.hpp" 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 afbb18b5243..4afeb134767 100644 --- a/src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp @@ -12,13 +12,11 @@ #include "itt.hpp" #include "openvino/core/validation_util.hpp" #include "openvino/op/add.hpp" -#include "openvino/op/broadcast.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/divide.hpp" #include "openvino/op/gather.hpp" -#include "openvino/op/gather_elements.hpp" #include "openvino/op/gru_sequence.hpp" #include "openvino/op/lstm_sequence.hpp" #include "openvino/op/multiply.hpp" @@ -28,17 +26,11 @@ #include "openvino/op/scatter_elements_update.hpp" #include "openvino/op/scatter_nd_update.hpp" #include "openvino/op/scatter_update.hpp" -#include "openvino/op/slice.hpp" #include "openvino/op/split.hpp" #include "openvino/op/squeeze.hpp" -#include "openvino/op/strided_slice.hpp" #include "openvino/op/subtract.hpp" -#include "openvino/op/tile.hpp" #include "openvino/op/transpose.hpp" #include "openvino/op/unsqueeze.hpp" -#include "openvino/op/util/binary_elementwise_comparison.hpp" -#include "openvino/op/util/binary_elementwise_logical.hpp" -#include "openvino/op/util/op_types.hpp" #include "openvino/op/util/pad_base.hpp" #include "openvino/op/variadic_split.hpp" #include "openvino/pass/pattern/op/optional.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/pull_through_reduce.cpp b/src/common/transformations/src/transformations/common_optimizations/pull_through_reduce.cpp index a2a32b12e9d..c162f9482bd 100644 --- a/src/common/transformations/src/transformations/common_optimizations/pull_through_reduce.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/pull_through_reduce.cpp @@ -12,8 +12,6 @@ #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/unsqueeze.hpp" -#include "openvino/op/util/arithmetic_reductions_keep_dims.hpp" -#include "openvino/op/util/logical_reduction_keep_dims.hpp" #include "openvino/op/util/reduction_base.hpp" #include "openvino/pass/pattern/op/or.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/reduce_reshape_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/reduce_reshape_fusion.cpp index 156a168b1fa..fea65484098 100644 --- a/src/common/transformations/src/transformations/common_optimizations/reduce_reshape_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/reduce_reshape_fusion.cpp @@ -10,8 +10,6 @@ #include "itt.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" -#include "openvino/op/util/arithmetic_reductions_keep_dims.hpp" -#include "openvino/op/util/logical_reduction_keep_dims.hpp" #include "openvino/op/util/reduction_base.hpp" #include "openvino/pass/pattern/op/or.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.cpp b/src/common/transformations/src/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.cpp index 2c21c91fe03..634851cfed0 100644 --- a/src/common/transformations/src/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.cpp @@ -12,7 +12,6 @@ #include "openvino/op/constant.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/transpose.hpp" -#include "openvino/op/util/gather_base.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/strides_optimization.cpp b/src/common/transformations/src/transformations/common_optimizations/strides_optimization.cpp index b6c257e53bd..813aedb046f 100644 --- a/src/common/transformations/src/transformations/common_optimizations/strides_optimization.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/strides_optimization.cpp @@ -15,7 +15,6 @@ #include "openvino/op/reshape.hpp" #include "openvino/op/shape_of.hpp" #include "openvino/op/squeeze.hpp" -#include "openvino/op/util/binary_elementwise_arithmetic.hpp" #include "openvino/pass/pattern/op/or.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/rt_info/strides_property.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/transpose_sinking.cpp b/src/common/transformations/src/transformations/common_optimizations/transpose_sinking.cpp index 2abfc5c8489..cc1cd9370a6 100644 --- a/src/common/transformations/src/transformations/common_optimizations/transpose_sinking.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/transpose_sinking.cpp @@ -18,9 +18,6 @@ #include "openvino/op/squeeze.hpp" #include "openvino/op/transpose.hpp" #include "openvino/op/unsqueeze.hpp" -#include "openvino/op/util/arithmetic_reductions_keep_dims.hpp" -#include "openvino/op/util/binary_elementwise_arithmetic.hpp" -#include "openvino/op/util/logical_reduction_keep_dims.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" diff --git a/src/common/transformations/src/transformations/flush_fp32_subnormals_to_zero.cpp b/src/common/transformations/src/transformations/flush_fp32_subnormals_to_zero.cpp index 9946771b113..ca03c288092 100644 --- a/src/common/transformations/src/transformations/flush_fp32_subnormals_to_zero.cpp +++ b/src/common/transformations/src/transformations/flush_fp32_subnormals_to_zero.cpp @@ -43,7 +43,7 @@ ov::pass::FlushFP32SubnormalsToZero::FlushFP32SubnormalsToZero() { if (!has_subnormals) return false; - auto new_constant = std::make_shared(ov::element::f32, node->get_shape()); + auto new_constant = std::make_shared(ov::element::f32, node->get_shape()); auto* dst_data = const_cast(new_constant->get_data_ptr()); for (size_t i = 0; i < size; ++i) { diff --git a/src/common/transformations/src/transformations/op_conversions/convert_nms_rotated_to_nms_ie_internal.cpp b/src/common/transformations/src/transformations/op_conversions/convert_nms_rotated_to_nms_ie_internal.cpp index 18e98ba6e7e..39833c645f7 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_nms_rotated_to_nms_ie_internal.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_nms_rotated_to_nms_ie_internal.cpp @@ -11,7 +11,6 @@ #include "openvino/core/rt_info.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" -#include "openvino/op/nms_rotated.hpp" #include "openvino/op/non_max_suppression.hpp" #include "openvino/op/reshape.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" diff --git a/src/common/transformations/src/transformations/op_conversions/convert_ti_to_sequences.cpp b/src/common/transformations/src/transformations/op_conversions/convert_ti_to_sequences.cpp index 3f10160ff7a..94c26584004 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_ti_to_sequences.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_ti_to_sequences.cpp @@ -14,7 +14,6 @@ #include "openvino/core/validation_util.hpp" #include "openvino/op/add.hpp" #include "openvino/op/broadcast.hpp" -#include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/gather.hpp" #include "openvino/op/gru_cell.hpp" @@ -25,16 +24,12 @@ #include "openvino/op/lstm_cell.hpp" #include "openvino/op/lstm_sequence.hpp" #include "openvino/op/parameter.hpp" -#include "openvino/op/range.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/result.hpp" -#include "openvino/op/reverse_sequence.hpp" #include "openvino/op/rnn_cell.hpp" #include "openvino/op/rnn_sequence.hpp" #include "openvino/op/scatter_nd_update.hpp" -#include "openvino/op/scatter_update.hpp" #include "openvino/op/shape_of.hpp" -#include "openvino/op/squeeze.hpp" #include "openvino/op/tensor_iterator.hpp" #include "openvino/op/transpose.hpp" #include "openvino/op/unsqueeze.hpp" @@ -564,12 +559,12 @@ ov::pass::ConvertLoopToLSTMSequence::ConvertLoopToLSTMSequence() { auto sequence_index_or_label = std::make_shared(OutputVector{sequence_index_label, sequence_index_reshaped_label}); auto gather_body_label = - pattern::wrap_type({X_body_label, sequence_index_or_label, gather_axis_label}, - pattern::rank_equals(2)); + pattern::wrap_type({X_body_label, sequence_index_or_label, gather_axis_label}, + pattern::rank_equals(2)); auto W_label = pattern::any_input(); auto R_label = pattern::any_input(); auto B_label = pattern::wrap_type(); - auto lstm_cell_label = pattern::wrap_type( + auto lstm_cell_label = pattern::wrap_type( {gather_body_label, H_body_label, C_body_label, W_label, R_label, B_label}); auto scatter_index_new_shape_label = pattern::wrap_type(); auto scatter_index_body_label = diff --git a/src/common/transformations/src/transformations/op_conversions/group_normalization_decomposition.cpp b/src/common/transformations/src/transformations/op_conversions/group_normalization_decomposition.cpp index 1313e936591..7b5dd79b771 100644 --- a/src/common/transformations/src/transformations/op_conversions/group_normalization_decomposition.cpp +++ b/src/common/transformations/src/transformations/op_conversions/group_normalization_decomposition.cpp @@ -13,7 +13,6 @@ #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" -#include "openvino/op/group_normalization.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/mvn.hpp" #include "openvino/op/parameter.hpp" diff --git a/src/common/transformations/src/transformations/symbolic_transformations/dereshape_matmul.cpp b/src/common/transformations/src/transformations/symbolic_transformations/dereshape_matmul.cpp index 05cab8c4a30..99b498c9ad5 100644 --- a/src/common/transformations/src/transformations/symbolic_transformations/dereshape_matmul.cpp +++ b/src/common/transformations/src/transformations/symbolic_transformations/dereshape_matmul.cpp @@ -9,11 +9,9 @@ #include "openvino/core/validation_util.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/convert.hpp" -#include "openvino/op/divide.hpp" #include "openvino/op/matmul.hpp" #include "openvino/op/reshape.hpp" #include "openvino/op/util/binary_elementwise_arithmetic.hpp" -#include "openvino/op/util/op_types.hpp" #include "openvino/pass/pattern/op/or.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/symbolic_transformations/utils.hpp" diff --git a/src/common/transformations/src/transformations/symbolic_transformations/reshape_optimizations.cpp b/src/common/transformations/src/transformations/symbolic_transformations/reshape_optimizations.cpp index ce2202148d9..c533a752eed 100644 --- a/src/common/transformations/src/transformations/symbolic_transformations/reshape_optimizations.cpp +++ b/src/common/transformations/src/transformations/symbolic_transformations/reshape_optimizations.cpp @@ -7,7 +7,6 @@ #include "compare.hpp" #include "itt.hpp" #include "openvino/core/dimension_tracker.hpp" -#include "openvino/op/reshape.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/symbolic_transformations/utils.hpp" #include "transformations/utils/utils.hpp" diff --git a/src/common/transformations/src/transformations/utils/utils.cpp b/src/common/transformations/src/transformations/utils/utils.cpp index c6dbd45d916..60cfdd74405 100644 --- a/src/common/transformations/src/transformations/utils/utils.cpp +++ b/src/common/transformations/src/transformations/utils/utils.cpp @@ -10,19 +10,12 @@ #include #include "openvino/core/validation_util.hpp" -#include "openvino/op/add.hpp" #include "openvino/op/broadcast.hpp" #include "openvino/op/constant.hpp" -#include "openvino/op/divide.hpp" #include "openvino/op/gather.hpp" -#include "openvino/op/multiply.hpp" -#include "openvino/op/relu.hpp" #include "openvino/op/reshape.hpp" -#include "openvino/op/shape_of.hpp" -#include "openvino/op/sigmoid.hpp" -#include "openvino/op/subtract.hpp" -#include "openvino/op/tanh.hpp" -#include "openvino/op/util/shape_of_base.hpp" +#include "openvino/opsets/opset1.hpp" +#include "openvino/opsets/opset3.hpp" namespace ov { namespace op { @@ -157,11 +150,11 @@ bool check_for_broadcast(const ov::PartialShape& ref_shape, const ov::PartialSha std::shared_ptr activation(const std::string& activation_name, const ov::Output& apply_to) { if (activation_name == "relu") { - return std::make_shared(apply_to); + return std::make_shared(apply_to); } else if (activation_name == "sigmoid") { - return std::make_shared(apply_to); + return std::make_shared(apply_to); } else if (activation_name == "tanh") { - return std::make_shared(apply_to); + return std::make_shared(apply_to); } else { OPENVINO_THROW("Unsupported activation function"); } @@ -278,22 +271,21 @@ bool shapes_equal_except_dynamic_expected_batch(const ov::PartialShape& expected void visit_shape_path(Node* node, std::unordered_set& visited, std::function func) { auto is_shapeof = [](ov::Node* node) { - return ov::is_type(node) || ov::is_type(node); + return ov::is_type(node) || ov::is_type(node); }; visit_path_impl(node, visited, func, is_shapeof); } void visit_constant_path(ov::Node* node, std::unordered_set& visited, std::function func) { auto check_parameter = [](ov::Node* node) { - OPENVINO_ASSERT(!ov::is_type(node), - "visit_constant_path is called for non-constant path."); + OPENVINO_ASSERT(!ov::is_type(node), "visit_constant_path is called for non-constant path."); return false; }; visit_path_impl(node, visited, func, check_parameter); } bool is_dequantization_subgraph(const Output& node) { - if (!is_type(node.get_node())) { + if (!is_type(node.get_node())) { return false; } @@ -301,9 +293,9 @@ bool is_dequantization_subgraph(const Output& node) { Node* sub = nullptr; Node* convert = nullptr; - if (is_type(mul_inputs[0].get_node())) { + if (is_type(mul_inputs[0].get_node())) { sub = mul_inputs[0].get_node(); - } else if (is_type(mul_inputs[0].get_node())) { + } else if (is_type(mul_inputs[0].get_node())) { convert = mul_inputs[0].get_node(); } else { return false; @@ -311,7 +303,7 @@ bool is_dequantization_subgraph(const Output& node) { if (sub) { auto sub_inputs = sub->input_values(); - if (is_type(sub_inputs[0].get_node())) { + if (is_type(sub_inputs[0].get_node())) { convert = sub_inputs[0].get_node(); } } @@ -328,8 +320,8 @@ bool is_dequantization_subgraph(const Output& node) { bool can_eliminate_eltwise_node(const std::shared_ptr& eltwise, const Output& constant, const Output& non_constant_input) { - if (!is_type(eltwise) && !is_type(eltwise) && - !is_type(eltwise) && !is_type(eltwise)) { + if (!is_type(eltwise) && !is_type(eltwise) && !is_type(eltwise) && + !is_type(eltwise)) { return false; } @@ -338,7 +330,7 @@ bool can_eliminate_eltwise_node(const std::shared_ptr& eltwise, } // check if constant has a single value with either 0 (for Add, Subtract) or 1 (for Multiply, Divide) - auto constant_ptr = std::dynamic_pointer_cast(constant.get_node_shared_ptr()); + auto constant_ptr = std::dynamic_pointer_cast(constant.get_node_shared_ptr()); if (!constant_ptr) { return false; } @@ -385,7 +377,7 @@ bool can_eliminate_eltwise_node(const std::shared_ptr& eltwise, return false; } float expected_const = 0; - if (is_type(eltwise) || is_type(eltwise)) { + if (is_type(eltwise) || is_type(eltwise)) { expected_const = 1; } if (actual_const != expected_const) { diff --git a/src/common/transformations/tests/common_optimizations/fuse_rotary_positional_embeddings.cpp b/src/common/transformations/tests/common_optimizations/fuse_rotary_positional_embeddings.cpp index ea8a866a382..48ee524c1fb 100644 --- a/src/common/transformations/tests/common_optimizations/fuse_rotary_positional_embeddings.cpp +++ b/src/common/transformations/tests/common_optimizations/fuse_rotary_positional_embeddings.cpp @@ -7,11 +7,7 @@ #include #include "common_test_utils/ov_test_utils.hpp" -#include "openvino/op/add.hpp" -#include "openvino/op/concat.hpp" -#include "openvino/op/multiply.hpp" #include "openvino/op/parameter.hpp" -#include "openvino/op/split.hpp" #include "openvino/op/variadic_split.hpp" #include "ov_ops/rotary_positional_embeddings.hpp" #include "transformations/utils/utils.hpp" diff --git a/src/common/transformations/tests/common_optimizations/gelu_fusion.cpp b/src/common/transformations/tests/common_optimizations/gelu_fusion.cpp index a600b4495ec..aa1f1d32a3d 100644 --- a/src/common/transformations/tests/common_optimizations/gelu_fusion.cpp +++ b/src/common/transformations/tests/common_optimizations/gelu_fusion.cpp @@ -20,7 +20,6 @@ #include "openvino/op/constant.hpp" #include "openvino/op/divide.hpp" #include "openvino/op/erf.hpp" -#include "openvino/op/gelu.hpp" #include "openvino/op/multiply.hpp" #include "openvino/op/parameter.hpp" #include "openvino/op/power.hpp" diff --git a/src/common/transformations/tests/common_optimizations/nop_elimination.cpp b/src/common/transformations/tests/common_optimizations/nop_elimination.cpp index 65bc60eaee2..b3da26e1232 100644 --- a/src/common/transformations/tests/common_optimizations/nop_elimination.cpp +++ b/src/common/transformations/tests/common_optimizations/nop_elimination.cpp @@ -16,11 +16,8 @@ #include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_common.hpp" #include "openvino/core/model.hpp" -#include "openvino/op/convert.hpp" #include "openvino/opsets/opset1.hpp" #include "openvino/opsets/opset10.hpp" -#include "openvino/opsets/opset4.hpp" -#include "openvino/opsets/opset8.hpp" #include "openvino/opsets/opset9.hpp" #include "openvino/pass/constant_folding.hpp" #include "openvino/pass/manager.hpp" diff --git a/src/common/transformations/tests/op_conversions/convert_subtract.cpp b/src/common/transformations/tests/op_conversions/convert_subtract.cpp index fb835d0cdb5..e9457e56087 100644 --- a/src/common/transformations/tests/op_conversions/convert_subtract.cpp +++ b/src/common/transformations/tests/op_conversions/convert_subtract.cpp @@ -7,7 +7,6 @@ #include #include "common_test_utils/ov_test_utils.hpp" -#include "openvino/opsets/opset8.hpp" #include "transformations/low_precision/mark_dequantization_subgraph.hpp" #include "transformations/utils/utils.hpp" diff --git a/src/common/transformations/tests/symbolic_transformations/dereshape_matmul.cpp b/src/common/transformations/tests/symbolic_transformations/dereshape_matmul.cpp index a250d57c8bb..013540af3bd 100644 --- a/src/common/transformations/tests/symbolic_transformations/dereshape_matmul.cpp +++ b/src/common/transformations/tests/symbolic_transformations/dereshape_matmul.cpp @@ -10,14 +10,9 @@ #include "openvino/core/dimension_tracker.hpp" #include "openvino/core/model.hpp" #include "openvino/core/validation_util.hpp" -#include "openvino/op/add.hpp" -#include "openvino/op/concat.hpp" -#include "openvino/op/divide.hpp" #include "openvino/op/matmul.hpp" -#include "openvino/op/multiply.hpp" #include "openvino/op/parameter.hpp" #include "openvino/op/reshape.hpp" -#include "openvino/op/util/op_types.hpp" #include "transformations/utils/utils.hpp" using namespace ov; diff --git a/src/common/transformations/tests/transpose_sinking/ts_reset_no_sinking_attribute.cpp b/src/common/transformations/tests/transpose_sinking/ts_reset_no_sinking_attribute.cpp index ccb90ac4ff3..1fecf456fa6 100644 --- a/src/common/transformations/tests/transpose_sinking/ts_reset_no_sinking_attribute.cpp +++ b/src/common/transformations/tests/transpose_sinking/ts_reset_no_sinking_attribute.cpp @@ -10,8 +10,6 @@ #include #include "common_test_utils/ov_test_utils.hpp" -#include "openvino/op/add.hpp" -#include "openvino/op/transpose.hpp" #include "transformations/rt_info/transpose_sinking_attr.hpp" #include "transformations/utils/utils.hpp" @@ -20,16 +18,17 @@ using namespace std; using namespace ov; using namespace op::v0; +using namespace op::v1; TEST(TransformationTests, ResetNoSinkingAttribute) { auto a = std::make_shared(element::f32, Shape{12, 3, 4, 8}); auto b = std::make_shared(element::f32, Shape{12, 3, 4, 8}); - auto transpose_a = make_shared(a, Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); - auto transpose_b = make_shared(b, Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); + auto transpose_a = make_shared(a, Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); + auto transpose_b = make_shared(b, Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); - auto add = std::make_shared(transpose_a, transpose_b); - auto trans_after = make_shared(add, Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); + auto add = std::make_shared(transpose_a, transpose_b); + auto trans_after = make_shared(add, Constant::create(element::i64, Shape{4}, {1, 0, 2, 3})); auto model = std::make_shared(NodeVector{trans_after}, ParameterVector{a, b}); mark_as_no_sinking_node(transpose_a); diff --git a/src/core/tests/pass/constant_folding.cpp b/src/core/tests/pass/constant_folding.cpp index e54b976ff69..f3e1e640881 100644 --- a/src/core/tests/pass/constant_folding.cpp +++ b/src/core/tests/pass/constant_folding.cpp @@ -10,61 +10,12 @@ #include "common_test_utils/ov_test_utils.hpp" #include "common_test_utils/test_tools.hpp" #include "openvino/core/constant_fold_utils.hpp" -#include "openvino/op/abs.hpp" #include "openvino/op/acosh.hpp" #include "openvino/op/add.hpp" -#include "openvino/op/asinh.hpp" -#include "openvino/op/atanh.hpp" -#include "openvino/op/broadcast.hpp" -#include "openvino/op/ceiling.hpp" -#include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert_like.hpp" -#include "openvino/op/divide.hpp" -#include "openvino/op/equal.hpp" -#include "openvino/op/floor.hpp" -#include "openvino/op/gather.hpp" -#include "openvino/op/greater.hpp" -#include "openvino/op/greater_eq.hpp" -#include "openvino/op/interpolate.hpp" -#include "openvino/op/less.hpp" -#include "openvino/op/less_eq.hpp" -#include "openvino/op/logical_not.hpp" -#include "openvino/op/logical_or.hpp" #include "openvino/op/loop.hpp" -#include "openvino/op/maximum.hpp" -#include "openvino/op/minimum.hpp" #include "openvino/op/multiply.hpp" -#include "openvino/op/negative.hpp" -#include "openvino/op/non_zero.hpp" -#include "openvino/op/not_equal.hpp" -#include "openvino/op/one_hot.hpp" -#include "openvino/op/power.hpp" -#include "openvino/op/range.hpp" -#include "openvino/op/reduce_logical_and.hpp" -#include "openvino/op/reduce_logical_or.hpp" -#include "openvino/op/reduce_max.hpp" -#include "openvino/op/reduce_mean.hpp" -#include "openvino/op/reduce_min.hpp" -#include "openvino/op/reduce_prod.hpp" -#include "openvino/op/reduce_sum.hpp" -#include "openvino/op/relu.hpp" -#include "openvino/op/reshape.hpp" -#include "openvino/op/reverse.hpp" -#include "openvino/op/scatter_elements_update.hpp" -#include "openvino/op/select.hpp" -#include "openvino/op/shape_of.hpp" -#include "openvino/op/split.hpp" -#include "openvino/op/sqrt.hpp" -#include "openvino/op/squared_difference.hpp" -#include "openvino/op/squeeze.hpp" -#include "openvino/op/strided_slice.hpp" -#include "openvino/op/subtract.hpp" -#include "openvino/op/tile.hpp" -#include "openvino/op/transpose.hpp" -#include "openvino/op/unsqueeze.hpp" -#include "openvino/op/variadic_split.hpp" -#include "openvino/op/xor.hpp" #include "transformations/common_optimizations/disable_shapeof_constant_folding.hpp" #include "transformations/utils/utils.hpp" diff --git a/src/frontends/tensorflow_common/src/helper_transforms/embedding_segments_feature_fusing.cpp b/src/frontends/tensorflow_common/src/helper_transforms/embedding_segments_feature_fusing.cpp index f8e3cdd3584..bbe02e5bd39 100644 --- a/src/frontends/tensorflow_common/src/helper_transforms/embedding_segments_feature_fusing.cpp +++ b/src/frontends/tensorflow_common/src/helper_transforms/embedding_segments_feature_fusing.cpp @@ -10,7 +10,6 @@ #include "helper_ops/sparse_fill_empty_rows.hpp" #include "helper_ops/sparse_segment_ops.hpp" #include "openvino/op/broadcast.hpp" -#include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/convert.hpp" #include "openvino/op/embedding_segments_sum.hpp" @@ -18,8 +17,6 @@ #include "openvino/op/greater_eq.hpp" #include "openvino/op/non_zero.hpp" #include "openvino/op/reshape.hpp" -#include "openvino/op/select.hpp" -#include "openvino/op/shape_of.hpp" #include "openvino/op/split.hpp" #include "openvino/op/squeeze.hpp" #include "openvino/op/strided_slice.hpp" diff --git a/src/frontends/tensorflow_common/src/helper_transforms/gru_block_cell_replacer.cpp b/src/frontends/tensorflow_common/src/helper_transforms/gru_block_cell_replacer.cpp index c9364dee2e8..d689eeba580 100644 --- a/src/frontends/tensorflow_common/src/helper_transforms/gru_block_cell_replacer.cpp +++ b/src/frontends/tensorflow_common/src/helper_transforms/gru_block_cell_replacer.cpp @@ -12,7 +12,6 @@ #include "openvino/op/constant.hpp" #include "openvino/op/gru_cell.hpp" #include "openvino/op/shape_of.hpp" -#include "openvino/op/slice.hpp" #include "openvino/op/split.hpp" #include "openvino/op/transpose.hpp" #include "openvino/op/variadic_split.hpp" diff --git a/src/plugins/auto/src/plugin.cpp b/src/plugins/auto/src/plugin.cpp index 14ab1ece070..81d78e1a559 100644 --- a/src/plugins/auto/src/plugin.cpp +++ b/src/plugins/auto/src/plugin.cpp @@ -22,9 +22,6 @@ #include "cumulative_compiled_model.hpp" #include "cumulative_schedule.hpp" #include "itt.hpp" -#include "openvino/op/fake_quantize.hpp" -#include "openvino/op/convolution.hpp" -#include "openvino/op/group_conv.hpp" namespace { const std::string get_model_precision(const std::shared_ptr &model) { diff --git a/src/plugins/auto/tests/unit/dynamic_output_test.cpp b/src/plugins/auto/tests/unit/dynamic_output_test.cpp index d5d90f6367b..afade1a3d1d 100644 --- a/src/plugins/auto/tests/unit/dynamic_output_test.cpp +++ b/src/plugins/auto/tests/unit/dynamic_output_test.cpp @@ -4,7 +4,7 @@ #include #include -#include "openvino/op/non_max_suppression.hpp" + #include "include/auto_unit_test.hpp" using DynamicOutputConfigParams = std::tuple< diff --git a/src/plugins/intel_cpu/src/cpu_streams_calculation.cpp b/src/plugins/intel_cpu/src/cpu_streams_calculation.cpp index 435a3d8de1e..044aed67410 100644 --- a/src/plugins/intel_cpu/src/cpu_streams_calculation.cpp +++ b/src/plugins/intel_cpu/src/cpu_streams_calculation.cpp @@ -11,7 +11,6 @@ #include "openvino/runtime/threading/istreams_executor.hpp" #include "transformations/utils.hpp" #include "transformations/utils/utils.hpp" -#include "openvino/op/fake_quantize.hpp" #include #include diff --git a/src/plugins/intel_cpu/src/nodes/rnn.cpp b/src/plugins/intel_cpu/src/nodes/rnn.cpp index 69fef6fe70a..c5efc984eb0 100644 --- a/src/plugins/intel_cpu/src/nodes/rnn.cpp +++ b/src/plugins/intel_cpu/src/nodes/rnn.cpp @@ -19,12 +19,6 @@ #include "ov_ops/augru_sequence.hpp" #include "openvino/core/node.hpp" -#include "openvino/op/lstm_sequence.hpp" -#include "openvino/op/rnn_sequence.hpp" -#include "openvino/op/gru_sequence.hpp" -#include "openvino/op/gru_cell.hpp" -#include "openvino/op/rnn_cell.hpp" -#include "openvino/op/lstm_cell.hpp" #include #include diff --git a/src/plugins/intel_cpu/src/nodes/split.cpp b/src/plugins/intel_cpu/src/nodes/split.cpp index f4249fff083..b353431c40e 100644 --- a/src/plugins/intel_cpu/src/nodes/split.cpp +++ b/src/plugins/intel_cpu/src/nodes/split.cpp @@ -13,8 +13,6 @@ #include #include "utils/ngraph_utils.hpp" #include -#include "openvino/op/split.hpp" -#include "openvino/op/variadic_split.hpp" #define THROW_ERROR(...) OPENVINO_THROW("Split layer with name '", getName(), "' ", __VA_ARGS__) diff --git a/src/plugins/intel_cpu/src/nodes/tensoriterator.cpp b/src/plugins/intel_cpu/src/nodes/tensoriterator.cpp index 42316b5429e..9ce943b3ae2 100644 --- a/src/plugins/intel_cpu/src/nodes/tensoriterator.cpp +++ b/src/plugins/intel_cpu/src/nodes/tensoriterator.cpp @@ -11,8 +11,6 @@ #include "transformations/utils/utils.hpp" #include "utils/general_utils.h" #include "utils/debug_capabilities.h" -#include "openvino/op/tensor_iterator.hpp" -#include "openvino/op/loop.hpp" #include #include diff --git a/src/plugins/intel_cpu/src/transformations/utils.cpp b/src/plugins/intel_cpu/src/transformations/utils.cpp index 23b70c6c80e..cd9da617108 100644 --- a/src/plugins/intel_cpu/src/transformations/utils.cpp +++ b/src/plugins/intel_cpu/src/transformations/utils.cpp @@ -4,7 +4,6 @@ #include "utils.hpp" #include "openvino/opsets/opset1.hpp" -#include "openvino/op/gather.hpp" #include "cpu_opset/common/op/fully_connected.hpp" #include "transformations/rt_info/dequantization_node.hpp" #include "transformations/utils/utils.hpp" @@ -55,7 +54,7 @@ bool has_matmul_with_compressed_weights(const std::shared_ptr& // \ / / // Gather bool is_gather_with_compressed_weights(const std::shared_ptr& node) { - if (!ov::is_type(node)) { + if (!ov::is_type(node)) { return false; } if (node->get_input_size() != 3) { diff --git a/src/plugins/intel_cpu/src/utils/ngraph_utils.hpp b/src/plugins/intel_cpu/src/utils/ngraph_utils.hpp index 7ead55c1e61..6cdd320d7eb 100644 --- a/src/plugins/intel_cpu/src/utils/ngraph_utils.hpp +++ b/src/plugins/intel_cpu/src/utils/ngraph_utils.hpp @@ -5,7 +5,6 @@ #pragma once #include -#include "openvino/op/util/op_types.hpp" #include #include "transformations/rt_info/primitives_priority_attribute.hpp" diff --git a/src/plugins/intel_cpu/tests/unit/transformations/arm/convert_group_conv.cpp b/src/plugins/intel_cpu/tests/unit/transformations/arm/convert_group_conv.cpp index e85d3f82b8f..5d94fe19c4e 100644 --- a/src/plugins/intel_cpu/tests/unit/transformations/arm/convert_group_conv.cpp +++ b/src/plugins/intel_cpu/tests/unit/transformations/arm/convert_group_conv.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/src/plugins/intel_cpu/tests/unit/transformations/arm/convert_group_conv1d.cpp b/src/plugins/intel_cpu/tests/unit/transformations/arm/convert_group_conv1d.cpp index 01c784ff784..eefb96c305a 100644 --- a/src/plugins/intel_cpu/tests/unit/transformations/arm/convert_group_conv1d.cpp +++ b/src/plugins/intel_cpu/tests/unit/transformations/arm/convert_group_conv1d.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp b/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp index f9276a17435..2d831c94806 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp @@ -29,11 +29,6 @@ #include "intel_gpu/primitives/eltwise.hpp" #include "intel_gpu/primitives/reorder.hpp" #include "intel_gpu/primitives/reshape.hpp" -#include "openvino/op/logical_xor.hpp" -#include "openvino/op/mod.hpp" -#include "openvino/op/is_inf.hpp" -#include "openvino/op/is_nan.hpp" -#include "openvino/op/is_finite.hpp" namespace ov { namespace intel_gpu { diff --git a/src/plugins/intel_gpu/src/plugin/ops/loop.cpp b/src/plugins/intel_gpu/src/plugin/ops/loop.cpp index 7ad29ad1e0f..215e322cf83 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/loop.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/loop.cpp @@ -7,7 +7,6 @@ #include "openvino/op/tensor_iterator.hpp" #include "openvino/op/loop.hpp" -#include "openvino/op/add.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/util/sub_graph_base.hpp" #include "transformations/utils/utils.hpp" diff --git a/src/plugins/intel_gpu/src/plugin/ops/unary.cpp b/src/plugins/intel_gpu/src/plugin/ops/unary.cpp index 4fc2508f13c..3a2b2fc965f 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/unary.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/unary.cpp @@ -9,8 +9,6 @@ #include "openvino/op/elu.hpp" #include "openvino/op/sigmoid.hpp" #include "openvino/op/relu.hpp" -#include "openvino/op/sqrt.hpp" -#include "openvino/op/softsign.hpp" #include "openvino/op/prelu.hpp" #include "openvino/op/clamp.hpp" #include "openvino/op/exp.hpp" diff --git a/src/plugins/intel_gpu/src/plugin/transformations/convert_fc_to_compressed.cpp b/src/plugins/intel_gpu/src/plugin/transformations/convert_fc_to_compressed.cpp index be3acec072c..32b9dcfa5ff 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/convert_fc_to_compressed.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/convert_fc_to_compressed.cpp @@ -19,7 +19,6 @@ #include "openvino/pass/pattern/op/wrap_type.hpp" #include "openvino/pass/pattern/op/or.hpp" #include "transformations/utils/utils.hpp" -#include "openvino/op/multiply.hpp" namespace ov { namespace intel_gpu { diff --git a/src/plugins/intel_gpu/src/plugin/transformations/indirect_kv_cache.cpp b/src/plugins/intel_gpu/src/plugin/transformations/indirect_kv_cache.cpp index 5db78e0acc1..2a0bac30295 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/indirect_kv_cache.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/indirect_kv_cache.cpp @@ -12,7 +12,6 @@ #include "intel_gpu/plugin/common_utils.hpp" #include "openvino/core/graph_util.hpp" -#include "openvino/op/util/op_types.hpp" #include "openvino/core/node_vector.hpp" #include "openvino/core/rt_info.hpp" #include "openvino/op/gather.hpp" diff --git a/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_fusion.cpp b/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_fusion.cpp index 2fd040e7a83..b444252009f 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_fusion.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_fusion.cpp @@ -22,8 +22,6 @@ #include "openvino/pass/pattern/op/or.hpp" #include "openvino/pass/visualize_tree.hpp" #include "transformations/utils/utils.hpp" -#include "openvino/op/concat.hpp" -#include "openvino/op/gather.hpp" namespace ov { namespace intel_gpu { diff --git a/src/plugins/intel_gpu/tests/unit/transformations/clamp_fp16_output_test.cpp b/src/plugins/intel_gpu/tests/unit/transformations/clamp_fp16_output_test.cpp index c6853bfa6fe..3973b770110 100644 --- a/src/plugins/intel_gpu/tests/unit/transformations/clamp_fp16_output_test.cpp +++ b/src/plugins/intel_gpu/tests/unit/transformations/clamp_fp16_output_test.cpp @@ -20,8 +20,6 @@ #include #include "common_test_utils/ov_test_utils.hpp" -#include "openvino/op/matmul.hpp" -#include "openvino/op/softmax.hpp" using namespace testing; using namespace ov::intel_gpu; diff --git a/src/plugins/intel_gpu/tests/unit/transformations/convert_binary_conv_to_conv_test.cpp b/src/plugins/intel_gpu/tests/unit/transformations/convert_binary_conv_to_conv_test.cpp index 4f273e8d85e..23c30f0e95e 100644 --- a/src/plugins/intel_gpu/tests/unit/transformations/convert_binary_conv_to_conv_test.cpp +++ b/src/plugins/intel_gpu/tests/unit/transformations/convert_binary_conv_to_conv_test.cpp @@ -20,7 +20,6 @@ #include "common_test_utils/ov_test_utils.hpp" #include "openvino/core/coordinate_diff.hpp" #include "openvino/core/type/element_type.hpp" -#include "openvino/op/pad.hpp" using namespace testing; using namespace ov::intel_gpu; diff --git a/src/plugins/intel_gpu/tests/unit/transformations/indirect_kv_cache_test.cpp b/src/plugins/intel_gpu/tests/unit/transformations/indirect_kv_cache_test.cpp index 8ad10dea0c1..276d11662f3 100644 --- a/src/plugins/intel_gpu/tests/unit/transformations/indirect_kv_cache_test.cpp +++ b/src/plugins/intel_gpu/tests/unit/transformations/indirect_kv_cache_test.cpp @@ -13,7 +13,6 @@ #include "openvino/core/node_vector.hpp" #include "openvino/core/partial_shape.hpp" #include "openvino/op/parameter.hpp" -#include "openvino/op/gather.hpp" #include "openvino/op/result.hpp" #include "openvino/pass/manager.hpp" diff --git a/src/plugins/intel_gpu/tests/unit/transformations/kv_cache_fusion_test.cpp b/src/plugins/intel_gpu/tests/unit/transformations/kv_cache_fusion_test.cpp index c42daf49578..fb2eed7792c 100644 --- a/src/plugins/intel_gpu/tests/unit/transformations/kv_cache_fusion_test.cpp +++ b/src/plugins/intel_gpu/tests/unit/transformations/kv_cache_fusion_test.cpp @@ -19,10 +19,8 @@ #include "openvino/core/partial_shape.hpp" #include "openvino/op/parameter.hpp" #include "openvino/op/result.hpp" -#include "openvino/op/concat.hpp" #include "openvino/op/sink.hpp" #include "intel_gpu/op/kv_cache.hpp" -#include "openvino/op/gather.hpp" using namespace testing; using namespace ov::intel_gpu; diff --git a/src/tests/ov_helpers/ov_snippets_models/src/subgraph_mha.cpp b/src/tests/ov_helpers/ov_snippets_models/src/subgraph_mha.cpp index aa468fb08f0..9b863dda1bf 100644 --- a/src/tests/ov_helpers/ov_snippets_models/src/subgraph_mha.cpp +++ b/src/tests/ov_helpers/ov_snippets_models/src/subgraph_mha.cpp @@ -509,7 +509,7 @@ std::shared_ptr MHAWOTransposeOnInputsFunction::initOriginal() const const auto mulConst = ov::test::utils::deprecated::make_constant(precision, ov::Shape({1}), std::vector{1}, true); const auto mul = std::make_shared(param1, mulConst); const auto matMul0 = std::make_shared(param0, mul, transA, transB); - const auto softmax = std::make_shared(matMul0, -1); + const auto softmax = std::make_shared(matMul0, -1); const auto matMul1 = std::make_shared(softmax, param2, transA, transB); const auto transpose3 = std::make_shared(matMul1, transpose3Const); @@ -526,7 +526,7 @@ std::shared_ptr MHAWOTransposeFunction::initOriginal() const { float transA = false; float transB = false; const auto matMul0 = std::make_shared(param0, param1, transA, transB); - const auto softmax = std::make_shared(matMul0, -1); + const auto softmax = std::make_shared(matMul0, -1); const auto matMul1 = std::make_shared(softmax, param2, transA, transB); ov::ResultVector results{std::make_shared(matMul1)}; @@ -553,7 +553,7 @@ std::shared_ptr MHAWOTransposeSplitMFunction::initReference() const { auto data2 = std::make_shared(precisions[2], reshape2->get_shape()); const auto matMul0 = std::make_shared(data0, data1); - const auto softmax = std::make_shared(matMul0, -1); + const auto softmax = std::make_shared(matMul0, -1); const auto matMul1 = std::make_shared(softmax, data2); const auto subgraph = std::make_shared(ov::NodeVector{reshape0, reshape1, reshape2}, @@ -698,7 +698,7 @@ std::shared_ptr MHAQuantMatMul0Function::initOriginal() const { const auto matMul0 = std::make_shared(transpose0, fq1); const auto add = std::make_shared(matMul0, addParam); - const auto softMax = std::make_shared(add, -1); + const auto softMax = std::make_shared(add, -1); const auto matMul1 = std::make_shared(softMax, transpose2); auto fq2 = ov::test::utils::make_fake_quantize(matMul1, ov::element::f32, 256, {1}, @@ -950,7 +950,7 @@ std::shared_ptr MHATransposedInputFunction::initOriginal() const { } const auto matMul0 = std::make_shared(param0, matmul0_in1, false, m_transposed_b); - const auto softmax = std::make_shared(matMul0, -1); + const auto softmax = std::make_shared(matMul0, -1); const auto matMul1 = std::make_shared(softmax, param2); ov::ResultVector results{std::make_shared(matMul1)}; @@ -993,7 +993,7 @@ std::shared_ptr MHATransposedInputFunction::initReference() const { } const auto matMul0 = std::make_shared(param0, matmul0_in1); - const auto softmax = std::make_shared(matMul0, -1); + const auto softmax = std::make_shared(matMul0, -1); const auto matMul1 = std::make_shared(softmax, param2); auto subgraph = std::make_shared(ov::NodeVector{data0, in1, data2}, @@ -1036,7 +1036,7 @@ std::shared_ptr MHAWithExtractedReshapeFunction::initOriginal() const const auto target_shape_const_2 = ov::opset1::Constant::create(ov::element::i32, ov::Shape{mm_out_shape.size()}, mm_out_shape); const auto reshape_2 = std::make_shared(add_2, target_shape_const_2, false); - const auto softmax = std::make_shared(reshape_2, -1); + const auto softmax = std::make_shared(reshape_2, -1); const auto matmul_1 = std::make_shared(softmax, param_4); ov::ResultVector results{std::make_shared(matmul_1)}; @@ -1074,7 +1074,7 @@ std::shared_ptr MHAWithExtractedReshapeFunction::initReference() cons const auto matmul_0 = std::make_shared(param_0, param_1); const auto add_internal = std::make_shared(matmul_0, param_2); - const auto softmax = std::make_shared(add_internal, -1); + const auto softmax = std::make_shared(add_internal, -1); const auto matmul_1 = std::make_shared(softmax, param_3); auto subgraph_model = std::make_shared(NodeVector{matmul_1}, ov::ParameterVector{param_0, param_1, param_2, param_3});