merge

include/starpu_task.h

@@ -237,8 +237,8 @@ struct starpu_task
 	.magic = 42,                  			\
 	.sched_ctx = 0,					\
 	.control_task = 0,				\
-	.hypervisor_tag = 0,			\
-	.flops = 0.0			\
+		.hypervisor_tag = 0,			\
+		.flops = 0.0				\
 };
 
 /*

src/sched_policies/heft.c

@@ -360,9 +360,9 @@ static void compute_all_performance_predictions(struct starpu_task *task,
 			if (bundle)
 			{
 				/* TODO : conversion time */
-				local_task_length[worker_ctx][nimpl] = _starpu_task_bundle_expected_length(bundle, perf_arch, nimpl);
-				local_data_penalty[worker_ctx][nimpl] = _starpu_task_bundle_expected_data_transfer_time(bundle, memory_node);
-				local_power[worker_ctx][nimpl] = _starpu_task_bundle_expected_power(bundle, perf_arch, nimpl);
+				local_task_length[worker_ctx][nimpl] = starpu_task_bundle_expected_length(bundle, perf_arch, nimpl);
+				local_data_penalty[worker_ctx][nimpl] = starpu_task_bundle_expected_data_transfer_time(bundle, memory_node);
+				local_power[worker_ctx][nimpl] = starpu_task_bundle_expected_power(bundle, perf_arch, nimpl);
 				//_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);
 			}
 			else