From 6bb47a720ad33d0a330228b52e320a1022e4dfe2 Mon Sep 17 00:00:00 2001
From: David Monahan <David.Monahan@arm.com>
Date: Fri, 22 Oct 2021 12:57:28 +0100
Subject: IVGCVSW-6359 Create a single definition of TContainer

 * Added a single definition of TContainer to include/armnn/Utils.hpp
 * Change all files which contained their own identical definitions of TContainer to use the new one


Signed-off-by: David Monahan <David.Monahan@arm.com>
Change-Id: I63e633693a430bbbd6a29001cafa19742ef8309a
---
 tests/ImageTensorGenerator/ImageTensorGenerator.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'tests/ImageTensorGenerator/ImageTensorGenerator.cpp')

diff --git a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp
index b4432558c4..a69a098eb4 100644
--- a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp
+++ b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp
@@ -9,7 +9,6 @@
 #include <armnn/TypesUtils.hpp>
 #include <armnnUtils/Filesystem.hpp>
 
-#include <mapbox/variant.hpp>
 #include <cxxopts/cxxopts.hpp>
 
 #include <algorithm>
@@ -297,9 +296,7 @@ int main(int argc, char* argv[])
     const unsigned int batchSize = 1;
     const armnn::DataLayout outputLayout(cmdline.GetLayout());
 
-    using TContainer = mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<uint8_t>,
-                                             std::vector<int8_t>>;
-    std::vector<TContainer> imageDataContainers;
+    std::vector<armnn::TContainer> imageDataContainers;
     const NormalizationParameters& normParams = GetNormalizationParameters(modelFormat, outputType);
     try
     {
-- 
cgit v1.2.1