commit ea55f91e5dd4e5bc766fabbac6df6ce3ab984d0e
author Giorgio Arena <giorgio.arena@arm.com> Thu Jul 12 15:41:35 2018 +0100
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:54:54 2018 +0000
tree 290272820514c19d9e45b9bc0f0fee4eb3a0bff1
parent 2df1f99ed6d318c428459fcda8c8052450ccd9bd

COMPMID-1373 Enable tests for CLWinogradConvolutionLayer for NHWC

Change-Id: I2c6a744f174cfb6c78a9923b737f06537debaa0d
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/139758
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>

tests/validation/CL/Winograd.cpp

diff --git a/tests/validation/CL/Winograd.cpp b/tests/validation/CL/Winograd.cpp
index 004d7c9..bb83f5a 100644
--- a/tests/validation/CL/Winograd.cpp
+++ b/tests/validation/CL/Winograd.cpp
@@ -580,7 +580,7 @@
                        combine(combine(combine(datasets::SmallWinogradConvolutionLayer3x3Dataset(),
                                                framework::dataset::make("DataType", { DataType::F32 })),
                                                framework::dataset::make("ActivationLayerInfo", { ActivationLayerInfo() })),
-                                               framework::dataset::make("DataLayout", { DataLayout::NCHW })))
+                                               framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
 {
     // Validate output
     validate(CLAccessor(_target), _reference, tolerance_convolution_layer_f32);
@@ -590,7 +590,7 @@
                        combine(combine(combine(datasets::LargeWinogradConvolutionLayer3x3Dataset(),
                                                framework::dataset::make("DataType", { DataType::F32 })),
                                                framework::dataset::make("ActivationLayerInfo", { ActivationLayerInfo() })),
-                                               framework::dataset::make("DataLayout", { DataLayout::NCHW })))
+                                               framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
 {
     // Validate output
     validate(CLAccessor(_target), _reference, tolerance_convolution_layer_f32);
@@ -602,7 +602,7 @@
                        combine(combine(combine(datasets::SmallWinogradConvolutionLayer3x1Dataset(),
                                        framework::dataset::make("DataType", { DataType::F32 })),
                                        framework::dataset::make("ActivationLayerInfo", { ActivationLayerInfo() })),
-                                       framework::dataset::make("DataLayout", { DataLayout::NCHW })))
+                                       framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
 {
     // Validate output
     validate(CLAccessor(_target), _reference, tolerance_convolution_layer_f32);
@@ -612,7 +612,7 @@
                        combine(combine(combine(datasets::LargeWinogradConvolutionLayer3x1Dataset(),
                                        framework::dataset::make("DataType", { DataType::F32 })),
                                        framework::dataset::make("ActivationLayerInfo", { ActivationLayerInfo() })),
-                                       framework::dataset::make("DataLayout", { DataLayout::NCHW })))
+                                       framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
 {
     // Validate output
     validate(CLAccessor(_target), _reference, tolerance_convolution_layer_f32);
@@ -624,7 +624,7 @@
                        combine(combine(combine(datasets::SmallWinogradConvolutionLayer1x3Dataset(),
                                        framework::dataset::make("DataType", { DataType::F32 })),
                                        framework::dataset::make("ActivationLayerInfo", { ActivationLayerInfo() })),
-                                       framework::dataset::make("DataLayout", { DataLayout::NCHW })))
+                                       framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
 {
     // Validate output
     validate(CLAccessor(_target), _reference, tolerance_convolution_layer_f32);
@@ -634,7 +634,7 @@
                        combine(combine(combine(datasets::LargeWinogradConvolutionLayer1x3Dataset(),
                                        framework::dataset::make("DataType", { DataType::F32 })),
                                        framework::dataset::make("ActivationLayerInfo", { ActivationLayerInfo() })),
-                                       framework::dataset::make("DataLayout", { DataLayout::NCHW })))
+                                       framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
 {
     // Validate output
     validate(CLAccessor(_target), _reference, tolerance_convolution_layer_f32);
@@ -646,7 +646,7 @@
                        combine(combine(combine(datasets::SmallWinogradConvolutionLayer5x5Dataset(),
                                                framework::dataset::make("DataType", { DataType::F32 })),
                                                framework::dataset::make("ActivationLayerInfo", { ActivationLayerInfo() })),
-                                               framework::dataset::make("DataLayout", { DataLayout::NCHW })))
+                                               framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
 
 {
     // Validate output
@@ -657,7 +657,7 @@
                        combine(combine(combine(datasets::LargeWinogradConvolutionLayer5x5Dataset(),
                                                framework::dataset::make("DataType", { DataType::F32 })),
                                                framework::dataset::make("ActivationLayerInfo", { ActivationLayerInfo() })),
-                                               framework::dataset::make("DataLayout", { DataLayout::NCHW })))
+                                               framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
 
 {
     // Validate output
@@ -670,7 +670,7 @@
                        combine(combine(combine(datasets::SmallWinogradConvolutionLayer5x1Dataset(),
                                                framework::dataset::make("DataType", { DataType::F32 })),
                                                framework::dataset::make("ActivationLayerInfo", { ActivationLayerInfo() })),
-                                               framework::dataset::make("DataLayout", { DataLayout::NCHW })))
+                                               framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
 
 {
     // Validate output
@@ -681,7 +681,7 @@
                        combine(combine(combine(datasets::LargeWinogradConvolutionLayer5x1Dataset(),
                                                framework::dataset::make("DataType", { DataType::F32 })),
                                                framework::dataset::make("ActivationLayerInfo", { ActivationLayerInfo() })),
-                                               framework::dataset::make("DataLayout", { DataLayout::NCHW })))
+                                               framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
 
 {
     // Validate output
@@ -694,7 +694,7 @@
                        combine(combine(combine(datasets::SmallWinogradConvolutionLayer1x5Dataset(),
                                                framework::dataset::make("DataType", { DataType::F32 })),
                                                framework::dataset::make("ActivationLayerInfo", { ActivationLayerInfo() })),
-                                               framework::dataset::make("DataLayout", { DataLayout::NCHW })))
+                                               framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
 
 {
     // Validate output
@@ -705,7 +705,7 @@
                        combine(combine(combine(datasets::LargeWinogradConvolutionLayer1x5Dataset(),
                                                framework::dataset::make("DataType", { DataType::F32 })),
                                                framework::dataset::make("ActivationLayerInfo", { ActivationLayerInfo() })),
-                                               framework::dataset::make("DataLayout", { DataLayout::NCHW })))
+                                               framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
 
 {
     // Validate output