From 7fc16c32951174e6b4375d74bd2e003878cad880 Mon Sep 17 00:00:00 2001 From: Ilya Churaev Date: Tue, 4 Jul 2023 22:14:53 +0400 Subject: [PATCH] Move OpenVINO core developers API to OpenVINO folder (#18360) * Move openvino core developers API to OpenVINO folder * Fixed GPU plugin * Fixed code style --- src/bindings/python/src/pyopenvino/graph/rt_map.cpp | 2 +- src/bindings/python/src/pyopenvino/utils/utils.cpp | 2 +- .../common_optimizations/dimension_tracking.cpp | 2 +- .../common_optimizations/reshape_sequence_fusion.cpp | 2 +- .../transformations/smart_reshape/lstm_states_broadcast.cpp | 2 +- .../tests/common_optimizations/dimension_tracking.cpp | 4 ++-- .../dev_api/{ => openvino/core}/bound_evaluation_util.hpp | 0 src/core/dev_api/{ => openvino/core}/dimension_tracker.hpp | 0 src/core/dev_api/{ => openvino/core}/meta_data.hpp | 0 src/core/dev_api/{ => openvino/core}/so_extension.hpp | 0 src/core/shape_inference/include/utils.hpp | 2 +- src/core/src/bound_evaluate.cpp | 2 +- src/core/src/bound_evaluate.hpp | 2 +- src/core/src/dimension.cpp | 2 +- src/core/src/model.cpp | 2 +- src/core/src/op/concat.cpp | 2 +- src/core/src/op/reshape.cpp | 2 +- src/core/src/op/shape_of.cpp | 2 +- src/core/src/op/topk.cpp | 2 +- src/core/src/partial_shape.cpp | 2 +- src/core/src/pass/serialize.cpp | 2 +- src/core/src/so_extension.cpp | 2 +- src/core/src/validation_util.cpp | 2 +- src/core/tests/evaluate_bound/concat.cpp | 2 +- src/core/tests/extension.cpp | 2 +- src/core/tests/type_prop/arithmetic_ops.hpp | 2 +- src/core/tests/type_prop/binary_elementwise.cpp | 2 +- src/core/tests/type_prop/broadcast.cpp | 3 +-- src/core/tests/type_prop/concat.cpp | 2 +- src/core/tests/type_prop/convert.cpp | 3 +-- src/core/tests/type_prop/ctc_greedy_decoder.cpp | 2 +- src/core/tests/type_prop/ctc_greedy_decoder_seq_len.cpp | 2 +- src/core/tests/type_prop/detection_output.cpp | 2 +- src/core/tests/type_prop/einsum.cpp | 2 +- src/core/tests/type_prop/eye.cpp | 2 +- src/core/tests/type_prop/gather.cpp | 2 +- src/core/tests/type_prop/gather_elements.cpp | 2 +- src/core/tests/type_prop/gather_nd.cpp | 2 +- src/core/tests/type_prop/gather_tree.cpp | 2 +- src/core/tests/type_prop/grid_sample.cpp | 2 +- src/core/tests/type_prop/logical_ops.hpp | 2 +- src/core/tests/type_prop/matmul.cpp | 2 +- src/core/tests/type_prop/one_hot.cpp | 2 +- src/core/tests/type_prop/reshape.cpp | 3 +-- src/core/tests/type_prop/scatter_update.cpp | 2 +- src/core/tests/type_prop/select.cpp | 2 +- src/core/tests/type_prop/shape_of.cpp | 3 +-- src/core/tests/type_prop/slice.cpp | 2 +- src/core/tests/type_prop/squeeze.cpp | 3 +-- src/core/tests/type_prop/strided_slice.cpp | 2 +- src/core/tests/type_prop/tile.cpp | 2 +- src/core/tests/type_prop/top_k.cpp | 2 +- src/core/tests/type_prop/transpose.cpp | 2 +- src/core/tests/type_prop/unsqueeze.cpp | 2 +- src/core/tests/type_prop/variadic_split.cpp | 2 +- src/frontends/common/src/frontend.cpp | 2 +- src/frontends/ir/src/frontend.cpp | 2 +- src/frontends/ir/src/ir_deserializer.cpp | 2 +- src/frontends/onnx/frontend/src/frontend.cpp | 2 +- src/frontends/onnx/tests/conversion.cpp | 2 +- src/frontends/onnx/tests/op_extension.cpp | 4 ++-- src/frontends/paddle/src/frontend.cpp | 2 +- src/frontends/paddle/tests/conversion.cpp | 2 +- src/frontends/paddle/tests/op_extension.cpp | 2 +- src/frontends/pytorch/src/frontend.cpp | 2 +- src/frontends/tensorflow/src/frontend.cpp | 2 +- src/frontends/tensorflow/tests/conversion.cpp | 2 +- src/frontends/tensorflow/tests/op_extension.cpp | 2 +- src/frontends/tensorflow_lite/src/frontend.cpp | 2 +- src/frontends/tensorflow_lite/tests/conversion.cpp | 2 +- src/frontends/tensorflow_lite/tests/op_extension.cpp | 4 ++-- src/inference/src/check_network_batchable.cpp | 2 +- src/inference/src/core.cpp | 2 +- src/inference/src/dev/core_impl.cpp | 2 +- src/inference/src/dev/core_impl.hpp | 6 ++++-- src/inference/src/ie_core.cpp | 2 +- src/plugins/auto_batch/src/plugin.cpp | 4 ++-- src/plugins/auto_batch/tests/unit/load_network_tests.cpp | 3 +-- src/plugins/intel_gpu/src/plugin/plugin.cpp | 2 +- src/tests/util/type_prop.hpp | 2 +- 80 files changed, 83 insertions(+), 87 deletions(-) rename src/core/dev_api/{ => openvino/core}/bound_evaluation_util.hpp (100%) rename src/core/dev_api/{ => openvino/core}/dimension_tracker.hpp (100%) rename src/core/dev_api/{ => openvino/core}/meta_data.hpp (100%) rename src/core/dev_api/{ => openvino/core}/so_extension.hpp (100%) diff --git a/src/bindings/python/src/pyopenvino/graph/rt_map.cpp b/src/bindings/python/src/pyopenvino/graph/rt_map.cpp index 0634dcb7b1566d..3e7323300e7016 100644 --- a/src/bindings/python/src/pyopenvino/graph/rt_map.cpp +++ b/src/bindings/python/src/pyopenvino/graph/rt_map.cpp @@ -10,7 +10,7 @@ #include #include "dict_attribute_visitor.hpp" -#include "meta_data.hpp" +#include "openvino/core/meta_data.hpp" #include "openvino/core/node.hpp" #include "openvino/core/runtime_attribute.hpp" #include "openvino/op/add.hpp" diff --git a/src/bindings/python/src/pyopenvino/utils/utils.cpp b/src/bindings/python/src/pyopenvino/utils/utils.cpp index 1b3764eac851c6..64067cf7ec684e 100644 --- a/src/bindings/python/src/pyopenvino/utils/utils.cpp +++ b/src/bindings/python/src/pyopenvino/utils/utils.cpp @@ -12,8 +12,8 @@ #include #include "Python.h" -#include "meta_data.hpp" #include "openvino/core/except.hpp" +#include "openvino/core/meta_data.hpp" #include "openvino/frontend/decoder.hpp" #include "openvino/frontend/graph_iterator.hpp" diff --git a/src/common/transformations/src/transformations/common_optimizations/dimension_tracking.cpp b/src/common/transformations/src/transformations/common_optimizations/dimension_tracking.cpp index 67a7026828381c..b02f3b93ad84b9 100644 --- a/src/common/transformations/src/transformations/common_optimizations/dimension_tracking.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/dimension_tracking.cpp @@ -11,8 +11,8 @@ #include #include -#include "dimension_tracker.hpp" #include "itt.hpp" +#include "openvino/core/dimension_tracker.hpp" void ov::batch_util::mark_with_unique_dimension_labels(const std::shared_ptr& f, const ov::DimensionTracker& dt) { diff --git a/src/common/transformations/src/transformations/common_optimizations/reshape_sequence_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/reshape_sequence_fusion.cpp index 2617986862235f..a18c2260ce244f 100644 --- a/src/common/transformations/src/transformations/common_optimizations/reshape_sequence_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/reshape_sequence_fusion.cpp @@ -10,8 +10,8 @@ #include #include -#include "bound_evaluation_util.hpp" #include "itt.hpp" +#include "openvino/core/bound_evaluation_util.hpp" #include "transformations/utils/utils.hpp" namespace { diff --git a/src/common/transformations/src/transformations/smart_reshape/lstm_states_broadcast.cpp b/src/common/transformations/src/transformations/smart_reshape/lstm_states_broadcast.cpp index 20ebf538a7a04b..4fcfb6d8a72bc2 100644 --- a/src/common/transformations/src/transformations/smart_reshape/lstm_states_broadcast.cpp +++ b/src/common/transformations/src/transformations/smart_reshape/lstm_states_broadcast.cpp @@ -6,8 +6,8 @@ #include -#include "dimension_tracker.hpp" #include "itt.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/op/broadcast.hpp" #include "openvino/op/concat.hpp" #include "openvino/op/constant.hpp" diff --git a/src/common/transformations/tests/common_optimizations/dimension_tracking.cpp b/src/common/transformations/tests/common_optimizations/dimension_tracking.cpp index 6bad3e7fa70b1f..148988b315fa93 100644 --- a/src/common/transformations/tests/common_optimizations/dimension_tracking.cpp +++ b/src/common/transformations/tests/common_optimizations/dimension_tracking.cpp @@ -4,7 +4,6 @@ #include -#include #include #include #include @@ -18,6 +17,7 @@ #include "common_test_utils/ngraph_test_utils.hpp" #include "ngraph_functions/subgraph_builders.hpp" +#include "openvino/core/dimension_tracker.hpp" using namespace testing; @@ -309,4 +309,4 @@ TEST(partial_shape, cout_without_label) { std::stringstream stream; stream << shape; ASSERT_EQ(stream.str(), "[1,2,3,5]"); -} \ No newline at end of file +} diff --git a/src/core/dev_api/bound_evaluation_util.hpp b/src/core/dev_api/openvino/core/bound_evaluation_util.hpp similarity index 100% rename from src/core/dev_api/bound_evaluation_util.hpp rename to src/core/dev_api/openvino/core/bound_evaluation_util.hpp diff --git a/src/core/dev_api/dimension_tracker.hpp b/src/core/dev_api/openvino/core/dimension_tracker.hpp similarity index 100% rename from src/core/dev_api/dimension_tracker.hpp rename to src/core/dev_api/openvino/core/dimension_tracker.hpp diff --git a/src/core/dev_api/meta_data.hpp b/src/core/dev_api/openvino/core/meta_data.hpp similarity index 100% rename from src/core/dev_api/meta_data.hpp rename to src/core/dev_api/openvino/core/meta_data.hpp diff --git a/src/core/dev_api/so_extension.hpp b/src/core/dev_api/openvino/core/so_extension.hpp similarity index 100% rename from src/core/dev_api/so_extension.hpp rename to src/core/dev_api/openvino/core/so_extension.hpp diff --git a/src/core/shape_inference/include/utils.hpp b/src/core/shape_inference/include/utils.hpp index 346d0f4a443bea..66858cfd1e544c 100644 --- a/src/core/shape_inference/include/utils.hpp +++ b/src/core/shape_inference/include/utils.hpp @@ -8,7 +8,7 @@ #include #include -#include "bound_evaluation_util.hpp" +#include "openvino/core/bound_evaluation_util.hpp" #include "shape_infer_type_utils.hpp" #include "tensor_data_accessor.hpp" diff --git a/src/core/src/bound_evaluate.cpp b/src/core/src/bound_evaluate.cpp index ec313a5ce258b4..49e32619766082 100644 --- a/src/core/src/bound_evaluate.cpp +++ b/src/core/src/bound_evaluate.cpp @@ -4,8 +4,8 @@ #include "bound_evaluate.hpp" -#include "dimension_tracker.hpp" #include "ngraph/validation_util.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/core/rt_info.hpp" #include "openvino/opsets/opset10.hpp" #include "shape_util.hpp" diff --git a/src/core/src/bound_evaluate.hpp b/src/core/src/bound_evaluate.hpp index 62f24d2453cc78..297f69d661f131 100644 --- a/src/core/src/bound_evaluate.hpp +++ b/src/core/src/bound_evaluate.hpp @@ -4,7 +4,7 @@ #pragma once -#include "bound_evaluation_util.hpp" +#include "openvino/core/bound_evaluation_util.hpp" namespace ov { // bool could_propagate(const Output& output, std::vector& order); diff --git a/src/core/src/dimension.cpp b/src/core/src/dimension.cpp index a1b239f6c074bd..adcde4f535c2cd 100644 --- a/src/core/src/dimension.cpp +++ b/src/core/src/dimension.cpp @@ -11,7 +11,7 @@ #include #include -#include "dimension_tracker.hpp" +#include "openvino/core/dimension_tracker.hpp" using namespace ngraph; diff --git a/src/core/src/model.cpp b/src/core/src/model.cpp index ff1c7e0cf90e0a..e07cfe626386f0 100644 --- a/src/core/src/model.cpp +++ b/src/core/src/model.cpp @@ -10,7 +10,6 @@ #include "itt.hpp" #include "layout_utils.hpp" -#include "meta_data.hpp" #include "ngraph/evaluator.hpp" #include "ngraph/function.hpp" #include "ngraph/graph_util.hpp" @@ -20,6 +19,7 @@ #include "ngraph/validation_util.hpp" #include "openvino/core/attribute_visitor.hpp" #include "openvino/core/except.hpp" +#include "openvino/core/meta_data.hpp" #include "openvino/core/partial_shape.hpp" #include "openvino/op/parameter.hpp" #include "openvino/op/util/op_types.hpp" diff --git a/src/core/src/op/concat.cpp b/src/core/src/op/concat.cpp index 00d85091d8dd52..eaf269984d6c7c 100644 --- a/src/core/src/op/concat.cpp +++ b/src/core/src/op/concat.cpp @@ -8,10 +8,10 @@ #include "bound_evaluate.hpp" #include "concat_shape_inference.hpp" -#include "dimension_tracker.hpp" #include "itt.hpp" #include "ngraph/attribute_visitor.hpp" #include "ngraph/runtime/reference/concat.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "validation_util.hpp" using namespace std; diff --git a/src/core/src/op/reshape.cpp b/src/core/src/op/reshape.cpp index 19301fc9fe5ef8..ea935c72e84fca 100644 --- a/src/core/src/op/reshape.cpp +++ b/src/core/src/op/reshape.cpp @@ -5,7 +5,6 @@ #include "ngraph/op/reshape.hpp" #include -#include #include #include "bound_evaluate.hpp" @@ -14,6 +13,7 @@ #include "ngraph/op/constant.hpp" #include "ngraph/runtime/opt_kernel/reshape.hpp" #include "ngraph/runtime/reference/reshape.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/op/util/precision_sensitive_attribute.hpp" using namespace std; diff --git a/src/core/src/op/shape_of.cpp b/src/core/src/op/shape_of.cpp index c0df4dd18286ec..12bb461f99107a 100644 --- a/src/core/src/op/shape_of.cpp +++ b/src/core/src/op/shape_of.cpp @@ -5,7 +5,6 @@ #include "ngraph/op/shape_of.hpp" #include -#include #include #include @@ -17,6 +16,7 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/shape_of.hpp" #include "ngraph/type/element_type_traits.hpp" +#include "openvino/core/dimension_tracker.hpp" using namespace std; using namespace ngraph; diff --git a/src/core/src/op/topk.cpp b/src/core/src/op/topk.cpp index a1555e24d126d5..dae497b3f8f4aa 100644 --- a/src/core/src/op/topk.cpp +++ b/src/core/src/op/topk.cpp @@ -7,7 +7,6 @@ #include #include -#include "dimension_tracker.hpp" #include "itt.hpp" #include "ngraph/attribute_visitor.hpp" #include "ngraph/axis_vector.hpp" @@ -17,6 +16,7 @@ #include "ngraph/runtime/reference/topk.hpp" #include "ngraph/shape.hpp" #include "ngraph/validation_util.hpp" +#include "openvino/core/dimension_tracker.hpp" using namespace std; using namespace ngraph; diff --git a/src/core/src/partial_shape.cpp b/src/core/src/partial_shape.cpp index a2fdd7554f7cfc..003701a144af9f 100644 --- a/src/core/src/partial_shape.cpp +++ b/src/core/src/partial_shape.cpp @@ -8,9 +8,9 @@ #include #include -#include "dimension_tracker.hpp" #include "ngraph/check.hpp" #include "ngraph/util.hpp" +#include "openvino/core/dimension_tracker.hpp" namespace { static constexpr char dim_out_range_access_txt[] = "Accessing out-of-range dimension in Dimension[]"; diff --git a/src/core/src/pass/serialize.cpp b/src/core/src/pass/serialize.cpp index 37e1b2e859c674..a140b3f7d99462 100644 --- a/src/core/src/pass/serialize.cpp +++ b/src/core/src/pass/serialize.cpp @@ -12,11 +12,11 @@ #include #include -#include "meta_data.hpp" #include "ngraph/ops.hpp" #include "ngraph/opsets/opset.hpp" #include "openvino/core/coordinate_diff.hpp" #include "openvino/core/except.hpp" +#include "openvino/core/meta_data.hpp" #include "openvino/core/model.hpp" #include "openvino/op/util/framework_node.hpp" #include "openvino/opsets/opset1.hpp" diff --git a/src/core/src/so_extension.cpp b/src/core/src/so_extension.cpp index d14d73694a800b..a3adf262eac38b 100644 --- a/src/core/src/so_extension.cpp +++ b/src/core/src/so_extension.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "so_extension.hpp" +#include "openvino/core/so_extension.hpp" const ov::Extension::Ptr& ov::detail::SOExtension::extension() const { return m_ext; diff --git a/src/core/src/validation_util.cpp b/src/core/src/validation_util.cpp index 0559275e632b86..447f786d953c82 100644 --- a/src/core/src/validation_util.cpp +++ b/src/core/src/validation_util.cpp @@ -11,7 +11,6 @@ #include "bound_evaluate.hpp" #include "compare.hpp" -#include "dimension_tracker.hpp" #include "ngraph/evaluator.hpp" #include "ngraph/op/concat.hpp" #include "ngraph/op/convert.hpp" @@ -25,6 +24,7 @@ #include "ngraph/shape.hpp" #include "ngraph/type/element_type_traits.hpp" #include "ngraph/util.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/op/ops.hpp" #include "sequnce_generator.hpp" #include "validation_util.hpp" diff --git a/src/core/tests/evaluate_bound/concat.cpp b/src/core/tests/evaluate_bound/concat.cpp index a1c6f4fbaf79c8..81143031b14893 100644 --- a/src/core/tests/evaluate_bound/concat.cpp +++ b/src/core/tests/evaluate_bound/concat.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "dimension_tracker.hpp" #include "gmock/gmock.h" #include "openvino/core/dimension.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/core/node.hpp" #include "openvino/core/partial_shape.hpp" #include "openvino/opsets/opset9.hpp" diff --git a/src/core/tests/extension.cpp b/src/core/tests/extension.cpp index 77f6cf4d103188..44b3f4d4a4d932 100644 --- a/src/core/tests/extension.cpp +++ b/src/core/tests/extension.cpp @@ -9,9 +9,9 @@ #include "common_test_utils/file_utils.hpp" #include "openvino/core/graph_util.hpp" #include "openvino/core/op_extension.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/opsets/opset9.hpp" #include "openvino/util/file_util.hpp" -#include "so_extension.hpp" inline std::string get_extension_path() { return ov::util::make_plugin_library_name(CommonTestUtils::getExecutableDirectory(), diff --git a/src/core/tests/type_prop/arithmetic_ops.hpp b/src/core/tests/type_prop/arithmetic_ops.hpp index ff2d34c6cf0d0b..d1eca6b536a688 100644 --- a/src/core/tests/type_prop/arithmetic_ops.hpp +++ b/src/core/tests/type_prop/arithmetic_ops.hpp @@ -15,9 +15,9 @@ #include -#include "dimension_tracker.hpp" #include "gtest/gtest.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/op/util/attr_types.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/binary_elementwise.cpp b/src/core/tests/type_prop/binary_elementwise.cpp index 3b316ffa38b503..e6ab6b5fbdb1d5 100644 --- a/src/core/tests/type_prop/binary_elementwise.cpp +++ b/src/core/tests/type_prop/binary_elementwise.cpp @@ -3,9 +3,9 @@ // #include "common_test_utils/test_assertions.hpp" -#include "dimension_tracker.hpp" #include "gtest/gtest.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "util/type_prop.hpp" using namespace std; diff --git a/src/core/tests/type_prop/broadcast.cpp b/src/core/tests/type_prop/broadcast.cpp index 5b26ef60a41e2b..917fc154906c04 100644 --- a/src/core/tests/type_prop/broadcast.cpp +++ b/src/core/tests/type_prop/broadcast.cpp @@ -2,12 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include - #include "common_test_utils/test_assertions.hpp" #include "gtest/gtest.h" #include "ngraph/ngraph.hpp" #include "ngraph/opsets/opset6.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/op/util/attr_types.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/concat.cpp b/src/core/tests/type_prop/concat.cpp index 84148dc62b6afe..ec2c26d739ee0d 100644 --- a/src/core/tests/type_prop/concat.cpp +++ b/src/core/tests/type_prop/concat.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "dimension_tracker.hpp" #include "gmock/gmock.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/pass/graph_rewrite.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/convert.cpp b/src/core/tests/type_prop/convert.cpp index a26afb66e92e3f..306da7bb5edf75 100644 --- a/src/core/tests/type_prop/convert.cpp +++ b/src/core/tests/type_prop/convert.cpp @@ -2,10 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include - #include "gtest/gtest.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "util/type_prop.hpp" using namespace std; diff --git a/src/core/tests/type_prop/ctc_greedy_decoder.cpp b/src/core/tests/type_prop/ctc_greedy_decoder.cpp index ad8054f10d6e92..f713298865fd8c 100644 --- a/src/core/tests/type_prop/ctc_greedy_decoder.cpp +++ b/src/core/tests/type_prop/ctc_greedy_decoder.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "dimension_tracker.hpp" #include "gtest/gtest.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "util/type_prop.hpp" using namespace std; diff --git a/src/core/tests/type_prop/ctc_greedy_decoder_seq_len.cpp b/src/core/tests/type_prop/ctc_greedy_decoder_seq_len.cpp index 7274425cd0d955..526c7e1e3756b3 100644 --- a/src/core/tests/type_prop/ctc_greedy_decoder_seq_len.cpp +++ b/src/core/tests/type_prop/ctc_greedy_decoder_seq_len.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "dimension_tracker.hpp" #include "gtest/gtest.h" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/op/ops.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/detection_output.cpp b/src/core/tests/type_prop/detection_output.cpp index ea52165987df29..9c4559752f55d6 100644 --- a/src/core/tests/type_prop/detection_output.cpp +++ b/src/core/tests/type_prop/detection_output.cpp @@ -6,9 +6,9 @@ #include -#include "dimension_tracker.hpp" #include "gtest/gtest.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/util/common_util.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/einsum.cpp b/src/core/tests/type_prop/einsum.cpp index 824fe07956a352..828cb494627228 100644 --- a/src/core/tests/type_prop/einsum.cpp +++ b/src/core/tests/type_prop/einsum.cpp @@ -3,9 +3,9 @@ // #include "common_test_utils/test_assertions.hpp" -#include "dimension_tracker.hpp" #include "gmock/gmock.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/pass/graph_rewrite.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/eye.cpp b/src/core/tests/type_prop/eye.cpp index f572c01bb6bdaf..13ec8f558409cb 100644 --- a/src/core/tests/type_prop/eye.cpp +++ b/src/core/tests/type_prop/eye.cpp @@ -3,9 +3,9 @@ // #include "common_test_utils/test_assertions.hpp" -#include "dimension_tracker.hpp" #include "eye_shape_inference.hpp" #include "gtest/gtest.h" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/opsets/opset10.hpp" #include "type_prop.hpp" diff --git a/src/core/tests/type_prop/gather.cpp b/src/core/tests/type_prop/gather.cpp index 7c149f30033f91..6778486f98e189 100644 --- a/src/core/tests/type_prop/gather.cpp +++ b/src/core/tests/type_prop/gather.cpp @@ -3,8 +3,8 @@ // #include "common_test_utils/test_assertions.hpp" -#include "dimension_tracker.hpp" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "util/type_prop.hpp" NGRAPH_SUPPRESS_DEPRECATED_START diff --git a/src/core/tests/type_prop/gather_elements.cpp b/src/core/tests/type_prop/gather_elements.cpp index 87fb269e1f501d..304d4211c008d4 100644 --- a/src/core/tests/type_prop/gather_elements.cpp +++ b/src/core/tests/type_prop/gather_elements.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "dimension_tracker.hpp" #include "gtest/gtest.h" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/op/ops.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/gather_nd.cpp b/src/core/tests/type_prop/gather_nd.cpp index 8b478517c83e98..04dbf2cafb466c 100644 --- a/src/core/tests/type_prop/gather_nd.cpp +++ b/src/core/tests/type_prop/gather_nd.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "dimension_tracker.hpp" #include "gmock/gmock.h" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/op/ops.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/gather_tree.cpp b/src/core/tests/type_prop/gather_tree.cpp index 42366dd91add4a..36663ef23dd3db 100644 --- a/src/core/tests/type_prop/gather_tree.cpp +++ b/src/core/tests/type_prop/gather_tree.cpp @@ -5,9 +5,9 @@ #include #include -#include "dimension_tracker.hpp" #include "gtest/gtest.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/op/ops.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/grid_sample.cpp b/src/core/tests/type_prop/grid_sample.cpp index 5391be3ab6a77a..14be7a8f2d3848 100644 --- a/src/core/tests/type_prop/grid_sample.cpp +++ b/src/core/tests/type_prop/grid_sample.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "dimension_tracker.hpp" #include "gtest/gtest.h" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/op/util/attr_types.hpp" #include "openvino/opsets/opset9.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/logical_ops.hpp b/src/core/tests/type_prop/logical_ops.hpp index e9a43b507fa976..2b6437399ae64a 100644 --- a/src/core/tests/type_prop/logical_ops.hpp +++ b/src/core/tests/type_prop/logical_ops.hpp @@ -5,8 +5,8 @@ #pragma once #include "common_test_utils/test_assertions.hpp" -#include "dimension_tracker.hpp" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "util/type_prop.hpp" template diff --git a/src/core/tests/type_prop/matmul.cpp b/src/core/tests/type_prop/matmul.cpp index 327e8574c53301..72652daf1d9629 100644 --- a/src/core/tests/type_prop/matmul.cpp +++ b/src/core/tests/type_prop/matmul.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "dimension_tracker.hpp" #include "gmock/gmock.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "util/type_prop.hpp" using namespace std; diff --git a/src/core/tests/type_prop/one_hot.cpp b/src/core/tests/type_prop/one_hot.cpp index b3e71bfd955f4b..514d2ecbb970b0 100644 --- a/src/core/tests/type_prop/one_hot.cpp +++ b/src/core/tests/type_prop/one_hot.cpp @@ -3,9 +3,9 @@ // #include "common_test_utils/test_assertions.hpp" -#include "dimension_tracker.hpp" #include "gtest/gtest.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "util/type_prop.hpp" using namespace std; diff --git a/src/core/tests/type_prop/reshape.cpp b/src/core/tests/type_prop/reshape.cpp index 466d9dbf77a1e3..75b13f982963ca 100644 --- a/src/core/tests/type_prop/reshape.cpp +++ b/src/core/tests/type_prop/reshape.cpp @@ -2,10 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include - #include "gtest/gtest.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "util/type_prop.hpp" using namespace std; diff --git a/src/core/tests/type_prop/scatter_update.cpp b/src/core/tests/type_prop/scatter_update.cpp index 94053006d9c286..23dea1e3b44286 100644 --- a/src/core/tests/type_prop/scatter_update.cpp +++ b/src/core/tests/type_prop/scatter_update.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "dimension_tracker.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "util/type_prop.hpp" using namespace std; diff --git a/src/core/tests/type_prop/select.cpp b/src/core/tests/type_prop/select.cpp index 8802b5e4907711..46bb8538ea32b7 100644 --- a/src/core/tests/type_prop/select.cpp +++ b/src/core/tests/type_prop/select.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "dimension_tracker.hpp" #include "gtest/gtest.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "util/type_prop.hpp" NGRAPH_SUPPRESS_DEPRECATED_START diff --git a/src/core/tests/type_prop/shape_of.cpp b/src/core/tests/type_prop/shape_of.cpp index 0a1ff56389c8dc..7085583f0f0eb1 100644 --- a/src/core/tests/type_prop/shape_of.cpp +++ b/src/core/tests/type_prop/shape_of.cpp @@ -2,10 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include - #include "gtest/gtest.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "util/type_prop.hpp" using namespace std; diff --git a/src/core/tests/type_prop/slice.cpp b/src/core/tests/type_prop/slice.cpp index 98664906c960cb..38523c06cccb2a 100644 --- a/src/core/tests/type_prop/slice.cpp +++ b/src/core/tests/type_prop/slice.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // -#include #include #include "common_test_utils/test_assertions.hpp" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/opsets/opset9.hpp" #include "sequnce_generator.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/squeeze.cpp b/src/core/tests/type_prop/squeeze.cpp index a037a1d528913c..f0a9829b8bbd68 100644 --- a/src/core/tests/type_prop/squeeze.cpp +++ b/src/core/tests/type_prop/squeeze.cpp @@ -2,11 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 // -#include - #include "common_test_utils/test_assertions.hpp" #include "gmock/gmock.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "sequnce_generator.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/strided_slice.cpp b/src/core/tests/type_prop/strided_slice.cpp index 5090dbac4f3545..94ea20f8b80358 100644 --- a/src/core/tests/type_prop/strided_slice.cpp +++ b/src/core/tests/type_prop/strided_slice.cpp @@ -2,13 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 // -#include #include #include #include "common_test_utils/test_assertions.hpp" #include "gmock/gmock.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/opsets/opset9.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/tile.cpp b/src/core/tests/type_prop/tile.cpp index 9d14df58d3e2e6..7115ff300a396b 100644 --- a/src/core/tests/type_prop/tile.cpp +++ b/src/core/tests/type_prop/tile.cpp @@ -3,9 +3,9 @@ // #include "common_test_utils/test_assertions.hpp" -#include "dimension_tracker.hpp" #include "gtest/gtest.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "util/type_prop.hpp" using namespace std; diff --git a/src/core/tests/type_prop/top_k.cpp b/src/core/tests/type_prop/top_k.cpp index ed415b9653ee4f..146623d4b15f33 100644 --- a/src/core/tests/type_prop/top_k.cpp +++ b/src/core/tests/type_prop/top_k.cpp @@ -3,7 +3,7 @@ // #include "common_test_utils/test_assertions.hpp" -#include "dimension_tracker.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/opsets/opset11.hpp" #include "topk_shape_inference.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/transpose.cpp b/src/core/tests/type_prop/transpose.cpp index b197c35d641c45..5d754a1139ed20 100644 --- a/src/core/tests/type_prop/transpose.cpp +++ b/src/core/tests/type_prop/transpose.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "dimension_tracker.hpp" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "sequnce_generator.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/unsqueeze.cpp b/src/core/tests/type_prop/unsqueeze.cpp index 12186ac84762a1..02a4c616a786e4 100644 --- a/src/core/tests/type_prop/unsqueeze.cpp +++ b/src/core/tests/type_prop/unsqueeze.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "dimension_tracker.hpp" #include "gmock/gmock.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "sequnce_generator.hpp" #include "util/type_prop.hpp" diff --git a/src/core/tests/type_prop/variadic_split.cpp b/src/core/tests/type_prop/variadic_split.cpp index 175c04f217c8e5..9a4c1704bc52f8 100644 --- a/src/core/tests/type_prop/variadic_split.cpp +++ b/src/core/tests/type_prop/variadic_split.cpp @@ -3,9 +3,9 @@ // #include "common_test_utils/test_assertions.hpp" -#include "dimension_tracker.hpp" #include "gmock/gmock.h" #include "ngraph/ngraph.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "sequnce_generator.hpp" #include "util/type_prop.hpp" diff --git a/src/frontends/common/src/frontend.cpp b/src/frontends/common/src/frontend.cpp index bcf27b32205507..ae4d5a2e0b3041 100644 --- a/src/frontends/common/src/frontend.cpp +++ b/src/frontends/common/src/frontend.cpp @@ -5,12 +5,12 @@ #include #include +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/exception.hpp" #include "openvino/frontend/extension/op.hpp" #include "openvino/frontend/manager.hpp" #include "openvino/frontend/place.hpp" #include "plugin_loader.hpp" -#include "so_extension.hpp" #include "utils.hpp" using namespace ov; diff --git a/src/frontends/ir/src/frontend.cpp b/src/frontends/ir/src/frontend.cpp index 6e6d49cd7ed057..bd9ad9fccdd87a 100644 --- a/src/frontends/ir/src/frontend.cpp +++ b/src/frontends/ir/src/frontend.cpp @@ -12,8 +12,8 @@ #include "ngraph/runtime/aligned_buffer.hpp" #include "ngraph/runtime/shared_buffer.hpp" #include "openvino/core/any.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/util/file_util.hpp" -#include "so_extension.hpp" #include "xml_parse_utils.h" using namespace ov; diff --git a/src/frontends/ir/src/ir_deserializer.cpp b/src/frontends/ir/src/ir_deserializer.cpp index 0a4ece0aae5e63..22443a779cc179 100644 --- a/src/frontends/ir/src/ir_deserializer.cpp +++ b/src/frontends/ir/src/ir_deserializer.cpp @@ -8,10 +8,10 @@ #include #include "ie_ngraph_utils.hpp" -#include "meta_data.hpp" #include "ngraph/op/util/framework_node.hpp" #include "ngraph/opsets/opset1.hpp" #include "openvino/core/except.hpp" +#include "openvino/core/meta_data.hpp" #include "rt_info_deserializer.hpp" #include "transformations/rt_info/attributes.hpp" #include "utils.hpp" diff --git a/src/frontends/onnx/frontend/src/frontend.cpp b/src/frontends/onnx/frontend/src/frontend.cpp index 3ed28b64737051..4381f02f22c02b 100644 --- a/src/frontends/onnx/frontend/src/frontend.cpp +++ b/src/frontends/onnx/frontend/src/frontend.cpp @@ -26,9 +26,9 @@ #include "legacy_op_extension.hpp" #include "onnx_common/onnx_model_validator.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/extension/telemetry.hpp" #include "ops_bridge.hpp" -#include "so_extension.hpp" using namespace ov; using namespace ov::frontend::onnx; diff --git a/src/frontends/onnx/tests/conversion.cpp b/src/frontends/onnx/tests/conversion.cpp index 96783128c926a5..a2e41a4300c965 100644 --- a/src/frontends/onnx/tests/conversion.cpp +++ b/src/frontends/onnx/tests/conversion.cpp @@ -7,9 +7,9 @@ #include "common_test_utils/file_utils.hpp" #include "conversion_extension.hpp" #include "onnx_utils.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/onnx/frontend.hpp" #include "openvino/op/add.hpp" -#include "so_extension.hpp" using namespace ov::frontend; diff --git a/src/frontends/onnx/tests/op_extension.cpp b/src/frontends/onnx/tests/op_extension.cpp index fcb3480ab47e84..cd1c79a9b55571 100644 --- a/src/frontends/onnx/tests/op_extension.cpp +++ b/src/frontends/onnx/tests/op_extension.cpp @@ -8,13 +8,13 @@ #include "ie_extension.h" #include "onnx_import/onnx_utils.hpp" #include "onnx_utils.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/extension/op.hpp" #include "openvino/frontend/onnx/extension/op.hpp" #include "openvino/frontend/onnx/frontend.hpp" #include "openvino/op/relu.hpp" #include "openvino/op/util/framework_node.hpp" #include "openvino/runtime/core.hpp" -#include "so_extension.hpp" using namespace ov::frontend; @@ -210,4 +210,4 @@ TEST(ONNXOpExtensionViaCommonConstructor, onnx_op_extension_mixed_legacy_and_new EXPECT_NO_THROW(core.read_model(input_model_path)); } -OPENVINO_SUPPRESS_DEPRECATED_END \ No newline at end of file +OPENVINO_SUPPRESS_DEPRECATED_END diff --git a/src/frontends/paddle/src/frontend.cpp b/src/frontends/paddle/src/frontend.cpp index 3ad7c9955de981..d94ef8e091cbf2 100644 --- a/src/frontends/paddle/src/frontend.cpp +++ b/src/frontends/paddle/src/frontend.cpp @@ -28,13 +28,13 @@ #include "internal/pass/transform_tensorarray.hpp" #include "internal/pass/transform_while.hpp" #include "op_table.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/extension/conversion.hpp" #include "openvino/frontend/paddle/node_context.hpp" #include "openvino/util/common_util.hpp" #include "paddle_fw_node.hpp" #include "paddle_utils.hpp" #include "place.hpp" -#include "so_extension.hpp" using namespace ov::frontend::paddle::op::default_opset; using namespace ov; diff --git a/src/frontends/paddle/tests/conversion.cpp b/src/frontends/paddle/tests/conversion.cpp index 9f422b4fbbbdc8..9bcbf9b855765c 100644 --- a/src/frontends/paddle/tests/conversion.cpp +++ b/src/frontends/paddle/tests/conversion.cpp @@ -3,10 +3,10 @@ // #include "conversion_extension.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/exception.hpp" #include "openvino/frontend/paddle/frontend.hpp" #include "paddle_utils.hpp" -#include "so_extension.hpp" using namespace ov::frontend; diff --git a/src/frontends/paddle/tests/op_extension.cpp b/src/frontends/paddle/tests/op_extension.cpp index 6d0efe03d4db78..e8843c10c475bc 100644 --- a/src/frontends/paddle/tests/op_extension.cpp +++ b/src/frontends/paddle/tests/op_extension.cpp @@ -4,12 +4,12 @@ #include "op_extension.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/extension/op.hpp" #include "openvino/frontend/paddle/extension/op.hpp" #include "openvino/frontend/paddle/frontend.hpp" #include "openvino/runtime/core.hpp" #include "paddle_utils.hpp" -#include "so_extension.hpp" #include "utils.hpp" using namespace ov::frontend; diff --git a/src/frontends/pytorch/src/frontend.cpp b/src/frontends/pytorch/src/frontend.cpp index 75afc85560ed38..05a0b81fc9138c 100644 --- a/src/frontends/pytorch/src/frontend.cpp +++ b/src/frontends/pytorch/src/frontend.cpp @@ -6,12 +6,12 @@ #include "input_model.hpp" #include "op_table.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/pytorch/extension/conversion.hpp" #include "openvino/op/util/multi_subgraph_base.hpp" #include "openvino/pass/constant_folding.hpp" #include "openvino/util/log.hpp" #include "pt_framework_node.hpp" -#include "so_extension.hpp" #include "transformations/common_optimizations/push_constant_to_subgraph.hpp" #include "transformations/common_optimizations/remove_multi_subgraph_op_dangling_params.hpp" #include "transformations/common_optimizations/reverse_shape_and_type_infer.hpp" diff --git a/src/frontends/tensorflow/src/frontend.cpp b/src/frontends/tensorflow/src/frontend.cpp index 676f6a30c46f63..6d54a2a56d775a 100644 --- a/src/frontends/tensorflow/src/frontend.cpp +++ b/src/frontends/tensorflow/src/frontend.cpp @@ -16,6 +16,7 @@ #include "helper_transforms/saved_model_unused_remover.hpp" #include "input_model.hpp" #include "op_table.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/graph_iterator.hpp" #include "openvino/frontend/tensorflow/extension/conversion.hpp" #include "openvino/op/util/multi_subgraph_base.hpp" @@ -23,7 +24,6 @@ #include "openvino/util/common_util.hpp" #include "openvino/util/file_util.hpp" #include "openvino/util/log.hpp" -#include "so_extension.hpp" #include "tf_framework_node.hpp" #include "transformations/common_optimizations/remove_concat_zero_dim_input.hpp" #include "transformations/common_optimizations/reverse_shape_and_type_infer.hpp" diff --git a/src/frontends/tensorflow/tests/conversion.cpp b/src/frontends/tensorflow/tests/conversion.cpp index d4b88ba8d973e1..d705a26a147839 100644 --- a/src/frontends/tensorflow/tests/conversion.cpp +++ b/src/frontends/tensorflow/tests/conversion.cpp @@ -3,9 +3,9 @@ // #include "conversion_extension.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/extension/telemetry.hpp" #include "openvino/frontend/tensorflow/frontend.hpp" -#include "so_extension.hpp" #include "tf_utils.hpp" using namespace ov::frontend; diff --git a/src/frontends/tensorflow/tests/op_extension.cpp b/src/frontends/tensorflow/tests/op_extension.cpp index 45356aa6de2c47..b0fa49c98f0d2e 100644 --- a/src/frontends/tensorflow/tests/op_extension.cpp +++ b/src/frontends/tensorflow/tests/op_extension.cpp @@ -4,10 +4,10 @@ #include "op_extension.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/extension/op.hpp" #include "openvino/frontend/tensorflow/extension/op.hpp" #include "openvino/frontend/tensorflow/frontend.hpp" -#include "so_extension.hpp" #include "tf_utils.hpp" using namespace ov::frontend; diff --git a/src/frontends/tensorflow_lite/src/frontend.cpp b/src/frontends/tensorflow_lite/src/frontend.cpp index 1b7d3615c4b672..0c7544eaea0d9f 100644 --- a/src/frontends/tensorflow_lite/src/frontend.cpp +++ b/src/frontends/tensorflow_lite/src/frontend.cpp @@ -8,9 +8,9 @@ #include "input_model.hpp" #include "op/op_translation_utils.hpp" #include "op_table.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/tensorflow_lite/extension/op.hpp" #include "openvino/util/common_util.hpp" -#include "so_extension.hpp" #include "tensor_lite_place.hpp" #include "tf_framework_node.hpp" #include "tflite_transformations/rfft2d_complex_abs.h" diff --git a/src/frontends/tensorflow_lite/tests/conversion.cpp b/src/frontends/tensorflow_lite/tests/conversion.cpp index 97f3240d71d54f..cccae7494f85cb 100644 --- a/src/frontends/tensorflow_lite/tests/conversion.cpp +++ b/src/frontends/tensorflow_lite/tests/conversion.cpp @@ -3,9 +3,9 @@ // #include "conversion_extension.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/extension/telemetry.hpp" #include "openvino/frontend/tensorflow_lite/frontend.hpp" -#include "so_extension.hpp" #include "tf_utils.hpp" using namespace ov::frontend; diff --git a/src/frontends/tensorflow_lite/tests/op_extension.cpp b/src/frontends/tensorflow_lite/tests/op_extension.cpp index 42115190196baa..67b3b32e8ef351 100644 --- a/src/frontends/tensorflow_lite/tests/op_extension.cpp +++ b/src/frontends/tensorflow_lite/tests/op_extension.cpp @@ -4,9 +4,9 @@ #include "op_extension.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/frontend/extension/op.hpp" #include "openvino/frontend/tensorflow_lite/extension/op.hpp" -#include "so_extension.hpp" #include "tf_utils.hpp" using namespace ov::frontend; @@ -138,4 +138,4 @@ INSTANTIATE_TEST_SUITE_P(TFOpExtensionViaTFConstructor, INSTANTIATE_TEST_SUITE_P(TFOpExtensionViaCommonConstructor, FrontEndOpExtensionTest, ::testing::Values(getTestDataOpExtensionViaCommonConstructor()), - FrontEndOpExtensionTest::getTestCaseName); \ No newline at end of file + FrontEndOpExtensionTest::getTestCaseName); diff --git a/src/inference/src/check_network_batchable.cpp b/src/inference/src/check_network_batchable.cpp index 207549356f93a4..869ee44948d5c3 100644 --- a/src/inference/src/check_network_batchable.cpp +++ b/src/inference/src/check_network_batchable.cpp @@ -1,8 +1,8 @@ #include "check_network_batchable.hpp" -#include "dimension_tracker.hpp" #include "ie_ngraph_utils.hpp" #include "ngraph/opsets/opset.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/op/detection_output.hpp" #include "openvino/op/ops.hpp" #include "openvino/pass/manager.hpp" diff --git a/src/inference/src/core.cpp b/src/inference/src/core.cpp index 5a7ef4ef1dea7b..6d061db7280402 100644 --- a/src/inference/src/core.cpp +++ b/src/inference/src/core.cpp @@ -9,8 +9,8 @@ #include "dev/converter_utils.hpp" #include "dev/core_impl.hpp" #include "ie_itt.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/runtime/device_id_parser.hpp" -#include "so_extension.hpp" namespace { std::string resolve_extension_path(const std::string& path) { diff --git a/src/inference/src/dev/core_impl.cpp b/src/inference/src/dev/core_impl.cpp index bd5d2a80af2d54..26eea32f6dd9c6 100644 --- a/src/inference/src/dev/core_impl.cpp +++ b/src/inference/src/dev/core_impl.cpp @@ -26,6 +26,7 @@ #include "openvino/core/except.hpp" #include "openvino/core/op_extension.hpp" #include "openvino/core/preprocess/pre_post_process.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/core/version.hpp" #include "openvino/pass/manager.hpp" #include "openvino/runtime/device_id_parser.hpp" @@ -38,7 +39,6 @@ #include "openvino/util/shared_object.hpp" #include "ov_plugins.hpp" #include "preprocessing/preprocessing.hpp" -#include "so_extension.hpp" #include "xml_parse_utils.h" ov::ICore::~ICore() = default; diff --git a/src/inference/src/dev/core_impl.hpp b/src/inference/src/dev/core_impl.hpp index 670dbf28cb9c74..84fafa329e2374 100644 --- a/src/inference/src/dev/core_impl.hpp +++ b/src/inference/src/dev/core_impl.hpp @@ -18,11 +18,11 @@ #include "multi-device/multi_device_config.hpp" #include "openvino/core/any.hpp" #include "openvino/core/extension.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/core/version.hpp" #include "openvino/runtime/common.hpp" #include "openvino/runtime/icompiled_model.hpp" #include "openvino/runtime/threading/executor_manager.hpp" -#include "so_extension.hpp" namespace ov { @@ -33,7 +33,9 @@ struct Parsed { AnyMap _config; }; -Parsed parseDeviceNameIntoConfig(const std::string& deviceName, const AnyMap& config = {}, const bool keep_core_property = false); +Parsed parseDeviceNameIntoConfig(const std::string& deviceName, + const AnyMap& config = {}, + const bool keep_core_property = false); /** * @brief Checks whether config is applicable for device with 'device_name' diff --git a/src/inference/src/ie_core.cpp b/src/inference/src/ie_core.cpp index 139c12d763145c..22327acc335205 100644 --- a/src/inference/src/ie_core.cpp +++ b/src/inference/src/ie_core.cpp @@ -36,6 +36,7 @@ #include "ngraph/opsets/opset.hpp" #include "ngraph/pass/constant_folding.hpp" #include "openvino/core/except.hpp" +#include "openvino/core/so_extension.hpp" #include "openvino/op/parameter.hpp" #include "openvino/op/result.hpp" #include "openvino/runtime/compiled_model.hpp" @@ -44,7 +45,6 @@ #include "openvino/util/common_util.hpp" #include "openvino/util/file_util.hpp" #include "openvino/util/shared_object.hpp" -#include "so_extension.hpp" #include "xml_parse_utils.h" using namespace InferenceEngine::PluginConfigParams; diff --git a/src/plugins/auto_batch/src/plugin.cpp b/src/plugins/auto_batch/src/plugin.cpp index b887c55754d4c8..d1cdd949497453 100644 --- a/src/plugins/auto_batch/src/plugin.cpp +++ b/src/plugins/auto_batch/src/plugin.cpp @@ -7,11 +7,11 @@ #include "plugin.hpp" #include "compiled_model.hpp" -#include "dimension_tracker.hpp" #include "ie_icore.hpp" #include "ie_metric_helpers.hpp" #include "ie_ngraph_utils.hpp" #include "ie_performance_hints.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/pass/manager.hpp" #include "openvino/runtime/intel_gpu/properties.hpp" #include "openvino/util/common_util.hpp" @@ -356,4 +356,4 @@ InferenceEngine::QueryNetworkResult Plugin::QueryNetwork(const InferenceEngine:: IE_THROW() << "Value for KEY_AUTO_BATCH_DEVICE_CONFIG is not set"; } } // namespace autobatch_plugin -} // namespace ov \ No newline at end of file +} // namespace ov diff --git a/src/plugins/auto_batch/tests/unit/load_network_tests.cpp b/src/plugins/auto_batch/tests/unit/load_network_tests.cpp index 3723a24bd5749d..b9c7accbc1b2af 100644 --- a/src/plugins/auto_batch/tests/unit/load_network_tests.cpp +++ b/src/plugins/auto_batch/tests/unit/load_network_tests.cpp @@ -5,11 +5,10 @@ #include #include -#include - #include "cpp_interfaces/interface/ie_iplugin_internal.hpp" #include "mock_auto_batch_plugin.hpp" #include "ngraph_functions/subgraph_builders.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "unit_test_utils/mocks/cpp_interfaces/impl/mock_inference_plugin_internal.hpp" #include "unit_test_utils/mocks/cpp_interfaces/interface/mock_icore.hpp" #include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iexecutable_network_internal.hpp" diff --git a/src/plugins/intel_gpu/src/plugin/plugin.cpp b/src/plugins/intel_gpu/src/plugin/plugin.cpp index fd0d94dd8168ce..3a8af28cf025e7 100644 --- a/src/plugins/intel_gpu/src/plugin/plugin.cpp +++ b/src/plugins/intel_gpu/src/plugin/plugin.cpp @@ -36,7 +36,7 @@ #include "openvino/runtime/device_id_parser.hpp" #include "ie_icore.hpp" -#include "dimension_tracker.hpp" +#include "openvino/core/dimension_tracker.hpp" #include "transformations/init_node_info.hpp" #include "transformations/common_optimizations/dimension_tracking.hpp" #include diff --git a/src/tests/util/type_prop.hpp b/src/tests/util/type_prop.hpp index 82e3f2153df431..3ba1064c820a38 100644 --- a/src/tests/util/type_prop.hpp +++ b/src/tests/util/type_prop.hpp @@ -4,8 +4,8 @@ #pragma once -#include "dimension_tracker.hpp" #include "gmock/gmock.h" +#include "openvino/core/dimension_tracker.hpp" #include "openvino/core/partial_shape.hpp" #include "openvino/op/parameter.hpp"