From 20ec2497c4059e39f43a38ceb2ba99f1a7b760f1 Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Fri, 31 May 2019 09:09:44 +0100 Subject: IVGCVSW-3186 Add ClQuantizeWorkload * Added ClQuantizeWorkload to enable quantization on CL backend Signed-off-by: Sadik Armagan Change-Id: Id49d5ec29514f6f853c2500a34b1a12444c49168 --- src/backends/cl/ClLayerSupport.cpp | 11 ++++++ src/backends/cl/ClLayerSupport.hpp | 4 ++ src/backends/cl/ClWorkloadFactory.cpp | 7 ++-- src/backends/cl/ClWorkloadFactory.hpp | 4 +- src/backends/cl/backend.mk | 1 + src/backends/cl/test/ClLayerTests.cpp | 4 ++ src/backends/cl/workloads/CMakeLists.txt | 2 + src/backends/cl/workloads/ClQuantizeWorkload.cpp | 47 ++++++++++++++++++++++++ src/backends/cl/workloads/ClQuantizeWorkload.hpp | 28 ++++++++++++++ src/backends/cl/workloads/ClWorkloads.hpp | 1 + 10 files changed, 103 insertions(+), 6 deletions(-) create mode 100644 src/backends/cl/workloads/ClQuantizeWorkload.cpp create mode 100644 src/backends/cl/workloads/ClQuantizeWorkload.hpp diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp index 78ac0e628c..48953026a1 100644 --- a/src/backends/cl/ClLayerSupport.cpp +++ b/src/backends/cl/ClLayerSupport.cpp @@ -38,6 +38,7 @@ #include "workloads/ClPadWorkload.hpp" #include "workloads/ClPermuteWorkload.hpp" #include "workloads/ClPooling2dWorkload.hpp" +#include "workloads/ClQuantizeWorkload.hpp" #include "workloads/ClSoftmaxBaseWorkload.hpp" #include "workloads/ClSpaceToBatchNdWorkload.hpp" #include "workloads/ClSplitterWorkload.hpp" @@ -554,6 +555,16 @@ bool ClLayerSupport::IsPooling2dSupported(const TensorInfo& input, FORWARD_WORKLOAD_VALIDATE_FUNC(ClPooling2dWorkloadValidate, reasonIfUnsupported, input, output, descriptor); } +bool ClLayerSupport::IsQuantizeSupported(const TensorInfo& input, + const TensorInfo& output, + Optional reasonIfUnsupported) const +{ + FORWARD_WORKLOAD_VALIDATE_FUNC(ClQuantizeWorkloadValidate, + reasonIfUnsupported, + input, + output); +} + bool ClLayerSupport::IsReshapeSupported(const TensorInfo& input, const ReshapeDescriptor& descriptor, Optional reasonIfUnsupported) const diff --git a/src/backends/cl/ClLayerSupport.hpp b/src/backends/cl/ClLayerSupport.hpp index 64c1079621..f8a9a96f0f 100644 --- a/src/backends/cl/ClLayerSupport.hpp +++ b/src/backends/cl/ClLayerSupport.hpp @@ -182,6 +182,10 @@ public: const Pooling2dDescriptor& descriptor, Optional reasonIfUnsupported = EmptyOptional()) const override; + bool IsQuantizeSupported(const TensorInfo& input, + const TensorInfo& output, + Optional reasonIfUnsupported = EmptyOptional()) const override; + bool IsReshapeSupported(const TensorInfo& input, const ReshapeDescriptor& descriptor, Optional reasonIfUnsupported = EmptyOptional()) const override; diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index 214b88deba..e3ce73f04f 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -252,11 +252,10 @@ std::unique_ptr ClWorkloadFactory::CreateResizeBilinear( return MakeWorkload(descriptor, info); } -std::unique_ptr ClWorkloadFactory::CreateFakeQuantization( - const FakeQuantizationQueueDescriptor& descriptor, - const WorkloadInfo& info) const +std::unique_ptr ClWorkloadFactory::CreateQuantize(const QuantizeQueueDescriptor& descriptor, + const WorkloadInfo& info) const { - return nullptr; + return std::make_unique(descriptor, info); } std::unique_ptr ClWorkloadFactory::CreateL2Normalization(const L2NormalizationQueueDescriptor& descriptor, diff --git a/src/backends/cl/ClWorkloadFactory.hpp b/src/backends/cl/ClWorkloadFactory.hpp index 27221713c1..9d38ac74c9 100644 --- a/src/backends/cl/ClWorkloadFactory.hpp +++ b/src/backends/cl/ClWorkloadFactory.hpp @@ -91,8 +91,8 @@ public: std::unique_ptr CreateResizeBilinear(const ResizeBilinearQueueDescriptor& descriptor, const WorkloadInfo& info) const override; - std::unique_ptr CreateFakeQuantization(const FakeQuantizationQueueDescriptor& descriptor, - const WorkloadInfo& info) const override; + std::unique_ptr CreateQuantize(const QuantizeQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; std::unique_ptr CreateL2Normalization(const L2NormalizationQueueDescriptor& descriptor, const WorkloadInfo& info) const override; diff --git a/src/backends/cl/backend.mk b/src/backends/cl/backend.mk index 7539f3ebf8..f5994c74ad 100644 --- a/src/backends/cl/backend.mk +++ b/src/backends/cl/backend.mk @@ -44,6 +44,7 @@ BACKEND_SOURCES := \ workloads/ClPadWorkload.cpp \ workloads/ClPermuteWorkload.cpp \ workloads/ClPooling2dWorkload.cpp \ + workloads/ClQuantizeWorkload.cpp \ workloads/ClReshapeWorkload.cpp \ workloads/ClResizeBilinearFloatWorkload.cpp \ workloads/ClSoftmaxBaseWorkload.cpp \ diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index 23c975e668..ad87e953c8 100644 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -432,6 +432,10 @@ ARMNN_AUTO_TEST_CASE(StridedSlice3DReverseUint8, StridedSlice3DReverseUint8Test) ARMNN_AUTO_TEST_CASE(StridedSlice2DUint8, StridedSlice2DUint8Test) ARMNN_AUTO_TEST_CASE(StridedSlice2DReverseUint8, StridedSlice2DReverseUint8Test) +// Quantize +ARMNN_AUTO_TEST_CASE(QuantizeSimpleUint8, QuantizeSimpleUint8Test) +ARMNN_AUTO_TEST_CASE(QuantizeClampUint8, QuantizeClampUint8Test) + // ============================================================================ // COMPARE tests diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt index a3eedd028e..23668c564b 100644 --- a/src/backends/cl/workloads/CMakeLists.txt +++ b/src/backends/cl/workloads/CMakeLists.txt @@ -52,6 +52,8 @@ list(APPEND armnnClBackendWorkloads_sources ClPermuteWorkload.hpp ClPooling2dWorkload.cpp ClPooling2dWorkload.hpp + ClQuantizeWorkload.cpp + ClQuantizeWorkload.hpp ClReshapeWorkload.cpp ClReshapeWorkload.hpp ClResizeBilinearFloatWorkload.cpp diff --git a/src/backends/cl/workloads/ClQuantizeWorkload.cpp b/src/backends/cl/workloads/ClQuantizeWorkload.cpp new file mode 100644 index 0000000000..230e346a00 --- /dev/null +++ b/src/backends/cl/workloads/ClQuantizeWorkload.cpp @@ -0,0 +1,47 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "ClQuantizeWorkload.hpp" +#include "ClWorkloadUtils.hpp" + +#include +#include + +#include + +#include +#include +#include + +namespace armnn +{ +using namespace armcomputetensorutils; + +arm_compute::Status ClQuantizeWorkloadValidate(const TensorInfo& input, + const TensorInfo& output) +{ + const arm_compute::TensorInfo aclInputInfo = BuildArmComputeTensorInfo(input); + const arm_compute::TensorInfo aclOutputInfo = BuildArmComputeTensorInfo(output); + + return arm_compute::CLQuantizationLayer::validate(&aclInputInfo, + &aclOutputInfo); +} + +ClQuantizeWorkload::ClQuantizeWorkload(const QuantizeQueueDescriptor& descriptor, const WorkloadInfo& info) + : BaseWorkload(descriptor, info) +{ + arm_compute::ICLTensor& input = static_cast(m_Data.m_Inputs[0])->GetTensor(); + arm_compute::ICLTensor& output = static_cast(m_Data.m_Outputs[0])->GetTensor(); + + m_Layer.configure(&input, &output); +} + +void ClQuantizeWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT_CL("ClQuantizeWorkload_Execute"); + RunClFunction(m_Layer, CHECK_LOCATION()); +} + +} //namespace armnn diff --git a/src/backends/cl/workloads/ClQuantizeWorkload.hpp b/src/backends/cl/workloads/ClQuantizeWorkload.hpp new file mode 100644 index 0000000000..f4a7ec64dd --- /dev/null +++ b/src/backends/cl/workloads/ClQuantizeWorkload.hpp @@ -0,0 +1,28 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include + +#include + +namespace armnn +{ + +arm_compute::Status ClQuantizeWorkloadValidate(const TensorInfo& input, + const TensorInfo& output); + +class ClQuantizeWorkload : public BaseWorkload +{ +public: + ClQuantizeWorkload(const QuantizeQueueDescriptor& descriptor, const WorkloadInfo& info); + void Execute() const override; + +private: + mutable arm_compute::CLQuantizationLayer m_Layer; +}; + +} //namespace armnn \ No newline at end of file diff --git a/src/backends/cl/workloads/ClWorkloads.hpp b/src/backends/cl/workloads/ClWorkloads.hpp index 7e0170cac3..0060412770 100644 --- a/src/backends/cl/workloads/ClWorkloads.hpp +++ b/src/backends/cl/workloads/ClWorkloads.hpp @@ -26,6 +26,7 @@ #include "ClPermuteWorkload.hpp" #include "ClPadWorkload.hpp" #include "ClPooling2dWorkload.hpp" +#include "ClQuantizeWorkload.hpp" #include "ClReshapeWorkload.hpp" #include "ClResizeBilinearFloatWorkload.hpp" #include "ClSoftmaxFloatWorkload.hpp" -- cgit v1.2.1