diff options
| author | David Monahan <david.monahan@arm.com> | 2020-06-30 15:57:56 +0100 |
|---|---|---|
| committer | David Monahan <david.monahan@arm.com> | 2020-07-08 12:02:26 +0000 |
| commit | 9b14bfc3f3131d05e2aaf88f85a9a101f2a3e70a (patch) | |
| tree | dd7e94e123c93997f922e152047a247e0e931fd3 /src/backends/neon | |
| parent | e4112637b5057f638c3d147a1751ed01772be48a (diff) | |
| download | armnn-9b14bfc3f3131d05e2aaf88f85a9a101f2a3e70a.tar.gz | |
IVGCVSW-5005 Fix Deprecated Functions in CL/NEON Resize Workload
* Update CL pin to f3ad9513dd46fca1d6c5e4550286480fdbaba056
IVGCVSW-5005: Fix Deprecated Functions in CL/NEON Resize Workload
* Add missing virtual function to NeonIntercepterScheduler
* Update CL/Neon Resize Workloads to use ScaleKernelInfo
* Update CL/Neon Resize workloads to set correct Sampling Policy for Half Pixels
IVGCVSW-4981: Change CL/NEON Softmax axis value
* Default value is now 0
Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: I8a14c6a64e5a24bc1a66a7d3685cd388c2245702
Diffstat (limited to 'src/backends/neon')
| -rw-r--r-- | src/backends/neon/NeonInterceptorScheduler.cpp | 14 | ||||
| -rw-r--r-- | src/backends/neon/NeonInterceptorScheduler.hpp | 6 | ||||
| -rw-r--r-- | src/backends/neon/workloads/NeonResizeWorkload.cpp | 30 |
3 files changed, 40 insertions, 10 deletions
diff --git a/src/backends/neon/NeonInterceptorScheduler.cpp b/src/backends/neon/NeonInterceptorScheduler.cpp index 745c5fde62..b4d9b300df 100644 --- a/src/backends/neon/NeonInterceptorScheduler.cpp +++ b/src/backends/neon/NeonInterceptorScheduler.cpp @@ -52,4 +52,18 @@ void NeonInterceptorScheduler::run_tagged_workloads(std::vector<Workload> &workl m_Kernels->emplace_back(std::string(tag != nullptr ? tag : "Unknown"), delta.count(), Measurement::Unit::TIME_US); } +void NeonInterceptorScheduler::schedule_op(arm_compute::ICPPKernel *kernel, + const Hints &hints, + const arm_compute::InputTensorMap &inputs, + const arm_compute::OutputTensorMap &outputs ) +{ + + WallClockTimer::clock::time_point startTime = WallClockTimer::clock::now(); + m_RealScheduler.schedule_op(kernel, hints, inputs, outputs); + WallClockTimer::clock::time_point stopTime = WallClockTimer::clock::now(); + + const auto delta = std::chrono::duration<double, std::micro>(stopTime - startTime); + m_Kernels->emplace_back(kernel->name(), delta.count(), Measurement::Unit::TIME_US); +} + } // namespace armnn
\ No newline at end of file diff --git a/src/backends/neon/NeonInterceptorScheduler.hpp b/src/backends/neon/NeonInterceptorScheduler.hpp index 3a6f2aa5ec..fe80c62c5f 100644 --- a/src/backends/neon/NeonInterceptorScheduler.hpp +++ b/src/backends/neon/NeonInterceptorScheduler.hpp @@ -10,6 +10,7 @@ #include <arm_compute/runtime/IScheduler.h> #include <arm_compute/runtime/Scheduler.h> #include <arm_compute/core/CPP/ICPPKernel.h> +#include <arm_compute/core/experimental/Types.h> namespace armnn { @@ -32,6 +33,11 @@ public: void SetKernels(NeonTimer::KernelMeasurements* kernels) { m_Kernels = kernels; } NeonTimer::KernelMeasurements* GetKernels() { return m_Kernels; } + + void schedule_op(arm_compute::ICPPKernel *kernel, + const Hints &hints, + const arm_compute::InputTensorMap &inputs, + const arm_compute::OutputTensorMap &outputs ) override; private: NeonTimer::KernelMeasurements* m_Kernels; arm_compute::IScheduler& m_RealScheduler; diff --git a/src/backends/neon/workloads/NeonResizeWorkload.cpp b/src/backends/neon/workloads/NeonResizeWorkload.cpp index afb753fd64..fc378cae2f 100644 --- a/src/backends/neon/workloads/NeonResizeWorkload.cpp +++ b/src/backends/neon/workloads/NeonResizeWorkload.cpp @@ -33,12 +33,18 @@ arm_compute::Status NeonResizeWorkloadValidate(const TensorInfo& input, arm_compute::InterpolationPolicy aclInterpolationPolicy = ConvertResizeMethodToAclInterpolationPolicy(descriptor.m_Method); + arm_compute::SamplingPolicy samplingPolicy = descriptor.m_HalfPixelCenters ? arm_compute::SamplingPolicy::CENTER : + arm_compute::SamplingPolicy::TOP_LEFT; + return arm_compute::NEScale::validate(&aclInputInfo, &aclOutputInfo, - aclInterpolationPolicy, - arm_compute::BorderMode::REPLICATE, - arm_compute::PixelValue(0.f), - arm_compute::SamplingPolicy::TOP_LEFT); + arm_compute::ScaleKernelInfo(aclInterpolationPolicy, + arm_compute::BorderMode::REPLICATE, + arm_compute::PixelValue(0.f), + samplingPolicy, + true, + descriptor.m_AlignCorners)); + } NeonResizeWorkload::NeonResizeWorkload(const ResizeQueueDescriptor& descriptor, @@ -57,14 +63,18 @@ NeonResizeWorkload::NeonResizeWorkload(const ResizeQueueDescriptor& descriptor, arm_compute::InterpolationPolicy aclInterpolationPolicy = ConvertResizeMethodToAclInterpolationPolicy(descriptor.m_Parameters.m_Method); + arm_compute::SamplingPolicy samplingPolicy = descriptor.m_Parameters.m_HalfPixelCenters + ? arm_compute::SamplingPolicy::CENTER + : arm_compute::SamplingPolicy::TOP_LEFT; + m_ResizeLayer.configure(&input, &output, - aclInterpolationPolicy, - arm_compute::BorderMode::REPLICATE, - arm_compute::PixelValue(0.f), - arm_compute::SamplingPolicy::TOP_LEFT, - true, - descriptor.m_Parameters.m_AlignCorners); + arm_compute::ScaleKernelInfo(aclInterpolationPolicy, + arm_compute::BorderMode::REPLICATE, + arm_compute::PixelValue(0.f), + samplingPolicy, + true, + descriptor.m_Parameters.m_AlignCorners)); }; void NeonResizeWorkload::Execute() const |