diff options
author | Michalis Spyrou <michalis.spyrou@arm.com> | 2018-04-18 09:49:16 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:50:48 +0000 |
commit | e74b201ca1abca040ca9f30837fdf19aa610e7c4 (patch) | |
tree | 28a9022c564e40a410c66716467d4133574fec7b /arm_compute/core | |
parent | 2213d4b334567d0cb7f283090d42b5fb1b70f66b (diff) | |
download | ComputeLibrary-e74b201ca1abca040ca9f30837fdf19aa610e7c4.tar.gz |
COMPMID-805 Add NHWC data format support for CL pooling
Change-Id: I3d91fde78b971aba3f6349f633cd9b1c50e5cacf
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/124712
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'arm_compute/core')
-rw-r--r-- | arm_compute/core/utils/misc/ShapeCalculator.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/arm_compute/core/utils/misc/ShapeCalculator.h b/arm_compute/core/utils/misc/ShapeCalculator.h index 8d4c024f62..7d07d4619b 100644 --- a/arm_compute/core/utils/misc/ShapeCalculator.h +++ b/arm_compute/core/utils/misc/ShapeCalculator.h @@ -324,6 +324,30 @@ inline TensorShape compute_min_max_shape(const ITensorInfo *input) return output_shape; } +inline TensorShape compute_pool_shape(const ITensorInfo &input, PoolingLayerInfo pool_info) +{ + unsigned int pooled_w = 0; + unsigned int pooled_h = 0; + + const bool is_global_pooling = pool_info.is_global_pooling(); + const int idx_width = get_data_layout_dimension_index(input.data_layout(), DataLayoutDimension::WIDTH); + const int idx_height = get_data_layout_dimension_index(input.data_layout(), DataLayoutDimension::HEIGHT); + const unsigned int pool_size_x = is_global_pooling ? input.tensor_shape()[idx_width] : pool_info.pool_size().width; + const unsigned int pool_size_y = is_global_pooling ? input.tensor_shape()[idx_height] : pool_info.pool_size().height; + + std::tie(pooled_w, pooled_h) = scaled_dimensions(input.dimension(idx_width), + input.dimension(idx_height), + pool_size_x, + pool_size_y, + pool_info.pad_stride_info()); + + TensorShape output_shape{ input.tensor_shape() }; + output_shape.set(get_data_layout_dimension_index(input.data_layout(), DataLayoutDimension::WIDTH), pooled_w); + output_shape.set(get_data_layout_dimension_index(input.data_layout(), DataLayoutDimension::HEIGHT), pooled_h); + + return output_shape; +} + inline TensorShape compute_rnn_shape(const ITensorInfo *input, const unsigned int batch_size) { TensorShape output_shape{ input->tensor_shape() }; @@ -331,7 +355,6 @@ inline TensorShape compute_rnn_shape(const ITensorInfo *input, const unsigned in return output_shape; } - } // namespace shape_calculator } // namespace misc } // namespace arm_compute |