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/cl/workloads/ClResizeWorkload.cpp | |
| 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/cl/workloads/ClResizeWorkload.cpp')
| -rw-r--r-- | src/backends/cl/workloads/ClResizeWorkload.cpp | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/src/backends/cl/workloads/ClResizeWorkload.cpp b/src/backends/cl/workloads/ClResizeWorkload.cpp index adfb3686fd..744a915616 100644 --- a/src/backends/cl/workloads/ClResizeWorkload.cpp +++ b/src/backends/cl/workloads/ClResizeWorkload.cpp @@ -33,14 +33,17 @@ arm_compute::Status ClResizeWorkloadValidate(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::CLScale::validate(&aclInputInfo, &aclOutputInfo, - aclInterpolationPolicy, - arm_compute::BorderMode::REPLICATE, - arm_compute::PixelValue(0.f), - arm_compute::SamplingPolicy::TOP_LEFT, - true, - descriptor.m_AlignCorners); + arm_compute::ScaleKernelInfo(aclInterpolationPolicy, + arm_compute::BorderMode::REPLICATE, + arm_compute::PixelValue(0.f), + samplingPolicy, + true, + descriptor.m_AlignCorners)); } ClResizeWorkload::ClResizeWorkload(const ResizeQueueDescriptor& descriptor, const WorkloadInfo& info) : @@ -58,14 +61,19 @@ ClResizeWorkload::ClResizeWorkload(const ResizeQueueDescriptor& descriptor, cons 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 ClResizeWorkload::Execute() const |