diff options
| author | jimfly01 <jim.flynn@arm.com> | 2018-10-25 17:05:05 +0100 |
|---|---|---|
| committer | Les Bell <les.bell@arm.com> | 2018-10-26 08:45:43 +0000 |
| commit | 0a088a61d016bf7af77e2d73d0988223a5f98ef1 (patch) | |
| tree | 0688976c774f44bd62ebbf04d0922b916ddab879 /src/backends/test/LayerTests.hpp | |
| parent | 77cec7f2077956d2ade3f0995b30ba2c46ac606d (diff) | |
| download | armnn-0a088a61d016bf7af77e2d73d0988223a5f98ef1.tar.gz | |
IVGCVSW-2074: SimpleConvolution2dTestImpl updated for NHWC
* Added a defaulted DataLayoutIndexed argument to the SimpleConvolution2dTestImpl
* Permute test data tensors just before use if necessary
* Add DataLayout to descriptor
* Added a DataLayoutIndexed argument to SimpleConvolution2d3x5TestCommon
* Added NHWC versions of the SimpleConvolution2d3x5Test for Neon and CL
Change-Id: I10e3ece42a50108baeabe4d8b0f0ac3e6d532261
Diffstat (limited to 'src/backends/test/LayerTests.hpp')
| -rw-r--r-- | src/backends/test/LayerTests.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/backends/test/LayerTests.hpp b/src/backends/test/LayerTests.hpp index ebd38419c4..6c3b9e138f 100644 --- a/src/backends/test/LayerTests.hpp +++ b/src/backends/test/LayerTests.hpp @@ -50,7 +50,8 @@ struct LayerTestResult }; LayerTestResult<float, 4> SimpleConvolution2d3x5Test(armnn::IWorkloadFactory& workloadFactory, - bool biasEnabled); + bool biasEnabled, + const armnn::DataLayoutIndexed& layout); LayerTestResult<float, 4> SimpleConvolution2d3x3Test(armnn::IWorkloadFactory& workloadFactory, bool biasEnabled); @@ -312,7 +313,8 @@ LayerTestResult<uint8_t, 4> DivisionBroadcast1ElementUint8Test(armnn::IWorkloadF LayerTestResult<uint8_t, 4> DivisionBroadcast1DVectorUint8Test(armnn::IWorkloadFactory& workloadFactory); LayerTestResult<uint8_t, 4> SimpleConvolution2d3x5Uint8Test(armnn::IWorkloadFactory& workloadFactory, - bool biasEnabled); + bool biasEnabled, + const armnn::DataLayoutIndexed& layout); LayerTestResult<uint8_t, 4> SimpleConvolution2d3x3Uint8Test(armnn::IWorkloadFactory& workloadFactory, bool biasEnabled); |