Merge pull request #4408 from Faruk-Ahmed/flake8_signal

theano/tensor/signal/conv.py

@@ -30,18 +30,18 @@ def conv2d(input, filters, image_shape=None, filter_shape=None,
 
     Parameters
     ----------
-    input : dmatrix of dtensor3
-        Symbolic variable for images to be filtered.
-    filters : dmatrix of dtensor3
-        Symbolic variable containing filter values.
+    input   : Symbolic theano tensor for images to be filtered.
+              Dimensions: ([num_images], image height, image width)
+    filters : Symbolic theano tensor for convolution filter(s).
+              Dimensions: ([num_filters], filter height, filter width)
     border_mode: {'valid', 'full'}
         See scipy.signal.convolve2d.
     subsample
         Factor by which to subsample output.
     image_shape : tuple of length 2 or 3
-        ([number images,] image height, image width).
+        ([num_images,] image height, image width).
     filter_shape : tuple of length 2 or 3
-        ([number filters,] filter height, filter width).
+        ([num_filters,] filter height, filter width).
     kwargs
         See theano.tensor.nnet.conv.conv2d.
 

theano/tests/test_flake8.py

@@ -69,9 +69,6 @@ whitelist_flake8 = [
     "tensor/tests/test_blas_c.py",
     "tensor/tests/test_blas_scipy.py",
     "tensor/tests/test_mpi.py",
-    "tensor/signal/conv.py",
-    "tensor/signal/tests/test_conv.py",
-    "tensor/signal/tests/test_downsample.py",
     "tensor/nnet/__init__.py",
     "tensor/nnet/tests/__init__.py",
     "tensor/nnet/tests/test_conv.py",