浏览代码

include: minor fixes

Nathalie Furmento 13 年之前
父节点
当前提交
4f8508ef4b
共有 3 个文件被更改,包括 6 次插入6 次删除
  1. 1 1
      include/starpu_data_filters.h
  2. 2 2
      include/starpu_scheduler.h
  3. 3 3
      include/starpu_task.h

+ 1 - 1
include/starpu_data_filters.h

@@ -32,10 +32,10 @@ struct starpu_data_interface_ops;
 struct starpu_data_filter
 {
 	void (*filter_func)(void *father_interface, void *child_interface, struct starpu_data_filter *, unsigned id, unsigned nparts);
+        unsigned nchildren;
         unsigned (*get_nchildren)(struct starpu_data_filter *, starpu_data_handle_t initial_handle);
         struct starpu_data_interface_ops *(*get_child_ops)(struct starpu_data_filter *, unsigned id);
         unsigned filter_arg;
-        unsigned nchildren;
         void *filter_arg_ptr;
 };
 

+ 2 - 2
include/starpu_scheduler.h

@@ -98,10 +98,10 @@ struct starpu_sched_policy
 	  * when this method is called. */
 	struct starpu_task *(*pop_every_task)(void);
 
-	/* This method is called every time a task is starting. (optionnal) */
+	/* This method is called every time a task is starting. (optional) */
 	void (*pre_exec_hook)(struct starpu_task *);
 
-	/* This method is called every time a task has been executed. (optionnal) */
+	/* This method is called every time a task has been executed. (optional) */
 	void (*post_exec_hook)(struct starpu_task *);
 
 	/* Name of the policy (optionnal) */

+ 3 - 3
include/starpu_task.h

@@ -86,9 +86,9 @@ struct starpu_codelet
 	int max_parallelism;
 
 	/* the different implementations of the codelet */
-	void (*cuda_func)(void **, void *) STARPU_DEPRECATED;
-	void (*cpu_func)(void **, void *) STARPU_DEPRECATED;
-	void (*opencl_func)(void **, void *) STARPU_DEPRECATED;
+	starpu_cuda_func_t cuda_func STARPU_DEPRECATED;
+	starpu_cpu_func_t cpu_func STARPU_DEPRECATED;
+	starpu_opencl_func_t opencl_func STARPU_DEPRECATED;
 	uint8_t gordon_func STARPU_DEPRECATED;
 
 	starpu_cpu_func_t cpu_funcs[STARPU_MAXIMPLEMENTATIONS];