commit 987398f3c1b93cc63f6c25da8b9a20c68e7e8270
author Jim Flynn <jim.flynn@arm.com> Sat Sep 16 18:53:52 2023 +0100
committer TeresaARM <teresa.charlinreyes@arm.com> Tue Sep 19 13:06:09 2023 +0000
tree 4b6bb4f6226db3f14d7b8f99039c9003bf2c468c
parent 93b6064ca97c01a13d201a3829c24d25beaa457c

IVGCVSW-7855 removed ASSERTs from shim code

Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Change-Id: I8b34e74800ebdb43e1b3f996eacd6c3360a331eb

shim/sl/canonical/Converter.cpp

diff --git a/shim/sl/canonical/Converter.cpp b/shim/sl/canonical/Converter.cpp
index a00a0af..4ef29a1 100644
--- a/shim/sl/canonical/Converter.cpp
+++ b/shim/sl/canonical/Converter.cpp
@@ -5,6 +5,7 @@
 
 #include "Converter.hpp"
 #include <half/half.hpp>
+#include <armnn/Exceptions.hpp>
 #include <armnnUtils/TensorUtils.hpp>
 
 namespace armnn_driver
@@ -890,7 +891,11 @@
         if (isDynamicTensor)
         {
             // Infer the output shapes of concat if outputs are type 1 dynamic
-            ARMNN_ASSERT(layer->GetOutputSlot(0).IsTensorInfoSet());
+            if (!layer->GetOutputSlot(0).IsTensorInfoSet())
+            {
+                throw armnn::Exception(
+                    "tensor info is not set on output slot, cannot process dynamic tensor after input reshape");
+            }
             if (!ValidateConcatOutputShape(inputShapes,
                                            layer->GetOutputSlot(0).GetTensorInfo().GetShape(),
                                            concatDim))
@@ -4534,8 +4539,11 @@
     }
 
     armnn::IConnectableLayer* layer = data.m_Network->AddActivationLayer(desc);
+    if (layer == nullptr)
+    {
+        throw armnn::NullPointerException("failed to add Activation Layer to network");
+    }
     layer->SetBackendId(setBackend);
-    ARMNN_ASSERT(layer != nullptr);
     input.Connect(layer->GetInputSlot(0));
 
     return SetupAndTrackLayerOutputSlot(operation, 0, *layer, model, data, nullptr, validateFunc);