diff --git a/src/core/include/ngraph/op/group_normalization.hpp b/src/core/include/ngraph/op/group_normalization.hpp deleted file mode 100644 index cce1e3b13d4d4a..00000000000000 --- a/src/core/include/ngraph/op/group_normalization.hpp +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#include "openvino/op/group_normalization.hpp" - -namespace ngraph { -namespace op { -namespace v12 { -using ov::op::v12::GroupNormalization; -} // namespace v12 -} // namespace op -} // namespace ngraph diff --git a/src/core/include/ngraph/ops.hpp b/src/core/include/ngraph/ops.hpp index 7b21ae3ad91dcc..79a4d26adaeecd 100644 --- a/src/core/include/ngraph/ops.hpp +++ b/src/core/include/ngraph/ops.hpp @@ -82,7 +82,6 @@ #include "ngraph/op/grid_sample.hpp" #include "ngraph/op/grn.hpp" #include "ngraph/op/group_conv.hpp" -#include "ngraph/op/group_normalization.hpp" #include "ngraph/op/gru_cell.hpp" #include "ngraph/op/gru_sequence.hpp" #include "ngraph/op/hard_sigmoid.hpp" diff --git a/src/core/include/ngraph/opsets/opset.hpp b/src/core/include/ngraph/opsets/opset.hpp index fce3a525e4bca5..443de5714e4243 100644 --- a/src/core/include/ngraph/opsets/opset.hpp +++ b/src/core/include/ngraph/opsets/opset.hpp @@ -67,7 +67,6 @@ const NGRAPH_API OpSet& get_opset8(); const NGRAPH_API OpSet& get_opset9(); const NGRAPH_API OpSet& get_opset10(); const NGRAPH_API OpSet& get_opset11(); -const NGRAPH_API OpSet& get_opset12(); const NGRAPH_API std::map>& get_available_opsets(); } // namespace ngraph NGRAPH_SUPPRESS_DEPRECATED_END diff --git a/src/core/include/ngraph/opsets/opset12.hpp b/src/core/include/ngraph/opsets/opset12.hpp deleted file mode 100644 index 4394731fde395d..00000000000000 --- a/src/core/include/ngraph/opsets/opset12.hpp +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#include "ngraph/ops.hpp" - -namespace ngraph { -namespace opset12 { -#define NGRAPH_OP(a, b) using b::a; -#include "ngraph/opsets/opset12_tbl.hpp" -#undef NGRAPH_OP -} // namespace opset12 -} // namespace ngraph diff --git a/src/core/include/ngraph/opsets/opset12_tbl.hpp b/src/core/include/ngraph/opsets/opset12_tbl.hpp deleted file mode 100644 index f5db03d2593b2a..00000000000000 --- a/src/core/include/ngraph/opsets/opset12_tbl.hpp +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#ifndef NGRAPH_OP -# warning "NGRAPH_OP not defined" -# define NGRAPH_OP(x, y) -#endif - -#define _OPENVINO_OP_REG NGRAPH_OP -#include "openvino/opsets/opset12_tbl.hpp" -#undef _OPENVINO_OP_REG diff --git a/src/core/src/opsets/opset.cpp b/src/core/src/opsets/opset.cpp index 7c9e734ea56054..9b02d3edd66fdc 100644 --- a/src/core/src/opsets/opset.cpp +++ b/src/core/src/opsets/opset.cpp @@ -7,7 +7,7 @@ #include "itt.hpp" #include "ngraph/deprecated.hpp" #include "ngraph/log.hpp" -#include "ngraph/ops.hpp" +#include "openvino/op/ops.hpp" #include "openvino/opsets/opset.hpp" #include "openvino/util/log.hpp" @@ -64,8 +64,7 @@ const std::map>& ngraph::get_ _NGRAPH_REG_OPSET(opset8), _NGRAPH_REG_OPSET(opset9), _NGRAPH_REG_OPSET(opset10), - _NGRAPH_REG_OPSET(opset11), - _NGRAPH_REG_OPSET(opset12)}; + _NGRAPH_REG_OPSET(opset11)}; #undef _NGRAPH_REG_OPSET return opset_map; } @@ -275,8 +274,3 @@ const ngraph::OpSet& ngraph::get_opset11() { static OpSet opset(ov::get_opset11()); return opset; } - -const ngraph::OpSet& ngraph::get_opset12() { - static OpSet opset(ov::get_opset12()); - return opset; -} diff --git a/src/core/tests/op_version_tbl.hpp b/src/core/tests/op_version_tbl.hpp index c64b10fcfdbd6d..df476c0b363eab 100644 --- a/src/core/tests/op_version_tbl.hpp +++ b/src/core/tests/op_version_tbl.hpp @@ -67,7 +67,7 @@ _OPENVINO_OP_REG(Greater, ngraph::op::v1) _OPENVINO_OP_REG(GreaterEqual, ngraph::op::v1) _OPENVINO_OP_REG(GroupConvolution, ngraph::op::v1) _OPENVINO_OP_REG(GroupConvolutionBackpropData, ngraph::op::v1) -_OPENVINO_OP_REG(GroupNormalization, ngraph::op::v12) +_OPENVINO_OP_REG(GroupNormalization, ov::op::v12) _OPENVINO_OP_REG(HardSigmoid, ngraph::op::v0) _OPENVINO_OP_REG(Interpolate, ngraph::op::v0) _OPENVINO_OP_REG(Interpolate, ngraph::op::v4) diff --git a/src/tests/util/visitor.hpp b/src/tests/util/visitor.hpp index a274693eaeb1bc..d6b9c4275d208a 100644 --- a/src/tests/util/visitor.hpp +++ b/src/tests/util/visitor.hpp @@ -15,6 +15,7 @@ #include "ngraph/ops.hpp" #include "ngraph/runtime/host_tensor.hpp" #include "openvino/core/deprecated.hpp" +#include "openvino/op/ops.hpp" OPENVINO_SUPPRESS_DEPRECATED_START namespace ngraph {