From 33ff9ef467153eef05b700820d859515a52481f4 Mon Sep 17 00:00:00 2001 From: Xinghang Zhou Date: Wed, 17 Jan 2018 11:23:39 +0800 Subject: APPBROWSER-400: Implement the tensorshift kernel for fixing DC's alignment issue on OpenGL ES Change-Id: I7a8489bb0fddc72899ea165e414ee87bdbfb45b3 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/118106 Reviewed-by: Joel Liang Tested-by: Jenkins Reviewed-by: Anthony Barbier --- .../functions/GCDirectConvolutionLayer.h | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'arm_compute/runtime/GLES_COMPUTE/functions/GCDirectConvolutionLayer.h') diff --git a/arm_compute/runtime/GLES_COMPUTE/functions/GCDirectConvolutionLayer.h b/arm_compute/runtime/GLES_COMPUTE/functions/GCDirectConvolutionLayer.h index 5472bdb9ea..c6b948be1f 100644 --- a/arm_compute/runtime/GLES_COMPUTE/functions/GCDirectConvolutionLayer.h +++ b/arm_compute/runtime/GLES_COMPUTE/functions/GCDirectConvolutionLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -24,9 +24,12 @@ #ifndef __ARM_COMPUTE_GCDIRECTCONVOLUTIONLAYER_H__ #define __ARM_COMPUTE_GCDIRECTCONVOLUTIONLAYER_H__ +#include "arm_compute/core/GLES_COMPUTE/IGCKernel.h" #include "arm_compute/core/GLES_COMPUTE/kernels/GCDirectConvolutionLayerKernel.h" +#include "arm_compute/core/GLES_COMPUTE/kernels/GCFillBorderKernel.h" +#include "arm_compute/core/GLES_COMPUTE/kernels/GCTensorShiftKernel.h" #include "arm_compute/core/Types.h" -#include "arm_compute/runtime/GLES_COMPUTE/IGCSimpleFunction.h" +#include "arm_compute/runtime/IFunction.h" #include @@ -34,14 +37,20 @@ namespace arm_compute { class IGCTensor; -/** Basic function to execute direct convolution function: +/** Basic function to execute direct convolution function. This function calls the following kernels: + * + * -# @ref GCDirectConvolutionLayerKernel + * -# @ref GCFillBorderKernel + * -# @ref GCTensorShiftKernel * * @note Supported kernel size: 1x1, 3x3, and 5x5 * @note This OpenGL ES implementation works with stride_x = 1 and 2 */ -class GCDirectConvolutionLayer : public IGCSimpleFunction +class GCDirectConvolutionLayer : public IFunction { public: + /** Default constructor */ + GCDirectConvolutionLayer(); /** Set the input and output tensors. * * @param[in] input Source tensor. 3 lower dimensions represent a single input [width, height, IFM], @@ -54,6 +63,14 @@ public: * @param[in] conv_info Contains padding and stride information described in @ref PadStrideInfo. */ void configure(const IGCTensor *input, const IGCTensor *weights, const IGCTensor *biases, IGCTensor *output, const PadStrideInfo &conv_info); + + // Inherited methods overridden: + void run() override final; + +private: + std::unique_ptr _kernel; + GCFillBorderKernel _border_handler; + GCTensorShiftKernel _shift_handler; }; } #endif /* __ARM_COMPUTE_GCDIRECTCONVOLUTIONLAYER_H__ */ -- cgit v1.2.1