Merge pull request #6295 from nouiz/doc_conv

theano/gpuarray/opt.py

@@ -2134,7 +2134,7 @@ def local_gpua_abstractconv(op, context_name, inputs, outputs):
                 AbstractConv2d_gradInputs,
                 AbstractConv3d,
                 AbstractConv3d_gradWeights,
-                AbstractConv3d_gradInputs], 'fast_compile', 'conv_dnn', 'cudnn')
+                AbstractConv3d_gradInputs], 'fast_compile')
 def local_gpua_lift_abstractconv_graph(op, context_name, inputs, outputs):
     inps = list(inputs)
     inps[0] = as_gpuarray_variable(inputs[0],

theano/tensor/nnet/conv.py

@@ -95,6 +95,9 @@ def conv2d(input, filters, image_shape=None, filter_shape=None,
 
     """
 
+    warnings.warn("theano.tensor.nnet.conv.conv2d is deprecated."
+                  " Use theano.tensor.nnet.conv2d instead.")
+
     # accept Constant value for image_shape and filter_shape.
     if image_shape is not None:
         image_shape = list(image_shape)