From 5576315671cb357bcfc2d794e7f172ab4c633606 Mon Sep 17 00:00:00 2001 From: Pablo Marquez Date: Fri, 15 Feb 2019 09:51:03 +0000 Subject: Revert "COMPMID-1766: Implemented CPP Non Max Suppression" This reverts commit a0a0e29f635de08092c2325f8f049ffb286aabaf. Change-Id: I2a2a37ba7531f93a1562748054a3c29573c9753f Reviewed-on: https://review.mlplatform.org/705 Tested-by: Arm Jenkins Reviewed-by: VidhyaSudhan Loganathan --- .../CPP/functions/CPPDetectionOutputLayer.h | 52 +--------------------- 1 file changed, 1 insertion(+), 51 deletions(-) (limited to 'arm_compute') diff --git a/arm_compute/runtime/CPP/functions/CPPDetectionOutputLayer.h b/arm_compute/runtime/CPP/functions/CPPDetectionOutputLayer.h index 8c610f3ec2..7f80948c81 100644 --- a/arm_compute/runtime/CPP/functions/CPPDetectionOutputLayer.h +++ b/arm_compute/runtime/CPP/functions/CPPDetectionOutputLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -39,56 +39,6 @@ using NormalizedBBox = std::array; // LabelBBox used for map label and bounding box using LabelBBox = std::map>; -/** CPP Function to perform non maximum suppression on the bounding boxes and scores - * - */ -class CPPNonMaximumSuppression : public IFunction -{ -public: - /** Default constructor */ - CPPNonMaximumSuppression(); - /** Configure the function to perform non maximal suppression - * - * @param[in] bboxes The input bounding boxes. Data types supported: F32. - * @param[in] scores The corresponding input confidence. Same as @p scores. - * @param[out] indices The kept indices of bboxes after nms. Data types supported: S32. - * @param[in] max_output_size An integer tensor representing the maximum number of boxes to be selected by non max suppression. - * @param[in] score_threshold The threshold used to filter detection results. - * @param[in] nms_threshold The threshold used in non maximum suppression. - * - */ - void configure(const ITensor *bboxes, const ITensor *scores, ITensor *indices, unsigned int max_output_size, const float score_threshold, const float nms_threshold); - - /** Static function to check if given arguments will lead to a valid configuration of @ref CPPNonMaximumSuppression - * - * @param[in] bboxes The input bounding boxes. Data types supported: F32. - * @param[in] scores The corresponding input confidence. Same as @p scores. - * @param[out] indices The kept indices of bboxes after nms. Data types supported: S32. - * @param[in] max_output_size An integer tensor representing the maximum number of boxes to be selected by non max suppression. - * @param[in] score_threshold The threshold used to filter detection results. - * @param[in] nms_threshold The threshold used in non maximum suppression. - * - */ - static Status validate(const ITensorInfo *bboxes, const ITensorInfo *scores, const ITensorInfo *indices, unsigned int max_output_size, - const float score_threshold, const float nms_threshold); - - // Inherited methods overridden: - void run() override; - /** Prevent instances of this class from being copied (As this class contains pointers) */ - CPPNonMaximumSuppression(const CPPNonMaximumSuppression &) = delete; - /** Prevent instances of this class from being copied (As this class contains pointers) */ - CPPNonMaximumSuppression &operator=(const CPPNonMaximumSuppression &) = delete; - -private: - const ITensor *_bboxes; - const ITensor *_scores; - ITensor *_indices; - unsigned int _max_output_size; - - float _score_threshold; - float _nms_threshold; -}; - /** CPP Function to generate the detection output based on location and confidence * predictions by doing non maximum suppression. * -- cgit v1.2.1