commit 9adbb353aa706f958860cd4c2d2383f43b8a8a09
author Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Thu Jul 11 11:00:43 2019 +0100
committer Áron Virginás-Tar <aron.virginas-tar@arm.com> Thu Jul 11 10:35:03 2019 +0000
tree 6b560357b9794255515d0910cd7751dec07a7dea
parent 310d8ff46f26b6c656b417ac6dc59ef610aaa513

IVGCVSW-3459 Add support for dynamic output shape in ConvertSoftmax

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Ie1777ec774fe29369b61b0f881cc4b7cef0485a5

1.0/HalPolicy.cpp

diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp
index 2149d40..76309e3 100644
--- a/1.0/HalPolicy.cpp
+++ b/1.0/HalPolicy.cpp
@@ -1094,10 +1094,11 @@
         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 @@
     assert(layer != nullptr);
     input.Connect(layer->GetInputSlot(0));
 
-    return SetupAndTrackLayerOutputSlot<hal_1_0::HalPolicy>(operation, 0, *layer, model, data);
+    return SetupAndTrackLayerOutputSlot<hal_1_0::HalPolicy>(operation,
+                                                            0,
+                                                            *layer,
+                                                            model,
+                                                            data,
+                                                            armnn::Optional<armnn::TensorInfo>(outputInfo));
 }
 
 bool HalPolicy::ConvertSpaceToDepth(const Operation& operation, const Model& model, ConversionData& data)