[ShapeInfer] Remove old API from shape inference sources (#19435)

* Remove old API from shape inference sources

* Fix build issues

src/core/shape_inference/include/broadcast_shape_inference.hpp

@@ -3,12 +3,10 @@
 //
 #pragma once
 
-#include <ngraph/validation_util.hpp>
-#include <openvino/op/broadcast.hpp>
-#include <openvino/op/util/broadcast_base.hpp>
-
-#include "ngraph/op/concat.hpp"
 #include "openvino/core/axis_vector.hpp"
+#include "openvino/op/broadcast.hpp"
+#include "openvino/op/concat.hpp"
+#include "openvino/op/util/broadcast_base.hpp"
 #include "utils.hpp"
 
 namespace ov {

src/core/shape_inference/include/embedding_segments_sum_shape_inference.hpp

@@ -16,7 +16,6 @@ template <class TShape, class TRShape = result_shape_t<TShape>>
 std::vector<TRShape> shape_infer(const EmbeddingSegmentsSum* op,
                                  const std::vector<TShape>& input_shapes,
                                  const ITensorAccessor& ta = make_tensor_accessor()) {
-    // const std::map<size_t, std::shared_ptr<ngraph::runtime::HostTensor>>& constant_data = {}) {
     const auto input_size = input_shapes.size();
 
     NODE_VALIDATION_CHECK(op, input_size >= 4 && input_size <= 6);

src/core/shape_inference/include/grid_sample_shape_inference.hpp

@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include <ngraph/validation_util.hpp>
-#include <openvino/op/grid_sample.hpp>
 #include <vector>
 
+#include "openvino/op/grid_sample.hpp"
 #include "utils.hpp"
 
 namespace ov {

src/core/shape_inference/include/one_hot_shape_inference.hpp

@@ -49,15 +49,15 @@ std::vector<TRShape> shape_infer(const OneHot* op,
     const auto& off_value_shape = input_shapes[3];
 
     NODE_VALIDATION_CHECK(op,
-                          depth_shape.is_dynamic() || ngraph::is_scalar(depth_shape.to_shape()),
+                          depth_shape.is_dynamic() || ov::is_scalar(depth_shape.to_shape()),
                           "depth input must be scalar.");
 
     NODE_VALIDATION_CHECK(op,
-                          on_value_shape.is_dynamic() || ngraph::is_scalar(on_value_shape.to_shape()),
+                          on_value_shape.is_dynamic() || ov::is_scalar(on_value_shape.to_shape()),
                           "on_value input must be scalar.");
 
     NODE_VALIDATION_CHECK(op,
-                          off_value_shape.is_dynamic() || ngraph::is_scalar(off_value_shape.to_shape()),
+                          off_value_shape.is_dynamic() || ov::is_scalar(off_value_shape.to_shape()),
                           "off_value input must be scalar.");
 
     auto output_shapes = std::vector<TRShape>(1);

src/core/shape_inference/include/utils.hpp

@@ -4,13 +4,13 @@
 #pragma once
 
 #include <iterator>
-#include <ngraph/validation_util.hpp>
-#include <openvino/opsets/opset1.hpp>
 #include <type_traits>
 
 #include "element_visitor.hpp"
 #include "openvino/core/bound_evaluation_util.hpp"
 #include "openvino/core/deprecated.hpp"
+#include "openvino/core/validation_util.hpp"
+#include "openvino/opsets/opset1.hpp"
 #include "ov_optional.hpp"
 #include "shape_infer_type_utils.hpp"
 #include "tensor_data_accessor.hpp"

src/core/src/op/ceiling.cpp

@@ -7,6 +7,7 @@
 #include "itt.hpp"
 #include "ngraph/op/util/eval_copy.hpp"
 #include "ngraph/runtime/host_tensor.hpp"
+#include "ngraph/validation_util.hpp"
 #include "openvino/reference/ceiling.hpp"
 #include "openvino/reference/copy.hpp"
 

src/core/src/op/concat.cpp

@@ -10,6 +10,7 @@
 #include "concat_shape_inference.hpp"
 #include "itt.hpp"
 #include "ngraph/attribute_visitor.hpp"
+#include "ngraph/validation_util.hpp"
 #include "openvino/core/dimension_tracker.hpp"
 #include "openvino/reference/concat.hpp"
 #include "validation_util.hpp"

src/core/src/op/squeeze.cpp

@@ -12,6 +12,7 @@
 #include "bound_evaluate.hpp"
 #include "itt.hpp"
 #include "ngraph/op/constant.hpp"
+#include "ngraph/validation_util.hpp"
 #include "openvino/reference/copy.hpp"
 #include "squeeze_shape_inference.hpp"
 

src/core/src/op/strided_slice.cpp

@@ -17,6 +17,7 @@
 #include "ngraph/slice_plan.hpp"
 #include "ngraph/type/element_type_traits.hpp"
 #include "ngraph/util.hpp"
+#include "ngraph/validation_util.hpp"
 #include "openvino/core/rt_info.hpp"
 #include "openvino/core/validation_util.hpp"
 #include "openvino/op/util/precision_sensitive_attribute.hpp"

src/core/src/op/subtract.cpp

@@ -7,6 +7,7 @@
 #include "itt.hpp"
 #include "ngraph/op/negative.hpp"
 #include "ngraph/runtime/host_tensor.hpp"
+#include "ngraph/validation_util.hpp"
 #include "openvino/reference/subtract.hpp"
 
 using namespace std;

src/core/src/op/unsqueeze.cpp

@@ -11,6 +11,7 @@
 #include "bound_evaluate.hpp"
 #include "element_visitor.hpp"
 #include "itt.hpp"
+#include "ngraph/validation_util.hpp"
 #include "openvino/reference/copy.hpp"
 #include "unsqueeze_shape_inference.hpp"
 

src/core/src/op/util/gather_base.cpp

@@ -7,6 +7,7 @@
 #include "bound_evaluate.hpp"
 #include "gather_shape_inference.hpp"
 #include "itt.hpp"
+#include "ngraph/validation_util.hpp"
 #include "openvino/op/concat.hpp"
 #include "openvino/op/constant.hpp"
 #include "openvino/op/squeeze.hpp"
@@ -115,6 +116,7 @@ bool evaluate_gather(const ngraph::HostTensorPtr& arg0,
                      int64_t batch_dims = 0) {
     bool rc = true;
 
+    using ov::element::Type_t;
     switch (out->get_element_type()) {
         NGRAPH_TYPE_CASE(evaluate_gather, i32, arg0, arg1, out, axis, batch_dims);
         NGRAPH_TYPE_CASE(evaluate_gather, i64, arg0, arg1, out, axis, batch_dims);