commit 2135015779092e259ad5d5df185eda0c34b56359
author Matteo Martincigh <matteo.martincigh@arm.com> Wed Nov 28 16:22:22 2018 +0000
committer Matteo Martincigh <matteo.martincigh@arm.com> Wed Dec 05 11:03:35 2018 +0000
tree 744a46d8f6036ac13fc40ab5001ad2ad05fb4525
parent 24df822711e14cd3099a926272d863ed139ed4d7

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/reference/workloads/ConvImpl.hpp

diff --git a/src/backends/reference/workloads/ConvImpl.hpp b/src/backends/reference/workloads/ConvImpl.hpp
index 0b9f8f7..b8e2dea 100644
--- a/src/backends/reference/workloads/ConvImpl.hpp
+++ b/src/backends/reference/workloads/ConvImpl.hpp
@@ -10,7 +10,7 @@
 
 #include <armnn/Tensor.hpp>
 
-#include <backendsCommon/DataLayoutIndexed.hpp>
+#include <DataLayoutIndexed.hpp>
 
 #include <boost/assert.hpp>
 #include <boost/numeric/conversion/cast.hpp>
@@ -73,7 +73,7 @@
                                             GetOutputTensorData<InputType>(0, data),
                                             data.m_Parameters.m_DataLayout);
 
-    const DataLayoutIndexed dataLayoutIndexed(data.m_Parameters.m_DataLayout);
+    const armnnUtils::DataLayoutIndexed dataLayoutIndexed(data.m_Parameters.m_DataLayout);
     const unsigned int channelsIndex = dataLayoutIndexed.GetChannelsIndex();
     const unsigned int heightIndex   = dataLayoutIndexed.GetHeightIndex();
     const unsigned int widthIndex    = dataLayoutIndexed.GetWidthIndex();