From ca8784137a40bdac64cc9a45ce0d48fec29cbc6e Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Thu, 15 Dec 2016 12:20:47 +0100
Subject: [PATCH] Revert "Merge branch 'starpu/versions' into 'master'"
This reverts merge request !1
---
CMakeLists.txt | 2 ++
runtime/starpu/codelets/codelet_zasum.c | 3 ---
runtime/starpu/codelets/codelet_zaxpy.c | 3 ---
runtime/starpu/codelets/codelet_zbuild.c | 3 ---
runtime/starpu/codelets/codelet_zgeadd.c | 3 ---
runtime/starpu/codelets/codelet_zgelqt.c | 3 ---
runtime/starpu/codelets/codelet_zgemm.c | 3 ---
runtime/starpu/codelets/codelet_zgeqrt.c | 2 +-
runtime/starpu/codelets/codelet_zgessm.c | 3 ---
runtime/starpu/codelets/codelet_zgessq.c | 3 ---
runtime/starpu/codelets/codelet_zgetrf.c | 3 ---
runtime/starpu/codelets/codelet_zgetrf_incpiv.c | 3 ---
runtime/starpu/codelets/codelet_zgetrf_nopiv.c | 3 ---
runtime/starpu/codelets/codelet_zhe2ge.c | 2 +-
runtime/starpu/codelets/codelet_zhemm.c | 3 ---
runtime/starpu/codelets/codelet_zher2k.c | 3 ---
runtime/starpu/codelets/codelet_zherfb.c | 2 +-
runtime/starpu/codelets/codelet_zherk.c | 3 ---
runtime/starpu/codelets/codelet_zhessq.c | 3 ---
runtime/starpu/codelets/codelet_zlacpy.c | 3 ---
runtime/starpu/codelets/codelet_zlag2c.c | 6 ------
runtime/starpu/codelets/codelet_zlange.c | 6 ------
runtime/starpu/codelets/codelet_zlanhe.c | 3 ---
runtime/starpu/codelets/codelet_zlansy.c | 3 ---
runtime/starpu/codelets/codelet_zlantr.c | 3 ---
runtime/starpu/codelets/codelet_zlascal.c | 3 ---
runtime/starpu/codelets/codelet_zlaset.c | 3 ---
runtime/starpu/codelets/codelet_zlaset2.c | 3 ---
runtime/starpu/codelets/codelet_zlatro.c | 2 +-
runtime/starpu/codelets/codelet_zlauum.c | 3 ---
runtime/starpu/codelets/codelet_zplghe.c | 3 ---
runtime/starpu/codelets/codelet_zplgsy.c | 3 ---
runtime/starpu/codelets/codelet_zplrnt.c | 3 ---
runtime/starpu/codelets/codelet_zplssq.c | 6 ------
runtime/starpu/codelets/codelet_zpotrf.c | 3 ---
runtime/starpu/codelets/codelet_zssssm.c | 3 ---
runtime/starpu/codelets/codelet_zsymm.c | 3 ---
runtime/starpu/codelets/codelet_zsyr2k.c | 3 ---
runtime/starpu/codelets/codelet_zsyrk.c | 3 ---
runtime/starpu/codelets/codelet_zsyssq.c | 3 ---
runtime/starpu/codelets/codelet_zsytrf_nopiv.c | 3 ---
runtime/starpu/codelets/codelet_ztile_zero.c | 3 ---
runtime/starpu/codelets/codelet_ztradd.c | 3 ---
runtime/starpu/codelets/codelet_ztrasm.c | 3 ---
runtime/starpu/codelets/codelet_ztrmm.c | 3 ---
runtime/starpu/codelets/codelet_ztrsm.c | 3 ---
runtime/starpu/codelets/codelet_ztrssq.c | 3 ---
runtime/starpu/codelets/codelet_ztrtri.c | 3 ---
runtime/starpu/codelets/codelet_ztslqt.c | 3 ---
runtime/starpu/codelets/codelet_ztsmlq.c | 3 ---
runtime/starpu/codelets/codelet_ztsmlq_hetra1.c | 3 ---
runtime/starpu/codelets/codelet_ztsmqr.c | 2 +-
runtime/starpu/codelets/codelet_ztsmqr_hetra1.c | 2 +-
runtime/starpu/codelets/codelet_ztsqrt.c | 2 +-
runtime/starpu/codelets/codelet_ztstrf.c | 3 ---
runtime/starpu/codelets/codelet_zttlqt.c | 3 ---
runtime/starpu/codelets/codelet_zttmlq.c | 3 ---
runtime/starpu/codelets/codelet_zttmqr.c | 3 ---
runtime/starpu/codelets/codelet_zttqrt.c | 3 ---
runtime/starpu/codelets/codelet_zunmlq.c | 2 +-
runtime/starpu/codelets/codelet_zunmqr.c | 6 +++---
runtime/starpu/control/runtime_descriptor.c | 13 ++++++-------
runtime/starpu/include/morse_starpu.h | 7 -------
63 files changed, 19 insertions(+), 187 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b65b2961c..44019bf54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -691,6 +691,8 @@ 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}")
diff --git a/runtime/starpu/codelets/codelet_zasum.c b/runtime/starpu/codelets/codelet_zasum.c
index bd04e779c..14c640d71 100644
--- a/runtime/starpu/codelets/codelet_zasum.c
+++ b/runtime/starpu/codelets/codelet_zasum.c
@@ -46,9 +46,6 @@ 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);
}
diff --git a/runtime/starpu/codelets/codelet_zaxpy.c b/runtime/starpu/codelets/codelet_zaxpy.c
index 26735cad8..1de17ff69 100644
--- a/runtime/starpu/codelets/codelet_zaxpy.c
+++ b/runtime/starpu/codelets/codelet_zaxpy.c
@@ -45,9 +45,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zbuild.c b/runtime/starpu/codelets/codelet_zbuild.c
index fa1cd01cc..d8071d814 100644
--- a/runtime/starpu/codelets/codelet_zbuild.c
+++ b/runtime/starpu/codelets/codelet_zbuild.c
@@ -62,9 +62,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zgeadd.c b/runtime/starpu/codelets/codelet_zgeadd.c
index f2ebfc783..1eefb71ba 100644
--- a/runtime/starpu/codelets/codelet_zgeadd.c
+++ b/runtime/starpu/codelets/codelet_zgeadd.c
@@ -107,9 +107,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zgelqt.c b/runtime/starpu/codelets/codelet_zgelqt.c
index 023af3243..fe12b7850 100644
--- a/runtime/starpu/codelets/codelet_zgelqt.c
+++ b/runtime/starpu/codelets/codelet_zgelqt.c
@@ -122,9 +122,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index 68564e796..581d46a11 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -95,9 +95,6 @@ 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);
}
diff --git a/runtime/starpu/codelets/codelet_zgeqrt.c b/runtime/starpu/codelets/codelet_zgeqrt.c
index ca0875bbb..a60fb29da 100644
--- a/runtime/starpu/codelets/codelet_zgeqrt.c
+++ b/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,
-#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+#ifdef STARPU_12
STARPU_NAME, "zgeqrt",
#endif
0);
diff --git a/runtime/starpu/codelets/codelet_zgessm.c b/runtime/starpu/codelets/codelet_zgessm.c
index 09d5a60ef..f357b215f 100644
--- a/runtime/starpu/codelets/codelet_zgessm.c
+++ b/runtime/starpu/codelets/codelet_zgessm.c
@@ -109,9 +109,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zgessq.c b/runtime/starpu/codelets/codelet_zgessq.c
index 4c65d87aa..d13dd85c7 100644
--- a/runtime/starpu/codelets/codelet_zgessq.c
+++ b/runtime/starpu/codelets/codelet_zgessq.c
@@ -44,9 +44,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zgetrf.c b/runtime/starpu/codelets/codelet_zgetrf.c
index 9943b30ef..e6eec579a 100644
--- a/runtime/starpu/codelets/codelet_zgetrf.c
+++ b/runtime/starpu/codelets/codelet_zgetrf.c
@@ -53,9 +53,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
index 736bcecf7..8ee3d95dc 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
@@ -119,9 +119,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
index d2a6425d3..31e70a4c0 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
@@ -97,9 +97,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zhe2ge.c b/runtime/starpu/codelets/codelet_zhe2ge.c
index a6a33e783..1daebd9f1 100644
--- a/runtime/starpu/codelets/codelet_zhe2ge.c
+++ b/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,
-#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+#ifdef STARPU_12
STARPU_NAME, "zhe2ge",
#endif
0);
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index af47b8e98..6fd670682 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -68,9 +68,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c
index 2287ab27f..fa002e212 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/runtime/starpu/codelets/codelet_zher2k.c
@@ -68,9 +68,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zherfb.c b/runtime/starpu/codelets/codelet_zherfb.c
index eeaecd32c..4e257acba 100644
--- a/runtime/starpu/codelets/codelet_zherfb.c
+++ b/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,
-#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+#ifdef STARPU_12
STARPU_NAME, "zherfb",
#endif
0);
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index ce5f60025..df6d8718f 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -64,9 +64,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zhessq.c b/runtime/starpu/codelets/codelet_zhessq.c
index 8faa15d0b..aa3904e76 100644
--- a/runtime/starpu/codelets/codelet_zhessq.c
+++ b/runtime/starpu/codelets/codelet_zhessq.c
@@ -44,9 +44,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zlacpy.c b/runtime/starpu/codelets/codelet_zlacpy.c
index c36bc9f8e..c70e6b680 100644
--- a/runtime/starpu/codelets/codelet_zlacpy.c
+++ b/runtime/starpu/codelets/codelet_zlacpy.c
@@ -63,9 +63,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zlag2c.c b/runtime/starpu/codelets/codelet_zlag2c.c
index f3b0f2a86..7996cc801 100644
--- a/runtime/starpu/codelets/codelet_zlag2c.c
+++ b/runtime/starpu/codelets/codelet_zlag2c.c
@@ -57,9 +57,6 @@ 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);
}
}
@@ -103,9 +100,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zlange.c b/runtime/starpu/codelets/codelet_zlange.c
index ef031041e..219487ed7 100644
--- a/runtime/starpu/codelets/codelet_zlange.c
+++ b/runtime/starpu/codelets/codelet_zlange.c
@@ -50,9 +50,6 @@ 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);
}
}
@@ -94,9 +91,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zlanhe.c b/runtime/starpu/codelets/codelet_zlanhe.c
index c547eac26..529899eec 100644
--- a/runtime/starpu/codelets/codelet_zlanhe.c
+++ b/runtime/starpu/codelets/codelet_zlanhe.c
@@ -48,9 +48,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zlansy.c b/runtime/starpu/codelets/codelet_zlansy.c
index 69623180d..d2973a1d3 100644
--- a/runtime/starpu/codelets/codelet_zlansy.c
+++ b/runtime/starpu/codelets/codelet_zlansy.c
@@ -50,9 +50,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zlantr.c b/runtime/starpu/codelets/codelet_zlantr.c
index e1d585f86..6ba5cb732 100644
--- a/runtime/starpu/codelets/codelet_zlantr.c
+++ b/runtime/starpu/codelets/codelet_zlantr.c
@@ -49,9 +49,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zlascal.c b/runtime/starpu/codelets/codelet_zlascal.c
index 36af8ccb5..f40802665 100644
--- a/runtime/starpu/codelets/codelet_zlascal.c
+++ b/runtime/starpu/codelets/codelet_zlascal.c
@@ -83,9 +83,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zlaset.c b/runtime/starpu/codelets/codelet_zlaset.c
index 4f2c84485..1809d5f2a 100644
--- a/runtime/starpu/codelets/codelet_zlaset.c
+++ b/runtime/starpu/codelets/codelet_zlaset.c
@@ -90,9 +90,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zlaset2.c b/runtime/starpu/codelets/codelet_zlaset2.c
index 453025b81..67572a47f 100644
--- a/runtime/starpu/codelets/codelet_zlaset2.c
+++ b/runtime/starpu/codelets/codelet_zlaset2.c
@@ -86,9 +86,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zlatro.c b/runtime/starpu/codelets/codelet_zlatro.c
index cf3433112..5f0a2ea04 100644
--- a/runtime/starpu/codelets/codelet_zlatro.c
+++ b/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,
-#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+#ifdef STARPU_12
STARPU_NAME, "zlatro",
#endif
0);
diff --git a/runtime/starpu/codelets/codelet_zlauum.c b/runtime/starpu/codelets/codelet_zlauum.c
index 5539ca63f..d30eb3740 100644
--- a/runtime/starpu/codelets/codelet_zlauum.c
+++ b/runtime/starpu/codelets/codelet_zlauum.c
@@ -56,9 +56,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zplghe.c b/runtime/starpu/codelets/codelet_zplghe.c
index 42d3b7320..186d9b210 100644
--- a/runtime/starpu/codelets/codelet_zplghe.c
+++ b/runtime/starpu/codelets/codelet_zplghe.c
@@ -56,9 +56,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zplgsy.c b/runtime/starpu/codelets/codelet_zplgsy.c
index 027b80489..854947480 100644
--- a/runtime/starpu/codelets/codelet_zplgsy.c
+++ b/runtime/starpu/codelets/codelet_zplgsy.c
@@ -57,9 +57,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zplrnt.c b/runtime/starpu/codelets/codelet_zplrnt.c
index 7c6d3556d..1935dd343 100644
--- a/runtime/starpu/codelets/codelet_zplrnt.c
+++ b/runtime/starpu/codelets/codelet_zplrnt.c
@@ -55,9 +55,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zplssq.c b/runtime/starpu/codelets/codelet_zplssq.c
index 25de90a79..65b51032e 100644
--- a/runtime/starpu/codelets/codelet_zplssq.c
+++ b/runtime/starpu/codelets/codelet_zplssq.c
@@ -72,9 +72,6 @@ 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);
}
}
@@ -113,9 +110,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zpotrf.c b/runtime/starpu/codelets/codelet_zpotrf.c
index af1449231..abfd477a2 100644
--- a/runtime/starpu/codelets/codelet_zpotrf.c
+++ b/runtime/starpu/codelets/codelet_zpotrf.c
@@ -59,9 +59,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zssssm.c b/runtime/starpu/codelets/codelet_zssssm.c
index 79c90bb56..3a59f7708 100644
--- a/runtime/starpu/codelets/codelet_zssssm.c
+++ b/runtime/starpu/codelets/codelet_zssssm.c
@@ -139,9 +139,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index d7d557ef7..030ccc1b7 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -68,9 +68,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c
index a9d7a0ed2..b3bebf3b0 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -68,9 +68,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index 33e07811c..98e472cc4 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -64,9 +64,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zsyssq.c b/runtime/starpu/codelets/codelet_zsyssq.c
index 29d2f2df3..62fe8f524 100644
--- a/runtime/starpu/codelets/codelet_zsyssq.c
+++ b/runtime/starpu/codelets/codelet_zsyssq.c
@@ -44,9 +44,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
index 6a375295f..6320ea9a7 100644
--- a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
@@ -53,9 +53,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_ztile_zero.c b/runtime/starpu/codelets/codelet_ztile_zero.c
index 567e231a6..d8f1a1fb6 100644
--- a/runtime/starpu/codelets/codelet_ztile_zero.c
+++ b/runtime/starpu/codelets/codelet_ztile_zero.c
@@ -50,9 +50,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_ztradd.c b/runtime/starpu/codelets/codelet_ztradd.c
index 53cab26a4..24d532ddd 100644
--- a/runtime/starpu/codelets/codelet_ztradd.c
+++ b/runtime/starpu/codelets/codelet_ztradd.c
@@ -112,9 +112,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_ztrasm.c b/runtime/starpu/codelets/codelet_ztrasm.c
index f8aa3743e..7ad655c07 100644
--- a/runtime/starpu/codelets/codelet_ztrasm.c
+++ b/runtime/starpu/codelets/codelet_ztrasm.c
@@ -46,9 +46,6 @@ 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);
}
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index 745d429bd..9878b02fc 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -65,9 +65,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c
index 4bbea5e1a..e009a14b3 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -86,9 +86,6 @@ 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);
}
diff --git a/runtime/starpu/codelets/codelet_ztrssq.c b/runtime/starpu/codelets/codelet_ztrssq.c
index 92ef401a1..910a81d3c 100644
--- a/runtime/starpu/codelets/codelet_ztrssq.c
+++ b/runtime/starpu/codelets/codelet_ztrssq.c
@@ -47,9 +47,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_ztrtri.c b/runtime/starpu/codelets/codelet_ztrtri.c
index 962ef0b76..49e1ca945 100644
--- a/runtime/starpu/codelets/codelet_ztrtri.c
+++ b/runtime/starpu/codelets/codelet_ztrtri.c
@@ -60,9 +60,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_ztslqt.c b/runtime/starpu/codelets/codelet_ztslqt.c
index 653dffff0..137275a68 100644
--- a/runtime/starpu/codelets/codelet_ztslqt.c
+++ b/runtime/starpu/codelets/codelet_ztslqt.c
@@ -140,9 +140,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_ztsmlq.c b/runtime/starpu/codelets/codelet_ztsmlq.c
index 4215279ed..88128117d 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq.c
@@ -173,9 +173,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c b/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
index da3a7516e..ef13963bb 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
@@ -74,9 +74,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_ztsmqr.c b/runtime/starpu/codelets/codelet_ztsmqr.c
index 661b597e6..16f2475b3 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr.c
+++ b/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,
-#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+#ifdef STARPU_12
STARPU_NAME, "ztsmqr",
#endif
#if defined(CHAMELEON_USE_MPI)
diff --git a/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c b/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
index 2af83b5d2..94597b6a9 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
+++ b/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,
-#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+#ifdef STARPU_12
STARPU_NAME, "ztsmqr_hetra1",
#endif
0);
diff --git a/runtime/starpu/codelets/codelet_ztsqrt.c b/runtime/starpu/codelets/codelet_ztsqrt.c
index 63660c0a9..0d8a8a9aa 100644
--- a/runtime/starpu/codelets/codelet_ztsqrt.c
+++ b/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,
-#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+#ifdef STARPU_12
STARPU_NAME, "ztsqrt",
#endif
STARPU_EXECUTE_ON_NODE, A2->get_rankof(A2, A2m, A2n),
diff --git a/runtime/starpu/codelets/codelet_ztstrf.c b/runtime/starpu/codelets/codelet_ztstrf.c
index f1ae6bb17..2ba801d75 100644
--- a/runtime/starpu/codelets/codelet_ztstrf.c
+++ b/runtime/starpu/codelets/codelet_ztstrf.c
@@ -137,9 +137,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zttlqt.c b/runtime/starpu/codelets/codelet_zttlqt.c
index 518d965e8..1eac70c5d 100644
--- a/runtime/starpu/codelets/codelet_zttlqt.c
+++ b/runtime/starpu/codelets/codelet_zttlqt.c
@@ -136,9 +136,6 @@ 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);
}
}
diff --git a/runtime/starpu/codelets/codelet_zttmlq.c b/runtime/starpu/codelets/codelet_zttmlq.c
index cd6fbaff4..c3ec7be24 100644
--- a/runtime/starpu/codelets/codelet_zttmlq.c
+++ b/runtime/starpu/codelets/codelet_zttmlq.c
@@ -166,9 +166,6 @@ void MORSE_TASK_zttmlq(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, "zttmlq",
-#endif
0);
}
}
diff --git a/runtime/starpu/codelets/codelet_zttmqr.c b/runtime/starpu/codelets/codelet_zttmqr.c
index 453ed0af0..215c18701 100644
--- a/runtime/starpu/codelets/codelet_zttmqr.c
+++ b/runtime/starpu/codelets/codelet_zttmqr.c
@@ -194,9 +194,6 @@ void MORSE_TASK_zttmqr(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, "zttmqr",
#endif
0);
}
diff --git a/runtime/starpu/codelets/codelet_zttqrt.c b/runtime/starpu/codelets/codelet_zttqrt.c
index a5bf954ce..3f5fd2ab3 100644
--- a/runtime/starpu/codelets/codelet_zttqrt.c
+++ b/runtime/starpu/codelets/codelet_zttqrt.c
@@ -136,9 +136,6 @@ void MORSE_TASK_zttqrt(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, "zttqrt",
-#endif
0);
}
}
diff --git a/runtime/starpu/codelets/codelet_zunmlq.c b/runtime/starpu/codelets/codelet_zunmlq.c
index a615c4784..b3e973a09 100644
--- a/runtime/starpu/codelets/codelet_zunmlq.c
+++ b/runtime/starpu/codelets/codelet_zunmlq.c
@@ -150,7 +150,7 @@ void MORSE_TASK_zunmlq(const MORSE_option_t *options,
STARPU_VALUE, &nb, sizeof(int),
STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback,
-#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+#ifdef STARPU_12
STARPU_NAME, "zunmlq",
#endif
0);
diff --git a/runtime/starpu/codelets/codelet_zunmqr.c b/runtime/starpu/codelets/codelet_zunmqr.c
index acb7279ed..32c6d14ac 100644
--- a/runtime/starpu/codelets/codelet_zunmqr.c
+++ b/runtime/starpu/codelets/codelet_zunmqr.c
@@ -172,11 +172,11 @@ void MORSE_TASK_zunmqr(const MORSE_option_t *options,
STARPU_VALUE, &nb, sizeof(int),
STARPU_PRIORITY, options->priority,
STARPU_CALLBACK, callback,
+#ifdef STARPU_12
+ STARPU_NAME, "zunmqr",
+#endif
#if defined(CHAMELEON_USE_MPI)
STARPU_EXECUTE_ON_NODE, execution_rank,
-#endif
-#if defined(CHAMELEON_CODELETS_HAVE_NAME)
- STARPU_NAME, "zunmqr",
#endif
0);
}
diff --git a/runtime/starpu/control/runtime_descriptor.c b/runtime/starpu/control/runtime_descriptor.c
index 5bd0ca720..c25460a91 100644
--- a/runtime/starpu/control/runtime_descriptor.c
+++ b/runtime/starpu/control/runtime_descriptor.c
@@ -268,13 +268,6 @@ int RUNTIME_desc_release( MORSE_desc_t *desc )
return MORSE_SUCCESS;
}
-/**
- * For older revision of StarPU, STARPU_MAIN_RAM is not defined
- */
-#ifndef STARPU_MAIN_RAM
-#define STARPU_MAIN_RAM 0
-#endif
-
int RUNTIME_desc_getoncpu( MORSE_desc_t *desc )
{
starpu_data_handle_t *handle = (starpu_data_handle_t*)(desc->schedopt);
@@ -322,9 +315,15 @@ void *RUNTIME_desc_getaddr( const MORSE_desc_t *desc, int m, int n )
BLKLDD(desc, im), tempmm, tempnn, eltsze);
}
else {
+#ifdef STARPU_12
starpu_matrix_data_register(ptrtile, STARPU_MAIN_RAM,
(uintptr_t)desc->get_blkaddr(desc, m, n),
BLKLDD(desc, im), tempmm, tempnn, eltsze);
+#else
+ starpu_matrix_data_register(ptrtile, 0,
+ (uintptr_t)desc->get_blkaddr(desc, m, n),
+ BLKLDD(desc, im), tempmm, tempnn, eltsze);
+#endif
}
}
else {
diff --git a/runtime/starpu/include/morse_starpu.h b/runtime/starpu/include/morse_starpu.h
index efbc57cf1..de46d065e 100644
--- a/runtime/starpu/include/morse_starpu.h
+++ b/runtime/starpu/include/morse_starpu.h
@@ -64,13 +64,6 @@ typedef struct starpu_conf starpu_conf_t;
#endif
/*
- * Enable codelets names
- */
-#if (STARPU_MAJOR_VERSION > 1) || ((STARPU_MAJOR_VERSION == 1) && (STARPU_MINOR_VERSION > 1))
-#define CHAMELEON_CODELETS_HAVE_NAME
-#endif
-
-/**
* Access to block pointer and leading dimension
*/
#define RTBLKADDR( desc, type, m, n ) ( (starpu_data_handle_t)RUNTIME_desc_getaddr( desc, m, n ) )
--
GitLab