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.0 | |
| 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.0')
| -rw-r--r-- | 1.0/HalPolicy.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp index 8c617001..a2c8252a 100644 --- a/1.0/HalPolicy.cpp +++ b/1.0/HalPolicy.cpp @@ -9,6 +9,7 @@ #include "FullyConnected.hpp" #include "OutputShapeUtils.hpp" +#include "Utils.hpp" namespace armnn_driver { @@ -397,7 +398,7 @@ bool HalPolicy::ConvertDequantize(const Operation& operation, const Model& model } armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*outputOperand); - if (IsDynamicOutput(outputInfo)) + if (IsDynamicTensor(outputInfo)) { ALOGD("Output shape not set, will infer from input"); outputInfo.SetShape(input.GetTensorInfo().GetShape()); @@ -477,7 +478,7 @@ bool HalPolicy::ConvertFullyConnected(const Operation& operation, const Model& m const armnn::TensorInfo& inputInfo = input.GetTensorInfo(); armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*output); - if (IsDynamicOutput(outputInfo)) + if (IsDynamicTensor(outputInfo)) { ALOGD("Output shape not set, will infer from inputs"); outputInfo.SetShape(inputInfo.GetShape()); @@ -1004,7 +1005,7 @@ bool HalPolicy::ConvertL2Normalization(const Operation& operation, const Model& const armnn::TensorInfo& inputInfo = input.GetTensorInfo(); armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*output); - if (IsDynamicOutput(outputInfo)) + if (IsDynamicTensor(outputInfo)) { ALOGD("Output shape not set, will infer from inputs"); outputInfo.SetShape(inputInfo.GetShape()); @@ -1147,7 +1148,7 @@ bool HalPolicy::ConvertSoftmax(const Operation& operation, const Model& model, C } armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*outputOperand); - if (IsDynamicOutput(outputInfo)) + if (IsDynamicTensor(outputInfo)) { ALOGD("Output shape not set, will infer from input"); outputInfo.SetShape(input.GetTensorInfo().GetShape()); |