OpenCL Driver: renamings:

	struct starpu_opencl_codelet --> struct starpu_opencl_program

	STARPU_OPENCL_CODELET_DIR --> STARPU_OPENCL_PROGRAM_DIR

doc/starpu.texi

@@ -2257,7 +2257,7 @@ __kernel void vector_mult_opencl(__global float* val, int nx, float factor)
 #include <starpu.h>
 @i{#include <starpu_opencl.h>}
 
-@i{extern struct starpu_opencl_codelet codelet;}
+@i{extern struct starpu_opencl_program programs;}
 
 void scal_opencl_func(void *buffers[], void *_args)
 @{
@@ -2274,7 +2274,7 @@ void scal_opencl_func(void *buffers[], void *_args)
 @i{    id = starpu_worker_get_id();}
 @i{    devid = starpu_worker_get_devid(id);}
 
-@i{    err = starpu_opencl_load_kernel(&kernel, &queue, &codelet,}
+@i{    err = starpu_opencl_load_kernel(&kernel, &queue, &programs,}
 @i{                    "vector_mult_opencl", devid);   /* @b{Name of the codelet defined above} */}
 @i{    if (err != CL_SUCCESS) STARPU_OPENCL_REPORT_ERROR(err);}
 

doc/vector_scal_c.texi

@@ -30,7 +30,7 @@ static starpu_codelet cl = @{
 @};
 
 #ifdef STARPU_USE_OPENCL
-struct starpu_opencl_codelet codelet;
+struct starpu_opencl_program programs;
 #endif
 
 int main(int argc, char **argv)
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
 
 #ifdef STARPU_USE_OPENCL
         starpu_opencl_load_opencl_from_file("examples/basic_examples/vector_scal_opencl_codelet.cl",
-                                            &codelet);
+                                            &programs);
 #endif
 
     /* Tell StaPU to associate the "vector" vector with the "vector_handle"

doc/vector_scal_opencl.texi

@@ -1,7 +1,7 @@
 #include <starpu.h>
 #include <starpu_opencl.h>
 
-extern struct starpu_opencl_codelet codelet;
+extern struct starpu_opencl_program programs;
 
 void scal_opencl_func(void *buffers[], void *_args)
 @{
@@ -18,7 +18,7 @@ void scal_opencl_func(void *buffers[], void *_args)
     id = starpu_worker_get_id();
     devid = starpu_worker_get_devid(id);
 
-    err = starpu_opencl_load_kernel(&kernel, &queue, &codelet, "vector_mult_opencl", devid);
+    err = starpu_opencl_load_kernel(&kernel, &queue, &programs, "vector_mult_opencl", devid);
     if (err != CL_SUCCESS) STARPU_OPENCL_REPORT_ERROR(err);
 
     err = 0;

examples/basic_examples/vector_scal.c

@@ -47,7 +47,7 @@ static starpu_codelet cl = {
 };
 
 #ifdef STARPU_USE_OPENCL
-struct starpu_opencl_codelet codelet;
+struct starpu_opencl_program codelet;
 #endif
 
 int main(int argc, char **argv)

examples/basic_examples/vector_scal_opencl.c

@@ -21,7 +21,7 @@
 #include <starpu.h>
 #include <starpu_opencl.h>
 
-extern struct starpu_opencl_codelet codelet;
+extern struct starpu_opencl_program codelet;
 
 void scal_opencl_func(void *buffers[], void *_args)
 {

examples/block/block.c

@@ -32,7 +32,7 @@ void cpu_codelet(void *descr[], void *_args)
 }
 
 #ifdef STARPU_USE_OPENCL
-struct starpu_opencl_codelet opencl_code;
+struct starpu_opencl_program opencl_code;
 void opencl_codelet(void *descr[], void *_args)
 {
 	cl_kernel kernel;

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_codelet opencl_code;
+struct starpu_opencl_program opencl_code;
 #endif
 
 extern void cuda_codelet_host(float *tab);

examples/incrementer/incrementer_kernels_opencl.c

@@ -18,7 +18,7 @@
 #include <starpu_opencl.h>
 #include <CL/cl.h>
 
-extern struct starpu_opencl_codelet opencl_code;
+extern struct starpu_opencl_program opencl_code;
 void opencl_codelet(void *descr[], void *_args)
 {
 	float *val = (float *)STARPU_GET_VECTOR_PTR(descr[0]);

examples/matvecmult/matvecmult.c

@@ -25,7 +25,7 @@ static int width=20;
 static int height=4;
 
 #ifdef STARPU_USE_OPENCL
-struct starpu_opencl_codelet opencl_code;
+struct starpu_opencl_program opencl_code;
 void opencl_codelet(void *descr[], __attribute__ ((unused)) void *_args)
 {
 	cl_kernel kernel;

examples/spmv/dw_spmv.c

@@ -29,7 +29,7 @@ struct timeval end;
 
 #ifdef STARPU_USE_OPENCL
 #include "starpu_opencl.h"
-struct starpu_opencl_codelet opencl_codelet;
+struct starpu_opencl_program opencl_codelet;
 void spmv_kernel_opencl(void *descr[], void *args)
 {
 	cl_kernel kernel;

examples/variable/variable.c

@@ -26,7 +26,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_codelet opencl_code;
+struct starpu_opencl_program opencl_code;
 #endif
 
 extern void cuda_codelet_host(float *tab);

examples/variable/variable_kernels_opencl.c

@@ -17,7 +17,7 @@
 #include <starpu.h>
 #include <starpu_opencl.h>
 
-extern struct starpu_opencl_codelet opencl_code;
+extern struct starpu_opencl_program opencl_code;
 void opencl_codelet(void *descr[], void *_args)
 {
 	float *val = (float *)STARPU_GET_VECTOR_PTR(descr[0]);

include/starpu_opencl.h

@@ -174,7 +174,7 @@ extern "C" {
 		assert(0);	                                        \
 	} while (0)
 
-struct starpu_opencl_codelet {
+struct starpu_opencl_program {
         cl_program programs[STARPU_MAXOPENCLDEVS];
 };
 
@@ -182,11 +182,11 @@ void starpu_opencl_get_context(int devid, cl_context *context);
 void starpu_opencl_get_device(int devid, cl_device_id *device);
 void starpu_opencl_get_queue(int devid, cl_command_queue *queue);
 
-int starpu_opencl_load_opencl_from_file(char *source_file_name, struct starpu_opencl_codelet *codelet);
-int starpu_opencl_load_opencl_from_string(char *opencl_codelet_source, struct starpu_opencl_codelet *codelet);
-int starpu_opencl_unload_opencl(struct starpu_opencl_codelet *codelet);
+int starpu_opencl_load_opencl_from_file(char *source_file_name, struct starpu_opencl_program *opencl_programs);
+int starpu_opencl_load_opencl_from_string(char *opencl_program_source, struct starpu_opencl_program *opencl_programs);
+int starpu_opencl_unload_opencl(struct starpu_opencl_program *opencl_programs);
 
-int starpu_opencl_load_kernel(cl_kernel *kernel, cl_command_queue *queue, struct starpu_opencl_codelet *codelet, char *kernel_name, int devid);
+int starpu_opencl_load_kernel(cl_kernel *kernel, cl_command_queue *queue, struct starpu_opencl_program *opencl_programs, char *kernel_name, int devid);
 int starpu_opencl_release_kernel(cl_kernel kernel);
 
 

src/drivers/opencl/driver_opencl.c

@@ -33,7 +33,7 @@ static cl_device_id devices[STARPU_MAXOPENCLDEVS];
 static cl_command_queue queues[STARPU_MAXOPENCLDEVS];
 static cl_uint nb_devices = -1;
 static int init_done = 0;
-extern char *_starpu_opencl_codelet_dir;
+extern char *_starpu_opencl_program_dir;
 
 void starpu_opencl_get_context(int devid, cl_context *context)
 {
@@ -172,7 +172,7 @@ void _starpu_opencl_init(void)
                 }
 
                 // Get location of OpenCl codelet source files
-                _starpu_opencl_codelet_dir = getenv("STARPU_OPENCL_CODELET_DIR");
+                _starpu_opencl_program_dir = getenv("STARPU_OPENCL_PROGRAM_DIR");
 
                 // initialise internal structures
                 for(i=0 ; i<nb_devices ; i++) {

src/drivers/opencl/driver_opencl_utils.c

@@ -28,7 +28,7 @@
 #include "driver_opencl_utils.h"
 #include "driver_opencl.h"
 
-char *_starpu_opencl_codelet_dir;
+char *_starpu_opencl_program_dir;
 
 #define _STARPU_STRINGIFY_(x) #x
 #define _STARPU_STRINGIFY(x) _STARPU_STRINGIFY_(x)
@@ -40,8 +40,8 @@ int _starpu_opencl_locate_file(char *source_file_name, char *located_file_name)
                 strcpy(located_file_name, source_file_name);
                 return EXIT_SUCCESS;
         }
-        if (_starpu_opencl_codelet_dir) {
-                sprintf(located_file_name, "%s/%s", _starpu_opencl_codelet_dir, source_file_name);
+        if (_starpu_opencl_program_dir) {
+                sprintf(located_file_name, "%s/%s", _starpu_opencl_program_dir, source_file_name);
                 _STARPU_OPENCL_DEBUG("Trying to locate <%s>\n", located_file_name);
                 if (access(located_file_name, R_OK) == 0) return EXIT_SUCCESS;
         }
@@ -57,7 +57,7 @@ int _starpu_opencl_locate_file(char *source_file_name, char *located_file_name)
         return EXIT_FAILURE;
 }
 
-int starpu_opencl_load_kernel(cl_kernel *kernel, cl_command_queue *queue, struct starpu_opencl_codelet *codelet,
+int starpu_opencl_load_kernel(cl_kernel *kernel, cl_command_queue *queue, struct starpu_opencl_program *opencl_programs,
                               char *kernel_name, int devid)
 {
         int err;
@@ -69,7 +69,7 @@ int starpu_opencl_load_kernel(cl_kernel *kernel, cl_command_queue *queue, struct
         starpu_opencl_get_context(devid, &context);
         starpu_opencl_get_queue(devid, queue);
 
-        program = codelet->programs[devid];
+        program = opencl_programs->programs[devid];
         if (!program) {
                 fprintf(stderr, "Program not available\n");
                 return CL_INVALID_PROGRAM;
@@ -112,7 +112,7 @@ char *_starpu_opencl_load_program_source(const char *filename)
         return source;
 }
 
-int starpu_opencl_load_opencl_from_string(char *opencl_codelet_source, struct starpu_opencl_codelet *codelet)
+int starpu_opencl_load_opencl_from_string(char *opencl_program_source, struct starpu_opencl_program *opencl_programs)
 {
         unsigned int dev;
         unsigned int nb_devices;
@@ -127,12 +127,12 @@ int starpu_opencl_load_opencl_from_string(char *opencl_codelet_source, struct st
 
                 starpu_opencl_get_device(dev, &device);
                 starpu_opencl_get_context(dev, &context);
-                codelet->programs[dev] = NULL;
+                opencl_programs->programs[dev] = NULL;
 
                 if (context == NULL) continue;
 
                 // Create the compute program from the source buffer
-                program = clCreateProgramWithSource(context, 1, (const char **) &opencl_codelet_source, NULL, &err);
+                program = clCreateProgramWithSource(context, 1, (const char **) &opencl_program_source, NULL, &err);
                 if (!program || err != CL_SUCCESS) STARPU_OPENCL_REPORT_ERROR(err);
 
                 // Build the program executable
@@ -149,12 +149,12 @@ int starpu_opencl_load_opencl_from_string(char *opencl_codelet_source, struct st
                 }
 
                 // Store program
-                codelet->programs[dev] = program;
+                opencl_programs->programs[dev] = program;
         }
         return EXIT_SUCCESS;
 }
 
-int starpu_opencl_load_opencl_from_file(char *source_file_name, struct starpu_opencl_codelet *codelet)
+int starpu_opencl_load_opencl_from_file(char *source_file_name, struct starpu_opencl_program *opencl_programs)
 {
         char located_file_name[1024];
 
@@ -163,14 +163,14 @@ int starpu_opencl_load_opencl_from_file(char *source_file_name, struct starpu_op
         _STARPU_OPENCL_DEBUG("Source file name : <%s>\n", located_file_name);
 
         // Load the compute program from disk into a cstring buffer
-        char *opencl_codelet_source = _starpu_opencl_load_program_source(located_file_name);
-        if(!opencl_codelet_source)
+        char *opencl_program_source = _starpu_opencl_load_program_source(located_file_name);
+        if(!opencl_program_source)
                 _STARPU_OPENCL_ERROR("Failed to load compute program from file <%s>!\n", located_file_name);
 
-        return starpu_opencl_load_opencl_from_string(opencl_codelet_source, codelet);
+        return starpu_opencl_load_opencl_from_string(opencl_program_source, opencl_programs);
 }
 
-int starpu_opencl_unload_opencl(struct starpu_opencl_codelet *codelet)
+int starpu_opencl_unload_opencl(struct starpu_opencl_program *opencl_programs)
 {
         unsigned int dev;
         unsigned int nb_devices;
@@ -178,8 +178,8 @@ int starpu_opencl_unload_opencl(struct starpu_opencl_codelet *codelet)
         nb_devices = _starpu_opencl_get_device_count();
         // Iterate over each device
         for(dev = 0; dev < nb_devices; dev ++) {
-                if (codelet->programs[dev])
-                        clReleaseProgram(codelet->programs[dev]);
+                if (opencl_programs->programs[dev])
+                        clReleaseProgram(opencl_programs->programs[dev]);
         }
         return EXIT_SUCCESS;
 }

tests/datawizard/sync_and_notify_data.c

@@ -50,7 +50,7 @@ void cuda_codelet_incC(void *descr[], __attribute__ ((unused)) void *_args);
 #include <starpu_opencl.h>
 void opencl_codelet_incA(void *descr[], __attribute__ ((unused)) void *_args);
 void opencl_codelet_incC(void *descr[], __attribute__ ((unused)) void *_args);
-struct starpu_opencl_codelet opencl_code;
+struct starpu_opencl_program opencl_code;
 #endif
 
 #define VECTORSIZE	16

tests/datawizard/sync_and_notify_data_implicit.c

@@ -52,7 +52,7 @@ void cuda_codelet_incC(void *descr[], __attribute__ ((unused)) void *_args);
 #include <starpu_opencl.h>
 void opencl_codelet_incA(void *descr[], __attribute__ ((unused)) void *_args);
 void opencl_codelet_incC(void *descr[], __attribute__ ((unused)) void *_args);
-struct starpu_opencl_codelet opencl_code;
+struct starpu_opencl_program opencl_code;
 #endif
 
 #define VECTORSIZE	16

tests/datawizard/sync_and_notify_data_opencl.c

@@ -18,7 +18,7 @@
 #include <starpu_opencl.h>
 #include <CL/cl.h>
 
-extern struct starpu_opencl_codelet opencl_code;
+extern struct starpu_opencl_program opencl_code;
 
 void opencl_codelet_incA(void *descr[], __attribute__ ((unused)) void *_args)
 {