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

20 files changed, 62 insertions, 109 deletions

diff --git a/src/backends/backendsCommon/CMakeLists.txt b/src/backends/backendsCommon/CMakeLists.txt
index f9bded76f4..1fe9888901 100644
--- a/src/backends/backendsCommon/CMakeLists.txt
+++ b/src/backends/backendsCommon/CMakeLists.txt
@@ -9,8 +9,6 @@ list(APPEND armnnBackendsCommon_sources
     CpuTensorHandle.cpp
     CpuTensorHandleFwd.hpp
     CpuTensorHandle.hpp
-    DataLayoutIndexed.hpp
-    DataLayoutIndexed.cpp
     IBackendInternal.hpp
     IBackendContext.hpp
     ILayerSupport.cpp
diff --git a/src/backends/backendsCommon/DataLayoutIndexed.cpp b/src/backends/backendsCommon/DataLayoutIndexed.cpp
deleted file mode 100644
index b99d52c5b9..0000000000
--- a/src/backends/backendsCommon/DataLayoutIndexed.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include "DataLayoutIndexed.hpp"
-
-namespace armnn {
-
-// Definition in include/armnn/Types.hpp
-bool operator==(const DataLayout& dataLayout, const DataLayoutIndexed& indexed)
-{
-    return dataLayout == indexed.GetDataLayout();
-}
-
-// Definition in include/armnn/Types.hpp
-bool operator==(const DataLayoutIndexed& indexed, const DataLayout& dataLayout)
-{
-    return indexed.GetDataLayout() == dataLayout;
-}
-
-}
diff --git a/src/backends/backendsCommon/DataLayoutIndexed.hpp b/src/backends/backendsCommon/DataLayoutIndexed.hpp
deleted file mode 100644
index 8547475706..0000000000
--- a/src/backends/backendsCommon/DataLayoutIndexed.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-#pragma once
-#include <armnn/Types.hpp>
-
-namespace armnn
-{
-
-// Provides access to the appropriate indexes for Channels, Height and Width based on DataLayout
-class DataLayoutIndexed
-{
-public:
-    DataLayoutIndexed(DataLayout dataLayout) : m_DataLayout(dataLayout)
-    {
-        switch (dataLayout)
-        {
-            case DataLayout::NHWC:
-                m_ChannelsIndex = 3;
-                m_HeightIndex   = 1;
-                m_WidthIndex    = 2;
-                break;
-            case DataLayout::NCHW:
-                m_ChannelsIndex = 1;
-                m_HeightIndex   = 2;
-                m_WidthIndex    = 3;
-                break;
-            default:
-                throw InvalidArgumentException("Unknown DataLayout value: " +
-                                               std::to_string(static_cast<int>(dataLayout)));
-        }
-    }
-
-    DataLayout   GetDataLayout()    const { return m_DataLayout; }
-    unsigned int GetChannelsIndex() const { return m_ChannelsIndex; }
-    unsigned int GetHeightIndex()   const { return m_HeightIndex; }
-    unsigned int GetWidthIndex()    const { return m_WidthIndex; }
-
-private:
-    DataLayout   m_DataLayout;
-    unsigned int m_ChannelsIndex;
-    unsigned int m_HeightIndex;
-    unsigned int m_WidthIndex;
-};
-
-// Equality methods
-bool operator==(const DataLayout& dataLayout, const DataLayoutIndexed& indexed);
-bool operator==(const DataLayoutIndexed& indexed, const DataLayout& dataLayout);
-
-}
diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp
index 08f78fffe2..e0ba4a7ef7 100644
--- a/src/backends/backendsCommon/WorkloadData.cpp
+++ b/src/backends/backendsCommon/WorkloadData.cpp
@@ -6,7 +6,7 @@
 
 #include "CpuTensorHandle.hpp"
 
-#include <backendsCommon/DataLayoutIndexed.hpp>
+#include <DataLayoutIndexed.hpp>
 
 #include <algorithm>
 #include <iomanip>
@@ -15,6 +15,8 @@
 
 #include <boost/format.hpp>
 
+using namespace armnnUtils;
+
 namespace armnn
 {
 
diff --git a/src/backends/backendsCommon/common.mk b/src/backends/backendsCommon/common.mk
index 58de080794..9c3d50795e 100644
--- a/src/backends/backendsCommon/common.mk
+++ b/src/backends/backendsCommon/common.mk
@@ -9,7 +9,6 @@
 
 COMMON_SOURCES := \
     BackendRegistry.cpp \
-    DataLayoutIndexed.cpp \
     CpuTensorHandle.cpp \
     ILayerSupport.cpp \
     MemCopyWorkload.cpp \
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
+}
diff --git a/src/backends/backendsCommon/test/Conv2dTestImpl.hpp b/src/backends/backendsCommon/test/Conv2dTestImpl.hpp
index d137c8082a..0ba8d7552c 100755
--- a/src/backends/backendsCommon/test/Conv2dTestImpl.hpp
+++ b/src/backends/backendsCommon/test/Conv2dTestImpl.hpp
@@ -7,21 +7,24 @@
 #include "WorkloadTestUtils.hpp"
 #include "TensorUtils.hpp"
 
-#include <string>
+#include <Permute.hpp>
+#include <DataLayoutIndexed.hpp>
+
+#include <test/TensorHelpers.hpp>
+
 #include <armnn/ArmNN.hpp>
 #include <armnn/Tensor.hpp>
 #include <armnn/TypesUtils.hpp>
 
-#include <test/TensorHelpers.hpp>
-#include "QuantizeHelper.hpp"
-
-#include <backendsCommon/DataLayoutIndexed.hpp>
 #include <backendsCommon/CpuTensorHandle.hpp>
 #include <backendsCommon/IBackendInternal.hpp>
 #include <backendsCommon/WorkloadFactory.hpp>
-#include "Permute.hpp"
+#include <backendsCommon/test/QuantizeHelper.hpp>
+
 #include <boost/numeric/conversion/cast.hpp>
 
+#include <string>
+
 // Mapping from input type to bias type for fully connected layers.
 // float => float, uint8_t => int32_t
 template<typename T>
@@ -1141,7 +1144,7 @@ LayerTestResult<T, 4> CompareDepthwiseConvolution2dTestImpl(
     armnn::IWorkloadFactory& workloadFactory,
     const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
     armnn::IWorkloadFactory& refWorkloadFactory,
-    const armnn::DataLayoutIndexed& layout)
+    const armnnUtils::DataLayoutIndexed& layout)
 {
     unsigned int inputHeight = 8;
     unsigned int inputWidth = 16;
diff --git a/src/backends/backendsCommon/test/Pooling2dTestImpl.hpp b/src/backends/backendsCommon/test/Pooling2dTestImpl.hpp
index 0f33ac01a5..f5e3386fed 100644
--- a/src/backends/backendsCommon/test/Pooling2dTestImpl.hpp
+++ b/src/backends/backendsCommon/test/Pooling2dTestImpl.hpp
@@ -20,6 +20,8 @@
 
 #include <test/TensorHelpers.hpp>
 
+#include <DataLayoutIndexed.hpp>
+
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <algorithm>
@@ -36,7 +38,7 @@ LayerTestResult<T, 4> SimplePooling2dTestImpl(
     const boost::multi_array<T, 4>& outputExpected)
 {
     const armnn::DataLayout dataLayout = descriptor.m_DataLayout;
-    const armnn::DataLayoutIndexed dimensionIndices = dataLayout;
+    const armnnUtils::DataLayoutIndexed dimensionIndices = dataLayout;
     auto heightIndex = dimensionIndices.GetHeightIndex();
     auto widthIndex = dimensionIndices.GetWidthIndex();
     auto channelsIndex = dimensionIndices.GetChannelsIndex();
diff --git a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp
index d294705eaa..02c17851cd 100644
--- a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp
+++ b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp
@@ -8,7 +8,10 @@
 #include <aclCommon/ArmComputeTensorUtils.hpp>
 #include <neon/NeonLayerSupport.hpp>
 #include <backendsCommon/CpuTensorHandle.hpp>
-#include <backendsCommon/DataLayoutIndexed.hpp>
+
+#include <DataLayoutIndexed.hpp>
+
+using namespace armnnUtils;
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/BatchNormImpl.hpp b/src/backends/reference/workloads/BatchNormImpl.hpp
index fbcb2fdf5a..799e7a327b 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 @@ static void BatchNormImpl(NormData     data,
                                         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++)
     {
diff --git a/src/backends/reference/workloads/BatchToSpaceNd.cpp b/src/backends/reference/workloads/BatchToSpaceNd.cpp
index 4313085ba5..5f64213b39 100644
--- a/src/backends/reference/workloads/BatchToSpaceNd.cpp
+++ b/src/backends/reference/workloads/BatchToSpaceNd.cpp
@@ -11,6 +11,8 @@
 
 #include <boost/assert.hpp>
 
+using namespace armnnUtils;
+
 namespace armnn
 {
 
diff --git a/src/backends/reference/workloads/BatchToSpaceNd.hpp b/src/backends/reference/workloads/BatchToSpaceNd.hpp
index 5d932cc991..f08df93584 100644
--- a/src/backends/reference/workloads/BatchToSpaceNd.hpp
+++ b/src/backends/reference/workloads/BatchToSpaceNd.hpp
@@ -5,19 +5,21 @@
 
 #pragma once
 
-#include <backendsCommon/DataLayoutIndexed.hpp>
+#include <armnn/Types.hpp>
+
 #include <backendsCommon/Workload.hpp>
 #include <backendsCommon/WorkloadData.hpp>
-#include <armnn/Types.hpp>
+
+#include <DataLayoutIndexed.hpp>
 
 namespace armnn
 {
 
-void BatchToSpaceNd(const DataLayoutIndexed& dataLayout,
+void BatchToSpaceNd(const armnnUtils::DataLayoutIndexed& dataLayout,
                     const TensorInfo& inputTensorInfo,
                     const TensorInfo& outputTensorInfo,
                     const std::vector<unsigned int>& blockShape,
                     const std::vector<std::pair<unsigned int, unsigned int>>& cropsData,
                     const float* inputData,
                     float* outputData);
-} // namespace armnn
\ No newline at end of file
+} // namespace armnn
diff --git a/src/backends/reference/workloads/ConvImpl.hpp b/src/backends/reference/workloads/ConvImpl.hpp
index 0b9f8f70c8..b8e2deaa9c 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 @@ static void ConvImpl(ConvData data,
                                             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();
diff --git a/src/backends/reference/workloads/Pooling2d.cpp b/src/backends/reference/workloads/Pooling2d.cpp
index d2fd0da42c..a9cac32ced 100644
--- a/src/backends/reference/workloads/Pooling2d.cpp
+++ b/src/backends/reference/workloads/Pooling2d.cpp
@@ -135,6 +135,8 @@ namespace
     }
 }
 
+using namespace armnnUtils;
+
 namespace armnn
 {
 
@@ -144,7 +146,7 @@ void Pooling2d(const float* in,
                const TensorInfo& outputInfo,
                const Pooling2dDescriptor& params)
 {
-    const armnn::DataLayoutIndexed dataLayout = params.m_DataLayout;
+    const DataLayoutIndexed dataLayout = params.m_DataLayout;
     auto channelsIndex = dataLayout.GetChannelsIndex();
     auto heightIndex = dataLayout.GetHeightIndex();
     auto widthIndex = dataLayout.GetWidthIndex();
diff --git a/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.cpp b/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.cpp
index d21cfa947a..bc82739f6e 100644
--- a/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.cpp
+++ b/src/backends/reference/workloads/RefL2NormalizationFloat32Workload.cpp
@@ -12,6 +12,8 @@
 
 #include <cmath>
 
+using namespace armnnUtils;
+
 namespace armnn
 {
 
diff --git a/src/backends/reference/workloads/RefNormalizationFloat32Workload.cpp b/src/backends/reference/workloads/RefNormalizationFloat32Workload.cpp
index 4cec02338a..3a2f2b9658 100644
--- a/src/backends/reference/workloads/RefNormalizationFloat32Workload.cpp
+++ b/src/backends/reference/workloads/RefNormalizationFloat32Workload.cpp
@@ -15,6 +15,8 @@
 #include <boost/log/trivial.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
+using namespace armnnUtils;
+
 namespace armnn
 {
 
diff --git a/src/backends/reference/workloads/ResizeBilinear.cpp b/src/backends/reference/workloads/ResizeBilinear.cpp
index e098c6c20d..2d1087c9a0 100644
--- a/src/backends/reference/workloads/ResizeBilinear.cpp
+++ b/src/backends/reference/workloads/ResizeBilinear.cpp
@@ -12,6 +12,8 @@
 #include <cmath>
 #include <algorithm>
 
+using namespace armnnUtils;
+
 namespace armnn
 {
 
diff --git a/src/backends/reference/workloads/ResizeBilinear.hpp b/src/backends/reference/workloads/ResizeBilinear.hpp
index 3da88515a2..814a0f2257 100644
--- a/src/backends/reference/workloads/ResizeBilinear.hpp
+++ b/src/backends/reference/workloads/ResizeBilinear.hpp
@@ -7,15 +7,15 @@
 
 #include <armnn/Tensor.hpp>
 
-#include <backendsCommon/DataLayoutIndexed.hpp>
+#include <DataLayoutIndexed.hpp>
 
 namespace armnn
 {
 
-void ResizeBilinear(const float*      in,
-                    const TensorInfo& inputInfo,
-                    float*            out,
-                    const TensorInfo& outputInfo,
-                    DataLayoutIndexed dataLayout = DataLayout::NCHW);
+void ResizeBilinear(const float*                  in,
+                    const TensorInfo&             inputInfo,
+                    float*                        out,
+                    const TensorInfo&             outputInfo,
+                    armnnUtils::DataLayoutIndexed dataLayout = DataLayout::NCHW);
 
 } //namespace armnn
diff --git a/src/backends/reference/workloads/SpaceToBatchNd.cpp b/src/backends/reference/workloads/SpaceToBatchNd.cpp
index 6d0d004336..51e45a8c3f 100644
--- a/src/backends/reference/workloads/SpaceToBatchNd.cpp
+++ b/src/backends/reference/workloads/SpaceToBatchNd.cpp
@@ -5,7 +5,9 @@
 
 #include "SpaceToBatchNd.hpp"
 
-#include <backendsCommon/DataLayoutIndexed.hpp>
+#include <DataLayoutIndexed.hpp>
+
+using namespace armnnUtils;
 
 namespace armnn
 {
diff --git a/src/backends/reference/workloads/TensorBufferArrayView.hpp b/src/backends/reference/workloads/TensorBufferArrayView.hpp
index 5593ba6a5e..aecec6757a 100644
--- a/src/backends/reference/workloads/TensorBufferArrayView.hpp
+++ b/src/backends/reference/workloads/TensorBufferArrayView.hpp
@@ -7,10 +7,10 @@
 
 #include <armnn/Tensor.hpp>
 
-#include <backendsCommon/DataLayoutIndexed.hpp>
-
 #include <boost/assert.hpp>
 
+#include <DataLayoutIndexed.hpp>
+
 namespace armnn
 {
 
@@ -19,7 +19,8 @@ template <typename DataType>
 class TensorBufferArrayView
 {
 public:
-    TensorBufferArrayView(const TensorShape& shape, DataType* data, DataLayoutIndexed dataLayout = DataLayout::NCHW)
+    TensorBufferArrayView(const TensorShape& shape, DataType* data,
+                          armnnUtils::DataLayoutIndexed dataLayout = DataLayout::NCHW)
         : m_Shape(shape)
         , m_Data(data)
         , m_DataLayout(dataLayout)
@@ -60,9 +61,9 @@ public:
     }
 
 private:
-    const TensorShape m_Shape;
-    DataType*         m_Data;
-    DataLayoutIndexed m_DataLayout;
+    const TensorShape             m_Shape;
+    DataType*                     m_Data;
+    armnnUtils::DataLayoutIndexed m_DataLayout;
 };
 
 } //namespace armnn