From 382a91d5029e83002bda4ab006f9c73340d679fe Mon Sep 17 00:00:00 2001
From: jimfly01 <jim.flynn@arm.com>
Date: Fri, 26 Oct 2018 15:55:50 +0100
Subject: IVGCVSW-2074: Updated DepthwiseConvolution2dAsymmetricTest for NHWC

Change-Id: I1bc8d2f270d4abfaa62e4843b8d96bcf462c6b09
---
 src/backends/test/LayerTests.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/backends/test/LayerTests.cpp')

diff --git a/src/backends/test/LayerTests.cpp b/src/backends/test/LayerTests.cpp
index bc9e116f92..43a42f305c 100755
--- a/src/backends/test/LayerTests.cpp
+++ b/src/backends/test/LayerTests.cpp
@@ -432,7 +432,8 @@ template<typename T>
 LayerTestResult<T, 4> DepthwiseConvolution2dAsymmetricTestCommon(armnn::IWorkloadFactory& workloadFactory,
                                                                  float qScale,
                                                                  int32_t qOffset,
-                                                                 bool biasEnabled)
+                                                                 bool biasEnabled,
+                                                                 const armnn::DataLayoutIndexed& layout)
 {
     // Use a single-batch 2-channel 5x5 image as input.
     armnn::TensorInfo inputTensorInfo({ 1, 2, 5, 5 }, armnn::GetDataType<T>());
@@ -490,6 +491,7 @@ LayerTestResult<T, 4> DepthwiseConvolution2dAsymmetricTestCommon(armnn::IWorkloa
         expectedOutput,
         qScale,
         qOffset,
+        layout,
         1,  // Padding left.
         1,  // Padding top.
         2,  // Padding right.
@@ -643,13 +645,14 @@ LayerTestResult<float, 4> DepthwiseConvolution2dDepthMul1Test(armnn::IWorkloadFa
 }
 
 LayerTestResult<float, 4> DepthwiseConvolution2dAsymmetricTest(armnn::IWorkloadFactory& workloadFactory,
-                                                               bool                     biasEnabled)
+                                                               bool biasEnabled,
+                                                               const armnn::DataLayoutIndexed& layout)
 {
-    return DepthwiseConvolution2dAsymmetricTestCommon<float>(workloadFactory, 0.0f, 0, biasEnabled);
+    return DepthwiseConvolution2dAsymmetricTestCommon<float>(workloadFactory, 0.0f, 0, biasEnabled, layout);
 }
 
 LayerTestResult<uint8_t, 4> DepthwiseConvolution2dUint8Test(armnn::IWorkloadFactory& workloadFactory,
-                                                            bool                     biasEnabled)
+                                                            bool biasEnabled)
 {
     return DepthwiseConvolution2dTestImpl<uint8_t, int32_t>(workloadFactory, 0.5f, 50, biasEnabled);
 }
@@ -671,7 +674,7 @@ LayerTestResult<uint8_t, 4> Convolution1dUint8Test(armnn::IWorkloadFactory& work
 }
 
 LayerTestResult<float,4> CompareConvolution2dTest(armnn::IWorkloadFactory& workloadFactory,
-                                                armnn::IWorkloadFactory& refWorkloadFactory)
+                                                  armnn::IWorkloadFactory& refWorkloadFactory)
 {
     return CompareConvolution2dTestImpl<float>(workloadFactory, refWorkloadFactory);
 }
-- 
cgit v1.2.1