merge

theano/sandbox/conv.py

@@ -186,7 +186,8 @@ class ConvOp(Op):
         nkern = self.imshp[0]
         imshp = N.hstack((self.nkern,self.outshp))
         din = ConvOp(imshp, self.kshp, nkern, self.bsize, 
-                     1,1, output_mode=mode)(gz,filters)
+                     1,1, output_mode=mode,
+                     unroll_batch=un_b, unroll_kern=un_k)(gz,filters)
 
         return [din, dw]
 

theano/tensor/tests/test_misc.py

@@ -2,7 +2,7 @@ import sys
 import numpy, theano
 from theano import tensor
 
-def test_bug_2009_06_02():
+def test_bug_2009_06_02_trac_387():
 
     y = tensor.lvector('y')
     #f = theano.function([y], tensor.stack(y[0] / 2))