瀏覽代碼

src/util: we no longer need to set .xxx_func fields for struct starpu_codelet to STARPU_MULTIPLE_XXX_IMPLEMENTATIONS

Nathalie Furmento 13 年之前
父節點
當前提交
4894dfab0c
共有 3 個文件被更改,包括 2 次插入10 次删除
  1. 1 3
      src/util/execute_on_all.c
  2. 1 5
      src/util/malloc.c
  3. 0 2
      src/util/starpu_data_cpy.c

+ 1 - 3
src/util/execute_on_all.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 2010  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -44,10 +44,8 @@ void starpu_execute_on_each_worker(void (*func)(void *), void *arg, uint32_t whe
 	struct starpu_codelet wrapper_cl =
 	{
 		.where = where,
-		.cuda_func = STARPU_MULTIPLE_CUDA_IMPLEMENTATIONS,
 		.cuda_funcs = {wrapper_func, NULL},
 		.cpu_funcs = {wrapper_func, NULL},
-		.opencl_func = STARPU_MULTIPLE_OPENCL_IMPLEMENTATIONS,
 		.opencl_funcs = {wrapper_func, NULL},
 		/* XXX we do not handle Cell .. */
 		.nbuffers = 0

+ 1 - 5
src/util/malloc.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 2010  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -61,10 +61,8 @@ static struct starpu_perfmodel malloc_pinned_model =
 
 static struct starpu_codelet malloc_pinned_cl =
 {
-	.cuda_func = STARPU_MULTIPLE_CUDA_IMPLEMENTATIONS,
 	.cuda_funcs = {malloc_pinned_cuda_codelet, NULL},
 //#ifdef STARPU_USE_OPENCL
-//	.opencl_func = STARPU_MULTIPLE_OPENCL_IMPLEMENTATIONS,
 //	.opencl_funcs = {malloc_pinned_opencl_codelet, NULL},
 //#endif
 	.nbuffers = 0,
@@ -167,10 +165,8 @@ static struct starpu_perfmodel free_pinned_model =
 
 static struct starpu_codelet free_pinned_cl =
 {
-	.cuda_func = STARPU_MULTIPLE_CUDA_IMPLEMENTATIONS,
 	.cuda_funcs = {free_pinned_cuda_codelet, NULL},
 //#ifdef STARPU_USE_OPENCL
-//	.opencl_func = STARPU_MULTIPLE_OPENCL_IMPLEMENTATIONS,
 //	.opencl_funcs = {free_pinned_opencl_codelet, NULL},
 //#endif
 	.nbuffers = 0,

+ 0 - 2
src/util/starpu_data_cpy.c

@@ -60,9 +60,7 @@ static struct starpu_codelet copy_cl =
 {
 	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {data_cpy_func, NULL},
-	.cuda_func = STARPU_MULTIPLE_CUDA_IMPLEMENTATIONS,
 	.cuda_funcs = {data_cpy_func, NULL},
-	.opencl_func = STARPU_MULTIPLE_OPENCL_IMPLEMENTATIONS,
 	.opencl_funcs = {data_cpy_func, NULL},
 	.nbuffers = 2,
 	.modes = {STARPU_RW, STARPU_R},