From 17f869919935d77824dc696baebae82531390a5b Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Thu, 18 Oct 2018 00:02:17 +0200
Subject: [PATCH] Release/test

---
 compute/pzgelqf.c             |  3 +-
 compute/pzgelqf_param.c       |  3 +-
 compute/pzgelqfrh.c           |  3 +-
 compute/pzgemm.c              |  3 +-
 compute/pzgeqrf.c             |  3 +-
 compute/pzgeqrf_param.c       |  3 +-
 compute/pzgeqrfrh.c           |  3 +-
 compute/pzgetrf_incpiv.c      |  3 +-
 compute/pzgetrf_nopiv.c       |  3 +-
 compute/pzhemm.c              |  3 +-
 compute/pzher2k.c             |  3 +-
 compute/pzherk.c              |  3 +-
 compute/pzhetrd_he2hb.c       |  3 +-
 compute/pzlacpy.c             |  3 +-
 compute/pzlag2c.c             |  3 +-
 compute/pzlange.c             |  3 +-
 compute/pzlansy.c             |  3 +-
 compute/pzlascal.c            |  3 +-
 compute/pzlaset.c             |  3 +-
 compute/pzlaset2.c            |  3 +-
 compute/pzlauum.c             |  3 +-
 compute/pzplghe.c             |  3 +-
 compute/pzplgsy.c             |  3 +-
 compute/pzplrnt.c             |  3 +-
 compute/pzpotrf.c             |  3 +-
 compute/pzpotrimm.c           |  3 +-
 compute/pzsymm.c              |  3 +-
 compute/pzsyr2k.c             |  3 +-
 compute/pzsyrk.c              |  3 +-
 compute/pzsytrf.c             |  3 +-
 compute/pztile2band.c         |  3 +-
 compute/pztpgqrt.c            |  6 ++--
 compute/pztradd.c             |  3 +-
 compute/pztrmm.c              |  3 +-
 compute/pztrsm.c              |  3 +-
 compute/pztrsmpl.c            |  3 +-
 compute/pztrtri.c             |  3 +-
 compute/pzunglq.c             |  3 +-
 compute/pzunglq_param.c       |  3 +-
 compute/pzunglqrh.c           |  3 +-
 compute/pzungqr.c             |  3 +-
 compute/pzungqr_param.c       |  3 +-
 compute/pzungqrrh.c           |  3 +-
 compute/pzunmlq.c             |  3 +-
 compute/pzunmlq_param.c       |  3 +-
 compute/pzunmlqrh.c           |  3 +-
 compute/pzunmqr.c             |  3 +-
 compute/pzunmqr_param.c       |  3 +-
 compute/pzunmqrrh.c           |  3 +-
 compute/zposv.c               | 14 ++++-----
 control/context.c             |  1 +
 testing/CTestLists.cmake      | 59 ++++++++++++++++++-----------------
 testing/testing_zauxiliary.c  | 20 +++++++-----
 testing/testing_zauxiliary.h  | 14 +++++----
 testing/testing_zgeqrf_qdwh.c | 14 ++-------
 55 files changed, 160 insertions(+), 112 deletions(-)

diff --git a/compute/pzgelqf.c b/compute/pzgelqf.c
index 93cfdf662..6bf814a62 100644
--- a/compute/pzgelqf.c
+++ b/compute/pzgelqf.c
@@ -46,8 +46,9 @@ void chameleon_pzgelqf( int genD, CHAM_desc_t *A, CHAM_desc_t *T, CHAM_desc_t *D
     int ib, minMNT;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzgelqf_param.c b/compute/pzgelqf_param.c
index cfc343eb2..c91cea637 100644
--- a/compute/pzgelqf_param.c
+++ b/compute/pzgelqf_param.c
@@ -46,8 +46,9 @@ void chameleon_pzgelqf_param( int genD, const libhqr_tree_t *qrtree, CHAM_desc_t
     int ib, node, nbtiles, *tiles;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzgelqfrh.c b/compute/pzgelqfrh.c
index 55c3121b2..d9b77e548 100644
--- a/compute/pzgelqfrh.c
+++ b/compute/pzgelqfrh.c
@@ -49,8 +49,9 @@ void chameleon_pzgelqfrh( int genD, int BS, CHAM_desc_t *A, CHAM_desc_t *T, CHAM
     int ib, node;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzgemm.c b/compute/pzgemm.c
index b342ec265..eaf324397 100644
--- a/compute/pzgemm.c
+++ b/compute/pzgemm.c
@@ -45,8 +45,9 @@ void chameleon_pzgemm(cham_trans_t transA, cham_trans_t transB,
     CHAMELEON_Complex64_t zone = (CHAMELEON_Complex64_t)1.0;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     for (m = 0; m < C->mt; m++) {
diff --git a/compute/pzgeqrf.c b/compute/pzgeqrf.c
index 5df72c8ca..650e769a0 100644
--- a/compute/pzgeqrf.c
+++ b/compute/pzgeqrf.c
@@ -47,8 +47,9 @@ void chameleon_pzgeqrf( int genD, CHAM_desc_t *A, CHAM_desc_t *T, CHAM_desc_t *D
     int minMNT = chameleon_min(A->mt, A->nt);
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzgeqrf_param.c b/compute/pzgeqrf_param.c
index cc63e3a18..b297e598f 100644
--- a/compute/pzgeqrf_param.c
+++ b/compute/pzgeqrf_param.c
@@ -51,8 +51,9 @@ void chameleon_pzgeqrf_param( int genD, int K,
     int ib, node, nbtiles, *tiles;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzgeqrfrh.c b/compute/pzgeqrfrh.c
index 1eeb7cdbc..b075a0ef1 100644
--- a/compute/pzgeqrfrh.c
+++ b/compute/pzgeqrfrh.c
@@ -49,8 +49,9 @@ void chameleon_pzgeqrfrh( int genD, int BS, CHAM_desc_t *A, CHAM_desc_t *T, CHAM
     int ib, node;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzgetrf_incpiv.c b/compute/pzgetrf_incpiv.c
index 7781a8dc1..99fd7b508 100644
--- a/compute/pzgetrf_incpiv.c
+++ b/compute/pzgetrf_incpiv.c
@@ -55,8 +55,9 @@ void chameleon_pzgetrf_incpiv( CHAM_desc_t *A, CHAM_desc_t *L, CHAM_desc_t *D, i
     int minMNT = chameleon_min(A->mt, A->nt);
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzgetrf_nopiv.c b/compute/pzgetrf_nopiv.c
index cfd279f43..6377ce6be 100644
--- a/compute/pzgetrf_nopiv.c
+++ b/compute/pzgetrf_nopiv.c
@@ -42,8 +42,9 @@ void chameleon_pzgetrf_nopiv(CHAM_desc_t *A,
     CHAMELEON_Complex64_t mzone = (CHAMELEON_Complex64_t)-1.0;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzhemm.c b/compute/pzhemm.c
index 0f9614c97..59ab09761 100644
--- a/compute/pzhemm.c
+++ b/compute/pzhemm.c
@@ -45,8 +45,9 @@ void chameleon_pzhemm(cham_side_t side, cham_uplo_t uplo,
     CHAMELEON_Complex64_t zone = (CHAMELEON_Complex64_t)1.0;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     for(m = 0; m < C->mt; m++) {
diff --git a/compute/pzher2k.c b/compute/pzher2k.c
index ce5625577..2eaf407a6 100644
--- a/compute/pzher2k.c
+++ b/compute/pzher2k.c
@@ -47,8 +47,9 @@ void chameleon_pzher2k(cham_uplo_t uplo, cham_trans_t trans,
     double dbeta;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     for (n = 0; n < C->nt; n++) {
diff --git a/compute/pzherk.c b/compute/pzherk.c
index b3728d65e..b5262e621 100644
--- a/compute/pzherk.c
+++ b/compute/pzherk.c
@@ -46,8 +46,9 @@ void chameleon_pzherk(cham_uplo_t uplo, cham_trans_t trans,
     double dbeta;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     for (n = 0; n < C->nt; n++) {
diff --git a/compute/pzhetrd_he2hb.c b/compute/pzhetrd_he2hb.c
index 999e1034d..711651d15 100644
--- a/compute/pzhetrd_he2hb.c
+++ b/compute/pzhetrd_he2hb.c
@@ -53,8 +53,9 @@ void chameleon_pzhetrd_he2hb(cham_uplo_t uplo,
     int ib;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
 
     RUNTIME_options_init(&options, chamctxt, sequence, request);
     ib = CHAMELEON_IB;
diff --git a/compute/pzlacpy.c b/compute/pzlacpy.c
index b6e87b3d8..7d33b89b0 100644
--- a/compute/pzlacpy.c
+++ b/compute/pzlacpy.c
@@ -42,8 +42,9 @@ void chameleon_pzlacpy(cham_uplo_t uplo, CHAM_desc_t *A, CHAM_desc_t *B,
     int ldam, ldbm;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     switch (uplo) {
diff --git a/compute/pzlag2c.c b/compute/pzlag2c.c
index 9f195234f..211f47720 100644
--- a/compute/pzlag2c.c
+++ b/compute/pzlag2c.c
@@ -44,8 +44,9 @@ void chameleon_pclag2z(CHAM_desc_t *SA, CHAM_desc_t *B,
     int ldam, ldbm;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     for(m = 0; m < SA->mt; m++) {
diff --git a/compute/pzlange.c b/compute/pzlange.c
index b03d27f0c..cefbf5314 100644
--- a/compute/pzlange.c
+++ b/compute/pzlange.c
@@ -387,8 +387,9 @@ void chameleon_pzlange_generic( cham_normtype_t norm, cham_uplo_t uplo, cham_dia
     int m, n;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if ( sequence->status != CHAMELEON_SUCCESS ) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     *result = 0.0;
diff --git a/compute/pzlansy.c b/compute/pzlansy.c
index eac88cc06..1d3273838 100644
--- a/compute/pzlansy.c
+++ b/compute/pzlansy.c
@@ -320,8 +320,9 @@ void chameleon_pzlansy_generic( cham_normtype_t norm, cham_uplo_t uplo, cham_tra
     int m, n;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if ( sequence->status != CHAMELEON_SUCCESS ) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     *result = 0.0;
diff --git a/compute/pzlascal.c b/compute/pzlascal.c
index de54e477e..29e167216 100644
--- a/compute/pzlascal.c
+++ b/compute/pzlascal.c
@@ -35,8 +35,9 @@ void chameleon_pzlascal(cham_uplo_t uplo, CHAMELEON_Complex64_t alpha, CHAM_desc
     int minmnt = chameleon_min(A->mt, A->nt);
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
 
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
diff --git a/compute/pzlaset.c b/compute/pzlaset.c
index 3536b3561..49c575618 100644
--- a/compute/pzlaset.c
+++ b/compute/pzlaset.c
@@ -44,8 +44,9 @@ void chameleon_pzlaset(cham_uplo_t uplo,
     int minmn = chameleon_min(A->mt, A->nt);
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
 
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
diff --git a/compute/pzlaset2.c b/compute/pzlaset2.c
index e921755b7..5f5e129c3 100644
--- a/compute/pzlaset2.c
+++ b/compute/pzlaset2.c
@@ -43,8 +43,9 @@ void chameleon_pzlaset2(cham_uplo_t uplo, CHAMELEON_Complex64_t alpha,
     int minmn = chameleon_min(A->mt, A->nt);
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
 
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
diff --git a/compute/pzlauum.c b/compute/pzlauum.c
index 46b101514..34ac615b0 100644
--- a/compute/pzlauum.c
+++ b/compute/pzlauum.c
@@ -40,8 +40,9 @@ void chameleon_pzlauum(cham_uplo_t uplo, CHAM_desc_t *A,
     int tempkm, tempkn;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
     /*
      *  ChamLower
diff --git a/compute/pzplghe.c b/compute/pzplghe.c
index f11a331cb..08c6eef53 100644
--- a/compute/pzplghe.c
+++ b/compute/pzplghe.c
@@ -42,8 +42,9 @@ void chameleon_pzplghe( double bump, cham_uplo_t uplo, CHAM_desc_t *A,
     int tempmm, tempnn;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     for (m = 0; m < A->mt; m++) {
diff --git a/compute/pzplgsy.c b/compute/pzplgsy.c
index f2c4dde7c..8b96e86c3 100644
--- a/compute/pzplgsy.c
+++ b/compute/pzplgsy.c
@@ -42,8 +42,9 @@ void chameleon_pzplgsy( CHAMELEON_Complex64_t bump, cham_uplo_t uplo, CHAM_desc_
     int tempmm, tempnn;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     for (m = 0; m < A->mt; m++) {
diff --git a/compute/pzplrnt.c b/compute/pzplrnt.c
index 9995c25b6..d7ef9fa5d 100644
--- a/compute/pzplrnt.c
+++ b/compute/pzplrnt.c
@@ -38,8 +38,9 @@ void chameleon_pzplrnt( CHAM_desc_t *A, unsigned long long int seed,
     int tempmm, tempnn;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     for (m = 0; m < A->mt; m++) {
diff --git a/compute/pzpotrf.c b/compute/pzpotrf.c
index 5de5889a7..8f5a9b50b 100644
--- a/compute/pzpotrf.c
+++ b/compute/pzpotrf.c
@@ -45,8 +45,9 @@ void chameleon_pzpotrf(cham_uplo_t uplo, CHAM_desc_t *A,
     CHAMELEON_Complex64_t mzone = (CHAMELEON_Complex64_t)-1.0;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     RUNTIME_options_ws_alloc( &options, 0, ws_host );
diff --git a/compute/pzpotrimm.c b/compute/pzpotrimm.c
index 62cc4ba28..c8dee6ece 100644
--- a/compute/pzpotrimm.c
+++ b/compute/pzpotrimm.c
@@ -48,8 +48,9 @@ void chameleon_pzpotrimm(cham_uplo_t uplo, CHAM_desc_t *A, CHAM_desc_t *B, CHAM_
 
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     /*
diff --git a/compute/pzsymm.c b/compute/pzsymm.c
index 3b6d3e530..bd67ce978 100644
--- a/compute/pzsymm.c
+++ b/compute/pzsymm.c
@@ -45,8 +45,9 @@ void chameleon_pzsymm(cham_side_t side, cham_uplo_t uplo,
     CHAMELEON_Complex64_t zone = (CHAMELEON_Complex64_t)1.0;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     /*
diff --git a/compute/pzsyr2k.c b/compute/pzsyr2k.c
index a8d5f9e41..642379497 100644
--- a/compute/pzsyr2k.c
+++ b/compute/pzsyr2k.c
@@ -46,8 +46,9 @@ void chameleon_pzsyr2k(cham_uplo_t uplo, cham_trans_t trans,
     CHAMELEON_Complex64_t zbeta;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     for (n = 0; n < C->nt; n++) {
diff --git a/compute/pzsyrk.c b/compute/pzsyrk.c
index 899eca248..f3c87edb0 100644
--- a/compute/pzsyrk.c
+++ b/compute/pzsyrk.c
@@ -45,8 +45,9 @@ void chameleon_pzsyrk(cham_uplo_t uplo, cham_trans_t trans,
     CHAMELEON_Complex64_t zone = (CHAMELEON_Complex64_t)1.0;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     for (n = 0; n < C->nt; n++) {
diff --git a/compute/pzsytrf.c b/compute/pzsytrf.c
index 5946292bc..bd0016419 100644
--- a/compute/pzsytrf.c
+++ b/compute/pzsytrf.c
@@ -44,8 +44,9 @@ void chameleon_pzsytrf(cham_uplo_t uplo, CHAM_desc_t *A,
     CHAMELEON_Complex64_t mzone = (CHAMELEON_Complex64_t)-1.0;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     RUNTIME_options_ws_alloc( &options, 0, ws_host );
diff --git a/compute/pztile2band.c b/compute/pztile2band.c
index 1859a6c07..0a73e48d8 100644
--- a/compute/pztile2band.c
+++ b/compute/pztile2band.c
@@ -39,8 +39,9 @@ void chameleon_pztile2band(cham_uplo_t uplo, CHAM_desc_t *A, CHAM_desc_t *B,
     int minmnt = chameleon_min(A->mt, A->nt);
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ldx = B->mb-1;
diff --git a/compute/pztpgqrt.c b/compute/pztpgqrt.c
index f6062aa3d..ec1880018 100644
--- a/compute/pztpgqrt.c
+++ b/compute/pztpgqrt.c
@@ -40,8 +40,7 @@ void chameleon_pztpgqrt( int KT, int L,
     size_t ws_host = 0;
 
     int k, m, n;
-    int ldvk, ldvm, lddk;
-    int ldqk, ldqm;
+    int ldvm, ldqk, ldqm;
     int tempkn, tempnn, tempmm, templm;
     int ib;
 
@@ -51,8 +50,9 @@ void chameleon_pztpgqrt( int KT, int L,
     int maxmtk;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pztradd.c b/compute/pztradd.c
index 62e59d99b..991da8939 100644
--- a/compute/pztradd.c
+++ b/compute/pztradd.c
@@ -41,8 +41,9 @@ void chameleon_pztradd(cham_uplo_t uplo, cham_trans_t trans,
     int ldam, ldan, ldbm, ldbn;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     switch(uplo){
diff --git a/compute/pztrmm.c b/compute/pztrmm.c
index c208bf60e..3a99f8eb1 100644
--- a/compute/pztrmm.c
+++ b/compute/pztrmm.c
@@ -46,8 +46,9 @@ void chameleon_pztrmm(cham_side_t side, cham_uplo_t uplo,
     CHAMELEON_Complex64_t zone = (CHAMELEON_Complex64_t)1.0;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
     /*
      *  ChamLeft / ChamUpper / ChamNoTrans
diff --git a/compute/pztrsm.c b/compute/pztrsm.c
index ce87925c9..6655aaf51 100644
--- a/compute/pztrsm.c
+++ b/compute/pztrsm.c
@@ -47,8 +47,9 @@ void chameleon_pztrsm(cham_side_t side, cham_uplo_t uplo, cham_trans_t trans, ch
     CHAMELEON_Complex64_t lalpha;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
     /*
      *  ChamLeft / ChamUpper / ChamNoTrans
diff --git a/compute/pztrsmpl.c b/compute/pztrsmpl.c
index a9e96ff53..6dc01c95c 100644
--- a/compute/pztrsmpl.c
+++ b/compute/pztrsmpl.c
@@ -44,8 +44,9 @@ void chameleon_pztrsmpl( CHAM_desc_t *A, CHAM_desc_t *B, CHAM_desc_t *L, int *IP
     int ib;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pztrtri.c b/compute/pztrtri.c
index 3d48095c0..399fa5864 100644
--- a/compute/pztrtri.c
+++ b/compute/pztrtri.c
@@ -43,8 +43,9 @@ void chameleon_pztrtri(cham_uplo_t uplo, cham_diag_t diag, CHAM_desc_t *A,
     CHAMELEON_Complex64_t mzone = (CHAMELEON_Complex64_t)-1.0;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
     /*
      *  ChamLower
diff --git a/compute/pzunglq.c b/compute/pzunglq.c
index a757d48c2..05ad8cdef 100644
--- a/compute/pzunglq.c
+++ b/compute/pzunglq.c
@@ -48,8 +48,9 @@ void chameleon_pzunglq( int genD, CHAM_desc_t *A, CHAM_desc_t *Q, CHAM_desc_t *T
     int ib, minMT;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzunglq_param.c b/compute/pzunglq_param.c
index a6cc32e6f..d98a98ac7 100644
--- a/compute/pzunglq_param.c
+++ b/compute/pzunglq_param.c
@@ -46,8 +46,9 @@ void chameleon_pzunglq_param( int genD, const libhqr_tree_t *qrtree, CHAM_desc_t
     int ib, node, nbtiles, *tiles;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzunglqrh.c b/compute/pzunglqrh.c
index e8a6bdac9..95d6a7df4 100644
--- a/compute/pzunglqrh.c
+++ b/compute/pzunglqrh.c
@@ -51,8 +51,9 @@ void chameleon_pzunglqrh( int genD, int BS,
     int ib, node;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzungqr.c b/compute/pzungqr.c
index 26fae8b61..f9cc91822 100644
--- a/compute/pzungqr.c
+++ b/compute/pzungqr.c
@@ -49,8 +49,9 @@ void chameleon_pzungqr( int genD, CHAM_desc_t *A, CHAM_desc_t *Q,
     int ib, minMT;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzungqr_param.c b/compute/pzungqr_param.c
index d46024821..6f5501601 100644
--- a/compute/pzungqr_param.c
+++ b/compute/pzungqr_param.c
@@ -47,8 +47,9 @@ void chameleon_pzungqr_param( int genD, int K,
     int ib, nbgeqrt, node, nbtiles, *tiles;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzungqrrh.c b/compute/pzungqrrh.c
index 1b9036e6c..8fbfb9f48 100644
--- a/compute/pzungqrrh.c
+++ b/compute/pzungqrrh.c
@@ -54,8 +54,9 @@ void chameleon_pzungqrrh( int genD, int BS,
     int ib, node;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzunmlq.c b/compute/pzunmlq.c
index 90bd59861..faff5895e 100644
--- a/compute/pzunmlq.c
+++ b/compute/pzunmlq.c
@@ -49,8 +49,9 @@ void chameleon_pzunmlq( int genD, cham_side_t side, cham_trans_t trans,
     int ib, minMT, minM;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzunmlq_param.c b/compute/pzunmlq_param.c
index 545431e82..01c34e52b 100644
--- a/compute/pzunmlq_param.c
+++ b/compute/pzunmlq_param.c
@@ -48,8 +48,9 @@ void chameleon_pzunmlq_param( int genD, const libhqr_tree_t *qrtree,
     int node, nbtiles, *tiles;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzunmlqrh.c b/compute/pzunmlqrh.c
index 3ad2c4eae..23d038176 100644
--- a/compute/pzunmlqrh.c
+++ b/compute/pzunmlqrh.c
@@ -52,8 +52,9 @@ void chameleon_pzunmlqrh( int genD, int BS, cham_side_t side, cham_trans_t trans
     int ib, node;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzunmqr.c b/compute/pzunmqr.c
index 9c36a463f..9000c5158 100644
--- a/compute/pzunmqr.c
+++ b/compute/pzunmqr.c
@@ -49,8 +49,9 @@ void chameleon_pzunmqr( int genD, cham_side_t side, cham_trans_t trans,
     int ib, minMT, minM;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzunmqr_param.c b/compute/pzunmqr_param.c
index cd23e8114..7a9b2b6e1 100644
--- a/compute/pzunmqr_param.c
+++ b/compute/pzunmqr_param.c
@@ -48,8 +48,9 @@ void chameleon_pzunmqr_param( int genD, const libhqr_tree_t *qrtree,
     int node, nbtiles, *tiles;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/pzunmqrrh.c b/compute/pzunmqrrh.c
index efb0f13d5..1073db6ac 100644
--- a/compute/pzunmqrrh.c
+++ b/compute/pzunmqrrh.c
@@ -53,8 +53,9 @@ void chameleon_pzunmqrrh( int genD, int BS, cham_side_t side, cham_trans_t trans
     int ib, node;
 
     chamctxt = chameleon_context_self();
-    if (sequence->status != CHAMELEON_SUCCESS)
+    if (sequence->status != CHAMELEON_SUCCESS) {
         return;
+    }
     RUNTIME_options_init(&options, chamctxt, sequence, request);
 
     ib = CHAMELEON_IB;
diff --git a/compute/zposv.c b/compute/zposv.c
index 9defa1edc..055f17e88 100644
--- a/compute/zposv.c
+++ b/compute/zposv.c
@@ -91,8 +91,8 @@
  *
  */
 int CHAMELEON_zposv( cham_uplo_t uplo, int N, int NRHS,
-                 CHAMELEON_Complex64_t *A, int LDA,
-                 CHAMELEON_Complex64_t *B, int LDB )
+                     CHAMELEON_Complex64_t *A, int LDA,
+                     CHAMELEON_Complex64_t *B, int LDB )
 {
     int NB;
     int status;
@@ -147,18 +147,18 @@ int CHAMELEON_zposv( cham_uplo_t uplo, int N, int NRHS,
 
     /* Submit the matrix conversion */
     chameleon_zlap2tile( chamctxt, &descAl, &descAt, ChamDescInout, uplo,
-                     A, NB, NB, LDA, N, N, N, sequence, &request );
+                         A, NB, NB, LDA, N, N, N, sequence, &request );
     chameleon_zlap2tile( chamctxt, &descBl, &descBt, ChamDescInout, ChamUpperLower,
-                     B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
+                         B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
 
     /* Call the tile interface */
     CHAMELEON_zposv_Tile_Async( uplo, &descAt, &descBt, sequence, &request );
 
     /* Submit the matrix conversion back */
     chameleon_ztile2lap( chamctxt, &descAl, &descAt,
-                     ChamDescInout, uplo, sequence, &request );
+                         ChamDescInout, uplo, sequence, &request );
     chameleon_ztile2lap( chamctxt, &descBl, &descBt,
-                     ChamDescInout, ChamUpperLower, sequence, &request );
+                         ChamDescInout, ChamUpperLower, sequence, &request );
 
     chameleon_sequence_wait( chamctxt, sequence );
 
@@ -275,7 +275,7 @@ int CHAMELEON_zposv_Tile( cham_uplo_t uplo, CHAM_desc_t *A, CHAM_desc_t *B )
  *
  */
 int CHAMELEON_zposv_Tile_Async( cham_uplo_t uplo, CHAM_desc_t *A, CHAM_desc_t *B,
-                            RUNTIME_sequence_t *sequence, RUNTIME_request_t *request )
+                                RUNTIME_sequence_t *sequence, RUNTIME_request_t *request )
 {
     CHAM_context_t *chamctxt;
 
diff --git a/control/context.c b/control/context.c
index 384d473cd..9464aa922 100644
--- a/control/context.c
+++ b/control/context.c
@@ -27,6 +27,7 @@
 #include "control/auxiliary.h"
 #include "control/context.h"
 #include "chameleon/runtime.h"
+#include <stdlib.h>
 
 #if !defined(CHAMELEON_SIMULATION)
 #include "coreblas.h"
diff --git a/testing/CTestLists.cmake b/testing/CTestLists.cmake
index 6daed496d..7e6f77460 100644
--- a/testing/CTestLists.cmake
+++ b/testing/CTestLists.cmake
@@ -2,10 +2,10 @@
 # Check testing/
 #
 
-set(TEST_CMD_shm    testing 4 0)
-set(TEST_CMD_shmgpu testing 4 1)
-# set(TEST_CMD_mpi    testing 4 0)
-# set(TEST_CMD_mpigpu testing 4 1)
+set(TEST_CMD_shm    testing 4 0 19 7 )
+set(TEST_CMD_shmgpu testing 4 1 19 7 )
+# set(TEST_CMD_mpi    testing 4 0 19 7 )
+# set(TEST_CMD_mpigpu testing 4 1 19 7 )
 
 set( TEST_CATEGORIES shm )
 if (CHAMELEON_USE_CUDA AND CUDA_FOUND)
@@ -18,37 +18,38 @@ foreach(cat  ${TEST_CATEGORIES})
     string(TOUPPER ${prec} PREC)
 
     if (CHAMELEON_PREC_${PREC})
-        add_test(test_${cat}_${prec}lange ./${prec}${TEST_CMD_${cat}} LANGE 600 500 600)
-        add_test(test_${cat}_${prec}gemm  ./${prec}${TEST_CMD_${cat}} GEMM  1.0 -2.0 600 500 550 650 625 700)
-        add_test(test_${cat}_${prec}trsm  ./${prec}${TEST_CMD_${cat}} TRSM  -2.0 600 500 650 625)
-        add_test(test_${cat}_${prec}trmm  ./${prec}${TEST_CMD_${cat}} TRMM  -2.0 600 500 650 625)
-        add_test(test_${cat}_${prec}symm  ./${prec}${TEST_CMD_${cat}} SYMM  1.0 -2.0 600 500 650 625 700)
-        add_test(test_${cat}_${prec}syrk  ./${prec}${TEST_CMD_${cat}} SYRK  1.0 -2.0 600 500 650 625)
-        add_test(test_${cat}_${prec}syr2k ./${prec}${TEST_CMD_${cat}} SYR2K 1.0 -2.0 600 500 650 625 700)
+        add_test(test_${cat}_${prec}lange ./${prec}${TEST_CMD_${cat}} LANGE 117 213 232 )
+        add_test(test_${cat}_${prec}gemm  ./${prec}${TEST_CMD_${cat}} GEADD 1.7 -2.3 117 213    215 220    )
+        add_test(test_${cat}_${prec}gemm  ./${prec}${TEST_CMD_${cat}} GEMM  1.7 -2.3 117 213 97 215 220 232)
+        add_test(test_${cat}_${prec}trsm  ./${prec}${TEST_CMD_${cat}} TRSM      -2.3 117 213    215 220    )
+        add_test(test_${cat}_${prec}trmm  ./${prec}${TEST_CMD_${cat}} TRMM      -2.3 117 213    215 220    )
+        add_test(test_${cat}_${prec}symm  ./${prec}${TEST_CMD_${cat}} SYMM  1.7 -2.3 117 213    215 220 232)
+        add_test(test_${cat}_${prec}syrk  ./${prec}${TEST_CMD_${cat}} SYRK  1.7 -2.3 117 213    215 220    )
+        add_test(test_${cat}_${prec}syr2k ./${prec}${TEST_CMD_${cat}} SYR2K 1.7 -2.3 117 213    215 220 232)
 
         if ( ${prec} STREQUAL c OR ${prec} STREQUAL z )
-          add_test(test_${cat}_${prec}hemm  ./${prec}${TEST_CMD_${cat}} HEMM      1.0 -2.0 600 500 650 625 600)
-          add_test(test_${cat}_${prec}herk  ./${prec}${TEST_CMD_${cat}} HERK      1.0 -2.0 600 500 650 625)
-          add_test(test_${cat}_${prec}her2k ./${prec}${TEST_CMD_${cat}} HER2K     1.0 -2.0 600 500 650 625 700)
+          add_test(test_${cat}_${prec}hemm  ./${prec}${TEST_CMD_${cat}} HEMM  1.7 -2.3 117 213 215 220 232)
+          add_test(test_${cat}_${prec}herk  ./${prec}${TEST_CMD_${cat}} HERK  1.7 -2.3 117 213 215 220    )
+          add_test(test_${cat}_${prec}her2k ./${prec}${TEST_CMD_${cat}} HER2K 1.7 -2.3 117 213 215 220 232)
         endif()
 
-         add_test(test_${cat}_${prec}posv        ./${prec}${TEST_CMD_${cat}} POSV        500 600 25 700)
-         add_test(test_${cat}_${prec}potri       ./${prec}${TEST_CMD_${cat}} POTRI       500 600)
-         add_test(test_${cat}_${prec}gels_qr     ./${prec}${TEST_CMD_${cat}} GELS        0 800 400 825 25 810)
-         add_test(test_${cat}_${prec}gels_hqr    ./${prec}${TEST_CMD_${cat}} GELS        1 800 400 825 25 810 4)
-         add_test(test_${cat}_${prec}gels_lq     ./${prec}${TEST_CMD_${cat}} GELS        0 400 800 825 25 810)
-         add_test(test_${cat}_${prec}gels_hlq    ./${prec}${TEST_CMD_${cat}} GELS        1 400 800 825 25 810 4)
-         add_test(test_${cat}_${prec}gesv_incpiv ./${prec}${TEST_CMD_${cat}} GESV_INCPIV 800 825 25 810)
+         add_test(test_${cat}_${prec}posv        ./${prec}${TEST_CMD_${cat}} POSV            117 155 25 143)
+         add_test(test_${cat}_${prec}potri       ./${prec}${TEST_CMD_${cat}} POTRI           117 155       )
+         add_test(test_${cat}_${prec}gels_qr     ./${prec}${TEST_CMD_${cat}} GELS      0 233 117 255 25 242  )
+         add_test(test_${cat}_${prec}gels_hqr    ./${prec}${TEST_CMD_${cat}} GELS      1 233 117 255 25 242 3)
+         add_test(test_${cat}_${prec}gels_lq     ./${prec}${TEST_CMD_${cat}} GELS      0 117 233 155 25 242  )
+         add_test(test_${cat}_${prec}gels_hlq    ./${prec}${TEST_CMD_${cat}} GELS      1 117 233 155 25 242 3)
+         add_test(test_${cat}_${prec}gesv_incpiv ./${prec}${TEST_CMD_${cat}} GESV_INCPIV     117 155 25 242)
 
-         add_test(test_${cat}_${prec}gels_hqr_greedy    ./${prec}${TEST_CMD_${cat}} GELS_HQR 1000 600 1000 10 1000 4 -1 1 -1 0)
-         add_test(test_${cat}_${prec}gels_hqr_fibonacci ./${prec}${TEST_CMD_${cat}} GELS_HQR 1000 600 1000 10 1000 4 -1 2 -1 0)
-         add_test(test_${cat}_${prec}gels_hqr_binary    ./${prec}${TEST_CMD_${cat}} GELS_HQR 1000 600 1000 10 1000 4 -1 3 -1 0)
-         add_test(test_${cat}_${prec}gels_hlq_greedy    ./${prec}${TEST_CMD_${cat}} GELS_HQR 600 1000 1000 10 1000 4 -1 1 -1 0)
-         add_test(test_${cat}_${prec}gels_hlq_fibonacci ./${prec}${TEST_CMD_${cat}} GELS_HQR 600 1000 1000 10 1000 4 -1 2 -1 0)
-         add_test(test_${cat}_${prec}gels_hlq_binary    ./${prec}${TEST_CMD_${cat}} GELS_HQR 600 1000 1000 10 1000 4 -1 3 -1 0)
+         add_test(test_${cat}_${prec}gels_hqr_greedy    ./${prec}${TEST_CMD_${cat}} GELS_HQR 233 117 255 25 242 2 -1 1 -1 0)
+         add_test(test_${cat}_${prec}gels_hqr_fibonacci ./${prec}${TEST_CMD_${cat}} GELS_HQR 233 117 255 25 242 2 -1 2 -1 0)
+         add_test(test_${cat}_${prec}gels_hqr_binary    ./${prec}${TEST_CMD_${cat}} GELS_HQR 233 117 255 25 242 2 -1 3 -1 0)
+         add_test(test_${cat}_${prec}gels_hlq_greedy    ./${prec}${TEST_CMD_${cat}} GELS_HQR 117 233 255 25 242 2 -1 1 -1 0)
+         add_test(test_${cat}_${prec}gels_hlq_fibonacci ./${prec}${TEST_CMD_${cat}} GELS_HQR 117 233 255 25 242 2 -1 2 -1 0)
+         add_test(test_${cat}_${prec}gels_hlq_binary    ./${prec}${TEST_CMD_${cat}} GELS_HQR 117 233 255 25 242 2 -1 3 -1 0)
 
-         add_test(test_${cat}_${prec}gels_rq_systolic   ./${prec}${TEST_CMD_${cat}} GELS_SYSTOLIC 1000 600 1000 10 1000 3 2)
-         add_test(test_${cat}_${prec}gels_lq_systolic   ./${prec}${TEST_CMD_${cat}} GELS_SYSTOLIC 600 1000 1000 10 1000 3 2)
+         add_test(test_${cat}_${prec}gels_qr_systolic   ./${prec}${TEST_CMD_${cat}} GELS_SYSTOLIC 233 117 255 25 242 3 2)
+         add_test(test_${cat}_${prec}gels_lq_systolic   ./${prec}${TEST_CMD_${cat}} GELS_SYSTOLIC 117 233 255 25 242 3 2)
      endif()
 
   endforeach()
diff --git a/testing/testing_zauxiliary.c b/testing/testing_zauxiliary.c
index 06e983339..2c0f361db 100644
--- a/testing/testing_zauxiliary.c
+++ b/testing/testing_zauxiliary.c
@@ -152,15 +152,17 @@ int (*formatmap[6])(int, int, int, int, int, int) = {  map_CM, map_RM, map_CCRB,
 
 int main (int argc, char **argv)
 {
-    int ncores, ngpus;
+    int ncores, ngpus, nb, ib;
     int info = 0;
     char func[32];
 
     /* Check for number of arguments*/
-    if ( argc < 4) {
-        printf(" Proper Usage is : ./ztesting ncores ngpus FUNC ...\n"
+    if ( argc < 6 ) {
+        printf(" Proper Usage is : ./ztesting ncores ngpus nb ib FUNC ...\n"
                "   - ncores : number of cores\n"
                "   - ngpus  : number of GPUs\n"
+               "   - nb     : define the tile size\n"
+               "   - ib     : define the inner tile size\n"
                "   - FUNC   : name of function to test\n"
                "   - ... plus arguments depending on the testing function \n");
         exit(1);
@@ -168,7 +170,9 @@ int main (int argc, char **argv)
 
     sscanf( argv[1], "%d",   &ncores );
     sscanf( argv[2], "%d",   &ngpus  );
-    sscanf( argv[3], "%31s",  func   );
+    sscanf( argv[3], "%d",   &nb     );
+    sscanf( argv[4], "%d",   &ib     );
+    sscanf( argv[5], "%31s",  func   );
 
     /* Initialize CHAMELEON */
     /*if(nthreads_per_worker)
@@ -176,11 +180,11 @@ int main (int argc, char **argv)
      else*/
     CHAMELEON_Init( ncores, ngpus);
     CHAMELEON_Disable(CHAMELEON_AUTOTUNING);
-    CHAMELEON_Set(CHAMELEON_TILE_SIZE,         32 );
-    CHAMELEON_Set(CHAMELEON_INNER_BLOCK_SIZE,   5 );
+    CHAMELEON_Set(CHAMELEON_TILE_SIZE,        nb );
+    CHAMELEON_Set(CHAMELEON_INNER_BLOCK_SIZE, ib );
 
-    argc -= 4;
-    argv += 4;
+    argc -= 6;
+    argv += 6;
     info  = 0;
 
     /*
diff --git a/testing/testing_zauxiliary.h b/testing/testing_zauxiliary.h
index 37910ddd1..a6b14d3a1 100644
--- a/testing/testing_zauxiliary.h
+++ b/testing/testing_zauxiliary.h
@@ -23,12 +23,14 @@
 
 //#include "testing.h"
 
-#define USAGE(name, args, details)                                             \
-  printf(" Proper Usage is : ./ztesting ncores ngpus " name " " args " with\n" \
-         "   - ncores : number of cores \n"                                    \
-         "   - ngpus  : number of GPUs\n"                                      \
-         "   - name   : name of function to test\n"                            \
-         details);
+#define USAGE(name, args, details)                                      \
+    printf(" Proper Usage is : ./ztesting ncores ngpus nb ib " name " " args " with\n" \
+           "   - ncores : number of cores\n"                            \
+           "   - ngpus  : number of GPUs\n"                             \
+           "   - nb     : define the tile size\n"                       \
+           "   - ib     : define the inner tile size\n"                 \
+           "   - FUNC   : name of function to test\n"                   \
+           details);
 
 #ifdef WIN32
 #include <float.h>
diff --git a/testing/testing_zgeqrf_qdwh.c b/testing/testing_zgeqrf_qdwh.c
index 429657447..7e2330490 100644
--- a/testing/testing_zgeqrf_qdwh.c
+++ b/testing/testing_zgeqrf_qdwh.c
@@ -42,19 +42,15 @@ int testing_zgeqrf_qdwh(int argc, char **argv)
 {
     int hres = 0;
 
-    if ( argc != 4 ) {
-        USAGE("GEQRF_QDWH", "optid M NB LDA",
+    if ( argc != 2 ) {
+        USAGE("GEQRF_QDWH", "optid M",
               "   - optid: Take into account the fact that A2 is Id or not\n"
-              "   - M    : number of rows of the matrix A1 and A2\n"
-              "   - NB   : tile size\n"
-              "   - IB   : inner tile size\n");
+              "   - M    : number of rows of the matrix A1 and A2\n");
         return -1;
     }
 
     int optid = atoi(argv[0]) ? 1: 0;
     int M  = atoi(argv[1]);
-    int NB = atoi(argv[2]);
-    int IB = atoi(argv[3]);
     int MxM = M * M;
     int LDA = 2*M;
     double eps;
@@ -85,10 +81,6 @@ int testing_zgeqrf_qdwh(int argc, char **argv)
         return -2;
     }
 
-    CHAMELEON_Disable(CHAMELEON_AUTOTUNING);
-    CHAMELEON_Set(CHAMELEON_TILE_SIZE, NB);
-    CHAMELEON_Set(CHAMELEON_INNER_BLOCK_SIZE, IB);
-
     CHAMELEON_Alloc_Workspace_zgels(M, M, &T1, 1, 1);
     CHAMELEON_Alloc_Workspace_zgels(M, M, &T2, 1, 1);
 
-- 
GitLab