Fix when mode is ignore_border

theano/tensor/nnet/neighbours.py

@@ -633,9 +633,16 @@ def neibs2images(neibs, neib_shape, original_shape, mode='valid'):
                              new_neib_shape, mode=mode)
 
     if mode == 'ignore_borders':
-        valid_shape = list(original_shape)
-        valid_shape[2] = (valid_shape[2] // neib_shape[0]) * neib_shape[0]
-        valid_shape[3] = (valid_shape[3] // neib_shape[1]) * neib_shape[1]
+        # We use set_subtensor to accept original_shape we can't infer
+        # the shape and still raise error when it don't have the right
+        # shape.
+        valid_shape = original_shape
+        valid_shape = T.set_subtensor(
+            valid_shape[2],
+            (valid_shape[2] // neib_shape[0]) * neib_shape[0])
+        valid_shape = T.set_subtensor(
+            valid_shape[3],
+            (valid_shape[3] // neib_shape[1]) * neib_shape[1])
         output_4d = output_2d.reshape(valid_shape, ndim=4)
         # padding the borders with zeros
         for d in [2, 3]:

theano/tensor/nnet/tests/test_neighbours.py

@@ -352,18 +352,20 @@ class T_Images2Neibs(unittest_tools.InferShapeTester):
         patsRecovery = T.matrix('patsRecovery')
         original_size = T.ivector('original_size')
 
-        out = neibs2images(patsRecovery, (16, 16), original_size)
-        f = theano.function([patsRecovery, original_size], out)
-
-        im_val = numpy.ones((1, 3, 320, 320), dtype=numpy.float32)
-        neibs = extractPatches(im_val)
-        f(neibs, im_val.shape)
-        # Wrong number of dimensions
-        self.assertRaises(ValueError, f, neibs,
+        for mode in ['valid', 'ignore_borders']:
+            out = neibs2images(patsRecovery, (16, 16),
+                               original_size, mode=mode)
+            f = theano.function([patsRecovery, original_size], out)
+
+            im_val = numpy.ones((1, 3, 320, 320), dtype=numpy.float32)
+            neibs = extractPatches(im_val)
+            f(neibs, im_val.shape)
+            # Wrong number of dimensions
+            self.assertRaises(ValueError, f, neibs,
                           (1, 1, 3, 320, 320))
-        # End up with a step of 0
-        self.assertRaises(ValueError, f, neibs,
-                          (3, 320, 320, 1))
+            # End up with a step of 0
+            self.assertRaises(ValueError, f, neibs,
+                              (3, 320, 320, 1))
 
     def speed_neibs(self):
         shape = (100, 40, 18, 18)