diff options
author | Ellen Norris-Thompson <ellen.norris-thompson@arm.com> | 2019-06-26 16:40:36 +0100 |
---|---|---|
committer | James Conroy <james.conroy@arm.com> | 2019-07-09 13:29:58 +0000 |
commit | 2979457c5974e298033c387a5cd33f95e3301623 (patch) | |
tree | df7b6b54def6c608602f487e4cffa0b1dc187a3f /src/backends/neon/workloads | |
parent | 39f4639a79625c8f37c6ca547dadc7925378ee3e (diff) | |
download | armnn-2979457c5974e298033c387a5cd33f95e3301623.tar.gz |
IVGCVSW-3355 Add NeonSpaceToDepthWorkload
* Add Neon backend support for SpaceToDepth
* Enabled Neon Unit, CreateWorkload and
EndToEnd tests for SpaceToDepth.
* Added QSymm16 support to NeonTensorHandle.
Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>
Change-Id: Ibbb0bce5ad77dace2bf4c4c111006d2fadf844e8
Diffstat (limited to 'src/backends/neon/workloads')
4 files changed, 92 insertions, 0 deletions
diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt index 8f9b7d5d09..0ad961aa86 100644 --- a/src/backends/neon/workloads/CMakeLists.txt +++ b/src/backends/neon/workloads/CMakeLists.txt @@ -64,6 +64,8 @@ list(APPEND armnnNeonBackendWorkloads_sources NeonSoftmaxFloatWorkload.hpp NeonSoftmaxUint8Workload.cpp NeonSoftmaxUint8Workload.hpp + NeonSpaceToDepthWorkload.cpp + NeonSpaceToDepthWorkload.hpp NeonSplitterWorkload.cpp NeonSplitterWorkload.hpp NeonSubtractionWorkload.cpp diff --git a/src/backends/neon/workloads/NeonSpaceToDepthWorkload.cpp b/src/backends/neon/workloads/NeonSpaceToDepthWorkload.cpp new file mode 100644 index 0000000000..a4204b21e6 --- /dev/null +++ b/src/backends/neon/workloads/NeonSpaceToDepthWorkload.cpp @@ -0,0 +1,58 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "NeonSpaceToDepthWorkload.hpp" +#include "NeonWorkloadUtils.hpp" +#include <ResolveType.hpp> + +namespace armnn +{ + +using namespace armcomputetensorutils; + +arm_compute::Status NeonSpaceToDepthWorkloadValidate(const TensorInfo& input, + const TensorInfo& output, + const SpaceToDepthDescriptor& 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::NESpaceToDepthLayer::validate(&aclInput, &aclOutput, blockSize); +} + +NeonSpaceToDepthWorkload::NeonSpaceToDepthWorkload(const SpaceToDepthQueueDescriptor& desc, + const WorkloadInfo& info) + : BaseWorkload<SpaceToDepthQueueDescriptor>(desc, info) +{ + m_Data.ValidateInputsOutputs("NeonSpaceToDepthWorkload", 1, 1); + + arm_compute::DataLayout aclDataLayout = ConvertDataLayout(m_Data.m_Parameters.m_DataLayout); + + arm_compute::ITensor& input = boost::polymorphic_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_downcast<IAclTensorHandle*>(m_Data.m_Outputs[0])->GetTensor(); + output.info()->set_data_layout(aclDataLayout); + + m_Layer.reset(new arm_compute::NESpaceToDepthLayer()); + m_Layer->configure(&input, &output, blockSize); + m_Layer->prepare(); +} + +void NeonSpaceToDepthWorkload::Execute() const +{ + if (m_Layer) + { + ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonSpaceToDepthWorkload_Execute"); + m_Layer->run(); + } +} + +} //namespace armnn
\ No newline at end of file diff --git a/src/backends/neon/workloads/NeonSpaceToDepthWorkload.hpp b/src/backends/neon/workloads/NeonSpaceToDepthWorkload.hpp new file mode 100644 index 0000000000..f2de26b3c6 --- /dev/null +++ b/src/backends/neon/workloads/NeonSpaceToDepthWorkload.hpp @@ -0,0 +1,31 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include <armnn/TypesUtils.hpp> + +#include <backendsCommon/Workload.hpp> + +#include <arm_compute/runtime/NEON/functions/NESpaceToDepthLayer.h> + +namespace armnn +{ + +arm_compute::Status NeonSpaceToDepthWorkloadValidate(const TensorInfo& input, + const TensorInfo& output, + const SpaceToDepthDescriptor& descriptor); + +class NeonSpaceToDepthWorkload : public BaseWorkload<SpaceToDepthQueueDescriptor> +{ +public: + using BaseWorkload<SpaceToDepthQueueDescriptor>::BaseWorkload; + NeonSpaceToDepthWorkload(const SpaceToDepthQueueDescriptor& descriptor, const WorkloadInfo& info); + virtual void Execute() const override; +private: + mutable std::unique_ptr<arm_compute::NESpaceToDepthLayer> m_Layer; +}; + +} //namespace armnn
\ No newline at end of file diff --git a/src/backends/neon/workloads/NeonWorkloads.hpp b/src/backends/neon/workloads/NeonWorkloads.hpp index ebea879bad..a9604a160c 100644 --- a/src/backends/neon/workloads/NeonWorkloads.hpp +++ b/src/backends/neon/workloads/NeonWorkloads.hpp @@ -33,5 +33,6 @@ #include "NeonResizeBilinearWorkload.hpp" #include "NeonSoftmaxFloatWorkload.hpp" #include "NeonSoftmaxUint8Workload.hpp" +#include "NeonSpaceToDepthWorkload.hpp" #include "NeonSplitterWorkload.hpp" #include "NeonSubtractionWorkload.hpp" |