From 9adbb353aa706f958860cd4c2d2383f43b8a8a09 Mon Sep 17 00:00:00 2001 From: Aron Virginas-Tar Date: Thu, 11 Jul 2019 11:00:43 +0100 Subject: IVGCVSW-3459 Add support for dynamic output shape in ConvertSoftmax Signed-off-by: Aron Virginas-Tar Change-Id: Ie1777ec774fe29369b61b0f881cc4b7cef0485a5 --- 1.0/HalPolicy.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to '1.0') diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp index 2149d40f..76309e3b 100644 --- a/1.0/HalPolicy.cpp +++ b/1.0/HalPolicy.cpp @@ -1094,10 +1094,11 @@ bool HalPolicy::ConvertSoftmax(const Operation& operation, const Model& model, C return Fail("%s: Operation has no outputs", __func__); } - const armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*outputOperand); + armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*outputOperand); if (IsDynamicOutput(outputInfo)) { - return Fail("%s: Dynamic output not supported", __func__); + ALOGD("Output shape not set, will infer from input"); + outputInfo.SetShape(input.GetTensorInfo().GetShape()); } armnn::SoftmaxDescriptor desc; @@ -1120,7 +1121,12 @@ bool HalPolicy::ConvertSoftmax(const Operation& operation, const Model& model, C assert(layer != nullptr); input.Connect(layer->GetInputSlot(0)); - return SetupAndTrackLayerOutputSlot(operation, 0, *layer, model, data); + return SetupAndTrackLayerOutputSlot(operation, + 0, + *layer, + model, + data, + armnn::Optional(outputInfo)); } bool HalPolicy::ConvertSpaceToDepth(const Operation& operation, const Model& model, ConversionData& data) -- cgit v1.2.1