From ff04469d30b2f8d1f51b3e2906b4a2ed01e0348a Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Tue, 12 Mar 2024 20:17:52 +0100
Subject: [PATCH] codelet: alternative solution to avoid changing all codelet
 files (may be reverted if disagree)

---
 runtime/starpu/codelets/codelet_convert.c            |  1 -
 runtime/starpu/codelets/codelet_dlag2h.c             |  2 --
 runtime/starpu/codelets/codelet_dlag2z.c             |  1 -
 runtime/starpu/codelets/codelet_dzasum.c             |  1 -
 runtime/starpu/codelets/codelet_gemm.c               |  1 -
 runtime/starpu/codelets/codelet_gemmex.c             |  2 --
 runtime/starpu/codelets/codelet_hgemm.c              |  2 --
 runtime/starpu/codelets/codelet_ipiv_to_perm.c       |  1 -
 runtime/starpu/codelets/codelet_map.c                |  1 -
 runtime/starpu/codelets/codelet_zaxpy.c              |  1 -
 runtime/starpu/codelets/codelet_zbuild.c             |  1 -
 runtime/starpu/codelets/codelet_zcesca.c             |  1 -
 runtime/starpu/codelets/codelet_zgeadd.c             |  1 -
 runtime/starpu/codelets/codelet_zgelqt.c             |  1 -
 runtime/starpu/codelets/codelet_zgemm.c              |  2 --
 runtime/starpu/codelets/codelet_zgemv.c              |  1 -
 runtime/starpu/codelets/codelet_zgeqrt.c             |  1 -
 runtime/starpu/codelets/codelet_zgered.c             |  2 --
 runtime/starpu/codelets/codelet_zgerst.c             |  2 --
 runtime/starpu/codelets/codelet_zgessm.c             |  1 -
 runtime/starpu/codelets/codelet_zgessq.c             |  1 -
 runtime/starpu/codelets/codelet_zgesum.c             |  1 -
 runtime/starpu/codelets/codelet_zgetrf.c             |  1 -
 runtime/starpu/codelets/codelet_zgetrf_blocked.c     |  3 ---
 runtime/starpu/codelets/codelet_zgetrf_incpiv.c      |  1 -
 runtime/starpu/codelets/codelet_zgetrf_nopiv.c       |  1 -
 .../starpu/codelets/codelet_zgetrf_nopiv_percol.c    |  2 --
 runtime/starpu/codelets/codelet_zgetrf_percol.c      |  2 --
 runtime/starpu/codelets/codelet_zgram.c              |  1 -
 runtime/starpu/codelets/codelet_zhe2ge.c             |  1 -
 runtime/starpu/codelets/codelet_zhemm.c              |  2 --
 runtime/starpu/codelets/codelet_zher2k.c             |  1 -
 runtime/starpu/codelets/codelet_zherfb.c             |  1 -
 runtime/starpu/codelets/codelet_zherk.c              |  1 -
 runtime/starpu/codelets/codelet_zlacpy.c             |  2 --
 runtime/starpu/codelets/codelet_zlag2c.c             |  2 --
 runtime/starpu/codelets/codelet_zlange.c             |  2 --
 runtime/starpu/codelets/codelet_zlanhe.c             |  1 -
 runtime/starpu/codelets/codelet_zlansy.c             |  1 -
 runtime/starpu/codelets/codelet_zlantr.c             |  1 -
 runtime/starpu/codelets/codelet_zlascal.c            |  1 -
 runtime/starpu/codelets/codelet_zlaset.c             |  1 -
 runtime/starpu/codelets/codelet_zlaset2.c            |  1 -
 runtime/starpu/codelets/codelet_zlaswp.c             |  2 --
 runtime/starpu/codelets/codelet_zlatro.c             |  1 -
 runtime/starpu/codelets/codelet_zlauum.c             |  1 -
 runtime/starpu/codelets/codelet_zplghe.c             |  1 -
 runtime/starpu/codelets/codelet_zplgsy.c             |  1 -
 runtime/starpu/codelets/codelet_zplrnt.c             |  1 -
 runtime/starpu/codelets/codelet_zplssq.c             |  2 --
 runtime/starpu/codelets/codelet_zpotrf.c             |  1 -
 runtime/starpu/codelets/codelet_zssssm.c             |  1 -
 runtime/starpu/codelets/codelet_zsymm.c              |  2 --
 runtime/starpu/codelets/codelet_zsyr2k.c             |  1 -
 runtime/starpu/codelets/codelet_zsyrk.c              |  1 -
 runtime/starpu/codelets/codelet_zsyssq.c             |  1 -
 runtime/starpu/codelets/codelet_zsytrf_nopiv.c       |  1 -
 runtime/starpu/codelets/codelet_ztplqt.c             |  1 -
 runtime/starpu/codelets/codelet_ztpmlqt.c            |  1 -
 runtime/starpu/codelets/codelet_ztpmqrt.c            |  1 -
 runtime/starpu/codelets/codelet_ztpqrt.c             |  1 -
 runtime/starpu/codelets/codelet_ztradd.c             |  1 -
 runtime/starpu/codelets/codelet_ztrasm.c             |  1 -
 runtime/starpu/codelets/codelet_ztrmm.c              |  1 -
 runtime/starpu/codelets/codelet_ztrsm.c              |  1 -
 runtime/starpu/codelets/codelet_ztrssq.c             |  1 -
 runtime/starpu/codelets/codelet_ztrtri.c             |  1 -
 runtime/starpu/codelets/codelet_ztsmlq_hetra1.c      |  1 -
 runtime/starpu/codelets/codelet_ztsmqr_hetra1.c      |  1 -
 runtime/starpu/codelets/codelet_ztstrf.c             |  1 -
 runtime/starpu/codelets/codelet_zunmlq.c             |  1 -
 runtime/starpu/codelets/codelet_zunmqr.c             |  1 -
 runtime/starpu/include/chameleon_starpu.h.in         | 12 ++++++------
 73 files changed, 6 insertions(+), 95 deletions(-)

diff --git a/runtime/starpu/codelets/codelet_convert.c b/runtime/starpu/codelets/codelet_convert.c
index 7dfc1d42b..8a637a493 100644
--- a/runtime/starpu/codelets/codelet_convert.c
+++ b/runtime/starpu/codelets/codelet_convert.c
@@ -119,7 +119,6 @@ insert_task_convert( const RUNTIME_option_t *options,
     }
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &m,                 sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_dlag2h.c b/runtime/starpu/codelets/codelet_dlag2h.c
index 490696997..f2106e3b6 100644
--- a/runtime/starpu/codelets/codelet_dlag2h.c
+++ b/runtime/starpu/codelets/codelet_dlag2h.c
@@ -81,7 +81,6 @@ void INSERT_TASK_dlag2h( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &m,                 sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),
@@ -147,7 +146,6 @@ void INSERT_TASK_hlag2d( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &m,                 sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_dlag2z.c b/runtime/starpu/codelets/codelet_dlag2z.c
index 242242ea4..a3dc89cd5 100644
--- a/runtime/starpu/codelets/codelet_dlag2z.c
+++ b/runtime/starpu/codelets/codelet_dlag2z.c
@@ -61,7 +61,6 @@ void INSERT_TASK_dlag2z( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &uplo,              sizeof(uplo),
         STARPU_VALUE,    &m,                 sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_dzasum.c b/runtime/starpu/codelets/codelet_dzasum.c
index 6f5d4abba..3c4a6b4d8 100644
--- a/runtime/starpu/codelets/codelet_dzasum.c
+++ b/runtime/starpu/codelets/codelet_dzasum.c
@@ -62,7 +62,6 @@ void INSERT_TASK_dzasum( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &storev,              sizeof(cham_store_t),
         STARPU_VALUE,    &uplo,                sizeof(cham_uplo_t),
diff --git a/runtime/starpu/codelets/codelet_gemm.c b/runtime/starpu/codelets/codelet_gemm.c
index 2f9df76d7..436a5b563 100644
--- a/runtime/starpu/codelets/codelet_gemm.c
+++ b/runtime/starpu/codelets/codelet_gemm.c
@@ -184,7 +184,6 @@ INSERT_TASK_gemm( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, argssize,
diff --git a/runtime/starpu/codelets/codelet_gemmex.c b/runtime/starpu/codelets/codelet_gemmex.c
index d8577943f..c59af2cb0 100644
--- a/runtime/starpu/codelets/codelet_gemmex.c
+++ b/runtime/starpu/codelets/codelet_gemmex.c
@@ -179,7 +179,6 @@ void INSERT_TASK_gemmex_Astat( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_gemmex,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_gemmex_args_s),
@@ -258,7 +257,6 @@ void INSERT_TASK_gemmex( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_gemmex,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_gemmex_args_s),
diff --git a/runtime/starpu/codelets/codelet_hgemm.c b/runtime/starpu/codelets/codelet_hgemm.c
index 39e41525c..4565c15af 100644
--- a/runtime/starpu/codelets/codelet_hgemm.c
+++ b/runtime/starpu/codelets/codelet_hgemm.c
@@ -158,7 +158,6 @@ void INSERT_TASK_hgemm_Astat( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_hgemm,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_hgemm_args_s),
@@ -230,7 +229,6 @@ void INSERT_TASK_hgemm( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_hgemm,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_hgemm_args_s),
diff --git a/runtime/starpu/codelets/codelet_ipiv_to_perm.c b/runtime/starpu/codelets/codelet_ipiv_to_perm.c
index 04439a198..f615e2304 100644
--- a/runtime/starpu/codelets/codelet_ipiv_to_perm.c
+++ b/runtime/starpu/codelets/codelet_ipiv_to_perm.c
@@ -56,7 +56,6 @@ void INSERT_TASK_ipiv_to_perm( const RUNTIME_option_t *options,
     struct starpu_codelet *codelet = &cl_ipiv_to_perm;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,             &m0,  sizeof(int),
         STARPU_VALUE,             &m,   sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_map.c b/runtime/starpu/codelets/codelet_map.c
index a9eace549..6bdaed3eb 100644
--- a/runtime/starpu/codelets/codelet_map.c
+++ b/runtime/starpu/codelets/codelet_map.c
@@ -59,7 +59,6 @@ void INSERT_TASK_map( const RUNTIME_option_t *options,
                                       A->get_blktile( A, Am, An ) );
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &A,                      sizeof(CHAM_desc_t*),
         STARPU_VALUE,    &uplo,                   sizeof(cham_uplo_t),
diff --git a/runtime/starpu/codelets/codelet_zaxpy.c b/runtime/starpu/codelets/codelet_zaxpy.c
index 2b818bd03..3aa9e8523 100644
--- a/runtime/starpu/codelets/codelet_zaxpy.c
+++ b/runtime/starpu/codelets/codelet_zaxpy.c
@@ -62,7 +62,6 @@ void INSERT_TASK_zaxpy( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-            options->sequence->comm,
             codelet,
             STARPU_VALUE,    &M,                           sizeof(int),
             STARPU_VALUE,    &alpha,                       sizeof(CHAMELEON_Complex64_t),
diff --git a/runtime/starpu/codelets/codelet_zbuild.c b/runtime/starpu/codelets/codelet_zbuild.c
index b93d33b21..f96db26a8 100644
--- a/runtime/starpu/codelets/codelet_zbuild.c
+++ b/runtime/starpu/codelets/codelet_zbuild.c
@@ -74,7 +74,6 @@ CODELETS_CPU(zbuild, cl_zbuild_cpu_func)
     col_min = An*A->nb ;
     col_max = An == A->nt-1 ? A->n-1 : col_min+A->nb-1 ;
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &row_min,                      sizeof(int),
         STARPU_VALUE,    &row_max,                      sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zcesca.c b/runtime/starpu/codelets/codelet_zcesca.c
index 2e28accc8..25708af1c 100644
--- a/runtime/starpu/codelets/codelet_zcesca.c
+++ b/runtime/starpu/codelets/codelet_zcesca.c
@@ -94,7 +94,6 @@ void INSERT_TASK_zcesca( const RUNTIME_option_t *options,
     }
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zcesca_args_s),
         STARPU_R,        RTBLKADDR(Gi, ChamComplexDouble, Gim, Gin),
diff --git a/runtime/starpu/codelets/codelet_zgeadd.c b/runtime/starpu/codelets/codelet_zgeadd.c
index 9f2bf0071..37c6a7879 100644
--- a/runtime/starpu/codelets/codelet_zgeadd.c
+++ b/runtime/starpu/codelets/codelet_zgeadd.c
@@ -99,7 +99,6 @@ void INSERT_TASK_zgeadd( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &trans,              sizeof(int),
         STARPU_VALUE,    &m,                  sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgelqt.c b/runtime/starpu/codelets/codelet_zgelqt.c
index 840257376..3727a8f52 100644
--- a/runtime/starpu/codelets/codelet_zgelqt.c
+++ b/runtime/starpu/codelets/codelet_zgelqt.c
@@ -76,7 +76,6 @@ void INSERT_TASK_zgelqt(const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &m,                 sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index 21eac7fd3..ed64d0ef3 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -186,7 +186,6 @@ void INSERT_TASK_zgemm_Astat( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zgemm,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zgemm_args_s),
@@ -258,7 +257,6 @@ void INSERT_TASK_zgemm( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zgemm,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zgemm_args_s),
diff --git a/runtime/starpu/codelets/codelet_zgemv.c b/runtime/starpu/codelets/codelet_zgemv.c
index acb50f65f..35830c312 100644
--- a/runtime/starpu/codelets/codelet_zgemv.c
+++ b/runtime/starpu/codelets/codelet_zgemv.c
@@ -104,7 +104,6 @@ void INSERT_TASK_zgemv( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &trans,             sizeof(cham_trans_t),
         STARPU_VALUE,    &m,                 sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgeqrt.c b/runtime/starpu/codelets/codelet_zgeqrt.c
index 54cb174f4..bb350b8d4 100644
--- a/runtime/starpu/codelets/codelet_zgeqrt.c
+++ b/runtime/starpu/codelets/codelet_zgeqrt.c
@@ -77,7 +77,6 @@ void INSERT_TASK_zgeqrt(const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &m,                 sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgered.c b/runtime/starpu/codelets/codelet_zgered.c
index b634db06b..a6f8cab28 100644
--- a/runtime/starpu/codelets/codelet_zgered.c
+++ b/runtime/starpu/codelets/codelet_zgered.c
@@ -78,7 +78,6 @@ void INSERT_TASK_zgered( const RUNTIME_option_t *options,
             starpu_cham_tile_register( &handleAout, -1, tileA, ChamComplexHalf );
 
             rt_starpu_insert_task(
-                options->sequence->comm,
                 &cl_dlag2h,
                 STARPU_VALUE,    &m,                 sizeof(int),
                 STARPU_VALUE,    &n,                 sizeof(int),
@@ -120,7 +119,6 @@ void INSERT_TASK_zgered( const RUNTIME_option_t *options,
         starpu_cham_tile_register( &handleAout, -1, tileA, ChamComplexFloat );
 
         rt_starpu_insert_task(
-            options->sequence->comm,
             &cl_zlag2c,
             STARPU_VALUE,    &m,                 sizeof(int),
             STARPU_VALUE,    &n,                 sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgerst.c b/runtime/starpu/codelets/codelet_zgerst.c
index d41a70456..7aca89b00 100644
--- a/runtime/starpu/codelets/codelet_zgerst.c
+++ b/runtime/starpu/codelets/codelet_zgerst.c
@@ -70,7 +70,6 @@ void INSERT_TASK_zgerst( const RUNTIME_option_t *options,
                  A->myrank, Am, An );
 #endif
         rt_starpu_insert_task(
-            options->sequence->comm,
             &cl_hlag2d,
             STARPU_VALUE,    &m,                 sizeof(int),
             STARPU_VALUE,    &n,                 sizeof(int),
@@ -93,7 +92,6 @@ void INSERT_TASK_zgerst( const RUNTIME_option_t *options,
                  A->myrank, Am, An );
 #endif
         rt_starpu_insert_task(
-            options->sequence->comm,
             &cl_clag2z,
             STARPU_VALUE,    &m,                 sizeof(int),
             STARPU_VALUE,    &n,                 sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgessm.c b/runtime/starpu/codelets/codelet_zgessm.c
index fba34de91..4c2f1fb1b 100644
--- a/runtime/starpu/codelets/codelet_zgessm.c
+++ b/runtime/starpu/codelets/codelet_zgessm.c
@@ -71,7 +71,6 @@ void INSERT_TASK_zgessm( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,     &m,                        sizeof(int),
         STARPU_VALUE,     &n,                        sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgessq.c b/runtime/starpu/codelets/codelet_zgessq.c
index 92da99f22..a951ac6bc 100644
--- a/runtime/starpu/codelets/codelet_zgessq.c
+++ b/runtime/starpu/codelets/codelet_zgessq.c
@@ -61,7 +61,6 @@ void INSERT_TASK_zgessq( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &storev,                     sizeof(cham_store_t),
         STARPU_VALUE,    &m,                          sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgesum.c b/runtime/starpu/codelets/codelet_zgesum.c
index e5f1dc917..a301533d1 100644
--- a/runtime/starpu/codelets/codelet_zgesum.c
+++ b/runtime/starpu/codelets/codelet_zgesum.c
@@ -67,7 +67,6 @@ void INSERT_TASK_zgesum( const RUNTIME_option_t *options,
     }
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zgesum_args_s),
         STARPU_R,        RTBLKADDR(A, ChamComplexDouble, Am, An),
diff --git a/runtime/starpu/codelets/codelet_zgetrf.c b/runtime/starpu/codelets/codelet_zgetrf.c
index b99cec415..181f57df0 100644
--- a/runtime/starpu/codelets/codelet_zgetrf.c
+++ b/runtime/starpu/codelets/codelet_zgetrf.c
@@ -71,7 +71,6 @@ void INSERT_TASK_zgetrf( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,             &m,                        sizeof(int),
         STARPU_VALUE,             &n,                        sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgetrf_blocked.c b/runtime/starpu/codelets/codelet_zgetrf_blocked.c
index 1d654ce23..832132f4f 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_blocked.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_blocked.c
@@ -122,7 +122,6 @@ void INSERT_TASK_zgetrf_blocked_diag( const RUNTIME_option_t *options,
                                       A->get_blktile( A, Am, An ) );
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,             &h,                   sizeof(int),
         STARPU_VALUE,             &m0,                  sizeof(int),
@@ -206,7 +205,6 @@ void INSERT_TASK_zgetrf_blocked_offdiag( const RUNTIME_option_t *options,
                                       A->get_blktile( A, Am, An ) );
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,             &h,                   sizeof(int),
         STARPU_VALUE,             &m0,                  sizeof(int),
@@ -285,7 +283,6 @@ void INSERT_TASK_zgetrf_blocked_trsm( const RUNTIME_option_t *options,
                                       U->get_blktile( U, Um, Un ) );
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,             &m,                   sizeof(int),
         STARPU_VALUE,             &n,                   sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
index 12af07283..4ff218c4c 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
@@ -79,7 +79,6 @@ void INSERT_TASK_zgetrf_incpiv(const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &m,                 sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
index aee43a54f..3c0bccc80 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
@@ -71,7 +71,6 @@ void INSERT_TASK_zgetrf_nopiv(const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &m,                         sizeof(int),
         STARPU_VALUE,    &n,                         sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgetrf_nopiv_percol.c b/runtime/starpu/codelets/codelet_zgetrf_nopiv_percol.c
index 75222747a..5643f3e63 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_nopiv_percol.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_nopiv_percol.c
@@ -90,7 +90,6 @@ void INSERT_TASK_zgetrf_nopiv_percol_diag( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,             &m,                   sizeof(int),
         STARPU_VALUE,             &n,                   sizeof(int),
@@ -162,7 +161,6 @@ void INSERT_TASK_zgetrf_nopiv_percol_trsm( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,             &m, sizeof(int),
         STARPU_VALUE,             &n, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgetrf_percol.c b/runtime/starpu/codelets/codelet_zgetrf_percol.c
index a4c3a9695..7829c3f3e 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_percol.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_percol.c
@@ -100,7 +100,6 @@ void INSERT_TASK_zgetrf_percol_diag( const RUNTIME_option_t *options,
                                       A->get_blktile( A, Am, An ) );
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,             &h,                   sizeof(int),
         STARPU_VALUE,             &m0,                  sizeof(int),
@@ -170,7 +169,6 @@ void INSERT_TASK_zgetrf_percol_offdiag( const RUNTIME_option_t *options,
                                       A->get_blktile( A, Am, An ) );
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,             &h,                   sizeof(int),
         STARPU_VALUE,             &m0,                  sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zgram.c b/runtime/starpu/codelets/codelet_zgram.c
index f2f5d0258..d43e7884f 100644
--- a/runtime/starpu/codelets/codelet_zgram.c
+++ b/runtime/starpu/codelets/codelet_zgram.c
@@ -64,7 +64,6 @@ void INSERT_TASK_zgram( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &uplo,                      sizeof(int),
         STARPU_VALUE,    &m,                         sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zhe2ge.c b/runtime/starpu/codelets/codelet_zhe2ge.c
index a1c6dee97..19af61a01 100644
--- a/runtime/starpu/codelets/codelet_zhe2ge.c
+++ b/runtime/starpu/codelets/codelet_zhe2ge.c
@@ -61,7 +61,6 @@ void INSERT_TASK_zhe2ge( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,  &uplo,                sizeof(int),
         STARPU_VALUE,     &m,                        sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index cbaca240a..bb87a2bd1 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -188,7 +188,6 @@ void INSERT_TASK_zhemm_Astat( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zhemm,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zhemm_args_s),
@@ -259,7 +258,6 @@ void INSERT_TASK_zhemm( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zhemm,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zhemm_args_s),
diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c
index adfc14e1c..400f14612 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/runtime/starpu/codelets/codelet_zher2k.c
@@ -148,7 +148,6 @@ INSERT_TASK_zher2k( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,      &uplo,                sizeof(int),
         STARPU_VALUE,     &trans,                sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zherfb.c b/runtime/starpu/codelets/codelet_zherfb.c
index d8c0fc85b..f7c168edd 100644
--- a/runtime/starpu/codelets/codelet_zherfb.c
+++ b/runtime/starpu/codelets/codelet_zherfb.c
@@ -99,7 +99,6 @@ void INSERT_TASK_zherfb(const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &uplo,              sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index 5e6fd114a..e22373ea5 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -154,7 +154,6 @@ void INSERT_TASK_zherk( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zherk,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zherk_args_s),
diff --git a/runtime/starpu/codelets/codelet_zlacpy.c b/runtime/starpu/codelets/codelet_zlacpy.c
index b9363cfef..0d998b617 100644
--- a/runtime/starpu/codelets/codelet_zlacpy.c
+++ b/runtime/starpu/codelets/codelet_zlacpy.c
@@ -183,7 +183,6 @@ void INSERT_TASK_zlacpyx( const RUNTIME_option_t *options,
 
         /* Insert the task */
         rt_starpu_insert_task(
-            options->sequence->comm,
             &cl_zlacpyx,
             /* Task codelet arguments */
             STARPU_CL_ARGS, clargs, sizeof(struct cl_zlacpy_args_s),
@@ -259,7 +258,6 @@ void INSERT_TASK_zlacpy( const RUNTIME_option_t *options,
         callback = options->profiling ? cl_zlacpy_callback : NULL;
 
         rt_starpu_insert_task(
-            options->sequence->comm,
             &cl_zlacpy,
             /* Task codelet arguments */
             STARPU_CL_ARGS, clargs, sizeof(struct cl_zlacpy_args_s),
diff --git a/runtime/starpu/codelets/codelet_zlag2c.c b/runtime/starpu/codelets/codelet_zlag2c.c
index 4d50142f8..1a56bc748 100644
--- a/runtime/starpu/codelets/codelet_zlag2c.c
+++ b/runtime/starpu/codelets/codelet_zlag2c.c
@@ -97,7 +97,6 @@ void INSERT_TASK_zlag2c(const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &m,                 sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),
@@ -176,7 +175,6 @@ void INSERT_TASK_clag2z( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &m,                 sizeof(int),
         STARPU_VALUE,    &n,                 sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zlange.c b/runtime/starpu/codelets/codelet_zlange.c
index f4ff38318..01ac3d111 100644
--- a/runtime/starpu/codelets/codelet_zlange.c
+++ b/runtime/starpu/codelets/codelet_zlange.c
@@ -66,7 +66,6 @@ void INSERT_TASK_zlange( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &norm,              sizeof(cham_normtype_t),
         STARPU_VALUE,    &M,                 sizeof(int),
@@ -121,7 +120,6 @@ void INSERT_TASK_zlange_max(const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_R,        RTBLKADDR(A, ChamRealDouble, Am, An),
         STARPU_RW,       RTBLKADDR(B, ChamRealDouble, Bm, Bn),
diff --git a/runtime/starpu/codelets/codelet_zlanhe.c b/runtime/starpu/codelets/codelet_zlanhe.c
index eccd6bdfd..3a12a9bef 100644
--- a/runtime/starpu/codelets/codelet_zlanhe.c
+++ b/runtime/starpu/codelets/codelet_zlanhe.c
@@ -65,7 +65,6 @@ void INSERT_TASK_zlanhe(const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &norm,              sizeof(int),
         STARPU_VALUE,    &uplo,              sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zlansy.c b/runtime/starpu/codelets/codelet_zlansy.c
index 1776ed907..d07dd10b7 100644
--- a/runtime/starpu/codelets/codelet_zlansy.c
+++ b/runtime/starpu/codelets/codelet_zlansy.c
@@ -66,7 +66,6 @@ void INSERT_TASK_zlansy( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &norm,              sizeof(int),
         STARPU_VALUE,    &uplo,              sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zlantr.c b/runtime/starpu/codelets/codelet_zlantr.c
index ba8d69258..cee8c0b7f 100644
--- a/runtime/starpu/codelets/codelet_zlantr.c
+++ b/runtime/starpu/codelets/codelet_zlantr.c
@@ -65,7 +65,6 @@ void INSERT_TASK_zlantr( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &norm,              sizeof(int),
         STARPU_VALUE,    &uplo,              sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zlascal.c b/runtime/starpu/codelets/codelet_zlascal.c
index 9af659b92..000f4b8b9 100644
--- a/runtime/starpu/codelets/codelet_zlascal.c
+++ b/runtime/starpu/codelets/codelet_zlascal.c
@@ -88,7 +88,6 @@ void INSERT_TASK_zlascal( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zlascal,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zlascal_args_s),
diff --git a/runtime/starpu/codelets/codelet_zlaset.c b/runtime/starpu/codelets/codelet_zlaset.c
index d4ba3c6b2..1992b9815 100644
--- a/runtime/starpu/codelets/codelet_zlaset.c
+++ b/runtime/starpu/codelets/codelet_zlaset.c
@@ -82,7 +82,6 @@ void INSERT_TASK_zlaset( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zlaset,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zlaset_args_s),
diff --git a/runtime/starpu/codelets/codelet_zlaset2.c b/runtime/starpu/codelets/codelet_zlaset2.c
index 8dc3f3206..deef53db0 100644
--- a/runtime/starpu/codelets/codelet_zlaset2.c
+++ b/runtime/starpu/codelets/codelet_zlaset2.c
@@ -61,7 +61,6 @@ void INSERT_TASK_zlaset2(const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,  &uplo,                sizeof(int),
         STARPU_VALUE,     &M,                        sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zlaswp.c b/runtime/starpu/codelets/codelet_zlaswp.c
index 756959aad..4ffa8384c 100644
--- a/runtime/starpu/codelets/codelet_zlaswp.c
+++ b/runtime/starpu/codelets/codelet_zlaswp.c
@@ -51,7 +51,6 @@ void INSERT_TASK_zlaswp_get( const RUNTIME_option_t *options,
     //void (*callback)(void*) = options->profiling ? cl_zlaswp_get_callback : NULL;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,               &m0, sizeof(int),
         STARPU_VALUE,               &k,  sizeof(int),
@@ -96,7 +95,6 @@ void INSERT_TASK_zlaswp_set( const RUNTIME_option_t *options,
     //void (*callback)(void*) = options->profiling ? cl_zlaswp_set_callback : NULL;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,             &m0, sizeof(int),
         STARPU_VALUE,             &k,  sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zlatro.c b/runtime/starpu/codelets/codelet_zlatro.c
index c29de8c41..9ce157877 100644
--- a/runtime/starpu/codelets/codelet_zlatro.c
+++ b/runtime/starpu/codelets/codelet_zlatro.c
@@ -72,7 +72,6 @@ void INSERT_TASK_zlatro( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,   &uplo,    sizeof(int),
         STARPU_VALUE,   &trans,   sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zlauum.c b/runtime/starpu/codelets/codelet_zlauum.c
index 2bff43b0f..72423638b 100644
--- a/runtime/starpu/codelets/codelet_zlauum.c
+++ b/runtime/starpu/codelets/codelet_zlauum.c
@@ -80,7 +80,6 @@ void INSERT_TASK_zlauum( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zlauum,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zlauum_args_s),
diff --git a/runtime/starpu/codelets/codelet_zplghe.c b/runtime/starpu/codelets/codelet_zplghe.c
index bd27f834b..823355138 100644
--- a/runtime/starpu/codelets/codelet_zplghe.c
+++ b/runtime/starpu/codelets/codelet_zplghe.c
@@ -86,7 +86,6 @@ void INSERT_TASK_zplghe( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zplghe,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zplghe_args_s),
diff --git a/runtime/starpu/codelets/codelet_zplgsy.c b/runtime/starpu/codelets/codelet_zplgsy.c
index 320f9656b..0e37a66d8 100644
--- a/runtime/starpu/codelets/codelet_zplgsy.c
+++ b/runtime/starpu/codelets/codelet_zplgsy.c
@@ -86,7 +86,6 @@ void INSERT_TASK_zplgsy( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zplgsy,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zplgsy_args_s),
diff --git a/runtime/starpu/codelets/codelet_zplrnt.c b/runtime/starpu/codelets/codelet_zplrnt.c
index 185c5b044..3a93cb4ca 100644
--- a/runtime/starpu/codelets/codelet_zplrnt.c
+++ b/runtime/starpu/codelets/codelet_zplrnt.c
@@ -85,7 +85,6 @@ void INSERT_TASK_zplrnt( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zplrnt,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zplrnt_args_s),
diff --git a/runtime/starpu/codelets/codelet_zplssq.c b/runtime/starpu/codelets/codelet_zplssq.c
index f2ef6c861..15f3bb16e 100644
--- a/runtime/starpu/codelets/codelet_zplssq.c
+++ b/runtime/starpu/codelets/codelet_zplssq.c
@@ -65,7 +65,6 @@ void INSERT_TASK_zplssq( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &storev,            sizeof(int),
         STARPU_VALUE,    &M,                 sizeof(int),
@@ -114,7 +113,6 @@ void INSERT_TASK_zplssq2( const RUNTIME_option_t *options, int N,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &N,                 sizeof(int),
         STARPU_RW, RTBLKADDR(RESULT, ChamRealDouble, RESULTm, RESULTn),
diff --git a/runtime/starpu/codelets/codelet_zpotrf.c b/runtime/starpu/codelets/codelet_zpotrf.c
index 7c1817c74..5e06db2e3 100644
--- a/runtime/starpu/codelets/codelet_zpotrf.c
+++ b/runtime/starpu/codelets/codelet_zpotrf.c
@@ -97,7 +97,6 @@ void INSERT_TASK_zpotrf( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zpotrf,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zpotrf_args_s),
diff --git a/runtime/starpu/codelets/codelet_zssssm.c b/runtime/starpu/codelets/codelet_zssssm.c
index 8902e7d3a..56b3fd54c 100644
--- a/runtime/starpu/codelets/codelet_zssssm.c
+++ b/runtime/starpu/codelets/codelet_zssssm.c
@@ -78,7 +78,6 @@ void INSERT_TASK_zssssm( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &m1,                        sizeof(int),
         STARPU_VALUE,    &n1,                        sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index 785e198d0..e518b8b44 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -189,7 +189,6 @@ void INSERT_TASK_zsymm_Astat( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zsymm,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zsymm_args_s),
@@ -260,7 +259,6 @@ void INSERT_TASK_zsymm( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zsymm,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zsymm_args_s),
diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c
index 655233def..2c2d35c2f 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -147,7 +147,6 @@ void INSERT_TASK_zsyr2k(const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,      &uplo,                sizeof(int),
         STARPU_VALUE,     &trans,                sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index 1e2077e68..f89e1f223 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -155,7 +155,6 @@ void INSERT_TASK_zsyrk( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_zsyrk,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_zsyrk_args_s),
diff --git a/runtime/starpu/codelets/codelet_zsyssq.c b/runtime/starpu/codelets/codelet_zsyssq.c
index ef3c506ad..53815341b 100644
--- a/runtime/starpu/codelets/codelet_zsyssq.c
+++ b/runtime/starpu/codelets/codelet_zsyssq.c
@@ -59,7 +59,6 @@ void INSERT_TASK_zsyssq( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &storev,                     sizeof(cham_store_t),
         STARPU_VALUE,    &uplo,                       sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
index c0a52dac9..44d1bb95e 100644
--- a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
@@ -61,7 +61,6 @@ void INSERT_TASK_zsytrf_nopiv( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &uplo,                      sizeof(int),
         STARPU_VALUE,    &n,                         sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztplqt.c b/runtime/starpu/codelets/codelet_ztplqt.c
index af16f7b03..7bef41041 100644
--- a/runtime/starpu/codelets/codelet_ztplqt.c
+++ b/runtime/starpu/codelets/codelet_ztplqt.c
@@ -67,7 +67,6 @@ void INSERT_TASK_ztplqt( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE, &M,     sizeof(int),
         STARPU_VALUE, &N,     sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztpmlqt.c b/runtime/starpu/codelets/codelet_ztpmlqt.c
index 34b697a6c..62b0e5d20 100644
--- a/runtime/starpu/codelets/codelet_ztpmlqt.c
+++ b/runtime/starpu/codelets/codelet_ztpmlqt.c
@@ -109,7 +109,6 @@ void INSERT_TASK_ztpmlqt( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE, &side,  sizeof(int),
         STARPU_VALUE, &trans, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztpmqrt.c b/runtime/starpu/codelets/codelet_ztpmqrt.c
index 8226c1bb5..e2e0349bf 100644
--- a/runtime/starpu/codelets/codelet_ztpmqrt.c
+++ b/runtime/starpu/codelets/codelet_ztpmqrt.c
@@ -109,7 +109,6 @@ void INSERT_TASK_ztpmqrt( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE, &side,  sizeof(int),
         STARPU_VALUE, &trans, sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztpqrt.c b/runtime/starpu/codelets/codelet_ztpqrt.c
index f2acabc00..df369b0b2 100644
--- a/runtime/starpu/codelets/codelet_ztpqrt.c
+++ b/runtime/starpu/codelets/codelet_ztpqrt.c
@@ -68,7 +68,6 @@ void INSERT_TASK_ztpqrt( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE, &M,     sizeof(int),
         STARPU_VALUE, &N,     sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztradd.c b/runtime/starpu/codelets/codelet_ztradd.c
index ad0df5489..16ddd77e5 100644
--- a/runtime/starpu/codelets/codelet_ztradd.c
+++ b/runtime/starpu/codelets/codelet_ztradd.c
@@ -95,7 +95,6 @@ void INSERT_TASK_ztradd( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_ztradd,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_ztradd_args_s),
diff --git a/runtime/starpu/codelets/codelet_ztrasm.c b/runtime/starpu/codelets/codelet_ztrasm.c
index a431e5b3b..c0f14b574 100644
--- a/runtime/starpu/codelets/codelet_ztrasm.c
+++ b/runtime/starpu/codelets/codelet_ztrasm.c
@@ -62,7 +62,6 @@ void INSERT_TASK_ztrasm( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &storev,                    sizeof(int),
         STARPU_VALUE,    &uplo,                      sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index db90a3d35..01096c0cd 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -145,7 +145,6 @@ void INSERT_TASK_ztrmm( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_ztrmm,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_ztrmm_args_s),
diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c
index 022456236..d9549a3bb 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -149,7 +149,6 @@ void INSERT_TASK_ztrsm( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_ztrsm,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_ztrsm_args_s),
diff --git a/runtime/starpu/codelets/codelet_ztrssq.c b/runtime/starpu/codelets/codelet_ztrssq.c
index 885c80853..23e1c525a 100644
--- a/runtime/starpu/codelets/codelet_ztrssq.c
+++ b/runtime/starpu/codelets/codelet_ztrssq.c
@@ -61,7 +61,6 @@ void INSERT_TASK_ztrssq( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &uplo,                      sizeof(int),
         STARPU_VALUE,    &diag,                      sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztrtri.c b/runtime/starpu/codelets/codelet_ztrtri.c
index edf3b1498..36b33f132 100644
--- a/runtime/starpu/codelets/codelet_ztrtri.c
+++ b/runtime/starpu/codelets/codelet_ztrtri.c
@@ -93,7 +93,6 @@ void INSERT_TASK_ztrtri( const RUNTIME_option_t *options,
 
     /* Insert the task */
     rt_starpu_insert_task(
-        options->sequence->comm,
         &cl_ztrtri,
         /* Task codelet arguments */
         STARPU_CL_ARGS, clargs, sizeof(struct cl_ztrtri_args_s),
diff --git a/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c b/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
index 8cbdf5a0a..4aed2ed5a 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
@@ -86,7 +86,6 @@ void INSERT_TASK_ztsmlq_hetra1( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &side,              sizeof(int),
         STARPU_VALUE,    &trans,             sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c b/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
index ff47896bd..ca9798845 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
+++ b/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
@@ -86,7 +86,6 @@ void INSERT_TASK_ztsmqr_hetra1( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &side,              sizeof(int),
         STARPU_VALUE,    &trans,             sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_ztstrf.c b/runtime/starpu/codelets/codelet_ztstrf.c
index d08962a95..e9743232b 100644
--- a/runtime/starpu/codelets/codelet_ztstrf.c
+++ b/runtime/starpu/codelets/codelet_ztstrf.c
@@ -91,7 +91,6 @@ void INSERT_TASK_ztstrf( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &m,                         sizeof(int),
         STARPU_VALUE,    &n,                         sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zunmlq.c b/runtime/starpu/codelets/codelet_zunmlq.c
index d3a445f7a..dd4251dcc 100644
--- a/runtime/starpu/codelets/codelet_zunmlq.c
+++ b/runtime/starpu/codelets/codelet_zunmlq.c
@@ -111,7 +111,6 @@ void INSERT_TASK_zunmlq( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &side,              sizeof(int),
         STARPU_VALUE,    &trans,             sizeof(int),
diff --git a/runtime/starpu/codelets/codelet_zunmqr.c b/runtime/starpu/codelets/codelet_zunmqr.c
index 8cb39e8c7..4640a678e 100644
--- a/runtime/starpu/codelets/codelet_zunmqr.c
+++ b/runtime/starpu/codelets/codelet_zunmqr.c
@@ -110,7 +110,6 @@ void INSERT_TASK_zunmqr( const RUNTIME_option_t *options,
     CHAMELEON_END_ACCESS_DECLARATION;
 
     rt_starpu_insert_task(
-        options->sequence->comm,
         codelet,
         STARPU_VALUE,    &side,              sizeof(int),
         STARPU_VALUE,    &trans,             sizeof(int),
diff --git a/runtime/starpu/include/chameleon_starpu.h.in b/runtime/starpu/include/chameleon_starpu.h.in
index bbaf1bbdb..6a0b5929f 100644
--- a/runtime/starpu/include/chameleon_starpu.h.in
+++ b/runtime/starpu/include/chameleon_starpu.h.in
@@ -130,20 +130,20 @@ void *RUNTIME_data_getaddr_withconversion( const RUNTIME_option_t *options,
 #if defined(CHAMELEON_USE_MPI)
 
 #if defined(CHAMELEON_RUNTIME_SYNC)
-#define rt_starpu_insert_task( _comm_, _codelet_, ... )                         \
-    starpu_mpi_insert_task( (_comm_), (_codelet_), STARPU_TASK_SYNCHRONOUS, 1, ##__VA_ARGS__ )
+#define rt_starpu_insert_task( _codelet_, ... )                         \
+    starpu_mpi_insert_task( options->sequence->comm, (_codelet_), STARPU_TASK_SYNCHRONOUS, 1, ##__VA_ARGS__ )
 #else
-#define rt_starpu_insert_task( _comm_, _codelet_, ... )                         \
-    starpu_mpi_insert_task( (_comm_), (_codelet_), ##__VA_ARGS__ )
+#define rt_starpu_insert_task( _codelet_, ... )                         \
+    starpu_mpi_insert_task( options->sequence->comm, (_codelet_), ##__VA_ARGS__ )
 #endif
 
 #else
 
 #if defined(CHAMELEON_RUNTIME_SYNC)
-#define rt_starpu_insert_task( _comm_, _codelet_, ... )                         \
+#define rt_starpu_insert_task( _codelet_, ... )                         \
     starpu_insert_task( (_codelet_), STARPU_TASK_SYNCHRONOUS, 1, ##__VA_ARGS__ )
 #else
-#define rt_starpu_insert_task( _comm_, _codelet_, ... )                         \
+#define rt_starpu_insert_task( _codelet_, ... )                         \
     starpu_insert_task( (_codelet_), ##__VA_ARGS__ )
 #endif
 
-- 
GitLab