From f485a100e3f11911d25a16b4ccc286c6c0816061 Mon Sep 17 00:00:00 2001
From: Giorgio Arena <giorgio.arena@arm.com>
Date: Fri, 20 Apr 2018 16:06:21 +0100
Subject: COMPMID-802 Fix NEIm2Col NHWC

Change-Id: I513e0199b6fa665c4a7d2a739f4871b4575ef347
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/128490
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
---
 tests/validation/reference/Im2Col.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'tests/validation/reference/Im2Col.cpp')

diff --git a/tests/validation/reference/Im2Col.cpp b/tests/validation/reference/Im2Col.cpp
index 825f0a6ee1..d309b7d5e6 100644
--- a/tests/validation/reference/Im2Col.cpp
+++ b/tests/validation/reference/Im2Col.cpp
@@ -88,14 +88,12 @@ SimpleTensor<T> im2col(const SimpleTensor<T> &src, const TensorShape &dst_shape,
     if(src.data_layout() == DataLayout::NHWC)
     {
         SimpleTensor<T> src_nchw = reference::permute<T>(src, PermutationVector(1U, 2U, 0U));
-        SimpleTensor<T> dst_nchw = reference::permute<T>(dst, PermutationVector(1U, 2U, 0U));
-
-        im2col_nchw(src_nchw, dst_nchw, kernel_dims, conv_info, has_bias);
-
-        return reference::permute<T>(dst_nchw, PermutationVector(2U, 0U, 1U));
+        im2col_nchw(src_nchw, dst, kernel_dims, conv_info, has_bias);
+    }
+    else
+    {
+        im2col_nchw(src, dst, kernel_dims, conv_info, has_bias);
     }
-
-    im2col_nchw(src, dst, kernel_dims, conv_info, has_bias);
 
     return dst;
 }
-- 
cgit v1.2.1