diff options
| author | Francis Murtagh <francis.murtagh@arm.com> | 2018-09-24 15:01:18 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-10 16:16:57 +0100 |
| commit | 351d13d0b5fa698b72130012b2f069d30b911cb3 (patch) | |
| tree | b9417a78336e3e1b4c7d8775a2b3fd5bce0d624a /src/armnn | |
| parent | 2ca4696639c9d2361b24adbd9a33225d18527fde (diff) | |
| download | armnn-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 'src/armnn')
| -rw-r--r-- | src/armnn/layers/Convolution2dLayer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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<IWorkload> 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."); |