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 /ModelToINetworkConverter.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 'ModelToINetworkConverter.cpp')
-rw-r--r-- | ModelToINetworkConverter.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/ModelToINetworkConverter.cpp b/ModelToINetworkConverter.cpp index 4665ef16..2dc302ed 100644 --- a/ModelToINetworkConverter.cpp +++ b/ModelToINetworkConverter.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 // @@ -35,7 +35,6 @@ ModelToINetworkConverter<HalPolicy>::ModelToINetworkConverter(const std::vector< { m_ConversionResult = ConversionResult::UnsupportedFeature; ALOGE("%s: Unexpected exception: %s", __func__, e.what()); - assert(false); } } @@ -194,7 +193,12 @@ void ModelToINetworkConverter<HalPolicy>::Convert() const std::string layerName = "Output_" + std::to_string(i); armnn::IConnectableLayer* layer = m_Data.m_Network->AddOutputLayer(i, layerName.c_str()); - assert(m_Data.m_OutputSlotForOperand[outputIndex]); + if (!m_Data.m_OutputSlotForOperand[outputIndex]) + { + Fail("%s: OutputSlot %i does not exist", __func__, outputIndex); + m_ConversionResult = ConversionResult::UnsupportedFeature; + break; + } m_Data.m_OutputSlotForOperand[outputIndex]->Connect(layer->GetInputSlot(0)); } } @@ -210,7 +214,10 @@ template<typename HalPolicy> bool ModelToINetworkConverter<HalPolicy>::IsOperationSupported(uint32_t operationIndex) const { std::map<uint32_t, bool>::const_iterator it = m_OperationSupported.find(operationIndex); - assert(it != m_OperationSupported.end()); + if (it == m_OperationSupported.end()) + { + return Fail("%s: Unrecognised Operation Index: %i", __func__, operationIndex); + } return it->second; } |