From 05e5644715c678773abaf180222a33959ee0dadb Mon Sep 17 00:00:00 2001 From: Isabella Gottardi Date: Fri, 16 Nov 2018 11:26:52 +0000 Subject: COMPMID-1463: SSD support: Create Detection layer Change-Id: I8b59b9b94cbd132e1ff5157a4c59882719e12e3b Reviewed-on: https://review.mlplatform.org/327 Reviewed-by: Anthony Barbier Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas --- arm_compute/runtime/CPP/CPPFunctions.h | 1 + .../CPP/functions/CPPDetectionOutputLayer.h | 100 +++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 arm_compute/runtime/CPP/functions/CPPDetectionOutputLayer.h (limited to 'arm_compute/runtime/CPP') diff --git a/arm_compute/runtime/CPP/CPPFunctions.h b/arm_compute/runtime/CPP/CPPFunctions.h index 9c17d9e404..63df437d11 100644 --- a/arm_compute/runtime/CPP/CPPFunctions.h +++ b/arm_compute/runtime/CPP/CPPFunctions.h @@ -26,6 +26,7 @@ /* Header regrouping all the CPP functions */ #include "arm_compute/runtime/CPP/functions/CPPBoxWithNonMaximaSuppressionLimit.h" +#include "arm_compute/runtime/CPP/functions/CPPDetectionOutputLayer.h" #include "arm_compute/runtime/CPP/functions/CPPPermute.h" #include "arm_compute/runtime/CPP/functions/CPPUpsample.h" diff --git a/arm_compute/runtime/CPP/functions/CPPDetectionOutputLayer.h b/arm_compute/runtime/CPP/functions/CPPDetectionOutputLayer.h new file mode 100644 index 0000000000..7f80948c81 --- /dev/null +++ b/arm_compute/runtime/CPP/functions/CPPDetectionOutputLayer.h @@ -0,0 +1,100 @@ +/* + * 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_CPP_DETECTION_OUTPUT_LAYER_H__ +#define __ARM_COMPUTE_CPP_DETECTION_OUTPUT_LAYER_H__ + +#include "arm_compute/runtime/CPP/ICPPSimpleFunction.h" + +#include "arm_compute/core/Types.h" + +#include + +namespace arm_compute +{ +class ITensor; + +// Normalized Bounding Box [xmin, ymin, xmax, ymax] +using NormalizedBBox = std::array; +// LabelBBox used for map label and bounding box +using LabelBBox = std::map>; + +/** CPP Function to generate the detection output based on location and confidence + * predictions by doing non maximum suppression. + * + * @note Intended for use with MultiBox detection method. + */ +class CPPDetectionOutputLayer : public IFunction +{ +public: + /** Default constructor */ + CPPDetectionOutputLayer(); + /** Configure the detection output layer CPP kernel + * + * @param[in] input_loc The mbox location input tensor of size [C1, N]. Data types supported: F32. + * @param[in] input_conf The mbox confidence input tensor of size [C2, N]. Data types supported: F32. + * @param[in] input_priorbox The mbox prior box input tensor of size [C3, 2, N]. Data types supported: F32. + * @param[out] output The output tensor of size [7, M]. Data types supported: Same as @p input + * @param[in] info (Optional) DetectionOutputLayerInfo information. + * + * @note Output contains all the detections. Of those, only the ones selected by the valid region are valid. + */ + void configure(const ITensor *input_loc, const ITensor *input_conf, const ITensor *input_priorbox, ITensor *output, DetectionOutputLayerInfo info = DetectionOutputLayerInfo()); + /** Static function to check if given info will lead to a valid configuration of @ref CPPDetectionOutputLayer + * + * @param[in] input_loc The mbox location input tensor info. Data types supported: F32. + * @param[in] input_conf The mbox confidence input tensor info. Data types supported: F32. + * @param[in] input_priorbox The mbox prior box input tensor info. Data types supported: F32. + * @param[in] output The output tensor info. Data types supported: Same as @p input + * @param[in] info (Optional) DetectionOutputLayerInfo information. + * + * @return a status + */ + static Status validate(const ITensorInfo *input_loc, const ITensorInfo *input_conf, const ITensorInfo *input_priorbox, const ITensorInfo *output, + DetectionOutputLayerInfo info = DetectionOutputLayerInfo()); + // Inherited methods overridden: + void run() override; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CPPDetectionOutputLayer(const CPPDetectionOutputLayer &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CPPDetectionOutputLayer &operator=(const CPPDetectionOutputLayer &) = delete; + +private: + const ITensor *_input_loc; + const ITensor *_input_conf; + const ITensor *_input_priorbox; + ITensor *_output; + DetectionOutputLayerInfo _info; + + int _num_priors; + int _num; + + std::vector _all_location_predictions; + std::vector>> _all_confidence_scores; + std::vector _all_prior_bboxes; + std::vector> _all_prior_variances; + std::vector _all_decode_bboxes; + std::vector>> _all_indices; +}; +} // namespace arm_compute +#endif /* __ARM_COMPUTE_CPP_DETECTION_OUTPUT_LAYER_H__ */ -- cgit v1.2.1