From 0d99fdd73d68e8ef7d5aab2a5998365dfee46cc1 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed, 29 Mar 2017 18:35:38 +0200
Subject: [PATCH] Do not enable calibration by default, so people get to see
 the warnings about codelets still not being calibrated

---
 cmake_modules/morse_cmake                | 2 +-
 runtime/starpu/control/runtime_control.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/cmake_modules/morse_cmake b/cmake_modules/morse_cmake
index 8b867b974..32c1ba6ae 160000
--- a/cmake_modules/morse_cmake
+++ b/cmake_modules/morse_cmake
@@ -1 +1 @@
-Subproject commit 8b867b974fe1f03ff1afa2d3502a41add10d31a9
+Subproject commit 32c1ba6ae5d7e19d570ac3bd86a24acb82f2081e
diff --git a/runtime/starpu/control/runtime_control.c b/runtime/starpu/control/runtime_control.c
index 838d6ad84..9ff2f7e9f 100644
--- a/runtime/starpu/control/runtime_control.c
+++ b/runtime/starpu/control/runtime_control.c
@@ -62,12 +62,6 @@ int RUNTIME_init_scheduler( MORSE_context_t *morse, int ncpus, int ncudas, int n
     conf->ncuda = ncudas;
     conf->nopencl = 0;
 
-#if !defined(CHAMELEON_SIMULATION)
-    /* By default, enable calibration */
-    if (!getenv("STARPU_CALIBRATE"))
-        conf->calibrate = 1;
-#endif
-
     /* By default, use the dmdas strategy */
     if (!getenv("STARPU_SCHED")) {
         if (conf->ncuda > 0) {
-- 
GitLab