Merge pull request #4025 from nouiz/corrmm_segfault

theano/tensor/nnet/corr.py

@@ -86,7 +86,7 @@ class BaseCorrMM(gof.Op):
 
     def c_code_cache_version(self):
         # raise this whenever modifying any of the support_code_files
-        return (1, 0)
+        return (1, 1)
 
     def c_support_code_apply(self, node, nodename):
         # REMEMBER TO RAISE c_code_cache_version when changing any of

theano/tensor/nnet/corr_gemm.c

@@ -46,10 +46,10 @@ void im2col(const %(float_type)s* data_im, const int channels,
         int h_pad = h * stride_h - pad_h + h_offset;
         int w_pad = w * stride_w - pad_w + w_offset;
         if (h_pad >= 0 && h_pad < height && w_pad >= 0 && w_pad < width)
-          data_col[(c * height_col + h) * width_col + w] =
-            data_im[(c_im * height + h_pad) * width + w_pad];
+          data_col[(npy_intp)(c * height_col + h) * width_col + w] =
+            data_im[(npy_intp)(c_im * height + h_pad) * width + w_pad];
         else
-          data_col[(c * height_col + h) * width_col + w] = 0.;
+          data_col[(npy_intp)(c * height_col + h) * width_col + w] = 0.;
       }
     }
   }
@@ -75,8 +75,8 @@ void col2im(const %(float_type)s* data_col, const int channels,
         int h_pad = h * stride_h - pad_h + h_offset;
         int w_pad = w * stride_w - pad_w + w_offset;
         if (h_pad >= 0 && h_pad < height && w_pad >= 0 && w_pad < width)
-          data_im[(c_im * height + h_pad) * width + w_pad] +=
-            data_col[(c * height_col + h) * width_col + w];
+          data_im[(npy_intp)(c_im * height + h_pad) * width + w_pad] +=
+            data_col[(npy_intp)(c * height_col + h) * width_col + w];
 
       }
     }