diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-10-22 10:00:28 +0100 |
---|---|---|
committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-10-25 15:01:24 +0000 |
commit | 48623a0f6f4681ce0d9525b1587b7f96bfd58519 (patch) | |
tree | f5dbf25937e7b6641274e0953d09ca84acb51772 /src/armnn/test/TensorHelpers.hpp | |
parent | c82c8732fb514b412012002bd951a84039eca696 (diff) | |
download | armnn-48623a0f6f4681ce0d9525b1587b7f96bfd58519.tar.gz |
IVGCVSW-4018 Move QuantizeHelper.hpp to armnnUtils
* Moved QuntizeHelper.hpp to armnnUtils
* Reordered parameters for QuantizedVector and added default
values for qScale and qOffset to make life easier when
using the function for non-quantized types such as Float16
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I28c263dfa425f1316feccb4116839a84f5d568e5
Diffstat (limited to 'src/armnn/test/TensorHelpers.hpp')
-rw-r--r-- | src/armnn/test/TensorHelpers.hpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/armnn/test/TensorHelpers.hpp b/src/armnn/test/TensorHelpers.hpp index 35e471e0f2..3f8589353c 100644 --- a/src/armnn/test/TensorHelpers.hpp +++ b/src/armnn/test/TensorHelpers.hpp @@ -4,23 +4,21 @@ // #pragma once -#include <armnn/TensorFwd.hpp> -#include <boost/test/unit_test.hpp> -#include <boost/multi_array.hpp> -#include <vector> -#include <array> +#include <armnn/Tensor.hpp> + +#include <QuantizeHelper.hpp> #include <boost/assert.hpp> -#include <boost/test/tools/floating_point_comparison.hpp> +#include <boost/multi_array.hpp> +#include <boost/numeric/conversion/cast.hpp> #include <boost/random/uniform_real_distribution.hpp> #include <boost/random/mersenne_twister.hpp> -#include <boost/numeric/conversion/cast.hpp> - -#include <armnn/Tensor.hpp> - -#include <backendsCommon/test/QuantizeHelper.hpp> +#include <boost/test/tools/floating_point_comparison.hpp> +#include <boost/test/unit_test.hpp> +#include <array> #include <cmath> +#include <vector> constexpr float g_FloatCloseToZeroTolerance = 1.0e-6f; @@ -235,7 +233,9 @@ boost::multi_array<T, n> MakeRandomTensor(const armnn::TensorInfo& tensorInfo, { init[i] = dist(gen); } - float qScale = tensorInfo.GetQuantizationScale(); - int32_t qOffset = tensorInfo.GetQuantizationOffset(); - return MakeTensor<T, n>(tensorInfo, QuantizedVector<T>(qScale, qOffset, init)); + + const float qScale = tensorInfo.GetQuantizationScale(); + const int32_t qOffset = tensorInfo.GetQuantizationOffset(); + + return MakeTensor<T, n>(tensorInfo, armnnUtils::QuantizedVector<T>(init, qScale, qOffset)); } |