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>
diff --git a/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h b/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h
index 5f0a67e..b4ed56a 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 @@
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 91cda06..00a368e 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 @@
*
* 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 @@
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 */