starpu_opencl_set_kernel_args() does not take the number of arguments to set as a parameter any more.

include/starpu_opencl.h

@@ -75,19 +75,24 @@ int starpu_opencl_collect_stats(cl_event event);
  * 
  * 	size of the argument,  pointer to the argument
  *
+ * 0 must be passed to this function after the kernel arguments.
+ *
  * In case of failure, returns the id of the argument that could not be set,
- * and sets "error" to the error returned. Otherwise, returns "nargs".
+ * and sets "error" to the error returned. Otherwise, returns the number of 
+ * arguments that were set.
  *
  * Example :
  * int n;
  * cl_int err;
  * cl_kernel kernel;
  * n = starpu_opencl_set_kernel_args(&err, 2, &kernel,
- *				     sizeof(foo), &foo, sizeof(bar), &bar);
+ *				     sizeof(foo), &foo,
+ *                                   sizeof(bar), &bar,
+ *                                   0);
  * if (n != 2)
  * 	fprintf(stderr, "Error : %d\n", err);
  */
-int starpu_opencl_set_kernel_args(cl_int *error, int nargs, cl_kernel *kernel, ...);
+int starpu_opencl_set_kernel_args(cl_int *error, cl_kernel *kernel, ...);
 
 #ifdef __cplusplus
 }

src/drivers/opencl/driver_opencl_utils.c

@@ -467,16 +467,19 @@ void starpu_opencl_display_error(const char *func, const char *file, int line, c
 
 }
 
-int starpu_opencl_set_kernel_args(cl_int *error, int nargs, cl_kernel *kernel, ...)
+int starpu_opencl_set_kernel_args(cl_int *error, cl_kernel *kernel, ...)
 {
 	int i;
 	va_list ap;
 
 	va_start(ap, kernel);
 
-	for (i = 0; i < nargs; i++)
+	for (i = 0; ; i++)
 	{
 		int size = va_arg(ap, int);
+		if (size == 0)
+			break;
+
 		cl_mem *ptr = va_arg(ap, cl_mem *);
 		int err = clSetKernelArg(*kernel, i, size, ptr);
 		if (err != CL_SUCCESS)

tests/datawizard/interfaces/vector/test_vector_opencl.c

@@ -58,11 +58,12 @@ test_vector_opencl_func(void *buffers[], void *args)
 		STARPU_OPENCL_REPORT_ERROR(err);
 
 	int nargs;
-	nargs = starpu_opencl_set_kernel_args(&err, 4, &kernel,
+	nargs = starpu_opencl_set_kernel_args(&err, &kernel,
 					      sizeof(val), &val,
 					      sizeof(n), &n,
 					      sizeof(fail), &fail,
-					      sizeof(factor), &factor);
+					      sizeof(factor), &factor,
+					      0);
 
 	if (nargs != 4)
 	{