COMPMID-1478: Stop relying on static default OpenCL objects in cl2.hpp

This causes problems when ACL is used as a shared library on Android.
Fixes some problems related to creation / destruction order between the Graph's CL backend and core / runtime

Change-Id: I716d63fd42f4586df1ffbb6fa97e4db06d3a781b
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/143228
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele DiGiorgio <michele.digiorgio@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/arm_compute/graph/frontend/Stream.h b/arm_compute/graph/frontend/Stream.h
index 244d18e753..c8e24eeae2 100644
--- a/arm_compute/graph/frontend/Stream.h
+++ b/arm_compute/graph/frontend/Stream.h
@@ -74,11 +74,13 @@ public:
     const Graph &graph() const override;
 
 private:
-    GraphManager _manager; /**< Graph manager */
+    //Important: GraphContext must be declared *before* the GraphManager because the GraphManager
+    //allocates resources from the context and therefore needs to be destroyed before the context during clean up).
     GraphContext _ctx;     /**< Graph context to use */
+    GraphManager _manager; /**< Graph manager */
     Graph        _g;       /**< Internal graph representation of the stream */
 };
 } // namespace frontend
 } // namespace graph
 } // namespace arm_compute
-#endif /* __ARM_COMPUTE_GRAPH_STREAM_H__ */
\ No newline at end of file
+#endif /* __ARM_COMPUTE_GRAPH_STREAM_H__ */