diff options
| author | Sadik Armagan <sadik.armagan@arm.com> | 2019-07-11 10:53:38 +0100 |
|---|---|---|
| committer | Sadik Armagan <sadik.armagan@arm.com> | 2019-07-11 10:53:38 +0100 |
| commit | 310d8ff46f26b6c656b417ac6dc59ef610aaa513 (patch) | |
| tree | 5d7f85ce31e7cd0c4fcb5427addf32775de58733 /1.1 | |
| parent | 366e0a66f4566cf71dff3f850556350709ee66a8 (diff) | |
| download | android-nn-driver-310d8ff46f26b6c656b417ac6dc59ef610aaa513.tar.gz | |
IVGCVSW-3457 Fix VTS pad dynamic_output_shape test failures
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: Icb9a308f19ac6adbcf0d1de4d8733b95bab3bf0a
Diffstat (limited to '1.1')
| -rw-r--r-- | 1.1/HalPolicy.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/1.1/HalPolicy.cpp b/1.1/HalPolicy.cpp index dbd380ab..9f2c9be1 100644 --- a/1.1/HalPolicy.cpp +++ b/1.1/HalPolicy.cpp @@ -297,10 +297,11 @@ bool HalPolicy::ConvertPad(const Operation& operation, const Model& model, Conve return Fail("%s: Could not read output", __func__); } - const armnn::TensorInfo& outputInfo = GetTensorInfoForOperand(*output); + armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*output); if (IsDynamicOutput(outputInfo)) { - return Fail("%s: Dynamic output not supported", __func__); + ALOGD("Output shape not set, will infer from inputs"); + outputInfo.SetShape(InferPadOutputShape(inputInfo.GetShape(), descriptor.m_PadList)); } if (!IsLayerSupportedForAnyBackend(__func__, @@ -318,7 +319,12 @@ bool HalPolicy::ConvertPad(const Operation& operation, const Model& model, Conve input.Connect(layer->GetInputSlot(0)); layer->GetOutputSlot(0).SetTensorInfo(outputInfo); - return SetupAndTrackLayerOutputSlot<hal_1_1::HalPolicy>(operation, 0, *layer, model, data); + return SetupAndTrackLayerOutputSlot<hal_1_1::HalPolicy>(operation, + 0, + *layer, + model, + data, + armnn::Optional<armnn::TensorInfo>(outputInfo)); } bool HalPolicy::ConvertSpaceToBatchNd(const Operation& operation, const Model& model, ConversionData& data) |