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

[MO] Fix normalize_outputs MaxPool function condition (#9613)

Browse Source 
* Fix condition to correct handling MaxPool1 with only 1 output port

* Update check condition

* Add unit tests

* Sort imports

* Add comment
This commit is contained in:
Anton Chetverikov 2022-01-20 19:52:42 +03:00 committed by GitHub
parent 61762fbaf0
commit ff6a9a1179
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 97 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/mo/openvino/tools/mo/back/MaxPool.py
View File

@ -40,7 +40,8 @@ class MaxPool(BackReplacementPattern):
'keep_output_port': node.has_and_set('remove_values_output')}).create_node()
node.out_port(0).get_connection().set_destination(output.in_port(0))
if node.out_port(1).disconnected():
# we check port existing to support MaxPool_1 with only 1 output port and MaxPool_8 with 2 output ports
if node.has_port('out', 1) and node.out_port(1).disconnected():
output = Result(node.graph, {'name': node.name + '/Result_port_1/',
'keep_output_port': node.has_and_set('remove_values_output')}).create_node()
node.out_port(1).get_connection().set_destination(output.in_port(0))

95
tools/mo/unit_tests/mo/back/MaxPoolTest.py Normal file
View File

@ -0,0 +1,95 @@
# Copyright (C) 2018-2022 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
import unittest
from openvino.tools.mo.back.MaxPool import MaxPool
from openvino.tools.mo.graph.graph import Node
from openvino.tools.mo.utils.ir_engine.compare_graphs import compare_graphs
from unit_tests.utils.graph import build_graph
class TestMaxPool(unittest.TestCase):
def test_no_out_normalization(self):
graph = build_graph(
nodes_attrs={
'input': {'kind': 'op', 'op': 'Parameter', 'name': 'node'},
'input_data': {'kind': 'data'},
'pool': {'kind': 'op', 'name': 'node', 'type': 'Pooling', 'pool_method': 'max'},
'pool_data': {'kind': 'data'},
'result': {'kind': 'op', 'op': 'Result', 'name': 'node'}
},
edges=[
('input', 'input_data'),
('input_data', 'pool'),
('pool', 'pool_data'),
('pool_data', 'result')
]
)
graph_ref = build_graph(
nodes_attrs={
'input': {'kind': 'op', 'op': 'Parameter', 'name': 'node'},
'input_data': {'kind': 'data'},
'pool': {'kind': 'op', 'name': 'node', 'type': 'MaxPool'},
'pool_data': {'kind': 'data'},
'result': {'kind': 'op', 'op': 'Result', 'name': 'node'},
},
edges=[
('input', 'input_data'),
('input_data', 'pool'),
('pool', 'pool_data'),
('pool_data', 'result'),
]
)
MaxPool().find_and_replace_pattern(graph)
(flag, resp) = compare_graphs(graph, graph_ref, 'result', check_op_attrs=True)
self.assertTrue(flag, resp)
def test_out_normalization(self):
graph = build_graph(
nodes_attrs={
'input': {'kind': 'op', 'op': 'Parameter', 'name': 'node'},
'input_data': {'kind': 'data'},
'pool': {'kind': 'op', 'name': 'node', 'type': 'Pooling', 'pool_method': 'max'},
'pool_data': {'kind': 'data'},
'result': {'kind': 'op', 'op': 'Result', 'name': 'node'}
},
edges=[
('input', 'input_data'),
('input_data', 'pool'),
('pool', 'pool_data'),
('pool_data', 'result')
]
)
graph_ref = build_graph(
nodes_attrs={
'input': {'kind': 'op', 'op': 'Parameter', 'name': 'node'},
'input_data': {'kind': 'data'},
'pool': {'kind': 'op', 'name': 'node', 'type': 'MaxPool'},
'pool_data': {'kind': 'data'},
'pool_data_added': {'kind': 'data'},
'result': {'kind': 'op', 'op': 'Result', 'name': 'node'},
'result_added': {'kind': 'op', 'op': 'Result', 'name': 'node'}
},
edges=[
('input', 'input_data'),
('input_data', 'pool'),
('pool', 'pool_data'),
('pool_data', 'result'),
('pool', 'pool_data_added'),
('pool_data_added', 'result_added')
]
)
pool_op = Node(graph, 'pool')
pool_op.add_output_port(1) # add disconnected output port to check normalization
MaxPool().find_and_replace_pattern(graph)
(flag, resp) = compare_graphs(graph, graph_ref, 'result', check_op_attrs=True)
self.assertTrue(flag, resp)