commit 20ff84d333e73c62592cab339f4648c4b706c65f
author Gian Marco Iodice <gianmarco.iodice@arm.com> Thu Oct 18 14:30:28 2018 +0100
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:55:45 2018 +0000
tree 823587d7a011665c089018eb510fdc099137b85e
parent 7c75ba0316510ab46bfb56e7b575e72ec1668c46

COMPMID-1451 - Enabled NHWC in AlexNet, InceptionV3 and InceptionV4

Enabled NHWC as default data layout in AlexNet, InceptionV3 and InceptionV4 on NEON

Change-Id: I205ad7a1f5dbf482340182de4fac8f3a24ef2705
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/154141
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: bsgcomp <bsgcomp@arm.com>

examples/graph_alexnet.cpp

diff --git a/examples/graph_alexnet.cpp b/examples/graph_alexnet.cpp
index 97788d8..c607672 100644
--- a/examples/graph_alexnet.cpp
+++ b/examples/graph_alexnet.cpp
@@ -54,12 +54,6 @@
             return false;
         }
 
-        // Set default layout if needed
-        if(!common_opts.data_layout->is_set() && common_params.target == Target::NEON)
-        {
-            common_params.data_layout = DataLayout::NCHW;
-        }
-
         // Checks
         ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph");
 

examples/graph_inception_v3.cpp

diff --git a/examples/graph_inception_v3.cpp b/examples/graph_inception_v3.cpp
index d51be62..6a381a1 100644
--- a/examples/graph_inception_v3.cpp
+++ b/examples/graph_inception_v3.cpp
@@ -54,12 +54,6 @@
             return false;
         }
 
-        // Set default layout if needed
-        if(!common_opts.data_layout->is_set() && common_params.target == Target::NEON)
-        {
-            common_params.data_layout = DataLayout::NCHW;
-        }
-
         // Checks
         ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph");
         ARM_COMPUTE_EXIT_ON_MSG(common_params.data_type == DataType::F16 && common_params.target == Target::NEON, "F16 NEON not supported for this graph");

examples/graph_inception_v4.cpp

diff --git a/examples/graph_inception_v4.cpp b/examples/graph_inception_v4.cpp
index b64f176..77ef54c 100644
--- a/examples/graph_inception_v4.cpp
+++ b/examples/graph_inception_v4.cpp
@@ -54,12 +54,6 @@
             return false;
         }
 
-        // Set default layout if needed
-        if(!common_opts.data_layout->is_set() && common_params.target == Target::NEON)
-        {
-            common_params.data_layout = DataLayout::NCHW;
-        }
-
         // Checks
         ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph");
         ARM_COMPUTE_EXIT_ON_MSG(common_params.data_type == DataType::F16 && common_params.target == Target::NEON, "F16 NEON not supported for this graph");