aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJames Conroy <james.conroy@arm.com>2018-10-01 09:15:19 +0100
committerMatthew Bentham <matthew.bentham@arm.com>2018-10-10 16:16:58 +0100
commitee9e7665a5922f7ec0c5ec24d6ab2ecd88fbcfd6 (patch)
treebc1e65f452ac3997d30cc647da0d3531910a310f /include
parent616e775763280992de92287b129dc335be91a24c (diff)
downloadarmnn-ee9e7665a5922f7ec0c5ec24d6ab2ecd88fbcfd6.tar.gz
IVGCVSW-1931: Add data layout param for ResizeBilinear
* Added data layout parameter to ResizeBilinear descriptor, in order to support NHWC. Change-Id: Ifdbc4529127b7329a056d0a68e2e42b175aeea4a
Diffstat (limited to 'include')
-rw-r--r--include/armnn/Descriptors.hpp8
1 files changed, 5 insertions, 3 deletions
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