From 578225e8000c0fc2c4f81a44ae7f06fe44b0fc6a Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Mon, 16 Jul 2018 18:00:11 +0100 Subject: COMPMID-1357: Port NEWinogradConvolution to use NEGEMMAssemblyDispatch Change-Id: I9a6a1ebf3956b2b5747027f659cb326b86335f50 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/140155 Tested-by: Jenkins Reviewed-by: Pablo Tello Reviewed-by: Georgios Pinitas --- arm_compute/runtime/NEON/functions/NEWinogradConvolutionLayer.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'arm_compute/runtime/NEON/functions') diff --git a/arm_compute/runtime/NEON/functions/NEWinogradConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEWinogradConvolutionLayer.h index c1260977c0..d897ae00e7 100644 --- a/arm_compute/runtime/NEON/functions/NEWinogradConvolutionLayer.h +++ b/arm_compute/runtime/NEON/functions/NEWinogradConvolutionLayer.h @@ -27,11 +27,11 @@ #include "arm_compute/runtime/IFunction.h" #include "arm_compute/core/NEON/INEKernel.h" -#include "arm_compute/core/NEON/kernels/assembly/arm_gemm.hpp" #include "arm_compute/core/Types.h" #include "arm_compute/runtime/CPP/functions/CPPPermute.h" #include "arm_compute/runtime/MemoryGroup.h" #include "arm_compute/runtime/NEON/functions/NEActivationLayer.h" +#include "arm_compute/runtime/NEON/functions/NEGEMMAssemblyDispatch.h" #include "arm_compute/runtime/Tensor.h" #include @@ -102,9 +102,8 @@ public: NEWinogradConvolutionLayer &operator=(const NEWinogradConvolutionLayer &) = delete; private: - MemoryGroup _memory_group; - std::unique_ptr> _arm_gemm; - std::unique_ptr _gemm_kernel; + MemoryGroup _memory_group; + NEGEMMAssemblyDispatchF32 _asm_glue; std::unique_ptr _transform_input_kernel; std::unique_ptr _transform_output_kernel; std::unique_ptr _transform_weights_kernel; @@ -119,7 +118,6 @@ private: Tensor _input_nhwc; Tensor _output_nhwc; Tensor _weights_hwio; - Tensor _workspace; const ITensor *_input; const ITensor *_weights; ITensor *_output; -- cgit v1.2.1