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);
     }
 }