Rename the flush functions

compute/pzbuild.c

@@ -86,6 +86,6 @@ void morse_pzbuild( MORSE_enum uplo, MORSE_desc_t *A, void *user_data, void* use
     }
   }
 
-  RUNTIME_options_finalize(&options, morse);
-  MORSE_TASK_dataflush_all();
+  MORSE_TASK_flush_desc( &options, uplo, A );
+  RUNTIME_options_finalize( &options, morse);
 }

compute/pzgelqf.c

@@ -152,8 +152,11 @@ void morse_pzgelqf(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D,
 
         RUNTIME_iteration_pop(morse);
     }
+
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
+    MORSE_TASK_flush_desc( &options, MorseUpper, T );
     RUNTIME_options_ws_free(&options);
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
     (void)D;
 }

compute/pzgelqf_param.c

@@ -196,9 +196,12 @@ void morse_pzgelqf_param( const libhqr_tree_t *qrtree, MORSE_desc_t *A,
         RUNTIME_iteration_pop(morse);
     }
 
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
+    MORSE_TASK_flush_desc( &options, MorseUpper, TS );
+    MORSE_TASK_flush_desc( &options, MorseUpper, TT );
     free(tiles);
     RUNTIME_options_ws_free(&options);
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
     (void)D;
 }

compute/pzgelqfrh.c

@@ -180,8 +180,11 @@ void morse_pzgelqfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
         }
         RUNTIME_iteration_pop(morse);
     }
+
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
+    MORSE_TASK_flush_desc( &options, MorseUpper, T );
     RUNTIME_options_ws_free(&options);
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
     (void)D;
 }

compute/pzgemm.c

@@ -134,20 +134,19 @@ void morse_pzgemm(MORSE_enum transA, MORSE_enum transB,
                     }
                 }
             }
+            MORSE_TASK_flush_data( &options, C(m, n) );
         }
         if (transA == MorseNoTrans) {
             for (k = 0; k < A->nt; k++) {
-                MORSE_TASK_dataflush( &options, A(m, k) );
+                MORSE_TASK_flush_data( &options, A(m, k) );
             }
         } else {
             for (k = 0; k < A->mt; k++) {
-                MORSE_TASK_dataflush( &options, A(k, m) );
+                MORSE_TASK_flush_data( &options, A(k, m) );
             }
         }
-        for (n = 0; n < C->nt; n++) {
-            MORSE_TASK_dataflush( &options, C(m, n) );
-        }
     }
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, B );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
 }

compute/pzgeqrf.c

@@ -146,8 +146,11 @@ void morse_pzgeqrf(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D,
 
         RUNTIME_iteration_pop(morse);
     }
+
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
+    MORSE_TASK_flush_desc( &options, MorseLower, T );
     RUNTIME_options_ws_free(&options);
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
     (void)D;
 }

compute/pzgeqrf_param.c

@@ -195,9 +195,12 @@ void morse_pzgeqrf_param( const libhqr_tree_t *qrtree, MORSE_desc_t *A,
         RUNTIME_iteration_pop(morse);
     }
 
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
+    MORSE_TASK_flush_desc( &options, MorseLower, TS );
+    MORSE_TASK_flush_desc( &options, MorseLower, TT );
     free(tiles);
     RUNTIME_options_ws_free(&options);
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
     (void)D;
 }

compute/pzgeqrfrh.c

@@ -177,11 +177,13 @@ void morse_pzgeqrfrh(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *D, int BS,
                 }
             }
         }
-
         RUNTIME_iteration_pop(morse);
     }
+
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
+    MORSE_TASK_flush_desc( &options, MorseLower, T );
     RUNTIME_options_ws_free(&options);
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
     (void)D;
 }

compute/pzgetrf_incpiv.c

@@ -135,9 +135,12 @@ void morse_pzgetrf_incpiv(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV,
 
         RUNTIME_iteration_pop(morse);
     }
+
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
+    MORSE_TASK_flush_desc( &options, MorseLower, L );
     RUNTIME_options_ws_free(&options);
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
 
     morse_desc_mat_free(DIAG);
     free(DIAG);

compute/pzgetrf_nopiv.c

@@ -103,6 +103,8 @@ void morse_pzgetrf_nopiv(MORSE_desc_t *A,
 
         RUNTIME_iteration_pop(morse);
     }
+
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
 }

compute/pzhemm.c

@@ -226,6 +226,9 @@ void morse_pzhemm(MORSE_enum side, MORSE_enum uplo,
             }
         }
     }
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, B );
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, C );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
 }

compute/pzher2k.c

@@ -214,6 +214,9 @@ void morse_pzher2k(MORSE_enum uplo, MORSE_enum trans,
             }
         }
     }
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, B );
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, C );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
 }

compute/pzherk.c

@@ -173,6 +173,7 @@ void morse_pzherk(MORSE_enum uplo, MORSE_enum trans,
             }
         }
     }
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
+    MORSE_TASK_flush_desc( &options, uplo, C );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
 }

compute/pzhetrd_he2hb.c

@@ -435,9 +435,11 @@ void morse_pzhetrd_he2hb(MORSE_enum uplo,
                           A(k, k), ldak);
     }
 
+
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
     RUNTIME_options_ws_free(&options);
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
 
     MORSE_Sequence_Wait(sequence);
     morse_desc_mat_free(D);

compute/pzlacpy.c

@@ -129,6 +129,7 @@ void morse_pzlacpy(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B,
             }
         }
     }
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, B );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
 }

compute/pzlag2c.c

@@ -67,6 +67,7 @@ void morse_pclag2z(MORSE_desc_t *SA, MORSE_desc_t *B,
                 B(m, n), ldbm);
         }
     }
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, SA );
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, B );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
 }

compute/pzlange.c

@@ -412,5 +412,5 @@ void morse_pzlange(MORSE_enum norm, MORSE_desc_t *A, double *result,
     MORSE_Desc_Destroy( &(RESULT) );
     RUNTIME_options_ws_free(&options);
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
 }

compute/pzlanhe.c

@@ -456,5 +456,5 @@ void morse_pzlanhe(MORSE_enum norm, MORSE_enum uplo, MORSE_desc_t *A, double *re
     }
     RUNTIME_options_ws_free(&options);
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
 }

compute/pzlansy.c

@@ -465,5 +465,5 @@ void morse_pzlansy(MORSE_enum norm, MORSE_enum uplo, MORSE_desc_t *A, double *re
     }
     RUNTIME_options_ws_free(&options);
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
 }

compute/pzlantr.c

@@ -665,5 +665,5 @@ void morse_pzlantr(MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag,
     }
     RUNTIME_options_ws_free(&options);
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
+    MORSE_TASK_flush_all();
 }

compute/pzlascal.c

@@ -97,7 +97,6 @@ void morse_pzlascal(MORSE_enum uplo, MORSE_Complex64_t alpha, MORSE_desc_t *A,
             }
         }
     }
-    RUNTIME_options_ws_free(&options);
+    MORSE_TASK_flush_desc( &options, uplo, A );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
 }

compute/pzlaset.c

@@ -118,6 +118,6 @@ void morse_pzlaset(MORSE_enum uplo,
                A(j, j), ldaj);
        }
     }
+    MORSE_TASK_flush_desc( &options, uplo, A );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
 }

compute/pzlaset2.c

@@ -107,7 +107,7 @@ void morse_pzlaset2(MORSE_enum uplo, MORSE_Complex64_t alpha,
                    A(i, j), ldai);
            }
        }
-    } 
+    }
+    MORSE_TASK_flush_desc( &options, uplo, A );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
 }

compute/pzlauum.c

@@ -76,7 +76,7 @@ void morse_pzlauum(MORSE_enum uplo, MORSE_desc_t *A,
                 }
             }
             for (n = 0; n < k; n++) {
-                MORSE_TASK_dataflush( &options, A(k, n) );
+                MORSE_TASK_flush_data( &options, A(k, n) );
                 MORSE_TASK_ztrmm(
                     &options,
                     MorseLeft, uplo, MorseConjTrans, MorseNonUnit,
@@ -84,7 +84,7 @@ void morse_pzlauum(MORSE_enum uplo, MORSE_desc_t *A,
                     1.0, A(k, k), ldak,
                          A(k, n), ldak);
             }
-            MORSE_TASK_dataflush( &options, A(k, k) );
+            MORSE_TASK_flush_data( &options, A(k, k) );
             MORSE_TASK_zlauum(
                 &options,
                 uplo, tempkm, A->mb,
@@ -121,7 +121,7 @@ void morse_pzlauum(MORSE_enum uplo, MORSE_desc_t *A,
             }
             for (m = 0; m < k; m++) {
                 ldam = BLKLDD(A, m);
-                MORSE_TASK_dataflush( &options, A(m, k) );
+                MORSE_TASK_flush_data( &options, A(m, k) );
                 MORSE_TASK_ztrmm(
                     &options,
                     MorseRight, uplo, MorseConjTrans, MorseNonUnit,
@@ -129,13 +129,13 @@ void morse_pzlauum(MORSE_enum uplo, MORSE_desc_t *A,
                     1.0, A(k, k), ldak,
                          A(m, k), ldam);
             }
-            MORSE_TASK_dataflush( &options, A(k, k) );
+            MORSE_TASK_flush_data( &options, A(k, k) );
             MORSE_TASK_zlauum(
                 &options,
                 uplo, tempkn, A->mb,
                 A(k, k), ldak);
         }
     }
+    MORSE_TASK_flush_desc( &options, uplo, A );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
 }

compute/pzplghe.c

@@ -36,7 +36,7 @@
  *  morse_pzplghe - Generate a random hermitian (positive definite if 'bump' is large enough) half-matrix by tiles.
  **/
 void morse_pzplghe( double bump, MORSE_enum uplo, MORSE_desc_t *A,
-		            unsigned long long int seed,
+                    unsigned long long int seed,
                     MORSE_sequence_t *sequence, MORSE_request_t *request )
 {
     MORSE_context_t *morse;
@@ -55,48 +55,48 @@ void morse_pzplghe( double bump, MORSE_enum uplo, MORSE_desc_t *A,
     	tempmm = m == A->mt-1 ? A->m-m*A->mb : A->mb;
     	ldam = BLKLDD(A, m);
 
-		/*
-		 *  MorseLower
-		 */
-		if (uplo == MorseLower) {
-			for (n = 0; n <= m; n++) {
-				tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
+        /*
+         *  MorseLower
+         */
+        if (uplo == MorseLower) {
+            for (n = 0; n <= m; n++) {
+                tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
 
-				options.priority = m + n;
-				MORSE_TASK_zplghe(
-					&options,
-					bump, tempmm, tempnn, A(m, n), ldam,
-					A->m, m*A->mb, n*A->nb, seed );
-			}
-		}
-		/*
-		 * MorseUpper
-		 */
-		else if (uplo == MorseUpper) {
-			for (n = m; n < A->nt; n++) {
-				tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
+                options.priority = m + n;
+                MORSE_TASK_zplghe(
+                    &options,
+                    bump, tempmm, tempnn, A(m, n), ldam,
+                    A->m, m*A->mb, n*A->nb, seed );
+            }
+        }
+        /*
+         * MorseUpper
+         */
+        else if (uplo == MorseUpper) {
+            for (n = m; n < A->nt; n++) {
+                tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
 
-				options.priority = m + n;
-				MORSE_TASK_zplghe(
-					&options,
-					bump, tempmm, tempnn, A(m, n), ldam,
-					A->m, m*A->mb, n*A->nb, seed );
-			}
-		}
-		/*
-		 * MorseUpperLower
-		 */
-		else {
-			for (n = 0; n < A->nt; n++) {
-				tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
+                options.priority = m + n;
+                MORSE_TASK_zplghe(
+                    &options,
+                    bump, tempmm, tempnn, A(m, n), ldam,
+                    A->m, m*A->mb, n*A->nb, seed );
+            }
+        }
+        /*
+         * MorseUpperLower
+         */
+        else {
+            for (n = 0; n < A->nt; n++) {
+                tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
 
-				MORSE_TASK_zplghe(
-					&options,
-					bump, tempmm, tempnn, A(m, n), ldam,
-					A->m, m*A->mb, n*A->nb, seed );
-			}
-		}
+                MORSE_TASK_zplghe(
+                    &options,
+                    bump, tempmm, tempnn, A(m, n), ldam,
+                    A->m, m*A->mb, n*A->nb, seed );
+            }
+        }
     }
+    MORSE_TASK_flush_desc( &options, uplo, A );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
 }

compute/pzplgsy.c

@@ -87,16 +87,16 @@ void morse_pzplgsy( MORSE_Complex64_t bump, MORSE_enum uplo, MORSE_desc_t *A,
          * MorseUpperLower
          */
         else {
-			for (n = 0; n < A->nt; n++) {
-				tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
+            for (n = 0; n < A->nt; n++) {
+                tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
 
-				MORSE_TASK_zplgsy(
-					&options,
-					bump, tempmm, tempnn, A(m, n), ldam,
-					A->m, m*A->mb, n*A->nb, seed );
-			}
+                MORSE_TASK_zplgsy(
+                    &options,
+                    bump, tempmm, tempnn, A(m, n), ldam,
+                    A->m, m*A->mb, n*A->nb, seed );
+            }
         }
     }
+    MORSE_TASK_flush_desc( &options, uplo, A );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
 }

compute/pzplrnt.c

@@ -60,6 +60,6 @@ void morse_pzplrnt( MORSE_desc_t *A, unsigned long long int seed,
                 A->m, m*A->mb, n*A->nb, seed );
         }
     }
+    MORSE_TASK_flush_desc( &options, MorseUpperLower, A );
     RUNTIME_options_finalize(&options, morse);
-    MORSE_TASK_dataflush_all();
 }

compute/pzpotrf.c

@@ -84,7 +84,7 @@ void morse_pzpotrf(MORSE_enum uplo, MORSE_desc_t *A,
                     zone, A(k, k), ldak,
                           A(m, k), ldam);
             }
-            MORSE_TASK_dataflush( &options, A(k, k) );
+            MORSE_TASK_flush_data( &options, A(k, k) );
 
             for (n = k+1; n < A->nt; n++) {
                 tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
@@ -111,7 +111,7 @@ void morse_pzpotrf(MORSE_enum uplo, MORSE_desc_t *A,
                                A(n, k), ldan,
                         zone,  A(m, n), ldam);
                 }
-                MORSE_TASK_dataflush( &options, A(n, k) );
+                MORSE_TASK_flush_data( &options, A(n, k) );
             }
             RUNTIME_iteration_pop(morse);
         }
@@ -144,7 +144,7 @@ void morse_pzpotrf(MORSE_enum uplo, MORSE_desc_t *A,
                     zone, A(k, k), ldak,
                           A(k, n), ldak);
             }
-            MORSE_TASK_dataflush( &options, A(k, k) );
+            MORSE_TASK_flush_data( &options, A(k, k) );
 
             for (m = k+1; m < A->mt; m++) {
                 tempmm = m == A->mt-1 ? A->m - m*A->mb : A->mb;
@@ -170,13 +170,12 @@ void morse_pzpotrf(MORSE_enum uplo, MORSE_desc_t *A,
                                A(k, n), ldak,
                         zone,  A(m, n), ldam);
                 }
-                MORSE_TASK_dataflush( &options, A(k, m) );
+                MORSE_TASK_flush_data( &options, A(k, m) );
             }
 
             RUNTIME_iteration_pop(morse);
         }
     }
-
     RUNTIME_options_ws_free(&options);
     RUNTIME_options_finalize(&options, morse);
 }

compute/pzpotrimm.c

@@ -85,7 +85,7 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
                     zone, A(k, k), ldak,
                           A(m, k), ldam);
             }
-            MORSE_TASK_dataflush( &options, A(k, k) );
+            MORSE_TASK_flush_data( &options, A(k, k) );
 
             for (n = k+1; n < A->nt; n++) {
                 tempnn = n == A->nt-1 ? A->n-n*A->nb : A->nb;
@@ -108,7 +108,7 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
                                A(n, k), ldan,
                         zone,  A(m, n), ldam);
                 }
-                MORSE_TASK_dataflush( &options, A(n, k) );
+                MORSE_TASK_flush_data( &options, A(n, k) );
             }
 
             RUNTIME_iteration_pop(morse);
@@ -143,10 +143,10 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
                               A(k, n), ldak,
                         zone, A(m, n), ldam);
                 }
-                MORSE_TASK_dataflush( &options, A(m, k) );
+                MORSE_TASK_flush_data( &options, A(m, k) );
             }
             for (n = 0; n < k; n++) {
-                MORSE_TASK_dataflush( &options, A(k, n) );
+                MORSE_TASK_flush_data( &options, A(k, n) );
                 MORSE_TASK_ztrsm(
                     &options,
                     MorseLeft, uplo, MorseNoTrans, MorseNonUnit,
@@ -154,7 +154,7 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
                     zone, A(k, k), ldak,
                           A(k, n), ldak);
             }
-            MORSE_TASK_dataflush( &options, A(k, k) );
+            MORSE_TASK_flush_data( &options, A(k, k) );
             MORSE_TASK_ztrtri(
                 &options,
                 uplo, MorseNonUnit,
@@ -192,7 +192,7 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
                 }
             }
             for (n = 0; n < k; n++) {
-                MORSE_TASK_dataflush( &options, A(k, n) );
+                MORSE_TASK_flush_data( &options, A(k, n) );
                 MORSE_TASK_ztrmm(
                     &options,
                     MorseLeft, uplo, MorseConjTrans, MorseNonUnit,
@@ -200,7 +200,7 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
                     1.0, A(k, k), ldak,
                          A(k, n), ldak);
             }
-            MORSE_TASK_dataflush( &options, A(k, k) );
+            MORSE_TASK_flush_data( &options, A(k, k) );
             MORSE_TASK_zlauum(
                 &options,
                 uplo, tempkm, A->mb,
@@ -257,10 +257,10 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
                         }
                     }
                 }
-                MORSE_TASK_dataflush( &options, B(m, k) );
+                MORSE_TASK_flush_data( &options, B(m, k) );
             }
             for (n = 0; n <= k; n++) {
-                MORSE_TASK_dataflush( &options, A(k, n) );
+                MORSE_TASK_flush_data( &options, A(k, n) );
             }
 
             RUNTIME_iteration_pop(morse);
@@ -293,7 +293,7 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
                     zone, A(k, k), ldak,
                           A(k, n), ldak);
             }
-            MORSE_TASK_dataflush( &options, A(k, k) );
+            MORSE_TASK_flush_data( &options, A(k, k) );
 
             for (m = k+1; m < A->mt; m++) {
                 tempmm = m == A->mt-1 ? A->m - m*A->mb : A->mb;
@@ -317,7 +317,7 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
                                A(k, n), ldak,
                         zone,  A(m, n), ldam);
                 }
-                MORSE_TASK_dataflush( &options, A(k, m) );
+                MORSE_TASK_flush_data( &options, A(k, m) );
             }
 
             RUNTIME_iteration_pop(morse);
@@ -351,11 +351,11 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
                               A(k, n), ldak,
                         zone, A(m, n), ldam);
                 }
-                MORSE_TASK_dataflush( &options, A(k, n) );
+                MORSE_TASK_flush_data( &options, A(k, n) );
             }
             for (m = 0; m < k; m++) {
                 ldam = BLKLDD(A, m);
-                MORSE_TASK_dataflush( &options, A(m, k) );
+                MORSE_TASK_flush_data( &options, A(m, k) );
                 MORSE_TASK_ztrsm(
                     &options,
                     MorseRight, uplo, MorseNoTrans, MorseNonUnit,
@@ -363,7 +363,7 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
                     zone, A(k, k), ldak,
                           A(m, k), ldam);
             }
-            MORSE_TASK_dataflush( &options, A(k, k) );
+            MORSE_TASK_flush_data( &options, A(k, k) );
             MORSE_TASK_ztrtri(
                 &options,
                 uplo, MorseNonUnit,
@@ -403,7 +403,7 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
             }
             for (m = 0; m < k; m++) {
                 ldam = BLKLDD(A, m);
-                MORSE_TASK_dataflush( &options, A(m, k) );
+                MORSE_TASK_flush_data( &options, A(m, k) );
                 MORSE_TASK_ztrmm(
                     &options,
                     MorseRight, uplo, MorseConjTrans, MorseNonUnit,
@@ -411,7 +411,7 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
                     1.0, A(k, k), ldak,
                          A(m, k), ldam);
             }
-            MORSE_TASK_dataflush( &options, A(k, k) );
+            MORSE_TASK_flush_data( &options, A(k, k) );
             MORSE_TASK_zlauum(
                 &options,
                 uplo, tempkn, A->mb,
@@ -468,10 +468,10 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
                         }
                     }
                 }
-                MORSE_TASK_dataflush( &options, B(m, k) );
+                MORSE_TASK_flush_data( &options, B(m, k) );
             }
             for (m = 0; m <= k; m++) {
-                MORSE_TASK_dataflush( &options, A(m, k) );
+                MORSE_TASK_flush_data( &options, A(m, k) );
             }