Merge pull request #1053 from nouiz/misc

doc/library/tensor/signal/conv.txt

@@ -7,8 +7,8 @@
 .. note::
 
     Two similar implementation exists for conv2d:
-    **theano.tensor.signal.conv.conv2d** and
-    **theano.tensor.nnet.conv.conv2d**. The foremer implements a traditional
+    :func:`signal.conv2d <theano.tensor.signal.conv.conv2d>` and
+    :func:`nnet.conv2d <theano.tensor.nnet.conv.conv2d>. The former implements a traditional
     2D convolution, while the latter implements the convolutional layers
     present in convolutional neural networks (where filters are 3D and pool
     over several input channels).

theano/sandbox/cuda/tests/test_conv_cuda_ndarray.py

@@ -18,6 +18,7 @@ except ImportError:
 
 import theano
 from theano import tensor
+from theano.gof.python25 import any
 
 # Skip test if cuda_ndarray is not available.
 import theano.sandbox.cuda as cuda_ndarray