From: Paul Brossier <piem@piem.org>
Date: Mon, 7 Jan 2019 23:06:02 +0000 (+0100)
Subject: [maxpool2d] use first element to initialize output value, add stride
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=3cbcc408ead3efc38542a593717b109375543e33;p=aubio.git

[maxpool2d] use first element to initialize output value, add stride
---

diff --git a/src/ai/maxpool2d.c b/src/ai/maxpool2d.c
index e91f34b3..e8101809 100644
--- a/src/ai/maxpool2d.c
+++ b/src/ai/maxpool2d.c
@@ -101,11 +101,14 @@ void aubio_maxpool2d_do(aubio_maxpool2d_t *c, aubio_tensor_t *input_tensor,
     {
       for (k = 0; k < output_tensor->shape[2]; k++)
       {
-        smpl_t m = -10000.;
+        uint_t stride_i = i * c->pool_size[0];
+        uint_t stride_j = j * c->pool_size[1];
+        smpl_t m = input_tensor->data[stride_i][stride_j
+          * input_tensor->shape[2] + k];
         for (a = 0; a < c->pool_size[0]; a++) {
           for (b = 0; b < c->pool_size[1]; b++) {
-            uint_t idx = (j * c->pool_size[1] + b) * input_tensor->shape[2] + k;
-            m = MAX(m, input_tensor->data[i * c->pool_size[0] + a][idx]);
+            uint_t idx = (stride_j + b) * input_tensor->shape[2] + k;
+            m = MAX(m, input_tensor->data[stride_i + a][idx]);
           }
         }
         output_tensor->data[i][j * output_tensor->shape[2] + k] = m;