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/Runtime.hpp | |
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/Runtime.hpp')
-rw-r--r-- | src/armnn/Runtime.hpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/armnn/Runtime.hpp b/src/armnn/Runtime.hpp index 694e1e5f9a..e4d4d4ddb9 100644 --- a/src/armnn/Runtime.hpp +++ b/src/armnn/Runtime.hpp @@ -10,7 +10,8 @@ #include <armnn/IRuntime.hpp> #include <armnn/Tensor.hpp> #include <armnn/BackendId.hpp> -#include <backendsCommon/IBackendContext.hpp> + +#include <cl/ClContextControl.hpp> #include <mutex> #include <unordered_map> @@ -86,13 +87,14 @@ private: } mutable std::mutex m_Mutex; + std::unordered_map<NetworkId, std::unique_ptr<LoadedNetwork>> m_LoadedNetworks; - CreationOptions m_Options; + + ClContextControl m_ClContextControl; + int m_NetworkIdCounter; - DeviceSpec m_DeviceSpec; - using BackendContextMap = std::unordered_map<BackendId, IBackendContextUniquePtr>; - BackendContextMap m_BackendContexts; + DeviceSpec m_DeviceSpec; }; } |