diff options
author | Isabella Gottardi <isabella.gottardi@arm.com> | 2018-02-19 16:42:22 +0000 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:47:18 +0000 |
commit | cac4a2e5fadcb82c48828736deea24b3d8b495c8 (patch) | |
tree | d02ea42e7e14d7675782be9f8dd993b8f2e4cc05 | |
parent | 9be0c5a71cd7c1f08b65c48e53d083c59dd093a3 (diff) | |
download | ComputeLibrary-cac4a2e5fadcb82c48828736deea24b3d8b495c8.tar.gz |
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 <anthony.barbier@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
-rw-r--r-- | src/runtime/CL/functions/CLConvolutionLayer.cpp | 10 | ||||
-rw-r--r-- | tests/validation/CL/ConvolutionLayer.cpp | 2 |
2 files changed, 5 insertions, 7 deletions
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; } diff --git a/tests/validation/CL/ConvolutionLayer.cpp b/tests/validation/CL/ConvolutionLayer.cpp index b7f9241c88..bbe4c6a271 100644 --- a/tests/validation/CL/ConvolutionLayer.cpp +++ b/tests/validation/CL/ConvolutionLayer.cpp @@ -103,7 +103,7 @@ DATA_TEST_CASE(ValidateConvolutionMethod, framework::DatasetMode::ALL, zip(zip(z GPUTarget::BIFROST })), - framework::dataset::make("Expected", { ConvolutionMethod::DIRECT, ConvolutionMethod::GEMM, ConvolutionMethod::GEMM, ConvolutionMethod::GEMM, ConvolutionMethod::DIRECT })), + framework::dataset::make("Expected", { ConvolutionMethod::GEMM, ConvolutionMethod::GEMM, ConvolutionMethod::GEMM, ConvolutionMethod::GEMM, ConvolutionMethod::GEMM })), input_info, weights_info, biases_info, output_info, conv_info, gpu_target, expected) { ConvolutionMethod is_valid = CLConvolutionLayer::get_convolution_method(&input_info.clone()->set_is_resizable(false), |