From d59116ecb54c5bfe828d82ea0bc3367bc9b8c5dd Mon Sep 17 00:00:00 2001
From: Francis Murtagh <francis.murtagh@arm.com>
Date: Thu, 4 Oct 2018 16:03:07 +0100
Subject: IVGCVSW-1889 - Unit test Convolution2d with NHWC

	* Added simple convolution Unit test
	* Set the data layout correctly in workloads

Change-Id: Ie71b8415f6abc392a84900fc4438b7416fbb558a
---
 src/armnn/layers/Convolution2dLayer.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/armnn/layers')

diff --git a/src/armnn/layers/Convolution2dLayer.cpp b/src/armnn/layers/Convolution2dLayer.cpp
index 07d6d7eee4..d4b67cca3f 100644
--- a/src/armnn/layers/Convolution2dLayer.cpp
+++ b/src/armnn/layers/Convolution2dLayer.cpp
@@ -27,8 +27,6 @@ std::unique_ptr<IWorkload> Convolution2dLayer::CreateWorkload(const Graph& graph
 
     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