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

Make order of port names determined in IR (#5701)

Browse Source 
* Make order of port names determined in IR

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>

* Make port names in determined order and adopted tests

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>
This commit is contained in:
Roman Kazantsev
2021-05-20 13:44:06 +03:00
committed by GitHub
parent 82b84c0b61
commit d98e954f5d
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
model-optimizer/mo/graph/port.py
View File

@@ -294,7 +294,7 @@ class Port:
if node_idx in self.node.out_nodes():
out_node = self.node.out_node(node_idx)
fw_names += get_tensor_names_list(out_node.attrs())
return fw_names
return sorted(fw_names)
def disconnect(self):
if self.type == 'out':

22
model-optimizer/unit_tests/mo/graph/port_test.py
View File

@@ -26,7 +26,7 @@ class TestsGetTensorNames(unittest.TestCase):
('Op1', 'Op1,Op2')]})])
graph.stage = 'front'
input_node = Node(graph, 'input')
self.assertTrue(input_node.out_port(0).get_tensor_names() == ['input', 'Op1\\,Op2'])
self.assertTrue(input_node.out_port(0).get_tensor_names() == ['Op1\\,Op2', 'input'])
op1_node = Node(graph, 'Op1')
op1_node.add_output_port(0)
@@ -37,7 +37,7 @@ class TestsGetTensorNames(unittest.TestCase):
('input_data', 'Op2')])
input_node = Node(graph, 'input')
self.assertTrue(input_node.out_port(0).get_tensor_names() == ['input', 'Op1\\,Op2'])
self.assertTrue(input_node.out_port(0).get_tensor_names() == ['Op1\\,Op2', 'input'])
op1_node = Node(graph, 'Op1')
op1_node.add_output_port(0)
@@ -51,7 +51,7 @@ class TestsGetTensorNames(unittest.TestCase):
graph = build_graph(nodes, [('input', 'input_data'), ('input_data', 'Op1'),
('Op1', 'Op1_data', {'out': 1}), ('Op1_data', 'Op2')])
input_node = Node(graph, 'input')
self.assertTrue(input_node.out_port(0).get_tensor_names(port_renumber=True) == ['input', 'Op1\\,Op2'])
self.assertTrue(input_node.out_port(0).get_tensor_names(port_renumber=True) == ['Op1\\,Op2', 'input'])
op1_node = Node(graph, 'Op1')
op1_node.add_output_port(0)
@@ -63,13 +63,13 @@ class TestsGetTensorNames(unittest.TestCase):
input_node = Node(graph, 'input')
input_node_out_port = input_node.out_port(0)
self.assertTrue(input_node_out_port.get_tensor_names() == ['input', 'Op1\\,Op2'])
self.assertTrue(input_node_out_port.get_tensor_names() == ['Op1\\,Op2', 'input'])
op3_node = Node(graph, 'Op3')
input_node_out_port.get_connection().set_source(op3_node.out_port(0))
self.assertTrue(input_node_out_port.get_tensor_names() is None)
self.assertTrue(op3_node.out_port(0).get_tensor_names() == ['Op3', 'input', 'Op1\\,Op2'])
self.assertTrue(op3_node.out_port(0).get_tensor_names() == ['Op1\\,Op2', 'Op3', 'input'])
def test_reconnect_front_case1(self):
graph = build_graph(nodes, [('input', 'Op1', {'in': 0, 'out': 0, 'fw_tensor_debug_info': [('input', 'input'),
@@ -79,26 +79,26 @@ class TestsGetTensorNames(unittest.TestCase):
input_node = Node(graph, 'input')
input_node_out_port = input_node.out_port(0)
self.assertTrue(input_node_out_port.get_tensor_names() == ['input', 'Op1\\,Op2'])
self.assertTrue(input_node_out_port.get_tensor_names() == ['Op1\\,Op2', 'input'])
op3_node = Node(graph, 'Op3')
input_node_out_port.get_connection().set_source(op3_node.out_port(0))
self.assertTrue(input_node_out_port.get_tensor_names() == [])
self.assertTrue(op3_node.out_port(0).get_tensor_names() == ['Op3', 'input', 'Op1\\,Op2'])
self.assertTrue(op3_node.out_port(0).get_tensor_names() == ['Op1\\,Op2', 'Op3', 'input'])
def test_reconnect_middle_case1(self):
graph = build_graph(nodes, [('input', 'input_data'), ('input_data', 'Op1'), ('Op3', 'Op3_data')])
input_node = Node(graph, 'input')
input_node_out_port = input_node.out_port(0)
self.assertTrue(input_node_out_port.get_tensor_names() == ['input', 'Op1\\,Op2'])
self.assertTrue(input_node_out_port.get_tensor_names() == ['Op1\\,Op2', 'input'])
op3_node = Node(graph, 'Op3')
input_node_out_port.get_connection().set_source(op3_node.out_port(0))
self.assertTrue(input_node_out_port.get_tensor_names() == [])
self.assertTrue(op3_node.out_port(0).get_tensor_names() == ['Op3', 'input', 'Op1\\,Op2'])
self.assertTrue(op3_node.out_port(0).get_tensor_names() == ['Op1\\,Op2', 'Op3', 'input'])
def test_reconnect_middle_case2(self):
graph = build_graph(nodes, [('input', 'input_data'), ('input_data', 'Op1', {'out': 0}),
@@ -106,13 +106,13 @@ class TestsGetTensorNames(unittest.TestCase):
input_node = Node(graph, 'input')
input_node_out_port = input_node.out_port(0)
self.assertTrue(input_node_out_port.get_tensor_names() == ['input', 'Op1\\,Op2'])
self.assertTrue(input_node_out_port.get_tensor_names() == ['Op1\\,Op2', 'input'])
op3_node = Node(graph, 'Op3')
input_node_out_port.get_connection().set_source(op3_node.out_port(0))
self.assertTrue(input_node_out_port.get_tensor_names() == [])
self.assertTrue(op3_node.out_port(0).get_tensor_names() == ['Op3', 'input', 'Op1\\,Op2'])
self.assertTrue(op3_node.out_port(0).get_tensor_names() == ['Op1\\,Op2', 'Op3', 'input'])
class TestPortMethods(unittest.TestCase):