From c9ea45adefdde2890e9aa191a5b31563a3dd35ea Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Fri, 28 Feb 2020 18:11:58 +0000 Subject: IVGCVSW-4375 Add support for Transpose * Added TransposeLayer * Added CL, Neon and Ref Workloads * Added Transpose utilities * Added Serializer and Deserializer support * Added Quantizer support Signed-off-by: Mike Kelly Change-Id: I04c755ba7cb5b1edf72b3c9f3c0314878032e3c7 --- src/backends/cl/ClLayerSupport.cpp | 9 +++++ src/backends/cl/ClLayerSupport.hpp | 6 +++ src/backends/cl/ClWorkloadFactory.cpp | 6 +++ src/backends/cl/ClWorkloadFactory.hpp | 3 ++ src/backends/cl/backend.mk | 3 +- src/backends/cl/test/ClLayerTests.cpp | 14 +++++++ src/backends/cl/workloads/CMakeLists.txt | 2 + src/backends/cl/workloads/ClTransposeWorkload.cpp | 49 +++++++++++++++++++++++ src/backends/cl/workloads/ClTransposeWorkload.hpp | 40 ++++++++++++++++++ src/backends/cl/workloads/ClWorkloads.hpp | 1 + 10 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 src/backends/cl/workloads/ClTransposeWorkload.cpp create mode 100644 src/backends/cl/workloads/ClTransposeWorkload.hpp (limited to 'src/backends/cl') diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp index e8548e4b5a..d3ac98655a 100644 --- a/src/backends/cl/ClLayerSupport.cpp +++ b/src/backends/cl/ClLayerSupport.cpp @@ -60,6 +60,7 @@ #include "workloads/ClStridedSliceWorkload.hpp" #include "workloads/ClSubtractionWorkload.hpp" #include "workloads/ClTransposeConvolution2dWorkload.hpp" +#include "workloads/ClTransposeWorkload.hpp" #endif using namespace boost; @@ -819,4 +820,12 @@ bool ClLayerSupport::IsTransposeConvolution2dSupported(const TensorInfo& input, biases); } +bool ClLayerSupport::IsTransposeSupported(const TensorInfo& input, + const TensorInfo& output, + const TransposeDescriptor& descriptor, + Optional reasonIfUnsupported) const +{ + FORWARD_WORKLOAD_VALIDATE_FUNC(ClTransposeWorkloadValidate, reasonIfUnsupported, input, output, descriptor); +} + } // namespace armnn diff --git a/src/backends/cl/ClLayerSupport.hpp b/src/backends/cl/ClLayerSupport.hpp index 819d086cb4..60899d0596 100644 --- a/src/backends/cl/ClLayerSupport.hpp +++ b/src/backends/cl/ClLayerSupport.hpp @@ -286,6 +286,12 @@ public: const TensorInfo& weights, const Optional& biases, Optional reasonIfUnsupported = EmptyOptional()) const override; + + bool IsTransposeSupported(const TensorInfo& input, + const TensorInfo& output, + const TransposeDescriptor& descriptor, + Optional reasonIfUnsupported = EmptyOptional()) const override; + }; } // namespace armnn diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index 4bb2e2a8ce..21c26296af 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -534,6 +534,12 @@ std::unique_ptr ClWorkloadFactory::CreateSubtraction(const Subtractio return MakeWorkload(descriptor, info); } +std::unique_ptr ClWorkloadFactory::CreateTranspose(const TransposeQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return MakeWorkload(descriptor, info); +} + std::unique_ptr ClWorkloadFactory::CreateTransposeConvolution2d( const TransposeConvolution2dQueueDescriptor& descriptor, const WorkloadInfo& info) const diff --git a/src/backends/cl/ClWorkloadFactory.hpp b/src/backends/cl/ClWorkloadFactory.hpp index 980be9192e..a7168010f2 100644 --- a/src/backends/cl/ClWorkloadFactory.hpp +++ b/src/backends/cl/ClWorkloadFactory.hpp @@ -210,6 +210,9 @@ public: std::unique_ptr CreateSubtraction(const SubtractionQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + std::unique_ptr CreateTranspose(const TransposeQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + std::unique_ptr CreateTransposeConvolution2d(const TransposeConvolution2dQueueDescriptor& descriptor, const WorkloadInfo& info) const override; diff --git a/src/backends/cl/backend.mk b/src/backends/cl/backend.mk index 4182b94136..e326add9e9 100644 --- a/src/backends/cl/backend.mk +++ b/src/backends/cl/backend.mk @@ -67,7 +67,8 @@ BACKEND_SOURCES := \ workloads/ClStackWorkload.cpp \ workloads/ClStridedSliceWorkload.cpp \ workloads/ClSubtractionWorkload.cpp \ - workloads/ClTransposeConvolution2dWorkload.cpp + workloads/ClTransposeConvolution2dWorkload.cpp \ + workloads/ClTransposeWorkload.cpp else # ARMNN_COMPUTE_CL_ENABLED == 0 diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index cfec81a4c3..d8b0fd156b 100644 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -770,6 +770,20 @@ ARMNN_AUTO_TEST_CASE(DequantizeSimpleInt16, DequantizeSimpleInt16Test) ARMNN_AUTO_TEST_CASE(DequantizeSimpleUint8ToFp16, DequantizeSimpleUint8ToFp16Test) ARMNN_AUTO_TEST_CASE(DequantizeSimpleInt16ToFp16, DequantizeSimpleInt16ToFp16Test) +// Transpose +ARMNN_AUTO_TEST_CASE(SimpleTransposeFloat32, SimpleTransposeTest) +ARMNN_AUTO_TEST_CASE(TransposeFloat32ValueSet1Test, TransposeValueSet1Test) +ARMNN_AUTO_TEST_CASE(TransposeFloat32ValueSet2Test, TransposeValueSet2Test) +ARMNN_AUTO_TEST_CASE(TransposeFloat32ValueSet3Test, TransposeValueSet3Test) +ARMNN_AUTO_TEST_CASE(SimpleTransposeQASymm8, SimpleTransposeTest) +ARMNN_AUTO_TEST_CASE(TransposeQASymm8ValueSet1Test, TransposeValueSet1Test) +ARMNN_AUTO_TEST_CASE(TransposeQASymm8ValueSet2Test, TransposeValueSet2Test) +ARMNN_AUTO_TEST_CASE(TransposeQASymm8ValueSet3Test, TransposeValueSet3Test) +ARMNN_AUTO_TEST_CASE(SimpleTransposeQSymm16, SimpleTransposeTest) +ARMNN_AUTO_TEST_CASE(TransposeQSymm16ValueSet1Test, TransposeValueSet1Test) +ARMNN_AUTO_TEST_CASE(TransposeQSymm16ValueSet2Test, TransposeValueSet2Test) +ARMNN_AUTO_TEST_CASE(TransposeQSymm16ValueSet3Test, TransposeValueSet3Test) + // TransposeConvolution2d ARMNN_AUTO_TEST_CASE(SimpleTransposeConvolution2dFloatNchw, SimpleTransposeConvolution2dTest, diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt index de62ca9496..17d69b1ed5 100644 --- a/src/backends/cl/workloads/CMakeLists.txt +++ b/src/backends/cl/workloads/CMakeLists.txt @@ -96,6 +96,8 @@ list(APPEND armnnClBackendWorkloads_sources ClSubtractionWorkload.hpp ClTransposeConvolution2dWorkload.cpp ClTransposeConvolution2dWorkload.hpp + ClTransposeWorkload.cpp + ClTransposeWorkload.hpp ClWorkloads.hpp ClWorkloadUtils.hpp ) diff --git a/src/backends/cl/workloads/ClTransposeWorkload.cpp b/src/backends/cl/workloads/ClTransposeWorkload.cpp new file mode 100644 index 0000000000..b276b229f6 --- /dev/null +++ b/src/backends/cl/workloads/ClTransposeWorkload.cpp @@ -0,0 +1,49 @@ +// +// Copyright © 2020 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "ClTransposeWorkload.hpp" +#include +#include + +#include + +#include "ClWorkloadUtils.hpp" + +namespace armnn +{ + +arm_compute::Status ClTransposeWorkloadValidate(const TensorInfo& input, + const TensorInfo& output, + const TransposeDescriptor& descriptor) +{ + const arm_compute::TensorInfo aclInputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(input); + const arm_compute::TensorInfo aclOutputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(output); + const armnn::PermutationVector& mappings = descriptor.m_DimMappings; + + return arm_compute::CLPermute::validate(&aclInputInfo, &aclOutputInfo, + armcomputetensorutils::BuildArmComputeTransposeVector(mappings)); +} + +ClTransposeWorkload::ClTransposeWorkload(const TransposeQueueDescriptor& descriptor, + const WorkloadInfo& info) + : BaseWorkload(descriptor, info) +{ + m_Data.ValidateInputsOutputs(GetName(), 1, 1); + + const arm_compute::ICLTensor& input = static_cast(m_Data.m_Inputs[0])->GetTensor(); + arm_compute::ICLTensor& output = static_cast(m_Data.m_Outputs[0])->GetTensor(); + const armnn::PermutationVector& mappings = m_Data.m_Parameters.m_DimMappings; + // Run the layer. + m_PermuteFunction.configure(&input, &output, + armcomputetensorutils::BuildArmComputeTransposeVector(mappings)); +} + +void ClTransposeWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT_CL(GetName() + "_Execute"); + RunClFunction(m_PermuteFunction, CHECK_LOCATION()); +} + +} // namespace armnn diff --git a/src/backends/cl/workloads/ClTransposeWorkload.hpp b/src/backends/cl/workloads/ClTransposeWorkload.hpp new file mode 100644 index 0000000000..c1bed93b97 --- /dev/null +++ b/src/backends/cl/workloads/ClTransposeWorkload.hpp @@ -0,0 +1,40 @@ +// +// Copyright © 2020 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include +#include + +#include +#include + +#include + +namespace armnn +{ + +arm_compute::Status ClTransposeWorkloadValidate(const TensorInfo& input, + const TensorInfo& output, + const TransposeDescriptor& descriptor); + +class ClTransposeWorkload : public BaseWorkload +{ +public: + static const std::string& GetName() + { + static const std::string name = std::string("ClTransposeWorkload"); + return name; + } + + ClTransposeWorkload(const TransposeQueueDescriptor& descriptor, const WorkloadInfo& info); + void Execute() const override; + +private: + using BaseWorkload::m_Data; + mutable arm_compute::CLPermute m_PermuteFunction; +}; + +} // namespace armnn diff --git a/src/backends/cl/workloads/ClWorkloads.hpp b/src/backends/cl/workloads/ClWorkloads.hpp index 014dc3f99e..ec193d5e3e 100644 --- a/src/backends/cl/workloads/ClWorkloads.hpp +++ b/src/backends/cl/workloads/ClWorkloads.hpp @@ -49,3 +49,4 @@ #include "ClConvertFp16ToFp32Workload.hpp" #include "ClConvertFp32ToFp16Workload.hpp" #include "ClTransposeConvolution2dWorkload.hpp" +#include "ClTransposeWorkload.hpp" -- cgit v1.2.1