diff options
| author | Kevin May <kevin.may@arm.com> | 2019-08-21 16:53:50 +0100 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2019-08-26 18:10:08 +0100 |
| commit | e5f0bc6400dfb95ad538932c74cdfc276862f2fc (patch) | |
| tree | a6cf56194988746e19bba7e43645e9203e2fc6ee /src/backends/backendsCommon/test/LayerTests.hpp | |
| parent | 00dda4a66c10a56b02bdd534ba3b5fdb27527ebc (diff) | |
| download | armnn-e5f0bc6400dfb95ad538932c74cdfc276862f2fc.tar.gz | |
IVGCVSW-3575 Fix DepthwiseConvolution VTS Test Failures
Failing VTS tests were "NeuralnetworksHidlTest.depthwise_conv2d_*"
In depthwise convolution there was a difference in weight tensor channel
order between the reference and ACL implementations. This specifically related
to NCHW. This commit:
* Adds ReorderWeightChannelsForAcl to WorkloadUtils which will correct the weight tensor channel order.
* Add unit tests to detect this problem.
Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
Change-Id: Icaeac08e14b3d5da9e222ad2f118db55ebb15d09
Diffstat (limited to 'src/backends/backendsCommon/test/LayerTests.hpp')
| -rw-r--r-- | src/backends/backendsCommon/test/LayerTests.hpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/backends/backendsCommon/test/LayerTests.hpp b/src/backends/backendsCommon/test/LayerTests.hpp index df33aa192e..235c5dcbd2 100644 --- a/src/backends/backendsCommon/test/LayerTests.hpp +++ b/src/backends/backendsCommon/test/LayerTests.hpp @@ -148,6 +148,20 @@ LayerTestResult<T, 4> DepthwiseConvolution2d2x3x3Dilation3x3Test( bool biasEnabled, const armnn::DataLayout layout); +template<armnn::DataType ArmnnType, armnn::DataType ArmnnBType, typename T = armnn::ResolveType<ArmnnType>> +LayerTestResult<T, 4> DepthwiseConvolution2dMult4Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + bool biasEnabled, + const armnn::DataLayout layout); + +template<armnn::DataType ArmnnType, armnn::DataType ArmnnBType, typename T = armnn::ResolveType<ArmnnType>> +LayerTestResult<T, 4> DepthwiseConvolution2dMult2Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + bool biasEnabled, + const armnn::DataLayout layout); + LayerTestResult<float, 4> DepthwiseConvolution2dDepthNhwcTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, |