cory-master/BabelStream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update OpenCL code to use new C++ header calls

Browse Source 
Specifically:
 * make_kernel has been replaced by KernelFunctor.
 * Different define statements before including the header.
This commit is contained in:
Tom Deakin 2015-08-10 11:23:11 +01:00
parent 772091ae54
commit e804f44497
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ocl-stream.cpp
View File

@ -42,8 +42,10 @@
#include <cfloat> #include <cfloat>
#include <cmath> #include <cmath>
#define __CL_ENABLE_EXCEPTIONS #define CL_HPP_ENABLE_EXCEPTIONS
#include "CL/cl.hpp" #define CL_HPP_MINIMUM_OPENCL_VERSION 110
#define CL_HPP_TARGET_OPENCL_VERSION 110
#include "CL/cl2.hpp"
#include "common.h" #include "common.h"
std::string getDeviceName(const cl::Device& device); std::string getDeviceName(const cl::Device& device);
@ -193,13 +195,13 @@ int main(int argc, char *argv[])
} }
status = "Making kernel copy"; status = "Making kernel copy";
cl::make_kernel<cl::Buffer&, cl::Buffer&> copy(program, "copy"); auto copy = cl::KernelFunctor<cl::Buffer&, cl::Buffer&>(program, "copy");
status = "Making kernel mul"; status = "Making kernel mul";
cl::make_kernel<cl::Buffer&, cl::Buffer&> mul(program, "mul"); auto mul = cl::KernelFunctor<cl::Buffer&, cl::Buffer&>(program, "mul");
status = "Making kernel add"; status = "Making kernel add";
cl::make_kernel<cl::Buffer&, cl::Buffer&, cl::Buffer&> add(program, "add"); auto add = cl::KernelFunctor<cl::Buffer&, cl::Buffer&, cl::Buffer&>(program, "add");
status = "Making kernel triad"; status = "Making kernel triad";
cl::make_kernel<cl::Buffer&, cl::Buffer&, cl::Buffer&> triad(program, "triad"); auto triad = cl::KernelFunctor<cl::Buffer&, cl::Buffer&, cl::Buffer&>(program, "triad");
// Create host vectors // Create host vectors
void *h_a = malloc(ARRAY_SIZE * DATATYPE_SIZE); void *h_a = malloc(ARRAY_SIZE * DATATYPE_SIZE);