From ed7b27dd7cbdae57b880029840ad0235523848e0 Mon Sep 17 00:00:00 2001
From: Michalis Spyrou <micspy01@e123758.cambridge.arm.com>
Date: Wed, 27 Nov 2019 16:04:17 +0000
Subject: COMPMID-2819 Fix validation helpers header

Change-Id: I912149fcabf800bb7b1885d8c901f36ac25c15d5
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2378
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
---
 tests/validation/Helpers.cpp |  3 +++
 tests/validation/Helpers.h   | 21 +++------------------
 2 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'tests')

diff --git a/tests/validation/Helpers.cpp b/tests/validation/Helpers.cpp
index fa2f51ec38..fef4510405 100644
--- a/tests/validation/Helpers.cpp
+++ b/tests/validation/Helpers.cpp
@@ -108,6 +108,7 @@ CannyEdgeParameters canny_edge_parameters()
     return params;
 }
 
+template <>
 SimpleTensor<float> convert_from_asymmetric(const SimpleTensor<uint8_t> &src)
 {
     const UniformQuantizationInfo &quantization_info = src.quantization_info().uniform();
@@ -120,6 +121,7 @@ SimpleTensor<float> convert_from_asymmetric(const SimpleTensor<uint8_t> &src)
     return dst;
 }
 
+template <>
 SimpleTensor<float> convert_from_asymmetric(const SimpleTensor<uint16_t> &src)
 {
     const UniformQuantizationInfo &quantization_info = src.quantization_info().uniform();
@@ -158,6 +160,7 @@ SimpleTensor<int8_t> convert_to_asymmetric(const SimpleTensor<float> &src, const
     return dst;
 }
 
+template <>
 SimpleTensor<float> convert_from_asymmetric(const SimpleTensor<int8_t> &src)
 {
     const UniformQuantizationInfo &quantization_info = src.quantization_info().uniform();
diff --git a/tests/validation/Helpers.h b/tests/validation/Helpers.h
index a0169752de..3227a98b05 100644
--- a/tests/validation/Helpers.h
+++ b/tests/validation/Helpers.h
@@ -177,21 +177,14 @@ void fill_lookuptable(T &&table)
     }
 }
 
-/** Convert 8-bit asymmetric quantized simple tensor into float using tensor quantization information.
+/** Convert a quantized simple tensor into float using tensor quantization information.
  *
  * @param[in] src Quantized tensor.
  *
  * @return Float tensor.
  */
-SimpleTensor<float> convert_from_asymmetric(const SimpleTensor<uint8_t> &src);
-
-/** Convert 16-bit asymmetric quantized simple tensor into float using tensor quantization information.
- *
- * @param[in] src Quantized tensor.
- *
- * @return Float tensor.
- */
-SimpleTensor<float> convert_from_asymmetric(const SimpleTensor<uint16_t> &src);
+template <typename T>
+SimpleTensor<float> convert_from_asymmetric(const SimpleTensor<T> &src);
 
 /** Convert float simple tensor into quantized using specified quantization information.
  *
@@ -203,14 +196,6 @@ SimpleTensor<float> convert_from_asymmetric(const SimpleTensor<uint16_t> &src);
 template <typename T>
 SimpleTensor<T> convert_to_asymmetric(const SimpleTensor<float> &src, const QuantizationInfo &quantization_info);
 
-/** Convert quantized simple tensor into float using tensor quantization information.
- *
- * @param[in] src Quantized tensor.
- *
- * @return Float tensor.
- */
-SimpleTensor<float> convert_from_asymmetric(const SimpleTensor<uint16_t> &src);
-
 /** Convert quantized simple tensor into float using tensor quantization information.
  *
  * @param[in] src Quantized tensor.
-- 
cgit v1.2.1