aboutsummaryrefslogtreecommitdiff
path: root/src/backends/test/LayerTests.hpp
diff options
context:
space:
mode:
authornarpra01 <narumol.prangnawarat@arm.com>2018-10-26 16:24:58 +0100
committerMatteo Martincigh <matteo.martincigh@arm.com>2018-10-26 16:23:42 +0000
commit5f70318b08907eb1612dbe88d53857110909cb42 (patch)
treeb900688ba4d60bc891d47b2c303d33182197ec0c /src/backends/test/LayerTests.hpp
parent29fe58b6e6f221273b8f5e2af4133f243f7b7787 (diff)
downloadarmnn-5f70318b08907eb1612dbe88d53857110909cb42.tar.gz
IVGCVSW-2069 - Implement NHWC Convolution2D for CpuRef
* Calculate index for NHWC to compute Convolution * add more unit test for NHWC Change-Id: I800d649b9b42be2758c445e3b3e76142888c1377
Diffstat (limited to 'src/backends/test/LayerTests.hpp')
-rw-r--r--src/backends/test/LayerTests.hpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/backends/test/LayerTests.hpp b/src/backends/test/LayerTests.hpp
index 6c3b9e138f..8846297ff1 100644
--- a/src/backends/test/LayerTests.hpp
+++ b/src/backends/test/LayerTests.hpp
@@ -54,18 +54,23 @@ LayerTestResult<float, 4> SimpleConvolution2d3x5Test(armnn::IWorkloadFactory& wo
const armnn::DataLayoutIndexed& layout);
LayerTestResult<float, 4> SimpleConvolution2d3x3Test(armnn::IWorkloadFactory& workloadFactory,
- bool biasEnabled);
+ bool biasEnabled,
+ const armnn::DataLayoutIndexed& layout);
LayerTestResult<float, 4> SimpleConvolution2d3x3NhwcTest(armnn::IWorkloadFactory& workloadFactory,
bool biasEnabled);
LayerTestResult<float, 4>
-Convolution2dAsymmetricPaddingLargerThanHalfKernelSizeTest(armnn::IWorkloadFactory& workloadFactory);
-LayerTestResult<float, 4> Convolution2dAsymmetricPaddingTest(armnn::IWorkloadFactory& workloadFactory);
+Convolution2dAsymmetricPaddingLargerThanHalfKernelSizeTest(armnn::IWorkloadFactory& workloadFactory,
+ const armnn::DataLayoutIndexed& layout);
+LayerTestResult<float, 4> Convolution2dAsymmetricPaddingTest(armnn::IWorkloadFactory& workloadFactory,
+ const armnn::DataLayoutIndexed& layout);
-LayerTestResult<float, 4> Convolution1dTest(armnn::IWorkloadFactory& workloadFactory, bool biasEnabled);
-LayerTestResult<uint8_t, 4> Convolution1dUint8Test(armnn::IWorkloadFactory& workloadFactory, bool biasEnabled);
+LayerTestResult<float, 4> Convolution1dTest(armnn::IWorkloadFactory& workloadFactory,
+ bool biasEnabled);
+LayerTestResult<uint8_t, 4> Convolution1dUint8Test(armnn::IWorkloadFactory& workloadFactory,
+ bool biasEnabled);
LayerTestResult<float, 4> DepthwiseConvolution2dTest(armnn::IWorkloadFactory& workloadFactory, bool biasEnabled);
@@ -317,7 +322,8 @@ LayerTestResult<uint8_t, 4> SimpleConvolution2d3x5Uint8Test(armnn::IWorkloadFact
const armnn::DataLayoutIndexed& layout);
LayerTestResult<uint8_t, 4> SimpleConvolution2d3x3Uint8Test(armnn::IWorkloadFactory& workloadFactory,
- bool biasEnabled);
+ bool biasEnabled,
+ const armnn::DataLayoutIndexed& layout);
LayerTestResult<uint8_t, 4> DepthwiseConvolution2dUint8Test(armnn::IWorkloadFactory& workloadFactory,
bool biasEnabled);