From 04a729708f986b1a69c1efc42d5cf18271cfae1e Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Mon, 14 Sep 2020 15:44:18 +0100 Subject: IVGCVSW-5157 'Pipe ModelOption through Network::LoadNetwork() to Workload factory' * Pass ModelOptions to WorkloadFactory * Updated signature of CL and NEON Convolution2d workloads added FastMathEnabled param. Signed-off-by: Sadik Armagan Change-Id: I536178be8e4dd4083489e69febadaf0feeba46d2 --- src/armnn/LoadedNetwork.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/armnn/LoadedNetwork.cpp') diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index 4a293b92d9..7b64a88470 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -146,14 +146,16 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr net, if (backend->SupportsTensorAllocatorAPI()) { - auto workloadFactory = backend->CreateWorkloadFactory(m_TensorHandleFactoryRegistry); + auto workloadFactory = backend->CreateWorkloadFactory( + m_TensorHandleFactoryRegistry, m_OptimizedNetwork->GetModelOptions()); m_WorkloadFactories.emplace( std::make_pair(backendId, std::make_pair(std::move(workloadFactory), nullptr))); } else { IBackendInternal::IMemoryManagerSharedPtr memoryManager = backend->CreateMemoryManager(); - auto workloadFactory = backend->CreateWorkloadFactory(memoryManager); + auto workloadFactory = backend->CreateWorkloadFactory( + memoryManager, m_OptimizedNetwork->GetModelOptions()); m_WorkloadFactories.emplace( std::make_pair(backendId, std::make_pair(std::move(workloadFactory), memoryManager))); @@ -361,7 +363,10 @@ const IWorkloadFactory& LoadedNetwork::GetWorkloadFactory(const Layer& layer) co ARMNN_ASSERT_MSG(workloadFactory, "No workload factory"); std::string reasonIfUnsupported; - ARMNN_ASSERT_MSG(IWorkloadFactory::IsLayerSupported(layer, {}, reasonIfUnsupported), + ARMNN_ASSERT_MSG(IWorkloadFactory::IsLayerSupported(layer, + {}, + reasonIfUnsupported, + m_OptimizedNetwork->GetModelOptions()), "Factory does not support layer"); IgnoreUnused(reasonIfUnsupported); return *workloadFactory; -- cgit v1.2.1