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 /src/armnnUtils | |
| 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 'src/armnnUtils')
| -rw-r--r-- | src/armnnUtils/ParserPrototxtFixture.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/armnnUtils/ParserPrototxtFixture.hpp b/src/armnnUtils/ParserPrototxtFixture.hpp index ccb99be594..a12a66ea25 100644 --- a/src/armnnUtils/ParserPrototxtFixture.hpp +++ b/src/armnnUtils/ParserPrototxtFixture.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -127,7 +127,7 @@ void ParserPrototxtFixture<TParser>::Setup(const std::map<std::string, armnn::Te armnn::INetworkPtr network = m_Parser->CreateNetworkFromString(m_Prototext.c_str(), inputShapes, requestedOutputs); auto optimized = Optimize(*network, { armnn::Compute::CpuRef }, m_Runtime->GetDeviceSpec()); - armnn::Status ret = m_Runtime->LoadNetwork(m_NetworkIdentifier, move(optimized), errorMessage); + armnn::Status ret = m_Runtime->LoadNetwork(m_NetworkIdentifier, std::move(optimized), errorMessage); if (ret != armnn::Status::Success) { throw armnn::Exception(fmt::format("LoadNetwork failed with error: '{0}' {1}", @@ -144,7 +144,7 @@ void ParserPrototxtFixture<TParser>::Setup(const std::map<std::string, armnn::Te armnn::INetworkPtr network = m_Parser->CreateNetworkFromString(m_Prototext.c_str(), inputShapes); auto optimized = Optimize(*network, { armnn::Compute::CpuRef }, m_Runtime->GetDeviceSpec()); - armnn::Status ret = m_Runtime->LoadNetwork(m_NetworkIdentifier, move(optimized), errorMessage); + armnn::Status ret = m_Runtime->LoadNetwork(m_NetworkIdentifier, std::move(optimized), errorMessage); if (ret != armnn::Status::Success) { throw armnn::Exception(fmt::format("LoadNetwork failed with error: '{0}' {1}", @@ -161,7 +161,7 @@ void ParserPrototxtFixture<TParser>::Setup() armnn::INetworkPtr network = m_Parser->CreateNetworkFromString(m_Prototext.c_str()); auto optimized = Optimize(*network, { armnn::Compute::CpuRef }, m_Runtime->GetDeviceSpec()); - armnn::Status ret = m_Runtime->LoadNetwork(m_NetworkIdentifier, move(optimized), errorMessage); + armnn::Status ret = m_Runtime->LoadNetwork(m_NetworkIdentifier, std::move(optimized), errorMessage); if (ret != armnn::Status::Success) { throw armnn::Exception(fmt::format("LoadNetwork failed with error: '{0}' {1}", |