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 --- src/armnn/layers/Convolution2dLayer.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/armnn') diff --git a/src/armnn/layers/Convolution2dLayer.cpp b/src/armnn/layers/Convolution2dLayer.cpp index 71f54b88f8..07d6d7eee4 100644 --- a/src/armnn/layers/Convolution2dLayer.cpp +++ b/src/armnn/layers/Convolution2dLayer.cpp @@ -26,6 +26,9 @@ std::unique_ptr Convolution2dLayer::CreateWorkload(const Graph& graph Convolution2dQueueDescriptor descriptor; descriptor.m_Weight = m_Weight.get(); + + descriptor.m_DataLayout = GetParameters().m_DataLayout; + if (m_Param.m_BiasEnabled) { BOOST_ASSERT_MSG(m_Bias != nullptr, "Convolution2dLayer: Bias data should not be null."); -- cgit v1.2.1