commit e620a83da59b9f835642d1dd0b68663556dbf379
author Giorgio Arena <giorgio.arena@arm.com> Mon Feb 17 16:33:20 2020 +0000
committer Giorgio Arena <giorgio.arena@arm.com> Wed Feb 26 10:55:40 2020 +0000
tree 690a60c1b2a01279077c6c1c940d229541d27c07
parent 7d7c4206eb5fce3a1e93bad7a91841ff6d904f23

COMPMID-1611 CLDirectConvolution NHWC QASYMM not implemented

Change-Id: I358c729cb81b83d35f1bc7f70ea593d5bff5f1ed
Signed-off-by: Giorgio Arena <giorgio.arena@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2738
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>

tests/validation/reference/ConvolutionLayer.cpp

diff --git a/tests/validation/reference/ConvolutionLayer.cpp b/tests/validation/reference/ConvolutionLayer.cpp
index c9ad8d3..84fb349 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 @@
     // Create reference
     SimpleTensor<T> dst{ output_shape, src.data_type(), 1, out_quant_info };
 
-    if(src.data_layout() == DataLayout::NHWC)
-    {
-        SimpleTensor<T>  src_nchw     = reference::permute<T>(src, PermutationVector(1U, 2U, 0U));
-        SimpleTensor<TW> weights_nchw = reference::permute<TW>(weights, PermutationVector(1U, 2U, 0U));
-        SimpleTensor<T>  dst_nchw     = reference::permute<T>(dst, PermutationVector(1U, 2U, 0U));
-
-        return reference::permute<T>(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<float> convolution_layer(const SimpleTensor<float> &src, const SimpleTensor<float> &weights, const SimpleTensor<float> &bias, const TensorShape &output_shape,