COMPMID-3638: Move NEON kernels
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Change-Id: Ieed3e4bc8be7fef80c90c5094599b477a56fc473
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4285
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
diff --git a/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h b/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h
index d82f763..c82de0f 100644
--- a/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h
+++ b/arm_compute/runtime/NEON/functions/NEGaussianPyramid.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2019 Arm Limited.
+ * Copyright (c) 2016-2020 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -25,7 +25,6 @@
#define ARM_COMPUTE_NEGAUSSIANPYRAMID_H
#include "arm_compute/core/IPyramid.h"
-#include "arm_compute/core/NEON/kernels/NEGaussianPyramidKernel.h"
#include "arm_compute/core/Types.h"
#include "arm_compute/runtime/IFunction.h"
#include "arm_compute/runtime/NEON/functions/NEGaussian5x5.h"
@@ -39,6 +38,9 @@
namespace arm_compute
{
class ITensor;
+class NEGaussianPyramidHorKernel;
+class NEGaussianPyramidVertKernel;
+class NEFillBorderKernel;
/** Common interface for all Gaussian pyramid functions */
class NEGaussianPyramid : public IFunction
@@ -85,16 +87,26 @@
public:
/** Constructor */
NEGaussianPyramidHalf();
+ /** Prevent instances of this class from being copied (As this class contains pointers) */
+ NEGaussianPyramidHalf(const NEGaussianPyramidHalf &) = delete;
+ /** Prevent instances of this class from being copied (As this class contains pointers) */
+ NEGaussianPyramidHalf &operator=(const NEGaussianPyramidHalf &) = delete;
+ /** Allow instances of this class to be moved */
+ NEGaussianPyramidHalf(NEGaussianPyramidHalf &&) = default;
+ /** Allow instances of this class to be moved */
+ NEGaussianPyramidHalf &operator=(NEGaussianPyramidHalf &&) = default;
+ /** Default destructor */
+ ~NEGaussianPyramidHalf();
// Inherited methods overridden:
void configure(const ITensor *input, IPyramid *pyramid, BorderMode border_mode, uint8_t constant_border_value) override;
void run() override;
private:
- std::vector<NEFillBorderKernel> _horizontal_border_handler;
- std::vector<NEFillBorderKernel> _vertical_border_handler;
- std::vector<NEGaussianPyramidHorKernel> _horizontal_reduction;
- std::vector<NEGaussianPyramidVertKernel> _vertical_reduction;
+ std::vector<std::unique_ptr<NEFillBorderKernel>> _horizontal_border_handler;
+ std::vector<std::unique_ptr<NEFillBorderKernel>> _vertical_border_handler;
+ std::vector<std::unique_ptr<NEGaussianPyramidHorKernel>> _horizontal_reduction;
+ std::vector<std::unique_ptr<NEGaussianPyramidVertKernel>> _vertical_reduction;
};
/** Basic function to execute gaussian pyramid with ORB scale factor. This function calls the following NEON kernels and functions:
@@ -109,6 +121,16 @@
public:
/** Constructor */
NEGaussianPyramidOrb();
+ /** Prevent instances of this class from being copied (As this class contains pointers) */
+ NEGaussianPyramidOrb(const NEGaussianPyramidOrb &) = delete;
+ /** Prevent instances of this class from being copied (As this class contains pointers) */
+ NEGaussianPyramidOrb &operator=(const NEGaussianPyramidOrb &) = delete;
+ /** Allow instances of this class to be moved */
+ NEGaussianPyramidOrb(NEGaussianPyramidOrb &&) = default;
+ /** Allow instances of this class to be moved */
+ NEGaussianPyramidOrb &operator=(NEGaussianPyramidOrb &&) = default;
+ /** Default destructor */
+ ~NEGaussianPyramidOrb();
// Inherited methods overridden:
void configure(const ITensor *input, IPyramid *pyramid, BorderMode border_mode, uint8_t constant_border_value) override;