diff options
| author | Francis Murtagh <francis.murtagh@arm.com> | 2019-08-09 13:20:50 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-08-09 12:57:48 +0000 |
| commit | b3fc252b0763a847354c88d1a33f8f48d3c5a10c (patch) | |
| tree | 8e9b8d4b0603756989f5efcdaf311689accd1b5d /src/backends/cl | |
| parent | 6b4dfc2df9271b2e9e0b9e0e0a78f715ddebf36e (diff) | |
| download | armnn-b3fc252b0763a847354c88d1a33f8f48d3c5a10c.tar.gz | |
IVGCVSW-3474 Add end to end tests for Quantized_LSTM
Change-Id: Iaec6956b5c459308d77d29f699ae4558bee66cd5
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Diffstat (limited to 'src/backends/cl')
| -rw-r--r-- | src/backends/cl/ClLayerSupport.cpp | 14 | ||||
| -rw-r--r-- | src/backends/cl/ClWorkloadFactory.cpp | 5 | ||||
| -rw-r--r-- | src/backends/cl/test/ClEndToEndTests.cpp | 6 |
3 files changed, 10 insertions, 15 deletions
diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp index 811bf8ada7..625d2348be 100644 --- a/src/backends/cl/ClLayerSupport.cpp +++ b/src/backends/cl/ClLayerSupport.cpp @@ -382,10 +382,7 @@ bool ClLayerSupport::IsGreaterSupported(const TensorInfo& input0, bool ClLayerSupport::IsInputSupported(const TensorInfo& input, Optional<std::string&> reasonIfUnsupported) const { - return IsSupportedForDataTypeCl(reasonIfUnsupported, - input.GetDataType(), - &TrueFunc<>, - &TrueFunc<>); + return IsClBackendSupported(reasonIfUnsupported); } bool ClLayerSupport::IsL2NormalizationSupported(const TensorInfo& input, @@ -491,14 +488,7 @@ bool ClLayerSupport::IsNormalizationSupported(const TensorInfo& input, bool ClLayerSupport::IsOutputSupported(const TensorInfo& output, Optional<std::string&> reasonIfUnsupported) const { - return IsClBackendSupported(reasonIfUnsupported) && - IsSupportedForDataTypeGeneric(reasonIfUnsupported, - output.GetDataType(), - &TrueFunc<>, - &TrueFunc<>, - &TrueFunc<>, - &FalseFuncI32<>, - &TrueFunc<>); + return IsClBackendSupported(reasonIfUnsupported); } bool ClLayerSupport::IsPadSupported(const TensorInfo& input, diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index 6e91dd07a5..ca3c30d61a 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -127,14 +127,13 @@ std::unique_ptr<ITensorHandle> ClWorkloadFactory::CreateSubTensorHandle(ITensorH std::unique_ptr<IWorkload> ClWorkloadFactory::CreateInput(const InputQueueDescriptor& descriptor, const WorkloadInfo& info) const { - return MakeWorkload<CopyMemGenericWorkload, CopyMemGenericWorkload>(descriptor, info); + return std::make_unique<CopyMemGenericWorkload>(descriptor, info); } std::unique_ptr<IWorkload> ClWorkloadFactory::CreateOutput(const OutputQueueDescriptor& descriptor, const WorkloadInfo& info) const { - return MakeWorkloadHelper<CopyMemGenericWorkload, CopyMemGenericWorkload, CopyMemGenericWorkload, NullWorkload, - CopyMemGenericWorkload>(descriptor, info); + return std::make_unique<CopyMemGenericWorkload>(descriptor, info); } std::unique_ptr<IWorkload> ClWorkloadFactory::CreateActivation(const ActivationQueueDescriptor& descriptor, diff --git a/src/backends/cl/test/ClEndToEndTests.cpp b/src/backends/cl/test/ClEndToEndTests.cpp index 06c24a3439..c33190f67c 100644 --- a/src/backends/cl/test/ClEndToEndTests.cpp +++ b/src/backends/cl/test/ClEndToEndTests.cpp @@ -9,6 +9,7 @@ #include <backendsCommon/test/ConcatTestImpl.hpp> #include <backendsCommon/test/DequantizeEndToEndTestImpl.hpp> #include <backendsCommon/test/PreluEndToEndTestImpl.hpp> +#include <backendsCommon/test/QuantizedLstmEndToEndTestImpl.hpp> #include <backendsCommon/test/SpaceToDepthEndToEndTestImpl.hpp> #include <backendsCommon/test/SplitterEndToEndTestImpl.hpp> #include <backendsCommon/test/TransposeConvolution2dEndToEndTestImpl.hpp> @@ -259,4 +260,9 @@ BOOST_AUTO_TEST_CASE(ClTransposeConvolution2dEndToEndUint8NhwcTest) defaultBackends, armnn::DataLayout::NHWC); } +BOOST_AUTO_TEST_CASE(ClQuantizedLstmEndToEndTest) +{ + QuantizedLstmEndToEnd(defaultBackends); +} + BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file |