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 --- .../core/CPP/kernels/CPPBoxWithNonMaximaSuppressionLimitKernel.h | 6 ++---- arm_compute/core/CPP/kernels/CPPPermuteKernel.h | 8 ++++---- arm_compute/core/CPP/kernels/CPPTopKVKernel.h | 4 ++-- arm_compute/core/CPP/kernels/CPPUpsampleKernel.h | 4 ++-- 4 files changed, 10 insertions(+), 12 deletions(-) (limited to 'arm_compute/core/CPP') diff --git a/arm_compute/core/CPP/kernels/CPPBoxWithNonMaximaSuppressionLimitKernel.h b/arm_compute/core/CPP/kernels/CPPBoxWithNonMaximaSuppressionLimitKernel.h index 3fa83a6d6d..ac797bdf77 100644 --- a/arm_compute/core/CPP/kernels/CPPBoxWithNonMaximaSuppressionLimitKernel.h +++ b/arm_compute/core/CPP/kernels/CPPBoxWithNonMaximaSuppressionLimitKernel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -24,8 +24,6 @@ #ifndef ARM_COMPUTE_CPPBOXWITHNONMAXIMASUPPRESSIONLIMITKERNEL_H #define ARM_COMPUTE_CPPBOXWITHNONMAXIMASUPPRESSIONLIMITKERNEL_H -#include "arm_compute/core/IArray.h" -#include "arm_compute/core/IHOG.h" #include "arm_compute/core/NEON/INEKernel.h" #include "arm_compute/core/Types.h" @@ -62,7 +60,7 @@ public: * @param[out] classes The classes output tensor of size [N]. Data types supported: Same as @p scores_in * @param[out] batch_splits_out (Optional) The batch splits output tensor [batch_size]. Data types supported: Same as @p scores_in * @param[out] keeps (Optional) The keeps output tensor of size [N]. Data types supported: Same as@p scores_in - * @param[out] keeps_size (Optional) Number of filtered indices per class tensor of size [num_classes]. Data types supported: Same as @p scores_in + * @param[out] keeps_size (Optional) Number of filtered indices per class tensor of size [num_classes]. Data types supported: U32 * @param[in] info (Optional) BoxNMSLimitInfo information. */ void configure(const ITensor *scores_in, const ITensor *boxes_in, const ITensor *batch_splits_in, ITensor *scores_out, ITensor *boxes_out, ITensor *classes, diff --git a/arm_compute/core/CPP/kernels/CPPPermuteKernel.h b/arm_compute/core/CPP/kernels/CPPPermuteKernel.h index e75152f4ea..6a60849bf3 100644 --- a/arm_compute/core/CPP/kernels/CPPPermuteKernel.h +++ b/arm_compute/core/CPP/kernels/CPPPermuteKernel.h @@ -56,15 +56,15 @@ public: /** Set the input and output of the kernel. * - * @param[in] input The input tensor to permute. Data types supported: U8/S8/QASYMM8/QASYMM8_SIGNED/U16/S16/F16/U32/S32/F32 - * @param[out] output The output tensor. Data types supported: Same as @p input + * @param[in] input The input tensor to permute. Data types supported: All. + * @param[out] output The output tensor. Data types supported: same as @p input * @param[in] perm Permutation vector */ void configure(const ITensor *input, ITensor *output, const PermutationVector &perm); /** Static function to check if given info will lead to a valid configuration of @ref CPPPermuteKernel * - * @param[in] input The input tensor to permute. Data types supported: U8/S8/QASYMM8/QASYMM8_SIGNED/U16/S16/F16/U32/S32/F32 - * @param[in] output The output tensor. Data types supported: Same as @p input + * @param[in] input The input tensor to permute. Data types supported: All. + * @param[in] output The output tensor. Data types supported: same as @p input * @param[in] perm Permutation vector * * @return a status diff --git a/arm_compute/core/CPP/kernels/CPPTopKVKernel.h b/arm_compute/core/CPP/kernels/CPPTopKVKernel.h index 4b9bfdd3c9..bba183ce3a 100644 --- a/arm_compute/core/CPP/kernels/CPPTopKVKernel.h +++ b/arm_compute/core/CPP/kernels/CPPTopKVKernel.h @@ -54,7 +54,7 @@ public: /** Set the input and output of the kernel. * * @param[in] predictions A batch_size x classes tensor. Data types supported: F16/S32/F32/QASYMM8/QASYMM8_SIGNED - * @param[in] targets A batch_size 1D tensor of class ids. Data types supported: S32 + * @param[in] targets A batch_size 1D tensor of class ids. Data types supported: U32 * @param[out] output Computed precision at @p k as a bool 1D tensor. Data types supported: U8 * @param[in] k Number of top elements to look at for computing precision. */ @@ -63,7 +63,7 @@ public: /** Static function to check if given info will lead to a valid configuration of @ref CPPTopKVKernel * * @param[in] predictions A batch_size x classes tensor info. Data types supported: F16/S32/F32/QASYMM8/QASYMM8_SIGNED - * @param[in] targets A batch_size 1D tensor info of class ids. Data types supported: S32 + * @param[in] targets A batch_size 1D tensor info of class ids. Data types supported: U32 * @param[in] output Computed precision at @p k as a bool 1D tensor info. Data types supported: U8 * @param[in] k Number of top elements to look at for computing precision. * diff --git a/arm_compute/core/CPP/kernels/CPPUpsampleKernel.h b/arm_compute/core/CPP/kernels/CPPUpsampleKernel.h index 9fbc9b697c..eb23d1a185 100644 --- a/arm_compute/core/CPP/kernels/CPPUpsampleKernel.h +++ b/arm_compute/core/CPP/kernels/CPPUpsampleKernel.h @@ -55,8 +55,8 @@ public: /** Set the input and output of the kernel. * - * @param[in] input The input tensor to upsample. Data types supported: F32/F16/QASYMM8/QASYMM8_SIGNED - * @param[out] output The output tensor. Data types supported: Same as @p input + * @param[in] input The input tensor to upsample. Data types supported: All. + * @param[out] output The output tensor. Data types supported: same as @p input. * @param[in] info Padding info. */ void configure(const ITensor *input, ITensor *output, const PadStrideInfo &info); -- cgit v1.2.1