Kaynağa Gözat

rename starpu_sched_recipe_add_component into starpu_sched_component_recipe_add

Nathalie Furmento 10 yıl önce
ebeveyn
işleme
08c4f7f391

+ 1 - 1
doc/doxygen/chapters/api/modularized_scheduler.doxy

@@ -364,7 +364,7 @@ todo
 \ingroup API_Modularized_Scheduler
 	 return a recipe to build a composed component with a \p create_component
 
-\fn void starpu_sched_recipe_add_component(struct starpu_sched_component_composed_recipe *recipe, struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void *arg), void *arg)
+\fn void starpu_sched_component_recipe_add(struct starpu_sched_component_composed_recipe *recipe, struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void *arg), void *arg)
 \ingroup API_Modularized_Scheduler
 	 add \p create_component under all previous components in recipe
 

+ 1 - 2
include/starpu_sched_component.h

@@ -166,11 +166,10 @@ int starpu_sched_component_is_perfmodel_select(struct starpu_sched_component *co
 struct starpu_sched_component_composed_recipe;
 struct starpu_sched_component_composed_recipe *starpu_sched_component_create_recipe(void);
 struct starpu_sched_component_composed_recipe *starpu_sched_component_create_recipe_singleton(struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void *arg), void *arg);
-void starpu_sched_recipe_add_component(struct starpu_sched_component_composed_recipe *recipe, struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void *arg), void *arg);
+void starpu_sched_component_recipe_add(struct starpu_sched_component_composed_recipe *recipe, struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void *arg), void *arg);
 void starpu_destroy_composed_sched_component_recipe(struct starpu_sched_component_composed_recipe *);
 struct starpu_sched_component *starpu_sched_component_composed_component_create(struct starpu_sched_tree *tree, struct starpu_sched_component_composed_recipe *recipe);
 
-
 #ifdef STARPU_HAVE_HWLOC
 /* null pointer mean to ignore a level L of hierarchy, then components of levels > L become children of level L - 1 */
 struct starpu_sched_specs

+ 4 - 4
src/sched_policies/component_composed.c

@@ -41,9 +41,9 @@ struct starpu_sched_component_composed_recipe * starpu_sched_component_create_re
 	return recipe;
 }
 
-void starpu_sched_recipe_add_component(struct starpu_sched_component_composed_recipe * recipe,
-				  struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void * arg),
-				  void * arg)
+void starpu_sched_component_recipe_add(struct starpu_sched_component_composed_recipe * recipe,
+				       struct starpu_sched_component *(*create_component)(struct starpu_sched_tree *tree, void * arg),
+				       void * arg)
 {
 	struct fun_create_component * e = fun_create_component_new();
 	e->create_component = create_component;
@@ -54,7 +54,7 @@ struct starpu_sched_component_composed_recipe * starpu_sched_component_create_re
 										      void * arg)
 {
 	struct starpu_sched_component_composed_recipe * r = starpu_sched_component_create_recipe();
-	starpu_sched_recipe_add_component(r, create_component, arg);
+	starpu_sched_component_recipe_add(r, create_component, arg);
 	return r;
 }
 void starpu_destroy_composed_sched_component_recipe(struct starpu_sched_component_composed_recipe * recipe)

+ 5 - 5
src/sched_policies/hierarchical_heft.c

@@ -4,8 +4,8 @@
 static struct  starpu_sched_component_composed_recipe *  recipe_for_worker(enum starpu_worker_archtype a STARPU_ATTRIBUTE_UNUSED)
 {
 	struct starpu_sched_component_composed_recipe * r = starpu_sched_component_create_recipe();
-	starpu_sched_recipe_add_component(r, starpu_sched_component_best_implementation_create, NULL);
-	starpu_sched_recipe_add_component(r, starpu_sched_component_fifo_create, NULL);
+	starpu_sched_component_recipe_add(r, starpu_sched_component_best_implementation_create, NULL);
+	starpu_sched_component_recipe_add(r, starpu_sched_component_fifo_create, NULL);
 	return r;
 }
 
@@ -31,12 +31,12 @@ static void initialize_heft_center_policy(unsigned sched_ctx_id)
 		.arg_calibrating_component = NULL,
 	};
 	struct starpu_sched_component_composed_recipe * r = starpu_sched_component_create_recipe();
-	starpu_sched_recipe_add_component(r,(struct starpu_sched_component * (*)(void*))starpu_sched_component_heft_create,&heft_data);
+	starpu_sched_component_recipe_add(r,(struct starpu_sched_component * (*)(void*))starpu_sched_component_heft_create,&heft_data);
 	specs.hwloc_machine_composed_sched_component = r;
 
 	r = starpu_sched_component_create_recipe();
-	starpu_sched_recipe_add_component(r, starpu_sched_component_best_implementation_create, NULL);
-	starpu_sched_recipe_add_component(r, starpu_sched_component_fifo_create ,NULL);
+	starpu_sched_component_recipe_add(r, starpu_sched_component_best_implementation_create, NULL);
+	starpu_sched_component_recipe_add(r, starpu_sched_component_fifo_create ,NULL);
 
 	specs.hwloc_component_composed_sched_component = r;
 	specs.worker_composed_sched_component = recipe_for_worker;