Replace redefinitioon of starpu function by an internal one to avoid conflict

runtime/starpu/codelets/codelet_dlag2z.c

@@ -62,8 +62,8 @@ void INSERT_TASK_dlag2z( const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_W(B, Bm, Bn);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &uplo,              sizeof(uplo),
         STARPU_VALUE,    &m,                 sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),

runtime/starpu/codelets/codelet_dzasum.c

@@ -61,8 +61,8 @@ void INSERT_TASK_dzasum( const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(B, Bm, Bn);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &storev,              sizeof(cham_store_t),
         STARPU_VALUE,    &uplo,                sizeof(cham_uplo_t),
         STARPU_VALUE,    &M,                   sizeof(int),

runtime/starpu/codelets/codelet_map.c

@@ -55,8 +55,8 @@ void INSERT_TASK_map( const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(A, Am, An);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &A,                      sizeof(CHAM_desc_t*),
         STARPU_VALUE,    &uplo,                   sizeof(cham_uplo_t),
         STARPU_VALUE,    &Am,                     sizeof(int),

runtime/starpu/codelets/codelet_zaxpy.c

@@ -61,8 +61,8 @@ void INSERT_TASK_zaxpy( const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(B, Bm, Bn);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-            starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+            codelet,
             STARPU_VALUE,    &M,                           sizeof(int),
             STARPU_VALUE,    &alpha,                       sizeof(CHAMELEON_Complex64_t),
             STARPU_R,        RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An),

runtime/starpu/codelets/codelet_zbuild.c

@@ -73,8 +73,8 @@ CODELETS_CPU(zbuild, cl_zbuild_cpu_func)
     row_max = Am == A->mt-1 ? A->m-1 : row_min+A->mb-1 ;
     col_min = An*A->nb ;
     col_max = An == A->nt-1 ? A->n-1 : col_min+A->nb-1 ;
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &row_min,                      sizeof(int),
         STARPU_VALUE,    &row_max,                      sizeof(int),
         STARPU_VALUE,    &col_min,                      sizeof(int),

runtime/starpu/codelets/codelet_zgeadd.c

@@ -105,8 +105,8 @@ void INSERT_TASK_zgeadd( const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(B, Bm, Bn);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &trans,              sizeof(int),
         STARPU_VALUE,    &m,                  sizeof(int),
         STARPU_VALUE,    &n,                  sizeof(int),

runtime/starpu/codelets/codelet_zgelqt.c

@@ -75,8 +75,8 @@ void INSERT_TASK_zgelqt(const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_W(T, Tm, Tn);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &m,                 sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),
         STARPU_VALUE,    &ib,                sizeof(int),

runtime/starpu/codelets/codelet_zgemm.c

@@ -124,8 +124,8 @@ void INSERT_TASK_zgemm(const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(C, Cm, Cn);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &transA,            sizeof(int),
         STARPU_VALUE,    &transB,            sizeof(int),
         STARPU_VALUE,    &m,                 sizeof(int),

runtime/starpu/codelets/codelet_zgemv.c

@@ -111,8 +111,8 @@ void INSERT_TASK_zgemv( const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(Y, Ym, Yn);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &trans,             sizeof(cham_trans_t),
         STARPU_VALUE,    &m,                 sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),

runtime/starpu/codelets/codelet_zgeqrt.c

@@ -76,8 +76,8 @@ void INSERT_TASK_zgeqrt(const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_W(T, Tm, Tn);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &m,                 sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),
         STARPU_VALUE,    &ib,                sizeof(int),

runtime/starpu/codelets/codelet_zgessm.c

@@ -71,8 +71,8 @@ void INSERT_TASK_zgessm( const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(A, Am, An);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,     &m,                        sizeof(int),
         STARPU_VALUE,     &n,                        sizeof(int),
         STARPU_VALUE,     &k,                        sizeof(int),

runtime/starpu/codelets/codelet_zgessq.c

@@ -60,8 +60,8 @@ void INSERT_TASK_zgessq( const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(SCALESUMSQ, SCALESUMSQm, SCALESUMSQn);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &storev,                     sizeof(cham_store_t),
         STARPU_VALUE,    &m,                          sizeof(int),
         STARPU_VALUE,    &n,                          sizeof(int),

runtime/starpu/codelets/codelet_zgetrf.c

@@ -70,8 +70,8 @@ void INSERT_TASK_zgetrf( const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(A, Am, An);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,             &m,                        sizeof(int),
         STARPU_VALUE,             &n,                        sizeof(int),
         STARPU_RW,                     RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An),

runtime/starpu/codelets/codelet_zgetrf_incpiv.c

@@ -78,8 +78,8 @@ void INSERT_TASK_zgetrf_incpiv(const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_W(L, Lm, Ln);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &m,                 sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),
         STARPU_VALUE,    &ib,                sizeof(int),

runtime/starpu/codelets/codelet_zgetrf_nopiv.c

@@ -70,8 +70,8 @@ void INSERT_TASK_zgetrf_nopiv(const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(A, Am, An);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &m,                         sizeof(int),
         STARPU_VALUE,    &n,                         sizeof(int),
         STARPU_VALUE,    &ib,                        sizeof(int),

runtime/starpu/codelets/codelet_zgram.c

@@ -65,8 +65,8 @@ void INSERT_TASK_zgram( const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(A, Am, An);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &uplo,                      sizeof(int),
         STARPU_VALUE,    &m,                         sizeof(int),
         STARPU_VALUE,    &n,                         sizeof(int),

runtime/starpu/codelets/codelet_zhe2ge.c

@@ -61,8 +61,8 @@ void INSERT_TASK_zhe2ge( const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_W(B, Bm, Bn);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,  &uplo,                sizeof(int),
         STARPU_VALUE,     &m,                        sizeof(int),
         STARPU_VALUE,     &n,                        sizeof(int),

runtime/starpu/codelets/codelet_zhemm.c

@@ -123,8 +123,8 @@ void INSERT_TASK_zhemm(const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(C, Cm, Cn);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &side,                sizeof(int),
         STARPU_VALUE,    &uplo,                sizeof(int),
         STARPU_VALUE,       &m,                        sizeof(int),

runtime/starpu/codelets/codelet_zher2k.c

@@ -120,8 +120,8 @@ INSERT_TASK_zher2k( const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(C, Cm, Cn);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,      &uplo,                sizeof(int),
         STARPU_VALUE,     &trans,                sizeof(int),
         STARPU_VALUE,         &n,                        sizeof(int),

runtime/starpu/codelets/codelet_zherfb.c

@@ -103,8 +103,8 @@ void INSERT_TASK_zherfb(const RUNTIME_option_t *options,
     CHAMELEON_ACCESS_RW(C, Cm, Cn);
     CHAMELEON_END_ACCESS_DECLARATION;
 
-    starpu_insert_task(
-        starpu_mpi_codelet(codelet),
+    rt_starpu_insert_task(
+        codelet,
         STARPU_VALUE,    &uplo,              sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),
         STARPU_VALUE,    &k,                 sizeof(int),