From 8ec0bb6d9027bb7505d6fa0eada42a52c6e1073b Mon Sep 17 00:00:00 2001 From: Vidhya Sudhan Loganathan Date: Tue, 23 Apr 2019 10:40:44 +0100 Subject: COMPMID-2117 : Use FFT convolution if output feature map depth is less than input Change-Id: I588f467258aaa86a9fab8eb96603e02f24362d05 Signed-off-by: Vidhya Sudhan Loganathan Reviewed-on: https://review.mlplatform.org/c/1010 Comments-Addressed: Arm Jenkins Reviewed-by: Gian Marco Iodice Tested-by: Arm Jenkins --- arm_compute/core/Types.h | 7 ++++--- arm_compute/runtime/CL/functions/CLConvolutionLayer.h | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'arm_compute') diff --git a/arm_compute/core/Types.h b/arm_compute/core/Types.h index 5a469a6c9a..24e91bd3c5 100644 --- a/arm_compute/core/Types.h +++ b/arm_compute/core/Types.h @@ -128,9 +128,10 @@ enum class DataLayoutDimension /** Available ConvolutionMethod*/ enum class ConvolutionMethod { - GEMM, /**< Convolution using GEMM */ - DIRECT, /**< Direct convolution */ - WINOGRAD /**< Convolution using Winograd */ + GEMM, /**< Convolution using GEMM */ + DIRECT, /**< Direct convolution */ + WINOGRAD, /**< Convolution using Winograd */ + FFT /**< Convolution using FFT */ }; /** Padding mode to use for PadLayer */ diff --git a/arm_compute/runtime/CL/functions/CLConvolutionLayer.h b/arm_compute/runtime/CL/functions/CLConvolutionLayer.h index 8270e9723e..96f69f21d5 100644 --- a/arm_compute/runtime/CL/functions/CLConvolutionLayer.h +++ b/arm_compute/runtime/CL/functions/CLConvolutionLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -25,6 +25,7 @@ #define __ARM_COMPUTE_CLCONVOLUTIONLAYER_H__ #include "arm_compute/runtime/CL/functions/CLDirectConvolutionLayer.h" +#include "arm_compute/runtime/CL/functions/CLFFTConvolutionLayer.h" #include "arm_compute/runtime/CL/functions/CLGEMMConvolutionLayer.h" #include "arm_compute/runtime/CL/functions/CLWinogradConvolutionLayer.h" #include "arm_compute/runtime/IFunction.h" @@ -39,6 +40,7 @@ namespace arm_compute * -# @ref CLGEMMConvolutionLayer * -# @ref CLWinogradConvolutionLayer * -# @ref CLDirectConvolutionLayer + * -# @ref CLFFTConvolutionLayer */ class CLConvolutionLayer : public IFunction { -- cgit v1.2.1