From bd540829ea1954c3b367ec70aa8c5811b643422b Mon Sep 17 00:00:00 2001
From: Cedric Nugteren <web@cedricnugteren.nl>
Date: Sun, 24 Dec 2017 12:10:55 +0100
Subject: Fixes for the CUDA backend of CLBlast

---
 CMakeLists.txt            | 5 ++++-
 src/utilities/compile.cpp | 2 +-
 test/test_utilities.cpp   | 2 +-
 test/test_utilities.hpp   | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb2d847d..b0a2759c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -577,7 +577,10 @@ if(TESTS)
   endforeach()
 
   # Miscellaneous tests
-  set(MISC_TESTS override_parameters preprocessor)
+  set(MISC_TESTS override_parameters)
+  if(NOT CUDA)
+    set(MISC_TESTS ${MISC_TESTS} preprocessor)
+  endif()
   if(MSVC)
     set(TESTS_COMMON ${TESTS_COMMON} src/kernel_preprocessor.cpp)
   endif()
diff --git a/src/utilities/compile.cpp b/src/utilities/compile.cpp
index a3b90126..c1d921a4 100644
--- a/src/utilities/compile.cpp
+++ b/src/utilities/compile.cpp
@@ -59,7 +59,7 @@ Program CompileFromSource(const std::string &source_string, const Precision prec
 
   // Optionally adds a translation header from OpenCL kernels to CUDA kernels
   #ifdef CUDA_API
-    source_string +=
+    header_string +=
       #include "kernels/opencl_to_cuda.h"
     ;
   #endif
diff --git a/test/test_utilities.cpp b/test/test_utilities.cpp
index 84734156..d8c1995e 100644
--- a/test/test_utilities.cpp
+++ b/test/test_utilities.cpp
@@ -117,7 +117,7 @@ void FloatToHalfBuffer(std::vector<half>& result, const std::vector<float>& sour
 // =================================================================================================
 
 void OverrideParametersFromJSONFiles(const std::vector<std::string>& file_names,
-                                     const cl_device_id device, const Precision precision) {
+                                     const RawDeviceID device, const Precision precision) {
 
   // Retrieves the best parameters for each file from disk
   BestParametersCollection all_parameters;
diff --git a/test/test_utilities.hpp b/test/test_utilities.hpp
index 1f096310..42660bdb 100644
--- a/test/test_utilities.hpp
+++ b/test/test_utilities.hpp
@@ -120,7 +120,7 @@ using BestParameters = std::unordered_map<std::string,size_t>;
 using BestParametersCollection = std::unordered_map<std::string, BestParameters>;
 
 void OverrideParametersFromJSONFiles(const std::vector<std::string>& file_names,
-                                     const cl_device_id device, const Precision precision);
+                                     const RawDeviceID device, const Precision precision);
 void GetBestParametersFromJSONFile(const std::string& file_name,
                                    BestParametersCollection& all_parameters,
                                    const Precision precision);
-- 
cgit v1.2.3