From 351d13d0b5fa698b72130012b2f069d30b911cb3 Mon Sep 17 00:00:00 2001
From: Francis Murtagh <francis.murtagh@arm.com>
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/backends/WorkloadData.hpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/backends/WorkloadData.hpp')

diff --git a/src/backends/WorkloadData.hpp b/src/backends/WorkloadData.hpp
index b5b0402237..5da9e8b1fd 100644
--- a/src/backends/WorkloadData.hpp
+++ b/src/backends/WorkloadData.hpp
@@ -142,11 +142,13 @@ struct Convolution2dQueueDescriptor : QueueDescriptorWithParameters<Convolution2
     Convolution2dQueueDescriptor()
         : m_Weight(nullptr)
         , m_Bias(nullptr)
+        , m_DataLayout(DataLayout::NCHW)
     {
     }
 
     const ConstCpuTensorHandle* m_Weight;
     const ConstCpuTensorHandle* m_Bias;
+    DataLayout m_DataLayout;
 
     void Validate(const WorkloadInfo& workloadInfo) const;
 };
-- 
cgit v1.2.1