diff options
| author | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2019-06-04 11:22:00 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-06-04 15:07:40 +0000 |
| commit | b6441e462e18e7e89c05b098d95dfcede90c9c7f (patch) | |
| tree | 9cf787ceb5a8fbde41f9e59c546b59d05c97ee69 | |
| parent | 33732f64df7d3ed014354806f1b855014501be05 (diff) | |
| download | armnn-b6441e462e18e7e89c05b098d95dfcede90c9c7f.tar.gz | |
Add support for all data type for input and output layers
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I688f4db5f5950877ad88f637cf71c05270fd5338
| -rw-r--r-- | src/backends/reference/RefLayerSupport.cpp | 13 | ||||
| -rw-r--r-- | src/backends/reference/RefWorkloadFactory.cpp | 5 | ||||
| -rw-r--r-- | src/backends/reference/test/RefEndToEndTests.cpp | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp index 1d0b230c77..edd552b2ac 100644 --- a/src/backends/reference/RefLayerSupport.cpp +++ b/src/backends/reference/RefLayerSupport.cpp @@ -701,10 +701,7 @@ bool RefLayerSupport::IsGreaterSupported(const TensorInfo& input0, bool RefLayerSupport::IsInputSupported(const TensorInfo& input, Optional<std::string&> reasonIfUnsupported) const { - return IsSupportedForDataTypeRef(reasonIfUnsupported, - input.GetDataType(), - &TrueFunc<>, - &TrueFunc<>); + return true; } bool RefLayerSupport::IsL2NormalizationSupported(const TensorInfo& input, @@ -950,13 +947,7 @@ bool RefLayerSupport::IsNormalizationSupported(const TensorInfo& input, bool RefLayerSupport::IsOutputSupported(const TensorInfo& output, Optional<std::string&> reasonIfUnsupported) const { - return IsSupportedForDataTypeGeneric(reasonIfUnsupported, - output.GetDataType(), - &TrueFunc<>, - &TrueFunc<>, - &TrueFunc<>, - &FalseFuncI32<>, - &TrueFunc<>); + return true; } bool RefLayerSupport::IsPadSupported(const TensorInfo& input, diff --git a/src/backends/reference/RefWorkloadFactory.cpp b/src/backends/reference/RefWorkloadFactory.cpp index 500c14b244..161065550d 100644 --- a/src/backends/reference/RefWorkloadFactory.cpp +++ b/src/backends/reference/RefWorkloadFactory.cpp @@ -87,7 +87,7 @@ std::unique_ptr<IWorkload> RefWorkloadFactory::CreateInput(const InputQueueDescr throw InvalidArgumentException("RefWorkloadFactory::CreateInput: data input and output differ in byte count."); } - return MakeWorkload<CopyMemGenericWorkload, CopyMemGenericWorkload>(descriptor, info); + return std::make_unique<CopyMemGenericWorkload>(descriptor, info); } std::unique_ptr<IWorkload> RefWorkloadFactory::CreateOutput(const OutputQueueDescriptor& descriptor, @@ -106,8 +106,7 @@ std::unique_ptr<IWorkload> RefWorkloadFactory::CreateOutput(const OutputQueueDes throw InvalidArgumentException("RefWorkloadFactory::CreateOutput: data input and output differ in byte count."); } - return MakeWorkloadHelper<CopyMemGenericWorkload, CopyMemGenericWorkload, - CopyMemGenericWorkload, NullWorkload, CopyMemGenericWorkload>(descriptor, info); + return std::make_unique<CopyMemGenericWorkload>(descriptor, info); } std::unique_ptr<IWorkload> RefWorkloadFactory::CreateActivation(const ActivationQueueDescriptor& descriptor, diff --git a/src/backends/reference/test/RefEndToEndTests.cpp b/src/backends/reference/test/RefEndToEndTests.cpp index 8e75eba021..885773d5e9 100644 --- a/src/backends/reference/test/RefEndToEndTests.cpp +++ b/src/backends/reference/test/RefEndToEndTests.cpp @@ -467,6 +467,16 @@ BOOST_AUTO_TEST_CASE(DequantizeEndToEndOffsetTest) DequantizeEndToEndOffset<armnn::DataType::QuantisedAsymm8>(defaultBackends); } +BOOST_AUTO_TEST_CASE(DequantizeEndToEndSimpleInt16Test) +{ + DequantizeEndToEndSimple<armnn::DataType::QuantisedSymm16>(defaultBackends); +} + +BOOST_AUTO_TEST_CASE(DequantizeEndToEndOffsetInt16Test) +{ + DequantizeEndToEndOffset<armnn::DataType::QuantisedSymm16>(defaultBackends); +} + BOOST_AUTO_TEST_CASE(RefDetectionPostProcessRegularNmsTest) { std::vector<float> boxEncodings({ |