Wrap op params for theano.gpuarray.pool.GpuMaxPoolRop

theano/gpuarray/pool.py

@@ -366,6 +366,7 @@ class GpuMaxPoolRop(CGpuKernelBase):
 
     """
     __props__ = ('ignore_border', 'mode', 'ndim')
+    params_type = ParamsType(ignore_border=bool_t, context=gpu_context_type)
 
     def __init__(self, ignore_border, mode='max', ndim=2):
         self.ndim = ndim
@@ -376,6 +377,9 @@ class GpuMaxPoolRop(CGpuKernelBase):
         assert mode == 'max'
         assert ndim in [2, 3]
 
+    def get_params(self, node):
+        return self.params_type.get_params(self, context=node.inputs[0].type.context)
+
     def c_headers(self):
         return ['gpuarray_api.h', 'gpuarray_helper.h', 'numpy_compat.h']
 
@@ -419,10 +423,6 @@ class GpuMaxPoolRop(CGpuKernelBase):
 
         return Apply(self, [inp, eval_point, ws, stride, pad], [eval_point.type()])
 
-    def get_op_params(self):
-        ignore_border = int(self.ignore_border)
-        return [('IGNORE_BORDER', ignore_border)]
-
     def infer_shape(self, node, in_shapes):
         ws, stride, pad = [node.inputs[2], node.inputs[3], node.inputs[4]]
         shp = Pool.out_shape(in_shapes[0], ws, self.ignore_border, stride,

theano/gpuarray/pool_max_rop.c

@@ -109,8 +109,8 @@ KERNEL void max_pool3d_rop_kernel(const ga_size nthreads,
 #section support_code
 
 // output shape for a given input padded shape, window shape and stride
-#define OUTPUT_DIMS(in_dim, ws, st)                       \
-  (IGNORE_BORDER ? (in_dim - ws)/st + 1 :                 \
+#define OUTPUT_DIMS(in_dim, ws, st, ignore_border)        \
+  (ignore_border ? (in_dim - ws)/st + 1 :                 \
    (st > ws ? (in_dim - 1)/st + 1 :                       \
     std::max<ssize_t>(0, (in_dim - 1 - ws + st)/st) + 1))
 
@@ -122,7 +122,7 @@ int APPLY_SPECIFIC(max_pool_rop)(PyGpuArrayObject *x,
                                  PyArrayObject *stride,
                                  PyArrayObject *pad,
                                  PyGpuArrayObject **z,
-                                 PyGpuContextObject *ctx) {
+                                 PARAMS_TYPE* params) {
   if (!GpuArray_IS_C_CONTIGUOUS(&x->ga) || !GpuArray_IS_C_CONTIGUOUS(&ex->ga))
     {
       PyErr_Format(PyExc_ValueError,
@@ -146,19 +146,19 @@ int APPLY_SPECIFIC(max_pool_rop)(PyGpuArrayObject *x,
     w[i] = *((npy_int64*)PyArray_GETPTR1(ws, i));
     s[i] = *((npy_int64*)PyArray_GETPTR1(stride, i));
     p[i] = *((npy_int64*)PyArray_GETPTR1(pad, i));
-    z_dims[2 + i] = OUTPUT_DIMS(x_dims[2 + i] + 2*p[i], w[i], s[i]);
+    z_dims[2 + i] = OUTPUT_DIMS(x_dims[2 + i] + 2*p[i], w[i], s[i], params->ignore_border);
     if (p[i] > 0) {
       nonzero_padding = 1;
     }
   }
-  if (!IGNORE_BORDER && nonzero_padding) {
+  if (!params->ignore_border && nonzero_padding) {
     PyErr_SetString(PyExc_ValueError,
                     "GpuMaxPoolRop: padding works only with ignore_border=True");
     return 1;
   }
 
   if (theano_prep_output(z, PyGpuArray_NDIM(ex), z_dims,
-                         ex->ga.typecode, GA_C_ORDER, ctx) != 0)
+                         ex->ga.typecode, GA_C_ORDER, params->context) != 0)
     {
       PyErr_SetString(PyExc_RuntimeError,
                       "GpuMaxPoolRop: failed to allocate memory");