diff options
| author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-07-23 14:01:37 +0100 |
|---|---|---|
| committer | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-07-23 14:33:20 +0100 |
| commit | 573a8fa04ef0774fe44a4ac6669582a6bf753d6e (patch) | |
| tree | efb5f466c71af293597506ee77dcf9f944c6559f /1.1 | |
| parent | 074c25a1535b648fdf19d7f6648e8aceef9aa7ad (diff) | |
| download | android-nn-driver-573a8fa04ef0774fe44a4ac6669582a6bf753d6e.tar.gz | |
IVGCVSW-3553 Fix failing zero_sized tests
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Idd10f34babc0d2552d599872b853ba5fb5c98351
Diffstat (limited to '1.1')
| -rw-r--r-- | 1.1/HalPolicy.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/1.1/HalPolicy.cpp b/1.1/HalPolicy.cpp index d7f4bbb8..6687b123 100644 --- a/1.1/HalPolicy.cpp +++ b/1.1/HalPolicy.cpp @@ -6,6 +6,7 @@ #include "HalPolicy.hpp" #include "OutputShapeUtils.hpp" +#include "Utils.hpp" #include "../1.0/HalPolicy.hpp" @@ -182,7 +183,7 @@ bool HalPolicy::ConvertSub(const Operation& operation, const Model& model, Conve } armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*outputOperand); - if (IsDynamicOutput(outputInfo)) + if (IsDynamicTensor(outputInfo)) { ALOGD("Output shape not set, will infer from inputs"); outputInfo.SetShape(InferSubOutputShape(input0.GetTensorInfo().GetShape(), input1.GetTensorInfo().GetShape())); @@ -313,7 +314,7 @@ bool HalPolicy::ConvertPad(const Operation& operation, const Model& model, Conve } armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*output); - if (IsDynamicOutput(outputInfo)) + if (IsDynamicTensor(outputInfo)) { ALOGD("Output shape not set, will infer from inputs"); outputInfo.SetShape(InferPadOutputShape(inputInfo.GetShape(), descriptor.m_PadList)); |