OpenCL: use 'opencl kernels' instead of 'opencl codelet' to avoid confusion with starpu codelet object

examples/Makefile.am

@@ -551,7 +551,7 @@ if STARPU_USE_OPENCL
 incrementer_incrementer_SOURCES +=	\
 	incrementer/incrementer_kernels_opencl.c
 nobase_STARPU_OPENCL_DATA_DATA += \
-	incrementer/incrementer_kernels_opencl_codelet.cl
+	incrementer/incrementer_kernels_opencl_kernel.cl
 endif
 
 ######################

examples/incrementer/incrementer.c

@@ -27,7 +27,7 @@ extern void cuda_codelet(void *descr[], __attribute__ ((unused)) void *_args);
 #ifdef STARPU_USE_OPENCL
 #include <starpu_opencl.h>
 extern void opencl_codelet(void *descr[], __attribute__ ((unused)) void *_args);
-struct starpu_opencl_program opencl_code;
+struct starpu_opencl_program opencl_program;
 #endif
 
 void cpu_codelet(void *descr[], __attribute__ ((unused)) void *_args)
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 			(uintptr_t)&float_array, 4, sizeof(float));
 
 #ifdef STARPU_USE_OPENCL
-        starpu_opencl_load_opencl_from_file("examples/incrementer/incrementer_kernels_opencl_codelet.cl", &opencl_code);
+        starpu_opencl_load_opencl_from_file("examples/incrementer/incrementer_kernels_opencl_kernel.cl", &opencl_program);
 #endif
 
 	starpu_codelet cl =

examples/incrementer/incrementer_kernels_opencl.c

@@ -18,7 +18,7 @@
 #include <starpu_opencl.h>
 #include <CL/cl.h>
 
-extern struct starpu_opencl_program opencl_code;
+extern struct starpu_opencl_program opencl_program;
 void opencl_codelet(void *descr[], void *_args)
 {
 	float *val = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
@@ -29,7 +29,7 @@ void opencl_codelet(void *descr[], void *_args)
         id = starpu_worker_get_id();
         devid = starpu_worker_get_devid(id);
 
-	err = starpu_opencl_load_kernel(&kernel, &queue, &opencl_code, "incrementer", devid);
+	err = starpu_opencl_load_kernel(&kernel, &queue, &opencl_program, "incrementer", devid);
 	if (err != CL_SUCCESS) STARPU_OPENCL_REPORT_ERROR(err);
 
 	err = 0;