From 187ccd7687977ab5f10865d9509e043f8c85fcaf Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Mon, 11 Jan 2021 16:40:54 +0100
Subject: [PATCH] Replace redefinitioon of starpu function by an internal one
to avoid conflict
---
runtime/starpu/codelets/codelet_dlag2z.c | 4 ++--
runtime/starpu/codelets/codelet_dzasum.c | 4 ++--
runtime/starpu/codelets/codelet_map.c | 4 ++--
runtime/starpu/codelets/codelet_zaxpy.c | 4 ++--
runtime/starpu/codelets/codelet_zbuild.c | 4 ++--
runtime/starpu/codelets/codelet_zgeadd.c | 4 ++--
runtime/starpu/codelets/codelet_zgelqt.c | 4 ++--
runtime/starpu/codelets/codelet_zgemm.c | 4 ++--
runtime/starpu/codelets/codelet_zgemv.c | 4 ++--
runtime/starpu/codelets/codelet_zgeqrt.c | 4 ++--
runtime/starpu/codelets/codelet_zgessm.c | 4 ++--
runtime/starpu/codelets/codelet_zgessq.c | 4 ++--
runtime/starpu/codelets/codelet_zgetrf.c | 4 ++--
runtime/starpu/codelets/codelet_zgetrf_incpiv.c | 4 ++--
runtime/starpu/codelets/codelet_zgetrf_nopiv.c | 4 ++--
runtime/starpu/codelets/codelet_zgram.c | 4 ++--
runtime/starpu/codelets/codelet_zhe2ge.c | 4 ++--
runtime/starpu/codelets/codelet_zhemm.c | 4 ++--
runtime/starpu/codelets/codelet_zher2k.c | 4 ++--
runtime/starpu/codelets/codelet_zherfb.c | 4 ++--
runtime/starpu/codelets/codelet_zherk.c | 4 ++--
runtime/starpu/codelets/codelet_zlacpy.c | 4 ++--
runtime/starpu/codelets/codelet_zlag2c.c | 8 ++++----
runtime/starpu/codelets/codelet_zlange.c | 8 ++++----
runtime/starpu/codelets/codelet_zlanhe.c | 4 ++--
runtime/starpu/codelets/codelet_zlansy.c | 4 ++--
runtime/starpu/codelets/codelet_zlantr.c | 4 ++--
runtime/starpu/codelets/codelet_zlascal.c | 4 ++--
runtime/starpu/codelets/codelet_zlaset.c | 4 ++--
runtime/starpu/codelets/codelet_zlaset2.c | 4 ++--
runtime/starpu/codelets/codelet_zlatro.c | 4 ++--
runtime/starpu/codelets/codelet_zlauum.c | 4 ++--
runtime/starpu/codelets/codelet_zplghe.c | 4 ++--
runtime/starpu/codelets/codelet_zplgsy.c | 4 ++--
runtime/starpu/codelets/codelet_zplrnt.c | 4 ++--
runtime/starpu/codelets/codelet_zplssq.c | 8 ++++----
runtime/starpu/codelets/codelet_zpotrf.c | 4 ++--
runtime/starpu/codelets/codelet_zssssm.c | 4 ++--
runtime/starpu/codelets/codelet_zsymm.c | 4 ++--
runtime/starpu/codelets/codelet_zsyr2k.c | 4 ++--
runtime/starpu/codelets/codelet_zsyrk.c | 4 ++--
runtime/starpu/codelets/codelet_zsyssq.c | 4 ++--
runtime/starpu/codelets/codelet_zsytrf_nopiv.c | 4 ++--
runtime/starpu/codelets/codelet_ztplqt.c | 4 ++--
runtime/starpu/codelets/codelet_ztpmlqt.c | 4 ++--
runtime/starpu/codelets/codelet_ztpmqrt.c | 4 ++--
runtime/starpu/codelets/codelet_ztpqrt.c | 4 ++--
runtime/starpu/codelets/codelet_ztradd.c | 4 ++--
runtime/starpu/codelets/codelet_ztrasm.c | 4 ++--
runtime/starpu/codelets/codelet_ztrmm.c | 4 ++--
runtime/starpu/codelets/codelet_ztrsm.c | 4 ++--
runtime/starpu/codelets/codelet_ztrssq.c | 4 ++--
runtime/starpu/codelets/codelet_ztrtri.c | 4 ++--
runtime/starpu/codelets/codelet_ztsmlq_hetra1.c | 4 ++--
runtime/starpu/codelets/codelet_ztsmqr_hetra1.c | 4 ++--
runtime/starpu/codelets/codelet_ztstrf.c | 4 ++--
runtime/starpu/codelets/codelet_zunmlq.c | 4 ++--
runtime/starpu/codelets/codelet_zunmqr.c | 4 ++--
runtime/starpu/include/chameleon_starpu.h.in | 13 ++++++++-----
59 files changed, 130 insertions(+), 127 deletions(-)
diff --git a/runtime/starpu/codelets/codelet_dlag2z.c b/runtime/starpu/codelets/codelet_dlag2z.c
index b7953cd97..490ea86ac 100644
--- a/runtime/starpu/codelets/codelet_dlag2z.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_dzasum.c b/runtime/starpu/codelets/codelet_dzasum.c
index 7ef0d27e3..fd8b03d2e 100644
--- a/runtime/starpu/codelets/codelet_dzasum.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_map.c b/runtime/starpu/codelets/codelet_map.c
index d56451136..a7d4862a3 100644
--- a/runtime/starpu/codelets/codelet_map.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zaxpy.c b/runtime/starpu/codelets/codelet_zaxpy.c
index a4c1df2eb..e27bf4ebb 100644
--- a/runtime/starpu/codelets/codelet_zaxpy.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zbuild.c b/runtime/starpu/codelets/codelet_zbuild.c
index b8b14ae4a..9e7f6344c 100644
--- a/runtime/starpu/codelets/codelet_zbuild.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zgeadd.c b/runtime/starpu/codelets/codelet_zgeadd.c
index 65c82231e..7270e2e99 100644
--- a/runtime/starpu/codelets/codelet_zgeadd.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zgelqt.c b/runtime/starpu/codelets/codelet_zgelqt.c
index 9a26068ca..575d65f7b 100644
--- a/runtime/starpu/codelets/codelet_zgelqt.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index 42bd6609a..9a3b9ea3f 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zgemv.c b/runtime/starpu/codelets/codelet_zgemv.c
index 62b887247..35d479dfa 100644
--- a/runtime/starpu/codelets/codelet_zgemv.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zgeqrt.c b/runtime/starpu/codelets/codelet_zgeqrt.c
index ae8ad0d53..1e727312a 100644
--- a/runtime/starpu/codelets/codelet_zgeqrt.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zgessm.c b/runtime/starpu/codelets/codelet_zgessm.c
index 9e97aa445..c83036013 100644
--- a/runtime/starpu/codelets/codelet_zgessm.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zgessq.c b/runtime/starpu/codelets/codelet_zgessq.c
index 7bcaabb15..9d16755b0 100644
--- a/runtime/starpu/codelets/codelet_zgessq.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zgetrf.c b/runtime/starpu/codelets/codelet_zgetrf.c
index 947fb8d2b..f5bdda1c3 100644
--- a/runtime/starpu/codelets/codelet_zgetrf.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
index 460a8e1a5..429484a43 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
index c84418518..29d4ffbf3 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zgram.c b/runtime/starpu/codelets/codelet_zgram.c
index 1a5e8e4e9..fd3605724 100644
--- a/runtime/starpu/codelets/codelet_zgram.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zhe2ge.c b/runtime/starpu/codelets/codelet_zhe2ge.c
index 203544170..1979643cd 100644
--- a/runtime/starpu/codelets/codelet_zhe2ge.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index f4963cacf..97f23a3c0 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c
index e652db505..510e26f5b 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zherfb.c b/runtime/starpu/codelets/codelet_zherfb.c
index d92f922eb..11c82d947 100644
--- a/runtime/starpu/codelets/codelet_zherfb.c
+++ b/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),
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index ec0f985b5..1b9d39818 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -109,8 +109,8 @@ void INSERT_TASK_zherk(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),
diff --git a/runtime/starpu/codelets/codelet_zlacpy.c b/runtime/starpu/codelets/codelet_zlacpy.c
index 312555129..bec2d9228 100644
--- a/runtime/starpu/codelets/codelet_zlacpy.c
+++ b/runtime/starpu/codelets/codelet_zlacpy.c
@@ -75,8 +75,8 @@ void INSERT_TASK_zlacpyx( 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(cham_uplo_t),
STARPU_VALUE, &m, sizeof(int),
STARPU_VALUE, &n, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zlag2c.c b/runtime/starpu/codelets/codelet_zlag2c.c
index b9eb91889..68e16f363 100644
--- a/runtime/starpu/codelets/codelet_zlag2c.c
+++ b/runtime/starpu/codelets/codelet_zlag2c.c
@@ -68,8 +68,8 @@ void INSERT_TASK_zlag2c(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, &m, sizeof(int),
STARPU_VALUE, &n, sizeof(int),
STARPU_R, RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An),
@@ -121,8 +121,8 @@ void INSERT_TASK_clag2z(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, &m, sizeof(int),
STARPU_VALUE, &n, sizeof(int),
STARPU_R, RTBLKADDR(A, CHAMELEON_Complex32_t, Am, An),
diff --git a/runtime/starpu/codelets/codelet_zlange.c b/runtime/starpu/codelets/codelet_zlange.c
index 35a7251a8..d9160db93 100644
--- a/runtime/starpu/codelets/codelet_zlange.c
+++ b/runtime/starpu/codelets/codelet_zlange.c
@@ -65,8 +65,8 @@ void INSERT_TASK_zlange( 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, &norm, sizeof(cham_normtype_t),
STARPU_VALUE, &M, sizeof(int),
STARPU_VALUE, &N, sizeof(int),
@@ -121,8 +121,8 @@ void INSERT_TASK_zlange_max(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_R, RTBLKADDR(A, double, Am, An),
STARPU_RW, RTBLKADDR(B, double, Bm, Bn),
STARPU_PRIORITY, options->priority,
diff --git a/runtime/starpu/codelets/codelet_zlanhe.c b/runtime/starpu/codelets/codelet_zlanhe.c
index 45123eeb7..dfc02d2bf 100644
--- a/runtime/starpu/codelets/codelet_zlanhe.c
+++ b/runtime/starpu/codelets/codelet_zlanhe.c
@@ -64,8 +64,8 @@ void INSERT_TASK_zlanhe(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, &norm, sizeof(int),
STARPU_VALUE, &uplo, sizeof(int),
STARPU_VALUE, &N, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zlansy.c b/runtime/starpu/codelets/codelet_zlansy.c
index ef7eacbd9..d0dcf8fe9 100644
--- a/runtime/starpu/codelets/codelet_zlansy.c
+++ b/runtime/starpu/codelets/codelet_zlansy.c
@@ -65,8 +65,8 @@ void INSERT_TASK_zlansy( 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, &norm, sizeof(int),
STARPU_VALUE, &uplo, sizeof(int),
STARPU_VALUE, &N, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zlantr.c b/runtime/starpu/codelets/codelet_zlantr.c
index b763625dd..103c6a3b4 100644
--- a/runtime/starpu/codelets/codelet_zlantr.c
+++ b/runtime/starpu/codelets/codelet_zlantr.c
@@ -61,8 +61,8 @@ void INSERT_TASK_zlantr( 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, &norm, sizeof(int),
STARPU_VALUE, &uplo, sizeof(int),
STARPU_VALUE, &diag, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zlascal.c b/runtime/starpu/codelets/codelet_zlascal.c
index 0142c39ec..bd6823a08 100644
--- a/runtime/starpu/codelets/codelet_zlascal.c
+++ b/runtime/starpu/codelets/codelet_zlascal.c
@@ -67,8 +67,8 @@ void INSERT_TASK_zlascal( 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),
diff --git a/runtime/starpu/codelets/codelet_zlaset.c b/runtime/starpu/codelets/codelet_zlaset.c
index 90d3ad925..c7661bdb8 100644
--- a/runtime/starpu/codelets/codelet_zlaset.c
+++ b/runtime/starpu/codelets/codelet_zlaset.c
@@ -63,8 +63,8 @@ void INSERT_TASK_zlaset(const RUNTIME_option_t *options,
CHAMELEON_ACCESS_W(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),
diff --git a/runtime/starpu/codelets/codelet_zlaset2.c b/runtime/starpu/codelets/codelet_zlaset2.c
index 0f19d0e94..6972b34ea 100644
--- a/runtime/starpu/codelets/codelet_zlaset2.c
+++ b/runtime/starpu/codelets/codelet_zlaset2.c
@@ -60,8 +60,8 @@ void INSERT_TASK_zlaset2(const RUNTIME_option_t *options,
CHAMELEON_ACCESS_W(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),
diff --git a/runtime/starpu/codelets/codelet_zlatro.c b/runtime/starpu/codelets/codelet_zlatro.c
index 718fd3ce5..4e8210988 100644
--- a/runtime/starpu/codelets/codelet_zlatro.c
+++ b/runtime/starpu/codelets/codelet_zlatro.c
@@ -71,8 +71,8 @@ void INSERT_TASK_zlatro( 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, &trans, sizeof(int),
STARPU_VALUE, &m, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zlauum.c b/runtime/starpu/codelets/codelet_zlauum.c
index 00dcda475..0f3f1911b 100644
--- a/runtime/starpu/codelets/codelet_zlauum.c
+++ b/runtime/starpu/codelets/codelet_zlauum.c
@@ -65,8 +65,8 @@ void INSERT_TASK_zlauum( 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, &n, sizeof(int),
STARPU_RW, RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An),
diff --git a/runtime/starpu/codelets/codelet_zplghe.c b/runtime/starpu/codelets/codelet_zplghe.c
index 23ccbc3da..87c071e44 100644
--- a/runtime/starpu/codelets/codelet_zplghe.c
+++ b/runtime/starpu/codelets/codelet_zplghe.c
@@ -66,8 +66,8 @@ void INSERT_TASK_zplghe( const RUNTIME_option_t *options,
CHAMELEON_ACCESS_W(A, Am, An);
CHAMELEON_END_ACCESS_DECLARATION;
- starpu_insert_task(
- starpu_mpi_codelet(codelet),
+ rt_starpu_insert_task(
+ codelet,
STARPU_VALUE, &bump, sizeof(double),
STARPU_VALUE, &m, sizeof(int),
STARPU_VALUE, &n, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zplgsy.c b/runtime/starpu/codelets/codelet_zplgsy.c
index 665f31002..748e78d33 100644
--- a/runtime/starpu/codelets/codelet_zplgsy.c
+++ b/runtime/starpu/codelets/codelet_zplgsy.c
@@ -67,8 +67,8 @@ void INSERT_TASK_zplgsy( const RUNTIME_option_t *options,
CHAMELEON_ACCESS_W(A, Am, An);
CHAMELEON_END_ACCESS_DECLARATION;
- starpu_insert_task(
- starpu_mpi_codelet(codelet),
+ rt_starpu_insert_task(
+ codelet,
STARPU_VALUE, &bump, sizeof(CHAMELEON_Complex64_t),
STARPU_VALUE, &m, sizeof(int),
STARPU_VALUE, &n, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zplrnt.c b/runtime/starpu/codelets/codelet_zplrnt.c
index 4f2910f7d..1376e950c 100644
--- a/runtime/starpu/codelets/codelet_zplrnt.c
+++ b/runtime/starpu/codelets/codelet_zplrnt.c
@@ -64,8 +64,8 @@ void INSERT_TASK_zplrnt( const RUNTIME_option_t *options,
CHAMELEON_ACCESS_W(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_W, RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An),
diff --git a/runtime/starpu/codelets/codelet_zplssq.c b/runtime/starpu/codelets/codelet_zplssq.c
index c017aba69..73b8ec634 100644
--- a/runtime/starpu/codelets/codelet_zplssq.c
+++ b/runtime/starpu/codelets/codelet_zplssq.c
@@ -65,8 +65,8 @@ void INSERT_TASK_zplssq( const RUNTIME_option_t *options,
CHAMELEON_ACCESS_RW( OUT, OUTm, OUTn );
CHAMELEON_END_ACCESS_DECLARATION;
- starpu_insert_task(
- starpu_mpi_codelet(codelet),
+ rt_starpu_insert_task(
+ codelet,
STARPU_VALUE, &storev, sizeof(int),
STARPU_VALUE, &M, sizeof(int),
STARPU_VALUE, &N, sizeof(int),
@@ -115,8 +115,8 @@ void INSERT_TASK_zplssq2( const RUNTIME_option_t *options, int N,
CHAMELEON_ACCESS_RW( RESULT, RESULTm, RESULTn );
CHAMELEON_END_ACCESS_DECLARATION;
- starpu_insert_task(
- starpu_mpi_codelet(codelet),
+ rt_starpu_insert_task(
+ codelet,
STARPU_VALUE, &N, sizeof(int),
STARPU_RW, RTBLKADDR(RESULT, double, RESULTm, RESULTn),
STARPU_PRIORITY, options->priority,
diff --git a/runtime/starpu/codelets/codelet_zpotrf.c b/runtime/starpu/codelets/codelet_zpotrf.c
index f99cd3ce6..2337b00fd 100644
--- a/runtime/starpu/codelets/codelet_zpotrf.c
+++ b/runtime/starpu/codelets/codelet_zpotrf.c
@@ -78,8 +78,8 @@ void INSERT_TASK_zpotrf(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, &n, sizeof(int),
STARPU_RW, RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An),
diff --git a/runtime/starpu/codelets/codelet_zssssm.c b/runtime/starpu/codelets/codelet_zssssm.c
index 5c7125646..bf2bb0683 100644
--- a/runtime/starpu/codelets/codelet_zssssm.c
+++ b/runtime/starpu/codelets/codelet_zssssm.c
@@ -77,8 +77,8 @@ void INSERT_TASK_zssssm( const RUNTIME_option_t *options,
CHAMELEON_ACCESS_R(L2, L2m, L2n);
CHAMELEON_END_ACCESS_DECLARATION;
- starpu_insert_task(
- starpu_mpi_codelet(codelet),
+ rt_starpu_insert_task(
+ codelet,
STARPU_VALUE, &m1, sizeof(int),
STARPU_VALUE, &n1, sizeof(int),
STARPU_VALUE, &m2, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index b87b3bef6..32ebce174 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -123,8 +123,8 @@ void INSERT_TASK_zsymm(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),
diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c
index 822094558..6b759e106 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -119,8 +119,8 @@ void INSERT_TASK_zsyr2k(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),
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index 9795d0a98..9552eee9c 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -114,8 +114,8 @@ void INSERT_TASK_zsyrk(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),
diff --git a/runtime/starpu/codelets/codelet_zsyssq.c b/runtime/starpu/codelets/codelet_zsyssq.c
index dd6300a18..2d099e3a8 100644
--- a/runtime/starpu/codelets/codelet_zsyssq.c
+++ b/runtime/starpu/codelets/codelet_zsyssq.c
@@ -58,8 +58,8 @@ void INSERT_TASK_zsyssq( 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, &uplo, sizeof(int),
STARPU_VALUE, &n, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
index 2e92e4cfd..e09dfb243 100644
--- a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
@@ -61,8 +61,8 @@ void INSERT_TASK_zsytrf_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, &uplo, sizeof(int),
STARPU_VALUE, &n, sizeof(int),
STARPU_RW, RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An),
diff --git a/runtime/starpu/codelets/codelet_ztplqt.c b/runtime/starpu/codelets/codelet_ztplqt.c
index 708098635..1d0307346 100644
--- a/runtime/starpu/codelets/codelet_ztplqt.c
+++ b/runtime/starpu/codelets/codelet_ztplqt.c
@@ -67,8 +67,8 @@ void INSERT_TASK_ztplqt( 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, &L, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztpmlqt.c b/runtime/starpu/codelets/codelet_ztpmlqt.c
index 1a250a195..6c843617d 100644
--- a/runtime/starpu/codelets/codelet_ztpmlqt.c
+++ b/runtime/starpu/codelets/codelet_ztpmlqt.c
@@ -114,8 +114,8 @@ void INSERT_TASK_ztpmlqt( 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, &side, sizeof(int),
STARPU_VALUE, &trans, sizeof(int),
STARPU_VALUE, &M, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztpmqrt.c b/runtime/starpu/codelets/codelet_ztpmqrt.c
index e36abb2cd..9befdca1b 100644
--- a/runtime/starpu/codelets/codelet_ztpmqrt.c
+++ b/runtime/starpu/codelets/codelet_ztpmqrt.c
@@ -114,8 +114,8 @@ void INSERT_TASK_ztpmqrt( 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, &side, sizeof(int),
STARPU_VALUE, &trans, sizeof(int),
STARPU_VALUE, &M, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztpqrt.c b/runtime/starpu/codelets/codelet_ztpqrt.c
index 9e1de5db0..6e303e16b 100644
--- a/runtime/starpu/codelets/codelet_ztpqrt.c
+++ b/runtime/starpu/codelets/codelet_ztpqrt.c
@@ -66,8 +66,8 @@ void INSERT_TASK_ztpqrt( 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, &L, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztradd.c b/runtime/starpu/codelets/codelet_ztradd.c
index fbd6a0f8e..689cb6254 100644
--- a/runtime/starpu/codelets/codelet_ztradd.c
+++ b/runtime/starpu/codelets/codelet_ztradd.c
@@ -67,8 +67,8 @@ void INSERT_TASK_ztradd( 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, &uplo, sizeof(int),
STARPU_VALUE, &trans, sizeof(int),
STARPU_VALUE, &m, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztrasm.c b/runtime/starpu/codelets/codelet_ztrasm.c
index f870eb563..1cb326677 100644
--- a/runtime/starpu/codelets/codelet_ztrasm.c
+++ b/runtime/starpu/codelets/codelet_ztrasm.c
@@ -61,8 +61,8 @@ void INSERT_TASK_ztrasm( 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(int),
STARPU_VALUE, &uplo, sizeof(int),
STARPU_VALUE, &diag, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index e820a6d6b..354e5f454 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -116,8 +116,8 @@ void INSERT_TASK_ztrmm(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, &side, sizeof(int),
STARPU_VALUE, &uplo, sizeof(int),
STARPU_VALUE, &transA, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c
index 13fb16fad..694f0a99b 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -111,8 +111,8 @@ void INSERT_TASK_ztrsm(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, &side, sizeof(int),
STARPU_VALUE, &uplo, sizeof(int),
STARPU_VALUE, &transA, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztrssq.c b/runtime/starpu/codelets/codelet_ztrssq.c
index a453d7aca..b5c5707d4 100644
--- a/runtime/starpu/codelets/codelet_ztrssq.c
+++ b/runtime/starpu/codelets/codelet_ztrssq.c
@@ -60,8 +60,8 @@ void INSERT_TASK_ztrssq( 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, &uplo, sizeof(int),
STARPU_VALUE, &diag, sizeof(int),
STARPU_VALUE, &m, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztrtri.c b/runtime/starpu/codelets/codelet_ztrtri.c
index 97d8c56dd..01b14eef4 100644
--- a/runtime/starpu/codelets/codelet_ztrtri.c
+++ b/runtime/starpu/codelets/codelet_ztrtri.c
@@ -75,8 +75,8 @@ void INSERT_TASK_ztrtri( 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, &diag, sizeof(int),
STARPU_VALUE, &n, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c b/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
index be215519f..7e31cdae4 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
@@ -85,8 +85,8 @@ void INSERT_TASK_ztsmlq_hetra1( const RUNTIME_option_t *options,
CHAMELEON_ACCESS_R(T, Tm, Tn);
CHAMELEON_END_ACCESS_DECLARATION;
- starpu_insert_task(
- starpu_mpi_codelet(codelet),
+ rt_starpu_insert_task(
+ codelet,
STARPU_VALUE, &side, sizeof(int),
STARPU_VALUE, &trans, sizeof(int),
STARPU_VALUE, &m1, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c b/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
index 7f8c0488d..c45d9a8b6 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
+++ b/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
@@ -85,8 +85,8 @@ void INSERT_TASK_ztsmqr_hetra1( const RUNTIME_option_t *options,
CHAMELEON_ACCESS_R(T, Tm, Tn);
CHAMELEON_END_ACCESS_DECLARATION;
- starpu_insert_task(
- starpu_mpi_codelet(codelet),
+ rt_starpu_insert_task(
+ codelet,
STARPU_VALUE, &side, sizeof(int),
STARPU_VALUE, &trans, sizeof(int),
STARPU_VALUE, &m1, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztstrf.c b/runtime/starpu/codelets/codelet_ztstrf.c
index 0e3f717f4..915f30670 100644
--- a/runtime/starpu/codelets/codelet_ztstrf.c
+++ b/runtime/starpu/codelets/codelet_ztstrf.c
@@ -90,8 +90,8 @@ void INSERT_TASK_ztstrf( 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),
diff --git a/runtime/starpu/codelets/codelet_zunmlq.c b/runtime/starpu/codelets/codelet_zunmlq.c
index 9f42aa67f..3ffcb478d 100644
--- a/runtime/starpu/codelets/codelet_zunmlq.c
+++ b/runtime/starpu/codelets/codelet_zunmlq.c
@@ -115,8 +115,8 @@ void INSERT_TASK_zunmlq( 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, &trans, sizeof(int),
STARPU_VALUE, &m, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zunmqr.c b/runtime/starpu/codelets/codelet_zunmqr.c
index e44279dd2..d6f0e4ddd 100644
--- a/runtime/starpu/codelets/codelet_zunmqr.c
+++ b/runtime/starpu/codelets/codelet_zunmqr.c
@@ -114,8 +114,8 @@ void INSERT_TASK_zunmqr( 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, &trans, sizeof(int),
STARPU_VALUE, &m, sizeof(int),
diff --git a/runtime/starpu/include/chameleon_starpu.h.in b/runtime/starpu/include/chameleon_starpu.h.in
index 2960389a5..3b62a17b0 100644
--- a/runtime/starpu/include/chameleon_starpu.h.in
+++ b/runtime/starpu/include/chameleon_starpu.h.in
@@ -100,13 +100,16 @@ typedef struct starpu_option_request_s {
#endif
#if defined(CHAMELEON_USE_MPI)
+
#undef STARPU_REDUX
-#undef starpu_insert_task
-#define starpu_insert_task starpu_mpi_insert_task
-#undef starpu_mpi_codelet
-#define starpu_mpi_codelet(_codelet_) MPI_COMM_WORLD, _codelet_ TASK_SYNCHRONOUS
+#define rt_starpu_insert_task( _codelet_, ... ) \
+ starpu_mpi_insert_task( MPI_COMM_WORLD, (_codelet_) TASK_SYNCHRONOUS, ##__VA_ARGS__ )
+
#else
-#define starpu_mpi_codelet(_codelet_) _codelet_ TASK_SYNCHRONOUS
+
+#define rt_starpu_insert_task( _codelet_, ... ) \
+ starpu_insert_task( (_codelet_) TASK_SYNCHRONOUS, ##__VA_ARGS__ )
+
#endif
/*
--
GitLab