diff options
author | David Beck <david.beck@arm.com> | 2018-10-24 17:09:46 +0100 |
---|---|---|
committer | David Beck <david.beck@arm.com> | 2018-10-26 10:25:09 +0100 |
commit | d4dfa684941a21314b70593d01b0fc2167eebad4 (patch) | |
tree | eaf561f9bdf5f5643702a5a6f24ed822dea9c4c2 /src/armnn/LoadedNetwork.cpp | |
parent | 0a088a61d016bf7af77e2d73d0988223a5f98ef1 (diff) | |
download | armnn-d4dfa684941a21314b70593d01b0fc2167eebad4.tar.gz |
IVGCVSW-2056 + IVGCVSW-2064 : move ClContextControl to the ClBackend
Change-Id: Ice19d3f763298bc14585267df389e99df846320d
Diffstat (limited to 'src/armnn/LoadedNetwork.cpp')
-rw-r--r-- | src/armnn/LoadedNetwork.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index 40137779f6..616a0327fe 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -38,6 +38,7 @@ std::string ToErrorMessage(const char * prefix, const ExceptionType & error) } // anonymous std::unique_ptr<LoadedNetwork> LoadedNetwork::MakeLoadedNetwork(std::unique_ptr<OptimizedNetwork> net, + const IRuntime::CreationOptions& options, std::string & errorMessage) { std::unique_ptr<LoadedNetwork> loadedNetwork; @@ -52,7 +53,7 @@ std::unique_ptr<LoadedNetwork> LoadedNetwork::MakeLoadedNetwork(std::unique_ptr< try { - loadedNetwork.reset(new LoadedNetwork(std::move(net))); + loadedNetwork.reset(new LoadedNetwork(std::move(net), options)); } catch (const armnn::RuntimeException& error) { @@ -70,7 +71,8 @@ std::unique_ptr<LoadedNetwork> LoadedNetwork::MakeLoadedNetwork(std::unique_ptr< return loadedNetwork; } -LoadedNetwork::LoadedNetwork(std::unique_ptr<OptimizedNetwork> net) +LoadedNetwork::LoadedNetwork(std::unique_ptr<OptimizedNetwork> net, + const IRuntime::CreationOptions& options) : m_OptimizedNetwork(std::move(net)) , m_WorkingMemLock(m_WorkingMemMutex, std::defer_lock) { @@ -89,7 +91,7 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr<OptimizedNetwork> net) if (m_Backends.count(backend) == 0) { auto createBackend = BackendRegistryInstance().GetFactory(backend); - auto it = m_Backends.emplace(std::make_pair(backend, createBackend())); + auto it = m_Backends.emplace(std::make_pair(backend, createBackend(EmptyInitializer()))); m_WorkloadFactories.emplace(std::make_pair(backend, it.first->second->CreateWorkloadFactory())); } |