aboutsummaryrefslogtreecommitdiff
path: root/src/armnn/LoadedNetwork.cpp
diff options
context:
space:
mode:
authorColm Donelan <colm.donelan@arm.com>2023-08-01 14:57:25 +0100
committerColm Donelan <colm.donelan@arm.com>2023-08-02 10:56:32 +0100
commit2812484ffa1d0ef8f9456d297d05202bea3dac38 (patch)
treeb46766e6259e9eae1b0dadba599206d02e7158e2 /src/armnn/LoadedNetwork.cpp
parentfb2b416a6451f2f78314fe71396297cd0c02ed47 (diff)
downloadarmnn-2812484ffa1d0ef8f9456d297d05202bea3dac38.tar.gz
Fixing ambiguous method name in BackendHelper.
!android-nn-driver:10035 * Two of the 4 HasCapability methods in BackendHelper were checking the value of the capability not just the existence of the capability. Signed-off-by: Colm Donelan <colm.donelan@arm.com> Change-Id: I63bc1671dfb088a947de70a21c86d2502f92f008
Diffstat (limited to 'src/armnn/LoadedNetwork.cpp')
-rw-r--r--src/armnn/LoadedNetwork.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp
index 3d84054b69..7150261ddd 100644
--- a/src/armnn/LoadedNetwork.cpp
+++ b/src/armnn/LoadedNetwork.cpp
@@ -255,14 +255,15 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr<IOptimizedNetwork> net,
// If we're doing async execution verify that the backend supports it and ExternallyManagedMemory.
if (networkProperties.m_AsyncEnabled)
{
- if (!HasCapability(BackendOptions::BackendOption{"AsyncExecution", true}, backend->GetCapabilities()))
+ if (!HasMatchingCapability(BackendOptions::BackendOption{"AsyncExecution", true},
+ backend->GetCapabilities()))
{
std::string er = backend->GetId();
er += " does not support AsyncExecution";
throw BackendCapabilityException(er);
}
- if (!HasCapability(BackendOptions::BackendOption{"ExternallyManagedMemory", true},
- backend->GetCapabilities()))
+ if (!HasMatchingCapability(BackendOptions::BackendOption{"ExternallyManagedMemory", true},
+ backend->GetCapabilities()))
{
std::string er = backend->GetId();
er += " does not support ExternallyManagedMemory\n";
@@ -1508,7 +1509,8 @@ std::vector<ImportedInputId> LoadedNetwork::ImportInputs(const InputTensors& inp
}
auto& backend = m_Backends.at(layer->GetBackendId());
- if (!HasCapability(BackendOptions::BackendOption{"PreImportIOTensors", true}, backend->GetCapabilities()))
+ if (!HasMatchingCapability(BackendOptions::BackendOption{"PreImportIOTensors", true},
+ backend->GetCapabilities()))
{
std::string er = backend->GetId();
er += " does not have PreImportIOTensors capability";
@@ -1641,7 +1643,8 @@ std::vector<ImportedOutputId> LoadedNetwork::ImportOutputs(const OutputTensors&
}
auto& backend = m_Backends.at(layer->GetBackendId());
- if (!HasCapability(BackendOptions::BackendOption{"PreImportIOTensors", true}, backend->GetCapabilities()))
+ if (!HasMatchingCapability(BackendOptions::BackendOption{"PreImportIOTensors", true},
+ backend->GetCapabilities()))
{
std::string er = backend->GetId();
er += " does not have PreImportIOTensors capability";