diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2021-10-14 12:35:58 +0100 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2021-10-14 12:35:58 +0100 |
| commit | e2d611e4502fb5dce8b8a398ccfc8d7ef29da96b (patch) | |
| tree | 79d9178420924d57ed0ab23db46ff57159279886 /ConversionUtils.cpp | |
| parent | 4bd8f7c96e01e081276c376fe5c34018e7b70d17 (diff) | |
| download | android-nn-driver-e2d611e4502fb5dce8b8a398ccfc8d7ef29da96b.tar.gz | |
IVGCVSW-6428 Remove asserts
* Changed asserts to check for errors and return appropriate values or
throw exceptions
* Changed unit tests to use Doctest's long macro names as the short
macro names clashed with Android's Logging macros
* Removed unused #includes
* Clarified ambiguous #includes
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: Ice92a37590df727fd581d3be5ff2716665f26a13
Diffstat (limited to 'ConversionUtils.cpp')
| -rw-r--r-- | ConversionUtils.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/ConversionUtils.cpp b/ConversionUtils.cpp index d59af994..7eb7343e 100644 --- a/ConversionUtils.cpp +++ b/ConversionUtils.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -31,7 +31,11 @@ bool LayerInputHandle::IsValid() const void LayerInputHandle::Connect(armnn::IInputSlot& inputSlot) { - ARMNN_ASSERT(IsValid()); + if (!IsValid()) + { + throw armnn::RuntimeException("LayerInputHandle is invalid"); + } + if (m_OutputSlot) { m_OutputSlot->Connect(inputSlot); @@ -40,7 +44,10 @@ void LayerInputHandle::Connect(armnn::IInputSlot& inputSlot) void LayerInputHandle::Disconnect(armnn::IInputSlot& inputSlot) { - ARMNN_ASSERT(IsValid()); + if (!IsValid()) + { + throw armnn::RuntimeException("LayerInputHandle is invalid"); + } if (m_OutputSlot) { m_OutputSlot->Disconnect(inputSlot); @@ -116,8 +123,11 @@ armnn::IConnectableLayer* ProcessActivation(const armnn::TensorInfo& tensorInfo, armnn::IConnectableLayer* prevLayer, ConversionData& data) { - ARMNN_ASSERT(prevLayer->GetNumOutputSlots() == 1); - + if (prevLayer->GetNumOutputSlots() != 1) + { + Fail("%s: Incorrect Number of OutputSlots expected 1 was %i", __func__, prevLayer->GetNumOutputSlots()); + return nullptr; + } prevLayer->GetOutputSlot(0).SetTensorInfo(tensorInfo); armnn::IConnectableLayer* activationLayer = prevLayer; |