From 539b44dbd620c9f793f84933c1bcc51ce3ff085e Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Mon, 1 Oct 2018 09:26:39 +0100 Subject: IVGCVSW-1863 Unit tests for NHWC L2Normalization * Added NHWC unit test implementation * Programmatically selected the channel dimension when creating the ACL Normalization layer info * Set the input/output data layout in the constructor of the L2Normalization workload Change-Id: Ie69f1a360022c29d1a3a3808c1f26b69243fa8f9 --- .../cl/workloads/ClL2NormalizationFloatWorkload.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp') diff --git a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp index edc13bcfe..f84801601 100644 --- a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp @@ -22,7 +22,7 @@ arm_compute::Status ClL2NormalizationWorkloadValidate(const TensorInfo& input, const arm_compute::TensorInfo aclOutput = BuildArmComputeTensorInfo(output, descriptor.m_DataLayout); arm_compute::NormalizationLayerInfo normalizationInfo = - CreateAclNormalizationLayerInfoForL2Normalization(input); + CreateAclNormalizationLayerInfoForL2Normalization(input, descriptor.m_DataLayout); return arm_compute::CLNormalizationLayer::validate(&aclInput, &aclOutput, normalizationInfo); } @@ -35,7 +35,14 @@ ClL2NormalizationFloatWorkload::ClL2NormalizationFloatWorkload(const L2Normaliza arm_compute::ICLTensor& input = static_cast(m_Data.m_Inputs[0])->GetTensor(); arm_compute::ICLTensor& output = static_cast(m_Data.m_Outputs[0])->GetTensor(); - m_Layer.configure(&input, &output, CreateAclNormalizationLayerInfoForL2Normalization(info.m_InputTensorInfos[0])); + + arm_compute::DataLayout aclDataLayout = ConvertDataLayout(m_Data.m_Parameters.m_DataLayout); + input.info()->set_data_layout(aclDataLayout); + output.info()->set_data_layout(aclDataLayout); + + m_Layer.configure(&input, &output, + CreateAclNormalizationLayerInfoForL2Normalization(info.m_InputTensorInfos[0], + m_Data.m_Parameters.m_DataLayout)); } void ClL2NormalizationFloatWorkload::Execute() const @@ -45,6 +52,3 @@ void ClL2NormalizationFloatWorkload::Execute() const } } //namespace armnn - - - -- cgit v1.2.3