diff options
author | Michele Di Giorgio <michele.digiorgio@arm.com> | 2019-08-23 11:49:04 +0100 |
---|---|---|
committer | Michele Di Giorgio <michele.digiorgio@arm.com> | 2019-08-29 09:17:46 +0000 |
commit | 578a9fc6c06ebbd6e2650372029e339a4cbcacca (patch) | |
tree | 7aa428d18323cce34dabe088063d2cf533c36fac /tests/validation/reference | |
parent | c7ec194d5ae5ee5c9af3e6aa3de43e30382d8f87 (diff) | |
download | ComputeLibrary-578a9fc6c06ebbd6e2650372029e339a4cbcacca.tar.gz |
COMPMID-2317: Implement CLROIAlignLayer
Change-Id: Iaa61b7a3528d3f82339d2ff8a2d77e77a1c68603
Signed-off-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1821
Reviewed-by: Pablo Marquez <pablo.tello@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests/validation/reference')
-rw-r--r-- | tests/validation/reference/ROIAlignLayer.cpp | 39 | ||||
-rw-r--r-- | tests/validation/reference/ROIAlignLayer.h | 6 |
2 files changed, 36 insertions, 9 deletions
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<float> convert_rois_from_asymmetric(SimpleTensor<uint16_t> rois) +{ + const UniformQuantizationInfo &quantization_info = rois.quantization_info().uniform(); + SimpleTensor<float> dst{ rois.shape(), DataType::F32, 1, QuantizationInfo(), rois.data_layout() }; + + for(int i = 0; i < rois.num_elements(); i += 5) + { + dst[i] = static_cast<float>(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 <typename T> -SimpleTensor<T> roi_align_layer(const SimpleTensor<T> &src, const SimpleTensor<T> &rois, const ROIPoolingLayerInfo &pool_info) +template <typename T, typename TRois> +SimpleTensor<T> roi_align_layer(const SimpleTensor<T> &src, const SimpleTensor<TRois> &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<const T *>(rois.data()); + const auto *rois_ptr = static_cast<const TRois *>(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<T> roi_align_layer(const SimpleTensor<T> &src, const SimpleTensor<T } return dst; } -template SimpleTensor<float> roi_align_layer(const SimpleTensor<float> &src, const SimpleTensor<float> &rois, const ROIPoolingLayerInfo &pool_info); -template SimpleTensor<half> roi_align_layer(const SimpleTensor<half> &src, const SimpleTensor<half> &rois, const ROIPoolingLayerInfo &pool_info); + +template SimpleTensor<float> roi_align_layer(const SimpleTensor<float> &src, const SimpleTensor<float> &rois, const ROIPoolingLayerInfo &pool_info, const QuantizationInfo &output_qinfo); +template SimpleTensor<half> roi_align_layer(const SimpleTensor<half> &src, const SimpleTensor<half> &rois, const ROIPoolingLayerInfo &pool_info, const QuantizationInfo &output_qinfo); + +template <> +SimpleTensor<uint8_t> roi_align_layer(const SimpleTensor<uint8_t> &src, const SimpleTensor<uint16_t> &rois, const ROIPoolingLayerInfo &pool_info, const QuantizationInfo &output_qinfo) +{ + SimpleTensor<float> src_tmp = convert_from_asymmetric(src); + SimpleTensor<float> rois_tmp = convert_rois_from_asymmetric(rois); + SimpleTensor<float> dst_tmp = roi_align_layer<float, float>(src_tmp, rois_tmp, pool_info, output_qinfo); + SimpleTensor<uint8_t> dst = convert_to_asymmetric(dst_tmp, output_qinfo); + return dst; +} } // namespace reference } // namespace validation } // namespace test diff --git a/tests/validation/reference/ROIAlignLayer.h b/tests/validation/reference/ROIAlignLayer.h index b67ff42166..e1568133e7 100644 --- a/tests/validation/reference/ROIAlignLayer.h +++ b/tests/validation/reference/ROIAlignLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -36,8 +36,8 @@ namespace validation { namespace reference { -template <typename T> -SimpleTensor<T> roi_align_layer(const SimpleTensor<T> &src, const SimpleTensor<T> &rois, const ROIPoolingLayerInfo &pool_info); +template <typename T, typename TRois> +SimpleTensor<T> roi_align_layer(const SimpleTensor<T> &src, const SimpleTensor<TRois> &rois, const ROIPoolingLayerInfo &pool_info, const QuantizationInfo &output_qinfo); } // namespace reference } // namespace validation } // namespace test |