From 58f7109a50a58f106bd3d12cd508785aa5e2a8a4 Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Tue, 25 Sep 2018 15:58:52 +0100 Subject: IVGCVSW-1863 Support NHWC for L2Normalization * Added L2NormalizationDescriptor to ConvertL2Normalization !armnn:150051 Change-Id: I622d7a8af2bfd27e7d4543a24c59e53988cb5d82 --- 1.0/HalPolicy.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to '1.0') diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp index d3c6dba1..1375df38 100644 --- a/1.0/HalPolicy.cpp +++ b/1.0/HalPolicy.cpp @@ -1084,16 +1084,19 @@ bool HalPolicy::ConvertL2Normalization(const Operation& operation, const Model& const armnn::TensorInfo swizzledInputInfo = armnnUtils::Permuted(inputInfo, NHWCToArmNN); const armnn::TensorInfo swizzledOutputInfo = armnnUtils::Permuted(outputInfo, NHWCToArmNN); + armnn::L2NormalizationDescriptor desc; + if (!IsLayerSupported(__func__, armnn::IsL2NormalizationSupported, data.m_Compute, swizzledInputInfo, - swizzledOutputInfo)) + swizzledOutputInfo, + desc)) { return false; } - armnn::IConnectableLayer* layer = data.m_Network->AddL2NormalizationLayer(); + armnn::IConnectableLayer* layer = data.m_Network->AddL2NormalizationLayer(desc); assert(layer != nullptr); layer->GetOutputSlot(0).SetTensorInfo(swizzledOutputInfo); @@ -1357,4 +1360,4 @@ bool HalPolicy::ConvertResizeBilinear(const Operation& operation, const Model& m } } // namespace hal_1_0 -} // namespace armnn_driver \ No newline at end of file +} // namespace armnn_driver -- cgit v1.2.1