Kaynağa Gözat

rename struct starpu_sched_specs into struct starpu_sched_component_specs

Nathalie Furmento 10 yıl önce
ebeveyn
işleme
28e4f109a7

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

@@ -377,7 +377,7 @@ todo
 	 create a component that behave as all component of recipe where linked. Except that you cant use starpu_sched_component_is_foo function
 	 if recipe contain a single create_foo arg_foo pair, create_foo(arg_foo) is returned instead of a composed component
 
-\struct starpu_sched_specs
+\struct starpu_sched_component_specs
 \ingroup API_Modularized_Scheduler
 	 Define how build a scheduler according to topology. Each level (except for hwloc_machine_composed_sched_component) can be NULL, then
 	 the level is just skipped. Bugs everywhere, do not rely on.
@@ -399,7 +399,7 @@ todo
      If this flag is not set, a new fifo will be built for each of them (if they have the same starpu_perf_arch and the same
      numa component it will be shared
 
-\fn struct starpu_sched_tree *starpu_sched_component_make_scheduler(unsigned sched_ctx_id, struct starpu_sched_specs s)
+\fn struct starpu_sched_tree *starpu_sched_component_make_scheduler(unsigned sched_ctx_id, struct starpu_sched_component_specs s)
 \ingroup API_Modularized_Scheduler
 	 this function build a scheduler for \p sched_ctx_id according to \p s and the hwloc topology of the machine.
 

+ 2 - 2
include/starpu_sched_component.h

@@ -172,7 +172,7 @@ struct starpu_sched_component *starpu_sched_component_composed_component_create(
 
 #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
+struct starpu_sched_component_specs
 {
 	/* hw_loc_machine_composed_sched_component must be set as its the root of the topology */
 	struct starpu_sched_component_composed_recipe *hwloc_machine_composed_sched_component;
@@ -191,7 +191,7 @@ struct starpu_sched_specs
 	int mix_heterogeneous_workers;
 };
 
-struct starpu_sched_tree *starpu_sched_component_make_scheduler(unsigned sched_ctx_id, struct starpu_sched_specs s);
+struct starpu_sched_tree *starpu_sched_component_make_scheduler(unsigned sched_ctx_id, struct starpu_sched_component_specs s);
 #endif /* STARPU_HAVE_HWLOC */
 
 #ifdef __cplusplus

+ 1 - 1
src/sched_policies/hierarchical_heft.c

@@ -16,7 +16,7 @@ static void initialize_heft_center_policy(unsigned sched_ctx_id)
 {
 	starpu_sched_ctx_create_worker_collection(sched_ctx_id, STARPU_WORKER_LIST);
 
-	struct starpu_sched_specs specs;
+	struct starpu_sched_component_specs specs;
 	memset(&specs,0,sizeof(specs));
 
 	struct starpu_heft_data heft_data =

+ 4 - 4
src/sched_policies/scheduler_maker.c

@@ -53,7 +53,7 @@ static void add_component(struct sched_component_list *list, struct starpu_sched
 	list->size++;
 }
 /* this is the function that actualy built the scheduler, but without workers */
-static struct sched_component_list helper_make_scheduler(struct starpu_sched_tree *tree, hwloc_obj_t obj, struct starpu_sched_specs specs, unsigned sched_ctx_id)
+static struct sched_component_list helper_make_scheduler(struct starpu_sched_tree *tree, hwloc_obj_t obj, struct starpu_sched_component_specs specs, unsigned sched_ctx_id)
 {
 	STARPU_ASSERT(obj);
 
@@ -155,7 +155,7 @@ static struct starpu_sched_component * find_mem_component(struct starpu_sched_co
 	return component;
 }
 
-static struct starpu_sched_component * where_should_we_plug_this(struct starpu_sched_component *root, struct starpu_sched_component * worker_component, struct starpu_sched_specs specs, unsigned sched_ctx_id)
+static struct starpu_sched_component * where_should_we_plug_this(struct starpu_sched_component *root, struct starpu_sched_component * worker_component, struct starpu_sched_component_specs specs, unsigned sched_ctx_id)
 {
 	struct starpu_sched_component * mem = find_mem_component(root ,worker_component);
 	if(specs.mix_heterogeneous_workers || mem->parents[sched_ctx_id] == NULL)
@@ -181,7 +181,7 @@ static struct starpu_sched_component * where_should_we_plug_this(struct starpu_s
 }
 
 static void set_worker_leaf(struct starpu_sched_component * root, struct starpu_sched_component * worker_component, unsigned sched_ctx_id,
-			    struct starpu_sched_specs specs)
+			    struct starpu_sched_component_specs specs)
 {
 	struct _starpu_worker * worker = worker_component->data;
 	struct starpu_sched_component * component = where_should_we_plug_this(root,worker_component,specs, sched_ctx_id);
@@ -241,7 +241,7 @@ static void helper_display_scheduler(FILE* out, unsigned depth, struct starpu_sc
 		helper_display_scheduler(out, depth + 1, component->children[i]);
 }
 #endif //STARPU_DEVEL
-struct starpu_sched_tree * starpu_sched_component_make_scheduler(unsigned sched_ctx_id, struct starpu_sched_specs specs)
+struct starpu_sched_tree * starpu_sched_component_make_scheduler(unsigned sched_ctx_id, struct starpu_sched_component_specs specs)
 {
 	struct starpu_sched_tree * tree = starpu_sched_tree_create(sched_ctx_id);