From 4fd458c7a7b935ba99e38e5f3a2f1ab636f9bdba Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Mon, 22 Jan 2018 18:38:29 +0100
Subject: [PATCH] Keep converting the lapack interface function

---
 compute/zgeadd.c        | 15 ++-------------
 compute/zgelqf.c        | 12 ++----------
 compute/zgelqf_param.c  | 12 ++----------
 compute/zgelqs.c        | 15 ++-------------
 compute/zgelqs_param.c  | 15 ++-------------
 compute/zgels.c         | 41 ++++++++++++-----------------------------
 compute/zgels_param.c   | 38 ++++++++++----------------------------
 compute/zgemm.c         | 28 +++++++---------------------
 compute/zgeqrf.c        | 12 ++----------
 compute/zgeqrf_param.c  | 12 ++----------
 compute/zgeqrs.c        | 15 ++-------------
 compute/zgeqrs_param.c  | 15 ++-------------
 compute/zgesv_incpiv.c  | 15 ++-------------
 compute/zgesv_nopiv.c   | 15 ++-------------
 compute/zgesvd.c        | 12 ++----------
 compute/zgetrf_incpiv.c | 12 ++----------
 compute/zgetrf_nopiv.c  | 13 ++-----------
 compute/zgetrs_incpiv.c | 15 ++-------------
 compute/zgetrs_nopiv.c  | 15 ++-------------
 compute/zheevd.c        | 12 ++----------
 compute/zhemm.c         | 18 ++----------------
 compute/zher2k.c        | 18 ++----------------
 compute/zherk.c         | 15 ++-------------
 compute/zhetrd.c        | 12 ++----------
 compute/zlacpy.c        | 14 ++------------
 compute/zlange.c        | 12 ++----------
 compute/zlanhe.c        | 12 ++----------
 compute/zlansy.c        | 12 ++----------
 compute/zlantr.c        | 12 ++----------
 compute/zlascal.c       | 12 ++----------
 compute/zlaset.c        | 12 ++----------
 compute/zlauum.c        | 12 ++----------
 compute/zposv.c         | 17 +++--------------
 compute/zpotri.c        | 12 ++----------
 compute/zpotrimm.c      | 12 ++----------
 compute/zpotrs.c        | 15 ++-------------
 compute/zsymm.c         | 18 ++----------------
 compute/zsyr2k.c        | 18 ++----------------
 compute/zsyrk.c         | 15 ++-------------
 compute/zsysv.c         | 15 ++-------------
 compute/zsytrf.c        | 12 ++----------
 compute/zsytrs.c        | 15 ++-------------
 compute/ztpgqrt.c       | 15 ++-------------
 compute/ztpqrt.c        | 13 ++-----------
 compute/ztradd.c        | 15 ++-------------
 compute/ztrmm.c         | 15 ++-------------
 compute/ztrsm.c         | 15 ++-------------
 compute/ztrsmpl.c       | 15 ++-------------
 compute/ztrtri.c        | 12 ++----------
 compute/zunglq.c        | 15 ++-------------
 compute/zunglq_param.c  | 15 ++-------------
 compute/zungqr.c        | 15 ++-------------
 compute/zungqr_param.c  | 15 ++-------------
 compute/zunmlq.c        | 15 ++-------------
 compute/zunmlq_param.c  | 15 ++-------------
 compute/zunmqr.c        | 15 ++-------------
 compute/zunmqr_param.c  | 15 ++-------------
 57 files changed, 138 insertions(+), 731 deletions(-)

diff --git a/compute/zgeadd.c b/compute/zgeadd.c
index 93e709dfd..ecf975a90 100644
--- a/compute/zgeadd.c
+++ b/compute/zgeadd.c
@@ -153,32 +153,21 @@ int MORSE_zgeadd(MORSE_enum trans, int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-    /* if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) { */
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, An, Am, An, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, N, M, N, sequence, &request );
-    /* } else { */
-    /*     morse_ziplap2tile( descA, A, NB, NB, LDA, An, 0, 0, Am, An, */
-    /*                         sequence, &request); */
-    /*     morse_ziplap2tile( descB, B, NB, NB, LDB, N, 0, 0, M, N, */
-    /*                         sequence, &request); */
-    /* } */
 
     /* Call the tile interface */
     MORSE_zgeadd_Tile_Async(
         trans, alpha, &descA, beta, &descB, sequence, &request);
 
-    /* if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) { */
+    /* Submit the matrix conversion */
         morse_zooptile2lap( descB, B, NB, NB, LDB, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-    /* } else { */
-    /*     morse_ziptile2lap( descA, A, NB, NB, LDA, An, sequence, &request); */
-    /*     morse_ziptile2lap( descB, B, NB, NB, LDB, N,  sequence, &request); */
-    /*     morse_dynamic_sync(); */
-    /* } */
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgelqf.c b/compute/zgelqf.c
index 4fb713c04..100a0e130 100644
--- a/compute/zgelqf.c
+++ b/compute/zgelqf.c
@@ -122,25 +122,17 @@ int MORSE_zgelqf(int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgelqf_Tile_Async(&descA, descT, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgelqf_param.c b/compute/zgelqf_param.c
index 1b0c5bf61..22d8dacdd 100644
--- a/compute/zgelqf_param.c
+++ b/compute/zgelqf_param.c
@@ -119,25 +119,17 @@ int MORSE_zgelqf_param(const libhqr_tree_t *qrtree, int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgelqf_param_Tile_Async(qrtree, &descA, descTS, descTT, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgelqs.c b/compute/zgelqs.c
index dde651c68..b9f501378 100644
--- a/compute/zgelqs.c
+++ b/compute/zgelqs.c
@@ -137,32 +137,21 @@ int MORSE_zgelqs(int M, int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, M, N,   */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N, NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgelqs_Tile_Async(&descA, descT, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,     sequence, &request);
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
     morse_sequence_wait(morse, sequence);
     morse_desc_mat_free(&descA);
     morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgelqs_param.c b/compute/zgelqs_param.c
index fc3d96ea6..b6faae1ba 100644
--- a/compute/zgelqs_param.c
+++ b/compute/zgelqs_param.c
@@ -139,32 +139,21 @@ int MORSE_zgelqs_param(const libhqr_tree_t *qrtree, int M, int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, M, N,   */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N, NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgelqs_param_Tile_Async(qrtree, &descA, descTS, descTT, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,     sequence, &request);
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
     morse_sequence_wait(morse, sequence);
     morse_desc_mat_free(&descA);
     morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgels.c b/compute/zgels.c
index a12abd3ca..c3a7c852c 100644
--- a/compute/zgels.c
+++ b/compute/zgels.c
@@ -171,47 +171,30 @@ int MORSE_zgels(MORSE_enum trans, int M, int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
+    /* Submit the matrix conversion */
     if ( M >= N ) {
-/*        if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
-                     A, NB, NB, LDA, N, M, N, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
-                     B, NB, NB, LDB, NRHS, M, NRHS, sequence, &request );
-/*        } else {*/
-/*            morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, M, N,*/
-/*                                sequence, &request);*/
-/*            morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, M, NRHS,*/
-/*                                sequence, &request);*/
-/*        }*/
+        morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+                         A, NB, NB, LDA, N, M, N, sequence, &request );
+        morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+                         B, NB, NB, LDB, NRHS, M, NRHS, sequence, &request );
     } else {
-/*        if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
-                     A, NB, NB, LDA, N, M, N, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
-                     B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
-/*        } else {*/
-/*            morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, M, N,*/
-/*                                sequence, &request);*/
-/*            morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N, NRHS,*/
-/*                                sequence, &request);*/
-/*        }*/
+        /* Submit the matrix conversion */
+        morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+                         A, NB, NB, LDA, N, M, N, sequence, &request );
+        morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+                         B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
     }
 
     /* Call the tile interface */
     MORSE_zgels_Tile_Async(MorseNoTrans, &descA, descT, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,     sequence, &request);
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
-    
+
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
     return status;
diff --git a/compute/zgels_param.c b/compute/zgels_param.c
index 26d4ae18a..733eeed65 100644
--- a/compute/zgels_param.c
+++ b/compute/zgels_param.c
@@ -173,46 +173,28 @@ int MORSE_zgels_param(const libhqr_tree_t *qrtree, MORSE_enum trans, int M, int
 
     morse_sequence_create(morse, &sequence);
 
+    /* Submit the matrix conversion */
     if ( M >= N ) {
-        /*        if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
-                     A, NB, NB, LDA, N, M, N, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
-                     B, NB, NB, LDB, NRHS, M, NRHS, sequence, &request );
-        /*        } else {*/
-        /*            morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, M, N,*/
-        /*                                sequence, &request);*/
-        /*            morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, M, NRHS,*/
-        /*                                sequence, &request);*/
-        /*        }*/
+        morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+                         A, NB, NB, LDA, N, M, N, sequence, &request );
+        morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+                         B, NB, NB, LDB, NRHS, M, NRHS, sequence, &request );
     } else {
-        /*        if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
-                     A, NB, NB, LDA, N, M, N, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
-                     B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
-        /*        } else {*/
-        /*            morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, M, N,*/
-        /*                                sequence, &request);*/
-        /*            morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N, NRHS,*/
-        /*                                sequence, &request);*/
-        /*        }*/
+        morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+                         A, NB, NB, LDA, N, M, N, sequence, &request );
+        morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+                         B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
     }
 
     /* Call the tile interface */
     MORSE_zgels_param_Tile_Async(qrtree, MorseNoTrans, &descA, descTS, descTT, &descB, sequence, &request);
 
-    /*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zooptile2lap(descA, A, NB, NB, LDA, N,     sequence, &request);
     morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
     morse_sequence_wait(morse, sequence);
     morse_desc_mat_free(&descA);
     morse_desc_mat_free(&descB);
-    /*    } else {*/
-    /*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-    /*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-    /*        morse_sequence_wait(morse, sequence);*/
-    /*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgemm.c b/compute/zgemm.c
index 7d5fd72bd..b830977a3 100644
--- a/compute/zgemm.c
+++ b/compute/zgemm.c
@@ -210,38 +210,24 @@ int MORSE_zgemm(MORSE_enum transA, MORSE_enum transB, int M, int N, int K,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, An, Am, An, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, Bn, Bm, Bn, sequence, &request );
     morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
                      C, NB, NB, LDC, N, M,  N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, An, 0, 0, Am, An, */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, Bn, 0, 0, Bm, Bn, */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descC, C, NB, NB, LDC, N,  0, 0, M,  N,  */
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgemm_Tile_Async(
         transA, transB, alpha, &descA, &descB, beta, &descC, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
-        morse_zooptile2lap(descC, C, NB, NB, LDC, N,  sequence, &request);
-        morse_sequence_wait(morse, sequence);
-        morse_desc_mat_free(&descA);
-        morse_desc_mat_free(&descB);
-        morse_desc_mat_free(&descC);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, An,  sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, Bn,  sequence, &request);*/
-/*        morse_ziptile2lap( descC, C, NB, NB, LDC, N,   sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
+    /* Submit the matrix conversion */
+    morse_zooptile2lap(descC, C, NB, NB, LDC, N,  sequence, &request);
+    morse_sequence_wait(morse, sequence);
+    morse_desc_mat_free(&descA);
+    morse_desc_mat_free(&descB);
+    morse_desc_mat_free(&descC);
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgeqrf.c b/compute/zgeqrf.c
index 08604a843..8e32eb570 100644
--- a/compute/zgeqrf.c
+++ b/compute/zgeqrf.c
@@ -121,25 +121,17 @@ int MORSE_zgeqrf(int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgeqrf_Tile_Async(&descA, descT, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgeqrf_param.c b/compute/zgeqrf_param.c
index 4e1dbb612..00fce04af 100644
--- a/compute/zgeqrf_param.c
+++ b/compute/zgeqrf_param.c
@@ -124,25 +124,17 @@ int MORSE_zgeqrf_param(const libhqr_tree_t *qrtree, int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
         MORSE_zgeqrf_param_Tile_Async(qrtree, &descA, descTS, descTT, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgeqrs.c b/compute/zgeqrs.c
index 615c1513a..2c9012db3 100644
--- a/compute/zgeqrs.c
+++ b/compute/zgeqrs.c
@@ -137,32 +137,21 @@ int MORSE_zgeqrs(int M, int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, M, NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, M, N,   */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, M, NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgeqrs_Tile_Async(&descA, descT, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,     sequence, &request);
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
     
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgeqrs_param.c b/compute/zgeqrs_param.c
index c14ee32b0..f74ca1582 100644
--- a/compute/zgeqrs_param.c
+++ b/compute/zgeqrs_param.c
@@ -132,32 +132,21 @@ int MORSE_zgeqrs_param(const libhqr_tree_t *qrtree, int M, int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, M, NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, M, N,   */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, M, NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgeqrs_param_Tile_Async(qrtree, &descA, descTS, descTT, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,     sequence, &request);
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgesv_incpiv.c b/compute/zgesv_incpiv.c
index f1431c24e..f22c79585 100644
--- a/compute/zgesv_incpiv.c
+++ b/compute/zgesv_incpiv.c
@@ -136,32 +136,21 @@ int MORSE_zgesv_incpiv(int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, N, N,   */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N, NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgesv_incpiv_Tile_Async(&descA, descL, IPIV, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,     sequence, &request);
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
     
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgesv_nopiv.c b/compute/zgesv_nopiv.c
index 97a540d58..164ee3109 100644
--- a/compute/zgesv_nopiv.c
+++ b/compute/zgesv_nopiv.c
@@ -135,32 +135,21 @@ int MORSE_zgesv_nopiv(int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, N, N,   */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N, NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgesv_nopiv_Tile_Async(&descA, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,     sequence, &request);
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
     
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgesvd.c b/compute/zgesvd.c
index 7432a277f..d3f1e8b1d 100644
--- a/compute/zgesvd.c
+++ b/compute/zgesvd.c
@@ -214,25 +214,17 @@ int MORSE_zgesvd(MORSE_enum jobu, MORSE_enum jobvt,
 
     morse_sequence_create(morse, &sequence);
 
-    /* if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) { */
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB,  LDA, N, M, N, sequence, &request );
-    /* } else { */
-    /*     morse_ziplap2tile( descA,   A, NB, NB,  LDA, N, 0, 0, M, N, */
-    /*                         sequence, &request); */
-    /* } */
 
     /* Call the tile interface */
     MORSE_zgesvd_Tile_Async(jobu, jobvt, &descA, S, descT, U, LDU, VT, LDVT, sequence, &request);
 
-    /* if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) { */
+    /* Submit the matrix conversion */
     morse_zooptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);
     morse_sequence_wait(morse, sequence);
     morse_desc_mat_free(&descA);
-    /* } else { */
-    /*     morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request); */
-    /*     morse_sequence_wait(morse, sequence); */
-    /* } */
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgetrf_incpiv.c b/compute/zgetrf_incpiv.c
index 243e7f70c..809df1bc2 100644
--- a/compute/zgetrf_incpiv.c
+++ b/compute/zgetrf_incpiv.c
@@ -123,25 +123,17 @@ int MORSE_zgetrf_incpiv(int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgetrf_incpiv_Tile_Async(&descA, descL, IPIV, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgetrf_nopiv.c b/compute/zgetrf_nopiv.c
index 447ed24f5..10e9270bf 100644
--- a/compute/zgetrf_nopiv.c
+++ b/compute/zgetrf_nopiv.c
@@ -116,26 +116,17 @@ int MORSE_zgetrf_nopiv(int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile(  descA, A, NB, NB, LDA, N, 0, 0, N, N,*/
-/*                             sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgetrf_nopiv_Tile_Async(&descA, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N, sequence, &request );
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,*/
-/*                             sequence, &request );*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgetrs_incpiv.c b/compute/zgetrs_incpiv.c
index d2a410344..392f3c8ae 100644
--- a/compute/zgetrs_incpiv.c
+++ b/compute/zgetrs_incpiv.c
@@ -142,31 +142,20 @@ int MORSE_zgetrs_incpiv(MORSE_enum trans, int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, N, N,   */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N, NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgetrs_incpiv_Tile_Async(&descA, descL, IPIV, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zgetrs_nopiv.c b/compute/zgetrs_nopiv.c
index 72af580ea..5f4448f22 100644
--- a/compute/zgetrs_nopiv.c
+++ b/compute/zgetrs_nopiv.c
@@ -136,31 +136,20 @@ int MORSE_zgetrs_nopiv(MORSE_enum trans, int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, N, N,   */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N, NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zgetrs_nopiv_Tile_Async(&descA, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zheevd.c b/compute/zheevd.c
index 864d50eb0..5254ea766 100644
--- a/compute/zheevd.c
+++ b/compute/zheevd.c
@@ -152,25 +152,17 @@ int MORSE_zheevd(MORSE_enum jobz, MORSE_enum uplo, int N,
 
     morse_sequence_create(morse, &sequence);
 
-    /* if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) { */
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-    /* } else { */
-    /*     morse_ziplap2tile( descA, A, NB, NB, LDA, N, 0, 0, N, N, */
-    /*                         sequence, &requoest); */
-    /* } */
 
     /* Call the tile interface */
     MORSE_zheevd_Tile_Async(jobz, uplo, &descA, W, descT, sequence, &request);
 
-    /* if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) { */
+    /* Submit the matrix conversion */
     morse_zooptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);
     morse_sequence_wait(morse, sequence);
     morse_desc_mat_free(&descA);
-    /* } else { */
-    /*     morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request); */
-    /*     morse_sequence_wait(morse, sequence); */
-    /* } */
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zhemm.c b/compute/zhemm.c
index 1aa351cce..5d31cb379 100644
--- a/compute/zhemm.c
+++ b/compute/zhemm.c
@@ -173,38 +173,24 @@ int MORSE_zhemm(MORSE_enum side, MORSE_enum uplo, int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, Am, Am, Am, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, N, M,  N, sequence, &request );
     morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
                      C, NB, NB, LDC, N, M,  N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, Am, 0, 0, Am, Am,*/
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, N,  0, 0, M,  N,*/
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descC, C, NB, NB, LDC, N,  0, 0, M,  N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zhemm_Tile_Async(
         side, uplo, alpha, &descA, &descB, beta, &descC, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descC, C, NB, NB, LDC, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
         morse_desc_mat_free(&descC);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, Am,  sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, N,  sequence, &request);*/
-/*        morse_ziptile2lap( descC, C, NB, NB, LDC, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zher2k.c b/compute/zher2k.c
index b75b27348..93d3da9e1 100644
--- a/compute/zher2k.c
+++ b/compute/zher2k.c
@@ -178,37 +178,23 @@ int MORSE_zher2k(MORSE_enum uplo, MORSE_enum trans, int N, int K,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, An, Am, An, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, An, Am, An, sequence, &request );
     morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
                      C, NB, NB, LDC, N, N,  N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, An, 0, 0, Am, An, */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, An, 0, 0, Am, An, */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descC, C, NB, NB, LDC, N,  0, 0, N,  N, */
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zher2k_Tile_Async(uplo, trans, alpha, &descA, &descB, beta, &descC, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descC, C, NB, NB, LDC, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
         morse_desc_mat_free(&descC);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, An,  sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, An,  sequence, &request);*/
-/*        morse_ziptile2lap( descC, C, NB, NB, LDC, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zherk.c b/compute/zherk.c
index 47e0048d7..de717dd8c 100644
--- a/compute/zherk.c
+++ b/compute/zherk.c
@@ -164,31 +164,20 @@ int MORSE_zherk(MORSE_enum uplo, MORSE_enum trans, int N, int K,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, An, Am, An, sequence, &request );
     morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
                      C, NB, NB, LDC, N, N,  N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, An, 0, 0, Am, An, */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descC, C, NB, NB, LDC, N,  0, 0, N,  N, */
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zherk_Tile_Async(uplo, trans, alpha, &descA, beta, &descC, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descC, C, NB, NB, LDC, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descC);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, An,  sequence, &request);*/
-/*        morse_ziptile2lap( descC, C, NB, NB, LDC, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zhetrd.c b/compute/zhetrd.c
index 5bf4718f4..e895ce6b5 100644
--- a/compute/zhetrd.c
+++ b/compute/zhetrd.c
@@ -166,25 +166,17 @@ int MORSE_zhetrd(MORSE_enum jobz, MORSE_enum uplo, int N,
 
     morse_sequence_create(morse, &sequence);
 
-    /* if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) { */
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-    /* } else { */
-    /*     morse_ziplap2tile( descA, A, NB, NB, LDA, N, 0, 0, N, N, */
-    /*                         sequence, &request); */
-    /* } */
 
     /* Call the tile interface */
     MORSE_zhetrd_Tile_Async(jobz, uplo, &descA, D, E, descT, Q, LDQ, sequence, &request);
 
-    /* if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) { */
+    /* Submit the matrix conversion */
     morse_zooptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);
     morse_sequence_wait(morse, sequence);
     morse_desc_mat_free(&descA);
-    /* } else { */
-    /*     morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request); */
-    /* morse_sequence_wait(morse, sequence); */
-    /* } */
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zlacpy.c b/compute/zlacpy.c
index 9d7ca0785..828f80445 100644
--- a/compute/zlacpy.c
+++ b/compute/zlacpy.c
@@ -130,30 +130,20 @@ int MORSE_zlacpy(MORSE_enum uplo, int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile(  descA, A, NB, NB, LDA, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile(  descB, B, NB, NB, LDA, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zlacpy_Tile_Async(uplo, &descA, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descB, B, NB, NB, LDB, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     morse_sequence_destroy(morse, sequence);
     return MORSE_SUCCESS;
diff --git a/compute/zlange.c b/compute/zlange.c
index 1ab8a57ec..8c196310e 100644
--- a/compute/zlange.c
+++ b/compute/zlange.c
@@ -134,26 +134,18 @@ double MORSE_zlange(MORSE_enum norm, int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile(  descA, A, NB, NB, LDA, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zlange_Tile_Async(norm, &descA, &value, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,  sequence, &request);
     RUNTIME_desc_flush( &descA, sequence );
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     morse_sequence_destroy(morse, sequence);
     return value;
diff --git a/compute/zlanhe.c b/compute/zlanhe.c
index 673352709..299246590 100644
--- a/compute/zlanhe.c
+++ b/compute/zlanhe.c
@@ -134,26 +134,18 @@ double MORSE_zlanhe(MORSE_enum norm, MORSE_enum uplo, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile(  descA, A, NB, NB, LDA, N, 0, 0, N, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zlanhe_Tile_Async(norm, uplo, &descA, &value, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zooptile2lap(descA, A, NB, NB, LDA, N,  sequence, &request);
     RUNTIME_desc_flush( &descA, sequence );
     morse_sequence_wait(morse, sequence);
     morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     morse_sequence_destroy(morse, sequence);
     return value;
diff --git a/compute/zlansy.c b/compute/zlansy.c
index 4186a9561..3078ce2a9 100644
--- a/compute/zlansy.c
+++ b/compute/zlansy.c
@@ -134,24 +134,16 @@ double MORSE_zlansy(MORSE_enum norm, MORSE_enum uplo, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile(  descA, A, NB, NB, LDA, N, 0, 0, N, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zlansy_Tile_Async(norm, uplo, &descA, &value, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     morse_sequence_destroy(morse, sequence);
     return value;
diff --git a/compute/zlantr.c b/compute/zlantr.c
index bf288ccf3..80ac58305 100644
--- a/compute/zlantr.c
+++ b/compute/zlantr.c
@@ -154,24 +154,16 @@ double MORSE_zlantr(MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile(  descA, A, NB, NB, LDA, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zlantr_Tile_Async(norm, uplo, diag, &descA, &value, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     morse_sequence_destroy(morse, sequence);
     return value;
diff --git a/compute/zlascal.c b/compute/zlascal.c
index 1ceb1ad8c..91315d994 100644
--- a/compute/zlascal.c
+++ b/compute/zlascal.c
@@ -113,26 +113,18 @@ int MORSE_zlascal(MORSE_enum uplo, int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N , 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zlascal_Tile_Async(
         uplo, alpha, &descA, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);
         RUNTIME_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N, sequence, &request);*/
-/*        morse_dynamic_sync();*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zlaset.c b/compute/zlaset.c
index c9e404994..58fee1e20 100644
--- a/compute/zlaset.c
+++ b/compute/zlaset.c
@@ -127,24 +127,16 @@ int MORSE_zlaset(MORSE_enum uplo, int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile(  descA, A, NB, NB, LDA, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zlaset_Tile_Async(uplo, alpha, beta, &descA, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     morse_sequence_destroy(morse, sequence);
     return MORSE_SUCCESS;
diff --git a/compute/zlauum.c b/compute/zlauum.c
index 0102c3269..851a2adfe 100644
--- a/compute/zlauum.c
+++ b/compute/zlauum.c
@@ -121,25 +121,17 @@ int MORSE_zlauum(MORSE_enum uplo, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile(  descA, A, NB, NB, LDA, N, 0, 0, N, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zlauum_Tile_Async(uplo, &descA, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zposv.c b/compute/zposv.c
index 49af7c7e8..f09a6f707 100644
--- a/compute/zposv.c
+++ b/compute/zposv.c
@@ -149,33 +149,22 @@ int MORSE_zposv(MORSE_enum uplo, int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, N, N,   */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N, NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zposv_Tile_Async(uplo, &descA, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,     sequence, &request);
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
-    
+
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
     return status;
diff --git a/compute/zpotri.c b/compute/zpotri.c
index d7456beb8..5b5612914 100644
--- a/compute/zpotri.c
+++ b/compute/zpotri.c
@@ -118,25 +118,17 @@ int MORSE_zpotri(MORSE_enum uplo, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile(  descA, A, NB, NB, LDA, N, 0, 0, N, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zpotri_Tile_Async(uplo, &descA, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zpotrimm.c b/compute/zpotrimm.c
index bd12cb16a..b92665ca6 100644
--- a/compute/zpotrimm.c
+++ b/compute/zpotrimm.c
@@ -128,22 +128,18 @@ int MORSE_zpotrimm(MORSE_enum uplo, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, N, N, N, sequence, &request );
     morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
                      C, NB, NB, LDC, N, N, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile(  descA, A, NB, NB, LDA, N, 0, 0, N, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zpotrimm_Tile_Async(uplo, &descA, &descB, &descC, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,  sequence, &request);
         morse_zooptile2lap(descB, A, NB, NB, LDB, N,  sequence, &request);
         morse_zooptile2lap(descC, C, NB, NB, LDC, N,  sequence, &request);
@@ -151,10 +147,6 @@ int MORSE_zpotrimm(MORSE_enum uplo, int N,
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
         morse_desc_mat_free(&descC);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zpotrs.c b/compute/zpotrs.c
index 79cbe0d6e..8311a8b7d 100644
--- a/compute/zpotrs.c
+++ b/compute/zpotrs.c
@@ -133,31 +133,20 @@ int MORSE_zpotrs(MORSE_enum uplo, int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, N, N,   */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N, NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zpotrs_Tile_Async(uplo, &descA, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
     
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zsymm.c b/compute/zsymm.c
index 34aedb00e..1bfd9b086 100644
--- a/compute/zsymm.c
+++ b/compute/zsymm.c
@@ -173,38 +173,24 @@ int MORSE_zsymm(MORSE_enum side, MORSE_enum uplo, int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, Am, Am, Am, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, N, M,  N, sequence, &request );
     morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
                      C, NB, NB, LDC, N, M,  N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, Am, 0, 0, Am, Am,*/
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, N,  0, 0, M,  N,*/
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descC, C, NB, NB, LDC, N,  0, 0, M,  N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zsymm_Tile_Async(
         side, uplo, alpha, &descA, &descB, beta, &descC, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descC, C, NB, NB, LDC, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
         morse_desc_mat_free(&descC);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, Am,  sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, N,  sequence, &request);*/
-/*        morse_ziptile2lap( descC, C, NB, NB, LDC, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zsyr2k.c b/compute/zsyr2k.c
index dbc9ec1ed..835004eeb 100644
--- a/compute/zsyr2k.c
+++ b/compute/zsyr2k.c
@@ -178,37 +178,23 @@ int MORSE_zsyr2k(MORSE_enum uplo, MORSE_enum trans, int N, int K,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, An, Am, An, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, An, Am, An, sequence, &request );
     morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
                      C, NB, NB, LDC, N, N,  N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, An, 0, 0, Am, An, */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, An, 0, 0, Am, An, */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descC, C, NB, NB, LDC, N,  0, 0, N,  N, */
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zsyr2k_Tile_Async(uplo, trans, alpha, &descA, &descB, beta, &descC, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descC, C, NB, NB, LDC, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
         morse_desc_mat_free(&descC);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, An,  sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, An,  sequence, &request);*/
-/*        morse_ziptile2lap( descC, C, NB, NB, LDC, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zsyrk.c b/compute/zsyrk.c
index 16383776e..70cd97564 100644
--- a/compute/zsyrk.c
+++ b/compute/zsyrk.c
@@ -164,31 +164,20 @@ int MORSE_zsyrk(MORSE_enum uplo, MORSE_enum trans, int N, int K,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, An, Am, An, sequence, &request );
     morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
                      C, NB, NB, LDC, N, N,  N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, An, 0, 0, Am, An, */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descC, C, NB, NB, LDC, N,  0, 0, N,  N, */
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zsyrk_Tile_Async(uplo, trans, alpha, &descA, beta, &descC, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descC, C, NB, NB, LDC, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descC);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, An,  sequence, &request);*/
-/*        morse_ziptile2lap( descC, C, NB, NB, LDC, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zsysv.c b/compute/zsysv.c
index f2419e6bb..bdec5fefc 100644
--- a/compute/zsysv.c
+++ b/compute/zsysv.c
@@ -146,32 +146,21 @@ int MORSE_zsysv(MORSE_enum uplo, int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, N, N,   */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N, NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zsysv_Tile_Async(uplo, &descA, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,     sequence, &request);
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zsytrf.c b/compute/zsytrf.c
index a902fabdf..424094d87 100644
--- a/compute/zsytrf.c
+++ b/compute/zsytrf.c
@@ -122,25 +122,17 @@ int MORSE_zsytrf(MORSE_enum uplo, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N, 0, 0, N, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zsytrf_Tile_Async(uplo, &descA, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zsytrs.c b/compute/zsytrs.c
index 7649dd6eb..f1d1b42ee 100644
--- a/compute/zsytrs.c
+++ b/compute/zsytrs.c
@@ -132,31 +132,20 @@ int MORSE_zsytrs(MORSE_enum uplo, int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, N, N,   */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N, NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zsytrs_Tile_Async(uplo, &descA, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
     
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/ztpgqrt.c b/compute/ztpgqrt.c
index 4942e0d2f..d2b174253 100644
--- a/compute/ztpgqrt.c
+++ b/compute/ztpgqrt.c
@@ -207,7 +207,7 @@ int MORSE_ztpgqrt( int M, int N, int K, int L,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descV1l, &descV1t, MorseUpperLower,
                      V1, NB, NB, LDV1, K, M, K, sequence, &request );
     morse_zlap2tile( morse, &descV2l, &descV2t, MorseUpperLower,
@@ -216,15 +216,11 @@ int MORSE_ztpgqrt( int M, int N, int K, int L,
                      Q1, NB, NB, LDQ1, N, K, N, sequence, &request );
     morse_zlap2tile( morse, &descQ2l, &descQ2t, MorseUpperLower,
                      Q2, NB, NB, LDQ2, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descQ1, Q1, NB, NB, LDQ1, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_ztpgqrt_Tile_Async(L, &descV1, descT1, &descV2, descT2, &descQ1, &descQ2, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descQ1, Q1, NB, NB, LDQ1, N, sequence, &request);
         morse_zooptile2lap(descQ2, Q2, NB, NB, LDQ2, N, sequence, &request);
         morse_sequence_wait(morse, sequence);
@@ -232,13 +228,6 @@ int MORSE_ztpgqrt( int M, int N, int K, int L,
         morse_desc_mat_free(&descV2);
         morse_desc_mat_free(&descQ1);
         morse_desc_mat_free(&descQ2);
-/*    } else {*/
-/*        morse_ziptile2lap( descV1, V1, NB, NB, LDV1, K,  sequence, &request);*/
-/*        morse_ziptile2lap( descV2, V2, NB, NB, LDV2, K,  sequence, &request);*/
-/*        morse_ziptile2lap( descQ1, Q1, NB, NB, LDQ1, N,  sequence, &request);*/
-/*        morse_ziptile2lap( descQ2, Q2, NB, NB, LDQ2, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/ztpqrt.c b/compute/ztpqrt.c
index a80b0c911..ed352901b 100644
--- a/compute/ztpqrt.c
+++ b/compute/ztpqrt.c
@@ -185,30 +185,21 @@ int MORSE_ztpqrt( int M, int N, int L,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_ztpqrt_Tile_Async(L, &descA, &descB, descT, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N, sequence, &request);
         morse_zooptile2lap(descB, B, NB, NB, LDB, N, sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/ztradd.c b/compute/ztradd.c
index 8deb69a60..2aa2175b7 100644
--- a/compute/ztradd.c
+++ b/compute/ztradd.c
@@ -163,32 +163,21 @@ int MORSE_ztradd(MORSE_enum uplo, MORSE_enum trans, int M, int N,
 
     morse_sequence_create(morse, &sequence);
 
-    /* if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) { */
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, An, Am, An, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, N, M, N, sequence, &request );
-    /* } else { */
-    /*     morse_ziplap2tile( descA, A, NB, NB, LDA, An, 0, 0, Am, An, */
-    /*                         sequence, &request); */
-    /*     morse_ziplap2tile( descB, B, NB, NB, LDB, N, 0, 0, M, N, */
-    /*                         sequence, &request); */
-    /* } */
 
     /* Call the tile interface */
     MORSE_ztradd_Tile_Async(
         uplo, trans, alpha, &descA, beta, &descB, sequence, &request);
 
-    /* if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) { */
+    /* Submit the matrix conversion */
         morse_zooptile2lap( descB, B, NB, NB, LDB, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-    /* } else { */
-    /*     morse_ziptile2lap( descA, A, NB, NB, LDA, An, sequence, &request); */
-    /*     morse_ziptile2lap( descB, B, NB, NB, LDB, N,  sequence, &request); */
-    /*     morse_dynamic_sync(); */
-    /* } */
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/ztrmm.c b/compute/ztrmm.c
index cf6a4b5df..e20dad686 100644
--- a/compute/ztrmm.c
+++ b/compute/ztrmm.c
@@ -177,32 +177,21 @@ int MORSE_ztrmm(MORSE_enum side, MORSE_enum uplo,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, NA, NA, NA, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, N,  NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, NA,   0, 0, NA, NA,  */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N,  NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_ztrmm_Tile_Async(
         side, uplo, transA, diag, alpha, &descA, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, NA,    sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/ztrsm.c b/compute/ztrsm.c
index 10b239204..620a8609d 100644
--- a/compute/ztrsm.c
+++ b/compute/ztrsm.c
@@ -175,32 +175,21 @@ int MORSE_ztrsm(MORSE_enum side, MORSE_enum uplo,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, NA, NA, NA, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, N,  NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, NA,   0, 0, NA, NA,  */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N,  NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_ztrsm_Tile_Async(
         side, uplo, transA, diag, alpha, &descA, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, NA,    sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/ztrsmpl.c b/compute/ztrsmpl.c
index 4666f2b87..0fe3372c9 100644
--- a/compute/ztrsmpl.c
+++ b/compute/ztrsmpl.c
@@ -130,31 +130,20 @@ int MORSE_ztrsmpl(int N, int NRHS,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
     morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N,    0, 0, N, N,   */
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descB, B, NB, NB, LDB, NRHS, 0, 0, N, NRHS,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_ztrsmpl_Tile_Async(&descA, descL, IPIV, &descB, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descB, B, NB, NB, LDB, NRHS,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descB);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,     sequence, &request);*/
-/*        morse_ziptile2lap( descB, B, NB, NB, LDB, NRHS,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/ztrtri.c b/compute/ztrtri.c
index 522fe747a..d5462b555 100644
--- a/compute/ztrtri.c
+++ b/compute/ztrtri.c
@@ -130,25 +130,17 @@ int MORSE_ztrtri(MORSE_enum uplo, MORSE_enum diag, int N,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile(  descA, A, NB, NB, LDA, N, 0, 0, N, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_ztrtri_Tile_Async(uplo, diag, &descA, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descA, A, NB, NB, LDA, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zunglq.c b/compute/zunglq.c
index 73f6193e5..c3d30f230 100644
--- a/compute/zunglq.c
+++ b/compute/zunglq.c
@@ -136,31 +136,20 @@ int MORSE_zunglq(int M, int N, int K,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, K, N, sequence, &request );
     morse_zlap2tile( morse, &descQl, &descQt, MorseUpperLower,
                      Q, NB, NB, LDQ, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N, 0, 0, K, N,*/
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descQ, Q, NB, NB, LDQ, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zunglq_Tile_Async(&descA, descT, &descQ, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descQ, Q, NB, NB, LDQ, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descQ);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_ziptile2lap( descQ, Q, NB, NB, LDQ, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zunglq_param.c b/compute/zunglq_param.c
index 5f1a5ee3f..39a2250de 100644
--- a/compute/zunglq_param.c
+++ b/compute/zunglq_param.c
@@ -133,31 +133,20 @@ int MORSE_zunglq_param(const libhqr_tree_t *qrtree, int M, int N, int K,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, K, N, sequence, &request );
     morse_zlap2tile( morse, &descQl, &descQt, MorseUpperLower,
                      Q, NB, NB, LDQ, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N, 0, 0, K, N,*/
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descQ, Q, NB, NB, LDQ, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zunglq_param_Tile_Async(qrtree, &descA, descTS, descTT, &descQ, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descQ, Q, NB, NB, LDQ, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descQ);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, N,  sequence, &request);*/
-/*        morse_ziptile2lap( descQ, Q, NB, NB, LDQ, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zungqr.c b/compute/zungqr.c
index b62905220..d271bb095 100644
--- a/compute/zungqr.c
+++ b/compute/zungqr.c
@@ -135,31 +135,20 @@ int MORSE_zungqr(int M, int N, int K,
 
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, K, sequence, &request );
     morse_zlap2tile( morse, &descQl, &descQt, MorseUpperLower,
                      Q, NB, NB, LDQ, N, M, N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, N, 0, 0, M, K,*/
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descQ, Q, NB, NB, LDQ, N, 0, 0, M, N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zungqr_Tile_Async(&descA, descT, &descQ, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descQ, Q, NB, NB, LDQ, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descQ);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, K,  sequence, &request);*/
-/*        morse_ziptile2lap( descQ, Q, NB, NB, LDQ, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zungqr_param.c b/compute/zungqr_param.c
index c99631434..5b99249ad 100644
--- a/compute/zungqr_param.c
+++ b/compute/zungqr_param.c
@@ -134,31 +134,20 @@ int MORSE_zungqr_param(const libhqr_tree_t *qrtree,
 
     morse_sequence_create(morse, &sequence);
 
-    /*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, N, M, K, sequence, &request );
     morse_zlap2tile( morse, &descQl, &descQt, MorseUpperLower,
                      Q, NB, NB, LDQ, N, M, N, sequence, &request );
-    /*    } else {*/
-    /*        morse_ziplap2tile( descA, A, NB, NB, LDA, N, 0, 0, M, K,*/
-    /*                            sequence, &request);*/
-    /*        morse_ziplap2tile( descQ, Q, NB, NB, LDQ, N, 0, 0, M, N,*/
-    /*                            sequence, &request);*/
-    /*    }*/
 
     /* Call the tile interface */
     MORSE_zungqr_param_Tile_Async(qrtree, &descA, descTS, descTT, &descQ, sequence, &request);
 
-    /*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zooptile2lap(descQ, Q, NB, NB, LDQ, N,  sequence, &request);
     morse_sequence_wait(morse, sequence);
     morse_desc_mat_free(&descA);
     morse_desc_mat_free(&descQ);
-    /*    } else {*/
-    /*        morse_ziptile2lap( descA, A, NB, NB, LDA, K,  sequence, &request);*/
-    /*        morse_ziptile2lap( descQ, Q, NB, NB, LDQ, N,  sequence, &request);*/
-    /*        morse_sequence_wait(morse, sequence);*/
-    /*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zunmlq.c b/compute/zunmlq.c
index ba2f34e5d..fb497ddee 100644
--- a/compute/zunmlq.c
+++ b/compute/zunmlq.c
@@ -173,32 +173,21 @@ int MORSE_zunmlq(MORSE_enum side, MORSE_enum trans, int M, int N, int K,
     NB   = MORSE_NB;
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, An, K, An, sequence, &request );
     morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
                      C, NB, NB, LDC, N, M,  N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, An, 0, 0, K, An,*/
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descC, C, NB, NB, LDC, N, 0, 0, M,  N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zunmlq_Tile_Async(
         side, trans, &descA, descT, &descC, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descC, C, NB, NB, LDC, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descC);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, An, sequence, &request);*/
-/*        morse_ziptile2lap( descC, C, NB, NB, LDC, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zunmlq_param.c b/compute/zunmlq_param.c
index 36da968cf..4492c2eed 100644
--- a/compute/zunmlq_param.c
+++ b/compute/zunmlq_param.c
@@ -172,32 +172,21 @@ int MORSE_zunmlq_param(const libhqr_tree_t *qrtree, MORSE_enum side, MORSE_enum
     NB   = MORSE_NB;
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, An, K, An, sequence, &request );
     morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
                      C, NB, NB, LDC, N, M,  N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, An, 0, 0, K, An,*/
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descC, C, NB, NB, LDC, N, 0, 0, M,  N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zunmlq_param_Tile_Async(
         qrtree, side, trans, &descA, descTS, descTT, &descC, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descC, C, NB, NB, LDC, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descC);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, An, sequence, &request);*/
-/*        morse_ziptile2lap( descC, C, NB, NB, LDC, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zunmqr.c b/compute/zunmqr.c
index 6f8563d2e..b6eb340da 100644
--- a/compute/zunmqr.c
+++ b/compute/zunmqr.c
@@ -176,32 +176,21 @@ int MORSE_zunmqr(MORSE_enum side, MORSE_enum trans, int M, int N, int K,
     NB   = MORSE_NB;
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, K, Am, K, sequence, &request );
     morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
                      C, NB, NB, LDC, N, M,  N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, K, 0, 0, Am, K,*/
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descC, C, NB, NB, LDC, N, 0, 0, M,  N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
     MORSE_zunmqr_Tile_Async(
         side, trans, &descA, descT, &descC, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descC, C, NB, NB, LDC, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descC);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, K,  sequence, &request);*/
-/*        morse_ziptile2lap( descC, C, NB, NB, LDC, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/zunmqr_param.c b/compute/zunmqr_param.c
index 510115624..bd5ab11c8 100644
--- a/compute/zunmqr_param.c
+++ b/compute/zunmqr_param.c
@@ -177,32 +177,21 @@ int MORSE_zunmqr_param(const libhqr_tree_t *qrtree,
     NB   = MORSE_NB;
     morse_sequence_create(morse, &sequence);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
     morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
                      A, NB, NB, LDA, K, Am, K, sequence, &request );
     morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
                      C, NB, NB, LDC, N, M,  N, sequence, &request );
-/*    } else {*/
-/*        morse_ziplap2tile( descA, A, NB, NB, LDA, K, 0, 0, Am, K,*/
-/*                            sequence, &request);*/
-/*        morse_ziplap2tile( descC, C, NB, NB, LDC, N, 0, 0, M,  N,*/
-/*                            sequence, &request);*/
-/*    }*/
 
     /* Call the tile interface */
         MORSE_zunmqr_param_Tile_Async(
             qrtree, side, trans, &descA, descTS, descTT, &descC, sequence, &request);
 
-/*    if ( MORSE_TRANSLATION == MORSE_OUTOFPLACE ) {*/
+    /* Submit the matrix conversion */
         morse_zooptile2lap(descC, C, NB, NB, LDC, N,  sequence, &request);
         morse_sequence_wait(morse, sequence);
         morse_desc_mat_free(&descA);
         morse_desc_mat_free(&descC);
-/*    } else {*/
-/*        morse_ziptile2lap( descA, A, NB, NB, LDA, K,  sequence, &request);*/
-/*        morse_ziptile2lap( descC, C, NB, NB, LDC, N,  sequence, &request);*/
-/*        morse_sequence_wait(morse, sequence);*/
-/*    }*/
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
-- 
GitLab