fix bug(it disabled some fonctionality) introduced in commit 54f8821476cc. Add…

theano/tensor/basic.py

@@ -3450,8 +3450,11 @@ class Reshape(Op):
             return gof.Apply(self, [x, shp], [tensor(x.type.dtype, bcast)])
         else:
             bcasts = [False] * self.ndim
+            shp_list = shp_orig
+            if not isinstance(shp_orig,(list,tuple)):
+                shp_list = [shp_orig]
             for index in xrange(self.ndim):
-                y = shp_orig[index]
+                y = shp_list[index]
                 # Try to see if we can infer that y has a constant value of 1.
                 # If so, that dimension should be broadcastable.
                 try:

theano/tensor/tests/test_basic.py

@@ -2531,9 +2531,15 @@ def test_reshape():
     a = dvector()
     b = dmatrix()
 
+    #basic to 1 dim
+    c = reshape(b, as_tensor_variable(6), ndim=1)
+    f = inplace_func([b], c)
+    assert numpy.all(f(numpy.asarray([[0,1,2],[3,4,5]])) == numpy.asarray([0,1,2,3,4,5]))
+    print f.maker.env.toposort()
+    #check that we remove the useless reshape
+
+    #basic to 2 dims
     c = reshape(a, [2,3])
-
-    #basic
     f = inplace_func([a], c)
     assert numpy.all(f(numpy.asarray([0,1,2,3,4,5])) == numpy.asarray([[0,1,2], [3,4,5]]))