Remove dim param from c_set_tensorNd and c_set_kernelNd

theano/sandbox/cuda/dnn.py

@@ -1454,7 +1454,7 @@ if (!CudaNdarray_is_c_contiguous(%(input)s)) {
   %(fail)s
 }
 
-if (c_set_tensorNd(%(input)s, %(input)s->nd, %(input_desc)s) != 0)
+if (c_set_tensorNd(%(input)s, %(input_desc)s) != 0)
   %(fail)s
 
 cudnnPoolingMode_t mode;
@@ -1486,7 +1486,7 @@ if (CudaNdarray_prep_output(&%(out)s, ndims+2, %(out)s_dims) != 0)
   %(fail)s
 }
 
-if (c_set_tensorNd(%(out)s, %(out)s->nd, %(output_desc)s) != 0)
+if (c_set_tensorNd(%(out)s, %(output_desc)s) != 0)
   %(fail)s
 
 {
@@ -1642,11 +1642,11 @@ if (!CudaNdarray_is_c_contiguous(%(output)s)) {
   %(fail)s
 }
 
-if (c_set_tensorNd(%(input)s, %(input)s->nd, %(input_desc)s) != 0)
+if (c_set_tensorNd(%(input)s, %(input_desc)s) != 0)
   %(fail)s
-if (c_set_tensorNd(%(input_grad)s, %(input_grad)s->nd, %(input_grad_desc)s) != 0)
+if (c_set_tensorNd(%(input_grad)s, %(input_grad_desc)s) != 0)
   %(fail)s
-if (c_set_tensorNd(%(output)s, %(output)s->nd, %(output_desc)s) != 0)
+if (c_set_tensorNd(%(output)s, %(output_desc)s) != 0)
   %(fail)s
 
 if (CudaNdarray_prep_output(&%(output_grad)s,
@@ -1656,7 +1656,7 @@ if (CudaNdarray_prep_output(&%(output_grad)s,
   %(fail)s
 }
 
-if (c_set_tensorNd(%(output_grad)s, %(output_grad)s->nd, %(output_grad_desc)s) != 0)
+if (c_set_tensorNd(%(output_grad)s, %(output_grad_desc)s) != 0)
   %(fail)s
 
 {

theano/sandbox/cuda/dnn_base.c

@@ -3,9 +3,10 @@ static cudnnHandle_t _handle = NULL;
 
 
 static int
-c_set_tensorNd(CudaNdarray *var, int dim, cudnnTensorDescriptor_t desc) {
+c_set_tensorNd(CudaNdarray *var, cudnnTensorDescriptor_t desc) {
 
 
+  int dim = CudaNdarray_NDIM(var);
   int strides[dim];
   int default_str = 1;
 
@@ -33,12 +34,13 @@ c_set_tensorNd(CudaNdarray *var, int dim, cudnnTensorDescriptor_t desc) {
 
 
 static int
-c_set_filterNd(CudaNdarray *var, int dim, cudnnFilterDescriptor_t desc) {
+c_set_filterNd(CudaNdarray *var, cudnnFilterDescriptor_t desc) {
   if (!CudaNdarray_is_c_contiguous(var)) {
     PyErr_SetString(PyExc_ValueError,
 		    "Only contiguous filters (kernels) are supported.");
     return -1;
   }
+  int dim = CudaNdarray_NDIM(var);
   cudnnStatus_t err = cudnnSetFilterNdDescriptor(desc, CUDNN_DATA_FLOAT, dim,
                                                  CudaNdarray_HOST_DIMS(var));
   if (err != CUDNN_STATUS_SUCCESS) {

theano/sandbox/cuda/dnn_fwd.c

@@ -12,9 +12,9 @@ APPLY_SPECIFIC(conv_fwd)(CudaNdarray *input, CudaNdarray *kerns,
     return 1;
   }
 
-  if (c_set_tensorNd(input, nb_dim, APPLY_SPECIFIC(input)) == -1)
+  if (c_set_tensorNd(input, APPLY_SPECIFIC(input)) == -1)
     return 1;
-  if (c_set_filterNd(kerns, nb_dim, APPLY_SPECIFIC(kerns)) == -1)
+  if (c_set_filterNd(kerns, APPLY_SPECIFIC(kerns)) == -1)
     return 1;
 
 #ifdef CONV_INPLACE
@@ -28,7 +28,7 @@ APPLY_SPECIFIC(conv_fwd)(CudaNdarray *input, CudaNdarray *kerns,
     return 1;
 #endif
 
-   if (c_set_tensorNd(*output, nb_dim, APPLY_SPECIFIC(output)) == -1)
+   if (c_set_tensorNd(*output, APPLY_SPECIFIC(output)) == -1)
      return 1;
 
   {

theano/sandbox/cuda/dnn_gi.c

@@ -12,9 +12,9 @@ APPLY_SPECIFIC(conv_gi)(CudaNdarray *kerns, CudaNdarray *output,
     return 1;
   }
 
-  if (c_set_tensorNd(output, nb_dim, APPLY_SPECIFIC(output)) == -1)
+  if (c_set_tensorNd(output, APPLY_SPECIFIC(output)) == -1)
     return 1;
-  if (c_set_filterNd(kerns, nb_dim, APPLY_SPECIFIC(kerns)) == -1)
+  if (c_set_filterNd(kerns, APPLY_SPECIFIC(kerns)) == -1)
     return 1;
 
 #ifdef CONV_INPLACE
@@ -28,7 +28,7 @@ APPLY_SPECIFIC(conv_gi)(CudaNdarray *kerns, CudaNdarray *output,
     return 1;
 #endif
 
-  if (c_set_tensorNd(*input, nb_dim, APPLY_SPECIFIC(input)) == -1)
+  if (c_set_tensorNd(*input, APPLY_SPECIFIC(input)) == -1)
     return 1;
 
 #if defined(CUDNN_VERSION) && CUDNN_VERSION >= 3000

theano/sandbox/cuda/dnn_gw.c

@@ -12,9 +12,9 @@ APPLY_SPECIFIC(conv_gw)(CudaNdarray *input, CudaNdarray *output,
     return 1;
   }
 
-  if (c_set_tensorNd(input, nb_dim, APPLY_SPECIFIC(input)) == -1)
+  if (c_set_tensorNd(input, APPLY_SPECIFIC(input)) == -1)
     return 1;
-  if (c_set_tensorNd(output, nb_dim, APPLY_SPECIFIC(output)) == -1)
+  if (c_set_tensorNd(output, APPLY_SPECIFIC(output)) == -1)
     return 1;
 
 #ifdef CONV_INPLACE
@@ -28,7 +28,7 @@ APPLY_SPECIFIC(conv_gw)(CudaNdarray *input, CudaNdarray *output,
     return 1;
 #endif
 
-  if (c_set_filterNd(*kerns, nb_dim, APPLY_SPECIFIC(kerns)) == -1)
+  if (c_set_filterNd(*kerns, APPLY_SPECIFIC(kerns)) == -1)
     return 1;
 
 #if defined(CUDNN_VERSION) && CUDNN_VERSION >= 3000