diff --git a/src/core/include/ngraph/coordinate_diff.hpp b/src/core/include/ngraph/coordinate_diff.hpp deleted file mode 100644 index b8d85b0b2717b2..00000000000000 --- a/src/core/include/ngraph/coordinate_diff.hpp +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#if !defined(IN_OV_COMPONENT) && !defined(NGRAPH_LEGACY_HEADER_INCLUDED) -# define NGRAPH_LEGACY_HEADER_INCLUDED -# ifdef _MSC_VER -# pragma message( \ - "The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# else -# warning("The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# endif -#endif - -#include -#include -#include - -#include "openvino/core/coordinate_diff.hpp" - -namespace ngraph { -/// \brief A difference (signed) of tensor element coordinates. -using ov::CoordinateDiff; -} // namespace ngraph diff --git a/src/core/include/ngraph/enum_names.hpp b/src/core/include/ngraph/enum_names.hpp deleted file mode 100644 index 098f9bb1547668..00000000000000 --- a/src/core/include/ngraph/enum_names.hpp +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#if !defined(IN_OV_COMPONENT) && !defined(NGRAPH_LEGACY_HEADER_INCLUDED) -# define NGRAPH_LEGACY_HEADER_INCLUDED -# ifdef _MSC_VER -# pragma message( \ - "The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# else -# warning("The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# endif -#endif - -#include "openvino/core/enum_names.hpp" - -namespace ngraph { -using ov::as_enum; -using ov::as_string; -using ov::EnumNames; -} // namespace ngraph diff --git a/src/core/include/ngraph/validation_util.hpp b/src/core/include/ngraph/validation_util.hpp index bca2e67234bdc4..ef9233ee72d348 100644 --- a/src/core/include/ngraph/validation_util.hpp +++ b/src/core/include/ngraph/validation_util.hpp @@ -16,12 +16,13 @@ #include -#include "ngraph/coordinate_diff.hpp" +#include "openvino/core/coordinate_diff.hpp" #include "openvino/op/constant.hpp" #include "openvino/op/util/attr_types.hpp" #include "openvino/op/util/variable_context.hpp" namespace ngraph { +using ov::CoordinateDiff; using ov::op::v0::Constant; namespace element { diff --git a/src/frontends/onnx/frontend/src/op/conv_transpose.cpp b/src/frontends/onnx/frontend/src/op/conv_transpose.cpp index 2e0276ada0172f..125e9dcbedeec2 100644 --- a/src/frontends/onnx/frontend/src/op/conv_transpose.cpp +++ b/src/frontends/onnx/frontend/src/op/conv_transpose.cpp @@ -5,6 +5,7 @@ #include "op/conv_transpose.hpp" #include "exceptions.hpp" +#include "openvino/core/coordinate_diff.hpp" #include "openvino/op/add.hpp" #include "openvino/op/broadcast.hpp" #include "openvino/op/concat.hpp" @@ -19,6 +20,7 @@ #include "utils/convpool.hpp" using namespace ov::op; +using ov::CoordinateDiff; OPENVINO_SUPPRESS_DEPRECATED_START namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/quant_conv.cpp b/src/frontends/onnx/frontend/src/op/quant_conv.cpp index 4ecab311eb33c3..eb624cfb8719f8 100644 --- a/src/frontends/onnx/frontend/src/op/quant_conv.cpp +++ b/src/frontends/onnx/frontend/src/op/quant_conv.cpp @@ -16,7 +16,6 @@ # include "default_opset.hpp" # include "exceptions.hpp" # include "ngraph/builder/quantization/quantized_linear_convolution.hpp" -# include "ngraph/coordinate_diff.hpp" # include "ngraph/frontend/onnx_import/utils/convpool.hpp" # include "ngraph/op/util/attr_types.hpp" # include "ngraph/opsets/opset0.hpp" diff --git a/src/frontends/onnx/frontend/src/utils/convpool.cpp b/src/frontends/onnx/frontend/src/utils/convpool.cpp index 80e68dc2975530..4dc590dae189a1 100644 --- a/src/frontends/onnx/frontend/src/utils/convpool.cpp +++ b/src/frontends/onnx/frontend/src/utils/convpool.cpp @@ -17,6 +17,7 @@ using namespace ov; using namespace ov::op; +using ov::CoordinateDiff; OPENVINO_SUPPRESS_DEPRECATED_START diff --git a/src/frontends/onnx/frontend/src/utils/convpool.hpp b/src/frontends/onnx/frontend/src/utils/convpool.hpp index 91ddad14c00fc6..b1159204460abe 100644 --- a/src/frontends/onnx/frontend/src/utils/convpool.hpp +++ b/src/frontends/onnx/frontend/src/utils/convpool.hpp @@ -5,6 +5,7 @@ #pragma once #include "onnx_import/core/node.hpp" +#include "openvino/core/coordinate_diff.hpp" #include "openvino/core/deprecated.hpp" #include "openvino/core/shape.hpp" #include "openvino/core/strides.hpp" diff --git a/src/frontends/onnx/frontend/src/utils/pooling_factory.cpp b/src/frontends/onnx/frontend/src/utils/pooling_factory.cpp index 32a4ba1f1cbdb3..9a7663a691c226 100644 --- a/src/frontends/onnx/frontend/src/utils/pooling_factory.cpp +++ b/src/frontends/onnx/frontend/src/utils/pooling_factory.cpp @@ -6,6 +6,7 @@ #include +#include "openvino/core/coordinate_diff.hpp" #include "openvino/frontend/exception.hpp" #include "openvino/op/avg_pool.hpp" #include "openvino/op/constant.hpp"