diff options
author | Declan-ARM <decmce01@arm.com> | 2024-03-12 16:40:25 +0000 |
---|---|---|
committer | Colm Donelan <colm.donelan@arm.com> | 2024-03-13 10:07:56 +0000 |
commit | 7c75e336fbeeec052a1cb90c68d1caece332c176 (patch) | |
tree | 8fac689c1b4192522f5fa98bccbfab12b8e08afe /src/armnn/layers/LogicalBinaryLayer.cpp | |
parent | 93bbf00d968101fb9a9174ad011b655ca7100546 (diff) | |
download | armnn-7c75e336fbeeec052a1cb90c68d1caece332c176.tar.gz |
IVGCVSW-7853 Assert audit and removal
* src/armnn
* src/armnn/layers
Signed-off-by: Declan-ARM <decmce01@arm.com>
Change-Id: Ic78cbbb59e90fbb15f893205a358c45264243721
Diffstat (limited to 'src/armnn/layers/LogicalBinaryLayer.cpp')
-rw-r--r-- | src/armnn/layers/LogicalBinaryLayer.cpp | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/src/armnn/layers/LogicalBinaryLayer.cpp b/src/armnn/layers/LogicalBinaryLayer.cpp index 84a6e8e812..a781d6e283 100644 --- a/src/armnn/layers/LogicalBinaryLayer.cpp +++ b/src/armnn/layers/LogicalBinaryLayer.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2020-2023 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2020-2024 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -33,11 +33,23 @@ LogicalBinaryLayer* LogicalBinaryLayer::Clone(Graph& graph) const std::vector<TensorShape> LogicalBinaryLayer::InferOutputShapes(const std::vector<TensorShape>& inputShapes) const { - ARMNN_ASSERT(inputShapes.size() == 2); + if (inputShapes.size() != 2) + { + throw armnn::Exception("inputShapes' size is \"" + std::to_string(inputShapes.size()) + + "\" - should be \"2\"."); + } + const TensorShape& input0 = inputShapes[0]; const TensorShape& input1 = inputShapes[1]; - ARMNN_ASSERT(input0.GetNumDimensions() == input1.GetNumDimensions()); + if (input0.GetNumDimensions() != input1.GetNumDimensions()) + { + throw armnn::Exception("Input dimensions do not match (\"" + + std::to_string(input0.GetNumDimensions()) + + "\" vs \"" + + std::to_string(input1.GetNumDimensions()) + "\")."); + } + unsigned int numDims = input0.GetNumDimensions(); std::vector<unsigned int> dims(numDims); @@ -46,8 +58,10 @@ std::vector<TensorShape> LogicalBinaryLayer::InferOutputShapes(const std::vector unsigned int dim0 = input0[i]; unsigned int dim1 = input1[i]; - ARMNN_ASSERT_MSG(dim0 == dim1 || dim0 == 1 || dim1 == 1, - "Dimensions should either match or one should be of size 1."); + if (dim0 != dim1 && dim0 != 1 && dim1 != 1) + { + throw armnn::Exception("Dimensions should either match or one should be of size 1."); + } dims[i] = std::max(dim0, dim1); } @@ -67,7 +81,13 @@ void LogicalBinaryLayer::ValidateTensorShapesFromInputs() GetInputSlot(0).GetTensorInfo().GetShape(), GetInputSlot(1).GetTensorInfo().GetShape() }); - ARMNN_ASSERT(inferredShapes.size() == 1); + + if (inferredShapes.size() != 1) + { + throw armnn::LayerValidationException("inferredShapes has " + + std::to_string(inferredShapes.size()) + + " elements - should only have 1."); + } ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "LogicalBinaryLayer"); } |