diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2017-09-18 17:55:22 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | 3021edfb5e72ef4cd91dbc754ce6ac55388ebc4e (patch) | |
tree | 4dba45b5e0ea8401c3bcbd66fc2b97d18d119dc6 /arm_compute/runtime/NEON/functions | |
parent | d910ffa3ae6433404649f91ac53c8fa08bd6e196 (diff) | |
download | ComputeLibrary-3021edfb5e72ef4cd91dbc754ce6ac55388ebc4e.tar.gz |
COMPMID-417: Fix NEGaussianPyramidOrb.
Change-Id: I9e89136a926f33cc591784d4e7785618bba7b0b2
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/88116
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Diffstat (limited to 'arm_compute/runtime/NEON/functions')
-rw-r--r-- | arm_compute/runtime/NEON/functions/NEGaussianPyramid.h | 5 | ||||
-rw-r--r-- | arm_compute/runtime/NEON/functions/NEScale.h | 6 |
2 files changed, 3 insertions, 8 deletions
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<Image[]> _offsets; std::unique_ptr<NEGaussian5x5[]> _gaus5x5; - std::unique_ptr<NEScaleKernel[]> _scale_nearest; + std::unique_ptr<NEScale[]> _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 <cstdint> -#include <memory> namespace arm_compute { @@ -47,7 +44,7 @@ public: * * Initialize NEScale */ - NEScale(std::shared_ptr<IMemoryManager> 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 */ |