From ee9e7665a5922f7ec0c5ec24d6ab2ecd88fbcfd6 Mon Sep 17 00:00:00 2001
From: James Conroy <james.conroy@arm.com>
Date: Mon, 1 Oct 2018 09:15:19 +0100
Subject: IVGCVSW-1931: Add data layout param for ResizeBilinear

* Added data layout parameter to ResizeBilinear
  descriptor, in order to support NHWC.

Change-Id: Ifdbc4529127b7329a056d0a68e2e42b175aeea4a
---
 include/armnn/Descriptors.hpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'include/armnn')

diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp
index 30c8144220..2de031e94a 100644
--- a/include/armnn/Descriptors.hpp
+++ b/include/armnn/Descriptors.hpp
@@ -92,7 +92,7 @@ struct ViewsDescriptor
     friend void swap(ViewsDescriptor& first, ViewsDescriptor& second);
 private:
     OriginsDescriptor m_Origins;
-    uint32_t** m_ViewSizes;
+    uint32_t**        m_ViewSizes;
 };
 
 /// Convenience template to create an OriginsDescriptor to use when creating a Merger layer for performing concatenation
@@ -308,10 +308,12 @@ struct ResizeBilinearDescriptor
     ResizeBilinearDescriptor()
     : m_TargetWidth(0)
     , m_TargetHeight(0)
+    , m_DataLayout(DataLayout::NCHW)
     {}
 
-    uint32_t m_TargetWidth;
-    uint32_t m_TargetHeight;
+    uint32_t   m_TargetWidth;
+    uint32_t   m_TargetHeight;
+    DataLayout m_DataLayout;
 };
 
 struct ReshapeDescriptor
-- 
cgit v1.2.1