diff options
| author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-07-11 11:00:43 +0100 |
|---|---|---|
| committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-07-11 10:35:03 +0000 |
| commit | 9adbb353aa706f958860cd4c2d2383f43b8a8a09 (patch) | |
| tree | 6b560357b9794255515d0910cd7751dec07a7dea /1.0 | |
| parent | 310d8ff46f26b6c656b417ac6dc59ef610aaa513 (diff) | |
| download | android-nn-driver-9adbb353aa706f958860cd4c2d2383f43b8a8a09.tar.gz | |
IVGCVSW-3459 Add support for dynamic output shape in ConvertSoftmax
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Ie1777ec774fe29369b61b0f881cc4b7cef0485a5
Diffstat (limited to '1.0')
| -rw-r--r-- | 1.0/HalPolicy.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
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<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) |