diff --git a/compute/pzgelqf.c b/compute/pzgelqf.c
index 6fc0628a915fc14df3d933f7d3815d3563141a12..09dbfc41eae282599a3ec0de4dc0279fe9522ab4 100644
--- a/compute/pzgelqf.c
+++ b/compute/pzgelqf.c
@@ -127,8 +127,8 @@ void morse_pzgelqf(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D,
                 T(k, k), T->mb,
                 A(m, k), ldam);
         }
-        MORSE_TASK_dataflush( &options, D(k)    );
-        MORSE_TASK_dataflush( &options, T(k, k) );
+        RUNTIME_data_flush( sequence, D(k)    );
+        RUNTIME_data_flush( sequence, T(k, k) );
 
         for (n = k+1; n < A->nt; n++) {
             tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
@@ -159,8 +159,8 @@ void morse_pzgelqf(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D,
                     A(m, k), ldam,
                     A(m, n), ldam);
             }
-            MORSE_TASK_dataflush( &options, A(k, n) );
-            MORSE_TASK_dataflush( &options, T(k, n) );
+            RUNTIME_data_flush( sequence, A(k, n) );
+            RUNTIME_data_flush( sequence, T(k, n) );
         }
 
         /* Restore the original location of the tiles */
diff --git a/compute/pzgelqf_param.c b/compute/pzgelqf_param.c
index d9c8036b4077971c0a0422c96beef5efcfa63958..c6c5ceeaa3e7a422700bfa9b4f0fc488df9990c6 100644
--- a/compute/pzgelqf_param.c
+++ b/compute/pzgelqf_param.c
@@ -135,8 +135,8 @@ void morse_pzgelqf_param( const libhqr_tree_t *qrtree, MORSE_desc_t *A,
                     T(k, p), T->mb,
                     A(m, p), ldam);
             }
-            MORSE_TASK_dataflush( &options, D(k, p) );
-            MORSE_TASK_dataflush( &options, T(k, p) );
+            RUNTIME_data_flush( sequence, D(k, p) );
+            RUNTIME_data_flush( sequence, T(k, p) );
         }
 
         /* Setting the order of the tiles */
@@ -190,8 +190,8 @@ void morse_pzgelqf_param( const libhqr_tree_t *qrtree, MORSE_desc_t *A,
                     A(m, p), ldam,
                     A(m, n), ldam);
             }
-            MORSE_TASK_dataflush( &options, A(k, n) );
-            MORSE_TASK_dataflush( &options, T(k, n) );
+            RUNTIME_data_flush( sequence, A(k, n) );
+            RUNTIME_data_flush( sequence, T(k, n) );
         }
 
         /* Restore the original location of the tiles */
diff --git a/compute/pzgelqfrh.c b/compute/pzgelqfrh.c
index 1e2910b95ca420f807914c2f3139bc699ba00776..e8f7638fbecea65ab14a3904e2d0c0d6aa568e4c 100644
--- a/compute/pzgelqfrh.c
+++ b/compute/pzgelqfrh.c
@@ -127,8 +127,8 @@ void morse_pzgelqfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
                     T(k, N), T->mb,
                     A(m, N), ldam);
             }
-            MORSE_TASK_dataflush( &options, D(k, N) );
-            MORSE_TASK_dataflush( &options, T(k, N) );
+            RUNTIME_data_flush( sequence, D(k, N) );
+            RUNTIME_data_flush( sequence, T(k, N) );
 
             for (n = N+1; n < chameleon_min(N+BS, A->nt); n++) {
                 tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
@@ -160,8 +160,8 @@ void morse_pzgelqfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
                         A(m, N), ldam,
                         A(m, n), ldam);
                 }
-                MORSE_TASK_dataflush( &options, A(k, n) );
-                MORSE_TASK_dataflush( &options, T(k, n) );
+                RUNTIME_data_flush( sequence, A(k, n) );
+                RUNTIME_data_flush( sequence, T(k, n) );
             }
         }
         for (RD = BS; RD < A->nt-k; RD *= 2) {
@@ -199,8 +199,8 @@ void morse_pzgelqfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
                         A (m, N   ), ldam,
                         A (m, N+RD), ldam);
                 }
-                MORSE_TASK_dataflush( &options, A (k, N+RD) );
-                MORSE_TASK_dataflush( &options, T2(k, N+RD) );
+                RUNTIME_data_flush( sequence, A (k, N+RD) );
+                RUNTIME_data_flush( sequence, T2(k, N+RD) );
             }
         }
 
diff --git a/compute/pzgeqrf.c b/compute/pzgeqrf.c
index 1495317c539011f6ff2b38a602093e6877c1ac41..38574eb128a302126c87994cc4eca8ca1c79f4e8 100644
--- a/compute/pzgeqrf.c
+++ b/compute/pzgeqrf.c
@@ -121,8 +121,8 @@ void morse_pzgeqrf(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D,
                 T(k, k), T->mb,
                 A(k, n), ldak);
         }
-        MORSE_TASK_dataflush( &options, D(k)    );
-        MORSE_TASK_dataflush( &options, T(k, k) );
+        RUNTIME_data_flush( sequence, D(k)    );
+        RUNTIME_data_flush( sequence, T(k, k) );
 
         for (m = k+1; m < A->mt; m++) {
             tempmm = m == A->mt-1 ? A->m-m*A->mb : A->mb;
@@ -155,8 +155,8 @@ void morse_pzgeqrf(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D,
                     A(k, n), ldak,
                     A(m, n), ldam);
             }
-            MORSE_TASK_dataflush( &options, A(m, k) );
-            MORSE_TASK_dataflush( &options, T(m, k) );
+            RUNTIME_data_flush( sequence, A(m, k) );
+            RUNTIME_data_flush( sequence, T(m, k) );
         }
 
         /* Restore the original location of the tiles */
diff --git a/compute/pzgeqrf_param.c b/compute/pzgeqrf_param.c
index fea76f60617471cd46f4f9eb2a191f62c5949a20..efc866dabf22abfeb57c8aaad6a147b2749b877d 100644
--- a/compute/pzgeqrf_param.c
+++ b/compute/pzgeqrf_param.c
@@ -132,8 +132,8 @@ void morse_pzgeqrf_param( const libhqr_tree_t *qrtree, MORSE_desc_t *A,
                     T(m, k), T->mb,
                     A(m, n), ldam);
             }
-            MORSE_TASK_dataflush( &options, D(m, k) );
-            MORSE_TASK_dataflush( &options, T(m, k) );
+            RUNTIME_data_flush( sequence, D(m, k) );
+            RUNTIME_data_flush( sequence, T(m, k) );
         }
 
         /* Setting the order of the tiles */
@@ -187,8 +187,8 @@ void morse_pzgeqrf_param( const libhqr_tree_t *qrtree, MORSE_desc_t *A,
                     A(p, n), ldap,
                     A(m, n), ldam);
             }
-            MORSE_TASK_dataflush( &options, A(m, k) );
-            MORSE_TASK_dataflush( &options, T(m, k) );
+            RUNTIME_data_flush( sequence, A(m, k) );
+            RUNTIME_data_flush( sequence, T(m, k) );
         }
 
         /* Restore the original location of the tiles */
diff --git a/compute/pzgeqrfrh.c b/compute/pzgeqrfrh.c
index 5e01a431dc4ac360c80dcb4d1d4448c968887d9f..2235fceb6de0d0bef056e22c33a1db77808f46b0 100644
--- a/compute/pzgeqrfrh.c
+++ b/compute/pzgeqrfrh.c
@@ -125,8 +125,8 @@ void morse_pzgeqrfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
                     T(M, k), T->mb,
                     A(M, n), ldaM);
             }
-            MORSE_TASK_dataflush( &options, D(M, k) );
-            MORSE_TASK_dataflush( &options, T(M, k) );
+            RUNTIME_data_flush( sequence, D(M, k) );
+            RUNTIME_data_flush( sequence, T(M, k) );
 
             for (m = M+1; m < chameleon_min(M+BS, A->mt); m++) {
                 tempmm = m == A->mt-1 ? A->m-m*A->mb : A->mb;
@@ -158,8 +158,8 @@ void morse_pzgeqrfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
                         A(M, n), ldaM,
                         A(m, n), ldam);
                 }
-                MORSE_TASK_dataflush( &options, A(m, k) );
-                MORSE_TASK_dataflush( &options, T(m, k) );
+                RUNTIME_data_flush( sequence, A(m, k) );
+                RUNTIME_data_flush( sequence, T(m, k) );
             }
         }
         for (RD = BS; RD < A->mt-k; RD *= 2) {
@@ -198,8 +198,8 @@ void morse_pzgeqrfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
                         A (M,    n), ldaM,
                         A (M+RD, n), ldaMRD);
                 }
-                MORSE_TASK_dataflush( &options, A (M+RD, k) );
-                MORSE_TASK_dataflush( &options, T2(M+RD, k) );
+                RUNTIME_data_flush( sequence, A (M+RD, k) );
+                RUNTIME_data_flush( sequence, T2(M+RD, k) );
             }
         }
 
diff --git a/compute/pzunglq.c b/compute/pzunglq.c
index ec51767546f92c426278e1f8671a86f28fe2e0c5..b34e519a7cfe42a023693b0f3e8ae76cb1a6a1ae 100644
--- a/compute/pzunglq.c
+++ b/compute/pzunglq.c
@@ -116,8 +116,8 @@ void morse_pzunglq(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc
                     Q(m, k), ldqm,
                     Q(m, n), ldqm);
             }
-            MORSE_TASK_dataflush( &options, A(k, n) );
-            MORSE_TASK_dataflush( &options, T(k, n) );
+            RUNTIME_data_flush( sequence, A(k, n) );
+            RUNTIME_data_flush( sequence, T(k, n) );
         }
 #if defined(CHAMELEON_COPY_DIAG)
         MORSE_TASK_zlacpy(
@@ -148,8 +148,8 @@ void morse_pzunglq(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc
                 T(k, k), T->mb,
                 Q(m, k), ldqm);
         }
-        MORSE_TASK_dataflush( &options, D(k)    );
-        MORSE_TASK_dataflush( &options, T(k, k) );
+        RUNTIME_data_flush( sequence, D(k)    );
+        RUNTIME_data_flush( sequence, T(k, k) );
 
         RUNTIME_iteration_pop(morse);
     }
diff --git a/compute/pzunglq_param.c b/compute/pzunglq_param.c
index 5543ca3b6dae28bddc025de4cb45aedc38b15755..47a83950101f8b0756b20d3e1fecd35c96e8da46 100644
--- a/compute/pzunglq_param.c
+++ b/compute/pzunglq_param.c
@@ -127,8 +127,8 @@ void morse_pzunglq_param(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_des
                     Q(m, p), ldqm,
                     Q(m, n), ldqm);
             }
-            MORSE_TASK_dataflush( &options, A(k, n) );
-            MORSE_TASK_dataflush( &options, T(k, n) );
+            RUNTIME_data_flush( sequence, A(k, n) );
+            RUNTIME_data_flush( sequence, T(k, n) );
         }
 
         T = TS;
@@ -167,8 +167,8 @@ void morse_pzunglq_param(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_des
                     T(k, p), T->mb,
                     Q(m, p), ldqm);
             }
-            MORSE_TASK_dataflush( &options, D(k, p) );
-            MORSE_TASK_dataflush( &options, T(k, p) );
+            RUNTIME_data_flush( sequence, D(k, p) );
+            RUNTIME_data_flush( sequence, T(k, p) );
         }
 
         RUNTIME_iteration_pop(morse);
diff --git a/compute/pzunglqrh.c b/compute/pzunglqrh.c
index 1ee8e66d415d311212671ac8d17da01e37104c4c..adb58487874ff71f17e467024c7ee44d04aa3238 100644
--- a/compute/pzunglqrh.c
+++ b/compute/pzunglqrh.c
@@ -114,8 +114,8 @@ void morse_pzunglqrh(MORSE_desc_t *A, MORSE_desc_t *Q,
                         Q (m, N+RD), ldqm);
                 }
 
-                MORSE_TASK_dataflush( &options, A (k, N+RD) );
-                MORSE_TASK_dataflush( &options, T2(k, N+RD) );
+                RUNTIME_data_flush( sequence, A (k, N+RD) );
+                RUNTIME_data_flush( sequence, T2(k, N+RD) );
             }
         }
         for (N = k; N < A->nt; N += BS) {
@@ -144,8 +144,8 @@ void morse_pzunglqrh(MORSE_desc_t *A, MORSE_desc_t *Q,
                         Q(m, n), ldqm);
                 }
 
-                MORSE_TASK_dataflush( &options, A(k, n) );
-                MORSE_TASK_dataflush( &options, T(k, n) );
+                RUNTIME_data_flush( sequence, A(k, n) );
+                RUNTIME_data_flush( sequence, T(k, n) );
             }
 #if defined(CHAMELEON_COPY_DIAG)
             MORSE_TASK_zlacpy(
@@ -177,8 +177,8 @@ void morse_pzunglqrh(MORSE_desc_t *A, MORSE_desc_t *Q,
                     T(k, N), T->mb,
                     Q(m, N), ldqm);
             }
-            MORSE_TASK_dataflush( &options, D(k, N) );
-            MORSE_TASK_dataflush( &options, T(k, N) );
+            RUNTIME_data_flush( sequence, D(k, N) );
+            RUNTIME_data_flush( sequence, T(k, N) );
         }
         RUNTIME_iteration_pop(morse);
     }
diff --git a/compute/pzungqr.c b/compute/pzungqr.c
index afff40601276edf8f3a2580b0d457546e4af631c..1c85fc7a63a8d3bec7eb71622bb252b74f5d9fd1 100644
--- a/compute/pzungqr.c
+++ b/compute/pzungqr.c
@@ -118,8 +118,8 @@ void morse_pzungqr(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc
                     Q(k, n), ldqk,
                     Q(m, n), ldqm);
             }
-            MORSE_TASK_dataflush( &options, A(m, k) );
-            MORSE_TASK_dataflush( &options, T(m, k) );
+            RUNTIME_data_flush( sequence, A(m, k) );
+            RUNTIME_data_flush( sequence, T(m, k) );
         }
 
 #if defined(CHAMELEON_COPY_DIAG)
@@ -151,8 +151,8 @@ void morse_pzungqr(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T, MORSE_desc
                 T(k, k), T->mb,
                 Q(k, n), ldqk);
         }
-        MORSE_TASK_dataflush( &options, D(k) );
-        MORSE_TASK_dataflush( &options, T(k, k) );
+        RUNTIME_data_flush( sequence, D(k) );
+        RUNTIME_data_flush( sequence, T(k, k) );
 
         RUNTIME_iteration_pop(morse);
     }
diff --git a/compute/pzungqr_param.c b/compute/pzungqr_param.c
index 846bc284760dc098e3ae4379d5d03915dc719286..35107c789d81e8ce527a408a26d7eccb8ced70d3 100644
--- a/compute/pzungqr_param.c
+++ b/compute/pzungqr_param.c
@@ -133,8 +133,8 @@ void morse_pzungqr_param(const libhqr_tree_t *qrtree,
                     Q(p, n), ldqp,
                     Q(m, n), ldqm);
             }
-            MORSE_TASK_dataflush( &options, A(m, k) );
-            MORSE_TASK_dataflush( &options, T(m, k) );
+            RUNTIME_data_flush( sequence, A(m, k) );
+            RUNTIME_data_flush( sequence, T(m, k) );
         }
 
         T = TS;
@@ -176,8 +176,8 @@ void morse_pzungqr_param(const libhqr_tree_t *qrtree,
                     T(m, k), T->mb,
                     Q(m, n), ldqm);
             }
-            MORSE_TASK_dataflush( &options, D(m, k) );
-            MORSE_TASK_dataflush( &options, T(m, k) );
+            RUNTIME_data_flush( sequence, D(m, k) );
+            RUNTIME_data_flush( sequence, T(m, k) );
         }
 
         RUNTIME_iteration_pop(morse);
diff --git a/compute/pzungqrrh.c b/compute/pzungqrrh.c
index 5481c8d00ff0385a35fa07a2d2d76325ea672b3d..4b16f52284bd6f625df8b634ba6f329a888d5d14 100644
--- a/compute/pzungqrrh.c
+++ b/compute/pzungqrrh.c
@@ -117,8 +117,8 @@ void morse_pzungqrrh(MORSE_desc_t *A, MORSE_desc_t *Q,
                         Q (M+RD, n), ldqMRD);
                 }
 
-                MORSE_TASK_dataflush( &options, A (M+RD, k) );
-                MORSE_TASK_dataflush( &options, T2(M+RD, k) );
+                RUNTIME_data_flush( sequence, A (M+RD, k) );
+                RUNTIME_data_flush( sequence, T2(M+RD, k) );
             }
         }
         for (M = k; M < A->mt; M += BS) {
@@ -149,8 +149,8 @@ void morse_pzungqrrh(MORSE_desc_t *A, MORSE_desc_t *Q,
                         Q(M, n), ldqM,
                         Q(m, n), ldqm);
                 }
-                MORSE_TASK_dataflush( &options, A(m, k) );
-                MORSE_TASK_dataflush( &options, T(m, k) );
+                RUNTIME_data_flush( sequence, A(m, k) );
+                RUNTIME_data_flush( sequence, T(m, k) );
             }
 
 #if defined(CHAMELEON_COPY_DIAG)
@@ -183,8 +183,8 @@ void morse_pzungqrrh(MORSE_desc_t *A, MORSE_desc_t *Q,
                     T(M, k), T->mb,
                     Q(M, n), ldqM);
             }
-            MORSE_TASK_dataflush( &options, D(M, k) );
-            MORSE_TASK_dataflush( &options, T(M, k) );
+            RUNTIME_data_flush( sequence, D(M, k) );
+            RUNTIME_data_flush( sequence, T(M, k) );
         }
         RUNTIME_iteration_pop(morse);
     }
diff --git a/compute/pzunmlq.c b/compute/pzunmlq.c
index ae5b3ad31681bb82d281a162b4214d1743bafcee..9e0ddf3839110cdd569f2c0613e2c6472a14f8fe 100644
--- a/compute/pzunmlq.c
+++ b/compute/pzunmlq.c
@@ -128,8 +128,8 @@ void morse_pzunmlq(MORSE_enum side, MORSE_enum trans,
                         B(k, n), ldbk);
                 }
 
-                MORSE_TASK_dataflush( &options, D(k)    );
-                MORSE_TASK_dataflush( &options, T(k, k) );
+                RUNTIME_data_flush( sequence, D(k)    );
+                RUNTIME_data_flush( sequence, T(k, k) );
 
                 for (m = k+1; m < B->mt; m++) {
                     tempmm = m == B->mt-1 ? B->m-m*B->mb : B->mb;
@@ -151,8 +151,8 @@ void morse_pzunmlq(MORSE_enum side, MORSE_enum trans,
                             B(m, n), ldbm);
                     }
 
-                    MORSE_TASK_dataflush( &options, A(k, m) );
-                    MORSE_TASK_dataflush( &options, T(k, m) );
+                    RUNTIME_data_flush( sequence, A(k, m) );
+                    RUNTIME_data_flush( sequence, T(k, m) );
                 }
 
                 /* Restore the original location of the tiles */
@@ -195,8 +195,8 @@ void morse_pzunmlq(MORSE_enum side, MORSE_enum trans,
                             B(m, n), ldbm);
                     }
 
-                    MORSE_TASK_dataflush( &options, A(k, m) );
-                    MORSE_TASK_dataflush( &options, T(k, m) );
+                    RUNTIME_data_flush( sequence, A(k, m) );
+                    RUNTIME_data_flush( sequence, T(k, m) );
                 }
 #if defined(CHAMELEON_COPY_DIAG)
                 MORSE_TASK_zlacpy(
@@ -226,8 +226,8 @@ void morse_pzunmlq(MORSE_enum side, MORSE_enum trans,
                         T(k, k), T->mb,
                         B(k, n), ldbk);
                 }
-                MORSE_TASK_dataflush( &options, D(k)    );
-                MORSE_TASK_dataflush( &options, T(k, k) );
+                RUNTIME_data_flush( sequence, D(k)    );
+                RUNTIME_data_flush( sequence, T(k, k) );
                 RUNTIME_iteration_pop(morse);
             }
         }
@@ -263,8 +263,8 @@ void morse_pzunmlq(MORSE_enum side, MORSE_enum trans,
                             B(m, n), ldbm);
                     }
 
-                    MORSE_TASK_dataflush( &options, A(k, n) );
-                    MORSE_TASK_dataflush( &options, T(k, n) );
+                    RUNTIME_data_flush( sequence, A(k, n) );
+                    RUNTIME_data_flush( sequence, T(k, n) );
                 }
 #if defined(CHAMELEON_COPY_DIAG)
                 MORSE_TASK_zlacpy(
@@ -296,8 +296,8 @@ void morse_pzunmlq(MORSE_enum side, MORSE_enum trans,
                         B(m, k), ldbm);
                 }
 
-                MORSE_TASK_dataflush( &options, D(k)    );
-                MORSE_TASK_dataflush( &options, T(k, k) );
+                RUNTIME_data_flush( sequence, D(k)    );
+                RUNTIME_data_flush( sequence, T(k, k) );
 
                 RUNTIME_iteration_pop(morse);
             }
@@ -338,8 +338,8 @@ void morse_pzunmlq(MORSE_enum side, MORSE_enum trans,
                         B(m, k), ldbm);
                 }
 
-                MORSE_TASK_dataflush( &options, D(k)    );
-                MORSE_TASK_dataflush( &options, T(k, k) );
+                RUNTIME_data_flush( sequence, D(k)    );
+                RUNTIME_data_flush( sequence, T(k, k) );
 
                 for (n = k+1; n < B->nt; n++) {
                     tempnn = n == B->nt-1 ? B->n-n*B->nb : B->nb;
@@ -361,8 +361,8 @@ void morse_pzunmlq(MORSE_enum side, MORSE_enum trans,
                             B(m, n), ldbm);
                     }
 
-                    MORSE_TASK_dataflush( &options, A(k, n) );
-                    MORSE_TASK_dataflush( &options, T(k, n) );
+                    RUNTIME_data_flush( sequence, A(k, n) );
+                    RUNTIME_data_flush( sequence, T(k, n) );
                 }
 
                 /* Restore the original location of the tiles */
diff --git a/compute/pzunmlq_param.c b/compute/pzunmlq_param.c
index 57ef015c7d5ff0046243dda3ec05e3d8208a4e4c..6bfbdb1e7174b033749065d3f7e90dec52ad45ee 100644
--- a/compute/pzunmlq_param.c
+++ b/compute/pzunmlq_param.c
@@ -128,8 +128,8 @@ void morse_pzunmlq_param(const libhqr_tree_t *qrtree,
                             B(p, n), ldbp);
                     }
 
-                    MORSE_TASK_dataflush( &options, D(k, p) );
-                    MORSE_TASK_dataflush( &options, T(k, p) );
+                    RUNTIME_data_flush( sequence, D(k, p) );
+                    RUNTIME_data_flush( sequence, T(k, p) );
                 }
 
                 /* Setting the order of the tiles*/
@@ -170,8 +170,8 @@ void morse_pzunmlq_param(const libhqr_tree_t *qrtree,
                             B(p, n), ldbp,
                             B(m, n), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, A(k, m) );
-                    MORSE_TASK_dataflush( &options, T(k, m) );
+                    RUNTIME_data_flush( sequence, A(k, m) );
+                    RUNTIME_data_flush( sequence, T(k, m) );
                 }
 
                 /* Restore the original location of the tiles */
@@ -231,8 +231,8 @@ void morse_pzunmlq_param(const libhqr_tree_t *qrtree,
                             B(p, n), ldbp,
                             B(m, n), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, A(k, m) );
-                    MORSE_TASK_dataflush( &options, T(k, m) );
+                    RUNTIME_data_flush( sequence, A(k, m) );
+                    RUNTIME_data_flush( sequence, T(k, m) );
                 }
 
                 T = TS;
@@ -272,8 +272,8 @@ void morse_pzunmlq_param(const libhqr_tree_t *qrtree,
                             B(p, n), ldbp);
                     }
 
-                    MORSE_TASK_dataflush( &options, D(k, p) );
-                    MORSE_TASK_dataflush( &options, T(k, p) );
+                    RUNTIME_data_flush( sequence, D(k, p) );
+                    RUNTIME_data_flush( sequence, T(k, p) );
                 }
 
                 RUNTIME_iteration_pop(morse);
@@ -329,8 +329,8 @@ void morse_pzunmlq_param(const libhqr_tree_t *qrtree,
                             B(m, p), ldbm,
                             B(m, n), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, A(k, n) );
-                    MORSE_TASK_dataflush( &options, T(k, n) );
+                    RUNTIME_data_flush( sequence, A(k, n) );
+                    RUNTIME_data_flush( sequence, T(k, n) );
                 }
 
                 T = TS;
@@ -370,8 +370,8 @@ void morse_pzunmlq_param(const libhqr_tree_t *qrtree,
                             B(m, p), ldbm);
                     }
 
-                    MORSE_TASK_dataflush( &options, D(k, p) );
-                    MORSE_TASK_dataflush( &options, T(k, p) );
+                    RUNTIME_data_flush( sequence, D(k, p) );
+                    RUNTIME_data_flush( sequence, T(k, p) );
                 }
 
                 RUNTIME_iteration_pop(morse);
@@ -421,8 +421,8 @@ void morse_pzunmlq_param(const libhqr_tree_t *qrtree,
                             B(m, p), ldbm);
                     }
 
-                    MORSE_TASK_dataflush( &options, D(k, p) );
-                    MORSE_TASK_dataflush( &options, T(k, p) );
+                    RUNTIME_data_flush( sequence, D(k, p) );
+                    RUNTIME_data_flush( sequence, T(k, p) );
                 }
 
                 /* Setting the order of tiles */
@@ -464,8 +464,8 @@ void morse_pzunmlq_param(const libhqr_tree_t *qrtree,
                             B(m, p), ldbm,
                             B(m, n), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, A(k, n) );
-                    MORSE_TASK_dataflush( &options, T(k, n) );
+                    RUNTIME_data_flush( sequence, A(k, n) );
+                    RUNTIME_data_flush( sequence, T(k, n) );
                 }
 
                 RUNTIME_iteration_pop(morse);
diff --git a/compute/pzunmlqrh.c b/compute/pzunmlqrh.c
index 2f04bdd005895cb88004f266b61ea782acbfae7a..539b991698e6d2803200522b874fa7e1d3b8b558 100644
--- a/compute/pzunmlqrh.c
+++ b/compute/pzunmlqrh.c
@@ -123,8 +123,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
                             T(k, N), T->mb,
                             B(N, n), ldbN);
                     }
-                    MORSE_TASK_dataflush( &options, D(k, N) );
-                    MORSE_TASK_dataflush( &options, T(k, N) );
+                    RUNTIME_data_flush( sequence, D(k, N) );
+                    RUNTIME_data_flush( sequence, T(k, N) );
 
                     for (m = N+1; m < chameleon_min(N+BS, A->nt); m++) {
                         tempmm = m == B->mt-1 ? B->m-m*B->mb : B->mb;
@@ -146,8 +146,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
                                 B(N, n), ldbN,
                                 B(m, n), ldbm);
                         }
-                        MORSE_TASK_dataflush( &options, A(k, m) );
-                        MORSE_TASK_dataflush( &options, T(k, m) );
+                        RUNTIME_data_flush( sequence, A(k, m) );
+                        RUNTIME_data_flush( sequence, T(k, m) );
                     }
                 }
                 for (RD = BS; RD < A->nt-k; RD *= 2) {
@@ -173,8 +173,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
                                 B (N,    n), ldbN,
                                 B (N+RD, n), ldbNRD);
                         }
-                        MORSE_TASK_dataflush( &options, A (k, N+RD) );
-                        MORSE_TASK_dataflush( &options, T2(k, N+RD) );
+                        RUNTIME_data_flush( sequence, A (k, N+RD) );
+                        RUNTIME_data_flush( sequence, T2(k, N+RD) );
                     }
                 }
 
@@ -221,8 +221,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
                                 B (N,    n), ldbN,
                                 B (N+RD, n), ldbNRD);
                         }
-                        MORSE_TASK_dataflush( &options, A (k, N+RD) );
-                        MORSE_TASK_dataflush( &options, T2(k, N+RD) );
+                        RUNTIME_data_flush( sequence, A (k, N+RD) );
+                        RUNTIME_data_flush( sequence, T2(k, N+RD) );
                     }
                 }
                 for (N = k; N < A->nt; N += BS) {
@@ -250,8 +250,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
                                 B(N, n), ldbN,
                                 B(m, n), ldbm);
                         }
-                        MORSE_TASK_dataflush( &options, A(k, m) );
-                        MORSE_TASK_dataflush( &options, T(k, m) );
+                        RUNTIME_data_flush( sequence, A(k, m) );
+                        RUNTIME_data_flush( sequence, T(k, m) );
                     }
 #if defined(CHAMELEON_COPY_DIAG)
                     MORSE_TASK_zlacpy(
@@ -282,8 +282,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
                             T(k, N), T->mb,
                             B(N, n), ldbN);
                     }
-                    MORSE_TASK_dataflush( &options, D(k, N) );
-                    MORSE_TASK_dataflush( &options, T(k, N) );
+                    RUNTIME_data_flush( sequence, D(k, N) );
+                    RUNTIME_data_flush( sequence, T(k, N) );
                 }
                 RUNTIME_iteration_pop(morse);
             }
@@ -324,8 +324,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
                                 B (m, N   ), ldbm,
                                 B (m, N+RD), ldbm);
                         }
-                        MORSE_TASK_dataflush( &options, A (k, N+RD) );
-                        MORSE_TASK_dataflush( &options, T2(k, N+RD) );
+                        RUNTIME_data_flush( sequence, A (k, N+RD) );
+                        RUNTIME_data_flush( sequence, T2(k, N+RD) );
                     }
                 }
                 for (N = k; N < A->nt; N += BS) {
@@ -352,8 +352,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
                                 B(m, N), ldbm,
                                 B(m, n), ldbm);
                         }
-                        MORSE_TASK_dataflush( &options, A(k, n) );
-                        MORSE_TASK_dataflush( &options, T(k, n) );
+                        RUNTIME_data_flush( sequence, A(k, n) );
+                        RUNTIME_data_flush( sequence, T(k, n) );
                     }
 #if defined(CHAMELEON_COPY_DIAG)
                     MORSE_TASK_zlacpy(
@@ -385,8 +385,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
                             T(k, N), T->mb,
                             B(m, N), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, D(k, N) );
-                    MORSE_TASK_dataflush( &options, T(k, N) );
+                    RUNTIME_data_flush( sequence, D(k, N) );
+                    RUNTIME_data_flush( sequence, T(k, N) );
                 }
 
                 RUNTIME_iteration_pop(morse);
@@ -429,8 +429,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
                             T(k, N), T->mb,
                             B(m, N), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, D(k, N) );
-                    MORSE_TASK_dataflush( &options, T(k, N) );
+                    RUNTIME_data_flush( sequence, D(k, N) );
+                    RUNTIME_data_flush( sequence, T(k, N) );
 
                     for (n = N+1; n < chameleon_min(N+BS, A->nt); n++) {
                         tempnn = n == B->nt-1 ? B->n-n*B->nb : B->nb;
@@ -453,8 +453,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
                                 B(m, N), ldbm,
                                 B(m, n), ldbm);
                         }
-                        MORSE_TASK_dataflush( &options, A(k, n) );
-                        MORSE_TASK_dataflush( &options, T(k, n) );
+                        RUNTIME_data_flush( sequence, A(k, n) );
+                        RUNTIME_data_flush( sequence, T(k, n) );
                     }
                 }
                 for (RD = BS; RD < A->nt-k; RD *= 2) {
@@ -479,8 +479,8 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
                                 B (m, N   ), ldbm,
                                 B (m, N+RD), ldbm);
                         }
-                        MORSE_TASK_dataflush( &options, A (k, N+RD) );
-                        MORSE_TASK_dataflush( &options, T2(k, N+RD) );
+                        RUNTIME_data_flush( sequence, A (k, N+RD) );
+                        RUNTIME_data_flush( sequence, T2(k, N+RD) );
                     }
                 }
 
diff --git a/compute/pzunmqr.c b/compute/pzunmqr.c
index 3cef739d64cc1e92248aafd72c1d2888aba1dce8..c1897dcc1db6d8ac82d911afc274b1082f310074 100644
--- a/compute/pzunmqr.c
+++ b/compute/pzunmqr.c
@@ -128,8 +128,8 @@ void morse_pzunmqr(MORSE_enum side, MORSE_enum trans,
                         B(k, n), ldbk);
                 }
 
-                MORSE_TASK_dataflush( &options, D(k)    );
-                MORSE_TASK_dataflush( &options, T(k, k) );
+                RUNTIME_data_flush( sequence, D(k)    );
+                RUNTIME_data_flush( sequence, T(k, k) );
 
                 for (m = k+1; m < B->mt; m++) {
                     tempmm = m == B->mt-1 ? B->m-m*B->mb : B->mb;
@@ -152,8 +152,8 @@ void morse_pzunmqr(MORSE_enum side, MORSE_enum trans,
                             B(m, n), ldbm);
                     }
 
-                    MORSE_TASK_dataflush( &options, A(m, k) );
-                    MORSE_TASK_dataflush( &options, T(m, k) );
+                    RUNTIME_data_flush( sequence, A(m, k) );
+                    RUNTIME_data_flush( sequence, T(m, k) );
                 }
 
                 /* Restore the original location of the tiles */
@@ -196,8 +196,8 @@ void morse_pzunmqr(MORSE_enum side, MORSE_enum trans,
                             B(k, n), ldbk,
                             B(m, n), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, A(m, k) );
-                    MORSE_TASK_dataflush( &options, T(m, k) );
+                    RUNTIME_data_flush( sequence, A(m, k) );
+                    RUNTIME_data_flush( sequence, T(m, k) );
                 }
 
 #if defined(CHAMELEON_COPY_DIAG)
@@ -228,8 +228,8 @@ void morse_pzunmqr(MORSE_enum side, MORSE_enum trans,
                         T(k, k), T->mb,
                         B(k, n), ldbk);
                 }
-                MORSE_TASK_dataflush( &options, D(k)    );
-                MORSE_TASK_dataflush( &options, T(k, k) );
+                RUNTIME_data_flush( sequence, D(k)    );
+                RUNTIME_data_flush( sequence, T(k, k) );
                 RUNTIME_iteration_pop(morse);
             }
         }
@@ -267,8 +267,8 @@ void morse_pzunmqr(MORSE_enum side, MORSE_enum trans,
                             B(m, n), ldbm);
                     }
 
-                    MORSE_TASK_dataflush( &options, A(n, k) );
-                    MORSE_TASK_dataflush( &options, T(n, k) );
+                    RUNTIME_data_flush( sequence, A(n, k) );
+                    RUNTIME_data_flush( sequence, T(n, k) );
                 }
 #if defined(CHAMELEON_COPY_DIAG)
                 MORSE_TASK_zlacpy(
@@ -300,8 +300,8 @@ void morse_pzunmqr(MORSE_enum side, MORSE_enum trans,
                         B(m, k), ldbm);
                 }
 
-                MORSE_TASK_dataflush( &options, D(k)    );
-                MORSE_TASK_dataflush( &options, T(k, k) );
+                RUNTIME_data_flush( sequence, D(k)    );
+                RUNTIME_data_flush( sequence, T(k, k) );
 
                 RUNTIME_iteration_pop(morse);
             }
@@ -342,8 +342,8 @@ void morse_pzunmqr(MORSE_enum side, MORSE_enum trans,
                         B(m, k), ldbm);
                 }
 
-                MORSE_TASK_dataflush( &options, D(k)    );
-                MORSE_TASK_dataflush( &options, T(k, k) );
+                RUNTIME_data_flush( sequence, D(k)    );
+                RUNTIME_data_flush( sequence, T(k, k) );
 
                 for (n = k+1; n < B->nt; n++) {
                     tempnn = n == B->nt-1 ? B->n-n*B->nb : B->nb;
@@ -366,8 +366,8 @@ void morse_pzunmqr(MORSE_enum side, MORSE_enum trans,
                             B(m, n), ldbm);
                     }
 
-                    MORSE_TASK_dataflush( &options, A(n, k) );
-                    MORSE_TASK_dataflush( &options, T(n, k) );
+                    RUNTIME_data_flush( sequence, A(n, k) );
+                    RUNTIME_data_flush( sequence, T(n, k) );
                 }
 
                 /* Restore the original location of the tiles */
diff --git a/compute/pzunmqr_param.c b/compute/pzunmqr_param.c
index 4f1bf0d913a8af020464b0ada6a1c3b85794eb7c..55c2b74104127457e7977e11da0a14fcceeaa7a1 100644
--- a/compute/pzunmqr_param.c
+++ b/compute/pzunmqr_param.c
@@ -127,8 +127,8 @@ void morse_pzunmqr_param(const libhqr_tree_t *qrtree,
                             T(m, k), T->mb,
                             B(m, n), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, D(m, k) );
-                    MORSE_TASK_dataflush( &options, T(m, k) );
+                    RUNTIME_data_flush( sequence, D(m, k) );
+                    RUNTIME_data_flush( sequence, T(m, k) );
                 }
 
                 /* Setting the order of the tiles*/
@@ -170,8 +170,8 @@ void morse_pzunmqr_param(const libhqr_tree_t *qrtree,
                             B(p, n), ldbp,
                             B(m, n), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, A(m, k) );
-                    MORSE_TASK_dataflush( &options, T(m, k) );
+                    RUNTIME_data_flush( sequence, A(m, k) );
+                    RUNTIME_data_flush( sequence, T(m, k) );
                }
 
                 /* Restore the original location of the tiles */
@@ -231,8 +231,8 @@ void morse_pzunmqr_param(const libhqr_tree_t *qrtree,
                             B(p, n), ldbp,
                             B(m, n), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, A(m, k) );
-                    MORSE_TASK_dataflush( &options, T(m, k) );
+                    RUNTIME_data_flush( sequence, A(m, k) );
+                    RUNTIME_data_flush( sequence, T(m, k) );
                 }
 
                 T = TS;
@@ -273,8 +273,8 @@ void morse_pzunmqr_param(const libhqr_tree_t *qrtree,
                             B(m, n), ldbm);
                     }
 
-                    MORSE_TASK_dataflush( &options, D(m, k) );
-                    MORSE_TASK_dataflush( &options, T(m, k) );
+                    RUNTIME_data_flush( sequence, D(m, k) );
+                    RUNTIME_data_flush( sequence, T(m, k) );
                 }
 
                 RUNTIME_iteration_pop(morse);
@@ -330,8 +330,8 @@ void morse_pzunmqr_param(const libhqr_tree_t *qrtree,
                             B(m, p), ldbm,
                             B(m, n), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, A(n, k) );
-                    MORSE_TASK_dataflush( &options, T(n, k) );
+                    RUNTIME_data_flush( sequence, A(n, k) );
+                    RUNTIME_data_flush( sequence, T(n, k) );
                 }
 
                 T = TS;
@@ -371,8 +371,8 @@ void morse_pzunmqr_param(const libhqr_tree_t *qrtree,
                             T(n, k), T->mb,
                             B(m, n), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, D(n, k) );
-                    MORSE_TASK_dataflush( &options, T(n, k) );
+                    RUNTIME_data_flush( sequence, D(n, k) );
+                    RUNTIME_data_flush( sequence, T(n, k) );
                 }
                 RUNTIME_iteration_pop(morse);
             }
@@ -419,8 +419,8 @@ void morse_pzunmqr_param(const libhqr_tree_t *qrtree,
                             T(n, k), T->mb,
                             B(m, n), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, D(n, k) );
-                    MORSE_TASK_dataflush( &options, T(n, k) );
+                    RUNTIME_data_flush( sequence, D(n, k) );
+                    RUNTIME_data_flush( sequence, T(n, k) );
                 }
 
                 /* Setting the order of tiles */
@@ -463,8 +463,8 @@ void morse_pzunmqr_param(const libhqr_tree_t *qrtree,
                             B(m, p), ldbm,
                             B(m, n), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, A(n, k) );
-                    MORSE_TASK_dataflush( &options, T(n, k) );
+                    RUNTIME_data_flush( sequence, A(n, k) );
+                    RUNTIME_data_flush( sequence, T(n, k) );
                 }
 
                 RUNTIME_iteration_pop(morse);
diff --git a/compute/pzunmqrrh.c b/compute/pzunmqrrh.c
index 41c96e3d02254b79a705b029807845579fd8818f..c4d6e3e34367dad7d10634662935ac042d32e280 100644
--- a/compute/pzunmqrrh.c
+++ b/compute/pzunmqrrh.c
@@ -123,8 +123,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
                             T(M, k), T->mb,
                             B(M, n), ldbM);
                     }
-                    MORSE_TASK_dataflush( &options, D(M, k) );
-                    MORSE_TASK_dataflush( &options, T(M, k) );
+                    RUNTIME_data_flush( sequence, D(M, k) );
+                    RUNTIME_data_flush( sequence, T(M, k) );
 
                     for (m = M+1; m < chameleon_min(M+BS, A->mt); m++) {
                         tempmm = m == A->mt-1 ? A->m-m*A->mb : A->mb;
@@ -147,8 +147,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
                                 B(M, n), ldbM,
                                 B(m, n), ldbm);
                         }
-                        MORSE_TASK_dataflush( &options, A(m, k) );
-                        MORSE_TASK_dataflush( &options, T(m, k) );
+                        RUNTIME_data_flush( sequence, A(m, k) );
+                        RUNTIME_data_flush( sequence, T(m, k) );
                     }
                 }
                 for (RD = BS; RD < A->mt-k; RD *= 2) {
@@ -174,8 +174,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
                                 B (M,    n), ldbM,
                                 B (M+RD, n), ldbMRD);
                         }
-                        MORSE_TASK_dataflush( &options, A (M+RD, k) );
-                        MORSE_TASK_dataflush( &options, T2(M+RD, k) );
+                        RUNTIME_data_flush( sequence, A (M+RD, k) );
+                        RUNTIME_data_flush( sequence, T2(M+RD, k) );
                     }
                 }
 
@@ -221,8 +221,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
                                 B (M,    n), ldbM,
                                 B (M+RD, n), ldbMRD);
                         }
-                        MORSE_TASK_dataflush( &options, A (M+RD, k) );
-                        MORSE_TASK_dataflush( &options, T2(M+RD, k) );
+                        RUNTIME_data_flush( sequence, A (M+RD, k) );
+                        RUNTIME_data_flush( sequence, T2(M+RD, k) );
                     }
                 }
                 for (M = k; M < A->mt; M += BS) {
@@ -251,8 +251,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
                                 B(M, n), ldbM,
                                 B(m, n), ldbm);
                         }
-                        MORSE_TASK_dataflush( &options, A(m, k) );
-                        MORSE_TASK_dataflush( &options, T(m, k) );
+                        RUNTIME_data_flush( sequence, A(m, k) );
+                        RUNTIME_data_flush( sequence, T(m, k) );
                     }
 #if defined(CHAMELEON_COPY_DIAG)
                     MORSE_TASK_zlacpy(
@@ -281,8 +281,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
                             T(M, k), T->mb,
                             B(M, n), ldbM);
                     }
-                    MORSE_TASK_dataflush( &options, D(M, k) );
-                    MORSE_TASK_dataflush( &options, T(M, k) );
+                    RUNTIME_data_flush( sequence, D(M, k) );
+                    RUNTIME_data_flush( sequence, T(M, k) );
                 }
                 RUNTIME_iteration_pop(morse);
             }
@@ -322,8 +322,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
                                 B (m, M), ldbm,
                                 B (m, M+RD), ldbm);
                         }
-                        MORSE_TASK_dataflush( &options, A (M+RD, k) );
-                        MORSE_TASK_dataflush( &options, T2(M+RD, k) );
+                        RUNTIME_data_flush( sequence, A (M+RD, k) );
+                        RUNTIME_data_flush( sequence, T2(M+RD, k) );
                     }
                 }
                 for (M = k; M < A->mt; M += BS) {
@@ -352,8 +352,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
                                 B(m, M), ldbm,
                                 B(m, n), ldbm);
                         }
-                        MORSE_TASK_dataflush( &options, A(n, k) );
-                        MORSE_TASK_dataflush( &options, T(n, k) );
+                        RUNTIME_data_flush( sequence, A(n, k) );
+                        RUNTIME_data_flush( sequence, T(n, k) );
                     }
 #if defined(CHAMELEON_COPY_DIAG)
                     MORSE_TASK_zlacpy(
@@ -384,8 +384,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
                             T(M, k), T->mb,
                             B(m, M), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, D(M, k) );
-                    MORSE_TASK_dataflush( &options, T(M, k) );
+                    RUNTIME_data_flush( sequence, D(M, k) );
+                    RUNTIME_data_flush( sequence, T(M, k) );
                 }
 
                 RUNTIME_iteration_pop(morse);
@@ -427,8 +427,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
                             T(M, k), T->mb,
                             B(m, M), ldbm);
                     }
-                    MORSE_TASK_dataflush( &options, D(M, k) );
-                    MORSE_TASK_dataflush( &options, T(M, k) );
+                    RUNTIME_data_flush( sequence, D(M, k) );
+                    RUNTIME_data_flush( sequence, T(M, k) );
 
                     for (n = M+1; n < chameleon_min(M+BS,  A->mt); n++) {
                         tempnn = n == B->nt-1 ? B->n-n*B->nb : B->nb;
@@ -451,8 +451,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
                                 B(m, M), ldbm,
                                 B(m, n), ldbm);
                         }
-                        MORSE_TASK_dataflush( &options, A(n, k) );
-                        MORSE_TASK_dataflush( &options, T(n, k) );
+                        RUNTIME_data_flush( sequence, A(n, k) );
+                        RUNTIME_data_flush( sequence, T(n, k) );
                     }
                 }
                 for (RD = BS; RD < A->mt-k; RD *= 2) {
@@ -477,8 +477,8 @@ void morse_pzunmqrrh( MORSE_enum side, MORSE_enum trans,
                                 B (m, M   ), ldbm,
                                 B (m, M+RD), ldbm);
                         }
-                        MORSE_TASK_dataflush( &options, A (M+RD, k) );
-                        MORSE_TASK_dataflush( &options, T2(M+RD, k) );
+                        RUNTIME_data_flush( sequence, A (M+RD, k) );
+                        RUNTIME_data_flush( sequence, T2(M+RD, k) );
                     }
                 }