fix rnn construct graph

Author: hanjr92

tensorlayerx/nn/core/common.py

@@ -540,8 +540,7 @@ def construct_graph(inputs, outputs):
                 if out_node.node_name not in indegrees.keys():
                     indegrees[out_node.node_name] = len(out_node.in_nodes)
                 indegrees[out_node.node_name] -= 1
-                if indegrees[out_node.node_name] == 0 or \
-                        isinstance(out_node.layer, (tlx.nn.RNN, tlx.nn.LSTM, tlx.nn.GRU)):
+                if indegrees[out_node.node_name] == 0:
                     next_depth.append(out_node)
         cur_depth = next_depth
         next_depth = []

tensorlayerx/nn/layers/recurrent.py

@@ -591,7 +591,9 @@ def forward(self, input, states=None):
         output, new_states = self.rnn(input, states)
 
         if not self._nodes_fixed and self._build_graph:
-            self._add_node(input, [output, new_states])
+            self.states = states
+            self.new_states = new_states
+            self._add_node(input, output)
             self._nodes_fixed = True
         return output, new_states
 
@@ -671,7 +673,9 @@ def forward(self, input, states=None):
         output, new_states = self.rnn(input, states)
 
         if not self._nodes_fixed and self._build_graph:
-            self._add_node(input, [output, new_states])
+            self.states = states
+            self.new_states = new_states
+            self._add_node(input, output)
             self._nodes_fixed = True
         return output, new_states
 
@@ -750,6 +754,8 @@ def forward(self, input, states=None):
         output, new_states = self.rnn(input, states)
 
         if not self._nodes_fixed and self._build_graph:
-            self._add_node(input, [output, new_states])
+            self.states = states
+            self.new_states = new_states
+            self._add_node(input, output)
             self._nodes_fixed = True
         return output, new_states