From ab8408872f49c9429c84d83de665c55e31a500b2 Mon Sep 17 00:00:00 2001 From: Suhail Munshi Date: Tue, 9 Feb 2021 16:31:00 +0000 Subject: Added Qasymm8 datatype support to NEROIPoolingLayer with Tests Tests added to check ROIPooling Layer against reference with both Float32 and Qasymm8 input. Resolves : COMPMID-2319 Change-Id: I867bc4dde1e3e91f9f42f4a7ce8debfe83b8db50 Signed-off-by: Mohammed Suhail Munshi Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/c/VisualCompute/ComputeLibrary/+/296640 Tested-by: bsgcomp Reviewed-by: Pablo Tello Comments-Addressed: Pablo Tello Signed-off-by: Suhail Munshi Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5060 Tested-by: Arm Jenkins Reviewed-by: Pablo Marquez Tello Comments-Addressed: Arm Jenkins --- .../runtime/NEON/functions/NEROIPoolingLayer.h | 23 ++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h') diff --git a/arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h b/arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h index a912669f57..510c89caf2 100644 --- a/arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h +++ b/arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h @@ -24,14 +24,14 @@ #ifndef ARM_COMPUTE_NEROIPOOLINGLAYER_H #define ARM_COMPUTE_NEROIPOOLINGLAYER_H -#include "arm_compute/runtime/IFunction.h" - #include "arm_compute/core/IArray.h" +#include "arm_compute/runtime/IFunction.h" #include namespace arm_compute { class ITensor; +class ITensorInfo; class NEROIPoolingLayerKernel; class ROIPoolingLayerInfo; @@ -58,7 +58,7 @@ public: ~NEROIPoolingLayer(); /** Set the input and output tensors. * - * @param[in] input Source tensor. Data types supported: F32. + * @param[in] input Source tensor. Data types supported: QASYMM8/F32 * @param[in] rois ROIs tensor, it is a 2D tensor of size [5, N] (where N is the number of ROIs) containing top left and bottom right corner * as coordinate of an image and batch_id of ROI [ batch_id, x1, y1, x2, y2 ]. Data types supported: U16 * @param[out] output Destination tensor. Data types supported: Same as @p input. @@ -69,11 +69,26 @@ public: * @note The z dimensions of @p output tensor and @p input tensor must be the same. * @note The fourth dimension of @p output tensor must be the same as the number of elements in @p rois array. */ - void configure(const ITensor *input, const ITensor *rois, ITensor *output, const ROIPoolingLayerInfo &pool_info); + void configure(const ITensor *input, const ITensor *rois, const ITensor *output, const ROIPoolingLayerInfo &pool_info); // Inherited methods overridden: void run() override; + /** Static function to check if given info will lead to a valid configuration of @ref NEROIPoolingLayerKernel + * + * @param[in] input Source tensor info. Data types supported: QASYMM8/F32. + * @param[in] rois TensorInfo for rois tensor which is a 2D tensor of size [5,N] (where 5 is the number ROIs). Data types supported: U16 + * @param[in] output Destination tensor info. Data types supported: Same as @p input. + * @param[in] pool_info Contains pooling operation information described in @ref ROIPoolingLayerInfo. + * + * @note The x and y dimensions of @p output tensor must be the same as that specified by @p pool_info 's pooled + * width and pooled height. + * @note The z dimensions of @p output tensor and @p input tensor must be the same. + * @note The fourth dimension of @p output tensor must be the same as the number of elements in @p rois array. + * @return a Status + */ + static Status validate(const ITensorInfo *input, const ITensorInfo *rois, const ITensorInfo *output, const ROIPoolingLayerInfo &pool_info); + private: std::unique_ptr _roi_kernel; }; -- cgit v1.2.1