From 8800c00770ed14eb48045cfcf033d6b67595a126 Mon Sep 17 00:00:00 2001
From: Matthew Bentham <matthew.bentham@arm.com>
Date: Mon, 19 Nov 2018 13:19:28 +0000
Subject: IVGCVSW-2169 Remove DataLayoutIndexed from public API

Change-Id: If8d8087d9d365e467d3ca9bf9c40d7219cb75cfd
---
 include/armnn/Descriptors.hpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'include/armnn/Descriptors.hpp')

diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp
index 0abc7583b9..b705abe729 100644
--- a/include/armnn/Descriptors.hpp
+++ b/include/armnn/Descriptors.hpp
@@ -198,7 +198,7 @@ struct Pooling2dDescriptor
     uint32_t            m_StrideY;
     OutputShapeRounding m_OutputShapeRounding;
     PaddingMethod       m_PaddingMethod;
-    DataLayoutIndexed   m_DataLayout;
+    DataLayout   m_DataLayout;
 };
 
 struct FullyConnectedDescriptor
@@ -286,7 +286,7 @@ struct L2NormalizationDescriptor
         : m_DataLayout(DataLayout::NCHW)
     {}
 
-    DataLayoutIndexed m_DataLayout;
+    DataLayout m_DataLayout;
 };
 
 struct BatchNormalizationDescriptor
@@ -297,7 +297,7 @@ struct BatchNormalizationDescriptor
     {}
 
     float m_Eps;
-    DataLayoutIndexed m_DataLayout;
+    DataLayout m_DataLayout;
 };
 
 struct BatchToSpaceNdDescriptor
@@ -316,7 +316,7 @@ struct BatchToSpaceNdDescriptor
 
     std::vector<unsigned int> m_BlockShape;
     std::vector<std::pair<unsigned int, unsigned int>> m_Crops;
-    DataLayoutIndexed m_DataLayout;
+    DataLayout m_DataLayout;
 };
 
 struct FakeQuantizationDescriptor
@@ -340,7 +340,7 @@ struct ResizeBilinearDescriptor
 
     uint32_t          m_TargetWidth;
     uint32_t          m_TargetHeight;
-    DataLayoutIndexed m_DataLayout;
+    DataLayout m_DataLayout;
 };
 
 struct ReshapeDescriptor
@@ -371,7 +371,7 @@ struct SpaceToBatchNdDescriptor
 
     std::vector<unsigned int> m_BlockShape;
     std::vector<std::pair<unsigned int, unsigned int>> m_PadList;
-    DataLayoutIndexed m_DataLayout;
+    DataLayout m_DataLayout;
 };
 
 // temporary descriptor for Lstm
@@ -455,7 +455,7 @@ struct StridedSliceDescriptor
     int32_t m_EllipsisMask;
     int32_t m_NewAxisMask;
 
-    DataLayoutIndexed m_DataLayout;
+    DataLayout m_DataLayout;
 };
 
 }
-- 
cgit v1.2.1