diff options
| author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-07-11 11:14:11 +0100 |
|---|---|---|
| committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-07-11 10:35:16 +0000 |
| commit | c16c9c16a898c229c819eeb27ffab4a46f814863 (patch) | |
| tree | a1761757a916eb78bd82aab01a7df548fb226478 /1.0 | |
| parent | 9adbb353aa706f958860cd4c2d2383f43b8a8a09 (diff) | |
| download | android-nn-driver-c16c9c16a898c229c819eeb27ffab4a46f814863.tar.gz | |
IVGCVSW-3461 Add support for dynamic output shape in ConvertDequantize
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Iad2673ffbeb334ab9a39ce09600f476ce96f4165
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 76309e3b..cd009011 100644 --- a/1.0/HalPolicy.cpp +++ b/1.0/HalPolicy.cpp @@ -389,10 +389,11 @@ bool HalPolicy::ConvertDequantize(const Operation& operation, const Model& model return Fail("%s: Operation has invalid 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()); } if (!IsLayerSupportedForAnyBackend(__func__, @@ -408,7 +409,12 @@ bool HalPolicy::ConvertDequantize(const Operation& operation, const Model& model 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::ConvertFloor(const Operation& operation, const Model& model, ConversionData& data) |