From 5daeffdd96c5e46ac2482431d578dfaf9b300cde Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Mon, 26 Nov 2018 10:01:15 +0000 Subject: COMPMID-1723: CL: Implement Reverse Change-Id: Id0d4a07af24e2331161996083b0c1bab072bd405 Reviewed-on: https://review.mlplatform.org/322 Reviewed-by: Georgios Pinitas Tested-by: Arm Jenkins --- arm_compute/core/CL/CLKernels.h | 1 + .../core/CL/kernels/CLChannelShuffleLayerKernel.h | 6 +- arm_compute/core/CL/kernels/CLReverseKernel.h | 76 ++++++++++++++++++++++ 3 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 arm_compute/core/CL/kernels/CLReverseKernel.h (limited to 'arm_compute/core/CL') diff --git a/arm_compute/core/CL/CLKernels.h b/arm_compute/core/CL/CLKernels.h index 0fe1e04ccd..201679347a 100644 --- a/arm_compute/core/CL/CLKernels.h +++ b/arm_compute/core/CL/CLKernels.h @@ -113,6 +113,7 @@ #include "arm_compute/core/CL/kernels/CLRemapKernel.h" #include "arm_compute/core/CL/kernels/CLReorgLayerKernel.h" #include "arm_compute/core/CL/kernels/CLReshapeLayerKernel.h" +#include "arm_compute/core/CL/kernels/CLReverseKernel.h" #include "arm_compute/core/CL/kernels/CLScaleKernel.h" #include "arm_compute/core/CL/kernels/CLScharr3x3Kernel.h" #include "arm_compute/core/CL/kernels/CLSelectKernel.h" diff --git a/arm_compute/core/CL/kernels/CLChannelShuffleLayerKernel.h b/arm_compute/core/CL/kernels/CLChannelShuffleLayerKernel.h index f7bd205ec7..7ae77580d2 100644 --- a/arm_compute/core/CL/kernels/CLChannelShuffleLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLChannelShuffleLayerKernel.h @@ -55,9 +55,9 @@ public: void configure(const ICLTensor *input, ICLTensor *output, unsigned int num_groups); /** Static function to check if given info will lead to a valid configuration of @ref CLChannelShuffleLayerKernel * - * @param[in] input Input tensor. Data types supported: U8/S8/QASYMM8/U16/S16/F16/U32/S32/F32 - * @param[out] output Output tensor. Data type supported: Same as @p input - * @param[in] num_groups Number of groups. Must be greater than 1 and the number of channels of the tensors must be a multiple of the number of groups. + * @param[in] input Input tensor info. Data types supported: U8/S8/QASYMM8/U16/S16/F16/U32/S32/F32 + * @param[in] output Output tensor info. Data type supported: Same as @p input + * @param[in] num_groups Number of groups. Must be greater than 1 and the number of channels of the tensors must be a multiple of the number of groups. * * @return a status */ diff --git a/arm_compute/core/CL/kernels/CLReverseKernel.h b/arm_compute/core/CL/kernels/CLReverseKernel.h new file mode 100644 index 0000000000..e11fbf53b1 --- /dev/null +++ b/arm_compute/core/CL/kernels/CLReverseKernel.h @@ -0,0 +1,76 @@ +/* + * 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_CLREVERSEKERNEL_H__ +#define __ARM_COMPUTE_CLREVERSEKERNEL_H__ + +#include "arm_compute/core/CL/ICLKernel.h" + +namespace arm_compute +{ +class ICLTensor; + +/** Interface for the reverse kernel */ +class CLReverseKernel : public ICLKernel +{ +public: + /** Default constructor */ + CLReverseKernel(); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLReverseKernel(const CLReverseKernel &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLReverseKernel &operator=(const CLReverseKernel &) = delete; + /** Allow instances of this class to be moved */ + CLReverseKernel(CLReverseKernel &&) = default; + /** Allow instances of this class to be moved */ + CLReverseKernel &operator=(CLReverseKernel &&) = default; + /** Default destructor */ + ~CLReverseKernel() = default; + /** Initialise the kernel's inputis and output + * + * @param[in] input Input tensor. Data types supported: U8/S8/QASYMM8/U16/S16/F16/U32/S32/F32 + * @param[out] output Output tensor. Data type supported: Same as @p input + * @param[in] axis Axis tensor. Contains the indices of the dimensions to reverse. Data type supported: U32 + */ + void configure(const ICLTensor *input, ICLTensor *output, const ICLTensor *axis); + + /** Static function to check if given info will lead to a valid configuration of @ref CLReverseKernel + * + * @param[in] input Input tensor info. Data types supported: U8/S8/QASYMM8/U16/S16/F16/U32/S32/F32 + * @param[in] output Output tensor info. Data type supported: Same as @p input + * @param[in] axis Axis tensor info. Contains the indices of the dimensions to reverse. Data type supported: U32 + * + * @return a status + */ + static Status validate(const ITensorInfo *input, const ITensorInfo *output, const ITensorInfo *axis); + + // Inherited methods overridden: + void run(const Window &window, cl::CommandQueue &queue) override; + +public: + const ICLTensor *_input; + ICLTensor *_output; + const ICLTensor *_axis; +}; +} // namespace arm_compute +#endif /*__ARM_COMPUTE_CLREVERSEKERNEL_H__ */ -- cgit v1.2.1