COMPMID-534: Port MemoryManager to CL functions (Images)
Adds support for:
-CLCannyEdge
-CLFastCorners
-CLGaussian5x5
-CLHarrisCorners
-CLSobel3x3
-CLSobel5x5
Change-Id: I712a76d4ceda915b5cf85a4d12c1b7a059d4d909
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/88118
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Moritz Pflanzer <moritz.pflanzer@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
diff --git a/arm_compute/runtime/CL/functions/CLCannyEdge.h b/arm_compute/runtime/CL/functions/CLCannyEdge.h
index e5a82b2..1d5a5aa 100644
--- a/arm_compute/runtime/CL/functions/CLCannyEdge.h
+++ b/arm_compute/runtime/CL/functions/CLCannyEdge.h
@@ -28,7 +28,9 @@
#include "arm_compute/core/CL/kernels/CLCannyEdgeKernel.h"
#include "arm_compute/core/CL/kernels/CLFillBorderKernel.h"
+#include "arm_compute/runtime/CL/CLMemoryGroup.h"
#include "arm_compute/runtime/CL/CLTensor.h"
+#include "arm_compute/runtime/IMemoryManager.h"
#include <memory>
@@ -49,7 +51,7 @@
{
public:
/** Constructor */
- CLCannyEdge();
+ CLCannyEdge(std::shared_ptr<IMemoryManager> memory_manager = nullptr);
/** Initialise the function's source, destination, thresholds, gradient size, normalization type and border mode.
*
* @param[in,out] input Source tensor. Data types supported: U8. (Written to only for border_mode != UNDEFINED)
@@ -68,6 +70,7 @@
virtual void run() override;
private:
+ CLMemoryGroup _memory_group; /**< Function's memory group */
std::unique_ptr<IFunction> _sobel; /**< Pointer to Sobel kernel. */
CLGradientKernel _gradient; /**< Gradient kernel. */
CLFillBorderKernel _border_mag_gradient; /**< Fill border on magnitude tensor kernel */
diff --git a/arm_compute/runtime/CL/functions/CLFastCorners.h b/arm_compute/runtime/CL/functions/CLFastCorners.h
index 79d82af..9afec71 100644
--- a/arm_compute/runtime/CL/functions/CLFastCorners.h
+++ b/arm_compute/runtime/CL/functions/CLFastCorners.h
@@ -29,11 +29,14 @@
#include "arm_compute/core/Types.h"
#include "arm_compute/core/Window.h"
#include "arm_compute/runtime/CL/CLArray.h"
+#include "arm_compute/runtime/CL/CLMemoryGroup.h"
#include "arm_compute/runtime/CL/CLTensor.h"
#include "arm_compute/runtime/CL/functions/CLNonMaximaSuppression3x3.h"
#include "arm_compute/runtime/IFunction.h"
+#include "arm_compute/runtime/IMemoryManager.h"
#include <cstdint>
+#include <memory>
namespace arm_compute
{
@@ -51,7 +54,7 @@
{
public:
/** Constructor */
- CLFastCorners();
+ CLFastCorners(std::shared_ptr<IMemoryManager> memory_manager = nullptr);
/** Prevent instances of this class from being copied (As this class contains pointers) */
CLFastCorners(const CLFastCorners &) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
@@ -72,6 +75,7 @@
void run() override;
private:
+ CLMemoryGroup _memory_group;
CLFastCornersKernel _fast_corners_kernel;
CLNonMaximaSuppression3x3 _suppr_func;
CLCopyToArrayKernel _copy_array_kernel;
diff --git a/arm_compute/runtime/CL/functions/CLGaussian5x5.h b/arm_compute/runtime/CL/functions/CLGaussian5x5.h
index 148b9a9..3c60cc6 100644
--- a/arm_compute/runtime/CL/functions/CLGaussian5x5.h
+++ b/arm_compute/runtime/CL/functions/CLGaussian5x5.h
@@ -27,10 +27,13 @@
#include "arm_compute/core/CL/kernels/CLFillBorderKernel.h"
#include "arm_compute/core/CL/kernels/CLGaussian5x5Kernel.h"
#include "arm_compute/core/Types.h"
+#include "arm_compute/runtime/CL/CLMemoryGroup.h"
#include "arm_compute/runtime/CL/CLTensor.h"
#include "arm_compute/runtime/IFunction.h"
+#include "arm_compute/runtime/IMemoryManager.h"
#include <cstdint>
+#include <memory>
namespace arm_compute
{
@@ -47,7 +50,7 @@
{
public:
/** Default Constructor. */
- CLGaussian5x5();
+ CLGaussian5x5(std::shared_ptr<IMemoryManager> memory_manager = nullptr);
/** Initialise the function's source, destinations and border mode.
*
* @param[in,out] input Source tensor. Data types supported: U8. (Written to only for @p border_mode != UNDEFINED)
@@ -61,6 +64,7 @@
void run() override;
protected:
+ CLMemoryGroup _memory_group; /**< Function's memory group */
CLGaussian5x5HorKernel _kernel_hor; /**< Horizontal pass kernel */
CLGaussian5x5VertKernel _kernel_vert; /**< Vertical pass kernel */
CLFillBorderKernel _border_handler; /**< Kernel to handle image borders */
diff --git a/arm_compute/runtime/CL/functions/CLHarrisCorners.h b/arm_compute/runtime/CL/functions/CLHarrisCorners.h
index f9a1275..e09e670 100644
--- a/arm_compute/runtime/CL/functions/CLHarrisCorners.h
+++ b/arm_compute/runtime/CL/functions/CLHarrisCorners.h
@@ -31,11 +31,12 @@
#include "arm_compute/core/CL/kernels/CLHarrisCornersKernel.h"
#include "arm_compute/core/NEON/kernels/NEHarrisCornersKernel.h"
#include "arm_compute/core/Types.h"
+#include "arm_compute/runtime/CL/CLMemoryGroup.h"
#include "arm_compute/runtime/CL/CLTensor.h"
#include "arm_compute/runtime/CL/functions/CLNonMaximaSuppression3x3.h"
+#include "arm_compute/runtime/IMemoryManager.h"
#include <cstdint>
-
#include <memory>
namespace arm_compute
@@ -60,7 +61,7 @@
{
public:
/** Constructor */
- CLHarrisCorners();
+ CLHarrisCorners(std::shared_ptr<IMemoryManager> memory_manager = nullptr);
/** Prevent instances of this class from being copied (As this class contains pointers) */
CLHarrisCorners(const CLHarrisCorners &) = delete;
/** Prevent instances of this class from being copied (As this class contains pointers) */
@@ -85,6 +86,7 @@
void run() override;
private:
+ CLMemoryGroup _memory_group; /**< Function's memory group */
std::unique_ptr<IFunction> _sobel; /**< Sobel function */
CLHarrisScoreKernel _harris_score; /**< Harris score kernel */
CLNonMaximaSuppression3x3 _non_max_suppr; /**< Non-maxima suppression function */
diff --git a/arm_compute/runtime/CL/functions/CLSobel5x5.h b/arm_compute/runtime/CL/functions/CLSobel5x5.h
index ad1f72f..3e603f8 100644
--- a/arm_compute/runtime/CL/functions/CLSobel5x5.h
+++ b/arm_compute/runtime/CL/functions/CLSobel5x5.h
@@ -27,10 +27,13 @@
#include "arm_compute/core/CL/kernels/CLFillBorderKernel.h"
#include "arm_compute/core/CL/kernels/CLSobel5x5Kernel.h"
#include "arm_compute/core/Types.h"
+#include "arm_compute/runtime/CL/CLMemoryGroup.h"
#include "arm_compute/runtime/CL/CLTensor.h"
#include "arm_compute/runtime/IFunction.h"
+#include "arm_compute/runtime/IMemoryManager.h"
#include <cstdint>
+#include <memory>
namespace arm_compute
{
@@ -47,7 +50,7 @@
{
public:
/** Default Constructor. */
- CLSobel5x5();
+ CLSobel5x5(std::shared_ptr<IMemoryManager> memory_manager = nullptr);
/** Initialise the function's source, destinations and border mode.
*
* @note At least one of output_x or output_y must be not NULL.
@@ -64,6 +67,7 @@
void run() override;
protected:
+ CLMemoryGroup _memory_group; /**< Function's memory group */
CLSobel5x5HorKernel _sobel_hor; /**< Sobel Horizontal 5x5 kernel */
CLSobel5x5VertKernel _sobel_vert; /**< Sobel Vertical 5x5 kernel */
CLFillBorderKernel _border_handler; /**< Kernel to handle image borders */
diff --git a/arm_compute/runtime/CL/functions/CLSobel7x7.h b/arm_compute/runtime/CL/functions/CLSobel7x7.h
index 1a3fe1a..0dc0a1c 100644
--- a/arm_compute/runtime/CL/functions/CLSobel7x7.h
+++ b/arm_compute/runtime/CL/functions/CLSobel7x7.h
@@ -27,10 +27,13 @@
#include "arm_compute/core/CL/kernels/CLFillBorderKernel.h"
#include "arm_compute/core/CL/kernels/CLSobel7x7Kernel.h"
#include "arm_compute/core/Types.h"
+#include "arm_compute/runtime/CL/CLMemoryGroup.h"
#include "arm_compute/runtime/CL/CLTensor.h"
#include "arm_compute/runtime/IFunction.h"
+#include "arm_compute/runtime/IMemoryManager.h"
#include <cstdint>
+#include <memory>
namespace arm_compute
{
@@ -47,7 +50,7 @@
{
public:
/** Default Constructor. */
- CLSobel7x7();
+ CLSobel7x7(std::shared_ptr<IMemoryManager> memory_manager = nullptr);
/** Initialise the function's source, destinations and border mode.
*
* @note At least one of output_x or output_y must be not NULL.
@@ -64,6 +67,7 @@
void run() override;
protected:
+ CLMemoryGroup _memory_group; /**< Function's memory group */
CLSobel7x7HorKernel _sobel_hor; /**< Sobel Horizontal 7x7 kernel */
CLSobel7x7VertKernel _sobel_vert; /**< Sobel Vertical 7x7 kernel */
CLFillBorderKernel _border_handler; /**< Kernel to handle image borders */