diff options
| author | Ronan Collobert <ronan@collobert.com> | 2012-01-30 19:54:41 +0400 |
|---|---|---|
| committer | Ronan Collobert <ronan@collobert.com> | 2012-01-30 19:54:41 +0400 |
| commit | 5468752e0a88537c3f27034cc7031e78a67f9202 (patch) | |
| tree | 4df10ec8b98c720438d63cfb33cc88dc7aca1c4f /generic | |
| parent | 4df3893abd1b9f840f1d9a8c1859799ccbf941de (diff) | |
Merge branch 'master' into newpack
Conflicts:
extra/nn/test/test.lua
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/SpatialMaxPooling.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/SpatialMaxPooling.c b/generic/SpatialMaxPooling.c index b9fab3b..845181b 100644 --- a/generic/SpatialMaxPooling.c +++ b/generic/SpatialMaxPooling.c @@ -75,8 +75,8 @@ static int nn_(SpatialMaxPooling_updateOutput)(lua_State *L) *op = maxval; // store location of max (x,y) - *indyp = (int)(maxindex / dW)+1; - *indxp = (maxindex % dW) +1; + *indyp = (int)(maxindex / kW)+1; + *indxp = (maxindex % kW) +1; } } } |