From 54b2169989fa9916565fb8a2edf717c6c93923d9 Mon Sep 17 00:00:00 2001 From: Conor Kennedy Date: Wed, 9 Jan 2019 07:57:38 +0000 Subject: IVGCVSW-2441 Add Minimum operator support (NEON) Change-Id: I0bc48f118aba419abb659657b83224401fac0715 --- src/backends/neon/workloads/CMakeLists.txt | 2 + .../neon/workloads/NeonMinimumWorkload.cpp | 45 ++++++++++++++++++++++ .../neon/workloads/NeonMinimumWorkload.hpp | 38 ++++++++++++++++++ src/backends/neon/workloads/NeonWorkloads.hpp | 1 + 4 files changed, 86 insertions(+) create mode 100644 src/backends/neon/workloads/NeonMinimumWorkload.cpp create mode 100644 src/backends/neon/workloads/NeonMinimumWorkload.hpp (limited to 'src/backends/neon/workloads') diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt index b7dfc3fcfd..919c716860 100644 --- a/src/backends/neon/workloads/CMakeLists.txt +++ b/src/backends/neon/workloads/CMakeLists.txt @@ -34,6 +34,8 @@ list(APPEND armnnNeonBackendWorkloads_sources NeonMeanWorkload.hpp NeonMergerWorkload.cpp NeonMergerWorkload.hpp + NeonMinimumWorkload.cpp + NeonMinimumWorkload.hpp NeonMultiplicationFloatWorkload.cpp NeonMultiplicationFloatWorkload.hpp NeonNormalizationFloatWorkload.cpp diff --git a/src/backends/neon/workloads/NeonMinimumWorkload.cpp b/src/backends/neon/workloads/NeonMinimumWorkload.cpp new file mode 100644 index 0000000000..9b97bf5863 --- /dev/null +++ b/src/backends/neon/workloads/NeonMinimumWorkload.cpp @@ -0,0 +1,45 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "NeonMinimumWorkload.hpp" +#include +#include + +namespace armnn +{ + +arm_compute::Status NeonMinimumWorkloadValidate(const TensorInfo& input0, + const TensorInfo& input1, + const TensorInfo& output) +{ + const arm_compute::TensorInfo aclInput0 = armcomputetensorutils::BuildArmComputeTensorInfo(input0); + const arm_compute::TensorInfo aclInput1 = armcomputetensorutils::BuildArmComputeTensorInfo(input1); + const arm_compute::TensorInfo aclOutput = armcomputetensorutils::BuildArmComputeTensorInfo(output); + + return arm_compute::NEElementwiseMin::validate(&aclInput0, + &aclInput1, + &aclOutput); +} + +NeonMinimumWorkload::NeonMinimumWorkload(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) + : BaseWorkload(descriptor, info) +{ + m_Data.ValidateInputsOutputs("NeonMinimumWorkload", 2, 1); + + arm_compute::ITensor& input0 = boost::polymorphic_downcast(m_Data.m_Inputs[0])->GetTensor(); + arm_compute::ITensor& input1 = boost::polymorphic_downcast(m_Data.m_Inputs[1])->GetTensor(); + arm_compute::ITensor& output = boost::polymorphic_downcast(m_Data.m_Outputs[0])->GetTensor(); + + m_MinLayer.configure(&input0, &input1, &output); +} + +void NeonMinimumWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonMinimumWorkload_Execute"); + m_MinLayer.run(); +} + +} //namespace armnn diff --git a/src/backends/neon/workloads/NeonMinimumWorkload.hpp b/src/backends/neon/workloads/NeonMinimumWorkload.hpp new file mode 100644 index 0000000000..5c76bb387e --- /dev/null +++ b/src/backends/neon/workloads/NeonMinimumWorkload.hpp @@ -0,0 +1,38 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include + +#include + +namespace armnn +{ + +/// Validate function for validating the inputs and output. +/// @param [in] input0 The input0 value to be validated. +/// @param [in] input1 The input1 value to be validated. +/// @param [in] output The output value to be validated. +arm_compute::Status NeonMinimumWorkloadValidate(const TensorInfo& input0, + const TensorInfo& input1, + const TensorInfo& output); + +class NeonMinimumWorkload : public BaseWorkload +{ +public: + /// Create a NeonMinimumWorkload. + /// @param [in] descriptor The MinimumQueueDescriptor to configure this operation. + /// @param [in] info The workload where this operation can be found. + NeonMinimumWorkload(const MinimumQueueDescriptor& descriptor, const WorkloadInfo& info); + + /// Execute the Minimum operation. + virtual void Execute() const override; + +private: + mutable arm_compute::NEElementwiseMin m_MinLayer; +}; + +} //namespace armnn diff --git a/src/backends/neon/workloads/NeonWorkloads.hpp b/src/backends/neon/workloads/NeonWorkloads.hpp index a5ef0dcb2d..70f9e376d5 100644 --- a/src/backends/neon/workloads/NeonWorkloads.hpp +++ b/src/backends/neon/workloads/NeonWorkloads.hpp @@ -19,6 +19,7 @@ #include "NeonMaximumWorkload.hpp" #include "NeonMeanWorkload.hpp" #include "NeonMergerWorkload.hpp" +#include "NeonMinimumWorkload.hpp" #include "NeonMultiplicationFloatWorkload.hpp" #include "NeonNormalizationFloatWorkload.hpp" #include "NeonPermuteWorkload.hpp" -- cgit v1.2.1