提交 eefbb4fd authored 作者: Frederic Bastien's avatar Frederic Bastien

Fix pooling op compilation with python 32bit and newer gcc.

上级 cbc60f01
...@@ -560,9 +560,9 @@ class Pool(OpenMPOp): ...@@ -560,9 +560,9 @@ class Pool(OpenMPOp):
// index for iterating over the pooling regions // index for iterating over the pooling regions
int r_idx[%(nd)s]; int r_idx[%(nd)s];
// placeholder for PyArray indexing (output) // placeholder for PyArray indexing (output)
long int o_idx[%(total_ndim)s]; npy_intp o_idx[%(total_ndim)s];
// placeholder for PyArray indexing (input) // placeholder for PyArray indexing (input)
long int i_idx[%(total_ndim)s]; npy_intp i_idx[%(total_ndim)s];
// loop over non-pooling dimensions // loop over non-pooling dimensions
int non_pooling_prod = 1; int non_pooling_prod = 1;
for (int i=0; i<%(non_pool_ndim)s; i++) for (int i=0; i<%(non_pool_ndim)s; i++)
...@@ -1040,9 +1040,9 @@ class MaxPoolGrad(PoolGrad): ...@@ -1040,9 +1040,9 @@ class MaxPoolGrad(PoolGrad):
// index for iterating over the pooling regions // index for iterating over the pooling regions
int r_idx[%(nd)s]; int r_idx[%(nd)s];
// placeholder for PyArray indexing (output) // placeholder for PyArray indexing (output)
long int o_idx[%(total_ndim)s]; npy_intp o_idx[%(total_ndim)s];
// placeholder for PyArray indexing (input) // placeholder for PyArray indexing (input)
long int i_idx[%(total_ndim)s]; npy_intp i_idx[%(total_ndim)s];
// loop over non-pooling dimensions // loop over non-pooling dimensions
int non_pooling_prod = 1; int non_pooling_prod = 1;
for (int i=0; i<%(non_pool_ndim)s; i++) for (int i=0; i<%(non_pool_ndim)s; i++)
...@@ -1367,9 +1367,9 @@ class AveragePoolGrad(PoolGrad): ...@@ -1367,9 +1367,9 @@ class AveragePoolGrad(PoolGrad):
// index for iterating over the pooling regions // index for iterating over the pooling regions
int r_idx[%(nd)s]; int r_idx[%(nd)s];
// placeholder for PyArray indexing (output) // placeholder for PyArray indexing (output)
long int o_idx[%(total_ndim)s]; npy_intp o_idx[%(total_ndim)s];
// placeholder for PyArray indexing (input) // placeholder for PyArray indexing (input)
long int i_idx[%(total_ndim)s]; npy_intp i_idx[%(total_ndim)s];
// loop over non-pooling dimensions // loop over non-pooling dimensions
int non_pooling_prod = 1; int non_pooling_prod = 1;
for (int i=0; i<%(non_pool_ndim)s; i++) for (int i=0; i<%(non_pool_ndim)s; i++)
...@@ -1671,9 +1671,9 @@ class DownsampleFactorMaxGradGrad(OpenMPOp): ...@@ -1671,9 +1671,9 @@ class DownsampleFactorMaxGradGrad(OpenMPOp):
// index for iterating over the pooling regions // index for iterating over the pooling regions
int r_idx[%(nd)s]; int r_idx[%(nd)s];
// placeholder for PyArray indexing (output) // placeholder for PyArray indexing (output)
long int o_idx[%(total_ndim)s]; npy_intp o_idx[%(total_ndim)s];
// placeholder for PyArray indexing (input) // placeholder for PyArray indexing (input)
long int i_idx[%(total_ndim)s]; npy_intp i_idx[%(total_ndim)s];
// loop over non-pooling dimensions // loop over non-pooling dimensions
int non_pooling_prod; int non_pooling_prod;
non_pooling_prod = 1; non_pooling_prod = 1;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论