Fixes for the CUDA backend of CLBlast

pull/234/head
Cedric Nugteren 2017-12-24 12:10:55 +01:00
parent 8657e90cf8
commit bd540829ea
4 changed files with 7 additions and 4 deletions

View File

@ -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()

View File

@ -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

View File

@ -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;

View File

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