Merge pull request #3903 from matthias-k/AbstractConv2d_R_op

theano/tensor/nnet/abstract_conv.py

@@ -308,6 +308,17 @@ class AbstractConv2d(BaseAbstractConv2d):
             'Did you exclude both "conv_dnn" and "conv_gemm" from '
             'the optimizer? Is cudnn available and does the GPU support it?')
 
+    def R_op(self, inputs, eval_points):
+        rval = None
+        if eval_points[0] is not None:
+            rval = self.make_node(eval_points[0], inputs[1]).outputs[0]
+        if eval_points[1] is not None:
+            if rval is None:
+                rval = self.make_node(inputs[0], eval_points[1]).outputs[0]
+            else:
+                rval += self.make_node(inputs[0], eval_points[1]).outputs[0]
+        return [rval]
+
     def grad(self, inp, grads):
         bottom, weights = inp
         top, = grads

theano/tests/test_rop.py

@@ -22,7 +22,7 @@ from theano.gof import Op, Apply
 from theano.gradient import grad_undefined
 from theano.tests.unittest_tools import SkipTest
 from theano.tensor.signal.pool import Pool
-from theano.tensor.nnet import conv
+from theano.tensor.nnet import conv, conv2d
 
 '''
 Special Op created to test what happens when you have one op that is not
@@ -260,6 +260,7 @@ class test_RopLop(RopLop_checker):
             (1,))
 
     def test_conv(self):
+        for conv_op in [conv.conv2d, conv2d]:
             for border_mode in ['valid', 'full']:
                 image_shape = (2, 2, 4, 5)
                 filter_shape = (2, 2, 2, 3)
@@ -279,7 +280,7 @@ class test_RopLop(RopLop_checker):
                     [False] * filter_dim)(name='ev_filters')
 
                 def sym_conv2d(input, filters):
-                return conv.conv2d(input, filters, border_mode=border_mode)
+                    return conv_op(input, filters, border_mode=border_mode)
                 output = sym_conv2d(input, filters).flatten()
                 yv = tensor.Rop(output, [input, filters], [ev_input, ev_filters])
                 rop_f = function([input, filters, ev_input, ev_filters],