22 files changed, 26 insertions, 26 deletions
diff --git a/src/routines/level2/xgbmv.cc b/src/routines/level2/xgbmv.cc
index 14d391ca..f90e26b2 100644
--- a/src/routines/level2/xgbmv.cc
+++ b/src/routines/level2/xgbmv.cc
@@ -21,7 +21,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xgbmv<T>::Xgbmv(Queue &queue, Event &event, const std::string &name):
+Xgbmv<T>::Xgbmv(Queue &queue, EventPointer event, const std::string &name):
     Xgemv<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xgemv.cc b/src/routines/level2/xgemv.cc
index bf7ae6fa..24e87db0 100644
--- a/src/routines/level2/xgemv.cc
+++ b/src/routines/level2/xgemv.cc
@@ -29,7 +29,7 @@ template <> const Precision Xgemv<double2>::precision_ = Precision::kComplexDoub
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xgemv<T>::Xgemv(Queue &queue, Event &event, const std::string &name):
+Xgemv<T>::Xgemv(Queue &queue, EventPointer event, const std::string &name):
     Routine<T>(queue, event, name, {"Pad", "Xgemv"}, precision_) {
   source_string_ =
     #include "../../kernels/level2/xgemv.opencl"
@@ -162,7 +162,7 @@ StatusCode Xgemv<T>::MatVec(const Layout layout, const Transpose a_transpose,
     // Launches the kernel
     auto global = std::vector<size_t>{global_size};
     auto local = std::vector<size_t>{local_size};
-    status = RunKernel(kernel, global, local);
+    status = RunKernel(kernel, global, local, event_);
     if (ErrorIn(status)) { return status; }
 
     // Succesfully finished the computation
diff --git a/src/routines/level2/xger.cc b/src/routines/level2/xger.cc
index 9ab21bfb..dda78232 100644
--- a/src/routines/level2/xger.cc
+++ b/src/routines/level2/xger.cc
@@ -29,7 +29,7 @@ template <> const Precision Xger<double2>::precision_ = Precision::kComplexDoubl
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xger<T>::Xger(Queue &queue, Event &event, const std::string &name):
+Xger<T>::Xger(Queue &queue, EventPointer event, const std::string &name):
     Routine<T>(queue, event, name, {"Xger"}, precision_) {
   source_string_ =
     #include "../../kernels/level2/level2.opencl"
@@ -89,7 +89,7 @@ StatusCode Xger<T>::DoGer(const Layout layout,
     auto a_two_ceiled = Ceil(CeilDiv(a_two, db_["WPT"]), db_["WGS2"]);
     auto global = std::vector<size_t>{a_one_ceiled, a_two_ceiled};
     auto local = std::vector<size_t>{db_["WGS1"], db_["WGS2"]};
-    status = RunKernel(kernel, global, local);
+    status = RunKernel(kernel, global, local, event_);
     if (ErrorIn(status)) { return status; }
 
     // Succesfully finished the computation
diff --git a/src/routines/level2/xgerc.cc b/src/routines/level2/xgerc.cc
index 09408898..73284b52 100644
--- a/src/routines/level2/xgerc.cc
+++ b/src/routines/level2/xgerc.cc
@@ -20,7 +20,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xgerc<T>::Xgerc(Queue &queue, Event &event, const std::string &name):
+Xgerc<T>::Xgerc(Queue &queue, EventPointer event, const std::string &name):
     Xger<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xgeru.cc b/src/routines/level2/xgeru.cc
index 36fd9d0a..7730d6a5 100644
--- a/src/routines/level2/xgeru.cc
+++ b/src/routines/level2/xgeru.cc
@@ -20,7 +20,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xgeru<T>::Xgeru(Queue &queue, Event &event, const std::string &name):
+Xgeru<T>::Xgeru(Queue &queue, EventPointer event, const std::string &name):
     Xger<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xhbmv.cc b/src/routines/level2/xhbmv.cc
index f59a7cb3..58591b50 100644
--- a/src/routines/level2/xhbmv.cc
+++ b/src/routines/level2/xhbmv.cc
@@ -21,7 +21,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xhbmv<T>::Xhbmv(Queue &queue, Event &event, const std::string &name):
+Xhbmv<T>::Xhbmv(Queue &queue, EventPointer event, const std::string &name):
     Xgemv<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xhemv.cc b/src/routines/level2/xhemv.cc
index 5a58b28b..b4ef0fa4 100644
--- a/src/routines/level2/xhemv.cc
+++ b/src/routines/level2/xhemv.cc
@@ -21,7 +21,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xhemv<T>::Xhemv(Queue &queue, Event &event, const std::string &name):
+Xhemv<T>::Xhemv(Queue &queue, EventPointer event, const std::string &name):
     Xgemv<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xher.cc b/src/routines/level2/xher.cc
index 1aefa240..aba665b0 100644
--- a/src/routines/level2/xher.cc
+++ b/src/routines/level2/xher.cc
@@ -28,7 +28,7 @@ template <> const Precision Xher<double2, double>::precision_ = Precision::kComp
 
 // Constructor: forwards to base class constructor
 template <typename T, typename U>
-Xher<T,U>::Xher(Queue &queue, Event &event, const std::string &name):
+Xher<T,U>::Xher(Queue &queue, EventPointer event, const std::string &name):
     Routine<T>(queue, event, name, {"Xger"}, precision_) {
   source_string_ =
     #include "../../kernels/level2/level2.opencl"
@@ -99,7 +99,7 @@ StatusCode Xher<T,U>::DoHer(const Layout layout, const Triangle triangle,
     auto global_two = Ceil(CeilDiv(n, db_["WPT"]), db_["WGS2"]);
     auto global = std::vector<size_t>{global_one, global_two};
     auto local = std::vector<size_t>{db_["WGS1"], db_["WGS2"]};
-    status = RunKernel(kernel, global, local);
+    status = RunKernel(kernel, global, local, event_);
     if (ErrorIn(status)) { return status; }
 
     // Succesfully finished the computation
diff --git a/src/routines/level2/xher2.cc b/src/routines/level2/xher2.cc
index 364add12..bcd6488f 100644
--- a/src/routines/level2/xher2.cc
+++ b/src/routines/level2/xher2.cc
@@ -28,7 +28,7 @@ template <> const Precision Xher2<double2>::precision_ = Precision::kComplexDoub
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xher2<T>::Xher2(Queue &queue, Event &event, const std::string &name):
+Xher2<T>::Xher2(Queue &queue, EventPointer event, const std::string &name):
     Routine<T>(queue, event, name, {"Xger"}, precision_) {
   source_string_ =
     #include "../../kernels/level2/level2.opencl"
@@ -91,7 +91,7 @@ StatusCode Xher2<T>::DoHer2(const Layout layout, const Triangle triangle,
     auto global_two = Ceil(CeilDiv(n, db_["WPT"]), db_["WGS2"]);
     auto global = std::vector<size_t>{global_one, global_two};
     auto local = std::vector<size_t>{db_["WGS1"], db_["WGS2"]};
-    status = RunKernel(kernel, global, local);
+    status = RunKernel(kernel, global, local, event_);
     if (ErrorIn(status)) { return status; }
 
     // Succesfully finished the computation
diff --git a/src/routines/level2/xhpmv.cc b/src/routines/level2/xhpmv.cc
index 2269255d..92686dbe 100644
--- a/src/routines/level2/xhpmv.cc
+++ b/src/routines/level2/xhpmv.cc
@@ -21,7 +21,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xhpmv<T>::Xhpmv(Queue &queue, Event &event, const std::string &name):
+Xhpmv<T>::Xhpmv(Queue &queue, EventPointer event, const std::string &name):
     Xgemv<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xhpr.cc b/src/routines/level2/xhpr.cc
index b0cea72f..4b31ad09 100644
--- a/src/routines/level2/xhpr.cc
+++ b/src/routines/level2/xhpr.cc
@@ -20,7 +20,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T, typename U>
-Xhpr<T,U>::Xhpr(Queue &queue, Event &event, const std::string &name):
+Xhpr<T,U>::Xhpr(Queue &queue, EventPointer event, const std::string &name):
     Xher<T,U>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xhpr2.cc b/src/routines/level2/xhpr2.cc
index ded35e53..9be24f43 100644
--- a/src/routines/level2/xhpr2.cc
+++ b/src/routines/level2/xhpr2.cc
@@ -20,7 +20,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xhpr2<T>::Xhpr2(Queue &queue, Event &event, const std::string &name):
+Xhpr2<T>::Xhpr2(Queue &queue, EventPointer event, const std::string &name):
     Xher2<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xsbmv.cc b/src/routines/level2/xsbmv.cc
index 457bd762..bc82c88d 100644
--- a/src/routines/level2/xsbmv.cc
+++ b/src/routines/level2/xsbmv.cc
@@ -21,7 +21,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xsbmv<T>::Xsbmv(Queue &queue, Event &event, const std::string &name):
+Xsbmv<T>::Xsbmv(Queue &queue, EventPointer event, const std::string &name):
     Xgemv<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xspmv.cc b/src/routines/level2/xspmv.cc
index 4f1a9c61..6e00dcfa 100644
--- a/src/routines/level2/xspmv.cc
+++ b/src/routines/level2/xspmv.cc
@@ -21,7 +21,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xspmv<T>::Xspmv(Queue &queue, Event &event, const std::string &name):
+Xspmv<T>::Xspmv(Queue &queue, EventPointer event, const std::string &name):
     Xgemv<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xspr.cc b/src/routines/level2/xspr.cc
index 2d998e0b..55af2f29 100644
--- a/src/routines/level2/xspr.cc
+++ b/src/routines/level2/xspr.cc
@@ -20,7 +20,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xspr<T>::Xspr(Queue &queue, Event &event, const std::string &name):
+Xspr<T>::Xspr(Queue &queue, EventPointer event, const std::string &name):
     Xher<T,T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xspr2.cc b/src/routines/level2/xspr2.cc
index fd5232da..9a3f97ce 100644
--- a/src/routines/level2/xspr2.cc
+++ b/src/routines/level2/xspr2.cc
@@ -20,7 +20,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xspr2<T>::Xspr2(Queue &queue, Event &event, const std::string &name):
+Xspr2<T>::Xspr2(Queue &queue, EventPointer event, const std::string &name):
     Xher2<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xsymv.cc b/src/routines/level2/xsymv.cc
index ec12324b..a9eb284f 100644
--- a/src/routines/level2/xsymv.cc
+++ b/src/routines/level2/xsymv.cc
@@ -21,7 +21,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xsymv<T>::Xsymv(Queue &queue, Event &event, const std::string &name):
+Xsymv<T>::Xsymv(Queue &queue, EventPointer event, const std::string &name):
     Xgemv<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xsyr.cc b/src/routines/level2/xsyr.cc
index c01fa2d3..4b3928e5 100644
--- a/src/routines/level2/xsyr.cc
+++ b/src/routines/level2/xsyr.cc
@@ -20,7 +20,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xsyr<T>::Xsyr(Queue &queue, Event &event, const std::string &name):
+Xsyr<T>::Xsyr(Queue &queue, EventPointer event, const std::string &name):
     Xher<T,T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xsyr2.cc b/src/routines/level2/xsyr2.cc
index 6db55085..3ae389e0 100644
--- a/src/routines/level2/xsyr2.cc
+++ b/src/routines/level2/xsyr2.cc
@@ -20,7 +20,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xsyr2<T>::Xsyr2(Queue &queue, Event &event, const std::string &name):
+Xsyr2<T>::Xsyr2(Queue &queue, EventPointer event, const std::string &name):
     Xher2<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xtbmv.cc b/src/routines/level2/xtbmv.cc
index 2e1aebff..47371c87 100644
--- a/src/routines/level2/xtbmv.cc
+++ b/src/routines/level2/xtbmv.cc
@@ -21,7 +21,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xtbmv<T>::Xtbmv(Queue &queue, Event &event, const std::string &name):
+Xtbmv<T>::Xtbmv(Queue &queue, EventPointer event, const std::string &name):
     Xgemv<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xtpmv.cc b/src/routines/level2/xtpmv.cc
index aa0e099b..c63cb9b2 100644
--- a/src/routines/level2/xtpmv.cc
+++ b/src/routines/level2/xtpmv.cc
@@ -21,7 +21,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xtpmv<T>::Xtpmv(Queue &queue, Event &event, const std::string &name):
+Xtpmv<T>::Xtpmv(Queue &queue, EventPointer event, const std::string &name):
     Xgemv<T>(queue, event, name) {
 }
 
diff --git a/src/routines/level2/xtrmv.cc b/src/routines/level2/xtrmv.cc
index 94424743..9111d41d 100644
--- a/src/routines/level2/xtrmv.cc
+++ b/src/routines/level2/xtrmv.cc
@@ -21,7 +21,7 @@ namespace clblast {
 
 // Constructor: forwards to base class constructor
 template <typename T>
-Xtrmv<T>::Xtrmv(Queue &queue, Event &event, const std::string &name):
+Xtrmv<T>::Xtrmv(Queue &queue, EventPointer event, const std::string &name):
     Xgemv<T>(queue, event, name) {
 }