Publishing 2019 R1 content

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

diff --git a/model-optimizer/extensions/middle/EltwiseInputReshape.py b/model-optimizer/extensions/middle/EltwiseInputReshape.py
index 74ff069..70647af 100644 (file)
--- a/model-optimizer/extensions/middle/EltwiseInputReshape.py
+++ b/model-optimizer/extensions/middle/EltwiseInputReshape.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.
@@ -14,11 +14,12 @@
  limitations under the License.
 """
 
-import networkx as nx
-import numpy as np
 from copy import deepcopy
+
+import numpy as np
+
 from mo.front.common.layout import get_features_dim, shape_for_layout
-from mo.graph.graph import Node
+from mo.graph.graph import Node, Graph
 from mo.middle.passes.fusing.helpers import get_value_id
 from mo.middle.replacement import MiddleReplacementPattern
 from mo.ops.op import Op
@@ -46,7 +47,7 @@ class Eltwise1DInputReshape(MiddleReplacementPattern):
     def run_after(self):
         return [EltwiseInputReshape]
 
-    def find_and_replace_pattern(self, graph: nx.MultiDiGraph):
+    def find_and_replace_pattern(self, graph: Graph):
         layout = graph.graph['layout']
         for n in list(graph.nodes()):
             if 'type' in graph.node[n] and graph.node[n]['type'] == 'Eltwise' and get_value_id(Node(graph, n)) is None:
@@ -68,7 +69,11 @@ class Eltwise1DInputReshape(MiddleReplacementPattern):
 class EltwiseInputReshape(MiddleReplacementPattern):
     enabled = True
 
-    def find_and_replace_pattern(self, graph: nx.MultiDiGraph):
+    def run_after(self):
+        from extensions.middle.pass_separator import MiddleStart
+        return [MiddleStart]
+
+    def find_and_replace_pattern(self, graph: Graph):
         data_nodes = [Node(graph, node) for node in graph.node if Node(graph, node).kind == 'data']
         for node in data_nodes:
             # Get all requested shapes for current node
@@ -113,4 +118,4 @@ class EltwiseInputReshape(MiddleReplacementPattern):
 
                         # Reconnect edge from original data node to Reshape output datanode
                         graph.remove_edge(node.id, consumer.id)
-                        graph.add_edge(reshape_data.id, consumer.id, **edge_attrs)
\ No newline at end of file
+                        graph.add_edge(reshape_data.id, consumer.id, **edge_attrs)