From 2135015779092e259ad5d5df185eda0c34b56359 Mon Sep 17 00:00:00 2001
From: Matteo Martincigh <matteo.martincigh@arm.com>
Date: Wed, 28 Nov 2018 16:22:22 +0000
Subject: IVGCVSW-2264 Move DataLayoutIndexed to armnnUtils

 * Since DataLayoutIndexed is now required in the TF parser, this
   changes move it to the armnnUtils library so that it'll be
   accessible by the armnnTfParser
 * Modified CMake files and Android.mk files accordingly

Change-Id: Ie2620359ef288aeff64cb9e9bec068a466eee0e9
---
 src/backends/backendsCommon/test/BatchNormTestImpl.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/backends/backendsCommon/test/BatchNormTestImpl.hpp')

diff --git a/src/backends/backendsCommon/test/BatchNormTestImpl.hpp b/src/backends/backendsCommon/test/BatchNormTestImpl.hpp
index 6325130218..d63f0b5610 100644
--- a/src/backends/backendsCommon/test/BatchNormTestImpl.hpp
+++ b/src/backends/backendsCommon/test/BatchNormTestImpl.hpp
@@ -16,6 +16,8 @@
 
 #include <test/TensorHelpers.hpp>
 
+#include <DataLayoutIndexed.hpp>
+
 template<typename T>
 LayerTestResult<T, 4> BatchNormTestImpl(
     armnn::IWorkloadFactory& workloadFactory,
@@ -30,7 +32,7 @@ LayerTestResult<T, 4> BatchNormTestImpl(
     armnn::TensorInfo inputTensorInfo(inputOutputTensorShape, armnn::GetDataType<T>());
     armnn::TensorInfo outputTensorInfo(inputOutputTensorShape, armnn::GetDataType<T>());
 
-    armnn::DataLayoutIndexed dataLayoutIndexed(dataLayout);
+    armnnUtils::DataLayoutIndexed dataLayoutIndexed(dataLayout);
 
     armnn::TensorInfo tensorInfo({ inputOutputTensorShape[dataLayoutIndexed.GetChannelsIndex()] },
                                  armnn::GetDataType<T>());
@@ -188,4 +190,4 @@ LayerTestResult<T,4> BatchNormTestNhwcImpl(
     CopyDataFromITensorHandle(&ret.output[0][0][0][0], outputHandle.get());
 
     return ret;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.1