IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Remove version] Remove version from py openvino

Browse Source 
Signed-off-by: Zhai, Xuejun <xuejun.zhai@intel.com>
This commit is contained in:
Zhai, Xuejun 2023-03-21 12:52:17 +08:00
parent 7f8786d9aa
commit bd0a9502f5
8 changed files with 9 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bindings/python/src/compatibility/pyngraph/discrete_type_info.cpp
View File

@ -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 "<DiscreteTypeInfo: " + name + " v" + version + " Parent(" + parent_name + " v" + parent_version +
")" + ">";

11
src/bindings/python/src/compatibility/pyngraph/node.cpp
View File

@ -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<ngraph::Node>& 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);

6
src/bindings/python/src/pyopenvino/graph/discrete_type_info.cpp
View File

@ -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 "<DiscreteTypeInfo: " + name + " v" + version + " Parent(" + parent_name + " v" + parent_version +
")" + ">";

9
src/bindings/python/src/pyopenvino/graph/node.cpp
View File

@ -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<ov::Node>& 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);

7
src/bindings/python/tests/test_graph/test_basic.py
View File

@ -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)

4
src/bindings/python/tests/test_graph/test_core.py
View File

@ -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

6
src/bindings/python/tests_compatibility/test_ngraph/test_basic.py
View File

@ -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

4
src/bindings/python/tests_compatibility/test_ngraph/test_core.py
View File

@ -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