diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-07-10 13:01:41 +0100 |
---|---|---|
committer | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-07-10 13:01:41 +0100 |
commit | 366e0a66f4566cf71dff3f850556350709ee66a8 (patch) | |
tree | f85badd07900acca485b6b66c8fd4b9b59f777fd /1.1/HalPolicy.cpp | |
parent | f03fcf0dd180ba2c87648a524fcca9214e1f979b (diff) | |
download | android-nn-driver-366e0a66f4566cf71dff3f850556350709ee66a8.tar.gz |
IVGCVSW-3482 Report operations with dynamic output size as unsupported
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Ifafe2a6fbfd6019b3395d51ed9967db794d2b034
Diffstat (limited to '1.1/HalPolicy.cpp')
-rw-r--r-- | 1.1/HalPolicy.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/1.1/HalPolicy.cpp b/1.1/HalPolicy.cpp index 78f157dd..dbd380ab 100644 --- a/1.1/HalPolicy.cpp +++ b/1.1/HalPolicy.cpp @@ -5,6 +5,8 @@ #include "HalPolicy.hpp" +#include "OutputShapeUtils.hpp" + #include "../1.0/HalPolicy.hpp" namespace @@ -176,20 +178,24 @@ bool HalPolicy::ConvertSub(const Operation& operation, const Model& model, Conve return false; } - const armnn::TensorInfo& outInfo = GetTensorInfoForOperand(*outputOperand); + const armnn::TensorInfo& outputInfo = GetTensorInfoForOperand(*outputOperand); + if (IsDynamicOutput(outputInfo)) + { + return Fail("%s: Dynamic output not supported", __func__); + } if (!IsLayerSupportedForAnyBackend(__func__, armnn::IsSubtractionSupported, data.m_Backends, input0.GetTensorInfo(), input1.GetTensorInfo(), - outInfo)) + outputInfo)) { return false; } armnn::IConnectableLayer* const startLayer = data.m_Network->AddSubtractionLayer(); - armnn::IConnectableLayer* const endLayer = ProcessActivation(outInfo, activationFunction, startLayer, data); + armnn::IConnectableLayer* const endLayer = ProcessActivation(outputInfo, activationFunction, startLayer, data); const armnn::TensorInfo& inputTensorInfo0 = input0.GetTensorInfo(); const armnn::TensorInfo& inputTensorInfo1 = input1.GetTensorInfo(); @@ -292,6 +298,10 @@ bool HalPolicy::ConvertPad(const Operation& operation, const Model& model, Conve } const armnn::TensorInfo& outputInfo = GetTensorInfoForOperand(*output); + if (IsDynamicOutput(outputInfo)) + { + return Fail("%s: Dynamic output not supported", __func__); + } if (!IsLayerSupportedForAnyBackend(__func__, armnn::IsPadSupported, |