From 52140b42f4f663da7f4537abbdebd13df541bcea Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Tue, 30 Jan 2018 14:48:11 +0000 Subject: COMPMID-784: Winograd tramsforms refactoring 1) Removed the example files winograd_layer.hpp/cpp 2) Teplatized winograd transform kernels Change-Id: I7045fa0b801b9d30a11275914aaa2dafd254aed2 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/118332 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- .../runtime/NEON/functions/NEWinogradLayer.h | 37 +++++++++++----------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'arm_compute/runtime/NEON') diff --git a/arm_compute/runtime/NEON/functions/NEWinogradLayer.h b/arm_compute/runtime/NEON/functions/NEWinogradLayer.h index 1682495f0d..63cac3a3b4 100644 --- a/arm_compute/runtime/NEON/functions/NEWinogradLayer.h +++ b/arm_compute/runtime/NEON/functions/NEWinogradLayer.h @@ -68,25 +68,24 @@ public: NEWinogradLayer &operator=(const NEWinogradLayer &) = delete; private: - MemoryGroup _memory_group; - NEWinogradLayerKernel _winograd_kernel; - NEWinogradLayerTransformInputKernel _transform_input_kernel; - NEWinogradLayerTransformOutputKernel _transform_output_kernel; - NEWinogradLayerTransformWeightsKernel _transform_weights_kernel; - CPPPermute _permute_input; - CPPPermute _permute_weights; - CPPPermute _permute_output; - Tensor _input_workspace; - Tensor _output_workspace; - Tensor _kernel_storage; - Tensor _input_nhwc; - Tensor _output_nhwc; - Tensor _weights_hwio; - const ITensor *_input; - const ITensor *_weights; - ITensor *_output; - bool _reshaped_kernel; - std::unique_ptr _conv; + MemoryGroup _memory_group; + NEWinogradLayerKernel<2, 2, 3, 3> _winograd_kernel; + NEWinogradLayerTransformInputKernel<2, 2, 3, 3> _transform_input_kernel; + NEWinogradLayerTransformOutputKernel<2, 2, 3, 3> _transform_output_kernel; + NEWinogradLayerTransformWeightsKernel<2, 2, 3, 3> _transform_weights_kernel; + CPPPermute _permute_input; + CPPPermute _permute_weights; + CPPPermute _permute_output; + Tensor _input_workspace; + Tensor _output_workspace; + Tensor _kernel_storage; + Tensor _input_nhwc; + Tensor _output_nhwc; + Tensor _weights_hwio; + const ITensor *_input; + const ITensor *_weights; + ITensor *_output; + bool _reshaped_kernel; }; } #endif /* __ARM_COMPUTE_NEWINOGRADLAYER_H__ */ -- cgit v1.2.1