commit 9542f90d82a42096166d72109683abc165072297
author Rob Hughes <robert.hughes@arm.com> Wed Jul 14 09:48:54 2021 +0100
committer Rob Hughes <robert.hughes@arm.com> Wed Jul 21 14:09:51 2021 +0000
tree 1f519b437ef83eed67419f52e1326f6d909e2467
parent 9021125ff83a035dae05e5c7c0e6b1455b71af1a

NNXSW-3081 Move Filesystem.hpp and Threads.hpp to public include

!android-nn-driver:5966

Change-Id: Ice0b4d2872bb0e09bfc0763034a206c3a8f24af4
Signed-off-by: Rob Hughes <robert.hughes@arm.com>

tests/ExecuteNetwork/ExecuteNetwork.cpp

diff --git a/tests/ExecuteNetwork/ExecuteNetwork.cpp b/tests/ExecuteNetwork/ExecuteNetwork.cpp
index 48577c9..bce8358 100644
--- a/tests/ExecuteNetwork/ExecuteNetwork.cpp
+++ b/tests/ExecuteNetwork/ExecuteNetwork.cpp
@@ -9,7 +9,7 @@
 #include <AsyncExecutionCallback.hpp>
 
 #include <armnn/Logging.hpp>
-#include <Filesystem.hpp>
+#include <armnnUtils/Filesystem.hpp>
 #include <InferenceTest.hpp>
 
 #if defined(ARMNN_SERIALIZER)

tests/ImageCSVFileGenerator/ImageCSVFileGenerator.cpp

diff --git a/tests/ImageCSVFileGenerator/ImageCSVFileGenerator.cpp b/tests/ImageCSVFileGenerator/ImageCSVFileGenerator.cpp
index 0138c1c..a949da3 100644
--- a/tests/ImageCSVFileGenerator/ImageCSVFileGenerator.cpp
+++ b/tests/ImageCSVFileGenerator/ImageCSVFileGenerator.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <Filesystem.hpp>
+#include <armnnUtils/Filesystem.hpp>
 #include <cxxopts/cxxopts.hpp>
 
 #include <algorithm>

tests/ImageTensorGenerator/ImageTensorGenerator.cpp

diff --git a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp
index 5417eb4..a2110f9 100644
--- a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp
+++ b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp
@@ -7,7 +7,7 @@
 #include "../InferenceTestImage.hpp"
 #include <armnn/Logging.hpp>
 #include <armnn/TypesUtils.hpp>
-#include <Filesystem.hpp>
+#include <armnnUtils/Filesystem.hpp>
 
 #include <mapbox/variant.hpp>
 #include <cxxopts/cxxopts.hpp>

tests/InferenceModel.hpp

diff --git a/tests/InferenceModel.hpp b/tests/InferenceModel.hpp
index 3eb1e6a..9eb3eab 100644
--- a/tests/InferenceModel.hpp
+++ b/tests/InferenceModel.hpp
@@ -24,7 +24,7 @@
 #include <armnnOnnxParser/IOnnxParser.hpp>
 #endif
 
-#include <Filesystem.hpp>
+#include <armnnUtils/Filesystem.hpp>
 #include <HeapProfiling.hpp>
 #include <TensorIOUtils.hpp>
 

tests/InferenceTest.cpp

diff --git a/tests/InferenceTest.cpp b/tests/InferenceTest.cpp
index ebbf506..5f2cf91 100644
--- a/tests/InferenceTest.cpp
+++ b/tests/InferenceTest.cpp
@@ -5,7 +5,7 @@
 #include "InferenceTest.hpp"
 
 #include <armnn/utility/Assert.hpp>
-#include <Filesystem.hpp>
+#include <armnnUtils/Filesystem.hpp>
 
 #include "../src/armnn/Profiling.hpp"
 #include <cxxopts/cxxopts.hpp>

tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp

diff --git a/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp b/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp
index 672f744..10d6e6a 100644
--- a/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp
+++ b/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp
@@ -7,7 +7,7 @@
 #include "../InferenceTest.hpp"
 #include "ModelAccuracyChecker.hpp"
 #include "armnnDeserializer/IDeserializer.hpp"
-#include <Filesystem.hpp>
+#include <armnnUtils/Filesystem.hpp>
 
 #include <cxxopts/cxxopts.hpp>
 #include <map>

tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp

diff --git a/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp b/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp
index e5da149..23b892f 100644
--- a/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp
+++ b/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp
@@ -5,7 +5,7 @@
 
 #include "NetworkExecutionUtils.hpp"
 
-#include <Filesystem.hpp>
+#include <armnnUtils/Filesystem.hpp>
 #include <InferenceTest.hpp>
 #include <ResolveType.hpp>