From e7fb36f39644c89b7b2aab7294ddde58eb019fcb Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Tue, 23 Jan 2018 16:21:21 +0100
Subject: [PATCH] Remove references to RUNTIME interface in z*.c files

---
 compute/zgeadd.c        |  4 ++--
 compute/zgelqf.c        |  2 +-
 compute/zgelqf_param.c  |  2 +-
 compute/zgelqs.c        |  4 ++--
 compute/zgelqs_param.c  |  4 ++--
 compute/zgels.c         |  4 ++--
 compute/zgels_param.c   |  4 ++--
 compute/zgemm.c         |  6 +++---
 compute/zgeqrf.c        |  2 +-
 compute/zgeqrf_param.c  |  2 +-
 compute/zgeqrs.c        |  6 +++---
 compute/zgeqrs_param.c  |  8 ++++----
 compute/zgesv_incpiv.c  |  4 ++--
 compute/zgesv_nopiv.c   |  4 ++--
 compute/zgetrf_incpiv.c |  2 +-
 compute/zgetrf_nopiv.c  |  2 +-
 compute/zgetrs_incpiv.c |  4 ++--
 compute/zgetrs_nopiv.c  |  4 ++--
 compute/zheevd.c        |  4 ++--
 compute/zhemm.c         |  6 +++---
 compute/zher2k.c        |  6 +++---
 compute/zherk.c         |  4 ++--
 compute/zlascal.c       |  2 +-
 compute/zlauum.c        |  2 +-
 compute/zposv.c         |  6 +++---
 compute/zpotrf.c        |  2 +-
 compute/zpotri.c        |  2 +-
 compute/zpotrimm.c      |  2 +-
 compute/zpotrs.c        |  4 ++--
 compute/zsymm.c         |  6 +++---
 compute/zsyr2k.c        |  6 +++---
 compute/zsyrk.c         |  4 ++--
 compute/zsysv.c         |  4 ++--
 compute/zsytrf.c        |  2 +-
 compute/zsytrs.c        |  4 ++--
 compute/ztile.c         | 44 +++++++++++++++++------------------------
 compute/ztpgqrt.c       |  4 ++--
 compute/ztpqrt.c        |  4 ++--
 compute/ztradd.c        |  4 ++--
 compute/ztrmm.c         |  4 ++--
 compute/ztrsm.c         |  4 ++--
 compute/ztrsmpl.c       |  4 ++--
 compute/ztrtri.c        |  2 +-
 compute/zunglq.c        |  4 ++--
 compute/zunglq_param.c  |  4 ++--
 compute/zungqr.c        |  4 ++--
 compute/zungqr_param.c  |  4 ++--
 compute/zunmlq.c        |  4 ++--
 compute/zunmlq_param.c  |  4 ++--
 compute/zunmqr.c        |  4 ++--
 compute/zunmqr_param.c  |  4 ++--
 51 files changed, 114 insertions(+), 122 deletions(-)

diff --git a/compute/zgeadd.c b/compute/zgeadd.c
index aebbe1983..837077bcc 100644
--- a/compute/zgeadd.c
+++ b/compute/zgeadd.c
@@ -244,8 +244,8 @@ int MORSE_zgeadd_Tile(MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgeadd_Tile_Async( trans, alpha, A, beta, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgelqf.c b/compute/zgelqf.c
index a5471e2e7..51dff3eec 100644
--- a/compute/zgelqf.c
+++ b/compute/zgelqf.c
@@ -196,7 +196,7 @@ int MORSE_zgelqf_Tile(MORSE_desc_t *A, MORSE_desc_t *T)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgelqf_Tile_Async( A, T, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgelqf_param.c b/compute/zgelqf_param.c
index 1a938c6d2..50d6773a1 100644
--- a/compute/zgelqf_param.c
+++ b/compute/zgelqf_param.c
@@ -193,7 +193,7 @@ int MORSE_zgelqf_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgelqf_param_Tile_Async( qrtree, A, TS, TT, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgelqs.c b/compute/zgelqs.c
index 7c2b19f23..c75c89a99 100644
--- a/compute/zgelqs.c
+++ b/compute/zgelqs.c
@@ -217,8 +217,8 @@ int MORSE_zgelqs_Tile(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgelqs_Tile_Async( A, T, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgelqs_param.c b/compute/zgelqs_param.c
index c0c7ccc55..5605e4b35 100644
--- a/compute/zgelqs_param.c
+++ b/compute/zgelqs_param.c
@@ -222,8 +222,8 @@ int MORSE_zgelqs_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgelqs_param_Tile_Async( qrtree, A, TS, TT, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgels.c b/compute/zgels.c
index 2f26b7901..f6961f4b6 100644
--- a/compute/zgels.c
+++ b/compute/zgels.c
@@ -275,8 +275,8 @@ int MORSE_zgels_Tile(MORSE_enum trans, MORSE_desc_t *A,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgels_Tile_Async( trans, A, T, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgels_param.c b/compute/zgels_param.c
index 67239b6bb..baf825f1c 100644
--- a/compute/zgels_param.c
+++ b/compute/zgels_param.c
@@ -279,8 +279,8 @@ int MORSE_zgels_param_Tile(const libhqr_tree_t *qrtree, MORSE_enum trans, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgels_param_Tile_Async( qrtree, trans, A, TS, TT, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgemm.c b/compute/zgemm.c
index fc7a79152..0bf587ed0 100644
--- a/compute/zgemm.c
+++ b/compute/zgemm.c
@@ -316,9 +316,9 @@ int MORSE_zgemm_Tile(MORSE_enum transA, MORSE_enum transB,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgemm_Tile_Async( transA, transB, alpha, A, B, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgeqrf.c b/compute/zgeqrf.c
index 8c9a96a38..58dc835fa 100644
--- a/compute/zgeqrf.c
+++ b/compute/zgeqrf.c
@@ -195,7 +195,7 @@ int MORSE_zgeqrf_Tile(MORSE_desc_t *A, MORSE_desc_t *T)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgeqrf_Tile_Async( A, T, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgeqrf_param.c b/compute/zgeqrf_param.c
index 839cedd4b..852928027 100644
--- a/compute/zgeqrf_param.c
+++ b/compute/zgeqrf_param.c
@@ -202,7 +202,7 @@ int MORSE_zgeqrf_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgeqrf_param_Tile_Async( qrtree, A, TS, TT, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgeqrs.c b/compute/zgeqrs.c
index 713e8abb2..645fdf119 100644
--- a/compute/zgeqrs.c
+++ b/compute/zgeqrs.c
@@ -216,9 +216,9 @@ int MORSE_zgeqrs_Tile(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgeqrs_Tile_Async( A, T, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( T, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( T, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgeqrs_param.c b/compute/zgeqrs_param.c
index 3f4e89f0e..a7331b9e0 100644
--- a/compute/zgeqrs_param.c
+++ b/compute/zgeqrs_param.c
@@ -211,10 +211,10 @@ int MORSE_zgeqrs_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgeqrs_param_Tile_Async( qrtree, A, TS, TT, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( TS, sequence );
-    RUNTIME_desc_flush( TT, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( TS, sequence );
+    MORSE_Desc_Flush( TT, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgesv_incpiv.c b/compute/zgesv_incpiv.c
index 53278b297..0bcd72193 100644
--- a/compute/zgesv_incpiv.c
+++ b/compute/zgesv_incpiv.c
@@ -221,8 +221,8 @@ int MORSE_zgesv_incpiv_Tile(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, MORSE_d
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgesv_incpiv_Tile_Async( A, L, IPIV, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgesv_nopiv.c b/compute/zgesv_nopiv.c
index 442df3b6e..93571e422 100644
--- a/compute/zgesv_nopiv.c
+++ b/compute/zgesv_nopiv.c
@@ -213,8 +213,8 @@ int MORSE_zgesv_nopiv_Tile(MORSE_desc_t *A, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgesv_nopiv_Tile_Async( A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgetrf_incpiv.c b/compute/zgetrf_incpiv.c
index 9628e1e13..949ad8fb4 100644
--- a/compute/zgetrf_incpiv.c
+++ b/compute/zgetrf_incpiv.c
@@ -200,7 +200,7 @@ int MORSE_zgetrf_incpiv_Tile(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgetrf_incpiv_Tile_Async( A, L, IPIV, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgetrf_nopiv.c b/compute/zgetrf_nopiv.c
index 919699244..9de091347 100644
--- a/compute/zgetrf_nopiv.c
+++ b/compute/zgetrf_nopiv.c
@@ -186,7 +186,7 @@ int MORSE_zgetrf_nopiv_Tile(MORSE_desc_t *A)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgetrf_nopiv_Tile_Async( A, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgetrs_incpiv.c b/compute/zgetrs_incpiv.c
index b011994af..1bffb66c0 100644
--- a/compute/zgetrs_incpiv.c
+++ b/compute/zgetrs_incpiv.c
@@ -225,8 +225,8 @@ int MORSE_zgetrs_incpiv_Tile(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgetrs_incpiv_Tile_Async( A, L, IPIV, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgetrs_nopiv.c b/compute/zgetrs_nopiv.c
index 8eff02ea1..36f4635a2 100644
--- a/compute/zgetrs_nopiv.c
+++ b/compute/zgetrs_nopiv.c
@@ -213,8 +213,8 @@ int MORSE_zgetrs_nopiv_Tile(MORSE_desc_t *A, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgetrs_nopiv_Tile_Async( A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zheevd.c b/compute/zheevd.c
index 1c763d06c..1d5dd8832 100644
--- a/compute/zheevd.c
+++ b/compute/zheevd.c
@@ -255,8 +255,8 @@ int MORSE_zheevd_Tile(MORSE_enum jobz, MORSE_enum uplo,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zheevd_Tile_Async( jobz, uplo, A, W, T, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( T, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( T, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zhemm.c b/compute/zhemm.c
index d004a263f..a9d03b1b8 100644
--- a/compute/zhemm.c
+++ b/compute/zhemm.c
@@ -281,9 +281,9 @@ int MORSE_zhemm_Tile(MORSE_enum side, MORSE_enum uplo,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zhemm_Tile_Async(side, uplo, alpha, A, B, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zher2k.c b/compute/zher2k.c
index 6e573292f..85e85217b 100644
--- a/compute/zher2k.c
+++ b/compute/zher2k.c
@@ -281,9 +281,9 @@ int MORSE_zher2k_Tile(MORSE_enum uplo, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zher2k_Tile_Async( uplo, trans, alpha, A, B, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zherk.c b/compute/zherk.c
index 035adf207..ecac77712 100644
--- a/compute/zherk.c
+++ b/compute/zherk.c
@@ -257,8 +257,8 @@ int MORSE_zherk_Tile(MORSE_enum uplo, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zherk_Tile_Async( uplo, trans, alpha, A, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zlascal.c b/compute/zlascal.c
index 840530e4c..4181e8cff 100644
--- a/compute/zlascal.c
+++ b/compute/zlascal.c
@@ -189,7 +189,7 @@ int MORSE_zlascal_Tile(MORSE_enum uplo,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zlascal_Tile_Async( uplo, alpha, A, sequence, &request );
-    RUNTIME_sequence_wait(morse, sequence);
+    morse_sequence_wait(morse, sequence);
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
     return status;
diff --git a/compute/zlauum.c b/compute/zlauum.c
index 3fb93a3fd..a8f489bcb 100644
--- a/compute/zlauum.c
+++ b/compute/zlauum.c
@@ -197,7 +197,7 @@ int MORSE_zlauum_Tile(MORSE_enum uplo, MORSE_desc_t *A)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zlauum_Tile_Async( uplo, A, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zposv.c b/compute/zposv.c
index 0131d0dd9..24495f81b 100644
--- a/compute/zposv.c
+++ b/compute/zposv.c
@@ -146,7 +146,7 @@ int MORSE_zposv(MORSE_enum uplo, int N, int NRHS,
     }
 
     /* Set NT & NTRHS */
-    NB    = MORSE_NB;
+    NB = MORSE_NB;
 
     morse_sequence_create(morse, &sequence);
 
@@ -239,8 +239,8 @@ int MORSE_zposv_Tile(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zposv_Tile_Async( uplo, A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zpotrf.c b/compute/zpotrf.c
index 950cb9220..8612c11e2 100644
--- a/compute/zpotrf.c
+++ b/compute/zpotrf.c
@@ -209,7 +209,7 @@ int MORSE_zpotrf_Tile(MORSE_enum uplo, MORSE_desc_t *A)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zpotrf_Tile_Async( uplo, A, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zpotri.c b/compute/zpotri.c
index 8778a473c..668137a4e 100644
--- a/compute/zpotri.c
+++ b/compute/zpotri.c
@@ -197,7 +197,7 @@ int MORSE_zpotri_Tile(MORSE_enum uplo, MORSE_desc_t *A)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zpotri_Tile_Async( uplo, A, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zpotrimm.c b/compute/zpotrimm.c
index 1850d998c..a82ed3ebc 100644
--- a/compute/zpotrimm.c
+++ b/compute/zpotrimm.c
@@ -219,7 +219,7 @@ int MORSE_zpotrimm_Tile(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zpotrimm_Tile_Async( uplo, A, B, C, sequence, &request );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zpotrs.c b/compute/zpotrs.c
index 162c6cb29..bd9e225e5 100644
--- a/compute/zpotrs.c
+++ b/compute/zpotrs.c
@@ -215,8 +215,8 @@ int MORSE_zpotrs_Tile(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zpotrs_Tile_Async( uplo, A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsymm.c b/compute/zsymm.c
index d2405343a..d84aea207 100644
--- a/compute/zsymm.c
+++ b/compute/zsymm.c
@@ -281,9 +281,9 @@ int MORSE_zsymm_Tile(MORSE_enum side, MORSE_enum uplo,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zsymm_Tile_Async(side, uplo, alpha, A, B, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsyr2k.c b/compute/zsyr2k.c
index 59e6790c5..1e94b255f 100644
--- a/compute/zsyr2k.c
+++ b/compute/zsyr2k.c
@@ -281,9 +281,9 @@ int MORSE_zsyr2k_Tile(MORSE_enum uplo, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zsyr2k_Tile_Async( uplo, trans, alpha, A, B, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsyrk.c b/compute/zsyrk.c
index 5cbe29975..6ba756003 100644
--- a/compute/zsyrk.c
+++ b/compute/zsyrk.c
@@ -257,8 +257,8 @@ int MORSE_zsyrk_Tile(MORSE_enum uplo, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zsyrk_Tile_Async( uplo, trans, alpha, A, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsysv.c b/compute/zsysv.c
index 460624047..ff0f85f98 100644
--- a/compute/zsysv.c
+++ b/compute/zsysv.c
@@ -232,8 +232,8 @@ int MORSE_zsysv_Tile(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zsysv_Tile_Async( uplo, A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsytrf.c b/compute/zsytrf.c
index 1d0875bb0..c3ea5c53a 100644
--- a/compute/zsytrf.c
+++ b/compute/zsytrf.c
@@ -198,7 +198,7 @@ int MORSE_zsytrf_Tile(MORSE_enum uplo, MORSE_desc_t *A)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zsytrf_Tile_Async( uplo, A, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsytrs.c b/compute/zsytrs.c
index 16812476d..d0225885d 100644
--- a/compute/zsytrs.c
+++ b/compute/zsytrs.c
@@ -211,8 +211,8 @@ int MORSE_zsytrs_Tile(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zsytrs_Tile_Async( uplo, A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztile.c b/compute/ztile.c
index a52368eb5..d2648eed9 100644
--- a/compute/ztile.c
+++ b/compute/ztile.c
@@ -66,7 +66,7 @@ int MORSE_zLapack_to_Tile(MORSE_Complex64_t *Af77, int LDA, MORSE_desc_t *A)
     MORSE_context_t *morse;
     MORSE_sequence_t *sequence = NULL;
     MORSE_request_t request;
-    MORSE_desc_t B;
+    MORSE_desc_t *B;
     int status;
 
     morse = morse_context_self();
@@ -81,25 +81,21 @@ int MORSE_zLapack_to_Tile(MORSE_Complex64_t *Af77, int LDA, MORSE_desc_t *A)
     }
 
     /* Create the B descriptor to handle the Lapack format matrix */
-    B = morse_desc_init_user(
-        MorseComplexDouble, A->mb, A->nb, A->bsiz,
-        LDA, A->n, 0, 0, A->m, A->n, 1, 1,
-        morse_getaddr_cm, morse_getblkldd_cm, NULL );
-    B.mat  = Af77;
-    B.styp = MorseCM;
-
-    RUNTIME_desc_create( &B );
+    MORSE_Desc_Create_User( &B, Af77, MorseComplexDouble, A->mb, A->nb, A->bsiz,
+                            LDA, A->n, 0, 0, A->m, A->n, 1, 1,
+                            morse_getaddr_cm, morse_getblkldd_cm, NULL );
 
     /* Start the computation */
     morse_sequence_create(morse, &sequence);
 
-    morse_pzlacpy( MorseUpperLower, &B, A, sequence, &request );
+    morse_pzlacpy( MorseUpperLower, B, A, sequence, &request );
 
-    RUNTIME_desc_flush( &B, sequence );
-    RUNTIME_desc_flush(  A, sequence );
+    MORSE_Desc_Flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
     morse_sequence_wait( morse, sequence );
 
-    RUNTIME_desc_destroy( &B );
+    /* Destroy temporary B descriptor */
+    MORSE_Desc_Destroy( &B );
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
@@ -146,7 +142,7 @@ int MORSE_zTile_to_Lapack(MORSE_desc_t *A, MORSE_Complex64_t *Af77, int LDA)
     MORSE_context_t *morse;
     MORSE_sequence_t *sequence = NULL;
     MORSE_request_t request;
-    MORSE_desc_t B;
+    MORSE_desc_t *B;
     int status;
 
     morse = morse_context_self();
@@ -161,25 +157,21 @@ int MORSE_zTile_to_Lapack(MORSE_desc_t *A, MORSE_Complex64_t *Af77, int LDA)
     }
 
     /* Create the B descriptor to handle the Lapack format matrix */
-    B = morse_desc_init_user(
-        MorseComplexDouble, A->mb, A->nb, A->bsiz,
-        LDA, A->n, 0, 0, A->m, A->n, 1, 1,
-        morse_getaddr_cm, morse_getblkldd_cm, NULL );
-    B.mat  = Af77;
-    B.styp = MorseCM;
-
-    RUNTIME_desc_create( &B );
+    MORSE_Desc_Create_User( &B, Af77, MorseComplexDouble, A->mb, A->nb, A->bsiz,
+                            LDA, A->n, 0, 0, A->m, A->n, 1, 1,
+                            morse_getaddr_cm, morse_getblkldd_cm, NULL );
 
     /* Start the computation */
     morse_sequence_create(morse, &sequence);
 
-    morse_pzlacpy( MorseUpperLower, A, &B, sequence, &request );
+    morse_pzlacpy( MorseUpperLower, A, B, sequence, &request );
+
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
-    RUNTIME_desc_flush(  A, sequence );
-    RUNTIME_desc_flush( &B, sequence );
     morse_sequence_wait( morse, sequence );
 
-    RUNTIME_desc_destroy( &B );
+    MORSE_Desc_Destroy( &B );
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/ztpgqrt.c b/compute/ztpgqrt.c
index adf47e86c..3708e05d5 100644
--- a/compute/ztpgqrt.c
+++ b/compute/ztpgqrt.c
@@ -291,8 +291,8 @@ int MORSE_ztpgqrt_Tile( int L,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztpgqrt_Tile_Async( L, V1, T1, V2, T2, Q1, Q2, sequence, &request );
-    RUNTIME_desc_flush( Q1, sequence );
-    RUNTIME_desc_flush( Q2, sequence );
+    MORSE_Desc_Flush( Q1, sequence );
+    MORSE_Desc_Flush( Q2, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztpqrt.c b/compute/ztpqrt.c
index bdbe28718..caacdc341 100644
--- a/compute/ztpqrt.c
+++ b/compute/ztpqrt.c
@@ -265,8 +265,8 @@ int MORSE_ztpqrt_Tile( int L, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_desc_t *T
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztpqrt_Tile_Async( L, A, B, T, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztradd.c b/compute/ztradd.c
index 2fa56e67a..bdcc1d7f4 100644
--- a/compute/ztradd.c
+++ b/compute/ztradd.c
@@ -260,8 +260,8 @@ int MORSE_ztradd_Tile(MORSE_enum uplo, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztradd_Tile_Async( uplo, trans, alpha, A, beta, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztrmm.c b/compute/ztrmm.c
index 268ea9a5f..883e8f7ce 100644
--- a/compute/ztrmm.c
+++ b/compute/ztrmm.c
@@ -282,8 +282,8 @@ int MORSE_ztrmm_Tile(MORSE_enum side, MORSE_enum uplo,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztrmm_Tile_Async(side, uplo, transA, diag, alpha, A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztrsm.c b/compute/ztrsm.c
index 8313dcc5f..d204af39d 100644
--- a/compute/ztrsm.c
+++ b/compute/ztrsm.c
@@ -280,8 +280,8 @@ int MORSE_ztrsm_Tile(MORSE_enum side, MORSE_enum uplo,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztrsm_Tile_Async(side, uplo, transA, diag, alpha, A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztrsmpl.c b/compute/ztrsmpl.c
index 83195d5c6..6887df12a 100644
--- a/compute/ztrsmpl.c
+++ b/compute/ztrsmpl.c
@@ -210,8 +210,8 @@ int MORSE_ztrsmpl_Tile(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, MORSE_desc_t
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztrsmpl_Tile_Async( A, L, IPIV, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztrtri.c b/compute/ztrtri.c
index c1864a56f..eefde0168 100644
--- a/compute/ztrtri.c
+++ b/compute/ztrtri.c
@@ -216,7 +216,7 @@ int MORSE_ztrtri_Tile(MORSE_enum uplo, MORSE_enum diag, MORSE_desc_t *A)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztrtri_Tile_Async( uplo, diag, A, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zunglq.c b/compute/zunglq.c
index 4dbd23de5..a6411e8e0 100644
--- a/compute/zunglq.c
+++ b/compute/zunglq.c
@@ -212,8 +212,8 @@ int MORSE_zunglq_Tile(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *Q)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zunglq_Tile_Async( A, T, Q, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( Q, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( Q, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zunglq_param.c b/compute/zunglq_param.c
index deec8916a..2a023a661 100644
--- a/compute/zunglq_param.c
+++ b/compute/zunglq_param.c
@@ -209,8 +209,8 @@ int MORSE_zunglq_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zunglq_param_Tile_Async( qrtree, A, TS, TT, Q, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( Q, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( Q, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zungqr.c b/compute/zungqr.c
index db36ac172..9cf2e3491 100644
--- a/compute/zungqr.c
+++ b/compute/zungqr.c
@@ -211,8 +211,8 @@ int MORSE_zungqr_Tile(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *Q)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zungqr_Tile_Async( A, T, Q, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( Q, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( Q, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zungqr_param.c b/compute/zungqr_param.c
index 32bb62d7a..d778d48f0 100644
--- a/compute/zungqr_param.c
+++ b/compute/zungqr_param.c
@@ -210,8 +210,8 @@ int MORSE_zungqr_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zungqr_param_Tile_Async( qrtree, A, TS, TT, Q, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( Q, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( Q, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zunmlq.c b/compute/zunmlq.c
index 7ba6f30b7..27f2784e2 100644
--- a/compute/zunmlq.c
+++ b/compute/zunmlq.c
@@ -264,8 +264,8 @@ int MORSE_zunmlq_Tile(MORSE_enum side, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zunmlq_Tile_Async(side, trans, A, T, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zunmlq_param.c b/compute/zunmlq_param.c
index fce325bd7..04792920b 100644
--- a/compute/zunmlq_param.c
+++ b/compute/zunmlq_param.c
@@ -263,8 +263,8 @@ int MORSE_zunmlq_param_Tile(const libhqr_tree_t *qrtree, MORSE_enum side, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zunmlq_param_Tile_Async( qrtree, side, trans, A, TS, TT, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zunmqr.c b/compute/zunmqr.c
index 501300566..36a3c277f 100644
--- a/compute/zunmqr.c
+++ b/compute/zunmqr.c
@@ -268,8 +268,8 @@ int MORSE_zunmqr_Tile(MORSE_enum side, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zunmqr_Tile_Async(side, trans, A, T, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zunmqr_param.c b/compute/zunmqr_param.c
index d1f406be2..46233c7a5 100644
--- a/compute/zunmqr_param.c
+++ b/compute/zunmqr_param.c
@@ -269,8 +269,8 @@ int MORSE_zunmqr_param_Tile(const libhqr_tree_t *qrtree, MORSE_enum side, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zunmqr_param_Tile_Async( qrtree, side, trans, A, TS, TT, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
-- 
GitLab