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/ClWorkloads/ClL2NormalizationFloatWorkload.cpp | 7 ++++--- src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/backends/ClWorkloads') diff --git a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp b/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp index 8f5ed5feca..0ca334348e 100644 --- a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp +++ b/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp @@ -15,10 +15,11 @@ namespace armnn using namespace armcomputetensorutils; arm_compute::Status ClL2NormalizationWorkloadValidate(const TensorInfo& input, - const TensorInfo& output) + const TensorInfo& output, + const L2NormalizationDescriptor& descriptor) { - const arm_compute::TensorInfo aclInput = BuildArmComputeTensorInfo(input); - const arm_compute::TensorInfo aclOutput = 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); diff --git a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp b/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp index f3f7de110a..20c0426208 100644 --- a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp +++ b/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp @@ -13,7 +13,8 @@ namespace armnn { arm_compute::Status ClL2NormalizationWorkloadValidate(const TensorInfo& input, - const TensorInfo& output); + const TensorInfo& output, + const L2NormalizationDescriptor& descriptor); class ClL2NormalizationFloatWorkload : public FloatWorkload { -- cgit v1.2.1