More MIC fixes

examples/binary/binary.c

@@ -107,6 +107,8 @@ int main(int argc, char **argv)
 	starpu_conf_init(&conf);
 	conf.ncpus = 0;
 	conf.ncuda = 0;
+	conf.nmic = 0;
+	conf.nscc = 0;
 
         ret = starpu_init(&conf);
 	if (STARPU_UNLIKELY(ret == -ENODEV))

examples/matvecmult/matvecmult.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010, 2011-2012, 2014  Université de Bordeaux
+ * Copyright (C) 2010, 2011-2012, 2014-2015  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2014  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -142,6 +142,8 @@ int main(int argc, char **argv)
 	starpu_conf_init(&conf);
 	conf.ncpus = 0;
 	conf.ncuda = 0;
+	conf.nmic = 0;
+	conf.nscc = 0;
 	conf.nopencl = 1;
 
         /* int width=1100; */

examples/sched_ctx/dummy_sched_with_ctx.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010-2014  Université de Bordeaux
+ * Copyright (C) 2010-2015  Université de Bordeaux
  * Copyright (C) 2010-2013  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -128,13 +128,14 @@ static struct starpu_sched_policy dummy_sched_policy =
 	.policy_description = "dummy scheduling strategy"
 };
 
-static void dummy_func(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg STARPU_ATTRIBUTE_UNUSED)
+void dummy_func(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 }
 
 static struct starpu_codelet dummy_codelet =
 {
 	.cpu_funcs = {dummy_func},
+	.cpu_funcs_name = {"dummy_func"},
 	.cuda_funcs = {dummy_func},
         .opencl_funcs = {dummy_func},
 	.model = NULL,

examples/scheduler/dummy_sched.c

@@ -134,13 +134,14 @@ static struct starpu_sched_policy dummy_sched_policy =
 	.policy_description = "dummy scheduling strategy"
 };
 
-static void dummy_func(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg STARPU_ATTRIBUTE_UNUSED)
+void dummy_func(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 }
 
 static struct starpu_codelet dummy_codelet =
 {
 	.cpu_funcs = {dummy_func},
+	.cpu_funcs_name = {"dummy_func"},
 	.cuda_funcs = {dummy_func},
         .opencl_funcs = {dummy_func},
 	.model = NULL,

tests/datawizard/variable_parameters.c

@@ -93,7 +93,9 @@ static struct starpu_codelet increment_cl =
 	.opencl_funcs = {increment_opencl_kernel},
 #endif
 	.cpu_funcs = {increment_cpu_kernel},
-	.cpu_funcs_name = {"increment_cpu_kernel"},
+
+	/* starpu_task_get_current() doesn't work on MIC */
+	/*.cpu_funcs_name = {"increment_cpu_kernel"},*/
 	.nbuffers = STARPU_VARIABLE_NBUFFERS,
 };