From 57dac8400d56a4b68975d5563a9540c96d49fe5f Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Thu, 1 Mar 2018 16:03:50 +0000 Subject: COMPMID-806 Add NHWC data format support format for NEON pooling Change-Id: I7ab174c72f3d56134fcec259a137739061fd12e9 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/123065 Reviewed-by: Georgios Pinitas Tested-by: Jenkins --- .../core/NEON/kernels/NEPoolingLayerKernel.h | 53 +++++++++++++++------- 1 file changed, 37 insertions(+), 16 deletions(-) (limited to 'arm_compute/core/NEON/kernels/NEPoolingLayerKernel.h') diff --git a/arm_compute/core/NEON/kernels/NEPoolingLayerKernel.h b/arm_compute/core/NEON/kernels/NEPoolingLayerKernel.h index 8250342b53..4140ccf1ed 100644 --- a/arm_compute/core/NEON/kernels/NEPoolingLayerKernel.h +++ b/arm_compute/core/NEON/kernels/NEPoolingLayerKernel.h @@ -82,112 +82,133 @@ private: * @param[in] window Output region on which to execute the kernel. */ template - void pooling2_f32(const Window &window_input, const Window &window); + void pooling2_f32_nchw(const Window &window_input, const Window &window); /** Function to perform 2x2 pooling for float16_t. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void pooling2_f16(const Window &window_input, const Window &window); + void pooling2_f16_nchw(const Window &window_input, const Window &window); /** Function to perform 2x2 pooling for 8bit fixed point. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void pooling2_q8(const Window &window_input, const Window &window); + void pooling2_q8_nchw(const Window &window_input, const Window &window); /** Function to perform 2x2 pooling for 8bit asymmetric fixed point. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void pooling2_qasymm8(const Window &window_input, const Window &window); + void pooling2_qasymm8_nchw(const Window &window_input, const Window &window); /** Function to perform 2x2 pooling for 16bit fixed point. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void pooling2_q16(const Window &window_input, const Window &window); + void pooling2_q16_nchw(const Window &window_input, const Window &window); /** Function to perform 3x3 pooling. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void pooling3_f32(const Window &window_input, const Window &window); + void pooling3_f32_nchw(const Window &window_input, const Window &window); /** Function to perform 3x3 pooling. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void pooling3_f16(const Window &window_input, const Window &window); + void pooling3_f16_nchw(const Window &window_input, const Window &window); /** Function to perform 3x3 pooling for 8bit fixed point. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void pooling3_q8(const Window &window_input, const Window &window); + void pooling3_q8_nchw(const Window &window_input, const Window &window); /** Function to perform 3x3 pooling for 8bit quantized fixed point. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void pooling3_qasymm8(const Window &window_input, const Window &window); + void pooling3_qasymm8_nchw(const Window &window_input, const Window &window); /** Function to perform 3x3 pooling for 16bit fixed point. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void pooling3_q16(const Window &window_input, const Window &window); + void pooling3_q16_nchw(const Window &window_input, const Window &window); /** Function to perform 7x7 pooling. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void pooling7_f32(const Window &window_input, const Window &window); + void pooling7_f32_nchw(const Window &window_input, const Window &window); /** Function to perform MxN pooling for 8bit fixed point. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void poolingMxN_q8(const Window &window_input, const Window &window); + void poolingMxN_q8_nchw(const Window &window_input, const Window &window); /** Function to perform MxN pooling for 8-bit quantized. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void poolingMxN_qasymm8(const Window &window_input, const Window &window); + void poolingMxN_qasymm8_nchw(const Window &window_input, const Window &window); + /** Function to perform MxN pooling for 8-bit quantized. (NHWC) + * + * @param[in] window_input Input region on which to execute the kernel. + * @param[in] window Output region on which to execute the kernel. + */ + template + void poolingMxN_qasymm8_nhwc(const Window &window_input, const Window &window); /** Function to perform MxN pooling for 16bit fixed point. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void poolingMxN_q16(const Window &window_input, const Window &window); + void poolingMxN_q16_nchw(const Window &window_input, const Window &window); /** Function to perform MxN pooling for 16-bit floating point values. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void poolingMxN_f16(const Window &window_input, const Window &window); + void poolingMxN_f16_nchw(const Window &window_input, const Window &window); + /** Function to perform MxN pooling for 16-bit floating point values. (NHWC) + * + * @param[in] window_input Input region on which to execute the kernel. + * @param[in] window Output region on which to execute the kernel. + */ + template + void poolingMxN_f16_nhwc(const Window &window_input, const Window &window); /** Function to perform MxN pooling for 32-bit floating point values. * * @param[in] window_input Input region on which to execute the kernel. * @param[in] window Output region on which to execute the kernel. */ template - void poolingMxN_f32(const Window &window_input, const Window &window); + void poolingMxN_f32_nchw(const Window &window_input, const Window &window); + /** Function to perform MxN pooling for 32-bit floating point values (NHWC). + * + * @param[in] window_input Input region on which to execute the kernel. + * @param[in] window Output region on which to execute the kernel. + */ + template + void poolingMxN_f32_nhwc(const Window &window_input, const Window &window); /** Common signature for all the specialised Pooling functions * * @param[in] window_input Input region on which to execute the kernel. -- cgit v1.2.1