From c7d0d44812336f4db8ab9a649fb40b4d4ed27e97 Mon Sep 17 00:00:00 2001
From: Mike Kelly <mike.kelly@arm.com>
Date: Wed, 11 Dec 2019 19:27:11 +0000
Subject: Catch std::exception instead of armnn::Exception

Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>

MLCE-143 Fix for reference implementation for service stopping when running CTS.

 *ConvertDepthwise reports that weights are not supported with the first dimension of the tensor is not 1
 *ConvertConcat was missing one case for reporting unsupported inputs.

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>

MLCE-144 Cts NNAPI test cases failed

 * Fixed numerous CTS/VTS failures related to Quantization

!armnn:2457

Signed-off-by: Mike Kelly <mike.kelly@arm.com>

MLCE-144 Fix 2d pooling convert function

Signed-off-by: FinnWilliamsArm <Finn.Williams@Arm.com>
Change-Id: I054635ebfd52cb5575490c3bfaae0104eb1685cc
---
 ArmnnPreparedModel.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'ArmnnPreparedModel.cpp')

diff --git a/ArmnnPreparedModel.cpp b/ArmnnPreparedModel.cpp
index 462970aa..2f1abef7 100644
--- a/ArmnnPreparedModel.cpp
+++ b/ArmnnPreparedModel.cpp
@@ -209,9 +209,9 @@ Return<ErrorStatus> ArmnnPreparedModel<HalVersion>::execute(const Request& reque
             pOutputTensors->emplace_back(i, outputTensor);
         }
     }
-    catch (armnn::Exception& e)
+    catch (std::exception& e)
     {
-        ALOGW("armnn::Exception caught while preparing for EnqueueWorkload: %s", e.what());
+        ALOGW("Exception caught while preparing for EnqueueWorkload: %s", e.what());
         NotifyCallbackAndCheck(callback, ErrorStatus::GENERAL_FAILURE, "ArmnnPreparedModel::execute");
         return ErrorStatus::GENERAL_FAILURE;
     }
@@ -253,9 +253,9 @@ void ArmnnPreparedModel<HalVersion>::ExecuteGraph(
             return;
         }
     }
-    catch (armnn::Exception& e)
+    catch (std::exception& e)
     {
-        ALOGW("armnn::Exception caught from EnqueueWorkload: %s", e.what());
+        ALOGW("Exception caught from EnqueueWorkload: %s", e.what());
         cb.callback(ErrorStatus::GENERAL_FAILURE, "ArmnnPreparedModel::ExecuteGraph");
         return;
     }
@@ -306,9 +306,9 @@ bool ArmnnPreparedModel<HalVersion>::ExecuteWithDummyInputs()
             return false;
         }
     }
-    catch (armnn::Exception& e)
+    catch (std::exception& e)
     {
-        ALOGW("ExecuteWithDummyInputs: armnn::Exception caught from EnqueueWorkload: %s", e.what());
+        ALOGW("ExecuteWithDummyInputs: Exception caught from EnqueueWorkload: %s", e.what());
         return false;
     }
     return true;
-- 
cgit v1.2.1