diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-09-30 13:28:08 +0100 |
---|---|---|
committer | Kevin May <kevin.may@arm.com> | 2019-09-30 14:13:42 +0000 |
commit | 2f00b7421f259851448a0be72e9eb01141faad2e (patch) | |
tree | 109902951005eca1b6bac148c7b41387e487432d /src/backends/neon/workloads | |
parent | 7be47efac07b6276f02a17cb486f9061a426a837 (diff) | |
download | armnn-2f00b7421f259851448a0be72e9eb01141faad2e.tar.gz |
IVGCVSW-3734 Add NEON workload for DepthToSpace
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I4fa8cba57f3a2277112c02062f4d2790089d1eb5
Diffstat (limited to 'src/backends/neon/workloads')
4 files changed, 95 insertions, 0 deletions
diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt index 90043911cf..42ac641369 100644 --- a/src/backends/neon/workloads/CMakeLists.txt +++ b/src/backends/neon/workloads/CMakeLists.txt @@ -22,6 +22,8 @@ list(APPEND armnnNeonBackendWorkloads_sources NeonConvertFp32ToFp16Workload.hpp NeonConvolution2dWorkload.cpp NeonConvolution2dWorkload.hpp + NeonDepthToSpaceWorkload.cpp + NeonDepthToSpaceWorkload.hpp NeonDepthwiseConvolutionWorkload.cpp NeonDepthwiseConvolutionWorkload.hpp NeonDequantizeWorkload.cpp diff --git a/src/backends/neon/workloads/NeonDepthToSpaceWorkload.cpp b/src/backends/neon/workloads/NeonDepthToSpaceWorkload.cpp new file mode 100644 index 0000000000..b30dfcd80e --- /dev/null +++ b/src/backends/neon/workloads/NeonDepthToSpaceWorkload.cpp @@ -0,0 +1,61 @@ +// +// Copyright © 2019 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "NeonDepthToSpaceWorkload.hpp" + +#include "NeonWorkloadUtils.hpp" + +#include <aclCommon/ArmComputeTensorUtils.hpp> + +#include <boost/numeric/conversion/cast.hpp> +#include <boost/polymorphic_pointer_cast.hpp> + +namespace armnn +{ + +using namespace armcomputetensorutils; + +arm_compute::Status NeonDepthToSpaceWorkloadValidate(const TensorInfo& input, + const TensorInfo& output, + const DepthToSpaceDescriptor& descriptor) +{ + DataLayout dataLayout = descriptor.m_DataLayout; + const arm_compute::TensorInfo aclInput = BuildArmComputeTensorInfo(input, dataLayout); + const arm_compute::TensorInfo aclOutput = BuildArmComputeTensorInfo(output, dataLayout); + + int32_t blockSize = boost::numeric_cast<int32_t>(descriptor.m_BlockSize); + + return arm_compute::NEDepthToSpaceLayer::validate(&aclInput, &aclOutput, blockSize); +} + +NeonDepthToSpaceWorkload::NeonDepthToSpaceWorkload(const DepthToSpaceQueueDescriptor& desc, + const WorkloadInfo& info) + : BaseWorkload<DepthToSpaceQueueDescriptor>(desc, info) +{ + m_Data.ValidateInputsOutputs("NeonDepthToSpaceWorkload", 1, 1); + + arm_compute::DataLayout aclDataLayout = ConvertDataLayout(m_Data.m_Parameters.m_DataLayout); + + arm_compute::ITensor& input = + boost::polymorphic_pointer_downcast<IAclTensorHandle>(m_Data.m_Inputs[0])->GetTensor(); + input.info()->set_data_layout(aclDataLayout); + + int32_t blockSize = boost::numeric_cast<int32_t>(desc.m_Parameters.m_BlockSize); + + arm_compute::ITensor& output = + boost::polymorphic_pointer_downcast<IAclTensorHandle>(m_Data.m_Outputs[0])->GetTensor(); + output.info()->set_data_layout(aclDataLayout); + + m_Layer.configure(&input, &output, blockSize); + m_Layer.prepare(); +} + +void NeonDepthToSpaceWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonDepthToSpaceWorkload_Execute"); + m_Layer.run(); +} + +} // namespace armnn diff --git a/src/backends/neon/workloads/NeonDepthToSpaceWorkload.hpp b/src/backends/neon/workloads/NeonDepthToSpaceWorkload.hpp new file mode 100644 index 0000000000..95b5e44e4d --- /dev/null +++ b/src/backends/neon/workloads/NeonDepthToSpaceWorkload.hpp @@ -0,0 +1,31 @@ +// +// Copyright © 2019 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include <armnn/Descriptors.hpp> + +#include <backendsCommon/Workload.hpp> + +#include <arm_compute/runtime/NEON/functions/NEDepthToSpaceLayer.h> + +namespace armnn +{ + +arm_compute::Status NeonDepthToSpaceWorkloadValidate(const TensorInfo& input, + const TensorInfo& output, + const DepthToSpaceDescriptor& descriptor); + +class NeonDepthToSpaceWorkload : public BaseWorkload<DepthToSpaceQueueDescriptor> +{ +public: + NeonDepthToSpaceWorkload(const DepthToSpaceQueueDescriptor& descriptor, const WorkloadInfo& info); + void Execute() const override; + +private: + mutable arm_compute::NEDepthToSpaceLayer m_Layer; +}; + +} // namespace armnn diff --git a/src/backends/neon/workloads/NeonWorkloads.hpp b/src/backends/neon/workloads/NeonWorkloads.hpp index 4f30f33d1b..9d35ed42fe 100644 --- a/src/backends/neon/workloads/NeonWorkloads.hpp +++ b/src/backends/neon/workloads/NeonWorkloads.hpp @@ -12,6 +12,7 @@ #include "NeonConvertFp16ToFp32Workload.hpp" #include "NeonConvertFp32ToFp16Workload.hpp" #include "NeonConvolution2dWorkload.hpp" +#include "NeonDepthToSpaceWorkload.hpp" #include "NeonDepthwiseConvolutionWorkload.hpp" #include "NeonDequantizeWorkload.hpp" #include "NeonFloorFloatWorkload.hpp" |