commit 33cea4db0b2729c5dbd50f9c0985578c60baffdd
author narpra01 <narumol.prangnawarat@arm.com> Thu Sep 27 16:46:14 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Wed Oct 10 16:16:57 2018 +0100
tree ecea0ce825b52a2225788362c76f40f6ec548cda
parent 0dbe0ee25312b728d77383d11c465156e64ae757

IVGCVSW-1919 - data layout parameter for Normalization

Change-Id: I33dce72bb0f1e25425dc058d6213a7cdf56eecd2

src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp

diff --git a/src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp b/src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp
index 472c75f..9cd315e 100644
--- a/src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp
+++ b/src/backends/neon/workloads/NeonNormalizationFloatWorkload.cpp
@@ -8,6 +8,8 @@
 #include <backends/aclCommon/ArmComputeUtils.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
 
+using namespace armnn::armcomputetensorutils;
+
 namespace armnn
 {
 
@@ -15,11 +17,10 @@
                                                       const TensorInfo& output,
                                                       const NormalizationDescriptor& descriptor)
 {
-    const arm_compute::TensorInfo aclInput = armcomputetensorutils::BuildArmComputeTensorInfo(input);
-    const arm_compute::TensorInfo aclOutput = armcomputetensorutils::BuildArmComputeTensorInfo(output);
+    const arm_compute::TensorInfo aclInput = BuildArmComputeTensorInfo(input, descriptor.m_DataLayout);
+    const arm_compute::TensorInfo aclOutput = BuildArmComputeTensorInfo(output, descriptor.m_DataLayout);
 
-    arm_compute::NormalizationLayerInfo normalizationInfo =
-            armcomputetensorutils::BuildArmComputeNormalizationLayerInfo(descriptor);
+    arm_compute::NormalizationLayerInfo normalizationInfo = BuildArmComputeNormalizationLayerInfo(descriptor);
 
     return arm_compute::NENormalizationLayer::validate(&aclInput, &aclOutput, normalizationInfo);
 }