From f4bf8f17713720121a0f7496cad08689d6caca1c Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Mon, 11 May 2015 12:23:46 +0000
Subject: [PATCH] move init of starpu parameters in a single place
(RUNTIME_init_scheduler) and use dmdas default scheduling strategy
---
runtime/starpu/control/context.c | 9 ---------
runtime/starpu/control/control.c | 9 +++++++++
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/runtime/starpu/control/context.c b/runtime/starpu/control/context.c
index bb8b2d38a..0e25a6cdb 100644
--- a/runtime/starpu/control/context.c
+++ b/runtime/starpu/control/context.c
@@ -38,15 +38,6 @@ void RUNTIME_context_create( MORSE_context_t *morse )
conf = morse->schedopt;
starpu_conf_init( conf );
- conf->nopencl = 0;
-
- /* By default, use the dmda strategy */
- if (!getenv("STARPU_SCHED"))
- conf->sched_policy_name = "dmda";
-
- /* By default, enable calibration */
- if (!getenv("STARPU_CALIBRATE"))
- conf->calibrate = 1;
return;
}
diff --git a/runtime/starpu/control/control.c b/runtime/starpu/control/control.c
index 21a319652..330817db4 100644
--- a/runtime/starpu/control/control.c
+++ b/runtime/starpu/control/control.c
@@ -46,6 +46,15 @@ int RUNTIME_init_scheduler( MORSE_context_t *morse, int nworkers, int ncudas, in
conf->ncpus = nworkers;
conf->ncuda = ncudas;
+ conf->nopencl = 0;
+
+ /* By default, use the dmdas strategy */
+ if (!getenv("STARPU_SCHED"))
+ conf->sched_policy_name = "dmdas";
+
+ /* By default, enable calibration */
+ if (!getenv("STARPU_CALIBRATE"))
+ conf->calibrate = 1;
/* Set scheduling to "ws" if no cuda devices used because it behaves better
* on homognenous architecture. If the user wants to use another
--
GitLab