From 3021edfb5e72ef4cd91dbc754ce6ac55388ebc4e Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Mon, 18 Sep 2017 17:55:22 +0100 Subject: COMPMID-417: Fix NEGaussianPyramidOrb. Change-Id: I9e89136a926f33cc591784d4e7785618bba7b0b2 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/88116 Reviewed-by: Pablo Tello Tested-by: Kaizen --- arm_compute/runtime/NEON/functions/NEGaussianPyramid.h | 5 ++--- arm_compute/runtime/NEON/functions/NEScale.h | 6 +----- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'arm_compute') diff --git a/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h b/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h index 5f0a67ea05..b4ed56a0c3 100644 --- a/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h +++ b/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h @@ -26,10 +26,10 @@ #include "arm_compute/core/IPyramid.h" #include "arm_compute/core/NEON/kernels/NEGaussianPyramidKernel.h" -#include "arm_compute/core/NEON/kernels/NEScaleKernel.h" #include "arm_compute/core/Types.h" #include "arm_compute/runtime/IFunction.h" #include "arm_compute/runtime/NEON/functions/NEGaussian5x5.h" +#include "arm_compute/runtime/NEON/functions/NEScale.h" #include "arm_compute/runtime/Pyramid.h" #include "arm_compute/runtime/Tensor.h" @@ -114,9 +114,8 @@ public: void run() override; private: - std::unique_ptr _offsets; std::unique_ptr _gaus5x5; - std::unique_ptr _scale_nearest; + std::unique_ptr _scale_nearest; }; } #endif /*__ARM_COMPUTE_NEGAUSSIANPYRAMID_H__ */ diff --git a/arm_compute/runtime/NEON/functions/NEScale.h b/arm_compute/runtime/NEON/functions/NEScale.h index 91cda066e7..00a368eb72 100644 --- a/arm_compute/runtime/NEON/functions/NEScale.h +++ b/arm_compute/runtime/NEON/functions/NEScale.h @@ -28,12 +28,9 @@ #include "arm_compute/core/NEON/kernels/NEScaleKernel.h" #include "arm_compute/core/Types.h" #include "arm_compute/runtime/IFunction.h" -#include "arm_compute/runtime/IMemoryManager.h" -#include "arm_compute/runtime/MemoryGroup.h" #include "arm_compute/runtime/Tensor.h" #include -#include namespace arm_compute { @@ -47,7 +44,7 @@ public: * * Initialize NEScale */ - NEScale(std::shared_ptr memory_manager = nullptr); + NEScale(); /** Initialize the function's source, destination, interpolation type and border_mode. * * @param[in, out] input Source tensor. Data type supported: U8. (Written to only for @p border_mode != UNDEFINED) @@ -62,7 +59,6 @@ public: void run() override; private: - MemoryGroup _memory_group; /**< Function memory group */ Tensor _offsets; /**< Offset to access the element with NEAREST interpolation or the top-left element with BILINEAR interpolation in the input tensor */ Tensor _dx; /**< Element's distance between the X real coordinate and the smallest X following integer */ Tensor _dy; /**< Element's distance between the Y real coordinate and the smallest Y following integer */ -- cgit v1.2.1