Publishing 2019 R1 content

[platform/upstream/dldt.git] / model-optimizer / extensions / middle / ShufflenetReshape.py

diff --git a/model-optimizer/extensions/middle/ShufflenetReshape.py b/model-optimizer/extensions/middle/ShufflenetReshape.py
index f85d60d..b25eb09 100644 (file)
--- a/model-optimizer/extensions/middle/ShufflenetReshape.py
+++ b/model-optimizer/extensions/middle/ShufflenetReshape.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.
@@ -16,11 +16,11 @@
 
 import logging as log
 
-import networkx as nx
 import numpy as np
 
 from mo.front.common.layout import get_features_dim, get_height_dim, get_width_dim
 from mo.front.common.partial_infer.utils import int64_array
+from mo.graph.graph import Graph
 from mo.middle.replacement import MiddleReplacementPattern
 from mo.ops.reshape import Reshape
 
@@ -33,6 +33,10 @@ class FeatureShuffleReshape(MiddleReplacementPattern):
 
     enabled = True
 
+    def run_after(self):
+        from extensions.middle.pass_separator import MiddleStart
+        return [MiddleStart]
+
     def pattern(self):
         return dict(
             nodes=[
@@ -51,7 +55,7 @@ class FeatureShuffleReshape(MiddleReplacementPattern):
                    ]
         )
 
-    def replace_pattern(self, graph: nx.MultiDiGraph, match: dict):
+    def replace_pattern(self, graph: Graph, match: dict):
         reshape1 = match['reshape1']
         reshape2 = match['reshape2']
         transpose = match['transpose']
@@ -117,6 +121,8 @@ class FeatureShuffleReshape(MiddleReplacementPattern):
         new_transpose_shape = np.array(new_reshape1_shape[new_transpose_order])
 
         reshape1.out_node().shape = new_reshape1_shape
+        reshape1.dim = np.copy(new_reshape1_shape)
+
         transpose.order = new_transpose_order
         transpose.out_node().shape = new_transpose_shape
 
@@ -137,6 +143,10 @@ class ReshapeSoftmaxReshape(MiddleReplacementPattern):
 
     enabled = True
 
+    def run_before(self):
+        from extensions.middle.pass_separator import MiddleFinish
+        return [MiddleFinish]
+
     def pattern(self):
         return dict(
             nodes=[
@@ -150,7 +160,7 @@ class ReshapeSoftmaxReshape(MiddleReplacementPattern):
                    ('softmax', 'softmax_data'),
                    ])
 
-    def replace_pattern(self, graph: nx.MultiDiGraph, match: dict):
+    def replace_pattern(self, graph: Graph, match: dict):
         layout = graph.graph['layout']
         if layout != 'NHWC':
             return