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>
diff --git a/delegate/src/armnn_delegate.cpp b/delegate/src/armnn_delegate.cpp
index 4c625a9..e637ca6 100644
--- a/delegate/src/armnn_delegate.cpp
+++ b/delegate/src/armnn_delegate.cpp
@@ -365,7 +365,9 @@
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 6024754..8f6027d 100644
--- a/delegate/src/test/DelegateOptionsTest.cpp
+++ b/delegate/src/test/DelegateOptionsTest.cpp
@@ -93,7 +93,7 @@
callback = true;
};
- armnn::INetworkProperties networkProperties;
+ armnn::INetworkProperties networkProperties(false, armnn::MemorySource::Undefined, armnn::MemorySource::Undefined);
armnnDelegate::DelegateOptions delegateOptions(backends,
optimizerOptions,
armnn::EmptyOptional(),