Removed the template from the Routine base-class

25 files changed, 45 insertions, 226 deletions

diff --git a/include/internal/routine.h b/include/internal/routine.h
index c64abc4c..9db4e227 100644
--- a/include/internal/routine.h
+++ b/include/internal/routine.h
@@ -28,7 +28,6 @@ namespace clblast {
 // =================================================================================================
 
 // See comment at top of file for a description of the class
-template <typename T>
 class Routine {
  public:
 
diff --git a/include/internal/routines/level1/xamax.h b/include/internal/routines/level1/xamax.h
index 8b80044e..42f8f67c 100644
--- a/include/internal/routines/level1/xamax.h
+++ b/include/internal/routines/level1/xamax.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xamax: public Routine<T> {
+class Xamax: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xamax(Queue &queue, EventPointer event, const std::string &name = "AMAX");
 
diff --git a/include/internal/routines/level1/xasum.h b/include/internal/routines/level1/xasum.h
index fe8529e3..9d93a6f4 100644
--- a/include/internal/routines/level1/xasum.h
+++ b/include/internal/routines/level1/xasum.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xasum: public Routine<T> {
+class Xasum: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xasum(Queue &queue, EventPointer event, const std::string &name = "ASUM");
 
diff --git a/include/internal/routines/level1/xaxpy.h b/include/internal/routines/level1/xaxpy.h
index af48086a..4c8d2c1f 100644
--- a/include/internal/routines/level1/xaxpy.h
+++ b/include/internal/routines/level1/xaxpy.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xaxpy: public Routine<T> {
+class Xaxpy: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xaxpy(Queue &queue, EventPointer event, const std::string &name = "AXPY");
 
diff --git a/include/internal/routines/level1/xcopy.h b/include/internal/routines/level1/xcopy.h
index eb245192..c7d03dd0 100644
--- a/include/internal/routines/level1/xcopy.h
+++ b/include/internal/routines/level1/xcopy.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xcopy: public Routine<T> {
+class Xcopy: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xcopy(Queue &queue, EventPointer event, const std::string &name = "COPY");
 
diff --git a/include/internal/routines/level1/xdot.h b/include/internal/routines/level1/xdot.h
index ce26d267..e1968740 100644
--- a/include/internal/routines/level1/xdot.h
+++ b/include/internal/routines/level1/xdot.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xdot: public Routine<T> {
+class Xdot: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xdot(Queue &queue, EventPointer event, const std::string &name = "DOT");
 
diff --git a/include/internal/routines/level1/xnrm2.h b/include/internal/routines/level1/xnrm2.h
index 5186acc5..ca9268c0 100644
--- a/include/internal/routines/level1/xnrm2.h
+++ b/include/internal/routines/level1/xnrm2.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xnrm2: public Routine<T> {
+class Xnrm2: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xnrm2(Queue &queue, EventPointer event, const std::string &name = "NRM2");
 
diff --git a/include/internal/routines/level1/xscal.h b/include/internal/routines/level1/xscal.h
index 6c82dd89..b9430f3b 100644
--- a/include/internal/routines/level1/xscal.h
+++ b/include/internal/routines/level1/xscal.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xscal: public Routine<T> {
+class Xscal: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xscal(Queue &queue, EventPointer event, const std::string &name = "SCAL");
 
diff --git a/include/internal/routines/level1/xswap.h b/include/internal/routines/level1/xswap.h
index 6a568377..bd063afc 100644
--- a/include/internal/routines/level1/xswap.h
+++ b/include/internal/routines/level1/xswap.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xswap: public Routine<T> {
+class Xswap: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xswap(Queue &queue, EventPointer event, const std::string &name = "SWAP");
 
diff --git a/include/internal/routines/level2/xgemv.h b/include/internal/routines/level2/xgemv.h
index b1277079..e9804c62 100644
--- a/include/internal/routines/level2/xgemv.h
+++ b/include/internal/routines/level2/xgemv.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xgemv: public Routine<T> {
+class Xgemv: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xgemv(Queue &queue, EventPointer event, const std::string &name = "GEMV");
 
diff --git a/include/internal/routines/level2/xger.h b/include/internal/routines/level2/xger.h
index aab5075d..184f8477 100644
--- a/include/internal/routines/level2/xger.h
+++ b/include/internal/routines/level2/xger.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xger: public Routine<T> {
+class Xger: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xger(Queue &queue, EventPointer event, const std::string &name = "GER");
 
diff --git a/include/internal/routines/level2/xher.h b/include/internal/routines/level2/xher.h
index 97ccfde7..fca8bb97 100644
--- a/include/internal/routines/level2/xher.h
+++ b/include/internal/routines/level2/xher.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T, typename U>
-class Xher: public Routine<T> {
+class Xher: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xher(Queue &queue, EventPointer event, const std::string &name = "HER");
 
diff --git a/include/internal/routines/level2/xher2.h b/include/internal/routines/level2/xher2.h
index 067f85e6..9a7610f1 100644
--- a/include/internal/routines/level2/xher2.h
+++ b/include/internal/routines/level2/xher2.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xher2: public Routine<T> {
+class Xher2: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xher2(Queue &queue, EventPointer event, const std::string &name = "HER2");
 
diff --git a/include/internal/routines/level2/xtbmv.h b/include/internal/routines/level2/xtbmv.h
index 3ccdf3f8..493a9853 100644
--- a/include/internal/routines/level2/xtbmv.h
+++ b/include/internal/routines/level2/xtbmv.h
@@ -25,14 +25,10 @@ namespace clblast {
 template <typename T>
 class Xtbmv: public Xgemv<T> {
  public:
-  
-  // Members from the base class
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
 
   // Uses the generic matrix-vector routine
+  using Xgemv<T>::queue_;
+  using Xgemv<T>::context_;
   using Xgemv<T>::MatVec;
 
   // Constructor
diff --git a/include/internal/routines/level2/xtpmv.h b/include/internal/routines/level2/xtpmv.h
index 7619197d..ce5cae6f 100644
--- a/include/internal/routines/level2/xtpmv.h
+++ b/include/internal/routines/level2/xtpmv.h
@@ -25,14 +25,10 @@ namespace clblast {
 template <typename T>
 class Xtpmv: public Xgemv<T> {
  public:
-  
-  // Members from the base class
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
 
   // Uses the generic matrix-vector routine
+  using Xgemv<T>::queue_;
+  using Xgemv<T>::context_;
   using Xgemv<T>::MatVec;
 
   // Constructor
diff --git a/include/internal/routines/level2/xtrmv.h b/include/internal/routines/level2/xtrmv.h
index 4021b39c..4407bad7 100644
--- a/include/internal/routines/level2/xtrmv.h
+++ b/include/internal/routines/level2/xtrmv.h
@@ -25,14 +25,10 @@ namespace clblast {
 template <typename T>
 class Xtrmv: public Xgemv<T> {
  public:
-  
-  // Members from the base class
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
 
   // Uses the generic matrix-vector routine
+  using Xgemv<T>::queue_;
+  using Xgemv<T>::context_;
   using Xgemv<T>::MatVec;
 
   // Constructor
diff --git a/include/internal/routines/level3/xgemm.h b/include/internal/routines/level3/xgemm.h
index 211ae990..c0541eef 100644
--- a/include/internal/routines/level3/xgemm.h
+++ b/include/internal/routines/level3/xgemm.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xgemm: public Routine<T> {
+class Xgemm: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xgemm(Queue &queue, EventPointer event, const std::string &name = "GEMM");
 
diff --git a/include/internal/routines/level3/xhemm.h b/include/internal/routines/level3/xhemm.h
index a9a422b0..e0f35669 100644
--- a/include/internal/routines/level3/xhemm.h
+++ b/include/internal/routines/level3/xhemm.h
@@ -25,16 +25,14 @@ template <typename T>
 class Xhemm: public Xgemm<T> {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
-  // Uses the regular Xgemm routine
-  using Xgemm<T>::DoGemm;
+  // Uses methods and variables the regular Xgemm routine
   using Xgemm<T>::precision_;
+  using Xgemm<T>::routine_name_;
+  using Xgemm<T>::queue_;
+  using Xgemm<T>::context_;
+  using Xgemm<T>::device_;
+  using Xgemm<T>::db_;
+  using Xgemm<T>::DoGemm;
 
   // Constructor
   Xhemm(Queue &queue, EventPointer event, const std::string &name = "HEMM");
diff --git a/include/internal/routines/level3/xher2k.h b/include/internal/routines/level3/xher2k.h
index dfeb737e..b7764e18 100644
--- a/include/internal/routines/level3/xher2k.h
+++ b/include/internal/routines/level3/xher2k.h
@@ -23,18 +23,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T, typename U>
-class Xher2k: public Routine<T> {
+class Xher2k: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xher2k(Queue &queue, EventPointer event, const std::string &name = "HER2K");
 
diff --git a/include/internal/routines/level3/xherk.h b/include/internal/routines/level3/xherk.h
index 7ea59579..abcf4c1a 100644
--- a/include/internal/routines/level3/xherk.h
+++ b/include/internal/routines/level3/xherk.h
@@ -23,18 +23,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T, typename U>
-class Xherk: public Routine<T> {
+class Xherk: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xherk(Queue &queue, EventPointer event, const std::string &name = "HERK");
 
diff --git a/include/internal/routines/level3/xsymm.h b/include/internal/routines/level3/xsymm.h
index 991284f5..889abfb7 100644
--- a/include/internal/routines/level3/xsymm.h
+++ b/include/internal/routines/level3/xsymm.h
@@ -27,16 +27,14 @@ template <typename T>
 class Xsymm: public Xgemm<T> {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
-  // Uses the regular Xgemm routine
-  using Xgemm<T>::DoGemm;
+  // Uses methods and variables the regular Xgemm routine
   using Xgemm<T>::precision_;
+  using Xgemm<T>::routine_name_;
+  using Xgemm<T>::queue_;
+  using Xgemm<T>::context_;
+  using Xgemm<T>::device_;
+  using Xgemm<T>::db_;
+  using Xgemm<T>::DoGemm;
 
   // Constructor
   Xsymm(Queue &queue, EventPointer event, const std::string &name = "SYMM");
diff --git a/include/internal/routines/level3/xsyr2k.h b/include/internal/routines/level3/xsyr2k.h
index aefd016d..f75c91e5 100644
--- a/include/internal/routines/level3/xsyr2k.h
+++ b/include/internal/routines/level3/xsyr2k.h
@@ -23,18 +23,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xsyr2k: public Routine<T> {
+class Xsyr2k: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xsyr2k(Queue &queue, EventPointer event, const std::string &name = "SYR2K");
 
diff --git a/include/internal/routines/level3/xsyrk.h b/include/internal/routines/level3/xsyrk.h
index 75726496..0710fa74 100644
--- a/include/internal/routines/level3/xsyrk.h
+++ b/include/internal/routines/level3/xsyrk.h
@@ -25,18 +25,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xsyrk: public Routine<T> {
+class Xsyrk: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xsyrk(Queue &queue, EventPointer event, const std::string &name = "SYRK");
 
diff --git a/include/internal/routines/level3/xtrmm.h b/include/internal/routines/level3/xtrmm.h
index caf1ca75..e18ad17a 100644
--- a/include/internal/routines/level3/xtrmm.h
+++ b/include/internal/routines/level3/xtrmm.h
@@ -26,16 +26,14 @@ template <typename T>
 class Xtrmm: public Xgemm<T> {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
-  // Uses the regular Xgemm routine
-  using Xgemm<T>::DoGemm;
+  // Uses methods and variables the regular Xgemm routine
   using Xgemm<T>::precision_;
+  using Xgemm<T>::routine_name_;
+  using Xgemm<T>::queue_;
+  using Xgemm<T>::context_;
+  using Xgemm<T>::device_;
+  using Xgemm<T>::db_;
+  using Xgemm<T>::DoGemm;
 
   // Constructor
   Xtrmm(Queue &queue, EventPointer event, const std::string &name = "TRMM");
diff --git a/include/internal/routines/levelx/xomatcopy.h b/include/internal/routines/levelx/xomatcopy.h
index e5c0529f..d2acb50d 100644
--- a/include/internal/routines/levelx/xomatcopy.h
+++ b/include/internal/routines/levelx/xomatcopy.h
@@ -21,18 +21,9 @@ namespace clblast {
 
 // See comment at top of file for a description of the class
 template <typename T>
-class Xomatcopy: public Routine<T> {
+class Xomatcopy: public Routine {
  public:
 
-  // Members and methods from the base class
-  using Routine<T>::db_;
-  using Routine<T>::source_string_;
-  using Routine<T>::queue_;
-  using Routine<T>::device_;
-  using Routine<T>::event_;
-  using Routine<T>::context_;
-  using Routine<T>::routine_name_;
-
   // Constructor
   Xomatcopy(Queue &queue, EventPointer event, const std::string &name = "OMATCOPY");