Merge branch 'starpu/versions' into 'master'

Propose a more generic version to handle starpu versions dependencies, and STARPU_NAME

- Remove the STARPU_XX macro
 - USE STARPU_MAJOR_VERSION, and STARPU_MINOR_REVISION where needed
 - Factorize the test to introduce CHAMELEON_CODELETS_HAVE_NAME, so we can disable it more easily
- Propagate the STARPU_NAME to all insert task functions.

See merge request !1

CMakeLists.txt

@@ -691,8 +691,6 @@ if( CHAMELEON_SCHED_STARPU )
         foreach(libdir ${STARPU_LIBRARY_DIRS_DEP})
             list(APPEND CMAKE_REQUIRED_FLAGS "-L${libdir}")
         endforeach()
-        add_definitions("-DSTARPU_${STARPU_VERSION_MAJOR}${STARPU_VERSION_MINOR}")
-        message("-- ${Blue}Add definition STARPU_${STARPU_VERSION_MAJOR}${STARPU_VERSION_MINOR}${ColourReset}")
         set(CMAKE_REQUIRED_LIBRARIES "${STARPU_LIBRARIES_DEP}")
         if (CHAMELEON_USE_MPI)
             list(APPEND CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_PATH}")

runtime/starpu/codelets/codelet_zasum.c

@@ -46,6 +46,9 @@ void MORSE_TASK_dzasum(const MORSE_option_t *options,
         STARPU_RW,        RTBLKADDR(B, double, Bm, Bn),
         STARPU_PRIORITY,    options->priority,
         STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+        STARPU_NAME, "zasum",
+#endif
         0);
 }
 

runtime/starpu/codelets/codelet_zaxpy.c

@@ -45,6 +45,9 @@ void MORSE_TASK_zaxpy(const MORSE_option_t *options,
                 STARPU_VALUE,    &incB,                        sizeof(int),
                 STARPU_PRIORITY, options->priority,
                 STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+                STARPU_NAME, "zaxpy",
+#endif
                 0);
     }
 }

runtime/starpu/codelets/codelet_zbuild.c

@@ -62,6 +62,9 @@ void MORSE_TASK_zbuild( const MORSE_option_t *options,
           STARPU_VALUE,    &user_build_callback,          sizeof(void*),
           STARPU_PRIORITY,  options->priority,
           STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+          STARPU_NAME, "zbuild",
+#endif
           0);
   }
 }

runtime/starpu/codelets/codelet_zgeadd.c

@@ -107,6 +107,9 @@ void MORSE_TASK_zgeadd(const MORSE_option_t *options,
             STARPU_VALUE,    &ldb,                sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgeadd",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zgelqt.c

@@ -122,6 +122,9 @@ void MORSE_TASK_zgelqt(const MORSE_option_t *options,
             STARPU_VALUE,    &h_work,            sizeof(MORSE_starpu_ws_t *),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgelqt",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zgemm.c

@@ -95,6 +95,9 @@ void MORSE_TASK_zgemm(const MORSE_option_t *options,
             STARPU_CALLBACK,  callback,
 #if defined(CHAMELEON_USE_MPI)
             STARPU_EXECUTE_ON_NODE, execution_rank,
+#endif
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgemm",
 #endif
             0);
     }

runtime/starpu/codelets/codelet_zgeqrt.c

@@ -123,7 +123,7 @@ void MORSE_TASK_zgeqrt(const MORSE_option_t *options,
             STARPU_VALUE,    &h_work,            sizeof(MORSE_starpu_ws_t *),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "zgeqrt",
 #endif
             0);

runtime/starpu/codelets/codelet_zgessm.c

@@ -109,6 +109,9 @@ void MORSE_TASK_zgessm(const MORSE_option_t *options,
             STARPU_VALUE,   &lda,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgessm",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zgessq.c

@@ -44,6 +44,9 @@ void MORSE_TASK_zgessq( const MORSE_option_t *options,
             STARPU_RW,       RTBLKADDR(SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgessq",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zgetrf.c

@@ -53,6 +53,9 @@ void MORSE_TASK_zgetrf(const MORSE_option_t *options,
             STARPU_VALUE,         &iinfo,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgetrf",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zgetrf_incpiv.c

@@ -119,6 +119,9 @@ void MORSE_TASK_zgetrf_incpiv(const MORSE_option_t *options,
             STARPU_VALUE,    &h_work,            sizeof(MORSE_starpu_ws_t *),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgetrf_incpiv",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zgetrf_nopiv.c

@@ -97,6 +97,9 @@ void MORSE_TASK_zgetrf_nopiv(const MORSE_option_t *options,
             STARPU_VALUE,    &iinfo,                     sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgetrf_nopiv",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zhe2ge.c

@@ -53,7 +53,7 @@ void MORSE_TASK_zhe2ge(const MORSE_option_t *options,
             STARPU_VALUE,   &ldb,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "zhe2ge",
 #endif
             0);

runtime/starpu/codelets/codelet_zhemm.c

@@ -68,6 +68,9 @@ void MORSE_TASK_zhemm(const MORSE_option_t *options,
             STARPU_VALUE,     &ldc,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zhemm",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zher2k.c

@@ -68,6 +68,9 @@ void MORSE_TASK_zher2k(const MORSE_option_t *options,
             STARPU_VALUE,       &ldc,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zher2k",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zherfb.c

@@ -61,7 +61,7 @@ void MORSE_TASK_zherfb(const MORSE_option_t *options,
             STARPU_VALUE,    &nb,                sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "zherfb",
 #endif
             0);

runtime/starpu/codelets/codelet_zherk.c

@@ -64,6 +64,9 @@ void MORSE_TASK_zherk(const MORSE_option_t *options,
             STARPU_VALUE,    &ldc,               sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zherk",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zhessq.c

@@ -44,6 +44,9 @@ void MORSE_TASK_zhessq( const MORSE_option_t *options,
             STARPU_RW,       RTBLKADDR(SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zhessq",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zlacpy.c

@@ -63,6 +63,9 @@ void MORSE_TASK_zlacpyx(const MORSE_option_t *options,
             STARPU_VALUE,   &ldb,                 sizeof(int),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlacpy",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zlag2c.c

@@ -57,6 +57,9 @@ void MORSE_TASK_zlag2c(const MORSE_option_t *options,
             STARPU_VALUE,    &ldb,               sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlag2c",
+#endif
             0);
     }
 }
@@ -100,6 +103,9 @@ void MORSE_TASK_clag2z(const MORSE_option_t *options,
             STARPU_VALUE,    &ldb,               sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "clag2z",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zlange.c

@@ -50,6 +50,9 @@ void MORSE_TASK_zlange(const MORSE_option_t *options,
                            STARPU_W,        RTBLKADDR(B, double, Bm, Bn),
                            STARPU_PRIORITY, options->priority,
                            STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+                           STARPU_NAME, "zlange",
+#endif
                            0);
     }
 }
@@ -91,6 +94,9 @@ void MORSE_TASK_zlange_max(const MORSE_option_t *options,
                            STARPU_RW,       RTBLKADDR(B, double, Bm, Bn),
                            STARPU_PRIORITY, options->priority,
                            STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+                           STARPU_NAME, "zlange_max",
+#endif
                            0);
     }
 }

runtime/starpu/codelets/codelet_zlanhe.c

@@ -48,6 +48,9 @@ void MORSE_TASK_zlanhe(const MORSE_option_t *options,
             STARPU_W,        RTBLKADDR(B, double, Bm, Bn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlanhe",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zlansy.c

@@ -50,6 +50,9 @@ void MORSE_TASK_zlansy(const MORSE_option_t *options,
             STARPU_W,        RTBLKADDR(B, double, Bm, Bn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlansy",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zlantr.c

@@ -49,6 +49,9 @@ void MORSE_TASK_zlantr(const MORSE_option_t *options,
             STARPU_W,        RTBLKADDR(B, double, Bm, Bn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlantr",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zlascal.c

@@ -83,6 +83,9 @@ void MORSE_TASK_zlascal(const MORSE_option_t *options,
             STARPU_VALUE,    &lda,                sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlascal",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zlaset.c

@@ -90,6 +90,9 @@ void MORSE_TASK_zlaset(const MORSE_option_t *options,
             STARPU_VALUE,   &LDA,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlaset",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zlaset2.c

@@ -86,6 +86,9 @@ void MORSE_TASK_zlaset2(const MORSE_option_t *options,
             STARPU_VALUE,   &LDA,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlaset2",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zlatro.c

@@ -62,7 +62,7 @@ void MORSE_TASK_zlatro(const MORSE_option_t *options,
             STARPU_VALUE,   &ldb,     sizeof(int),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "zlatro",
 #endif
             0);

runtime/starpu/codelets/codelet_zlauum.c

@@ -56,6 +56,9 @@ void MORSE_TASK_zlauum(const MORSE_option_t *options,
             STARPU_VALUE,    &lda,               sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlauum",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zplghe.c

@@ -56,6 +56,9 @@ void MORSE_TASK_zplghe( const MORSE_option_t *options,
             STARPU_VALUE, &seed,   sizeof(unsigned long long int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zplghe",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zplgsy.c

@@ -57,6 +57,9 @@ void MORSE_TASK_zplgsy( const MORSE_option_t *options,
             STARPU_VALUE, &seed,   sizeof(unsigned long long int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zplgsy",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zplrnt.c

@@ -55,6 +55,9 @@ void MORSE_TASK_zplrnt( const MORSE_option_t *options,
             STARPU_VALUE, &seed,   sizeof(unsigned long long int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zplrnt",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zplssq.c

@@ -72,6 +72,9 @@ void MORSE_TASK_zplssq( const MORSE_option_t *options,
             STARPU_RW, RTBLKADDR(SCLSSQ,     double, SCLSSQm,     SCLSSQn),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zplssq",
+#endif
             0);
     }
 }
@@ -110,6 +113,9 @@ void MORSE_TASK_zplssq2( const MORSE_option_t *options,
             STARPU_RW, RTBLKADDR(RESULT, double, RESULTm, RESULTn),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zplssq2",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zpotrf.c

@@ -59,6 +59,9 @@ void MORSE_TASK_zpotrf(const MORSE_option_t *options,
             /* STARPU_SCRATCH,   options->ws_worker, */
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zpotrf",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zssssm.c

@@ -139,6 +139,9 @@ void MORSE_TASK_zssssm(const MORSE_option_t *options,
             STARPU_VALUE,          &IPIV,                      sizeof(int*),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zssssm",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zsymm.c

@@ -68,6 +68,9 @@ void MORSE_TASK_zsymm(const MORSE_option_t *options,
             STARPU_VALUE,     &ldc,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zsymm",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zsyr2k.c

@@ -68,6 +68,9 @@ void MORSE_TASK_zsyr2k(const MORSE_option_t *options,
             STARPU_VALUE,       &ldc,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zsyr2k",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zsyrk.c

@@ -64,6 +64,9 @@ void MORSE_TASK_zsyrk(const MORSE_option_t *options,
             STARPU_VALUE,       &ldc,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zsyrk",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zsyssq.c

@@ -44,6 +44,9 @@ void MORSE_TASK_zsyssq( const MORSE_option_t *options,
             STARPU_RW,       RTBLKADDR(SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zsyssq",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zsytrf_nopiv.c

@@ -53,6 +53,9 @@ void MORSE_TASK_zsytrf_nopiv(const MORSE_option_t *options,
             /* STARPU_SCRATCH,   options->ws_worker, */
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zsytrf_nopiv",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_ztile_zero.c

@@ -50,6 +50,9 @@ void MORSE_TASK_ztile_zero(const const MORSE_option_t *options,
             STARPU_VALUE, &lda, sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback, NULL,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztile_zero",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_ztradd.c

@@ -112,6 +112,9 @@ void MORSE_TASK_ztradd(const MORSE_option_t *options,
             STARPU_VALUE,    &ldb,                sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztradd",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_ztrasm.c

@@ -46,6 +46,9 @@ void MORSE_TASK_ztrasm(const MORSE_option_t *options,
         STARPU_RW,       RTBLKADDR(B, double, Bm, Bn),
         STARPU_PRIORITY, options->priority,
         STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztrasm",
+#endif
         0);
 }
 

runtime/starpu/codelets/codelet_ztrmm.c

@@ -65,6 +65,9 @@ void MORSE_TASK_ztrmm(const MORSE_option_t *options,
             STARPU_VALUE,       &ldb,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztrmm",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_ztrsm.c

@@ -86,6 +86,9 @@ void MORSE_TASK_ztrsm(const MORSE_option_t *options,
             STARPU_CALLBACK,  callback,
 #if defined(CHAMELEON_USE_MPI)
             STARPU_EXECUTE_ON_NODE, execution_rank,
+#endif
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztrsm",
 #endif
             0);
     }

runtime/starpu/codelets/codelet_ztrssq.c

@@ -47,6 +47,9 @@ void MORSE_TASK_ztrssq( const MORSE_option_t *options,
             STARPU_RW,       RTBLKADDR(SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztrssq",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_ztrtri.c

@@ -60,6 +60,9 @@ void MORSE_TASK_ztrtri(const MORSE_option_t *options,
             STARPU_VALUE,    &iinfo,             sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztrtri",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_ztslqt.c

@@ -140,6 +140,9 @@ void MORSE_TASK_ztslqt(const MORSE_option_t *options,
             STARPU_VALUE,    &h_work,            sizeof(MORSE_starpu_ws_t *),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztslqt",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_ztsmlq.c

@@ -173,6 +173,9 @@ void MORSE_TASK_ztsmlq(const MORSE_option_t *options,
             STARPU_VALUE,    &ldwork,            sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztsmlq",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_ztsmlq_hetra1.c

@@ -74,6 +74,9 @@ void MORSE_TASK_ztsmlq_hetra1(const MORSE_option_t *options,
             STARPU_VALUE,    &ldwork,            sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztsmlq_hetra1",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_ztsmqr.c

@@ -199,7 +199,7 @@ void MORSE_TASK_ztsmqr(const MORSE_option_t *options,
             STARPU_VALUE,    &ldwork,            sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "ztsmqr",
 #endif
 #if defined(CHAMELEON_USE_MPI)

runtime/starpu/codelets/codelet_ztsmqr_hetra1.c

@@ -73,7 +73,7 @@ void MORSE_TASK_ztsmqr_hetra1(const MORSE_option_t *options,
             STARPU_VALUE,    &ldwork,            sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "ztsmqr_hetra1",
 #endif
             0);

runtime/starpu/codelets/codelet_ztsqrt.c

@@ -129,7 +129,7 @@ void MORSE_TASK_ztsqrt(const MORSE_option_t *options,
             STARPU_VALUE,    &h_work,            sizeof(MORSE_starpu_ws_t *),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "ztsqrt",
 #endif
             STARPU_EXECUTE_ON_NODE, A2->get_rankof(A2, A2m, A2n),

runtime/starpu/codelets/codelet_ztstrf.c

@@ -137,6 +137,9 @@ void MORSE_TASK_ztstrf(const MORSE_option_t *options,
             STARPU_VALUE,    &iinfo,                     sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztstrf",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zttlqt.c

@@ -136,6 +136,9 @@ void MORSE_TASK_zttlqt(const MORSE_option_t *options,
             STARPU_SCRATCH,   options->ws_worker,
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zttlqt",
+#endif
             0);
     }
 }

runtime/starpu/codelets/codelet_zttmlq.c

@@ -166,6 +166,9 @@ void MORSE_TASK_zttmlq(const MORSE_option_t *options,
             STARPU_VALUE,    &ldwork,            sizeof(int),
             STARPU_PRIORITY,  options->priority,