merge fix

src/sched_policies/heft.c

@@ -321,24 +321,6 @@ static void compute_all_performance_predictions(struct starpu_task *task,
 		worker = workers->get_next(workers);
 		if(starpu_is_ctxs_turn(worker, sched_ctx_id) || sched_ctx_id == 0)
 		{
-<<<<<<< .working
-=======
-			if (!starpu_worker_can_execute_task(worker, task, nimpl))
-			{
-				/* no one on that queue may execute this task */
-				continue;
-			}
-
-			/* Sometimes workers didn't take the tasks as early as we expected */
-			_STARPU_PTHREAD_MUTEX_LOCK(&sched_mutex[worker]);
-			exp_start[worker] = STARPU_MAX(exp_start[worker], starpu_timing_now());
-			exp_end[worker][nimpl] = exp_start[worker] + exp_len[worker];
-			if (exp_end[worker][nimpl] > max_exp_end)
-				max_exp_end = exp_end[worker][nimpl];
-			_STARPU_PTHREAD_MUTEX_UNLOCK(&sched_mutex[worker]);
->>>>>>> .merge-right.r7640
-
-<<<<<<< .working
 			for (nimpl = 0; nimpl <STARPU_MAXIMPLEMENTATIONS; nimpl++) 
 			{
 				if (!starpu_worker_can_execute_task(worker, task, nimpl))
@@ -379,8 +361,6 @@ static void compute_all_performance_predictions(struct starpu_task *task,
 					if (conversion_time > 0.0)
 						local_task_length[worker_ctx][nimpl] += conversion_time;
 
-=======
->>>>>>> .merge-right.r7640
 					//_STARPU_DEBUG("Scheduler heft bundle: task length (%lf) local power (%lf) worker (%u) kernel (%u) \n", local_task_length[worker_ctx],local_power[worker_ctx],worker,nimpl);
 				}
 				double ntasks_end = ntasks[worker] / starpu_worker_get_relative_speedup(perf_arch);
@@ -662,18 +642,14 @@ static int heft_push_task(struct starpu_task *task)
 	return ret_val;
 }
 
-<<<<<<< .working
 static void heft_deinit(unsigned sched_ctx_id) 
-=======
-struct starpu_sched_policy _starpu_sched_heft_policy =
->>>>>>> .merge-right.r7640
 {
 	heft_data *ht = (heft_data*)starpu_get_sched_ctx_policy_data(sched_ctx_id);
 	free(ht);
 	starpu_delete_worker_collection_for_sched_ctx(sched_ctx_id);
 }
 
-struct starpu_sched_policy heft_policy = 
+struct starpu_sched_policy _starpu_sched_heft_policy =
 {
 	.init_sched = heft_init,
 	.deinit_sched = heft_deinit,