diff options
| author | David Beck <david.beck@arm.com> | 2018-11-05 13:40:33 +0000 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-11-05 17:26:57 +0000 |
| commit | 9efb57d62197aeb7d868c289bb34166c132f0287 (patch) | |
| tree | 047fe9ac08ad90145d4e2d5bf1c6acc24eaad16c /src/armnn/LoadedNetwork.cpp | |
| parent | 9c6f3afdf7686d9804fd5bc04ea68fca4c49a0a8 (diff) | |
| download | armnn-9efb57d62197aeb7d868c289bb34166c132f0287.tar.gz | |
Revert "IVGCVSW-2056 + IVGCVSW-2064 : move ClContextControl to the ClBackend"
This reverts commit d4dfa684941a21314b70593d01b0fc2167eebad4.
Change-Id: Id61ce69215505c3cf5d30ec2a7ec9127fb2554fc
Diffstat (limited to 'src/armnn/LoadedNetwork.cpp')
| -rw-r--r-- | src/armnn/LoadedNetwork.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index 97c836079e..f58a115754 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -38,7 +38,6 @@ 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; @@ -53,7 +52,7 @@ std::unique_ptr<LoadedNetwork> LoadedNetwork::MakeLoadedNetwork(std::unique_ptr< try { - loadedNetwork.reset(new LoadedNetwork(std::move(net), options)); + loadedNetwork.reset(new LoadedNetwork(std::move(net))); } catch (const armnn::RuntimeException& error) { @@ -71,8 +70,7 @@ std::unique_ptr<LoadedNetwork> LoadedNetwork::MakeLoadedNetwork(std::unique_ptr< return loadedNetwork; } -LoadedNetwork::LoadedNetwork(std::unique_ptr<OptimizedNetwork> net, - const IRuntime::CreationOptions& options) +LoadedNetwork::LoadedNetwork(std::unique_ptr<OptimizedNetwork> net) : m_OptimizedNetwork(std::move(net)) , m_WorkingMemLock(m_WorkingMemMutex, std::defer_lock) { @@ -91,7 +89,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(EmptyInitializer()))); + auto it = m_Backends.emplace(std::make_pair(backend, createBackend())); m_WorkloadFactories.emplace(std::make_pair(backend, it.first->second->CreateWorkloadFactory())); } |