diff options
author | Luca Foschiani <luca.foschiani@arm.com> | 2020-02-17 17:02:49 +0000 |
---|---|---|
committer | Luca Foschiani <luca.foschiani@arm.com> | 2020-04-07 09:04:19 +0000 |
commit | fedefc3a8d76b9dea5945414324427ef5a01835d (patch) | |
tree | b2a2f6ab45d8a16ab26b5a99c832a18e207899aa /arm_compute/core/CPP | |
parent | 0d008f77b0085619c446d0ab5dc1228a80776706 (diff) | |
download | ComputeLibrary-fedefc3a8d76b9dea5945414324427ef5a01835d.tar.gz |
COMPMID-2765 Add support for QASYMM8_SIGNED in NEDeconvolutionLayer
Signed-off-by: Luca Foschiani <luca.foschiani@arm.com>
Change-Id: I8295fadee15311a9ab846aa24c031b82c0b799eb
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Signed-off-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2952
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Sheri Zhang <sheri.zhang@arm.com>
Diffstat (limited to 'arm_compute/core/CPP')
-rw-r--r-- | arm_compute/core/CPP/CPPKernels.h | 3 | ||||
-rw-r--r-- | arm_compute/core/CPP/kernels/CPPFlipWeightsKernel.h | 83 |
2 files changed, 1 insertions, 85 deletions
diff --git a/arm_compute/core/CPP/CPPKernels.h b/arm_compute/core/CPP/CPPKernels.h index d12cb2857a..c7b40baf22 100644 --- a/arm_compute/core/CPP/CPPKernels.h +++ b/arm_compute/core/CPP/CPPKernels.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -28,7 +28,6 @@ #include "arm_compute/core/CPP/kernels/CPPBoxWithNonMaximaSuppressionLimitKernel.h" #include "arm_compute/core/CPP/kernels/CPPCornerCandidatesKernel.h" #include "arm_compute/core/CPP/kernels/CPPDetectionWindowNonMaximaSuppressionKernel.h" -#include "arm_compute/core/CPP/kernels/CPPFlipWeightsKernel.h" #include "arm_compute/core/CPP/kernels/CPPNonMaximumSuppressionKernel.h" #include "arm_compute/core/CPP/kernels/CPPPermuteKernel.h" #include "arm_compute/core/CPP/kernels/CPPSortEuclideanDistanceKernel.h" diff --git a/arm_compute/core/CPP/kernels/CPPFlipWeightsKernel.h b/arm_compute/core/CPP/kernels/CPPFlipWeightsKernel.h deleted file mode 100644 index 285aa585be..0000000000 --- a/arm_compute/core/CPP/kernels/CPPFlipWeightsKernel.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2018-2019 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_CPP_FLIP_WEIGHTS_KERNEL_H -#define ARM_COMPUTE_CPP_FLIP_WEIGHTS_KERNEL_H - -#include "arm_compute/core/CPP/ICPPKernel.h" - -namespace arm_compute -{ -class ITensor; - -/** CPP kernel to perform 180 degrees flipping on deconvolution weights. */ -class CPPFlipWeightsKernel : public ICPPKernel -{ -public: - const char *name() const override - { - return "CPPFlipWeightsKernel"; - } - /** Default constructor */ - CPPFlipWeightsKernel(); - /** Prevent instances of this class from being copied (As this class contains pointers) */ - CPPFlipWeightsKernel(const CPPFlipWeightsKernel &) = delete; - /** Prevent instances of this class from being copied (As this class contains pointers) */ - CPPFlipWeightsKernel &operator=(const CPPFlipWeightsKernel &) = delete; - /** Allow instances of this class to be moved */ - CPPFlipWeightsKernel(CPPFlipWeightsKernel &&) = default; - /** Allow instances of this class to be moved */ - CPPFlipWeightsKernel &operator=(CPPFlipWeightsKernel &&) = default; - /** Default destructor */ - ~CPPFlipWeightsKernel() = default; - - /** Set the input and output of the kernel. - * - * @param[in] input The input tensor to flip. Data types supported: QASYMM8/F16/F32. Data layouts supported: NCHW/NHWC. - * @param[out] output The output tensor. Data types supported: Same as @p input - */ - void configure(const ITensor *input, ITensor *output); - - // Inherited methods overridden: - void run(const Window &window, const ThreadInfo &info) override; - - /** Function to perform flipping. - * - * @param[in] window_input Input region on which to execute the kernel. - */ - template <typename T> - void flip_weights(const Window &window_input); - - /** Common signature for all the specialised Flip functions - * - * @param[in] window_input Input region on which to execute the kernel. - */ - using FlipWeightsFunction = void (CPPFlipWeightsKernel::*)(const Window &window_input); - -private: - const ITensor *_input; - ITensor *_output; - FlipWeightsFunction _func; -}; -} // namespace arm_compute -#endif /*ARM_COMPUTE_CPP_FLIP_WEIGHTS_KERNEL_H */ |