change file names to avoid confusion with files coming from chameleon/control

runtime/starpu/CMakeLists.txt

@@ -39,11 +39,11 @@ if ( CBLAS_FOUND AND LAPACKE_FOUND AND LAPACK_FOUND AND CUDA_FOUND AND CUDA_CUBL
     endif()
 endif()
 
-# Generate the magma headers for all possible precisions
-# ------------------------------------------------------
+# Generate headers for all possible precisions
+# --------------------------------------------
 set(RUNTIME_HDRS_GENERATED "")
 set(ZHDR
-  include/codelet_z.h
+  include/runtime_codelet_z.h
 )
 
 precisions_rules_py(RUNTIME_HDRS_GENERATED "${ZHDR}"
@@ -53,11 +53,11 @@ precisions_rules_py(RUNTIME_HDRS_GENERATED "${ZHDR}"
 # Define the list of headers
 # --------------------------
 set(RUNTIME_HDRS
-    include/codelet_profile.h
-    include/codelets.h
     include/morse_starpu.h
-    include/profiling.h
-    include/workspace.h
+    include/runtime_codelet_profile.h
+    include/runtime_codelets.h
+    include/runtime_profiling.h
+    include/runtime_workspace.h
     ${RUNTIME_HDRS_GENERATED}
     )
 
@@ -74,8 +74,8 @@ add_custom_target(runtime_starpu_include ALL SOURCES ${RUNTIME_HDRS})
 # -----------------------------------------------------
 set(RUNTIME_COMMON_GENERATED "")
 set(ZSRC
-    control/zprofiling.c
-    control/zlocality.c
+    control/runtime_zprofiling.c
+    control/runtime_zlocality.c
     )
 
 precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}"
@@ -83,13 +83,13 @@ precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}"
                     TARGETDIR "control")
 
 set(RUNTIME_COMMON
-    control/control.c
-    control/context.c
-    control/descriptor.c
-    control/async.c
-    control/options.c
-    control/profiling.c
-    control/workspace.c
+    control/runtime_control.c
+    control/runtime_context.c
+    control/runtime_descriptor.c
+    control/runtime_async.c
+    control/runtime_options.c
+    control/runtime_profiling.c
+    control/runtime_workspace.c
     codelets/codelet_dataflush.c
     ${RUNTIME_COMMON_GENERATED}
     )
@@ -98,7 +98,7 @@ set(flags_to_add "")
 foreach(_prec ${CHAMELEON_PRECISION})
     set(flags_to_add "${flags_to_add} -DPRECISION_${_prec}")
 endforeach()
-set_source_files_properties(control/profiling.c PROPERTIES COMPILE_FLAGS "${flags_to_add}")
+set_source_files_properties(control/runtime_profiling.c PROPERTIES COMPILE_FLAGS "${flags_to_add}")
 
 # Generate the morse sources for all possible precisions
 # ------------------------------------------------------

runtime/starpu/codelets/codelet_zasum.c

@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 #include "runtime_z.h"
 
 void MORSE_TASK_dzasum(MORSE_option_t *options,

runtime/starpu/codelets/codelet_zaxpy.c

@@ -23,7 +23,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zaxpy(MORSE_option_t *options,
                       int M, MORSE_Complex64_t alpha,

runtime/starpu/codelets/codelet_zcallback.c

@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 CHAMELEON_CL_CB(zasum,         starpu_matrix_get_nx(task->handles[0]), starpu_matrix_get_ny(task->handles[0]), 0,                                      M*N);
 CHAMELEON_CL_CB(zaxpy,         starpu_matrix_get_nx(task->handles[0]), starpu_matrix_get_nx(task->handles[1]), 0,                                      M);

runtime/starpu/codelets/codelet_zgeadd.c

@@ -27,7 +27,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zgelqt.c

@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zgemm.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zgeqrt.c

@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zgessm.c

@@ -31,7 +31,7 @@
 #include "coreblas/include/cblas.h"
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zgessq.c

@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zgessq( MORSE_option_t *options,
                         int m, int n,

runtime/starpu/codelets/codelet_zgetrf.c

@@ -28,7 +28,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zgetrf(MORSE_option_t *options,
                        int m, int n, int nb,

runtime/starpu/codelets/codelet_zgetrf_incpiv.c

@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zgetrf_nopiv.c

@@ -26,7 +26,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zhemm.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zher2k.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zherk.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zhessq.c

@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zhessq( MORSE_option_t *options,
                         MORSE_enum uplo, int n,

runtime/starpu/codelets/codelet_zlacpy.c

@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zlag2c.c

@@ -28,7 +28,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zlange.c

@@ -28,7 +28,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zlange(MORSE_option_t *options,
                        MORSE_enum norm, int M, int N, int NB,

runtime/starpu/codelets/codelet_zlanhe.c

@@ -10,7 +10,7 @@
 
 /**
  *
- * @file codelet_zlange.c
+ * @file codelet_zlanhe.c
  *
  *  MORSE codelets kernel
  *  MORSE is a software package provided by Inria Bordeaux - Sud-Ouest, LaBRI,
@@ -27,7 +27,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zlanhe(MORSE_option_t *options,
                        MORSE_enum norm, MORSE_enum uplo, int N, int NB,

runtime/starpu/codelets/codelet_zlansy.c

@@ -28,7 +28,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zlansy(MORSE_option_t *options,
                        MORSE_enum norm, MORSE_enum uplo, int N, int NB,

runtime/starpu/codelets/codelet_zlantr.c

@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zlantr(MORSE_option_t *options,
                        MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag,

runtime/starpu/codelets/codelet_zlaset.c

@@ -29,7 +29,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 
 /**

runtime/starpu/codelets/codelet_zlaset2.c

@@ -29,7 +29,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 
 /**

runtime/starpu/codelets/codelet_zlauum.c

@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zpamm.c

@@ -30,7 +30,7 @@
 #include "coreblas/include/cblas.h"
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zplghe.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zplghe( MORSE_option_t *options,
                         double bump, int m, int n, MORSE_desc_t *A, int Am, int An, int lda,

runtime/starpu/codelets/codelet_zplgsy.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 
 

runtime/starpu/codelets/codelet_zplrnt.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 
 

runtime/starpu/codelets/codelet_zplssq.c

@@ -26,7 +26,7 @@
  **/
 #include <math.h>
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /*****************************************************************************
  *

runtime/starpu/codelets/codelet_zpotrf.c

@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zssssm.c

@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/cblas.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zsymm.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zsyr2k.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zsyrk.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zsyssq.c

@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zsyssq( MORSE_option_t *options,
                         MORSE_enum uplo, int n,

runtime/starpu/codelets/codelet_zsytrf_nopiv.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 
 void MORSE_TASK_zsytrf_nopiv(MORSE_option_t *options,

runtime/starpu/codelets/codelet_ztile_zero.c

@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /*****************************************************************************
  *

runtime/starpu/codelets/codelet_ztrasm.c

@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_ztrasm(MORSE_option_t *options,
                        MORSE_enum storev, MORSE_enum uplo, MORSE_enum diag, int M, int N,

runtime/starpu/codelets/codelet_ztrmm.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_ztrsm.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_ztrssq.c

@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_ztrssq( MORSE_option_t *options,
                         MORSE_enum uplo, MORSE_enum diag,

runtime/starpu/codelets/codelet_ztrtri.c

@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_ztslqt.c

@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 #undef REAL
 #define COMPLEX
 

runtime/starpu/codelets/codelet_ztsmlq.c

@@ -31,7 +31,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_ztsmqr.c

@@ -31,7 +31,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_ztsqrt.c

@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 #undef REAL
 #define COMPLEX
 

runtime/starpu/codelets/codelet_ztstrf.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 #include "coreblas/include/cblas.h"
 #include <math.h>
 

runtime/starpu/codelets/codelet_zttlqt.c

@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zttmlq.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zttmqr.c

@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zttqrt.c

@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zunmlq.c

@@ -31,7 +31,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/codelets/codelet_zunmqr.c

@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *

runtime/starpu/control/async.c → runtime/starpu/control/runtime_async.c

@@ -10,7 +10,7 @@
 
 /**
  *
- * @file async.c
+ * @file runtime_async.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,

runtime/starpu/control/context.c → runtime/starpu/control/runtime_context.c

@@ -10,7 +10,7 @@
 
 /**
  *
- * @file context.c
+ * @file runtime_context.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,

runtime/starpu/control/control.c → runtime/starpu/control/runtime_control.c

@@ -10,7 +10,7 @@
 
 /**
  *
- * @file control.c
+ * @file runtime_control.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,
@@ -39,12 +39,12 @@ int RUNTIME_rank(MORSE_context_t *morse)
 /*******************************************************************************
  *
  **/
-int RUNTIME_init_scheduler( MORSE_context_t *morse, int nworkers, int ncudas, int nthreads_per_worker)
+int RUNTIME_init_scheduler( MORSE_context_t *morse, int ncpus, int ncudas, int nthreads_per_worker)
 {
     starpu_conf_t *conf = (starpu_conf_t*)(morse->schedopt);
     int hres = -1;
 
-    conf->ncpus = nworkers;
+    conf->ncpus = ncpus;
     conf->ncuda = ncudas;
     conf->nopencl = 0;
 
@@ -70,7 +70,7 @@ int RUNTIME_init_scheduler( MORSE_context_t *morse, int nworkers, int ncudas, in
         conf->sched_policy_name = "ws";
 #endif
 
-    if ((nworkers == -1)||(nthreads_per_worker == -1))
+    if ((ncpus == -1)||(nthreads_per_worker == -1))
     {
         morse->parallel_enabled = MORSE_FALSE;
 
@@ -81,17 +81,17 @@ int RUNTIME_init_scheduler( MORSE_context_t *morse, int nworkers, int ncudas, in
 
         morse->parallel_enabled = MORSE_TRUE;
 
-        for (worker = 0; worker < nworkers; worker++)
+        for (worker = 0; worker < ncpus; worker++)
             conf->workers_bindid[worker] = (worker+1)*nthreads_per_worker - 1;
 
-        for (worker = 0; worker < nworkers; worker++)
+        for (worker = 0; worker < ncpus; worker++)
             conf->workers_bindid[worker + ncudas] = worker*nthreads_per_worker;
 
         conf->use_explicit_workers_bindid = 1;
 
         hres = starpu_init( conf );
 
-        morse->nworkers = nworkers;
+        morse->nworkers = ncpus;
         morse->nthreads_per_worker = nthreads_per_worker;
     }
 

runtime/starpu/control/descriptor.c → runtime/starpu/control/runtime_descriptor.c

@@ -10,7 +10,7 @@