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.cpp | |
| 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.cpp')
| -rwxr-xr-x | src/backends/test/LayerTests.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/backends/test/LayerTests.cpp b/src/backends/test/LayerTests.cpp index e5a4258043..e536cc9798 100755 --- a/src/backends/test/LayerTests.cpp +++ b/src/backends/test/LayerTests.cpp @@ -85,7 +85,8 @@ template<typename T> LayerTestResult<T, 4> SimpleConvolution2d3x5TestCommon(armnn::IWorkloadFactory& workloadFactory, float qScale, int32_t qOffset, - bool biasEnabled) + bool biasEnabled, + const armnn::DataLayoutIndexed& layout) { // Use common single-batch 3-channel 16x8 image. armnn::TensorInfo inputDesc({1, 3, 8, 16}, armnn::GetDataType<T>()); @@ -156,7 +157,8 @@ LayerTestResult<T, 4> SimpleConvolution2d3x5TestCommon(armnn::IWorkloadFactory& GetBias2<typename FullyConnectedBiasTypeForInputType<T>::Type>(biasEnabled, qScale, qOffset), expectedOutput, qScale, - qOffset); + qOffset, + layout); } template<typename T> @@ -278,15 +280,17 @@ LayerTestResult<T, 4> SimpleConvolution2d3x3NhwcTestCommon(armnn::IWorkloadFacto } LayerTestResult<float, 4> SimpleConvolution2d3x5Test(armnn::IWorkloadFactory& workloadFactory, - bool biasEnabled) + bool biasEnabled, + const armnn::DataLayoutIndexed& layout) { - return SimpleConvolution2d3x5TestCommon<float>(workloadFactory, 0.f, 0, biasEnabled); + return SimpleConvolution2d3x5TestCommon<float>(workloadFactory, 0.f, 0, biasEnabled, layout); } LayerTestResult<uint8_t, 4> SimpleConvolution2d3x5Uint8Test(armnn::IWorkloadFactory& workloadFactory, - bool biasEnabled) + bool biasEnabled, + const armnn::DataLayoutIndexed& layout) { - return SimpleConvolution2d3x5TestCommon<uint8_t>(workloadFactory, 0.5f, 50, biasEnabled); + return SimpleConvolution2d3x5TestCommon<uint8_t>(workloadFactory, 0.5f, 50, biasEnabled, layout); } LayerTestResult<float, 4> SimpleConvolution2d3x3Test(armnn::IWorkloadFactory& workloadFactory, @@ -359,6 +363,7 @@ LayerTestResult<T, 4> Convolution2dAsymmetricPaddingLargerThanHalfKernelSizeTest expectedOutput, qScale, qOffset, + armnn::DataLayout::NCHW, 1, // Padding left. 2, // Padding top. 3, // Padding right. @@ -410,6 +415,7 @@ LayerTestResult<T, 4> SimpleConvolution2dAsymmetricPaddingTestCommon(armnn::IWor expectedOutput, qScale, qOffset, + armnn::DataLayout::NCHW, 1, // Padding left. 1, // Padding top. 2, // Padding right. |