From 4aff98fcfd3c736115f3983dc448c3280e570841 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Wed, 28 Aug 2019 16:27:26 +0100 Subject: COMPMID-2247: Extend support of CLBoundingBoxTransform for QUANT16_ASYMM Change-Id: I8af7a382c0bccf55cf7f4a64f46ce9e6cd965afe Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/1833 Comments-Addressed: Arm Jenkins Reviewed-by: Pablo Marquez Tested-by: Arm Jenkins --- tests/validation/reference/ActivationLayer.cpp | 2 +- .../validation/reference/ArithmeticOperations.cpp | 2 +- .../validation/reference/BoundingBoxTransform.cpp | 40 ++++++++++++++-------- tests/validation/reference/BoundingBoxTransform.h | 6 ++-- .../validation/reference/ElementwiseOperations.cpp | 2 +- .../reference/NormalizePlanarYUVLayer.cpp | 4 +-- .../reference/PixelWiseMultiplication.cpp | 2 +- tests/validation/reference/PoolingLayer.cpp | 2 +- tests/validation/reference/ROIAlignLayer.cpp | 2 +- tests/validation/reference/Range.cpp | 4 +-- tests/validation/reference/ReductionOperation.cpp | 2 +- tests/validation/reference/Scale.cpp | 2 +- tests/validation/reference/SoftmaxLayer.cpp | 4 +-- tests/validation/reference/UpsampleLayer.cpp | 2 +- tests/validation/reference/YOLOLayer.cpp | 4 +-- 15 files changed, 45 insertions(+), 35 deletions(-) (limited to 'tests/validation/reference') diff --git a/tests/validation/reference/ActivationLayer.cpp b/tests/validation/reference/ActivationLayer.cpp index f573d12df8..6cdba09c75 100644 --- a/tests/validation/reference/ActivationLayer.cpp +++ b/tests/validation/reference/ActivationLayer.cpp @@ -61,7 +61,7 @@ SimpleTensor activation_layer(const SimpleTensor &src SimpleTensor src_tmp = convert_from_asymmetric(src); SimpleTensor dst_tmp = activation_layer(src_tmp, info); - SimpleTensor dst = convert_to_asymmetric(dst_tmp, dst_qinfo); + SimpleTensor dst = convert_to_asymmetric(dst_tmp, dst_qinfo); return dst; } diff --git a/tests/validation/reference/ArithmeticOperations.cpp b/tests/validation/reference/ArithmeticOperations.cpp index abd4f31d72..0ec328ee6a 100644 --- a/tests/validation/reference/ArithmeticOperations.cpp +++ b/tests/validation/reference/ArithmeticOperations.cpp @@ -112,7 +112,7 @@ SimpleTensor arithmetic_operation(ArithmeticOperation op, const SimpleT BroadcastUnroll::unroll(op, src1_tmp, src2_tmp, dst_tmp, convert_policy, id_src1, id_src2, id_dst); - dst = convert_to_asymmetric(dst_tmp, dst.quantization_info()); + dst = convert_to_asymmetric(dst_tmp, dst.quantization_info()); return dst; } else diff --git a/tests/validation/reference/BoundingBoxTransform.cpp b/tests/validation/reference/BoundingBoxTransform.cpp index 55dd165b51..e09bcff1c6 100644 --- a/tests/validation/reference/BoundingBoxTransform.cpp +++ b/tests/validation/reference/BoundingBoxTransform.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -36,16 +36,16 @@ namespace validation { namespace reference { -template -SimpleTensor bounding_box_transform(const SimpleTensor &boxes, const SimpleTensor &deltas, const BoundingBoxTransformInfo &info) +template +SimpleTensor bounding_box_transform(const SimpleTensor &boxes, const SimpleTensor &deltas, const BoundingBoxTransformInfo &info) { - const DataType boxes_data_type = deltas.data_type(); + const DataType boxes_data_type = boxes.data_type(); SimpleTensor pred_boxes(deltas.shape(), boxes_data_type); - const size_t num_classes = deltas.shape()[0] / 4; - const size_t num_boxes = deltas.shape()[1]; - const T *deltas_ptr = deltas.data(); - T *pred_boxes_ptr = pred_boxes.data(); + const size_t num_classes = deltas.shape()[0] / 4; + const size_t num_boxes = deltas.shape()[1]; + const TDeltas *deltas_ptr = deltas.data(); + T *pred_boxes_ptr = pred_boxes.data(); const int img_h = floor(info.img_height() / info.scale() + 0.5f); const int img_w = floor(info.img_width() / info.scale() + 0.5f); @@ -70,15 +70,15 @@ SimpleTensor bounding_box_transform(const SimpleTensor &boxes, const Simpl for(size_t j = 0; j < num_classes; ++j) { // Extract deltas - const size_t start_delta = i * num_classes * class_fields + class_fields * j; - const T dx = deltas_ptr[start_delta] / T(info.weights()[0]); - const T dy = deltas_ptr[start_delta + 1] / T(info.weights()[1]); - T dw = deltas_ptr[start_delta + 2] / T(info.weights()[2]); - T dh = deltas_ptr[start_delta + 3] / T(info.weights()[3]); + const size_t start_delta = i * num_classes * class_fields + class_fields * j; + const TDeltas dx = deltas_ptr[start_delta] / TDeltas(info.weights()[0]); + const TDeltas dy = deltas_ptr[start_delta + 1] / TDeltas(info.weights()[1]); + TDeltas dw = deltas_ptr[start_delta + 2] / TDeltas(info.weights()[2]); + TDeltas dh = deltas_ptr[start_delta + 3] / TDeltas(info.weights()[3]); // Clip dw and dh - dw = std::min(dw, T(info.bbox_xform_clip())); - dh = std::min(dh, T(info.bbox_xform_clip())); + dw = std::min(dw, TDeltas(info.bbox_xform_clip())); + dh = std::min(dh, TDeltas(info.bbox_xform_clip())); // Determine the predictions const T pred_ctr_x = dx * width + ctr_x; @@ -98,6 +98,16 @@ SimpleTensor bounding_box_transform(const SimpleTensor &boxes, const Simpl template SimpleTensor bounding_box_transform(const SimpleTensor &boxes, const SimpleTensor &deltas, const BoundingBoxTransformInfo &info); template SimpleTensor bounding_box_transform(const SimpleTensor &boxes, const SimpleTensor &deltas, const BoundingBoxTransformInfo &info); + +template <> +SimpleTensor bounding_box_transform(const SimpleTensor &boxes, const SimpleTensor &deltas, const BoundingBoxTransformInfo &info) +{ + SimpleTensor boxes_tmp = convert_from_asymmetric(boxes); + SimpleTensor deltas_tmp = convert_from_asymmetric(deltas); + SimpleTensor pred_boxes_tmp = bounding_box_transform(boxes_tmp, deltas_tmp, info); + SimpleTensor pred_boxes = convert_to_asymmetric(pred_boxes_tmp, boxes.quantization_info()); + return pred_boxes; +} } // namespace reference } // namespace validation } // namespace test diff --git a/tests/validation/reference/BoundingBoxTransform.h b/tests/validation/reference/BoundingBoxTransform.h index 33ef9d984f..dbe2a147e9 100644 --- a/tests/validation/reference/BoundingBoxTransform.h +++ b/tests/validation/reference/BoundingBoxTransform.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -38,8 +38,8 @@ namespace validation { namespace reference { -template -SimpleTensor bounding_box_transform(const SimpleTensor &boxes, const SimpleTensor &deltas, const BoundingBoxTransformInfo &info); +template +SimpleTensor bounding_box_transform(const SimpleTensor &boxes, const SimpleTensor &deltas, const BoundingBoxTransformInfo &info); } // namespace reference } // namespace validation } // namespace test diff --git a/tests/validation/reference/ElementwiseOperations.cpp b/tests/validation/reference/ElementwiseOperations.cpp index d5a37a0fae..7b39e18bd9 100644 --- a/tests/validation/reference/ElementwiseOperations.cpp +++ b/tests/validation/reference/ElementwiseOperations.cpp @@ -168,7 +168,7 @@ SimpleTensor arithmetic_operation(ArithmeticOperation op, const SimpleT BroadcastUnroll::unroll(op, src1_tmp, src2_tmp, dst_tmp, convert_policy, id_src1, id_src2, id_dst); - dst = convert_to_asymmetric(dst_tmp, dst.quantization_info()); + dst = convert_to_asymmetric(dst_tmp, dst.quantization_info()); return dst; } else diff --git a/tests/validation/reference/NormalizePlanarYUVLayer.cpp b/tests/validation/reference/NormalizePlanarYUVLayer.cpp index 563e2a7444..ea0e75a3c7 100644 --- a/tests/validation/reference/NormalizePlanarYUVLayer.cpp +++ b/tests/validation/reference/NormalizePlanarYUVLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -68,7 +68,7 @@ SimpleTensor normalize_planar_yuv_layer(const SimpleTensor mean_tmp = convert_from_asymmetric(mean); SimpleTensor std_tmp = convert_from_asymmetric(std); SimpleTensor dst_tmp = normalize_planar_yuv_layer(src_tmp, mean_tmp, std_tmp); - SimpleTensor dst = convert_to_asymmetric(dst_tmp, src.quantization_info()); + SimpleTensor dst = convert_to_asymmetric(dst_tmp, src.quantization_info()); return dst; } diff --git a/tests/validation/reference/PixelWiseMultiplication.cpp b/tests/validation/reference/PixelWiseMultiplication.cpp index 41a919249e..d9895e5ed9 100644 --- a/tests/validation/reference/PixelWiseMultiplication.cpp +++ b/tests/validation/reference/PixelWiseMultiplication.cpp @@ -160,7 +160,7 @@ SimpleTensor pixel_wise_multiplication(const SimpleTensor &src SimpleTensor src1_tmp = convert_from_asymmetric(src1); SimpleTensor src2_tmp = convert_from_asymmetric(src2); SimpleTensor dst_tmp = pixel_wise_multiplication(src1_tmp, src2_tmp, scale, convert_policy, rounding_policy, qout); - dst = convert_to_asymmetric(dst_tmp, qout); + dst = convert_to_asymmetric(dst_tmp, qout); } else { diff --git a/tests/validation/reference/PoolingLayer.cpp b/tests/validation/reference/PoolingLayer.cpp index f4112a486d..34b19ffb4f 100644 --- a/tests/validation/reference/PoolingLayer.cpp +++ b/tests/validation/reference/PoolingLayer.cpp @@ -157,7 +157,7 @@ SimpleTensor pooling_layer(const SimpleTensor &src, c { SimpleTensor src_tmp = convert_from_asymmetric(src); SimpleTensor dst_tmp = pooling_layer(src_tmp, info, output_qinfo); - SimpleTensor dst = convert_to_asymmetric(dst_tmp, output_qinfo); + SimpleTensor dst = convert_to_asymmetric(dst_tmp, output_qinfo); return dst; } diff --git a/tests/validation/reference/ROIAlignLayer.cpp b/tests/validation/reference/ROIAlignLayer.cpp index 8ad78ff915..415b483bc0 100644 --- a/tests/validation/reference/ROIAlignLayer.cpp +++ b/tests/validation/reference/ROIAlignLayer.cpp @@ -209,7 +209,7 @@ SimpleTensor roi_align_layer(const SimpleTensor &src, const Si 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); + SimpleTensor dst = convert_to_asymmetric(dst_tmp, output_qinfo); return dst; } } // namespace reference diff --git a/tests/validation/reference/Range.cpp b/tests/validation/reference/Range.cpp index c24512fa9d..ad1345425a 100644 --- a/tests/validation/reference/Range.cpp +++ b/tests/validation/reference/Range.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -60,7 +60,7 @@ SimpleTensor range(SimpleTensor &dst, float start, const size_ { SimpleTensor dst_tmp{ dst.shape(), DataType::F32, 1 }; generate_range(dst_tmp, start, num_of_elements, step); - return convert_to_asymmetric(dst_tmp, dst.quantization_info()); + return convert_to_asymmetric(dst_tmp, dst.quantization_info()); } generate_range(dst, start, num_of_elements, step); return dst; diff --git a/tests/validation/reference/ReductionOperation.cpp b/tests/validation/reference/ReductionOperation.cpp index fe128cc6ac..965365db9d 100644 --- a/tests/validation/reference/ReductionOperation.cpp +++ b/tests/validation/reference/ReductionOperation.cpp @@ -281,7 +281,7 @@ SimpleTensor reduction_operation(const SimpleTensor &src, cons { SimpleTensor src_f = convert_from_asymmetric(src); SimpleTensor dst_f = reference::reduction_operation(src_f, dst_shape, axis, op); - return convert_to_asymmetric(dst_f, src.quantization_info()); + return convert_to_asymmetric(dst_f, src.quantization_info()); } else { diff --git a/tests/validation/reference/Scale.cpp b/tests/validation/reference/Scale.cpp index 63a2853c66..4405e79263 100644 --- a/tests/validation/reference/Scale.cpp +++ b/tests/validation/reference/Scale.cpp @@ -196,7 +196,7 @@ SimpleTensor scale(const SimpleTensor &src, float scale_x, flo SimpleTensor src_tmp = convert_from_asymmetric(src); float constant_border_value_f = dequantize_qasymm8(constant_border_value, src.quantization_info()); SimpleTensor dst_tmp = scale_core(src_tmp, scale_x, scale_y, policy, border_mode, constant_border_value_f, sampling_policy, ceil_policy_scale); - dst = convert_to_asymmetric(dst_tmp, src.quantization_info()); + dst = convert_to_asymmetric(dst_tmp, src.quantization_info()); } else { diff --git a/tests/validation/reference/SoftmaxLayer.cpp b/tests/validation/reference/SoftmaxLayer.cpp index f1b94c0a02..fabc62bedb 100644 --- a/tests/validation/reference/SoftmaxLayer.cpp +++ b/tests/validation/reference/SoftmaxLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -90,7 +90,7 @@ SimpleTensor softmax_layer(const SimpleTensor &src, float beta, size_t axi SimpleTensor src_tmp = convert_from_asymmetric(src); SimpleTensor dst_tmp = softmax_layer(src_tmp, beta, axis); - SimpleTensor dst = convert_to_asymmetric(dst_tmp, output_quantization_info); + SimpleTensor dst = convert_to_asymmetric(dst_tmp, output_quantization_info); return dst; } diff --git a/tests/validation/reference/UpsampleLayer.cpp b/tests/validation/reference/UpsampleLayer.cpp index 8e36ee857e..79d726796a 100644 --- a/tests/validation/reference/UpsampleLayer.cpp +++ b/tests/validation/reference/UpsampleLayer.cpp @@ -93,7 +93,7 @@ SimpleTensor upsample_layer(const SimpleTensor &src, const Siz { SimpleTensor src_tmp = convert_from_asymmetric(src); SimpleTensor dst_tmp = upsample_function(src_tmp, info, policy); - dst = convert_to_asymmetric(dst_tmp, src.quantization_info()); + dst = convert_to_asymmetric(dst_tmp, src.quantization_info()); } else { diff --git a/tests/validation/reference/YOLOLayer.cpp b/tests/validation/reference/YOLOLayer.cpp index a12f411680..cf5e256cf9 100644 --- a/tests/validation/reference/YOLOLayer.cpp +++ b/tests/validation/reference/YOLOLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -68,7 +68,7 @@ SimpleTensor yolo_layer(const SimpleTensor &src, cons { SimpleTensor src_tmp = convert_from_asymmetric(src); SimpleTensor dst_tmp = yolo_layer(src_tmp, info, num_classes); - SimpleTensor dst = convert_to_asymmetric(dst_tmp, src.quantization_info()); + SimpleTensor dst = convert_to_asymmetric(dst_tmp, src.quantization_info()); return dst; } -- cgit v1.2.1