From f22f67298d1e7bbc349d5179bceb70971b4bc226 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Fri, 3 Jul 2020 16:29:24 +0100 Subject: COMPMID-3532: Align data type support between doxygen and implementation - CPP The patch also removes some unused NEON kernels. Change-Id: I4a7622f31c88ee038b21874614a981764a03122a Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3509 Tested-by: Arm Jenkins Reviewed-by: Sheri Zhang Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins --- .../kernels/NEGEMMMatrixVectorMultiplyKernel.h | 99 ---------------------- 1 file changed, 99 deletions(-) delete mode 100644 arm_compute/core/NEON/kernels/NEGEMMMatrixVectorMultiplyKernel.h (limited to 'arm_compute/core/NEON/kernels/NEGEMMMatrixVectorMultiplyKernel.h') diff --git a/arm_compute/core/NEON/kernels/NEGEMMMatrixVectorMultiplyKernel.h b/arm_compute/core/NEON/kernels/NEGEMMMatrixVectorMultiplyKernel.h deleted file mode 100644 index f5635dd58c..0000000000 --- a/arm_compute/core/NEON/kernels/NEGEMMMatrixVectorMultiplyKernel.h +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2016-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_NEGEMMMATRIXVECTORMULTIPLYKERNEL_H_ -#define ARM_COMPUTE_NEGEMMMATRIXVECTORMULTIPLYKERNEL_H_ - -#include "arm_compute/core/NEON/INESimpleKernel.h" - -namespace arm_compute -{ -class ITensor; - -/** Interface for the GEMM matrix vector multiply kernel. **/ -class NEGEMMMatrixVectorMultiplyKernel : public INESimpleKernel -{ -public: - const char *name() const override - { - return "NEGEMMMatrixVectorMultiplyKernel"; - } - /** Default constructor */ - NEGEMMMatrixVectorMultiplyKernel(); - /** Prevent instances of this class from being copied (As this class contains pointers) */ - NEGEMMMatrixVectorMultiplyKernel(const NEGEMMMatrixVectorMultiplyKernel &) = delete; - /** Prevent instances of this class from being copied (As this class contains pointers) */ - NEGEMMMatrixVectorMultiplyKernel &operator=(const NEGEMMMatrixVectorMultiplyKernel &) = delete; - /** Allow instances of this class to be moved */ - NEGEMMMatrixVectorMultiplyKernel(NEGEMMMatrixVectorMultiplyKernel &&) = default; - /** Allow instances of this class to be moved */ - NEGEMMMatrixVectorMultiplyKernel &operator=(NEGEMMMatrixVectorMultiplyKernel &&) = default; - /** Initialise the kernel's input and output. - * - * @param[in] input0 First Input tensor. Data types supported: QASYMM8/QASYMM8_SIGNED/F16/F32 - * @param[in] input1 Second Input tensor. Data types supported: same as @p input. - * @param[out] output Output tensor which stores the interleaved matrix. Data type supported: same as @p input, S32 for QASYMM8/QASYMM8_SIGNED input. - */ - void configure(const ITensor *input0, const ITensor *input1, ITensor *output); - - /** Static function to check if given info will lead to a valid configuration of @ref NEGEMMMatrixVectorMultiplyKernel - * - * @param[in] input0 First Input tensor. Data types supported: QASYMM8/QASYMM8_SIGNED/F16/F32 - * @param[in] input1 Second Input tensor. Data types supported: same as @p input. - * @param[in] output Output tensor which stores the interleaved matrix. Data type supported: same as @p input, S32 for QASYMM8/QASYMM8_SIGNED input. - * - * @return a status - */ - static Status validate(const ITensorInfo *input0, const ITensorInfo *input1, const ITensorInfo *output); - - // Inherited methods overridden: - void run(const Window &window, const ThreadInfo &info) override; - BorderSize border_size() const override; - -private: - /** Template function to run the matrix vector multiplication - * - * @tparam I0 Input 0 type - * @tparam I1 Input 1 type - * @tparam O Output type - * - * @param[in] window_in Input region. (Must be a valid region of the window returned by window()). - * @param[in] window_w Weights region. (Must be a valid region of the window returned by window()). - * @param[in] window_out Output region.(Must be a valid region of the window returned by window()). - */ - template - void matrix_vector_multiply(const Window &window_in, const Window &window_w, const Window &window_out); - /** Common signature for all the specialised matrix vector multiplication functions */ - using GEMMMatrixVectorMultiplyFunctionPtr = void (NEGEMMMatrixVectorMultiplyKernel::*)(const Window &window_in, - const Window &window_w, - const Window &window_out); - -private: - GEMMMatrixVectorMultiplyFunctionPtr _func; - const ITensor *_input0; - const ITensor *_input1; - ITensor *_output; - BorderSize _border_size; -}; -} // namespace arm_compute -#endif /*ARM_COMPUTE_NEGEMMMATRIXVECTORMULTIPLYKERNEL_H_*/ -- cgit v1.2.1