Преглед на файлове

function rename + fix build without QT

Simon Archipoff преди 12 години
родител
ревизия
2d5cb26f9e

+ 1 - 1
src/sched_policies/hierarchical_heft.c

@@ -172,7 +172,7 @@ static void initialize_heft_center_policy(unsigned sched_ctx_id)
 
 	}
 	_starpu_set_workers_bitmaps();
-	_starpu_call_init_data(data);
+	_starpu_tree_call_init_data(data);
 	starpu_sched_ctx_set_policy_data(sched_ctx_id, (void*)data);
 
 

+ 1 - 1
src/sched_policies/node_eager.c

@@ -22,7 +22,7 @@ static void initialize_eager_center_policy(unsigned sched_ctx_id)
 		_starpu_sched_node_add_child(data->root, node);
 	}
 	_starpu_set_workers_bitmaps();
-	_starpu_call_init_data(data);
+	_starpu_tree_call_init_data(data);
 	starpu_sched_ctx_set_policy_data(sched_ctx_id, (void*)data);
 }
 

+ 2 - 2
src/sched_policies/node_heft.c

@@ -147,10 +147,11 @@ static void update_helper_node(struct _starpu_sched_node * heft_node)
 #define _STARPU_SCHED_ALPHA_DEFAULT 1.0
 #define _STARPU_SCHED_BETA_DEFAULT 1.0
 #define _STARPU_SCHED_GAMMA_DEFAULT 1000.0
-#ifdef STARPU_USE_TOP
 static double alpha = _STARPU_SCHED_ALPHA_DEFAULT;
 static double beta = _STARPU_SCHED_BETA_DEFAULT;
 static double _gamma = _STARPU_SCHED_GAMMA_DEFAULT;
+
+#ifdef STARPU_USE_TOP
 static const float alpha_minimum=0;
 static const float alpha_maximum=10.0;
 static const float beta_minimum=0;
@@ -245,7 +246,6 @@ void _starpu_sched_node_heft_set_no_model_node(struct _starpu_sched_node * heft_
 	no_model_node->childs = malloc(heft_node->nchilds * sizeof(struct _starpu_sched_node *));
 	memcpy(no_model_node->childs, heft_node->childs, heft_node->nchilds * sizeof(struct _strapu_sched_node *));
 
-	heft_node->childs;
 	no_model_node->nchilds = heft_node->nchilds;
 	no_model_node->init_data(no_model_node);
 	data->no_model_node = no_model_node;

+ 1 - 1
src/sched_policies/node_random.c

@@ -107,7 +107,7 @@ static void initialize_random_center_policy(unsigned sched_ctx_id)
 		_starpu_sched_node_add_child(data->root, node);
 	}
 	_starpu_set_workers_bitmaps();
-	_starpu_call_init_data(data);
+	_starpu_tree_call_init_data(data);
 	starpu_sched_ctx_set_policy_data(sched_ctx_id, (void*)data);
 }
 static void deinitialize_random_center_policy(unsigned sched_ctx_id)

+ 1 - 1
src/sched_policies/node_sched.c

@@ -419,7 +419,7 @@ static void helper_starpu_call_init_data(struct _starpu_sched_node *node)
 		node->init_data(node);
 }
 
-void _starpu_call_init_data(struct _starpu_sched_tree * t)
+void _starpu_tree_call_init_data(struct _starpu_sched_tree * t)
 {
 	helper_starpu_call_init_data(t->root);
 }

+ 1 - 6
src/sched_policies/node_sched.h

@@ -20,10 +20,8 @@ struct _starpu_sched_node
 	int nchilds;
 	struct _starpu_sched_node ** childs;
 
-
 	//the set of workers in the node's subtree
 	struct _starpu_bitmap * workers;
-
 	//is_homogeneous is 0 iff workers in the node's subtree are heterogeneous,
 	//this field is set and updated automaticaly, you shouldn't write on it
 	int is_homogeneous;
@@ -33,7 +31,6 @@ struct _starpu_sched_node
 	 * so we need several fathers
 	 */
 	struct _starpu_sched_node * fathers[STARPU_NMAX_SCHED_CTXS];
-
 	
 	/* this function is called after all childs has been set
 	 */
@@ -41,7 +38,6 @@ struct _starpu_sched_node
 	/* this function is called to free data allocated by init_data 
 	 */
 	void (*deinit_data)(struct _starpu_sched_node *);
-
 };
 
 struct _starpu_task_execute_preds
@@ -152,8 +148,7 @@ struct _starpu_bitmap * _starpu_get_worker_mask(struct starpu_task * task);
 void _starpu_set_workers_bitmaps(void);
 /* this function call init data on all nodes in postfix order
  */
-void _starpu_call_init_data(struct _starpu_sched_tree * t);
-
+void _starpu_tree_call_init_data(struct _starpu_sched_tree * t);
 
 /* push task of list lower as possible in the tree, a non null value is returned if some task couldn't be pushed
  */

+ 1 - 1
src/sched_policies/node_work_stealing.c

@@ -262,7 +262,7 @@ static void initialize_ws_center_policy(unsigned sched_ctx_id)
 		_starpu_sched_node_add_child(ws, node);
 	}
 	_starpu_set_workers_bitmaps();
-	_starpu_call_init_data(data);
+	_starpu_tree_call_init_data(data);
 	starpu_sched_ctx_set_policy_data(sched_ctx_id, (void*)data);
 }