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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/DeepSpeechV1Database.hpp | 2 | ||||
| -rw-r--r-- | tests/MobileNetSsdDatabase.hpp | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/tests/DeepSpeechV1Database.hpp b/tests/DeepSpeechV1Database.hpp index 037c810122..182f373fc2 100644 --- a/tests/DeepSpeechV1Database.hpp +++ b/tests/DeepSpeechV1Database.hpp @@ -11,7 +11,6 @@ #include <vector> #include <armnn/TypesUtils.hpp> -#include <backendsCommon/test/QuantizeHelper.hpp> #include <boost/log/trivial.hpp> #include <boost/numeric/conversion/cast.hpp> @@ -202,4 +201,3 @@ std::unique_ptr<DeepSpeechV1TestCaseData> DeepSpeechV1Database::GetTestCaseData( } } // anonymous namespace - diff --git a/tests/MobileNetSsdDatabase.hpp b/tests/MobileNetSsdDatabase.hpp index 349d1ad96a..1a99ed715a 100644 --- a/tests/MobileNetSsdDatabase.hpp +++ b/tests/MobileNetSsdDatabase.hpp @@ -2,24 +2,23 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #pragma once +#include "InferenceTestImage.hpp" #include "ObjectDetectionCommon.hpp" -#include <memory> -#include <string> -#include <vector> +#include <QuantizeHelper.hpp> #include <armnn/TypesUtils.hpp> -#include <backendsCommon/test/QuantizeHelper.hpp> #include <boost/log/trivial.hpp> #include <boost/numeric/conversion/cast.hpp> #include <array> +#include <memory> #include <string> - -#include "InferenceTestImage.hpp" +#include <vector> namespace { @@ -97,7 +96,7 @@ std::unique_ptr<MobileNetSsdTestCaseData> MobileNetSsdDatabase::GetTestCaseData( // Get image data as a vector of floats std::vector<float> floatImageData = GetImageDataAsNormalizedFloats(ImageChannelLayout::Rgb, image); - imageData = QuantizedVector<uint8_t>(m_Scale, m_Offset, floatImageData); + imageData = armnnUtils::QuantizedVector<uint8_t>(floatImageData, m_Scale, m_Offset); } catch (const InferenceTestImageException& e) { |