From 351d13d0b5fa698b72130012b2f069d30b911cb3 Mon Sep 17 00:00:00 2001 From: Francis Murtagh Date: Mon, 24 Sep 2018 15:01:18 +0100 Subject: IVGCVSW-1888 Plumb data layout parameter for Convolution2D * Added the DataLayout parameter to the Convolution2dDescriptor * Added the DataLayout parameter the Convolution2dQueueDescriptor * Set the DataLayout on the Descriptor in CreateWorkload() * Added overloaded factory methods for CreateTensorHandle() * Updated BuildArmComputeTensorInfo() to take DataLayout parameter. * Updated handles to take DataLayout parameter * Updated (Cl/Neon)Convolution2dWorkloadValidate * Updated (Cl/Neon)Convolution2dFloatWorkload * Updated (Cl/Neon)Convolution2dUint8Workload Change-Id: I8410668b3d727ca587bee66755cc4c4c78422f1f --- include/armnn/Descriptors.hpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/armnn/Descriptors.hpp') diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index 8940e0b003..dfd532f633 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -216,6 +216,7 @@ struct Convolution2dDescriptor , m_StrideX(0) , m_StrideY(0) , m_BiasEnabled(false) + , m_DataLayout(DataLayout::NCHW) {}; uint32_t m_PadLeft; @@ -225,6 +226,7 @@ struct Convolution2dDescriptor uint32_t m_StrideX; uint32_t m_StrideY; bool m_BiasEnabled; + DataLayout m_DataLayout; }; struct DepthwiseConvolution2dDescriptor -- cgit v1.2.1