diff options
| author | Manuel Bottini <manuel.bottini@arm.com> | 2020-04-30 13:28:23 +0100 |
|---|---|---|
| committer | Manuel Bottini <manuel.bottini@arm.com> | 2020-05-12 09:34:17 +0000 |
| commit | 6e10aa395e81b83edb3437191acd7abe1639c7dc (patch) | |
| tree | fce78e75102402df6dbbd37e715f9ef855846008 /src/runtime/NEON/functions/NEConvolutionLayer.cpp | |
| parent | 0e240151637641e9e0c425d52dd75b7bd11d1159 (diff) | |
| download | ComputeLibrary-6e10aa395e81b83edb3437191acd7abe1639c7dc.tar.gz | |
COMPMID-3316: NEDeconvolutionLayer failing for a big input
- Using NEDirectConvolution for big shapes since the memory
required explodes for 9x9 kernel
- Adding test cases
- Fix enables only the NEON Deconvolution for NHWC
Change-Id: I8a541346428e5686818f8ecb7f69e2a9106cbceb
Signed-off-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3135
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Sang-Hoon Park <sang-hoon.park@arm.com>
Diffstat (limited to 'src/runtime/NEON/functions/NEConvolutionLayer.cpp')
| -rw-r--r-- | src/runtime/NEON/functions/NEConvolutionLayer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/runtime/NEON/functions/NEConvolutionLayer.cpp b/src/runtime/NEON/functions/NEConvolutionLayer.cpp index 1755e9a774..dcd26fc1cd 100644 --- a/src/runtime/NEON/functions/NEConvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEConvolutionLayer.cpp @@ -102,7 +102,7 @@ Status NEConvolutionLayer::validate(const ITensorInfo *input, const ITensorInfo ARM_COMPUTE_RETURN_ON_ERROR(NEGEMMConvolutionLayer::validate(input, weights, biases, output, conv_info, weights_info, dilation, act_info)); break; case ConvolutionMethod::DIRECT: - //Validate Gemm-based Convolution + //Validate Direct Convolution ARM_COMPUTE_RETURN_ON_ERROR(NEDirectConvolutionLayer::validate(input, weights, biases, output, conv_info, act_info)); break; case ConvolutionMethod::FFT: @@ -167,7 +167,8 @@ ConvolutionMethod NEConvolutionLayer::get_convolution_method(const ITensorInfo * else { // SRGAN - if((input->dimension(idx_h) > 720U) && (output->dimension(idx_h) > 720U) && (weights->dimension(idx_h) == 9) + // Output might not be initialized when it is an internal tensor of the layer using the convolution + if(input->total_size() > 1e7 && (weights->dimension(idx_h) > 7) && (NEDirectConvolutionLayer::validate(input, weights, nullptr, output, conv_info, act_info))) { return ConvolutionMethod::DIRECT; |