From bd0a9502f54deedd7009673170cc761cb2c33be9 Mon Sep 17 00:00:00 2001 From: "Zhai, Xuejun" Date: Tue, 21 Mar 2023 12:52:17 +0800 Subject: [PATCH] [Remove version] Remove version from py openvino Signed-off-by: Zhai, Xuejun --- .../src/compatibility/pyngraph/discrete_type_info.cpp | 6 +++--- .../python/src/compatibility/pyngraph/node.cpp | 11 ----------- .../src/pyopenvino/graph/discrete_type_info.cpp | 6 ++---- src/bindings/python/src/pyopenvino/graph/node.cpp | 9 --------- src/bindings/python/tests/test_graph/test_basic.py | 7 ------- src/bindings/python/tests/test_graph/test_core.py | 4 ++-- .../tests_compatibility/test_ngraph/test_basic.py | 6 ------ .../tests_compatibility/test_ngraph/test_core.py | 4 ++-- 8 files changed, 9 insertions(+), 44 deletions(-) diff --git a/src/bindings/python/src/compatibility/pyngraph/discrete_type_info.cpp b/src/bindings/python/src/compatibility/pyngraph/discrete_type_info.cpp index b7418def4d3..49f8bb97953 100644 --- a/src/bindings/python/src/compatibility/pyngraph/discrete_type_info.cpp +++ b/src/bindings/python/src/compatibility/pyngraph/discrete_type_info.cpp @@ -28,14 +28,14 @@ void regclass_pyngraph_DiscreteTypeInfo(py::module m) { discrete_type_info.def(py::self != py::self); discrete_type_info.def_readonly("name", &ngraph::DiscreteTypeInfo::name); - discrete_type_info.def_readonly("version", &ngraph::DiscreteTypeInfo::version); + discrete_type_info.def_readonly("version_id", &ngraph::DiscreteTypeInfo::version_id); discrete_type_info.def_readonly("parent", &ngraph::DiscreteTypeInfo::parent); discrete_type_info.def("__repr__", [](const ngraph::DiscreteTypeInfo& self) { std::string name = std::string(self.name); - std::string version = std::to_string(self.version); + std::string version = std::string(self.version_id); if (self.parent != nullptr) { - std::string parent_version = std::to_string(self.parent->version); + std::string parent_version = std::string(self.parent->version_id); std::string parent_name = self.parent->name; return ""; diff --git a/src/bindings/python/src/compatibility/pyngraph/node.cpp b/src/bindings/python/src/compatibility/pyngraph/node.cpp index 02bfb3d1395..f696a4297ca 100644 --- a/src/bindings/python/src/compatibility/pyngraph/node.cpp +++ b/src/bindings/python/src/compatibility/pyngraph/node.cpp @@ -277,16 +277,6 @@ void regclass_pyngraph_Node(py::module m) { get_rt_info : PyRTMap A dictionary of user defined data. )"); - node.def("get_version", - &ngraph::Node::get_version, - R"( - Returns operation's version of the node. - - Returns - ---------- - get_version : int - Operation version. - )"); node.def("set_argument", &ngraph::Node::set_argument); node.def("set_arguments", [](const std::shared_ptr& self, const ngraph::NodeVector& args) { @@ -301,7 +291,6 @@ void regclass_pyngraph_Node(py::module m) { node.def_property_readonly("rt_info", (PyRTMap & (ngraph::Node::*)()) & ngraph::Node::get_rt_info, py::return_value_policy::reference_internal); - node.def_property_readonly("version", &ngraph::Node::get_version); node.def_property_readonly("type_info", &ngraph::Node::get_type_info); node.def_property("friendly_name", &ngraph::Node::get_friendly_name, &ngraph::Node::set_friendly_name); diff --git a/src/bindings/python/src/pyopenvino/graph/discrete_type_info.cpp b/src/bindings/python/src/pyopenvino/graph/discrete_type_info.cpp index 74b81eb62a4..7d117b5d64d 100644 --- a/src/bindings/python/src/pyopenvino/graph/discrete_type_info.cpp +++ b/src/bindings/python/src/pyopenvino/graph/discrete_type_info.cpp @@ -25,20 +25,18 @@ void regclass_graph_DiscreteTypeInfo(py::module m) { discrete_type_info.def(py::self != py::self); discrete_type_info.def_readonly("name", &ov::DiscreteTypeInfo::name); - discrete_type_info.def_readonly("version", &ov::DiscreteTypeInfo::version); discrete_type_info.def_readonly("version_id", &ov::DiscreteTypeInfo::version_id); discrete_type_info.def_readonly("parent", &ov::DiscreteTypeInfo::parent); - discrete_type_info.def("get_version", &ov::DiscreteTypeInfo::get_version); discrete_type_info.def("hash", [](const ov::DiscreteTypeInfo& self) { return self.hash(); }); discrete_type_info.def("__repr__", [](const ov::DiscreteTypeInfo& self) { std::string name = std::string(self.name); - std::string version = std::to_string(self.version); + std::string version = std::string(self.version_id); if (self.parent != nullptr) { - std::string parent_version = std::to_string(self.parent->version); + std::string parent_version = std::string(self.parent->version_id); std::string parent_name = self.parent->name; return ""; diff --git a/src/bindings/python/src/pyopenvino/graph/node.cpp b/src/bindings/python/src/pyopenvino/graph/node.cpp index 599194ab9b9..1e99bff4421 100644 --- a/src/bindings/python/src/pyopenvino/graph/node.cpp +++ b/src/bindings/python/src/pyopenvino/graph/node.cpp @@ -304,14 +304,6 @@ void regclass_graph_Node(py::module m) { :return: A dictionary of user defined data. :rtype: openvino.runtime.RTMap )"); - node.def("get_version", - &ov::Node::get_version, - R"( - Returns operation's version of the node. - - :return: Operation version. - :rtype: int - )"); node.def("set_argument", &ov::Node::set_argument); node.def("set_arguments", [](const std::shared_ptr& self, const ov::NodeVector& args) { @@ -326,7 +318,6 @@ void regclass_graph_Node(py::module m) { node.def_property_readonly("rt_info", (PyRTMap & (ov::Node::*)()) & ov::Node::get_rt_info, py::return_value_policy::reference_internal); - node.def_property_readonly("version", &ov::Node::get_version); node.def_property_readonly("type_info", &ov::Node::get_type_info); node.def_property("friendly_name", &ov::Node::get_friendly_name, &ov::Node::set_friendly_name); diff --git a/src/bindings/python/tests/test_graph/test_basic.py b/src/bindings/python/tests/test_graph/test_basic.py index 67bb1f1afad..b4cc21edb27 100644 --- a/src/bindings/python/tests/test_graph/test_basic.py +++ b/src/bindings/python/tests/test_graph/test_basic.py @@ -537,13 +537,6 @@ def test_sink_function_ctor(): assert function.get_friendly_name() == "TestModel" -def test_node_version(): - node = ops.add([1], [2]) - - assert node.get_version() == 1 - assert node.version == 1 - - def test_strides_iteration_methods(): data = np.array([1, 2, 3]) strides = Strides(data) diff --git a/src/bindings/python/tests/test_graph/test_core.py b/src/bindings/python/tests/test_graph/test_core.py index bd02af0fe69..57e0d26252e 100644 --- a/src/bindings/python/tests/test_graph/test_core.py +++ b/src/bindings/python/tests/test_graph/test_core.py @@ -369,10 +369,10 @@ def test_discrete_type_info(): assert n1.get_type_info().name == "TopK" assert n3.get_type_info().name == "Sin" assert n1.type_info.name == n2.type_info.name - assert n1.type_info.version == n2.type_info.version + assert n1.type_info.version_id == n2.type_info.version_id assert n1.type_info.parent == n2.type_info.parent assert n1.get_type_info().name == n2.get_type_info().name - assert n1.get_type_info().version == n2.get_type_info().version + assert n1.get_type_info().version_id == n2.get_type_info().version_id assert n1.get_type_info().parent == n2.get_type_info().parent assert n1.get_type_info().name != n3.get_type_info().name assert n1.get_type_info().name > n3.get_type_info().name diff --git a/src/bindings/python/tests_compatibility/test_ngraph/test_basic.py b/src/bindings/python/tests_compatibility/test_ngraph/test_basic.py index de83f6a7708..5acc1a29fd2 100644 --- a/src/bindings/python/tests_compatibility/test_ngraph/test_basic.py +++ b/src/bindings/python/tests_compatibility/test_ngraph/test_basic.py @@ -414,9 +414,3 @@ def test_sink_function_ctor(): assert len(function.get_results()) == 1 assert function.get_friendly_name() == "TestFunction" - -def test_node_version(): - node = ng.add([1], [2]) - - assert node.get_version() == 1 - assert node.version == 1 diff --git a/src/bindings/python/tests_compatibility/test_ngraph/test_core.py b/src/bindings/python/tests_compatibility/test_ngraph/test_core.py index 9b50732396e..949946ef842 100644 --- a/src/bindings/python/tests_compatibility/test_ngraph/test_core.py +++ b/src/bindings/python/tests_compatibility/test_ngraph/test_core.py @@ -250,10 +250,10 @@ def test_discrete_type_info(): assert n1.get_type_info().name == "TopK" assert n3.get_type_info().name == "Sin" assert n1.type_info.name == n2.type_info.name - assert n1.type_info.version == n2.type_info.version + assert n1.type_info.version_id == n2.type_info.version_id assert n1.type_info.parent == n2.type_info.parent assert n1.get_type_info().name == n2.get_type_info().name - assert n1.get_type_info().version == n2.get_type_info().version + assert n1.get_type_info().version_id == n2.get_type_info().version_id assert n1.get_type_info().parent == n2.get_type_info().parent assert n1.get_type_info().name != n3.get_type_info().name assert n1.get_type_info().name > n3.get_type_info().name