From cac4a2e5fadcb82c48828736deea24b3d8b495c8 Mon Sep 17 00:00:00 2001 From: Isabella Gottardi Date: Mon, 19 Feb 2018 16:42:22 +0000 Subject: COMPMID-765 - Fix get_convolution_method in order to return the correct method. Change-Id: Ia4be053b9f5399fe7e241cebb4292890e957ae54 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/121141 Reviewed-by: Anthony Barbier Tested-by: Jenkins --- src/runtime/CL/functions/CLConvolutionLayer.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/runtime/CL/functions/CLConvolutionLayer.cpp') diff --git a/src/runtime/CL/functions/CLConvolutionLayer.cpp b/src/runtime/CL/functions/CLConvolutionLayer.cpp index c430174fe7..a0bee520a6 100644 --- a/src/runtime/CL/functions/CLConvolutionLayer.cpp +++ b/src/runtime/CL/functions/CLConvolutionLayer.cpp @@ -80,14 +80,14 @@ Status CLConvolutionLayer::validate(const ITensorInfo *input, const ITensorInfo case ConvolutionMethod::DIRECT: { // Validate direct convolution layer - CLDirectConvolutionLayerKernel::validate(input, weights, biases, output, conv_info, gpu_target); + CLDirectConvolutionLayer::validate(input, weights, biases, output, conv_info); break; } case ConvolutionMethod::GEMM: { // Validate gemm-based convolution layer /* TODO COMPMID-754: Add validation methods for CLGEMMConvolutionLayer - CLGEMMConvolutionLayerKernel::validate(input, weights, biases, output, conv_info, weights_info); */ + CLGEMMConvolutionLayer::validate(input, weights, biases, output, conv_info, weights_info); */ break; } default: @@ -102,15 +102,13 @@ ConvolutionMethod CLConvolutionLayer::get_convolution_method(const ITensorInfo * const WeightsInfo &weights_info, const GPUTarget gpu_target) { ARM_COMPUTE_UNUSED(input); + ARM_COMPUTE_UNUSED(weights); ARM_COMPUTE_UNUSED(biases); ARM_COMPUTE_UNUSED(output); ARM_COMPUTE_UNUSED(conv_info); ARM_COMPUTE_UNUSED(weights_info); + ARM_COMPUTE_UNUSED(gpu_target); - if((gpu_target == GPUTarget::BIFROST) && (weights->dimension(0) == 5) && (weights->dimension(1) == 5)) - { - return ConvolutionMethod::DIRECT; - } return ConvolutionMethod::GEMM; } -- cgit v1.2.1