Removed the template from the Routine base-class

8 files changed, 26 insertions, 77 deletions

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");