Made compilation of the cuBLAS wrapper work properly

7 files changed, 9 insertions, 12 deletions

diff --git a/test/routines/level2/xher.hpp b/test/routines/level2/xher.hpp
index 980e8d8b..c313d0f5 100644
--- a/test/routines/level2/xher.hpp
+++ b/test/routines/level2/xher.hpp
@@ -112,7 +112,7 @@ class TestXher {
 
   // Describes how to run the cuBLAS routine (for correctness/performance comparison)
   #ifdef CLBLAST_REF_CUBLAS
-    static StatusCode RunReference3(const Arguments<T> &args, BuffersCUDA<T> &buffers, Queue &) {
+    static StatusCode RunReference3(const Arguments<U> &args, BuffersCUDA<T> &buffers, Queue &) {
       auto status = cublasXher(args.layout,
                                convertToCUBLAS(args.triangle),
                                args.n, args.alpha,
diff --git a/test/routines/level2/xhpr.hpp b/test/routines/level2/xhpr.hpp
index 8148c253..986059bd 100644
--- a/test/routines/level2/xhpr.hpp
+++ b/test/routines/level2/xhpr.hpp
@@ -112,7 +112,7 @@ class TestXhpr {
 
   // Describes how to run the cuBLAS routine (for correctness/performance comparison)
   #ifdef CLBLAST_REF_CUBLAS
-    static StatusCode RunReference3(const Arguments<T> &args, BuffersCUDA<T> &buffers, Queue &) {
+    static StatusCode RunReference3(const Arguments<U> &args, BuffersCUDA<T> &buffers, Queue &) {
       auto status = cublasXhpr(args.layout,
                                convertToCUBLAS(args.triangle),
                                args.n, args.alpha,
diff --git a/test/routines/level3/xher2k.hpp b/test/routines/level3/xher2k.hpp
index b341c4d7..2b0fff64 100644
--- a/test/routines/level3/xher2k.hpp
+++ b/test/routines/level3/xher2k.hpp
@@ -130,7 +130,8 @@ class TestXher2k {
 
   // Describes how to run the cuBLAS routine (for correctness/performance comparison)
   #ifdef CLBLAST_REF_CUBLAS
-    static StatusCode RunReference3(const Arguments<T> &args, BuffersCUDA<T> &buffers, Queue &) {
+    static StatusCode RunReference3(const Arguments<U> &args, BuffersCUDA<T> &buffers, Queue &) {
+      auto alpha2 = T{args.alpha, args.alpha};
       auto status = cublasXher2k(args.layout,
                                  convertToCUBLAS(args.triangle),
                                  convertToCUBLAS(args.a_transpose),
diff --git a/test/routines/level3/xherk.hpp b/test/routines/level3/xherk.hpp
index 676d5286..3a676f59 100644
--- a/test/routines/level3/xherk.hpp
+++ b/test/routines/level3/xherk.hpp
@@ -117,7 +117,7 @@ class TestXherk {
 
   // Describes how to run the cuBLAS routine (for correctness/performance comparison)
   #ifdef CLBLAST_REF_CUBLAS
-    static StatusCode RunReference3(const Arguments<T> &args, BuffersCUDA<T> &buffers, Queue &) {
+    static StatusCode RunReference3(const Arguments<U> &args, BuffersCUDA<T> &buffers, Queue &) {
       auto status = cublasXherk(args.layout,
                                 convertToCUBLAS(args.triangle),
                                 convertToCUBLAS(args.a_transpose),
diff --git a/test/routines/level3/xsyrk.hpp b/test/routines/level3/xsyrk.hpp
index 2ee24a2e..34f8f41a 100644
--- a/test/routines/level3/xsyrk.hpp
+++ b/test/routines/level3/xsyrk.hpp
@@ -122,8 +122,8 @@ class TestXsyrk {
                                 convertToCUBLAS(args.triangle),
                                 convertToCUBLAS(args.a_transpose),
                                 args.n, args.k, args.alpha,
-                                buffer.a_mat, args.a_offset, args.a_ld, args.beta,
-                                buffer.c_mat, args.c_offset, args.c_ld);
+                                buffers.a_mat, args.a_offset, args.a_ld, args.beta,
+                                buffers.c_mat, args.c_offset, args.c_ld);
       if (status == CUBLAS_STATUS_SUCCESS) { return StatusCode::kSuccess; } else { return StatusCode::kUnknownError; }
     }
   #endif
diff --git a/test/routines/levelx/xinvert.hpp b/test/routines/levelx/xinvert.hpp
index ac9e9a2d..cc02a88b 100644
--- a/test/routines/levelx/xinvert.hpp
+++ b/test/routines/levelx/xinvert.hpp
@@ -16,10 +16,7 @@
 #ifndef CLBLAST_TEST_ROUTINES_XINVERT_H_
 #define CLBLAST_TEST_ROUTINES_XINVERT_H_
 
-#include <vector>
-#include <string>
-
-#include "utilities/utilities.hpp"
+#include "test/routines/common.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/test/routines/levelx/xomatcopy.hpp b/test/routines/levelx/xomatcopy.hpp
index 2e77e6f7..bbf6006c 100644
--- a/test/routines/levelx/xomatcopy.hpp
+++ b/test/routines/levelx/xomatcopy.hpp
@@ -16,8 +16,7 @@
 #ifndef CLBLAST_TEST_ROUTINES_XOMATCOPY_H_
 #define CLBLAST_TEST_ROUTINES_XOMATCOPY_H_
 
-#include <vector>
-#include <string>
+#include "test/routines/common.hpp"
 
 namespace clblast {
 // =================================================================================================