diff options
| author | Kevin May <kevin.may@arm.com> | 2020-04-24 09:42:31 +0100 |
|---|---|---|
| committer | Kevin May <kevin.may@arm.com> | 2020-04-24 13:46:49 +0100 |
| commit | ec52c3a04134e286d43cd2d22b916302f784ad29 (patch) | |
| tree | b0f64dc99993d6d4f61813e1ac54a3b135cf030b | |
| parent | 5302f5ef9d72437a3a1acc93cd503e6da4fc6b77 (diff) | |
| download | armnn-ec52c3a04134e286d43cd2d22b916302f784ad29.tar.gz | |
IVGCVSW-4686 Fix NNT GeneratedTests Abs_int32
* Add Signed32 to WorkloadData for AbsQueueDescriptor
* Add missing supported tests to Ref and Neon
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: Iba9d29fedeb1d2e985272c9299ea42ba2571687b
| -rw-r--r-- | src/backends/backendsCommon/WorkloadData.cpp | 3 | ||||
| -rw-r--r-- | src/backends/backendsCommon/test/layerTests/AbsTestImpl.cpp | 17 | ||||
| -rw-r--r-- | src/backends/neon/test/NeonLayerTests.cpp | 5 | ||||
| -rw-r--r-- | src/backends/reference/test/RefLayerTests.cpp | 4 |
4 files changed, 26 insertions, 3 deletions
diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index 1f4a849ee9..5fe056e669 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -3011,7 +3011,8 @@ void AbsQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const DataType::Float16, DataType::Float32, DataType::QAsymmU8, - DataType::QSymmS16 + DataType::QSymmS16, + DataType::Signed32 }; ValidateDataTypes(inputTensorInfo, supportedTypes, descriptorName); diff --git a/src/backends/backendsCommon/test/layerTests/AbsTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/AbsTestImpl.cpp index 7706809e8b..e6c6a96a9f 100644 --- a/src/backends/backendsCommon/test/layerTests/AbsTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/AbsTestImpl.cpp @@ -109,6 +109,11 @@ Abs2dTest<armnn::DataType::Float16>( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); +template LayerTestResult<armnn::ResolveType<armnn::DataType::Signed32>, 2> +Abs2dTest<armnn::DataType::Signed32>( + armnn::IWorkloadFactory& workloadFactory, +const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmU8>, 2> Abs2dTest<armnn::DataType::QAsymmU8>( armnn::IWorkloadFactory& workloadFactory, @@ -129,6 +134,11 @@ Abs3dTest<armnn::DataType::Float16>( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); +template LayerTestResult<armnn::ResolveType<armnn::DataType::Signed32>, 3> +Abs3dTest<armnn::DataType::Signed32>( + armnn::IWorkloadFactory& workloadFactory, +const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmU8>, 3> Abs3dTest<armnn::DataType::QAsymmU8>( armnn::IWorkloadFactory& workloadFactory, @@ -147,4 +157,9 @@ AbsZeroTest<armnn::DataType::Float32>( template LayerTestResult<armnn::ResolveType<armnn::DataType::Float16>, 2> AbsZeroTest<armnn::DataType::Float16>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager);
\ No newline at end of file + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +template LayerTestResult<armnn::ResolveType<armnn::DataType::Signed32>, 2> +AbsZeroTest<armnn::DataType::Signed32>( + armnn::IWorkloadFactory& workloadFactory, +const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager);
\ No newline at end of file diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index 20644fe47f..f4df76c41e 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -1096,9 +1096,12 @@ ARMNN_AUTO_TEST_CASE(MultiChannelTransposeConvolution2dUint8Nhwc, // Abs ARMNN_AUTO_TEST_CASE(Abs2d, Abs2dTest<DataType::Float32>) ARMNN_AUTO_TEST_CASE(Abs3d, Abs3dTest<DataType::Float32>) - ARMNN_AUTO_TEST_CASE(AbsZero, AbsZeroTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE(Abs2dSigned32, Abs2dTest<DataType::Signed32>) +ARMNN_AUTO_TEST_CASE(Abs3dSigned32, Abs3dTest<DataType::Signed32>) +ARMNN_AUTO_TEST_CASE(AbsZeroSigned32, AbsZeroTest<DataType::Signed32>) + // Rsqrt ARMNN_AUTO_TEST_CASE(Rsqrt2d, Rsqrt2dTest<DataType::Float32>) ARMNN_AUTO_TEST_CASE(Rsqrt3d, Rsqrt3dTest<DataType::Float32>) diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp index 6bcd7e3ed5..bcace79493 100644 --- a/src/backends/reference/test/RefLayerTests.cpp +++ b/src/backends/reference/test/RefLayerTests.cpp @@ -1464,6 +1464,10 @@ ARMNN_AUTO_TEST_CASE(Abs3d, Abs3dTest<DataType::Float32>) ARMNN_AUTO_TEST_CASE(AbsZero, AbsZeroTest<DataType::Float32>) ARMNN_AUTO_TEST_CASE(Abs2dFloat16, Abs2dTest<DataType::Float16>) ARMNN_AUTO_TEST_CASE(Abs3dFloat16, Abs3dTest<DataType::Float16>) +ARMNN_AUTO_TEST_CASE(Abs2dSigned32, Abs2dTest<DataType::Signed32>) +ARMNN_AUTO_TEST_CASE(Abs3dSigned32, Abs3dTest<DataType::Signed32>) +ARMNN_AUTO_TEST_CASE(AbsZeroSigned32, AbsZeroTest<DataType::Signed32>) + ARMNN_AUTO_TEST_CASE(Abs2dQuantisedAsymm8, Abs2dTest<DataType::QAsymmU8>) ARMNN_AUTO_TEST_CASE(Abs3dQuantisedAsymm8, Abs3dTest<DataType::QAsymmU8>) ARMNN_AUTO_TEST_CASE(Abs2dQuantisedSymm16, Abs2dTest<DataType::QSymmS16>) |