From ceb889efc302464efd7fd20001d8a89a06c4e0bd Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Mon, 17 Sep 2018 18:24:41 +0100 Subject: COMPMID-1588 Create UpsampleKernel for YOLOLayer Change-Id: Ic1f9e85306a0a0b1459c9f9aa35bd629deea1710 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/148797 Tested-by: bsgcomp Reviewed-by: Anthony Barbier Reviewed-by: Georgios Pinitas --- arm_compute/core/CL/CLKernels.h | 1 + .../core/CL/kernels/CLUpsampleLayerKernel.h | 79 ++++++++++++++++++++++ arm_compute/core/utils/misc/ShapeCalculator.h | 15 ++++ 3 files changed, 95 insertions(+) create mode 100644 arm_compute/core/CL/kernels/CLUpsampleLayerKernel.h (limited to 'arm_compute/core') diff --git a/arm_compute/core/CL/CLKernels.h b/arm_compute/core/CL/CLKernels.h index 88658013fa..f39d7b71f6 100644 --- a/arm_compute/core/CL/CLKernels.h +++ b/arm_compute/core/CL/CLKernels.h @@ -118,6 +118,7 @@ #include "arm_compute/core/CL/kernels/CLTableLookupKernel.h" #include "arm_compute/core/CL/kernels/CLThresholdKernel.h" #include "arm_compute/core/CL/kernels/CLTransposeKernel.h" +#include "arm_compute/core/CL/kernels/CLUpsampleLayerKernel.h" #include "arm_compute/core/CL/kernels/CLWarpAffineKernel.h" #include "arm_compute/core/CL/kernels/CLWarpPerspectiveKernel.h" #include "arm_compute/core/CL/kernels/CLWeightsReshapeKernel.h" diff --git a/arm_compute/core/CL/kernels/CLUpsampleLayerKernel.h b/arm_compute/core/CL/kernels/CLUpsampleLayerKernel.h new file mode 100644 index 0000000000..dcd4f1bdb4 --- /dev/null +++ b/arm_compute/core/CL/kernels/CLUpsampleLayerKernel.h @@ -0,0 +1,79 @@ +/* + * Copyright (c) 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_CLUPSAMPLELAYERKERNEL_H__ +#define __ARM_COMPUTE_CLUPSAMPLELAYERKERNEL_H__ + +#include "arm_compute/core/CL/ICLKernel.h" + +namespace arm_compute +{ +class ICLTensor; + +/** Interface for the UpsampleLayer kernel on OpenCL. */ +class CLUpsampleLayerKernel : public ICLKernel +{ +public: + /** Constructor */ + CLUpsampleLayerKernel(); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLUpsampleLayerKernel(const CLUpsampleLayerKernel &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLUpsampleLayerKernel &operator=(const CLUpsampleLayerKernel &) = delete; + /** Default Move Constructor. */ + CLUpsampleLayerKernel(CLUpsampleLayerKernel &&) = default; + /** Default move assignment operator */ + CLUpsampleLayerKernel &operator=(CLUpsampleLayerKernel &&) = default; + /** Default destructor */ + ~CLUpsampleLayerKernel() = default; + + /** Initialise the kernel's input and output. + * + * @param[in] input Source tensor. Data types supported: U8/S8/QASYMM8/U16/S16/F16/U32/S32/F32. + * @param[out] output Destination tensor. Data types supported: same as @p input. + * @param[in] info Contains stride information described in @ref Size2D. + * @param[in] upsampling_policy Defines the policy to fill the intermediate pixels. + */ + void configure(const ICLTensor *input, ICLTensor *output, const Size2D &info, const InterpolationPolicy upsampling_policy); + /** Static function to check if given info will lead to a valid configuration of @ref CLUpsampleLayerKernel + * + * @param[in] input Source tensor info. Data types supported: U8/S8/QASYMM8/U16/S16/F16/U32/S32/F32. + * @param[in] output Destination tensor info. Data types supported: same as @p input. + * @param[in] info Contains stride information described in @ref Size2D. + * @param[in] upsampling_policy Defines the policy to fill the intermediate pixels. + * + * @return a status + */ + static Status validate(const ITensorInfo *input, const ITensorInfo *output, const Size2D &info, const InterpolationPolicy upsampling_policy); + + // Inherited methods overridden: + void run(const Window &window, cl::CommandQueue &queue) override; + +private: + const ICLTensor *_input; + ICLTensor *_output; + Size2D _info; + unsigned int _num_elems_processed_per_iteration_input_x; +}; +} // namespace arm_compute +#endif /*__ARM_COMPUTE_CLUPSAMPLELAYERKERNEL_H__ */ diff --git a/arm_compute/core/utils/misc/ShapeCalculator.h b/arm_compute/core/utils/misc/ShapeCalculator.h index 6d8e15b8b2..1fdf5b8ff5 100644 --- a/arm_compute/core/utils/misc/ShapeCalculator.h +++ b/arm_compute/core/utils/misc/ShapeCalculator.h @@ -597,6 +597,21 @@ inline TensorShape compute_padded_shape(const TensorShape &input_shape, const Pa return padded_shape; } +inline TensorShape compute_upsample_shape(const ITensorInfo &input, const Size2D &info) +{ + const DataLayout data_layout = input.data_layout(); + const int idx_width = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH); + const int idx_height = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT); + + TensorShape scale_out_shape(input.tensor_shape()); + const unsigned int out_x = input.dimension(idx_width) * info.x(); + const unsigned int out_y = input.dimension(idx_height) * info.y(); + scale_out_shape.set(idx_width, out_x); + scale_out_shape.set(idx_height, out_y); + + return scale_out_shape; +} + template inline TensorShape extract_shape(T *data) { -- cgit v1.2.1