diff options
author | Sadik Armagan <sadik.armagan@arm.com> | 2019-08-19 09:49:58 +0100 |
---|---|---|
committer | Sadik Armagan <sadik.armagan@arm.com> | 2019-08-19 09:49:58 +0100 |
commit | 64b19b548bd23f25c81006f378b7631d0288e26e (patch) | |
tree | 79b025e8431384c8802d0f4dd632e57b915352ec /1.2/HalPolicy.cpp | |
parent | 999e209da5f4bc3307f9c07021cdb2655add0aea (diff) | |
download | android-nn-driver-64b19b548bd23f25c81006f378b7631d0288e26e.tar.gz |
IVGCVSW-3618 Fix VTS/Neural Netwok Test Failures
* Added IsReshapeSupported check on available backend(s) after adding Reshape layer.
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I38a36d5a3db0d67f0e4b4be2ef672dedb75bff22
Diffstat (limited to '1.2/HalPolicy.cpp')
-rw-r--r-- | 1.2/HalPolicy.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp index 7fe5f88e..3cd7ce48 100644 --- a/1.2/HalPolicy.cpp +++ b/1.2/HalPolicy.cpp @@ -545,7 +545,11 @@ bool HalPolicy::ConvertMaximum(const Operation& operation, const Model& model, C armnn::IConnectableLayer* layer = data.m_Network->AddMaximumLayer(); assert(layer != nullptr); - BroadcastTensor(input0, input1, layer, *data.m_Network); + bool isReshapeSupported = BroadcastTensor(input0, input1, layer, data); + if (!isReshapeSupported) + { + return false; + } return SetupAndTrackLayerOutputSlot<hal_1_2::HalPolicy>(operation, 0, *layer, model, data); } @@ -596,7 +600,11 @@ bool HalPolicy::ConvertMinimum(const Operation& operation, const Model& model, C armnn::IConnectableLayer* const layer = data.m_Network->AddMinimumLayer(); assert(layer != nullptr); - BroadcastTensor(input0, input1, layer, *data.m_Network); + bool isReshapeSupported = BroadcastTensor(input0, input1, layer, data); + if (!isReshapeSupported) + { + return false; + } return SetupAndTrackLayerOutputSlot<hal_1_2::HalPolicy>(operation, 0, *layer, model, data); } @@ -755,7 +763,11 @@ bool HalPolicy::ConvertPrelu(const Operation& operation, const Model& model, Con return Fail("%s: AddPreluLayer failed", __func__); } - BroadcastTensor(input, alpha, layer, *data.m_Network); + bool isReshapeSupported = BroadcastTensor(input, alpha, layer, data); + if (!isReshapeSupported) + { + return false; + } return SetupAndTrackLayerOutputSlot<hal_1_2::HalPolicy>(operation, 0, *layer, model, data); } |