IVGCVSW-7853 Assert audit and removal

  * src/armnn
  * src/armnn/layers

Signed-off-by: Declan-ARM <decmce01@arm.com>
Change-Id: Ic78cbbb59e90fbb15f893205a358c45264243721

1 files changed, 35 insertions, 9 deletions

diff --git a/src/armnn/layers/Convolution3dLayer.cpp b/src/armnn/layers/Convolution3dLayer.cpp
index 2d697beb1f..89ea0042ce 100644
--- a/src/armnn/layers/Convolution3dLayer.cpp
+++ b/src/armnn/layers/Convolution3dLayer.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2021-2023 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2021-2024 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
@@ -61,15 +61,34 @@ Convolution3dLayer* Convolution3dLayer::Clone(Graph& graph) const
 
 std::vector<TensorShape> Convolution3dLayer::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& inputShape = inputShapes[0];
     const TensorShape& filterShape = inputShapes[1];
 
-    ARMNN_ASSERT_MSG(inputShape.GetNumDimensions() == 5, "Convolutions will always have 5D input.");
+    if (inputShape.GetNumDimensions() != 5)
+    {
+        throw armnn::Exception("Convolutions will always have 5D input.");
+    }
+
+    if (m_Param.m_StrideX == 0)
+    {
+        throw armnn::Exception("m_StrideX cannot be 0.");
+    }
+
+    if (m_Param.m_StrideY == 0)
+    {
+        throw armnn::Exception("m_StrideY cannot be 0.");
+    }
 
-    ARMNN_ASSERT( m_Param.m_StrideX > 0);
-    ARMNN_ASSERT( m_Param.m_StrideY > 0);
-    ARMNN_ASSERT( m_Param.m_StrideZ > 0);
+    if (m_Param.m_StrideZ == 0)
+    {
+        throw armnn::Exception("m_StrideZ cannot be 0.");
+    }
 
     DataLayoutIndexed dataLayoutIndex(m_Param.m_DataLayout);
 
@@ -112,14 +131,21 @@ void Convolution3dLayer::ValidateTensorShapesFromInputs()
 
     VerifyShapeInferenceType(outputShape, m_ShapeInferenceMethod);
 
-    ARMNN_ASSERT_MSG(GetInputSlot(1).GetConnection(),
-                     "Convolution3dLayer: Weights should be connected to input slot 1.");
+    if (!GetInputSlot(1).GetConnection())
+    {
+        throw armnn::LayerValidationException("Convolution3dLayer: Weights should be connected to input slot 1.");
+    }
 
     auto inferredShapes = InferOutputShapes({
         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, "Convolution3dLayer");
 }