commit 40d2741b459fb7d55ff034d615678848a8e0af7c
author Francis Murtagh <francis.murtagh@arm.com> Thu Oct 28 11:11:35 2021 +0100
committer Francis Murtagh <francis.murtagh@arm.com> Thu Oct 28 10:36:25 2021 +0000
tree e0d89fcf02a2a6c2a0a6b8121105c1371cf57193
parent 040719d09b696dcb979b4dcadfc32181cb84301a

IVGCVSW-6513: Compilation failure in armnn-mobilenet-quant in ML-Examples

 * Move TContainer to armnnUtils library

Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: I3c0f895d11b66f6ee224ac689a19d0477f990b98

tests/ExecuteNetwork/ExecuteNetwork.cpp

diff --git a/tests/ExecuteNetwork/ExecuteNetwork.cpp b/tests/ExecuteNetwork/ExecuteNetwork.cpp
index db15872..dd3c0a3 100644
--- a/tests/ExecuteNetwork/ExecuteNetwork.cpp
+++ b/tests/ExecuteNetwork/ExecuteNetwork.cpp
@@ -9,8 +9,8 @@
 #include <AsyncExecutionCallback.hpp>
 
 #include <armnn/Logging.hpp>
-#include <armnn/Utils.hpp>
 #include <armnnUtils/Filesystem.hpp>
+#include <armnnUtils/TContainer.hpp>
 #include <InferenceTest.hpp>
 
 #if defined(ARMNN_SERIALIZER)
@@ -370,8 +370,8 @@
 {
     using namespace std::chrono;
 
-    std::vector<std::vector<armnn::TContainer>> inputs;
-    std::vector<std::vector<armnn::TContainer>> outputs;
+    std::vector<std::vector<armnnUtils::TContainer>> inputs;
+    std::vector<std::vector<armnnUtils::TContainer>> outputs;
 
     try
     {
@@ -436,7 +436,7 @@
 
         for(unsigned int j = 0; j < params.m_Iterations ; ++j)
         {
-            std::vector<armnn::TContainer> inputDataContainers;
+            std::vector<armnnUtils::TContainer> inputDataContainers;
             for(unsigned int i = 0; i < numInputs; ++i)
             {
                 // If there are less input files given than required for the execution of
@@ -460,7 +460,7 @@
                     numElements = params.m_InputTensorShapes[i]->GetNumElements();
                 }
 
-                armnn::TContainer tensorData;
+                armnnUtils::TContainer tensorData;
                 PopulateTensorWithData(tensorData,
                                        numElements,
                                        params.m_InputTypes[i],
@@ -476,7 +476,7 @@
 
         for (unsigned int j = 0; j < params.m_Iterations; ++j)
         {
-            std::vector <armnn::TContainer> outputDataContainers;
+            std::vector <armnnUtils::TContainer> outputDataContainers;
             for (unsigned int i = 0; i < numOutputs; ++i)
             {
                 if (params.m_OutputTypes[i].compare("float") == 0)
@@ -596,7 +596,7 @@
             {
                 ARMNN_LOG(info) << "Asynchronous execution with Arm NN thread pool...  \n";
                 armnn::AsyncCallbackManager callbackManager;
-                std::unordered_map<armnn::InferenceId, std::vector<armnn::TContainer>&> inferenceOutputMap;
+                std::unordered_map<armnn::InferenceId, std::vector<armnnUtils::TContainer>&> inferenceOutputMap;
 
                 // Declare the latest and earliest inference times here to be used when calculating overall time
                 std::chrono::high_resolution_clock::time_point earliestStartTime;