commit 4c5469b192665c94118a8a558787cb9cec2d0765
author Georgios Pinitas <georgios.pinitas@arm.com> Tue May 21 13:32:43 2019 +0100
committer Georgios Pinitas <georgios.pinitas@arm.com> Mon Jun 03 14:51:29 2019 +0000
tree 168aa969de8243bdbb1f25247dd9f54d037ae32c
parent 43a129e94df41f9ac8bc78b702da5a387ada0494

COMPMID-2225: Add interface support for new quantized data types.

Add support for:
-QSYMM8, 8-bit quantized symmetric
-QSYMM8_PER_CHANNEL, 8-bit quantized symmetric with per channel quantization

Change-Id: I00c4ff98e44af37419470af61419ee95d0de2463
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1236
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>

tests/validation/Helpers.cpp

diff --git a/tests/validation/Helpers.cpp b/tests/validation/Helpers.cpp
index 71a674b..31d6bfa 100644
--- a/tests/validation/Helpers.cpp
+++ b/tests/validation/Helpers.cpp
@@ -110,22 +110,24 @@
 
 SimpleTensor<float> convert_from_asymmetric(const SimpleTensor<uint8_t> &src)
 {
-    const QuantizationInfo &quantization_info = src.quantization_info();
-    SimpleTensor<float>     dst{ src.shape(), DataType::F32, 1, QuantizationInfo(), src.data_layout() };
+    const UniformQuantizationInfo &quantization_info = src.quantization_info().uniform();
+    SimpleTensor<float>            dst{ src.shape(), DataType::F32, 1, QuantizationInfo(), src.data_layout() };
 
     for(int i = 0; i < src.num_elements(); ++i)
     {
-        dst[i] = quantization_info.dequantize(src[i]);
+        dst[i] = dequantize_qasymm8(src[i], quantization_info);
     }
     return dst;
 }
 
 SimpleTensor<uint8_t> convert_to_asymmetric(const SimpleTensor<float> &src, const QuantizationInfo &quantization_info)
 {
-    SimpleTensor<uint8_t> dst{ src.shape(), DataType::QASYMM8, 1, quantization_info };
+    SimpleTensor<uint8_t>          dst{ src.shape(), DataType::QASYMM8, 1, quantization_info };
+    const UniformQuantizationInfo &qinfo = quantization_info.uniform();
+
     for(int i = 0; i < src.num_elements(); ++i)
     {
-        dst[i] = quantization_info.quantize(src[i], RoundingPolicy::TO_NEAREST_UP);
+        dst[i] = quantize_qasymm8(src[i], qinfo);
     }
     return dst;
 }
@@ -267,8 +269,8 @@
 {
     ARM_COMPUTE_ERROR_ON_MSG(min > max, "min must be lower equal than max");
 
-    const int min_bound = quant_info.quantize(min, RoundingPolicy::TO_NEAREST_UP);
-    const int max_bound = quant_info.quantize(max, RoundingPolicy::TO_NEAREST_UP);
+    const int min_bound = quantize_qasymm8(min, quant_info.uniform());
+    const int max_bound = quantize_qasymm8(max, quant_info.uniform());
     return std::pair<int, int> { min_bound, max_bound };
 }