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/InferenceModel.hpp

diff --git a/tests/InferenceModel.hpp b/tests/InferenceModel.hpp
index e2cd5d9..13f7d74 100644
--- a/tests/InferenceModel.hpp
+++ b/tests/InferenceModel.hpp
@@ -7,13 +7,15 @@
 
 
 #include <armnn/ArmNN.hpp>
-#include <armnn/Utils.hpp>
 #include <armnn/Threadpool.hpp>
 #include <armnn/Logging.hpp>
 #include <armnn/utility/Timer.hpp>
 #include <armnn/BackendRegistry.hpp>
 #include <armnn/utility/Assert.hpp>
 #include <armnn/utility/NumericCast.hpp>
+
+#include <armnnUtils/TContainer.hpp>
+
 #include <common/include/ProfilingGuid.hpp>
 
 #if defined(ARMNN_SERIALIZER)
@@ -584,8 +586,8 @@
     }
 
     std::chrono::duration<double, std::milli> Run(
-            const std::vector<armnn::TContainer>& inputContainers,
-            std::vector<armnn::TContainer>& outputContainers)
+            const std::vector<armnnUtils::TContainer>& inputContainers,
+            std::vector<armnnUtils::TContainer>& outputContainers)
     {
         for (unsigned int i = 0; i < outputContainers.size(); ++i)
         {
@@ -633,8 +635,8 @@
 
     std::tuple<unsigned int, std::chrono::duration<double, std::milli>> RunAsync(
         armnn::experimental::IWorkingMemHandle& workingMemHandleRef,
-        const std::vector<armnn::TContainer>& inputContainers,
-        std::vector<armnn::TContainer>& outputContainers,
+        const std::vector<armnnUtils::TContainer>& inputContainers,
+        std::vector<armnnUtils::TContainer>& outputContainers,
         unsigned int inferenceID)
     {
         for (unsigned int i = 0; i < outputContainers.size(); ++i)
@@ -684,8 +686,8 @@
         }
     }
 
-    void RunAsync(const std::vector<armnn::TContainer>& inputContainers,
-                  std::vector<armnn::TContainer>& outputContainers,
+    void RunAsync(const std::vector<armnnUtils::TContainer>& inputContainers,
+                  std::vector<armnnUtils::TContainer>& outputContainers,
                   std::shared_ptr<armnn::IAsyncExecutionCallback> cb)
     {
         for (unsigned int i = 0; i < outputContainers.size(); ++i)