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 /delegate | |
| 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 'delegate')
| -rw-r--r-- | delegate/src/armnn_delegate.cpp | 4 | ||||
| -rw-r--r-- | delegate/src/test/DelegateOptionsTest.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/delegate/src/armnn_delegate.cpp b/delegate/src/armnn_delegate.cpp index 4c625a9867..e637ca6ebf 100644 --- a/delegate/src/armnn_delegate.cpp +++ b/delegate/src/armnn_delegate.cpp @@ -365,7 +365,9 @@ ArmnnSubgraph* ArmnnSubgraph::Create(TfLiteContext* tfLiteContext, armnn::Status loadingStatus; if (delegate->m_Options.GetOptimizerOptions().m_ImportEnabled) { - armnn::INetworkProperties networkProperties(true, true); + armnn::INetworkProperties networkProperties(false, + armnn::MemorySource::Malloc, + armnn::MemorySource::Malloc); loadingStatus = delegate->m_Runtime->LoadNetwork(networkId, std::move(optNet), errorMessage, diff --git a/delegate/src/test/DelegateOptionsTest.cpp b/delegate/src/test/DelegateOptionsTest.cpp index 6024754be8..8f6027df58 100644 --- a/delegate/src/test/DelegateOptionsTest.cpp +++ b/delegate/src/test/DelegateOptionsTest.cpp @@ -93,7 +93,7 @@ TEST_CASE ("ArmnnDelegateOptimizerOptionsDebugFunction") callback = true; }; - armnn::INetworkProperties networkProperties; + armnn::INetworkProperties networkProperties(false, armnn::MemorySource::Undefined, armnn::MemorySource::Undefined); armnnDelegate::DelegateOptions delegateOptions(backends, optimizerOptions, armnn::EmptyOptional(), |