diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-12-03 18:51:58 +0000 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-12-09 17:39:16 +0000 |
| commit | ec2256b81e6d6f655dcfbc76683738fbfeb82bcc (patch) | |
| tree | 262ea08d3df23910dae663a79c915e585681530f /arm_compute/runtime/NEON/functions/NEGEMMConv2d.h | |
| parent | 98e33b97b92c912f058bfb3295adad1bcad3e80f (diff) | |
| download | ComputeLibrary-ec2256b81e6d6f655dcfbc76683738fbfeb82bcc.tar.gz | |
Move NEGEMMAssemblyDispatch as an internal function
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I89ee26c1595d510c5048904cae9422528b76cd45
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4662
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'arm_compute/runtime/NEON/functions/NEGEMMConv2d.h')
| -rw-r--r-- | arm_compute/runtime/NEON/functions/NEGEMMConv2d.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/arm_compute/runtime/NEON/functions/NEGEMMConv2d.h b/arm_compute/runtime/NEON/functions/NEGEMMConv2d.h index 7cae39397f..2b3c162eab 100644 --- a/arm_compute/runtime/NEON/functions/NEGEMMConv2d.h +++ b/arm_compute/runtime/NEON/functions/NEGEMMConv2d.h @@ -28,7 +28,6 @@ #include "arm_compute/runtime/IFunction.h" #include "arm_compute/runtime/IMemoryManager.h" #include "arm_compute/runtime/NEON/functions/NEActivationLayer.h" -#include "arm_compute/runtime/NEON/functions/NEGEMMAssemblyDispatch.h" #include "arm_compute/runtime/NEON/functions/NEPermute.h" #include "arm_compute/runtime/Tensor.h" @@ -37,6 +36,8 @@ namespace arm_compute { // Forward declarations class ITensor; +class NEGEMMAssemblyDispatch; + /** Basic function to compute the convolution layer. This function calls the following NEON kernels/functions: * * Supports only NHWC data layout @@ -60,6 +61,8 @@ public: NEGEMMConv2d &operator=(const NEGEMMConv2d &) = delete; /** Default move assignment operator */ NEGEMMConv2d &operator=(NEGEMMConv2d &&) = default; + /** Destructor */ + ~NEGEMMConv2d(); /** Set the input and output tensors. * * @param[in] input Source tensor. 3 lower dimensions represent a single input [width, height, IFM], @@ -96,13 +99,13 @@ public: void prepare() override; private: - NEGEMMAssemblyDispatch _gemm_asm_func; - NEActivationLayer _activation_func; - NEPermute _weights_permute_func; - const ITensor *_original_weights; - Tensor _permuted_weights; - bool _is_prepared; - bool _run_activation; + std::unique_ptr<NEGEMMAssemblyDispatch> _gemm_asm_func; + NEActivationLayer _activation_func; + NEPermute _weights_permute_func; + const ITensor *_original_weights; + Tensor _permuted_weights; + bool _is_prepared; + bool _run_activation; }; } // namespace arm_compute #endif /* ARM_COMPUTE_NEGEMMCONV2D_H */ |