Просмотр исходного кода

Revert to minimum estimated termination time by default, since that is indeed the availability time for a new task

Samuel Thibault лет назад: 8
Родитель
Сommit
f577b0820d

+ 1 - 1
src/sched_policies/component_fifo.c

@@ -47,7 +47,7 @@ static double fifo_estimated_end(struct starpu_sched_component * component)
 	starpu_pthread_mutex_t * mutex = &data->mutex;
 	int card = starpu_bitmap_cardinal(component->workers_in_ctx);
 	STARPU_ASSERT(card != 0);
-	double estimated_end = starpu_sched_component_estimated_end_average(component);
+	double estimated_end = starpu_sched_component_estimated_end_min(component);
 	STARPU_PTHREAD_MUTEX_LOCK(mutex);
 	fifo->exp_start = STARPU_MAX(fifo->exp_start, starpu_timing_now());
 	estimated_end += fifo->exp_start + fifo->exp_len / card;

+ 1 - 1
src/sched_policies/component_prio.c

@@ -65,7 +65,7 @@ static double prio_estimated_end(struct starpu_sched_component * component)
 	starpu_pthread_mutex_t * mutex = &data->mutex;
 	int card = starpu_bitmap_cardinal(component->workers_in_ctx);
 	STARPU_ASSERT(card != 0);
-	double estimated_end = starpu_sched_component_estimated_end_average(component);
+	double estimated_end = starpu_sched_component_estimated_end_min(component);
 	STARPU_PTHREAD_MUTEX_LOCK(mutex);
 	prio->exp_start = STARPU_MAX(prio->exp_start, starpu_timing_now());
 	estimated_end += prio->exp_start + prio->exp_len / card;

+ 1 - 1
src/sched_policies/component_sched.c

@@ -613,7 +613,7 @@ struct starpu_sched_component * starpu_sched_component_create(struct starpu_sche
 	component->can_push = starpu_sched_component_can_push;
 	component->can_pull = starpu_sched_component_can_pull;
 	component->estimated_load = starpu_sched_component_estimated_load;
-	component->estimated_end = starpu_sched_component_estimated_end_average;
+	component->estimated_end = starpu_sched_component_estimated_end_min;
 	component->deinit_data = take_component_and_does_nothing;
 	component->notify_change_workers = take_component_and_does_nothing;
 	component->name = strdup(name);