Use opencl.hpp instead of cl.hpp

fixes #73
krrishnarraj · Nov 8, 2020 · db42d30 · db42d30
1 parent 24f8c73
commit db42d30
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@ elseif(WIN32 AND ${OpenCL_LIBRARIES} MATCHES "OpenCL.lib")
   set(OpenCL_LIBRARIES ${OpenCL_LIBRARIES} cfgmgr32.lib)
 endif()
 
-FIND_PATH(HPP_FOUND CL/cl.hpp PATHS ${OpenCL_INCLUDE_DIRS})
+FIND_PATH(HPP_FOUND CL/opencl.hpp PATHS ${OpenCL_INCLUDE_DIRS})
 if(NOT HPP_FOUND)
   list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
   include(BuildCLHpp)
@@ -63,9 +63,7 @@ target_compile_definitions(clpeak PRIVATE CL_TARGET_OPENCL_VERSION=120)
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
    CMAKE_CXX_COMPILER_ID STREQUAL "GNU"   OR
    CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-  target_compile_options(clpeak PRIVATE -fPIC -Wall -Wextra -Wconversion -Wno-deprecated-declarations -Wno-unused-parameter -Wno-ignored-attributes)
-elseif(MSVC)
-  target_compile_options(clpeak PRIVATE /wd4996)
+  target_compile_options(clpeak PRIVATE -fPIC -Wall -Wextra -Wno-unused-parameter)
 endif()
 
 install(TARGETS clpeak RUNTIME DESTINATION bin)

diff --git a/cmake/BuildCLHpp.cmake b/cmake/BuildCLHpp.cmake
@@ -8,7 +8,7 @@ set(CMAKE_LIST_CONTENT "
   ExternalProject_add(  hpp_headers
     PREFIX              hpp
     GIT_REPOSITORY      https://github.com/KhronosGroup/OpenCL-CLHPP
-    GIT_TAG             opencl21
+    GIT_TAG             master
     GIT_SHALLOW         1
     GIT_PROGRESS        1
     CMAKE_ARGS

diff --git a/include/clpeak.h b/include/clpeak.h
@@ -1,10 +1,6 @@
 #ifndef CLPEAK_HPP
 #define CLPEAK_HPP
 
-#define __CL_ENABLE_EXCEPTIONS
-
-#include <CL/cl.hpp>
-
 #include <iostream>
 #include <stdio.h>
 #include <iomanip>

diff --git a/include/common.h b/include/common.h
@@ -1,7 +1,12 @@
 #ifndef COMMON_H
 #define COMMON_H
 
-#include <CL/cl.hpp>
+#define CL_HPP_ENABLE_EXCEPTIONS
+#define CL_HPP_MINIMUM_OPENCL_VERSION 120
+#define CL_HPP_TARGET_OPENCL_VERSION 120
+
+#include <CL/opencl.hpp>
+
 #if defined(__APPLE__) || defined(__MACOSX) || defined(__FreeBSD__)
 #include <sys/types.h>
 #endif

diff --git a/src/clpeak.cpp b/src/clpeak.cpp
@@ -3,7 +3,7 @@
 
 #define MSTRINGIFY(...) #__VA_ARGS__
 
-static const char *stringifiedKernels =
+static const std::string stringifiedKernels =
 #include "global_bandwidth_kernels.cl"
 #include "compute_sp_kernels.cl"
 #include "compute_hp_kernels.cl"
@@ -66,7 +66,7 @@ int clPeak::runAll()
 
       cl::Context ctx(CL_DEVICE_TYPE_ALL, cps);
       vector<cl::Device> devices = ctx.getInfo<CL_CONTEXT_DEVICES>();
-      cl::Program::Sources source(1, make_pair(stringifiedKernels, (strlen(stringifiedKernels) + 1)));
+      cl::Program::Sources source(1, stringifiedKernels);
       cl::Program prog = cl::Program(ctx, source);
 
       for (size_t d = 0; d < devices.size(); d++)