diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-11-28 11:35:47 +0000 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-11-29 10:30:58 +0000 |
| commit | e011d20f279e6e67e899bc6930b0266fc357bc1c (patch) | |
| tree | 4a190b08df3c63c4d540506491d31bee7c8dcd46 /tests | |
| parent | 2e259276fba9fa5c6c2e146de3b26e3d6c6cccc6 (diff) | |
| download | armnn-e011d20f279e6e67e899bc6930b0266fc357bc1c.tar.gz | |
IVGCVSW-4209 Create a public API for the ArmNN Utils
* Moved the relevant armnnUtils headers to the new location:
include/armnnUtils
* Update the header usage throughout the source code
!android-nn-driver:2387
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Change-Id: I2ba15cebcacafad2b5a1a7b9c3312ffc585e09d6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ImagePreprocessor.cpp | 5 | ||||
| -rw-r--r-- | tests/ImageTensorGenerator/ImageTensorGenerator.hpp | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tests/ImagePreprocessor.cpp b/tests/ImagePreprocessor.cpp index 74bc943ee8..f0184e466e 100644 --- a/tests/ImagePreprocessor.cpp +++ b/tests/ImagePreprocessor.cpp @@ -2,11 +2,14 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #include "InferenceTestImage.hpp" #include "ImagePreprocessor.hpp" -#include "Permute.hpp" + #include <armnn/TypesUtils.hpp> +#include <armnnUtils/Permute.hpp> + #include <boost/numeric/conversion/cast.hpp> #include <boost/assert.hpp> #include <boost/format.hpp> diff --git a/tests/ImageTensorGenerator/ImageTensorGenerator.hpp b/tests/ImageTensorGenerator/ImageTensorGenerator.hpp index 3e164bc9e0..b1cb5e36f5 100644 --- a/tests/ImageTensorGenerator/ImageTensorGenerator.hpp +++ b/tests/ImageTensorGenerator/ImageTensorGenerator.hpp @@ -4,9 +4,11 @@ // #include "../InferenceTestImage.hpp" -#include "Permute.hpp" + #include <armnn/TypesUtils.hpp> +#include <armnnUtils/Permute.hpp> + #include <algorithm> #include <fstream> #include <iterator> @@ -178,4 +180,4 @@ template <> void WriteImageTensorImpl<uint8_t>(const std::vector<uint8_t>& imageData, std::ofstream& imageTensorFile) { std::copy(imageData.begin(), imageData.end(), std::ostream_iterator<int>(imageTensorFile, " ")); -}
\ No newline at end of file +} |