From afa4e3a489df01d7f3b4d0c3f0a89a5251976bd5 Mon Sep 17 00:00:00 2001 From: Nattapat Chaimanowong Date: Tue, 2 Apr 2019 11:41:45 +0100 Subject: IVGCVSW-2875 Enable QuantisedSymm16 support for ref Dequantize workload Change-Id: I4b1c1f963214433ad67d5a311fbea5f21177f6a2 Signed-off-by: Nattapat Chaimanowong --- .../backendsCommon/test/DequantizeTestImpl.hpp | 37 ++++++++++++++++++++++ src/backends/backendsCommon/test/LayerTests.cpp | 16 +++++++++- src/backends/backendsCommon/test/LayerTests.hpp | 10 +++++- src/backends/reference/RefLayerSupport.cpp | 25 ++++++++++++--- src/backends/reference/RefWorkloadFactory.cpp | 2 +- src/backends/reference/test/RefLayerTests.cpp | 4 ++- 6 files changed, 86 insertions(+), 8 deletions(-) diff --git a/src/backends/backendsCommon/test/DequantizeTestImpl.hpp b/src/backends/backendsCommon/test/DequantizeTestImpl.hpp index 5c10c751e6..407589ab55 100644 --- a/src/backends/backendsCommon/test/DequantizeTestImpl.hpp +++ b/src/backends/backendsCommon/test/DequantizeTestImpl.hpp @@ -64,6 +64,43 @@ LayerTestResult DequantizeSimpleTest( armnn::DequantizeQueueDescriptor desc; + const armnn::TensorInfo inputTensorInfo({1, 2, 2, 3}, ArmnnInputType, 0.5f, 0); + const armnn::TensorInfo outputTensorInfo({1, 2, 2, 3}, armnn::DataType::Float32); + + std::vector inputData = std::vector( + { + 2, 4, 6, + 8, 10, 12, + 14, 16, 18, + 20, 22, 24, + }); + + std::vector expectedOutputData = std::vector( + { + 1.0f, 2.0f, 3.0f, + 4.0f, 5.0f, 6.0f, + 7.0f, 8.0f, 9.0f, + 10.0f, 11.0f, 12.0f, + }); + + return DequantizeTestImpl(workloadFactory, + memoryManager, + inputTensorInfo, + outputTensorInfo, + inputData, + expectedOutputData, + desc); +} + +template +LayerTestResult DequantizeOffsetTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + using T = armnn::ResolveType; + + armnn::DequantizeQueueDescriptor desc; + const armnn::TensorInfo inputTensorInfo({1, 2, 2, 3}, ArmnnInputType, 0.5f, 1); const armnn::TensorInfo outputTensorInfo({1, 2, 2, 3}, armnn::DataType::Float32); diff --git a/src/backends/backendsCommon/test/LayerTests.cpp b/src/backends/backendsCommon/test/LayerTests.cpp index e8fb84f534..f7c26b4009 100644 --- a/src/backends/backendsCommon/test/LayerTests.cpp +++ b/src/backends/backendsCommon/test/LayerTests.cpp @@ -8972,13 +8972,27 @@ LayerTestResult GatherMultiDimParamsMultiDimIndicesUint8Test( workloadFactory, memoryManager); } -LayerTestResult DequantizeUint8Test( +LayerTestResult DequantizeSimpleUint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { return DequantizeSimpleTest(workloadFactory, memoryManager); } +LayerTestResult DequantizeOffsetUint8Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return DequantizeOffsetTest(workloadFactory, memoryManager); +} + +LayerTestResult DequantizeSimpleInt16Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return DequantizeSimpleTest(workloadFactory, memoryManager); +} + LayerTestResult QuantizeSimpleUint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) diff --git a/src/backends/backendsCommon/test/LayerTests.hpp b/src/backends/backendsCommon/test/LayerTests.hpp index b9f73a4717..d589a40d76 100644 --- a/src/backends/backendsCommon/test/LayerTests.hpp +++ b/src/backends/backendsCommon/test/LayerTests.hpp @@ -1440,7 +1440,15 @@ LayerTestResult GatherMultiDimParamsMultiDimIndicesUint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); -LayerTestResult DequantizeUint8Test( +LayerTestResult DequantizeSimpleUint8Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult DequantizeOffsetUint8Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult DequantizeSimpleInt16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp index 4d164d58a2..d2cf6f904a 100644 --- a/src/backends/reference/RefLayerSupport.cpp +++ b/src/backends/reference/RefLayerSupport.cpp @@ -392,10 +392,27 @@ bool RefLayerSupport::IsDequantizeSupported(const TensorInfo& input, const TensorInfo& output, Optional reasonIfUnsupported) const { - return IsSupportedForDataTypeRef(reasonIfUnsupported, - input.GetDataType(), - &FalseFunc<>, - &TrueFunc<>); + bool supported = true; + + std::array supportedInputTypes = { + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 + }; + + supported &= CheckSupportRule(TypeAnyOf(input, supportedInputTypes), reasonIfUnsupported, + "Reference dequantize: input type not supported."); + + std::array supportedOutputTypes = { + DataType::Float32, + }; + + supported &= CheckSupportRule(TypeAnyOf(output, supportedOutputTypes), reasonIfUnsupported, + "Reference dequantize: output type not supported."); + + supported &= CheckSupportRule(ShapesAreSameTotalSize(input, output), reasonIfUnsupported, + "Reference dequantize: input and output shapes have different num total elements."); + + return supported; } bool RefLayerSupport::IsDetectionPostProcessSupported(const armnn::TensorInfo& input0, diff --git a/src/backends/reference/RefWorkloadFactory.cpp b/src/backends/reference/RefWorkloadFactory.cpp index 7fbd359282..619c14e007 100644 --- a/src/backends/reference/RefWorkloadFactory.cpp +++ b/src/backends/reference/RefWorkloadFactory.cpp @@ -356,7 +356,7 @@ std::unique_ptr RefWorkloadFactory::CreateQuantize(const QuantizeQueu std::unique_ptr RefWorkloadFactory::CreateDequantize(const DequantizeQueueDescriptor& descriptor, const WorkloadInfo& info) const { - return MakeWorkload(descriptor, info); + return std::make_unique(descriptor, info); } } // namespace armnn diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp index 5149b9f132..3206b762ff 100644 --- a/src/backends/reference/test/RefLayerTests.cpp +++ b/src/backends/reference/test/RefLayerTests.cpp @@ -531,7 +531,9 @@ BOOST_AUTO_TEST_CASE(DetectionPostProcessFastNmsUint8) } // Dequantize -ARMNN_AUTO_TEST_CASE(DequantizeUint8, DequantizeUint8Test) +ARMNN_AUTO_TEST_CASE(DequantizeSimpleUint8, DequantizeSimpleUint8Test) +ARMNN_AUTO_TEST_CASE(DequantizeOffsetUint8, DequantizeOffsetUint8Test) +ARMNN_AUTO_TEST_CASE(DequantizeSimpleInt16, DequantizeSimpleInt16Test) // Quantize ARMNN_AUTO_TEST_CASE(QuantizeSimpleUint8, QuantizeSimpleUint8Test) -- cgit v1.2.1