commit bf3c6626e98b9e1be435fce9fdabc9d21f3b5b3a
author Michele Di Giorgio <michele.digiorgio@arm.com> Thu Mar 08 11:52:27 2018 +0000
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:49:54 2018 +0000
tree b4edade1ca3b2e76c2196c76f97016220533313d
parent 164b65d3c8f61f1d6d404fb484c1998a20a2cbda

COMPMID-803: Add NHWC data format support for CL batch normalisation

Change-Id: Ie37588f60b9cfc7b1d09b1e8628fcfb4b17e0717
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/123834
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>

tests/benchmark/CL/BatchNormalizationLayer.cpp

diff --git a/tests/benchmark/CL/BatchNormalizationLayer.cpp b/tests/benchmark/CL/BatchNormalizationLayer.cpp
index 3d11aea..9ae80a8 100644
--- a/tests/benchmark/CL/BatchNormalizationLayer.cpp
+++ b/tests/benchmark/CL/BatchNormalizationLayer.cpp
@@ -56,7 +56,7 @@
                                                                                 framework::dataset::make("UseBeta", { false, true }))),
                                                                 framework::dataset::make("ActivationInfo", ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::BOUNDED_RELU, 6.f))),
                                                         data_types),
-                                                framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+                                                framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })),
                                         framework::dataset::make("Batches", 1)));
 
 REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2BatchNormalizationLayer, CLBatchNormalizationLayerFixture, framework::DatasetMode::ALL,
@@ -65,7 +65,7 @@
                                                                                 framework::dataset::make("UseBeta", { false, true }))),
                                                                 framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
                                                         data_types),
-                                                framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+                                                framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })),
                                         framework::dataset::make("Batches", 1)));
 
 REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV4BatchNormalizationLayer, CLBatchNormalizationLayerFixture, framework::DatasetMode::ALL,
@@ -74,7 +74,7 @@
                                                                                 framework::dataset::make("UseBeta", { false, true }))),
                                                                 framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
                                                         data_types),
-                                                framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+                                                framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })),
                                         framework::dataset::make("Batches", 1)));
 
 TEST_SUITE(NIGHTLY)
@@ -85,7 +85,7 @@
                                                                                 framework::dataset::make("UseBeta", { false, true }))),
                                                                 framework::dataset::make("ActivationInfo", ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::BOUNDED_RELU, 6.f))),
                                                         data_types),
-                                                framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+                                                framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })),
                                         framework::dataset::make("Batches", { 4, 8 })));
 
 REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2BatchNormalizationLayer, CLBatchNormalizationLayerFixture, framework::DatasetMode::NIGHTLY,
@@ -94,7 +94,7 @@
                                                                                 framework::dataset::make("UseBeta", { false, true }))),
                                                                 framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
                                                         data_types),
-                                                framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+                                                framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })),
                                         framework::dataset::make("Batches", { 4, 8 })));
 
 REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV4BatchNormalizationLayer, CLBatchNormalizationLayerFixture, framework::DatasetMode::NIGHTLY,
@@ -103,7 +103,7 @@
                                                                                 framework::dataset::make("UseBeta", { false, true }))),
                                                                 framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
                                                         data_types),
-                                                framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+                                                framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })),
                                         framework::dataset::make("Batches", { 4, 8 })));
 TEST_SUITE_END()
 TEST_SUITE_END()