Publishing 2019 R1 content

[platform/upstream/dldt.git] / model-optimizer / extensions / back / kaldi_remove_memory_output.py

diff --git a/model-optimizer/extensions/back/kaldi_remove_memory_output.py b/model-optimizer/extensions/back/kaldi_remove_memory_output.py
index 72e4cb4..3892635 100644 (file)
--- a/model-optimizer/extensions/back/kaldi_remove_memory_output.py
+++ b/model-optimizer/extensions/back/kaldi_remove_memory_output.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,9 +14,8 @@
  limitations under the License.
 """
 
-import networkx as nx
-
 from mo.back.replacement import BackReplacementPattern
+from mo.graph.graph import Graph
 
 
 class KaldiRemoveMemoryOutputBackReplacementPattern(BackReplacementPattern):
@@ -26,16 +25,18 @@ class KaldiRemoveMemoryOutputBackReplacementPattern(BackReplacementPattern):
     def pattern():
         return dict(
             nodes=[
-                ('memory_node', dict(kind='op', op='Memory')),
-                ('data_node', dict(kind='data'))
+                ('memory_node', dict(op='Memory')),
+                ('data_node', dict(kind='data')),
+                ('op_output', dict(op='OpOutput'))
             ],
             edges=[
-                ('memory_node', 'data_node', {'out': 0})
+                ('memory_node', 'data_node'),
+                ('data_node', 'op_output')
             ]
         )
 
     @staticmethod
-    def replace_pattern(graph: nx.MultiDiGraph, match: dict):
+    def replace_pattern(graph: Graph, match: dict):
         """
         Need to find the pattern: Memory -> Data -> OpOutput
 
@@ -47,7 +48,7 @@ class KaldiRemoveMemoryOutputBackReplacementPattern(BackReplacementPattern):
 
         Parameters
         ----------
-        graph : nx.MultiDiGraph
+        graph : Graph
            Graph with loaded model.
         match : dict
            Patterns which were found in graph structure.
@@ -55,8 +56,5 @@ class KaldiRemoveMemoryOutputBackReplacementPattern(BackReplacementPattern):
         memory = match['memory_node']
         data = match['data_node']
 
-        # Those Memory nodes that are not output ones, should not be replaced
-        if not data.has_and_set('is_output'):
-            return
         graph.remove_edge(memory.id, data.id)
         graph.remove_node(data.id)