Merge branch 'master' of https://github.com/fchollet/keras

Author: fchollet

keras/layers/containers.py

@@ -313,7 +313,7 @@ def add_input(self, name, input_shape=None,
         if dtype == 'float':
             layer.input = K.placeholder(shape=layer.input_shape, name=name)
         else:
-            if len(input_shape) == 1:
+            if (input_shape and len(input_shape) == 1) or (batch_input_shape and len(batch_input_shape) == 2):
                 layer.input = K.placeholder(shape=layer.input_shape,
                                             dtype='int32',
                                             name=name)