From a50e702289af66944e860eafc7f3b32f6c5f30be Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Tue, 9 Apr 2019 14:03:17 +0100 Subject: COMPMID-2012: Remove unnecessary templates from NEON kernels Change-Id: I2deb26188c7de7c6ad10d2f51f83e729fed7e5e2 Signed-off-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/961 Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins --- arm_compute/core/NEON/kernels/NEReorgLayerKernel.h | 23 ++++------------------ arm_compute/core/NEON/kernels/NEStackLayerKernel.h | 14 ------------- .../core/NEON/kernels/NEWeightsReshapeKernel.h | 11 ++++------- 3 files changed, 8 insertions(+), 40 deletions(-) (limited to 'arm_compute') diff --git a/arm_compute/core/NEON/kernels/NEReorgLayerKernel.h b/arm_compute/core/NEON/kernels/NEReorgLayerKernel.h index 7e0fb4350d..076af4fd1c 100644 --- a/arm_compute/core/NEON/kernels/NEReorgLayerKernel.h +++ b/arm_compute/core/NEON/kernels/NEReorgLayerKernel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -75,24 +75,9 @@ public: void run(const Window &window, const ThreadInfo &info) override; private: - /** Template function to run the reorg - * - * @param[in] window Region on which to execute the kernel. (Must be a valid region of the window returned by window()). - */ - template - void run_reorg(const Window &window); - - /** Common signature for all the specialised reorg functions - * - * @param[in] window Region on which to execute the kernel. - */ - using ReorgFunctionPtr = void (NEReorgLayerKernel::*)(const Window &window); - -private: - ReorgFunctionPtr _func; - const ITensor *_input; - ITensor *_output; - int32_t _stride; + const ITensor *_input; + ITensor *_output; + int32_t _stride; }; } // namespace arm_compute #endif /*__ARM_COMPUTE_NEREORGLAYERKERNEL_H__ */ diff --git a/arm_compute/core/NEON/kernels/NEStackLayerKernel.h b/arm_compute/core/NEON/kernels/NEStackLayerKernel.h index 3a9e81fa94..42a0539c9f 100644 --- a/arm_compute/core/NEON/kernels/NEStackLayerKernel.h +++ b/arm_compute/core/NEON/kernels/NEStackLayerKernel.h @@ -84,24 +84,10 @@ public: void run(const Window &window, const ThreadInfo &info) override; private: - /** Template function to run the stack - * - * @param[in] window Region on which to execute the kernel. (Must be a valid region of the window returned by window()). - */ - template - void run_stack(const Window &window); - - /** Common signature for all the specialised stack functions - * - * @param[in] window Region on which to execute the kernel. - */ - using StackFunctionPtr = void (NEStackLayerKernel::*)(const Window &window); - const ITensor *_input; ITensor *_output; unsigned int _axis; unsigned int _idx_input; - StackFunctionPtr _func; }; } // namespace arm_compute #endif /* __ARM_COMPUTE_NESTACKLAYERKERNEL_H__ */ diff --git a/arm_compute/core/NEON/kernels/NEWeightsReshapeKernel.h b/arm_compute/core/NEON/kernels/NEWeightsReshapeKernel.h index 21f36f6c2b..bba18a8fa8 100644 --- a/arm_compute/core/NEON/kernels/NEWeightsReshapeKernel.h +++ b/arm_compute/core/NEON/kernels/NEWeightsReshapeKernel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -99,12 +99,9 @@ public: void run(const Window &window, const ThreadInfo &info) override; private: - using WeightsReshapeKernel = void(const ITensor *input, const ITensor *bias, ITensor *output, const Window &window); - - WeightsReshapeKernel *_func; - const ITensor *_input; - const ITensor *_bias; - ITensor *_output; + const ITensor *_input; + const ITensor *_bias; + ITensor *_output; }; } // namespace arm_compute #endif /*__ARM_COMPUTE_NEWEIGHTSRESHAPEKERNEL_H__ */ -- cgit v1.2.1