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
diff --git a/src/backends/reference/workloads/BatchNormImpl.hpp b/src/backends/reference/workloads/BatchNormImpl.hpp
index fbcb2fd..799e7a3 100644
--- a/src/backends/reference/workloads/BatchNormImpl.hpp
+++ b/src/backends/reference/workloads/BatchNormImpl.hpp
@@ -10,6 +10,8 @@
#include <armnn/Tensor.hpp>
+#include <DataLayoutIndexed.hpp>
+
#include <cmath>
namespace armnn
@@ -34,7 +36,7 @@
outputData,
data.m_Parameters.m_DataLayout);
- DataLayoutIndexed dataLayout(data.m_Parameters.m_DataLayout);
+ armnnUtils::DataLayoutIndexed dataLayout(data.m_Parameters.m_DataLayout);
for (unsigned int c = 0; c < inputInfo.GetShape()[dataLayout.GetChannelsIndex()]; c++)
{