diff --git a/compute/pzgelqf.c b/compute/pzgelqf.c
index 0608f6d36f40064fceb066d601204a8cfdd783b0..8a49e062781b6389cb88c8f0fab7a713d950e969 100644
--- a/compute/pzgelqf.c
+++ b/compute/pzgelqf.c
@@ -115,7 +115,7 @@ void morse_pzgelqf(MORSE_desc_t *A, MORSE_desc_t *T,
 #endif
 
     for (k = 0; k < minMNT; k++) {
-        RUNTIME_set_iteration(k);
+        RUNTIME_set_iteration(morse, k);
 
         tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
         tempkn = k == A->nt-1 ? A->n-k*A->nb : A->nb;
diff --git a/compute/pzgelqfrh.c b/compute/pzgelqfrh.c
index 9295ac65748e99bb5ecadecbe3f15a7dc32643ff..46cc88668aac39a30467c1dff35fa6b02b8e9877 100644
--- a/compute/pzgelqfrh.c
+++ b/compute/pzgelqfrh.c
@@ -119,7 +119,7 @@ void morse_pzgelqfrh(MORSE_desc_t *A, MORSE_desc_t *T, int BS,
 #endif
 
     for (k = 0; k < chameleon_min(A->mt, A->nt); k++) {
-        RUNTIME_set_iteration(k);
+        RUNTIME_set_iteration(morse, k);
 
         tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
         ldak = BLKLDD(A, k);
diff --git a/compute/pzgeqrf.c b/compute/pzgeqrf.c
index c3d6fa742f8be5b16b73e760687da8e7914b967a..94e463ec2a0512a0a1d490b6e23918bdc9b212ac 100644
--- a/compute/pzgeqrf.c
+++ b/compute/pzgeqrf.c
@@ -110,7 +110,7 @@ void morse_pzgeqrf(MORSE_desc_t *A, MORSE_desc_t *T,
 #endif
 
     for (k = 0; k < minMNT; k++) {
-        RUNTIME_set_iteration(k);
+        RUNTIME_set_iteration(morse, k);
 
         tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
         tempkn = k == A->nt-1 ? A->n-k*A->nb : A->nb;
diff --git a/compute/pzgeqrfrh.c b/compute/pzgeqrfrh.c
index b96eddc07f1b82228a5869a1c8c5e671b5e43e20..5854923a331a6c814c52867ccd8f1ba300c74261 100644
--- a/compute/pzgeqrfrh.c
+++ b/compute/pzgeqrfrh.c
@@ -118,7 +118,7 @@ void morse_pzgeqrfrh(MORSE_desc_t *A, MORSE_desc_t *T, int BS,
 
     K = chameleon_min(A->mt, A->nt);
     for (k = 0; k < K; k++) {
-        RUNTIME_set_iteration(k);
+        RUNTIME_set_iteration(morse, k);
 
         tempkn = k == A->nt-1 ? A->n-k*A->nb : A->nb;
         for (M = k; M < A->mt; M += BS) {
diff --git a/compute/pzgetrf_incpiv.c b/compute/pzgetrf_incpiv.c
index c280a693c4d59d286e3d7ab95e7f42c7a43b4364..506cd00df0ee9623511341743998388a56a2691c 100644
--- a/compute/pzgetrf_incpiv.c
+++ b/compute/pzgetrf_incpiv.c
@@ -78,7 +78,7 @@ void morse_pzgetrf_incpiv(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV,
     morse_zdesc_alloc_diag(*DIAG, A->mb, A->nb, chameleon_min(A->m, A->n), A->nb, 0, 0, chameleon_min(A->m, A->n), A->nb, A->p, A->q);
 
     for (k = 0; k < minMNT; k++) {
-        RUNTIME_set_iteration(k);
+        RUNTIME_set_iteration(morse, k);
 
         tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
         tempkn = k == A->nt-1 ? A->n-k*A->nb : A->nb;
diff --git a/compute/pzgetrf_nopiv.c b/compute/pzgetrf_nopiv.c
index 75a980138dd2248c904c8bd77736847bb03f5af6..7fbd6bdfafb7f5119c5725a43cac71ce5b52d4e5 100644
--- a/compute/pzgetrf_nopiv.c
+++ b/compute/pzgetrf_nopiv.c
@@ -54,7 +54,7 @@ void morse_pzgetrf_nopiv(MORSE_desc_t *A,
     ib = MORSE_IB;
 
     for (k = 0; k < chameleon_min(A->mt, A->nt); k++) {
-        RUNTIME_set_iteration(k);
+        RUNTIME_set_iteration(morse, k);
 
         tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
         tempkn = k == A->nt-1 ? A->n-k*A->nb : A->nb;
diff --git a/compute/pzhetrd_he2hb.c b/compute/pzhetrd_he2hb.c
index 0fed5cc88b63f29c6d82d27a537f7f5cc25eea75..badde013dc02894749fa97b5f3426e4f8adbf06b 100644
--- a/compute/pzhetrd_he2hb.c
+++ b/compute/pzhetrd_he2hb.c
@@ -137,7 +137,7 @@ void morse_pzhetrd_he2hb(MORSE_enum uplo,
 
     if (uplo == MorseLower) {
        for (k = 0; k < A->nt-1; k++){
-           RUNTIME_set_iteration(k);
+           RUNTIME_set_iteration(morse, k);
 
            tempkm = k+1 == A->mt-1 ? A->m-(k+1)*A->mb : A->mb;
            tempkn = k   == A->nt-1 ? A->n- k   *A->nb : A->nb;
@@ -292,7 +292,7 @@ void morse_pzhetrd_he2hb(MORSE_enum uplo,
     }
     else {
        for (k = 0; k < A->nt-1; k++){
-           RUNTIME_set_iteration(k);
+           RUNTIME_set_iteration(morse, k);
 
            tempkn = k+1 == A->nt-1 ? A->n-(k+1)*A->nb : A->nb;
            tempkm = k   == A->mt-1 ? A->m- k   *A->mb : A->mb;
diff --git a/compute/pzpotrf.c b/compute/pzpotrf.c
index fe8143714ce19bf072b23ce90afcbe5d1907edca..cff8af13a4e3fc4ac3250b234ae9921e1232980f 100644
--- a/compute/pzpotrf.c
+++ b/compute/pzpotrf.c
@@ -71,7 +71,7 @@ void morse_pzpotrf(MORSE_enum uplo, MORSE_desc_t *A,
      */
     if (uplo == MorseLower) {
         for (k = 0; k < A->mt; k++) {
-            RUNTIME_set_iteration(k);
+            RUNTIME_set_iteration(morse, k);
 
             tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
             ldak = BLKLDD(A, k);
@@ -130,7 +130,7 @@ void morse_pzpotrf(MORSE_enum uplo, MORSE_desc_t *A,
      */
     else {
         for (k = 0; k < A->nt; k++) {
-            RUNTIME_set_iteration(k);
+            RUNTIME_set_iteration(morse, k);
 
             tempkm = k == A->nt-1 ? A->n-k*A->nb : A->nb;
             ldak = BLKLDD(A, k);
diff --git a/compute/pzpotrimm.c b/compute/pzpotrimm.c
index 8f5f83f7ed0ed7c3ab41f5686f1f6430fefdb80a..4756b0eec92a3462bf15c38232f0aceac0c25a8a 100644
--- a/compute/pzpotrimm.c
+++ b/compute/pzpotrimm.c
@@ -76,7 +76,7 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
          *  ZPOTRF
          */
         for (k = 0; k < A->mt; k++) {
-            RUNTIME_set_iteration(k);
+            RUNTIME_set_iteration(morse, k);
 
             tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
             ldak = BLKLDD(A, k);
@@ -277,7 +277,7 @@ void morse_pzpotrimm(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_de
          *  ZPOTRF
          */
         for (k = 0; k < A->nt; k++) {
-            RUNTIME_set_iteration(k);
+            RUNTIME_set_iteration(morse, k);
 
             tempkm = k == A->nt-1 ? A->n-k*A->nb : A->nb;
             ldak = BLKLDD(A, k);
diff --git a/compute/pzsytrf.c b/compute/pzsytrf.c
index 622a4d0b2a8d302e475cc18afad67da720da2d34..22b77f3f24c0a8cd086471bc97c5c1814acb3375 100644
--- a/compute/pzsytrf.c
+++ b/compute/pzsytrf.c
@@ -60,7 +60,7 @@ void morse_pzsytrf(MORSE_enum uplo, MORSE_desc_t *A,
      */
     if (uplo == MorseLower) {
         for (k = 0; k < A->mt; k++) {
-            RUNTIME_set_iteration(k);
+            RUNTIME_set_iteration(morse, k);
 
             tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
             ldak = BLKLDD(A, k);
@@ -112,7 +112,7 @@ void morse_pzsytrf(MORSE_enum uplo, MORSE_desc_t *A,
      */
     else {
         for (k = 0; k < A->nt; k++) {
-            RUNTIME_set_iteration(k);
+            RUNTIME_set_iteration(morse, k);
 
             tempkm = k == A->nt-1 ? A->n-k*A->nb : A->nb;
             ldak = BLKLDD(A, k);
diff --git a/compute/pztpgqrt.c b/compute/pztpgqrt.c
index 7b31f39c2889abb369295c0de78bbded528835d0..9d04de6ab2f32c17fae5419a073e6f7a5738c18e 100644
--- a/compute/pztpgqrt.c
+++ b/compute/pztpgqrt.c
@@ -101,7 +101,7 @@ void morse_pztpgqrt( int L,
 #endif
 
     for (k = V1->nt-1; k >= 0; k--) {
-        RUNTIME_set_iteration(k);
+        RUNTIME_set_iteration(morse, k);
 
         tempkm = k == V1->mt-1 ? V1->m-k*V1->mb : V1->mb;
         tempkk = k == V1->nt-1 ? V1->n-k*V1->nb : V1->nb;
diff --git a/compute/pztpqrt.c b/compute/pztpqrt.c
index a1c6c9149ee11469ba8dee209e6caa7815e55d64..71fad4a20b45213acf82ab15cd1f1ca42ba8f9f4 100644
--- a/compute/pztpqrt.c
+++ b/compute/pztpqrt.c
@@ -91,7 +91,7 @@ void morse_pztpqrt( int L, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_desc_t *T,
     RUNTIME_options_ws_alloc( &options, ws_worker, ws_host );
 
     for (k = 0; k < A->nt; k++) {
-        RUNTIME_set_iteration(k);
+        RUNTIME_set_iteration(morse, k);
 
         tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
         tempkn = k == A->nt-1 ? A->n-k*A->nb : A->nb;
diff --git a/compute/pztrtri.c b/compute/pztrtri.c
index b6777d212818feb4a07d3161f5acce157178dbee..7a56bb7b6009fe47b8653e1492d821b2fe2705d1 100644
--- a/compute/pztrtri.c
+++ b/compute/pztrtri.c
@@ -56,7 +56,7 @@ void morse_pztrtri(MORSE_enum uplo, MORSE_enum diag, MORSE_desc_t *A,
      */
     if (uplo == MorseLower) {
         for (k = 0; k < A->nt; k++) {
-            RUNTIME_set_iteration(k);
+            RUNTIME_set_iteration(morse, k);
 
             tempkn = k == A->nt-1 ? A->n-k*A->nb : A->nb;
             ldak = BLKLDD(A, k);
@@ -106,7 +106,7 @@ void morse_pztrtri(MORSE_enum uplo, MORSE_enum diag, MORSE_desc_t *A,
      */
     else {
         for (k = 0; k < A->mt; k++) {
-            RUNTIME_set_iteration(k);
+            RUNTIME_set_iteration(morse, k);
 
             tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
             ldak = BLKLDD(A, k);
diff --git a/compute/pzunglq.c b/compute/pzunglq.c
index 56d43c833babb5bf5428cd4f8a6e2e555a92d7df..746af6b8774cb720c6ab666e9fb1251e74ef4ba2 100644
--- a/compute/pzunglq.c
+++ b/compute/pzunglq.c
@@ -98,7 +98,7 @@ void morse_pzunglq(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T,
 #endif
 
     for (k = minMT-1; k >= 0; k--) {
-        RUNTIME_set_iteration(k);
+        RUNTIME_set_iteration(morse, k);
 
         tempAkm  = k == A->mt-1 ? A->m-k*A->mb : A->mb;
         tempAkn  = k == A->nt-1 ? A->n-k*A->nb : A->nb;
diff --git a/compute/pzunglqrh.c b/compute/pzunglqrh.c
index 09b67e012599eb9b1fdc8597c6cf8a07b9f5a1e2..fdccc54d9af2d87e20d669db85058ad2fcaf6c3d 100644
--- a/compute/pzunglqrh.c
+++ b/compute/pzunglqrh.c
@@ -99,7 +99,7 @@ void morse_pzunglqrh(MORSE_desc_t *A, MORSE_desc_t *Q,
 
     K = chameleon_min(A->mt, A->nt);
     for (k = K-1; k >= 0; k--) {
-        RUNTIME_set_iteration(k);
+        RUNTIME_set_iteration(morse, k);
 
         tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
         ldak = BLKLDD(A, k);
diff --git a/compute/pzungqr.c b/compute/pzungqr.c
index a93983d1e7b7be3f5f7e03c2405b79f3738ab4a5..e4c02312a88dd0301cee13702283819f0abfebd3 100644
--- a/compute/pzungqr.c
+++ b/compute/pzungqr.c
@@ -98,7 +98,7 @@ void morse_pzungqr(MORSE_desc_t *A, MORSE_desc_t *Q, MORSE_desc_t *T,
 #endif
 
     for (k = minMT-1; k >= 0; k--) {
-        RUNTIME_set_iteration(k);
+        RUNTIME_set_iteration(morse, k);
 
         tempAkm  = k == A->mt-1 ? A->m-k*A->mb : A->mb;
         tempAkn  = k == A->nt-1 ? A->n-k*A->nb : A->nb;
diff --git a/compute/pzungqrrh.c b/compute/pzungqrrh.c
index dcacc344f37446a192f43102daee1f6a328dd366..168a56254c9045ba42720081e103d67c88e67969 100644
--- a/compute/pzungqrrh.c
+++ b/compute/pzungqrrh.c
@@ -101,7 +101,7 @@ void morse_pzungqrrh(MORSE_desc_t *A, MORSE_desc_t *Q,
 
     K = chameleon_min(A->mt, A->nt);
     for (k = K-1; k >= 0; k--) {
-        RUNTIME_set_iteration(k);
+        RUNTIME_set_iteration(morse, k);
 
         tempkn = k == A->nt-1 ? A->n-k*A->nb : A->nb;
         lastRD = 0;
diff --git a/compute/pzunmlq.c b/compute/pzunmlq.c
index 448eff9efe98dcf9780d52af9f818d8792da9c4a..bc6086c4360819819e6d0669081e30e19d821235 100644
--- a/compute/pzunmlq.c
+++ b/compute/pzunmlq.c
@@ -105,7 +105,7 @@ void morse_pzunmlq(MORSE_enum side, MORSE_enum trans,
              *  MorseLeft / MorseNoTrans
              */
             for (k = 0; k < minMT; k++) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkm   = k == B->mt-1 ? B->m-k*B->mb : B->mb;
                 tempkmin = k == minMT-1 ? minM-k*A->nb : A->nb;
@@ -157,7 +157,7 @@ void morse_pzunmlq(MORSE_enum side, MORSE_enum trans,
              *  MorseLeft / MorseConjTrans
              */
             for (k = minMT-1; k >= 0; k--) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkm   = k == B->mt-1 ? B->m-k*B->mb : B->mb;
                 tempkmin = k == minMT-1 ? minM-k*A->nb : A->nb;
@@ -211,7 +211,7 @@ void morse_pzunmlq(MORSE_enum side, MORSE_enum trans,
              *  MorseRight / MorseNoTrans
              */
             for (k = minMT-1; k >= 0; k--) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkn   = k == B->nt -1 ? B->n -k*B->nb : B->nb;
                 tempkmin = k == minMT-1 ? minM-k*A->nb : A->nb;
@@ -263,7 +263,7 @@ void morse_pzunmlq(MORSE_enum side, MORSE_enum trans,
              *  MorseRight / MorseConjTrans
              */
             for (k = 0; k < minMT; k++) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkn   = k == B->nt -1 ? B->n -k*B->nb : B->nb;
                 tempkmin = k == minMT-1 ? minM-k*A->mb : A->mb;
diff --git a/compute/pzunmlqrh.c b/compute/pzunmlqrh.c
index 21f1805e1e705fb6bebebc66433c366d7399e58c..747539398de0d9b0523a35d2731b40d981d9e89d 100644
--- a/compute/pzunmlqrh.c
+++ b/compute/pzunmlqrh.c
@@ -105,7 +105,7 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
              *  MorseLeft / MorseNoTrans
              */
             for (k = 0; k < K; k++) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
                 ldak = BLKLDD(A, k);
@@ -180,7 +180,7 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
              *  MorseLeft / MorseConjTrans
              */
             for (k = K-1; k >= 0; k--) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
                 ldak = BLKLDD(A, k);
@@ -261,7 +261,7 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
              *  MorseRight / MorseNoTrans
              */
             for (k = K-1; k >= 0; k--) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
                 ldak = BLKLDD(A, k);
@@ -338,7 +338,7 @@ void morse_pzunmlqrh(MORSE_enum side, MORSE_enum trans,
              *  MorseRight / MorseConjTrans
              */
             for (k = 0; k < K; k++) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkm = k == A->mt-1 ? A->m-k*A->mb : A->mb;
                 ldak = BLKLDD(A, k);
diff --git a/compute/pzunmqr.c b/compute/pzunmqr.c
index 4cbcf7b62a2df5620086fb4d15a596580872b916..ccd43134ef4c5aff112b430ae76ec0a4f092d013 100644
--- a/compute/pzunmqr.c
+++ b/compute/pzunmqr.c
@@ -105,7 +105,7 @@ void morse_pzunmqr(MORSE_enum side, MORSE_enum trans,
              *  MorseLeft / MorseConjTrans
              */
             for (k = 0; k < minMT; k++) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkm   = k == B->mt-1 ? B->m-k*B->mb : B->mb;
                 tempkmin = k == minMT-1 ? minM-k*A->nb : A->nb;
@@ -158,7 +158,7 @@ void morse_pzunmqr(MORSE_enum side, MORSE_enum trans,
          */
         else {
             for (k = minMT-1; k >= 0; k--) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkm = k == B->mt-1 ? B->m-k*B->mb : B->mb;
                 tempkmin = k == minMT-1 ? minM-k*A->nb : A->nb;
@@ -213,7 +213,7 @@ void morse_pzunmqr(MORSE_enum side, MORSE_enum trans,
     else {
         if (trans == MorseConjTrans) {
             for (k = minMT-1; k >= 0; k--) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkn = k == B->nt-1 ? B->n-k*B->nb : B->nb;
                 tempkmin = k == minMT-1 ? minM-k*A->nb : A->nb;
@@ -267,7 +267,7 @@ void morse_pzunmqr(MORSE_enum side, MORSE_enum trans,
          */
         else {
             for (k = 0; k < minMT; k++) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkn   = k == B->nt-1 ? B->n-k*B->nb : B->nb;
                 tempkmin = k == minMT-1 ? minM-k*A->nb : A->nb;
diff --git a/compute/pzunmqrrh.c b/compute/pzunmqrrh.c
index 62023091c981210bd7c21a8218daa711e3ca7c28..fd7acea40b388d64e7f4080df1f62b2ebadad41f 100644
--- a/compute/pzunmqrrh.c
+++ b/compute/pzunmqrrh.c
@@ -107,7 +107,7 @@ void morse_pzunmqrrh(MORSE_enum side, MORSE_enum trans,
              *  MorseLeft / MorseConjTrans
              */
             for (k = 0; k < K; k++) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkn = k == A->nt-1 ? A->n-k*A->nb : A->nb;
                 for (M = k; M < A->mt; M += BS) {
@@ -184,7 +184,7 @@ void morse_pzunmqrrh(MORSE_enum side, MORSE_enum trans,
              *  MorseLeft / MorseNoTrans
              */
             for (k = K-1; k >= 0; k--) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkn = k == A->nt-1 ? A->n-k*A->nb : A->nb;
                 lastRD = 0;
@@ -266,7 +266,7 @@ void morse_pzunmqrrh(MORSE_enum side, MORSE_enum trans,
              *  MorseRight / MorseConjTrans
              */
             for (k = K-1; k >= 0; k--) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkn = k == A->nt-1 ? A->n-k*A->nb : A->nb;
                 lastRD = 0;
@@ -346,7 +346,7 @@ void morse_pzunmqrrh(MORSE_enum side, MORSE_enum trans,
              *  MorseRight / MorseNoTrans
              */
             for (k = 0; k < K; k++) {
-                RUNTIME_set_iteration(k);
+                RUNTIME_set_iteration(morse, k);
 
                 tempkn = k == A->nt-1 ? A->n-k*A->nb : A->nb;
                 for (M = k; M < A->mt; M += BS) {