diff options
author | Cedric Nugteren <web@cedricnugteren.nl> | 2016-06-18 14:56:55 +0200 |
---|---|---|
committer | Cedric Nugteren <web@cedricnugteren.nl> | 2016-06-18 14:56:55 +0200 |
commit | 7b4c0e1cf03a94077c20f7f12ef15fb8717c74ca (patch) | |
tree | c18d714997a5e455119dbdc7f15aa96b51afff5a /src | |
parent | f9947b4d7ffedcf98cdb128de835422f647e7f15 (diff) |
Removed the template from the Routine base-class
Diffstat (limited to 'src')
-rw-r--r-- | src/routine.cc | 17 | ||||
-rw-r--r-- | src/routines/level1/xamax.cc | 2 | ||||
-rw-r--r-- | src/routines/level1/xasum.cc | 2 | ||||
-rw-r--r-- | src/routines/level1/xaxpy.cc | 2 | ||||
-rw-r--r-- | src/routines/level1/xcopy.cc | 2 | ||||
-rw-r--r-- | src/routines/level1/xdot.cc | 2 | ||||
-rw-r--r-- | src/routines/level1/xnrm2.cc | 2 | ||||
-rw-r--r-- | src/routines/level1/xscal.cc | 2 | ||||
-rw-r--r-- | src/routines/level1/xswap.cc | 2 | ||||
-rw-r--r-- | src/routines/level2/xgemv.cc | 2 | ||||
-rw-r--r-- | src/routines/level2/xger.cc | 2 | ||||
-rw-r--r-- | src/routines/level2/xher.cc | 2 | ||||
-rw-r--r-- | src/routines/level2/xher2.cc | 2 | ||||
-rw-r--r-- | src/routines/level3/xgemm.cc | 2 | ||||
-rw-r--r-- | src/routines/level3/xher2k.cc | 2 | ||||
-rw-r--r-- | src/routines/level3/xherk.cc | 2 | ||||
-rw-r--r-- | src/routines/level3/xsyr2k.cc | 2 | ||||
-rw-r--r-- | src/routines/level3/xsyrk.cc | 2 | ||||
-rw-r--r-- | src/routines/levelx/xomatcopy.cc | 2 |
19 files changed, 21 insertions, 32 deletions
diff --git a/src/routine.cc b/src/routine.cc index 1086aead..9b1640b5 100644 --- a/src/routine.cc +++ b/src/routine.cc @@ -20,9 +20,8 @@ namespace clblast { // ================================================================================================= // Constructor: not much here, because no status codes can be returned -template <typename T> -Routine<T>::Routine(Queue &queue, EventPointer event, const std::string &name, - const std::vector<std::string> &routines, const Precision precision): +Routine::Routine(Queue &queue, EventPointer event, const std::string &name, + const std::vector<std::string> &routines, const Precision precision): precision_(precision), routine_name_(name), queue_(queue), @@ -36,8 +35,7 @@ Routine<T>::Routine(Queue &queue, EventPointer event, const std::string &name, // ================================================================================================= // Separate set-up function to allow for status codes to be returned -template <typename T> -StatusCode Routine<T>::SetUp() { +StatusCode Routine::SetUp() { // Queries the cache to see whether or not the program (context-specific) is already there if (ProgramIsInCache(context_, precision_, routine_name_)) { return StatusCode::kSuccess; } @@ -175,13 +173,4 @@ StatusCode RunKernel(Kernel &kernel, Queue queue, const Device device, } // ================================================================================================= - -// Compiles the templated class -template class Routine<half>; -template class Routine<float>; -template class Routine<double>; -template class Routine<float2>; -template class Routine<double2>; - -// ================================================================================================= } // namespace clblast diff --git a/src/routines/level1/xamax.cc b/src/routines/level1/xamax.cc index 1a3441ef..b4add2a3 100644 --- a/src/routines/level1/xamax.cc +++ b/src/routines/level1/xamax.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xamax<T>::Xamax(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Xdot"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Xdot"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level1/xamax.opencl" ; diff --git a/src/routines/level1/xasum.cc b/src/routines/level1/xasum.cc index 85c6e1ed..80f04829 100644 --- a/src/routines/level1/xasum.cc +++ b/src/routines/level1/xasum.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xasum<T>::Xasum(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Xdot"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Xdot"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level1/xasum.opencl" ; diff --git a/src/routines/level1/xaxpy.cc b/src/routines/level1/xaxpy.cc index 39121067..4a548757 100644 --- a/src/routines/level1/xaxpy.cc +++ b/src/routines/level1/xaxpy.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xaxpy<T>::Xaxpy(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Xaxpy"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Xaxpy"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level1/level1.opencl" #include "../../kernels/level1/xaxpy.opencl" diff --git a/src/routines/level1/xcopy.cc b/src/routines/level1/xcopy.cc index d85efca3..92d31786 100644 --- a/src/routines/level1/xcopy.cc +++ b/src/routines/level1/xcopy.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xcopy<T>::Xcopy(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Xaxpy"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Xaxpy"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level1/level1.opencl" #include "../../kernels/level1/xcopy.opencl" diff --git a/src/routines/level1/xdot.cc b/src/routines/level1/xdot.cc index e3a6b1f0..8709c541 100644 --- a/src/routines/level1/xdot.cc +++ b/src/routines/level1/xdot.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xdot<T>::Xdot(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Xdot"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Xdot"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level1/xdot.opencl" ; diff --git a/src/routines/level1/xnrm2.cc b/src/routines/level1/xnrm2.cc index 1730e144..105f991c 100644 --- a/src/routines/level1/xnrm2.cc +++ b/src/routines/level1/xnrm2.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xnrm2<T>::Xnrm2(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Xdot"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Xdot"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level1/xnrm2.opencl" ; diff --git a/src/routines/level1/xscal.cc b/src/routines/level1/xscal.cc index 4792d40b..3c1b5257 100644 --- a/src/routines/level1/xscal.cc +++ b/src/routines/level1/xscal.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xscal<T>::Xscal(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Xaxpy"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Xaxpy"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level1/level1.opencl" #include "../../kernels/level1/xscal.opencl" diff --git a/src/routines/level1/xswap.cc b/src/routines/level1/xswap.cc index 897515fb..27eb9b13 100644 --- a/src/routines/level1/xswap.cc +++ b/src/routines/level1/xswap.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xswap<T>::Xswap(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Xaxpy"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Xaxpy"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level1/level1.opencl" #include "../../kernels/level1/xswap.opencl" diff --git a/src/routines/level2/xgemv.cc b/src/routines/level2/xgemv.cc index ea3b245d..ccadd131 100644 --- a/src/routines/level2/xgemv.cc +++ b/src/routines/level2/xgemv.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xgemv<T>::Xgemv(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Pad", "Xgemv"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Pad", "Xgemv"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level2/xgemv.opencl" #include "../../kernels/level2/xgemv_fast.opencl" diff --git a/src/routines/level2/xger.cc b/src/routines/level2/xger.cc index e487d41b..6ceaa00e 100644 --- a/src/routines/level2/xger.cc +++ b/src/routines/level2/xger.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xger<T>::Xger(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Xger"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Xger"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level2/level2.opencl" #include "../../kernels/level2/xger.opencl" diff --git a/src/routines/level2/xher.cc b/src/routines/level2/xher.cc index 08ff5a2e..939e17bb 100644 --- a/src/routines/level2/xher.cc +++ b/src/routines/level2/xher.cc @@ -21,7 +21,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T, typename U> Xher<T,U>::Xher(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Xger"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Xger"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level2/level2.opencl" #include "../../kernels/level2/xher.opencl" diff --git a/src/routines/level2/xher2.cc b/src/routines/level2/xher2.cc index d5d4323b..95dbd87a 100644 --- a/src/routines/level2/xher2.cc +++ b/src/routines/level2/xher2.cc @@ -21,7 +21,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xher2<T>::Xher2(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Xger"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Xger"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level2/level2.opencl" #include "../../kernels/level2/xher2.opencl" diff --git a/src/routines/level3/xgemm.cc b/src/routines/level3/xgemm.cc index 7d06c2a2..8386ad09 100644 --- a/src/routines/level3/xgemm.cc +++ b/src/routines/level3/xgemm.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xgemm<T>::Xgemm(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Copy","Pad","Transpose","Padtranspose","Xgemm"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Copy","Pad","Transpose","Padtranspose","Xgemm"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level3/level3.opencl" #include "../../kernels/level3/copy_fast.opencl" diff --git a/src/routines/level3/xher2k.cc b/src/routines/level3/xher2k.cc index 0e5178df..bd0f83dd 100644 --- a/src/routines/level3/xher2k.cc +++ b/src/routines/level3/xher2k.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T, typename U> Xher2k<T,U>::Xher2k(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Copy","Pad","Transpose","Padtranspose","Xgemm"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Copy","Pad","Transpose","Padtranspose","Xgemm"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level3/level3.opencl" #include "../../kernels/level3/copy_fast.opencl" diff --git a/src/routines/level3/xherk.cc b/src/routines/level3/xherk.cc index f8ec217a..6155734a 100644 --- a/src/routines/level3/xherk.cc +++ b/src/routines/level3/xherk.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T, typename U> Xherk<T,U>::Xherk(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Copy","Pad","Transpose","Padtranspose","Xgemm"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Copy","Pad","Transpose","Padtranspose","Xgemm"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level3/level3.opencl" #include "../../kernels/level3/copy_fast.opencl" diff --git a/src/routines/level3/xsyr2k.cc b/src/routines/level3/xsyr2k.cc index b517520c..f9655889 100644 --- a/src/routines/level3/xsyr2k.cc +++ b/src/routines/level3/xsyr2k.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xsyr2k<T>::Xsyr2k(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Copy","Pad","Transpose","Padtranspose","Xgemm"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Copy","Pad","Transpose","Padtranspose","Xgemm"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level3/level3.opencl" #include "../../kernels/level3/copy_fast.opencl" diff --git a/src/routines/level3/xsyrk.cc b/src/routines/level3/xsyrk.cc index ccf8710c..bceb6afd 100644 --- a/src/routines/level3/xsyrk.cc +++ b/src/routines/level3/xsyrk.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xsyrk<T>::Xsyrk(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Copy","Pad","Transpose","Padtranspose","Xgemm"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Copy","Pad","Transpose","Padtranspose","Xgemm"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level3/level3.opencl" #include "../../kernels/level3/copy_fast.opencl" diff --git a/src/routines/levelx/xomatcopy.cc b/src/routines/levelx/xomatcopy.cc index c724b56b..6e4bddb2 100644 --- a/src/routines/levelx/xomatcopy.cc +++ b/src/routines/levelx/xomatcopy.cc @@ -22,7 +22,7 @@ namespace clblast { // Constructor: forwards to base class constructor template <typename T> Xomatcopy<T>::Xomatcopy(Queue &queue, EventPointer event, const std::string &name): - Routine<T>(queue, event, name, {"Copy","Pad","Transpose","Padtranspose"}, PrecisionValue<T>()) { + Routine(queue, event, name, {"Copy","Pad","Transpose","Padtranspose"}, PrecisionValue<T>()) { source_string_ = #include "../../kernels/level3/level3.opencl" #include "../../kernels/level3/copy_fast.opencl" |