commit 4e288696a2ca8e1c9d6d37d90d237c1a18d6e364
author Gian Marco Iodice <gianmarco.iodice@arm.com> Tue Jun 27 11:41:59 2017 +0100
committer Anthony Barbier <anthony.barbier@arm.com> Mon Sep 17 14:15:39 2018 +0100
tree 02c6792d1097fe84bb8c0fcee4c72d120ead6438
parent 3b77e9df5d2d33bda0500235d3f258f3197037de

COMPMID-417 - Adding support for rectangular kernels

Change-Id: I4dde0929bc689c83582b95856dd0253228125df2
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/78994
Reviewed-by: Moritz Pflanzer <moritz.pflanzer@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>

src/core/CL/kernels/CLPoolingLayerKernel.cpp

diff --git a/src/core/CL/kernels/CLPoolingLayerKernel.cpp b/src/core/CL/kernels/CLPoolingLayerKernel.cpp
index 7648025..15f26e3 100644
--- a/src/core/CL/kernels/CLPoolingLayerKernel.cpp
+++ b/src/core/CL/kernels/CLPoolingLayerKernel.cpp
@@ -52,16 +52,15 @@
 
 void CLPoolingLayerKernel::configure(const ICLTensor *input, ICLTensor *output, const PoolingLayerInfo &pool_info)
 {
-    int                   pool_pad_x      = 0;
-    int                   pool_pad_y      = 0;
-    int                   pool_stride_x   = 0;
-    int                   pool_stride_y   = 0;
-    unsigned int          pooled_w        = 0;
-    unsigned int          pooled_h        = 0;
-    const PoolingType     pool_type       = pool_info.pool_type();
-    const int             pool_size       = pool_info.pool_size();
-    const PadStrideInfo   pad_stride_info = pool_info.pad_stride_info();
-    DimensionRoundingType pool_round      = pad_stride_info.round();
+    int                 pool_pad_x      = 0;
+    int                 pool_pad_y      = 0;
+    int                 pool_stride_x   = 0;
+    int                 pool_stride_y   = 0;
+    unsigned int        pooled_w        = 0;
+    unsigned int        pooled_h        = 0;
+    const PoolingType   pool_type       = pool_info.pool_type();
+    const int           pool_size       = pool_info.pool_size();
+    const PadStrideInfo pad_stride_info = pool_info.pad_stride_info();
     std::tie(pool_pad_x, pool_pad_y)       = pad_stride_info.pad();
     std::tie(pool_stride_x, pool_stride_y) = pad_stride_info.stride();
 
@@ -78,9 +77,8 @@
     std::tie(pooled_w, pooled_h) = scaled_dimensions(input->info()->dimension(0),
                                                      input->info()->dimension(1),
                                                      pool_size,
-                                                     pool_stride_x, pool_stride_y,
-                                                     pool_pad_x, pool_pad_y,
-                                                     pool_round);
+                                                     pool_size,
+                                                     pool_info.pad_stride_info());
     ARM_COMPUTE_UNUSED(pooled_w);
     ARM_COMPUTE_UNUSED(pooled_h);
     ARM_COMPUTE_ERROR_ON((output->info()->dimension(0) != pooled_w) || (output->info()->dimension(1) != pooled_h));