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
---
 src/armnn/test/ModelAccuracyCheckerTest.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/armnn/test/ModelAccuracyCheckerTest.cpp b/src/armnn/test/ModelAccuracyCheckerTest.cpp
index 47ae3f4b0a..59711a5397 100644
--- a/src/armnn/test/ModelAccuracyCheckerTest.cpp
+++ b/src/armnn/test/ModelAccuracyCheckerTest.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 //
 #include "ModelAccuracyChecker.hpp"
-#include <armnn/Utils.hpp>
+#include <armnnUtils/TContainer.hpp>
 
 #include <doctest/doctest.h>
 
@@ -60,12 +60,12 @@ TEST_CASE_FIXTURE(TestHelper, "TestFloat32OutputTensorAccuracy")
 
     // Add image 1 and check accuracy
     std::vector<float> inferenceOutputVector1 = {0.05f, 0.10f, 0.70f, 0.15f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
-    armnn::TContainer inference1Container(inferenceOutputVector1);
-    std::vector<armnn::TContainer> outputTensor1;
+    armnnUtils::TContainer inference1Container(inferenceOutputVector1);
+    std::vector<armnnUtils::TContainer> outputTensor1;
     outputTensor1.push_back(inference1Container);
 
     std::string imageName = "val_01.JPEG";
-    checker.AddImageResult<armnn::TContainer>(imageName, outputTensor1);
+    checker.AddImageResult<armnnUtils::TContainer>(imageName, outputTensor1);
 
     // Top 1 Accuracy
     float totalAccuracy = checker.GetAccuracy(1);
@@ -73,12 +73,12 @@ TEST_CASE_FIXTURE(TestHelper, "TestFloat32OutputTensorAccuracy")
 
     // Add image 2 and check accuracy
     std::vector<float> inferenceOutputVector2 = {0.10f, 0.0f, 0.0f, 0.0f, 0.05f, 0.70f, 0.0f, 0.0f, 0.0f, 0.15f};
-    armnn::TContainer inference2Container(inferenceOutputVector2);
-    std::vector<armnn::TContainer> outputTensor2;
+    armnnUtils::TContainer inference2Container(inferenceOutputVector2);
+    std::vector<armnnUtils::TContainer> outputTensor2;
     outputTensor2.push_back(inference2Container);
 
     imageName = "val_02.JPEG";
-    checker.AddImageResult<armnn::TContainer>(imageName, outputTensor2);
+    checker.AddImageResult<armnnUtils::TContainer>(imageName, outputTensor2);
 
     // Top 1 Accuracy
     totalAccuracy = checker.GetAccuracy(1);
@@ -90,12 +90,12 @@ TEST_CASE_FIXTURE(TestHelper, "TestFloat32OutputTensorAccuracy")
 
     // Add image 3 and check accuracy
     std::vector<float> inferenceOutputVector3 = {0.0f, 0.10f, 0.0f, 0.0f, 0.05f, 0.70f, 0.0f, 0.0f, 0.0f, 0.15f};
-    armnn::TContainer inference3Container(inferenceOutputVector3);
-    std::vector<armnn::TContainer> outputTensor3;
+    armnnUtils::TContainer inference3Container(inferenceOutputVector3);
+    std::vector<armnnUtils::TContainer> outputTensor3;
     outputTensor3.push_back(inference3Container);
 
     imageName = "val_03.JPEG";
-    checker.AddImageResult<armnn::TContainer>(imageName, outputTensor3);
+    checker.AddImageResult<armnnUtils::TContainer>(imageName, outputTensor3);
 
     // Top 1 Accuracy
     totalAccuracy = checker.GetAccuracy(1);
-- 
cgit v1.2.1