fix other tests

theano/sandbox/gpuarray/dnn.py

@@ -40,9 +40,9 @@ def raise_no_cudnn(msg="CuDNN is required for convolution and pooling"):
 
 def _dnn_check_compile():
     preambule = """
-# include <stdio.h>
-# include <cudnn.h>
-# include <cudnn_helper.h>
+#include <stdio.h>
+#include <cudnn.h>
+#include <cudnn_helper.h>
 """
 
     # No need for the context in here since we won't execute that code
@@ -201,9 +201,9 @@ class DnnVersion(Op):
 
     def c_support_code(self):
         return """
-# if PY_MAJOR_VERSION >= 3
-# define PyInt_FromLong PyLong_FromLong
-# endif
+#if PY_MAJOR_VERSION >= 3
+#define PyInt_FromLong PyLong_FromLong
+#endif
 """
 
     def make_node(self):
@@ -1090,7 +1090,7 @@ class GpuDnnPool(DnnBase):
         return [('MODE_FLAG', mode_flag)]
 
     def make_node(self, img, ws, stride, pad):
-        ctx_name = infer_context_name(img, ws, stride, pad)
+        ctx_name = infer_context_name(img)
         img = as_gpuarray_variable(img, ctx_name)
 
         ws = tensor.as_tensor_variable(ws)

theano/sandbox/gpuarray/tests/test_dnn.py

@@ -574,14 +574,9 @@ class TestDnnInferShapes(utt.InferShapeTester):
             [(1, 1), (2, 2), (3, 3)],
             modes
         ):
-            desc = dnn.GpuDnnPoolDesc(
-                ws=params[0],
-                stride=params[1],
-                mode=params[2]
-            )()
             self._compile_and_check(
                 [img],
-                [dnn.GpuDnnPool()(img, desc)],
+                [dnn.GpuDnnPool(mode=params[2])(img, params[0], params[1], (0, 0))],
                 [img_val],
                 dnn.GpuDnnPool
             )
@@ -610,16 +605,13 @@ class TestDnnInferShapes(utt.InferShapeTester):
             [(1, 1), (2, 2), (3, 3)],
             ['max', 'average_inc_pad']
         ):
-            desc = dnn.GpuDnnPoolDesc(
-                ws=params[0],
-                stride=params[1],
-                mode=params[2]
-            )()
-            pool_grad = dnn.GpuDnnPoolGrad()(
+            pool_grad = dnn.GpuDnnPoolGrad(mode=params[2])(
                 img,
                 out,
                 img_grad,
-                desc
+                params[0],
+                params[1],
+                (0, 0)
             )
             self._compile_and_check(
                 [img, img_grad, out],