Publishing 2019 R1 content

[platform/upstream/dldt.git] / model-optimizer / extensions / ops / regionyolo_test.py

diff --git a/model-optimizer/extensions/ops/regionyolo_test.py b/model-optimizer/extensions/ops/regionyolo_test.py
index 715163a..070837b 100644 (file)
--- a/model-optimizer/extensions/ops/regionyolo_test.py
+++ b/model-optimizer/extensions/ops/regionyolo_test.py
@@ -1,5 +1,5 @@
 """
- Copyright (c) 2018 Intel Corporation
+ Copyright (c) 2018-2019 Intel Corporation
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -25,7 +25,8 @@ from mo.utils.unittest.graph import build_graph
 
 nodes_attributes = {'node_1': {'type': 'Identity', 'kind': 'op'},
                     'region': {'type': 'RegionYolo', 'kind': 'op'},
-                    'node_3': {'type': 'Identity', 'kind': 'op'}
+                    'node_3': {'type': 'Identity', 'kind': 'op'},
+                    'op_output': { 'kind': 'op', 'op': 'OpOutput'}
                     }
 
 
@@ -33,8 +34,10 @@ class TestRegionYOLOCaffe(unittest.TestCase):
     def test_region_infer(self):
         graph = build_graph(nodes_attributes,
                             [('node_1', 'region'),
-                             ('region', 'node_3')],
-                            {'node_3': {'is_output': True, 'shape': None},
+                             ('region', 'node_3'),
+                             ('node_3', 'op_output')
+                             ],
+                            {'node_3': {'shape': None},
                              'node_1': {'shape': np.array([1, 3, 227, 227])},
                              'region': {'axis': 1, 'end_axis': -1, 'do_softmax': 1, **layout_attrs()}
                              })
@@ -49,8 +52,10 @@ class TestRegionYOLOCaffe(unittest.TestCase):
     def test_region_infer_flatten(self):
         graph = build_graph(nodes_attributes,
                             [('node_1', 'region'),
-                             ('region', 'node_3')],
-                            {'node_3': {'is_output': True, 'shape': None},
+                             ('region', 'node_3'),
+                             ('node_3', 'op_output')
+                             ],
+                            {'node_3': {'shape': None},
                              'node_1': {'shape': np.array([1, 3, 227, 227])},
                              'region': {'end_axis': 1, 'axis': 0, 'do_softmax': 1, **layout_attrs()}
                              })
@@ -65,8 +70,10 @@ class TestRegionYOLOCaffe(unittest.TestCase):
     def test_region_infer_flatten_again(self):
         graph = build_graph(nodes_attributes,
                             [('node_1', 'region'),
-                             ('region', 'node_3')],
-                            {'node_3': {'is_output': True, 'shape': None},
+                             ('region', 'node_3'),
+                             ('node_3', 'op_output')
+                             ],
+                            {'node_3': {'shape': None},
                              'node_1': {'shape': np.array([1, 3, 227, 227])},
                              'region': {'end_axis': 2, 'axis': 0, 'do_softmax': 1, **layout_attrs()}
                              })
@@ -81,8 +88,10 @@ class TestRegionYOLOCaffe(unittest.TestCase):
     def test_region_infer_do_softmax(self):
         graph = build_graph(nodes_attributes,
                             [('node_1', 'region'),
-                             ('region', 'node_3')],
-                            {'node_3': {'is_output': True, 'shape': None},
+                             ('region', 'node_3'),
+                             ('node_3', 'op_output')
+                             ],
+                            {'node_3': {'shape': None},
                              'node_1': {'shape': np.array([1, 3, 227, 227])},
                              'region': {'do_softmax': 0, 'end_axis': -1, 'axis': 1, 'classes': 80, 'coords': 4,
                                         'mask': np.array([6, 7, 8]), **layout_attrs()}
@@ -101,8 +110,10 @@ class TestRegionYOLOTF(unittest.TestCase):
     def test_region_infer(self):
         graph = build_graph(nodes_attributes,
                             [('node_1', 'region'),
-                             ('region', 'node_3')],
-                            {'node_3': {'is_output': True, 'shape': None},
+                             ('region', 'node_3'),
+                             ('node_3', 'op_output')
+                             ],
+                            {'node_3': {'shape': None},
                              'node_1': {'shape': np.array([1, 227, 227, 3])},
                              'region': {'axis': 1, 'end_axis': -1, 'do_softmax': 1, **layout_attrs()}
                              })
@@ -117,8 +128,10 @@ class TestRegionYOLOTF(unittest.TestCase):
     def test_region_infer_do_softmax(self):
         graph = build_graph(nodes_attributes,
                             [('node_1', 'region'),
-                             ('region', 'node_3')],
-                            {'node_3': {'is_output': True, 'shape': None},
+                             ('region', 'node_3'),
+                             ('node_3', 'op_output')
+                             ],
+                            {'node_3': {'shape': None},
                              'node_1': {'shape': np.array([1, 227, 227, 3])},
                              'region': {'do_softmax': 0, 'end_axis': -1, 'axis': 1, 'classes': 80, 'coords': 4,
                                         'mask': np.array([6, 7, 8]), **layout_attrs()}