diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2019-12-11 19:27:11 +0000 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2019-12-11 19:27:11 +0000 |
| commit | c7d0d44812336f4db8ab9a649fb40b4d4ed27e97 (patch) | |
| tree | 6dc06685a5e6f9458b1b063360e854f76b803b10 /ArmnnPreparedModel_1_2.cpp | |
| parent | 1df647726b9f5a1bb725e13919f1f7fa506865c9 (diff) | |
| download | android-nn-driver-c7d0d44812336f4db8ab9a649fb40b4d4ed27e97.tar.gz | |
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
Diffstat (limited to 'ArmnnPreparedModel_1_2.cpp')
| -rw-r--r-- | ArmnnPreparedModel_1_2.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ArmnnPreparedModel_1_2.cpp b/ArmnnPreparedModel_1_2.cpp index a7997c72..a1e481df 100644 --- a/ArmnnPreparedModel_1_2.cpp +++ b/ArmnnPreparedModel_1_2.cpp @@ -314,9 +314,9 @@ Return<void> ArmnnPreparedModel_1_2<HalVersion>::executeSynchronously(const Requ 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()); cb(ErrorStatus::GENERAL_FAILURE, {}, g_NoTiming); return Void(); } @@ -345,9 +345,9 @@ Return<void> ArmnnPreparedModel_1_2<HalVersion>::executeSynchronously(const Requ return Void(); } } - 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(ErrorStatus::GENERAL_FAILURE, {}, g_NoTiming); return Void(); } @@ -531,9 +531,9 @@ void ArmnnPreparedModel_1_2<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, {}, g_NoTiming, "ArmnnPreparedModel_1_2::ExecuteGraph"); return; @@ -594,9 +594,9 @@ bool ArmnnPreparedModel_1_2<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; @@ -707,9 +707,9 @@ Return <ErrorStatus> ArmnnPreparedModel_1_2<HalVersion>::Execute(const Request& } } } - 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()); callback(ErrorStatus::GENERAL_FAILURE, {}, g_NoTiming, "ArmnnPreparedModel_1_2::execute"); return ErrorStatus::GENERAL_FAILURE; } |