diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-06-29 12:51:22 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:53:58 +0000 |
commit | 9e454f36db4e13a3794289cb13e2cefbfbde1047 (patch) | |
tree | 6f3c974e8481710c307574ff2911ba2292eb364c | |
parent | 00b93f52f328d3cf77a50a1ae7a46213f5b1f4c2 (diff) | |
download | ComputeLibrary-9e454f36db4e13a3794289cb13e2cefbfbde1047.tar.gz |
COMPMID-1350: (Nightly) Fix GEMMConvolutionLayer FP32/FP16 CL failing
Change-Id: I8e8dee355bbf708cc3abb22de867f848a22dccd6
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/138022
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele DiGiorgio <michele.digiorgio@arm.com>
-rw-r--r-- | src/core/CL/kernels/CLIm2ColKernel.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/CL/kernels/CLIm2ColKernel.cpp b/src/core/CL/kernels/CLIm2ColKernel.cpp index 91aa181c52..5d4e039e94 100644 --- a/src/core/CL/kernels/CLIm2ColKernel.cpp +++ b/src/core/CL/kernels/CLIm2ColKernel.cpp @@ -171,24 +171,25 @@ CLIm2ColKernel::configure_window(const ICLTensor *input, ICLTensor *output, cons break; case 5: _num_elems_processed_per_iteration = 1; - is_optimized_path = true; switch(data_layout) { case DataLayout::NCHW: - kernel_name = "im2col5x5_dchw"; + is_optimized_path = true; + kernel_name = "im2col5x5_dchw"; break; default: // using generic_nhwc + is_optimized_path = false; break; } break; case 11: + _num_elems_processed_per_iteration = 1; // Optimized im2col11x11 if pad_x = pad_y = 0 - if(!conv_info.has_padding()) + if(!conv_info.has_padding() && data_layout == DataLayout::NCHW) { - _num_elems_processed_per_iteration = 1; - is_optimized_path = true; - kernel_name = "im2col11x11_padx0_pady0_dchw"; + is_optimized_path = true; + kernel_name = "im2col11x11_padx0_pady0_dchw"; } break; default: |