Browse Source

tests: for struct starpu_codelet, define .xxx_funcs instead of .xxx_func fields

Nathalie Furmento 13 years ago
parent
commit
5e56dc31fb

+ 6 - 1
tests/datawizard/interfaces/multiformat/advanced/generic.c

@@ -37,7 +37,12 @@ void cuda_to_cpu_func(void *buffers[], void *args)
 
 
 struct starpu_codelet cpu_to_cuda_cl = {
 struct starpu_codelet cpu_to_cuda_cl = {
 	.where = STARPU_CUDA,
 	.where = STARPU_CUDA,
-	.cuda_func = cpu_to_cuda_func,
+	.cuda_funcs = {
+		cpu_to_cuda_func
+		,
+		NULL
+		,
+	}
 	.nbuffers = 1
 	.nbuffers = 1
 };
 };
 
 

+ 6 - 1
tests/datawizard/interfaces/multiformat/advanced/multiformat_cuda_opencl.c

@@ -46,7 +46,12 @@ test(void)
 	static struct starpu_codelet cl_cuda =
 	static struct starpu_codelet cl_cuda =
 	{
 	{
 		.where     = STARPU_CUDA,
 		.where     = STARPU_CUDA,
-		.cuda_func = cuda_func,
+		.cuda_funcs = {
+			cuda_func
+			,
+			NULL
+			,
+		}
 		.nbuffers  = 1
 		.nbuffers  = 1
 	};
 	};
 
 

+ 6 - 1
tests/datawizard/interfaces/multiformat/multiformat_conversion_codelets.c

@@ -34,7 +34,12 @@ void cuda_to_cpu(void *buffers[], void *arg)
 
 
 extern void cpu_to_cuda_cuda_func(void *buffers[], void *args); struct starpu_codelet cpu_to_cuda_cl = {
 extern void cpu_to_cuda_cuda_func(void *buffers[], void *args); struct starpu_codelet cpu_to_cuda_cl = {
 	.where = STARPU_CUDA,
 	.where = STARPU_CUDA,
-	.cuda_func = cpu_to_cuda_cuda_func,
+	.cuda_funcs = {
+		cpu_to_cuda_cuda_func
+		,
+		NULL
+		,
+	}
 	.nbuffers = 1
 	.nbuffers = 1
 };
 };
 
 

+ 1 - 1
tests/datawizard/manual_reduction.c

@@ -91,7 +91,7 @@ static void cpu_redux_func(void *descr[], void *cl_arg __attribute__((unused)))
 static struct starpu_codelet reduction_codelet = {
 static struct starpu_codelet reduction_codelet = {
 	.where = STARPU_CPU,
 	.where = STARPU_CPU,
 	.cpu_funcs = {cpu_redux_func, NULL},
 	.cpu_funcs = {cpu_redux_func, NULL},
-	.cuda_funcs = {NULL, NULL},
+	.cuda_funcs = {NULL},
 	.nbuffers = 2,
 	.nbuffers = 2,
 	.model = NULL
 	.model = NULL
 };
 };