From 780db4eb6a9e3dee565d14f36d772038cd3253da Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Thu, 23 Nov 2017 09:49:51 +0000 Subject: COMPMID-471 Implement Deconvolution on OpenCL Change-Id: Ie00c6b08a51d30c5ce2637d40ee3d165b8a68686 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/110311 Reviewed-by: Pablo Tello Reviewed-by: Georgios Pinitas Tested-by: Jenkins --- .../runtime/CL/functions/CLDeconvolutionLayer.h | 103 +++++++++++++++++++++ .../CL/functions/CLDeconvolutionLayerUpsample.h | 85 +++++++++++++++++ .../CL/functions/CLDirectConvolutionLayer.h | 3 +- 3 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h create mode 100644 arm_compute/runtime/CL/functions/CLDeconvolutionLayerUpsample.h (limited to 'arm_compute/runtime/CL/functions') diff --git a/arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h b/arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h new file mode 100644 index 0000000000..e98cc9b3d6 --- /dev/null +++ b/arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2017, 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_CLDECONVOLUTIONLAYER_H__ +#define __ARM_COMPUTE_CLDECONVOLUTIONLAYER_H__ + +#include "arm_compute/runtime/CL/functions/CLDeconvolutionLayerUpsample.h" +#include "arm_compute/runtime/CL/functions/CLDirectConvolutionLayer.h" + +#include "arm_compute/runtime/CL/CLMemoryGroup.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/IFunction.h" +#include "arm_compute/runtime/IMemoryManager.h" + +#include + +namespace arm_compute +{ +class ICLTensor; +/** Function to run the deconvolution layer. + * + * Deconvolution Layer is the backward pass of Convolution Layer. First we transform the input depending on the stride and pad info and then perform a 1x1 + * convolution pass. Input stride defines how many zeroes we should put between each element of the input, pad is the amount of padding and finally a is a user + * specified value where a < stride - 1, that increases the padding top and right of the input image. + * + * The relation between input to output is as follows: + * width_output = round((width_input − 1) ∗ (stride_x - 1) − 2 ∗ padding_x + kernel_x + inner_border_right ) + * height_output = round((height_input − 1) ∗ (stride_y - 1) − 2 ∗ padding_y + kernel_y + inner_border_top ) + * + * where: + * width_input is the size of the first input dimension. + * height_input is the size of the second input dimension. + * width_output is the size of the first output dimension. + * height_output is the size of the second output dimension. + * kernel_x and kernel_y are the convolution sizes in x and y. + * inner_border_right and inner_border_top the number of zeros added to the right and top edges of the input. + * stride_x and stride_y is the input stride of the first and second dimension. + * + */ +class CLDeconvolutionLayer : public IFunction +{ +public: + /** Constructor */ + CLDeconvolutionLayer(std::shared_ptr memory_manager = nullptr); + /** Set the input, weights, biases and output tensors. + * + * @param[in,out] input Input tensor. 3 lower dimensions represent a single input, and an optional 4th dimension for batch of inputs. Data types supported: F32. + * @param[in] weights The 4d weights with dimensions [width, height, OFM, IFM]. Data type supported: Same as @p input. + * @param[in] bias (Optional) The biases have one dimension. Data type supported: Same as @p input. + * @param[out] output Output tensor. The output has the same number of dimensions as the @p input. + * @param[in] info Contains padding and policies to be used in the deconvolution, this is decribed in @ref PadStrideInfo. + * @param[in] inner_border_right The number of zeros added to right edge of the input. + * @param[in] inner_border_top The number of zeros added to top edge of the input. + * + */ + void configure(ICLTensor *input, const ICLTensor *weights, const ICLTensor *bias, ICLTensor *output, const PadStrideInfo &info, + unsigned int inner_border_right, unsigned int inner_border_top); + /** Static function to check if given info will lead to a valid configuration of @ref CLDeconvolutionLayer + * + * @param[in] input Input tensor info. 3 lower dimensions represent a single input, and an optional 4th dimension for batch of inputs. Data types supported: F32. + * @param[in] weights The 4d weights info with dimensions [width, height, OFM, IFM]. Data type supported: Same as @p input. + * @param[in] bias (Optional) The biases have one dimension. Data type supported: Same as @p input. + * @param[in] output Output tensor info. The output has the same number of dimensions as the @p input. + * @param[in] info Contains padding and policies to be used in the deconvolution, this is decribed in @ref PadStrideInfo. + * @param[in] inner_border_right The number of zeros added to right edge of the input. + * @param[in] inner_border_top The number of zeros added to top edge of the input. + * + * @return a status + */ + static Status validate(const ITensorInfo *input, const ITensorInfo *weights, const ITensorInfo *bias, ITensorInfo *output, const PadStrideInfo &info, + unsigned int inner_border_right, unsigned int inner_border_top); + + // Inherited methods overridden: + void run() override; + +private: + CLMemoryGroup _memory_group; + CLDeconvolutionLayerUpsample _scale_f; + CLDirectConvolutionLayer _conv_f; + CLTensor _scaled_output; +}; +} +#endif /* __ARM_COMPUTE_CLDECONVOLUTIONLAYER_H__ */ \ No newline at end of file diff --git a/arm_compute/runtime/CL/functions/CLDeconvolutionLayerUpsample.h b/arm_compute/runtime/CL/functions/CLDeconvolutionLayerUpsample.h new file mode 100644 index 0000000000..74ee4efb2c --- /dev/null +++ b/arm_compute/runtime/CL/functions/CLDeconvolutionLayerUpsample.h @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2017, 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_CLDECONVOLUTIONLAYERUPSAMPLE_H__ +#define __ARM_COMPUTE_CLDECONVOLUTIONLAYERUPSAMPLE_H__ + +#include "arm_compute/runtime/IFunction.h" + +#include "arm_compute/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/runtime/CL/CLMemoryGroup.h" +#include "arm_compute/runtime/IFunction.h" +#include "arm_compute/runtime/IMemoryManager.h" + +namespace arm_compute +{ +class ICLTensor; + +/** Basic function to run @ref CLDeconvolutionLayerUpsampleKernel */ +class CLDeconvolutionLayerUpsample : public IFunction +{ +public: + /** Default constructor */ + CLDeconvolutionLayerUpsample(); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLDeconvolutionLayerUpsample(const CLDeconvolutionLayerUpsample &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLDeconvolutionLayerUpsample &operator=(const CLDeconvolutionLayerUpsample &) = delete; + /** Allow instances of this class to be moved */ + CLDeconvolutionLayerUpsample(CLDeconvolutionLayerUpsample &&) = default; + /** Allow instances of this class to be moved */ + CLDeconvolutionLayerUpsample &operator=(CLDeconvolutionLayerUpsample &&) = default; + /** Default destructor */ + virtual ~CLDeconvolutionLayerUpsample() = default; + + /** Initialize the function's source, destination, interpolation type and border_mode. + * + * @param[in, out] input Source tensor. Data type supported: F32. + * @param[out] output Destination tensor. Data type supported: F32. + * @param[in] inner_border The number of zeros added to right and top edges of the input. + * @param[in] info Contains padding and policies to be used in the deconvolution. + */ + void configure(ICLTensor *input, ICLTensor *output, const BorderSize &inner_border, + const PadStrideInfo &info); + /** Static function to check if given info will lead to a valid configuration of @ref CLDeconvolutionLayerUpsample + * + * @param[in] input Source tensor info. Data type supported: F32. + * @param[in] output Destination tensor info. Data type supported: F32. + * @param[in] inner_border The number of zeros added to right and top edges of the input. + * @param[in] info Contains padding and policies to be used in the deconvolution. + * + * @return a status + */ + static Status validate(const ITensorInfo *input, const ITensorInfo *output, const BorderSize &inner_border, + const PadStrideInfo &info); + + // Inherited methods overridden: + void run() override; + +private: + CLDeconvolutionLayerUpsampleKernel _upsample; + ICLTensor *_output; +}; +} +#endif /* __ARM_COMPUTE_CLDECONVOLUTIONLAYERUPSAMPLE_H__ */ diff --git a/arm_compute/runtime/CL/functions/CLDirectConvolutionLayer.h b/arm_compute/runtime/CL/functions/CLDirectConvolutionLayer.h index f31a45be90..205c90c478 100644 --- a/arm_compute/runtime/CL/functions/CLDirectConvolutionLayer.h +++ b/arm_compute/runtime/CL/functions/CLDirectConvolutionLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017, 2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -40,6 +40,7 @@ class ICLTensor; class CLDirectConvolutionLayer : public IFunction { public: + /** Default constructor */ CLDirectConvolutionLayer(); /** Set the input and output tensors. * -- cgit v1.2.1