diff options
author | Francis Murtagh <francis.murtagh@arm.com> | 2021-04-29 14:23:04 +0100 |
---|---|---|
committer | Francis Murtagh <francis.murtagh@arm.com> | 2021-04-29 14:55:27 +0000 |
commit | 73d3e2e1616ba5dcdb0a190afba2463742bd4fcc (patch) | |
tree | 5e03f174a763c275d5874c804996048fb0b505ab /src/armnn/LoadedNetwork.cpp | |
parent | 4df97eb257d3fc29b7431d9cb8a054b21d5a7448 (diff) | |
download | armnn-73d3e2e1616ba5dcdb0a190afba2463742bd4fcc.tar.gz |
IVGCVSW-5819 5820 5821 Add MemorySourceFlags to TensorHandleFactoryRegistry::GetFactory
* Modify Layer::CreateTensorHandles to include MemorySource
* Modify INetworkProperties to add MemorySource
* Disable Neon/Cl fallback tests until full import implementation complete
Change-Id: Ia4fff6ea3d4bf6afca33aae358125ccaec7f9a38
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Diffstat (limited to 'src/armnn/LoadedNetwork.cpp')
-rw-r--r-- | src/armnn/LoadedNetwork.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index 85451cb0d8..5c5a963212 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -174,8 +174,10 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr<IOptimizedNetwork> net, { // If IsImportEnabled is true then we need to set IsMemoryManaged // to false when creating TensorHandles - layer->CreateTensorHandles(m_TensorHandleFactoryRegistry, workloadFactory, - !m_NetworkProperties.m_ImportEnabled); + layer->CreateTensorHandles(m_TensorHandleFactoryRegistry, + workloadFactory, + !m_NetworkProperties.m_ImportEnabled, + m_NetworkProperties.m_InputSource); break; } default: @@ -186,8 +188,10 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr<IOptimizedNetwork> net, (layer->GetOutputSlots()[0].GetNumConnections() == 1) && (layer->GetOutputSlots()[0].GetConnection(0)->GetOwningLayer().GetType() == LayerType::Output)) { - layer->CreateTensorHandles(m_TensorHandleFactoryRegistry, workloadFactory, - !m_NetworkProperties.m_ExportEnabled); + layer->CreateTensorHandles(m_TensorHandleFactoryRegistry, + workloadFactory, + !m_NetworkProperties.m_ExportEnabled, + m_NetworkProperties.m_OutputSource); } else { |