aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorFrancis Murtagh <francis.murtagh@arm.com>2018-09-24 15:01:18 +0100
committerMatthew Bentham <matthew.bentham@arm.com>2018-10-10 16:16:57 +0100
commit351d13d0b5fa698b72130012b2f069d30b911cb3 (patch)
treeb9417a78336e3e1b4c7d8775a2b3fd5bce0d624a /include
parent2ca4696639c9d2361b24adbd9a33225d18527fde (diff)
downloadarmnn-351d13d0b5fa698b72130012b2f069d30b911cb3.tar.gz
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
Diffstat (limited to 'include')
-rw-r--r--include/armnn/Descriptors.hpp2
1 files changed, 2 insertions, 0 deletions
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