From 578a9fc6c06ebbd6e2650372029e339a4cbcacca Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Fri, 23 Aug 2019 11:49:04 +0100 Subject: COMPMID-2317: Implement CLROIAlignLayer Change-Id: Iaa61b7a3528d3f82339d2ff8a2d77e77a1c68603 Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/1821 Reviewed-by: Pablo Marquez Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- tests/validation/reference/ROIAlignLayer.cpp | 39 +++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 6 deletions(-) (limited to 'tests/validation/reference/ROIAlignLayer.cpp') diff --git a/tests/validation/reference/ROIAlignLayer.cpp b/tests/validation/reference/ROIAlignLayer.cpp index 8a76983d44..8ad78ff915 100644 --- a/tests/validation/reference/ROIAlignLayer.cpp +++ b/tests/validation/reference/ROIAlignLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -112,15 +112,31 @@ T clamp(T value, T lower, T upper) { return std::max(lower, std::min(value, upper)); } + +SimpleTensor convert_rois_from_asymmetric(SimpleTensor rois) +{ + const UniformQuantizationInfo &quantization_info = rois.quantization_info().uniform(); + SimpleTensor dst{ rois.shape(), DataType::F32, 1, QuantizationInfo(), rois.data_layout() }; + + for(int i = 0; i < rois.num_elements(); i += 5) + { + dst[i] = static_cast(rois[i]); // batch idx + dst[i + 1] = dequantize_qasymm16(rois[i + 1], quantization_info); + dst[i + 2] = dequantize_qasymm16(rois[i + 2], quantization_info); + dst[i + 3] = dequantize_qasymm16(rois[i + 3], quantization_info); + dst[i + 4] = dequantize_qasymm16(rois[i + 4], quantization_info); + } + return dst; +} } // namespace -template -SimpleTensor roi_align_layer(const SimpleTensor &src, const SimpleTensor &rois, const ROIPoolingLayerInfo &pool_info) +template +SimpleTensor roi_align_layer(const SimpleTensor &src, const SimpleTensor &rois, const ROIPoolingLayerInfo &pool_info, const QuantizationInfo &output_qinfo) { const size_t values_per_roi = rois.shape()[0]; const size_t num_rois = rois.shape()[1]; DataType dst_data_type = src.data_type(); - const auto *rois_ptr = static_cast(rois.data()); + const auto *rois_ptr = static_cast(rois.data()); TensorShape input_shape = src.shape(); TensorShape output_shape(pool_info.pooled_width(), pool_info.pooled_height(), src.shape()[2], num_rois); @@ -183,8 +199,19 @@ SimpleTensor roi_align_layer(const SimpleTensor &src, const SimpleTensor roi_align_layer(const SimpleTensor &src, const SimpleTensor &rois, const ROIPoolingLayerInfo &pool_info); -template SimpleTensor roi_align_layer(const SimpleTensor &src, const SimpleTensor &rois, const ROIPoolingLayerInfo &pool_info); + +template SimpleTensor roi_align_layer(const SimpleTensor &src, const SimpleTensor &rois, const ROIPoolingLayerInfo &pool_info, const QuantizationInfo &output_qinfo); +template SimpleTensor roi_align_layer(const SimpleTensor &src, const SimpleTensor &rois, const ROIPoolingLayerInfo &pool_info, const QuantizationInfo &output_qinfo); + +template <> +SimpleTensor roi_align_layer(const SimpleTensor &src, const SimpleTensor &rois, const ROIPoolingLayerInfo &pool_info, const QuantizationInfo &output_qinfo) +{ + SimpleTensor src_tmp = convert_from_asymmetric(src); + SimpleTensor rois_tmp = convert_rois_from_asymmetric(rois); + SimpleTensor dst_tmp = roi_align_layer(src_tmp, rois_tmp, pool_info, output_qinfo); + SimpleTensor dst = convert_to_asymmetric(dst_tmp, output_qinfo); + return dst; +} } // namespace reference } // namespace validation } // namespace test -- cgit v1.2.1