From bcd3c85b5a7657b38f503676b88a80ae74165acd Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Fri, 28 Sep 2018 14:14:12 +0100 Subject: IVGCVSW-1863 Support NHWC for L2Normalization * Added L2NormalizationDescriptor struct with m_DataLyaout member * Updated all IsL2NormalizationSupported calls to take a descriptor as an argument * Updated L2NormalizationLayer to take a descriptor as an argument !android-nn-driver:150116 Change-Id: I0459352d19cfd269bc864a70cf73910bf44fdc01 --- src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp') diff --git a/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp b/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp index dee789af85..4bddd9a24c 100644 --- a/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp +++ b/src/backends/neon/workloads/NeonL2NormalizationFloatWorkload.cpp @@ -8,12 +8,14 @@ namespace armnn { +using namespace armcomputetensorutils; arm_compute::Status NeonL2NormalizationWorkloadValidate(const TensorInfo& input, - const TensorInfo& output) + const TensorInfo& output, + const L2NormalizationDescriptor& 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 = CreateAclNormalizationLayerInfoForL2Normalization(input); -- cgit v1.2.1