From 40d2741b459fb7d55ff034d615678848a8e0af7c Mon Sep 17 00:00:00 2001
From: Francis Murtagh <francis.murtagh@arm.com>
Date: Thu, 28 Oct 2021 11:11:35 +0100
Subject: 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/InferenceTest.hpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'tests/InferenceTest.hpp')

diff --git a/tests/InferenceTest.hpp b/tests/InferenceTest.hpp
index d0bb0c00f3..fb9c048488 100644
--- a/tests/InferenceTest.hpp
+++ b/tests/InferenceTest.hpp
@@ -7,11 +7,12 @@
 #include "InferenceModel.hpp"
 
 #include <armnn/ArmNN.hpp>
-#include <armnn/Utils.hpp>
 #include <armnn/Logging.hpp>
 #include <armnn/TypesUtils.hpp>
 #include <armnn/utility/IgnoreUnused.hpp>
 
+#include <armnnUtils/TContainer.hpp>
+
 #include <cxxopts/cxxopts.hpp>
 #include <fmt/format.h>
 
@@ -114,7 +115,7 @@ public:
 
     InferenceModelTestCase(TModel& model,
                            unsigned int testCaseId,
-                           const std::vector<armnn::TContainer>& inputs,
+                           const std::vector<armnnUtils::TContainer>& inputs,
                            const std::vector<unsigned int>& outputSizes)
         : m_Model(model)
         , m_TestCaseId(testCaseId)
@@ -137,13 +138,13 @@ public:
 
 protected:
     unsigned int GetTestCaseId() const { return m_TestCaseId; }
-    const std::vector<armnn::TContainer>& GetOutputs() const { return m_Outputs; }
+    const std::vector<armnnUtils::TContainer>& GetOutputs() const { return m_Outputs; }
 
 private:
     TModel&                         m_Model;
     unsigned int                    m_TestCaseId;
-    std::vector<armnn::TContainer>  m_Inputs;
-    std::vector<armnn::TContainer>  m_Outputs;
+    std::vector<armnnUtils::TContainer>  m_Inputs;
+    std::vector<armnnUtils::TContainer>  m_Outputs;
 };
 
 template <typename TTestCaseDatabase, typename TModel>
-- 
cgit v1.2.1