diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2023-12-04 17:23:09 +0000 |
|---|---|---|
| committer | Nikhil Raj Arm <nikhil.raj@arm.com> | 2023-12-05 16:58:10 +0000 |
| commit | a9c3267d1a20e69a9cc0ae98b52958a6277e2f0d (patch) | |
| tree | cf8ba49f42bcdb6d8360ca705b247bdd656925f8 /shim | |
| parent | a8337d7a1e9f5aa3ed380dd0f5a4cf7636360122 (diff) | |
| download | armnn-a9c3267d1a20e69a9cc0ae98b52958a6277e2f0d.tar.gz | |
IVGCVSW-8159 Fixed issues building with NDK r26
* The compiler shipped with NDK r26 has stricter rules around certain
warnings and deprecation notices.
* Fixed warnings for unqualified call to 'std::move'
* Fixed error where the half values weren't being cast to a float
when calling 'std::nan'
* Removed unnecessary subtensor unit tests for neon
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I4ceb46e55ff5f2a754452e3a43de2188d58bf927
Diffstat (limited to 'shim')
| -rw-r--r-- | shim/sl/canonical/ArmnnDriverImpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shim/sl/canonical/ArmnnDriverImpl.cpp b/shim/sl/canonical/ArmnnDriverImpl.cpp index 060dd5a252..0063149adb 100644 --- a/shim/sl/canonical/ArmnnDriverImpl.cpp +++ b/shim/sl/canonical/ArmnnDriverImpl.cpp @@ -233,7 +233,7 @@ GeneralResult<SharedPreparedModel> ArmnnDriverImpl::PrepareArmnnModel( auto numOutputs = getMainModel(model).outputIndexes.size(); try { - if (runtime->LoadNetwork(netId, move(optNet), msg, networkProperties) != armnn::Status::Success) + if (runtime->LoadNetwork(netId, std::move(optNet), msg, networkProperties) != armnn::Status::Success) { return NN_ERROR(ErrorStatus::GENERAL_FAILURE) << "Network could not be loaded"; } @@ -530,7 +530,7 @@ GeneralResult<SharedPreparedModel> ArmnnDriverImpl::PrepareArmnnModelFromCache( options.IsGpuProfilingEnabled()); try { - if (runtime->LoadNetwork(netId, move(optNet), msg, networkProperties) != armnn::Status::Success) + if (runtime->LoadNetwork(netId, std::move(optNet), msg, networkProperties) != armnn::Status::Success) { return NN_ERROR(ErrorStatus::GENERAL_FAILURE) << "Network could not be loaded"; } |