IVGCVSW-2056 + IVGCVSW-2064 : move ClContextControl to the ClBackend

Change-Id: Ice19d3f763298bc14585267df389e99df846320d

1 files changed, 6 insertions, 6 deletions

diff --git a/src/armnn/Runtime.hpp b/src/armnn/Runtime.hpp
index 29bb6808d8..2679e3cc98 100644
--- a/src/armnn/Runtime.hpp
+++ b/src/armnn/Runtime.hpp
@@ -9,7 +9,8 @@
 #include <armnn/INetwork.hpp>
 #include <armnn/IRuntime.hpp>
 #include <armnn/Tensor.hpp>
-#include <backends/cl/ClContextControl.hpp>
+#include <armnn/BackendId.hpp>
+#include <backends/IBackendContext.hpp>
 
 #include <mutex>
 #include <unordered_map>
@@ -85,14 +86,13 @@ private:
     }
 
     mutable std::mutex m_Mutex;
-
     std::unordered_map<NetworkId, std::unique_ptr<LoadedNetwork>> m_LoadedNetworks;
-
-    ClContextControl m_ClContextControl;
-
+    CreationOptions m_Options;
     int m_NetworkIdCounter;
-
     DeviceSpec m_DeviceSpec;
+
+    using BackendContextMap = std::unordered_map<BackendId, IBackendContextUniquePtr>;
+    BackendContextMap m_BackendContexts;
 };
 
 }