Merge remote-tracking branch 'origin/master'

tflearn · Jan 13, 2017 · d9a6689 · d9a6689
2 parents b71e381 + de5bb85
commit d9a6689
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/tflearn/layers/core.py b/tflearn/layers/core.py
@@ -659,5 +659,8 @@ def time_distributed(incoming, fn, args=None, scope=None):
              for i in range(timestep)]
     else:
         x = [fn(x[i], *args) for i in range(timestep)]
-    x = map(lambda t: tf.reshape(t, [-1, 1]+utils.get_incoming_shape(t)[1:]), x)
+    try:
+      x = map(lambda t: tf.reshape(t, [-1, 1]+utils.get_incoming_shape(t)[1:]), x)
+    except:
+      x = list(map(lambda t: tf.reshape(t, [-1, 1]+utils.get_incoming_shape(t)[1:]), x))
     return tf.concat(1, x)