diff options
author | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-04-02 11:41:45 +0100 |
---|---|---|
committer | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-04-02 11:48:03 +0100 |
commit | afa4e3a489df01d7f3b4d0c3f0a89a5251976bd5 (patch) | |
tree | 710bd1abc201ac06a28b4e8c9385215a94be3440 /src/backends/reference | |
parent | a0beb3b8aeb8bbea906609e0f50a250c33cde10b (diff) | |
download | armnn-afa4e3a489df01d7f3b4d0c3f0a89a5251976bd5.tar.gz |
IVGCVSW-2875 Enable QuantisedSymm16 support for ref Dequantize workload
Change-Id: I4b1c1f963214433ad67d5a311fbea5f21177f6a2
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
Diffstat (limited to 'src/backends/reference')
-rw-r--r-- | src/backends/reference/RefLayerSupport.cpp | 25 | ||||
-rw-r--r-- | src/backends/reference/RefWorkloadFactory.cpp | 2 | ||||
-rw-r--r-- | src/backends/reference/test/RefLayerTests.cpp | 4 |
3 files changed, 25 insertions, 6 deletions
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<std::string&> reasonIfUnsupported) const { - return IsSupportedForDataTypeRef(reasonIfUnsupported, - input.GetDataType(), - &FalseFunc<>, - &TrueFunc<>); + bool supported = true; + + std::array<DataType,2> supportedInputTypes = { + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 + }; + + supported &= CheckSupportRule(TypeAnyOf(input, supportedInputTypes), reasonIfUnsupported, + "Reference dequantize: input type not supported."); + + std::array<DataType,2> 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<IWorkload> RefWorkloadFactory::CreateQuantize(const QuantizeQueu std::unique_ptr<IWorkload> RefWorkloadFactory::CreateDequantize(const DequantizeQueueDescriptor& descriptor, const WorkloadInfo& info) const { - return MakeWorkload<NullWorkload, RefDequantizeWorkload>(descriptor, info); + return std::make_unique<RefDequantizeWorkload>(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) |