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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/InferenceModel.hpp | 4 | ||||
| -rw-r--r-- | tests/TfLiteYoloV3Big-Armnn/TfLiteYoloV3Big-Armnn.cpp | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/InferenceModel.hpp b/tests/InferenceModel.hpp index 88c704c10e..3429598249 100644 --- a/tests/InferenceModel.hpp +++ b/tests/InferenceModel.hpp @@ -479,7 +479,9 @@ public: ARMNN_SCOPED_HEAP_PROFILING("LoadNetwork"); const auto loading_start_time = armnn::GetTimeNow(); - armnn::INetworkProperties networkProperties(false, false, params.m_AsyncEnabled); + armnn::INetworkProperties networkProperties(params.m_AsyncEnabled, + armnn::MemorySource::Undefined, + armnn::MemorySource::Undefined); std::string errorMessage; ret = m_Runtime->LoadNetwork(m_NetworkIdentifier, std::move(optNet), errorMessage, networkProperties); diff --git a/tests/TfLiteYoloV3Big-Armnn/TfLiteYoloV3Big-Armnn.cpp b/tests/TfLiteYoloV3Big-Armnn/TfLiteYoloV3Big-Armnn.cpp index 8ce7357962..3453fdd70b 100644 --- a/tests/TfLiteYoloV3Big-Armnn/TfLiteYoloV3Big-Armnn.cpp +++ b/tests/TfLiteYoloV3Big-Armnn/TfLiteYoloV3Big-Armnn.cpp @@ -147,7 +147,10 @@ int LoadModel(const char* filename, // Load model into runtime { std::string errorMessage; - INetworkProperties modelProps(options.m_ImportEnabled, options.m_ImportEnabled); + + armnn::MemorySource memSource = options.m_ImportEnabled ? armnn::MemorySource::Malloc + : armnn::MemorySource::Undefined; + INetworkProperties modelProps(false, memSource, memSource); Status status = runtime.LoadNetwork(networkId, std::move(optimizedModel), errorMessage, modelProps); if (status != Status::Success) { |