diff options
Diffstat (limited to 'src/runtime/CL')
| -rw-r--r-- | src/runtime/CL/functions/CLConvolutionLayer.cpp | 25 | ||||
| -rw-r--r-- | src/runtime/CL/functions/CLFFTConvolutionLayer.cpp | 2 |
2 files changed, 24 insertions, 3 deletions
diff --git a/src/runtime/CL/functions/CLConvolutionLayer.cpp b/src/runtime/CL/functions/CLConvolutionLayer.cpp index 0014e71734..165d523100 100644 --- a/src/runtime/CL/functions/CLConvolutionLayer.cpp +++ b/src/runtime/CL/functions/CLConvolutionLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -75,6 +75,13 @@ void CLConvolutionLayer::configure(ICLTensor *input, const ICLTensor *weights, c _function = std::move(f); break; } + case ConvolutionMethod::FFT: + { + auto f = arm_compute::support::cpp14::make_unique<CLFFTConvolutionLayer>(_memory_manager); + f->configure(input, weights, biases, output, conv_info, act_info); + _function = std::move(f); + break; + } default: ARM_COMPUTE_ERROR("Not supported."); break; @@ -111,6 +118,12 @@ Status CLConvolutionLayer::validate(const ITensorInfo *input, const ITensorInfo ARM_COMPUTE_RETURN_ON_ERROR(CLGEMMConvolutionLayer::validate(input, weights, biases, output, conv_info, weights_info, dilation, act_info, num_groups)); break; } + case ConvolutionMethod::FFT: + { + // Validate FFT-based convolution layer + ARM_COMPUTE_RETURN_ON_ERROR(CLFFTConvolutionLayer::validate(input, weights, nullptr, output, conv_info, act_info)); + break; + } default: ARM_COMPUTE_ERROR("Not supported."); break; @@ -169,12 +182,20 @@ ConvolutionMethod CLConvolutionLayer::get_convolution_method(const ITensorInfo * return (*found).second; } - if(dilation != Size2D(1U, 1U) || (input->dimension(idx_c) < 16)) + if(dilation != Size2D(1U, 1U)) { return ConvolutionMethod::GEMM; } else { + if((weights->dimension(idx_h) > 7) && (input->dimension(idx_c) > output->dimension(idx_c)) && ( CLFFTConvolutionLayer::validate(input, weights, nullptr, output, conv_info, act_info))) + { + return ConvolutionMethod::FFT; + } + if (input->dimension(idx_c) < 16) + { + return ConvolutionMethod::GEMM; + } return bool(CLWinogradConvolutionLayer::validate(input, weights, nullptr, output, conv_info, act_info, enable_fast_math)) ? ConvolutionMethod::WINOGRAD : ConvolutionMethod::GEMM; } } diff --git a/src/runtime/CL/functions/CLFFTConvolutionLayer.cpp b/src/runtime/CL/functions/CLFFTConvolutionLayer.cpp index 6a89b9d304..77097d2b63 100644 --- a/src/runtime/CL/functions/CLFFTConvolutionLayer.cpp +++ b/src/runtime/CL/functions/CLFFTConvolutionLayer.cpp @@ -279,7 +279,7 @@ Status CLFFTConvolutionLayer::validate(const ITensorInfo *input, const ITensorIn if((output != nullptr) && (output->total_size() != 0)) { ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); - ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_SHAPES(input, output); + ARM_COMPUTE_RETURN_ERROR_ON((input->tensor_shape()[idx_height] != output->tensor_shape()[idx_height]) || (input->tensor_shape()[idx_width] != output->tensor_shape()[idx_width])); // Validate Activation Layer if(act_info.enabled()) |