From e620a83da59b9f835642d1dd0b68663556dbf379 Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Mon, 17 Feb 2020 16:33:20 +0000 Subject: COMPMID-1611 CLDirectConvolution NHWC QASYMM not implemented Change-Id: I358c729cb81b83d35f1bc7f70ea593d5bff5f1ed Signed-off-by: Giorgio Arena Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2738 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Reviewed-by: Michele Di Giorgio --- tests/validation/reference/ConvolutionLayer.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'tests/validation/reference/ConvolutionLayer.cpp') diff --git a/tests/validation/reference/ConvolutionLayer.cpp b/tests/validation/reference/ConvolutionLayer.cpp index c9ad8d38b9..84fb3491bd 100644 --- a/tests/validation/reference/ConvolutionLayer.cpp +++ b/tests/validation/reference/ConvolutionLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -115,18 +115,7 @@ SimpleTensor convolution_layer(const SimpleTensor &src, const SimpleTensor // Create reference SimpleTensor dst{ output_shape, src.data_type(), 1, out_quant_info }; - if(src.data_layout() == DataLayout::NHWC) - { - SimpleTensor src_nchw = reference::permute(src, PermutationVector(1U, 2U, 0U)); - SimpleTensor weights_nchw = reference::permute(weights, PermutationVector(1U, 2U, 0U)); - SimpleTensor dst_nchw = reference::permute(dst, PermutationVector(1U, 2U, 0U)); - - return reference::permute(convolution_layer_nchw(src_nchw, weights_nchw, bias, dst_nchw, info, dilation, num_groups), PermutationVector(2U, 0U, 1U)); - } - else - { - return convolution_layer_nchw(src, weights, bias, dst, info, dilation, num_groups); - } + return convolution_layer_nchw(src, weights, bias, dst, info, dilation, num_groups); } template SimpleTensor convolution_layer(const SimpleTensor &src, const SimpleTensor &weights, const SimpleTensor &bias, const TensorShape &output_shape, -- cgit v1.2.1