tests: field where of struct starpu_codelet is optional, no longer set it

tests/datawizard/acquire_cb_insert.c

@@ -34,7 +34,6 @@ void which_index_cpu(void *descr[], void *_args)
 
 struct starpu_codelet which_index =
 {
-	.where = STARPU_CPU,
 	.cpu_funcs = {which_index_cpu, NULL},
         .nbuffers = 1,
 	.modes = {STARPU_W}
@@ -53,7 +52,6 @@ void work_cpu(void *descr[], void *_args)
 
 struct starpu_codelet work =
 {
-	.where = STARPU_CPU,
 	.cpu_funcs = {work_cpu, NULL},
         .nbuffers = 1,
 	.modes = {STARPU_W}

tests/datawizard/copy.c

@@ -30,7 +30,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet cpu_codelet =
 {
-        .where = STARPU_CPU,
         .cpu_funcs = {dummy_func, NULL},
         .model = NULL,
         .nbuffers = 1,
@@ -39,7 +38,6 @@ static struct starpu_codelet cpu_codelet =
 
 static struct starpu_codelet gpu_codelet =
 {
-        .where = STARPU_CUDA|STARPU_OPENCL,
         .cuda_funcs = {dummy_func, NULL},
         .opencl_funcs = {dummy_func, NULL},
         .model = NULL,

tests/datawizard/critical_section_with_void_interface.c

@@ -38,7 +38,6 @@ static void critical_section(void *descr[], __attribute__ ((unused)) void *_args
 
 static struct starpu_codelet cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {critical_section, NULL},
 	.cuda_funcs = {critical_section, NULL},
 	.opencl_funcs = {critical_section, NULL},

tests/datawizard/data_invalidation.c

@@ -125,7 +125,6 @@ static void cpu_check_content_codelet(void *descr[], __attribute__ ((unused)) vo
 
 static struct starpu_codelet check_content_cl =
 {
-	.where = STARPU_CPU,
 	.cpu_funcs = {cpu_check_content_codelet, NULL},
 	.nbuffers = 1,
 	.modes = {STARPU_R}

tests/datawizard/data_lookup.c

@@ -37,7 +37,6 @@ static void task(void **buffers, void *args)
 
 static struct starpu_codelet cl =
 {
-	.where = STARPU_CPU,
 	.cpu_funcs = {task, NULL},
 	.nbuffers = 1,
 	.modes = {STARPU_W}

tests/datawizard/dining_philosophers.c

@@ -31,7 +31,6 @@ static void eat_kernel(void *descr[], void *arg)
 static struct starpu_codelet eating_cl =
 {
 	.modes = { STARPU_RW, STARPU_RW },
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cuda_funcs = {eat_kernel, NULL},
 	.cpu_funcs = {eat_kernel, NULL},
         .opencl_funcs = {eat_kernel, NULL},

tests/datawizard/double_parameter.c

@@ -24,7 +24,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet codelet_R_R =
 {
-        .where = STARPU_CPU,
         .cpu_funcs = { dummy_func, NULL },
         .model = NULL,
         .nbuffers = 2,
@@ -33,7 +32,6 @@ static struct starpu_codelet codelet_R_R =
 
 static struct starpu_codelet codelet_R_W =
 {
-        .where = STARPU_CPU,
         .cpu_funcs = { dummy_func, NULL },
         .model = NULL,
         .nbuffers = 2,
@@ -42,7 +40,6 @@ static struct starpu_codelet codelet_R_W =
 
 static struct starpu_codelet codelet_R_RW =
 {
-        .where = STARPU_CPU,
         .cpu_funcs = { dummy_func, NULL },
         .model = NULL,
         .nbuffers = 2,
@@ -51,7 +48,6 @@ static struct starpu_codelet codelet_R_RW =
 
 static struct starpu_codelet codelet_W_R =
 {
-        .where = STARPU_CPU,
         .cpu_funcs = { dummy_func, NULL },
         .model = NULL,
         .nbuffers = 2,
@@ -60,7 +56,6 @@ static struct starpu_codelet codelet_W_R =
 
 static struct starpu_codelet codelet_W_W =
 {
-        .where = STARPU_CPU,
         .cpu_funcs = { dummy_func, NULL },
         .model = NULL,
         .nbuffers = 2,
@@ -69,7 +64,6 @@ static struct starpu_codelet codelet_W_W =
 
 static struct starpu_codelet codelet_W_RW =
 {
-        .where = STARPU_CPU,
         .cpu_funcs = { dummy_func, NULL },
         .model = NULL,
         .nbuffers = 2,
@@ -78,7 +72,6 @@ static struct starpu_codelet codelet_W_RW =
 
 static struct starpu_codelet codelet_RW_R =
 {
-        .where = STARPU_CPU,
         .cpu_funcs = { dummy_func, NULL },
         .model = NULL,
         .nbuffers = 2,
@@ -87,7 +80,6 @@ static struct starpu_codelet codelet_RW_R =
 
 static struct starpu_codelet codelet_RW_W =
 {
-        .where = STARPU_CPU,
         .cpu_funcs = { dummy_func, NULL },
         .model = NULL,
         .nbuffers = 2,
@@ -96,7 +88,6 @@ static struct starpu_codelet codelet_RW_W =
 
 static struct starpu_codelet codelet_RW_RW =
 {
-        .where = STARPU_CPU,
         .cpu_funcs = { dummy_func, NULL },
         .model = NULL,
         .nbuffers = 2,

tests/datawizard/dsm_stress.c

@@ -87,7 +87,6 @@ static enum starpu_access_mode select_random_mode(void)
 
 static struct starpu_codelet cl_r_r =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_codelet_null, NULL},
 	.cuda_funcs = {cuda_codelet_null, NULL},
         .opencl_funcs = {opencl_codelet_null, NULL},
@@ -97,7 +96,6 @@ static struct starpu_codelet cl_r_r =
 
 static struct starpu_codelet cl_r_w =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_codelet_null, NULL},
 	.cuda_funcs = {cuda_codelet_null, NULL},
         .opencl_funcs = {opencl_codelet_null, NULL},
@@ -107,7 +105,6 @@ static struct starpu_codelet cl_r_w =
 
 static struct starpu_codelet cl_r_rw =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_codelet_null, NULL},
 	.cuda_funcs = {cuda_codelet_null, NULL},
         .opencl_funcs = {opencl_codelet_null, NULL},
@@ -117,7 +114,6 @@ static struct starpu_codelet cl_r_rw =
 
 static struct starpu_codelet cl_w_r =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_codelet_null, NULL},
 	.cuda_funcs = {cuda_codelet_null, NULL},
         .opencl_funcs = {opencl_codelet_null, NULL},
@@ -127,7 +123,6 @@ static struct starpu_codelet cl_w_r =
 
 static struct starpu_codelet cl_w_w =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_codelet_null, NULL},
 	.cuda_funcs = {cuda_codelet_null, NULL},
         .opencl_funcs = {opencl_codelet_null, NULL},
@@ -137,7 +132,6 @@ static struct starpu_codelet cl_w_w =
 
 static struct starpu_codelet cl_w_rw =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_codelet_null, NULL},
 	.cuda_funcs = {cuda_codelet_null, NULL},
         .opencl_funcs = {opencl_codelet_null, NULL},
@@ -147,7 +141,6 @@ static struct starpu_codelet cl_w_rw =
 
 static struct starpu_codelet cl_rw_r =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_codelet_null, NULL},
 	.cuda_funcs = {cuda_codelet_null, NULL},
         .opencl_funcs = {opencl_codelet_null, NULL},
@@ -157,7 +150,6 @@ static struct starpu_codelet cl_rw_r =
 
 static struct starpu_codelet cl_rw_w =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_codelet_null, NULL},
 	.cuda_funcs = {cuda_codelet_null, NULL},
         .opencl_funcs = {opencl_codelet_null, NULL},
@@ -167,7 +159,6 @@ static struct starpu_codelet cl_rw_w =
 
 static struct starpu_codelet cl_rw_rw =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_codelet_null, NULL},
 	.cuda_funcs = {cuda_codelet_null, NULL},
         .opencl_funcs = {opencl_codelet_null, NULL},

tests/datawizard/increment_redux.c

@@ -119,7 +119,6 @@ static void neutral_cpu_kernel(void *descr[], void *arg)
 
 static struct starpu_codelet redux_cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {redux_cuda_kernel, NULL},
 #endif
@@ -132,7 +131,6 @@ static struct starpu_codelet redux_cl =
 
 static struct starpu_codelet neutral_cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA,
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {neutral_cuda_kernel, NULL},
 #endif
@@ -196,7 +194,6 @@ static void increment_cpu_kernel(void *descr[], void *arg)
 
 static struct starpu_codelet increment_cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {increment_cuda_kernel, NULL},
 #endif

tests/datawizard/increment_redux_lazy.c

@@ -105,7 +105,6 @@ static void neutral_cpu_kernel(void *descr[], void *arg)
 
 static struct starpu_codelet redux_cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {redux_cuda_kernel, NULL},
 #endif
@@ -118,7 +117,6 @@ static struct starpu_codelet redux_cl =
 
 static struct starpu_codelet neutral_cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA,
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {neutral_cuda_kernel, NULL},
 #endif
@@ -176,7 +174,6 @@ static void increment_cpu_kernel(void *descr[], void *arg)
 
 static struct starpu_codelet increment_cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {increment_cuda_kernel, NULL},
 #endif

tests/datawizard/increment_redux_v2.c

@@ -118,7 +118,6 @@ static void neutral_cpu_kernel(void *descr[], void *arg)
 
 static struct starpu_codelet redux_cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {redux_cuda_kernel, NULL},
 #endif
@@ -131,7 +130,6 @@ static struct starpu_codelet redux_cl =
 
 static struct starpu_codelet neutral_cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA,
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {neutral_cuda_kernel, NULL},
 #endif
@@ -195,7 +193,6 @@ static void increment_cpu_kernel(void *descr[], void *arg)
 
 static struct starpu_codelet increment_cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {increment_cuda_kernel, NULL},
 #endif
@@ -209,7 +206,6 @@ static struct starpu_codelet increment_cl =
 
 static struct starpu_codelet increment_cl_redux =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {increment_cuda_kernel, NULL},
 #endif

tests/datawizard/interfaces/multiformat/advanced/generic.c

@@ -54,14 +54,12 @@ void cuda_to_cpu_func(void *buffers[], void *args)
 
 struct starpu_codelet cpu_to_cuda_cl =
 {
-	.where = STARPU_CUDA,
 	.cuda_funcs = {cpu_to_cuda_func, NULL},
 	.nbuffers = 1
 };
 
 struct starpu_codelet cuda_to_cpu_cl =
 {
-	.where = STARPU_CPU,
 	.cpu_funcs = {cuda_to_cpu_func, NULL},
 	.nbuffers = 1
 };
@@ -91,14 +89,12 @@ void opencl_to_cpu_func(void *buffers[], void *args)
 
 struct starpu_codelet cpu_to_opencl_cl =
 {
-	.where = STARPU_OPENCL,
 	.opencl_funcs = {cpu_to_opencl_func, NULL},
 	.nbuffers = 1
 };
 
 struct starpu_codelet opencl_to_cpu_cl =
 {
-	.where = STARPU_CPU,
 	.cpu_funcs = {opencl_to_cpu_func, NULL},
 	.nbuffers = 1
 };

tests/datawizard/interfaces/multiformat/advanced/multiformat_cuda_opencl.c

@@ -46,7 +46,6 @@ test(void)
 
 	static struct starpu_codelet cl_cuda =
 	{
-		.where     = STARPU_CUDA,
 		.cuda_funcs = {cuda_func, NULL},
 		.nbuffers  = 1,
 		.modes = {STARPU_RW}
@@ -61,7 +60,6 @@ test(void)
 
 	static struct starpu_codelet cl_opencl =
 	{
-		.where       = STARPU_OPENCL,
 		.opencl_funcs = {opencl_func, NULL},
 		.nbuffers    = 1,
 		.modes = {STARPU_RW}

tests/datawizard/interfaces/multiformat/advanced/multiformat_worker.c

@@ -35,7 +35,6 @@ static int opencl_worker;
 #if defined(STARPU_USE_CUDA) || defined(STARPU_USE_OPENCL)
 static struct starpu_codelet cl =
 {
-	.where = STARPU_CUDA|STARPU_OPENCL,
 	.modes = { STARPU_RW },
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = { cuda_func, NULL },

tests/datawizard/interfaces/multiformat/multiformat_conversion_codelets.c

@@ -37,14 +37,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 =
 {
-	.where = STARPU_CUDA,
 	.cuda_funcs = {cpu_to_cuda_cuda_func, NULL},
 	.nbuffers = 1
 };
 
 struct starpu_codelet cuda_to_cpu_cl =
 {
-	.where = STARPU_CPU,
 	.cpu_funcs = {cuda_to_cpu, NULL},
 	.nbuffers = 1
 };
@@ -69,14 +67,12 @@ void opencl_to_cpu(void *buffers[], void *arg)
 extern void cpu_to_opencl_opencl_func(void *buffers[], void *args);
 struct starpu_codelet cpu_to_opencl_cl =
 {
-	.where = STARPU_OPENCL,
 	.opencl_funcs = {cpu_to_opencl_opencl_func, NULL},
 	.nbuffers = 1
 };
 
 struct starpu_codelet opencl_to_cpu_cl =
 {
-	.where = STARPU_CPU,
 	.cpu_funcs = {opencl_to_cpu, NULL},
 	.nbuffers = 1
 };

tests/datawizard/manual_reduction.c

@@ -89,7 +89,6 @@ static void cpu_redux_func(void *descr[], void *cl_arg __attribute__((unused)))
 
 static struct starpu_codelet reduction_codelet =
 {
-	.where = STARPU_CPU,
 	.cpu_funcs = {cpu_redux_func, NULL},
 	.cuda_funcs = {NULL},
 	.nbuffers = 2,
@@ -148,7 +147,6 @@ static void opencl_func_incr(void *descr[], void *cl_arg __attribute__((unused))
 
 static struct starpu_codelet use_data_on_worker_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_func_incr, NULL},
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {cuda_func_incr, NULL},

tests/datawizard/partition_lazy.c

@@ -20,14 +20,7 @@
 
 struct starpu_codelet mycodelet =
 {
-        .where = STARPU_CPU
-#ifdef STARPU_USE_CUDA
-		| STARPU_CUDA
-#endif
-#ifdef STARPU_USE_OPENCL
-		| STARPU_OPENCL
-#endif
-		,
+		
 	.cpu_funcs = { scal_func_cpu, NULL },
 #ifdef STARPU_USE_OPENCL
 	.opencl_funcs = { scal_func_opencl, NULL },

tests/datawizard/readers_and_writers.c

@@ -27,7 +27,6 @@ static void dummy_kernel(void *descr[], void *arg)
 
 static struct starpu_codelet r_cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cuda_funcs = {dummy_kernel, NULL},
 	.cpu_funcs = {dummy_kernel, NULL},
 	.opencl_funcs = {dummy_kernel, NULL},
@@ -37,7 +36,6 @@ static struct starpu_codelet r_cl =
 
 static struct starpu_codelet w_cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cuda_funcs = {dummy_kernel, NULL},
 	.cpu_funcs = {dummy_kernel, NULL},
 	.opencl_funcs = {dummy_kernel, NULL},

tests/datawizard/scal.c

@@ -88,14 +88,7 @@ void scal_func_opencl(void *buffers[], void *_args)
 
 struct starpu_codelet scal_codelet =
 {
-        .where = STARPU_CPU
-#ifdef STARPU_USE_CUDA
-		| STARPU_CUDA
-#endif
-#ifdef STARPU_USE_OPENCL
-		| STARPU_OPENCL
-#endif
-		,
+		
 	.cpu_funcs = { scal_func_cpu, NULL },
 #ifdef STARPU_USE_OPENCL
 	.opencl_funcs = { scal_func_opencl, NULL },

tests/datawizard/sync_and_notify_data.c

@@ -106,7 +106,6 @@ int main(int argc, char **argv)
 			/* increment a = v[0] */
 			struct starpu_codelet cl_inc_a =
 			{
-				.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 				.cpu_funcs = {cpu_codelet_incA, NULL},
 #ifdef STARPU_USE_CUDA
 				.cuda_funcs = {cuda_codelet_incA, NULL},
@@ -143,7 +142,6 @@ int main(int argc, char **argv)
 			/* increment c = v[2] */
 			struct starpu_codelet cl_inc_c =
 			{
-				.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 				.cpu_funcs = {cpu_codelet_incC, NULL},
 #ifdef STARPU_USE_CUDA
 				.cuda_funcs = {cuda_codelet_incC, NULL},

tests/datawizard/sync_and_notify_data_implicit.c

@@ -79,7 +79,6 @@ void cpu_codelet_incC(void *descr[], __attribute__ ((unused)) void *_args)
 /* increment a = v[0] */
 static struct starpu_codelet cl_inc_a =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_codelet_incA, NULL},
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {cuda_codelet_incA, NULL},
@@ -94,7 +93,6 @@ static struct starpu_codelet cl_inc_a =
 /* increment c = v[2] */
 struct starpu_codelet cl_inc_c =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_codelet_incC, NULL},
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {cuda_codelet_incC, NULL},

tests/datawizard/sync_with_data_with_mem.c

@@ -41,7 +41,6 @@ static void dummy_codelet(void *descr[], __attribute__ ((unused)) void *_args)
 static struct starpu_codelet cl =
 {
 	.modes = { STARPU_RW },
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_codelet, NULL},
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {dummy_codelet, NULL},

tests/datawizard/sync_with_data_with_mem_non_blocking.c

@@ -42,7 +42,6 @@ static void dummy_codelet(void *descr[], __attribute__ ((unused)) void *_args)
 static struct starpu_codelet cl =
 {
 	.modes = { STARPU_RW },
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_codelet, NULL},
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {dummy_codelet, NULL},

tests/datawizard/sync_with_data_with_mem_non_blocking_implicit.c

@@ -42,7 +42,6 @@ static void dummy_codelet(void *descr[], __attribute__ ((unused)) void *_args)
 static struct starpu_codelet cl =
 {
 	.modes = { STARPU_RW },
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_codelet, NULL},
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {dummy_codelet, NULL},

tests/datawizard/unpartition.c

@@ -41,7 +41,6 @@ static void dummy_codelet(void *descr[], __attribute__ ((unused)) void *_args)
 static struct starpu_codelet cl =
 {
 	.modes = { STARPU_RW },
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_codelet, NULL},
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {dummy_codelet, NULL},

tests/datawizard/write_only_tmp_buffer.c

@@ -79,7 +79,6 @@ static void display_var(void *descr[], __attribute__ ((unused)) void *_args)
 
 static struct starpu_codelet cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_codelet_null, NULL},
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {cuda_codelet_null, NULL},
@@ -93,7 +92,6 @@ static struct starpu_codelet cl =
 
 static struct starpu_codelet display_cl =
 {
-	.where = STARPU_CPU,
 	.cpu_funcs = {display_var, NULL},
 	.nbuffers = 1,
 	.modes = {STARPU_R}

tests/datawizard/wt_broadcast.c

@@ -73,7 +73,6 @@ static void increment_cpu_kernel(void *descr[], void *arg)
 
 static struct starpu_codelet increment_cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {increment_cuda_kernel, NULL},
 #endif

tests/datawizard/wt_host.c

@@ -73,7 +73,6 @@ static void increment_cpu_kernel(void *descr[], void *arg)
 
 static struct starpu_codelet increment_cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 #ifdef STARPU_USE_CUDA
 	.cuda_funcs = {increment_cuda_kernel, NULL},
 #endif

tests/errorcheck/invalid_blocking_calls.c

@@ -44,7 +44,6 @@ static void wrong_func(void *descr[], void *arg)
 static struct starpu_codelet wrong_codelet =
 {
 	.modes = { STARPU_RW },
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {wrong_func, NULL},
 	.cuda_funcs = {wrong_func, NULL},
         .opencl_funcs = {wrong_func, NULL},

tests/helper/starpu_create_sync_task.c

@@ -27,7 +27,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
         .opencl_funcs = {dummy_func, NULL},

tests/main/deprecated_buffer.c

@@ -31,7 +31,6 @@ void cpu_codelet(void *descr[], __attribute__ ((unused)) void *_args)
 struct starpu_codelet cl_with_mode =
 {
 	.name = "with_mode",
-	.where = STARPU_CPU,
 	.cpu_funcs = {cpu_codelet, NULL},
 	.nbuffers = 2,
 	.modes = {STARPU_R, STARPU_W},
@@ -40,7 +39,6 @@ struct starpu_codelet cl_with_mode =
 struct starpu_codelet cl_without_mode =
 {
 	.name = "without_mode",
-	.where = STARPU_CPU,
 	.cpu_funcs = {cpu_codelet, NULL},
 	.nbuffers = 2
 };

tests/main/empty_task_sync_point.c

@@ -36,7 +36,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/empty_task_sync_point_tasks.c

@@ -24,7 +24,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/execute_on_a_specific_worker.c

@@ -64,7 +64,6 @@ static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 
 static struct starpu_codelet cl_r =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {codelet_null, NULL},
 	.cuda_funcs = {codelet_null, NULL},
         .opencl_funcs = {codelet_null, NULL},
@@ -74,7 +73,6 @@ static struct starpu_codelet cl_r =
 
 static struct starpu_codelet cl_w =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {codelet_null, NULL},
 	.cuda_funcs = {codelet_null, NULL},
         .opencl_funcs = {codelet_null, NULL},
@@ -84,7 +82,6 @@ static struct starpu_codelet cl_w =
 
 static struct starpu_codelet cl_rw =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {codelet_null, NULL},
 	.cuda_funcs = {codelet_null, NULL},
         .opencl_funcs = {codelet_null, NULL},

tests/main/insert_task.c

@@ -43,7 +43,6 @@ void func_cpu(void *descr[], void *_args)
 struct starpu_codelet mycodelet =
 {
 	.modes = { STARPU_RW, STARPU_RW },
-	.where = STARPU_CPU,
 	.cpu_funcs = {func_cpu, NULL},
         .nbuffers = 2
 };

tests/main/multithreaded.c

@@ -40,7 +40,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/regenerate.c

@@ -57,7 +57,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet = 
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/starpu_task_bundle.c

@@ -35,7 +35,6 @@ void func_cpu(void *descr[], void *args)
 struct starpu_codelet codelet =
 {
 	.modes = {STARPU_RW},
-	.where = STARPU_CPU,
 	.cpu_funcs = {func_cpu, NULL},
         .nbuffers = 1
 };

tests/main/starpu_task_wait.c

@@ -35,7 +35,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/starpu_task_wait_for_all.c

@@ -34,7 +34,6 @@ static void dummy_func(void *descr[], void *arg)
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/starpu_worker_exists.c

@@ -48,7 +48,6 @@ static void fake(void *buffers[], void *args)
 
 static struct starpu_codelet cl =
 {
-	.where        = STARPU_CPU | STARPU_CUDA | STARPU_OPENCL,
 	.cpu_funcs    = { fake, NULL},
 	.cuda_funcs   = { fake, NULL},
 	.opencl_funcs = { fake, NULL},

tests/main/static_restartable.c

@@ -34,7 +34,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet = 
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/static_restartable_tag.c

@@ -36,7 +36,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet = 
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/static_restartable_using_initializer.c

@@ -37,7 +37,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/subgraph_repeat.c

@@ -56,7 +56,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/subgraph_repeat_regenerate.c

@@ -56,7 +56,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/subgraph_repeat_regenerate_tag.c

@@ -62,7 +62,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/subgraph_repeat_tag.c

@@ -56,7 +56,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/submit.c

@@ -32,7 +32,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet = 
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},
@@ -52,7 +51,6 @@ static void callback(void *arg __attribute__ ((unused)))
 
 static struct starpu_codelet callback_submit_codelet = 
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},
@@ -74,7 +72,6 @@ static void task_submit_func(void *descr[] __attribute__ ((unused)), void *arg _
 
 static struct starpu_codelet task_submit_codelet = 
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {task_submit_func, NULL},
 	.cuda_funcs = {task_submit_func, NULL},
 	.opencl_funcs = {task_submit_func, NULL},

tests/main/tag_wait_api.c

@@ -28,7 +28,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/main/task_wait_api.c

@@ -28,7 +28,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/microbenchs/async_tasks_overhead.c

@@ -36,7 +36,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
         .opencl_funcs = {dummy_func, NULL},

tests/microbenchs/prefetch_data_on_node.c

@@ -49,7 +49,6 @@ static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 
 static struct starpu_codelet cl_r =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {codelet_null, NULL},
 	.cuda_funcs = {codelet_null, NULL},
 	.opencl_funcs = {codelet_null, NULL},
@@ -59,7 +58,6 @@ static struct starpu_codelet cl_r =
 
 static struct starpu_codelet cl_w =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {codelet_null, NULL},
 	.cuda_funcs = {codelet_null, NULL},
 	.opencl_funcs = {codelet_null, NULL},
@@ -69,7 +67,6 @@ static struct starpu_codelet cl_w =
 
 static struct starpu_codelet cl_rw =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {codelet_null, NULL},
 	.cuda_funcs = {codelet_null, NULL},
 	.opencl_funcs = {codelet_null, NULL},

tests/microbenchs/redundant_buffer.c

@@ -43,7 +43,6 @@ static void cpu_codelet_null(void *descr[], __attribute__ ((unused)) void *_args
 
 static struct starpu_codelet cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {cpu_codelet_null, NULL},
 	.cuda_funcs = {cuda_codelet_null, NULL},
 	.opencl_funcs = {opencl_codelet_null, NULL},

tests/microbenchs/sync_tasks_overhead.c

@@ -30,7 +30,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet = 
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
         .opencl_funcs = {dummy_func, NULL},

tests/microbenchs/tasks_overhead.c

@@ -41,7 +41,6 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 
 static struct starpu_codelet dummy_codelet =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
 	.cuda_funcs = {dummy_func, NULL},
 	.opencl_funcs = {dummy_func, NULL},

tests/microbenchs/tasks_size_overhead.c

@@ -72,7 +72,6 @@ static void func(void *descr[] __attribute__ ((unused)), void *arg)
 
 static struct starpu_codelet codelet =
 {
-	.where = STARPU_CPU,
 	.cpu_funcs = {func, NULL},
 	.nbuffers = 0,
 	.modes = {STARPU_R, STARPU_R, STARPU_R, STARPU_R, STARPU_R, STARPU_R, STARPU_R, STARPU_R}

tests/overlap/overlap.c

@@ -69,7 +69,6 @@ static struct starpu_perfmodel model =
 
 static struct starpu_codelet cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {codelet_sleep, NULL},
 	.cuda_funcs = {codelet_sleep, NULL},
         .opencl_funcs = {codelet_sleep, NULL},

tests/parallel_tasks/explicit_combined_worker.c

@@ -40,7 +40,6 @@ static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 
 static struct starpu_codelet cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.type = STARPU_FORKJOIN,
 	.max_parallelism = INT_MAX,
 	.cpu_funcs = {codelet_null, NULL},

tests/parallel_tasks/parallel_kernels.c

@@ -46,7 +46,6 @@ struct starpu_perfmodel model =
 
 static struct starpu_codelet cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.type = STARPU_FORKJOIN,
 	.max_parallelism = INT_MAX,
 	.cpu_funcs = {codelet_null, NULL},

tests/parallel_tasks/parallel_kernels_spmd.c

@@ -48,7 +48,6 @@ struct starpu_perfmodel model =
 
 static struct starpu_codelet cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.type = STARPU_SPMD,
 	.max_parallelism = INT_MAX,
 	.cpu_funcs = {codelet_null, NULL},

tests/parallel_tasks/spmd_peager.c

@@ -46,7 +46,6 @@ static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 
 static struct starpu_codelet cl =
 {
-	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.type = STARPU_SPMD,
 	.max_parallelism = INT_MAX,
 	.cpu_funcs = {codelet_null, NULL},