Removal of opset12 from ngraph (openvinotoolkit#18282)

a-sidorova · Jun 30, 2023 · deb6231 · deb6231
1 parent 5d399fa
commit deb6231
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 53 deletions.
diff --git a/src/core/include/ngraph/op/group_normalization.hpp b/src/core/include/ngraph/op/group_normalization.hpp
diff --git 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
@@ -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<std::string, std::function<const ngraph::OpSet&()>>& 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
diff --git a/src/core/include/ngraph/opsets/opset12_tbl.hpp b/src/core/include/ngraph/opsets/opset12_tbl.hpp
diff --git 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<std::string, std::function<const ngraph::OpSet&()>>& 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
@@ -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
@@ -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 {