From 7ca01e2bc95e29195b098acaadca6eb7471d5444 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Fri, 22 May 2015 17:55:19 +0000
Subject: [PATCH] change file names to avoid confusion with files coming from
chameleon/control
---
runtime/starpu/CMakeLists.txt | 34 +++++++++----------
runtime/starpu/codelets/codelet_zasum.c | 2 +-
runtime/starpu/codelets/codelet_zaxpy.c | 2 +-
runtime/starpu/codelets/codelet_zcallback.c | 2 +-
runtime/starpu/codelets/codelet_zgeadd.c | 2 +-
runtime/starpu/codelets/codelet_zgelqt.c | 2 +-
runtime/starpu/codelets/codelet_zgemm.c | 2 +-
runtime/starpu/codelets/codelet_zgeqrt.c | 2 +-
runtime/starpu/codelets/codelet_zgessm.c | 2 +-
runtime/starpu/codelets/codelet_zgessq.c | 2 +-
runtime/starpu/codelets/codelet_zgetrf.c | 2 +-
.../starpu/codelets/codelet_zgetrf_incpiv.c | 2 +-
.../starpu/codelets/codelet_zgetrf_nopiv.c | 2 +-
runtime/starpu/codelets/codelet_zhemm.c | 2 +-
runtime/starpu/codelets/codelet_zher2k.c | 2 +-
runtime/starpu/codelets/codelet_zherk.c | 2 +-
runtime/starpu/codelets/codelet_zhessq.c | 2 +-
runtime/starpu/codelets/codelet_zlacpy.c | 2 +-
runtime/starpu/codelets/codelet_zlag2c.c | 2 +-
runtime/starpu/codelets/codelet_zlange.c | 2 +-
runtime/starpu/codelets/codelet_zlanhe.c | 4 +--
runtime/starpu/codelets/codelet_zlansy.c | 2 +-
runtime/starpu/codelets/codelet_zlantr.c | 2 +-
runtime/starpu/codelets/codelet_zlaset.c | 2 +-
runtime/starpu/codelets/codelet_zlaset2.c | 2 +-
runtime/starpu/codelets/codelet_zlauum.c | 2 +-
runtime/starpu/codelets/codelet_zpamm.c | 2 +-
runtime/starpu/codelets/codelet_zplghe.c | 2 +-
runtime/starpu/codelets/codelet_zplgsy.c | 2 +-
runtime/starpu/codelets/codelet_zplrnt.c | 2 +-
runtime/starpu/codelets/codelet_zplssq.c | 2 +-
runtime/starpu/codelets/codelet_zpotrf.c | 2 +-
runtime/starpu/codelets/codelet_zssssm.c | 2 +-
runtime/starpu/codelets/codelet_zsymm.c | 2 +-
runtime/starpu/codelets/codelet_zsyr2k.c | 2 +-
runtime/starpu/codelets/codelet_zsyrk.c | 2 +-
runtime/starpu/codelets/codelet_zsyssq.c | 2 +-
.../starpu/codelets/codelet_zsytrf_nopiv.c | 2 +-
runtime/starpu/codelets/codelet_ztile_zero.c | 2 +-
runtime/starpu/codelets/codelet_ztrasm.c | 2 +-
runtime/starpu/codelets/codelet_ztrmm.c | 2 +-
runtime/starpu/codelets/codelet_ztrsm.c | 2 +-
runtime/starpu/codelets/codelet_ztrssq.c | 2 +-
runtime/starpu/codelets/codelet_ztrtri.c | 2 +-
runtime/starpu/codelets/codelet_ztslqt.c | 2 +-
runtime/starpu/codelets/codelet_ztsmlq.c | 2 +-
runtime/starpu/codelets/codelet_ztsmqr.c | 2 +-
runtime/starpu/codelets/codelet_ztsqrt.c | 2 +-
runtime/starpu/codelets/codelet_ztstrf.c | 2 +-
runtime/starpu/codelets/codelet_zttlqt.c | 2 +-
runtime/starpu/codelets/codelet_zttmlq.c | 2 +-
runtime/starpu/codelets/codelet_zttmqr.c | 2 +-
runtime/starpu/codelets/codelet_zttqrt.c | 2 +-
runtime/starpu/codelets/codelet_zunmlq.c | 2 +-
runtime/starpu/codelets/codelet_zunmqr.c | 2 +-
.../control/{async.c => runtime_async.c} | 2 +-
.../control/{context.c => runtime_context.c} | 2 +-
.../control/{control.c => runtime_control.c} | 14 ++++----
.../{descriptor.c => runtime_descriptor.c} | 8 ++---
.../control/{options.c => runtime_options.c} | 2 +-
.../{profiling.c => runtime_profiling.c} | 2 +-
.../{workspace.c => runtime_workspace.c} | 2 +-
.../{zlocality.c => runtime_zlocality.c} | 4 +--
.../{zprofiling.c => runtime_zprofiling.c} | 2 +-
runtime/starpu/include/morse_starpu.h | 8 ++---
...et_profile.h => runtime_codelet_profile.h} | 2 +-
.../{codelet_z.h => runtime_codelet_z.h} | 4 +--
.../{codelets.h => runtime_codelets.h} | 4 +--
.../{profiling.h => runtime_profiling.h} | 2 +-
.../{workspace.h => runtime_workspace.h} | 2 +-
70 files changed, 102 insertions(+), 102 deletions(-)
rename runtime/starpu/control/{async.c => runtime_async.c} (98%)
rename runtime/starpu/control/{context.c => runtime_context.c} (98%)
rename runtime/starpu/control/{control.c => runtime_control.c} (92%)
rename runtime/starpu/control/{descriptor.c => runtime_descriptor.c} (97%)
rename runtime/starpu/control/{options.c => runtime_options.c} (98%)
rename runtime/starpu/control/{profiling.c => runtime_profiling.c} (99%)
rename runtime/starpu/control/{workspace.c => runtime_workspace.c} (99%)
rename runtime/starpu/control/{zlocality.c => runtime_zlocality.c} (98%)
rename runtime/starpu/control/{zprofiling.c => runtime_zprofiling.c} (99%)
rename runtime/starpu/include/{codelet_profile.h => runtime_codelet_profile.h} (99%)
rename runtime/starpu/include/{codelet_z.h => runtime_codelet_z.h} (96%)
rename runtime/starpu/include/{codelets.h => runtime_codelets.h} (98%)
rename runtime/starpu/include/{profiling.h => runtime_profiling.h} (97%)
rename runtime/starpu/include/{workspace.h => runtime_workspace.h} (98%)
diff --git a/runtime/starpu/CMakeLists.txt b/runtime/starpu/CMakeLists.txt
index 19b5522fb..6063f65d3 100644
--- a/runtime/starpu/CMakeLists.txt
+++ b/runtime/starpu/CMakeLists.txt
@@ -39,11 +39,11 @@ if ( CBLAS_FOUND AND LAPACKE_FOUND AND LAPACK_FOUND AND CUDA_FOUND AND CUDA_CUBL
endif()
endif()
-# Generate the magma headers for all possible precisions
-# ------------------------------------------------------
+# Generate headers for all possible precisions
+# --------------------------------------------
set(RUNTIME_HDRS_GENERATED "")
set(ZHDR
- include/codelet_z.h
+ include/runtime_codelet_z.h
)
precisions_rules_py(RUNTIME_HDRS_GENERATED "${ZHDR}"
@@ -53,11 +53,11 @@ precisions_rules_py(RUNTIME_HDRS_GENERATED "${ZHDR}"
# Define the list of headers
# --------------------------
set(RUNTIME_HDRS
- include/codelet_profile.h
- include/codelets.h
include/morse_starpu.h
- include/profiling.h
- include/workspace.h
+ include/runtime_codelet_profile.h
+ include/runtime_codelets.h
+ include/runtime_profiling.h
+ include/runtime_workspace.h
${RUNTIME_HDRS_GENERATED}
)
@@ -74,8 +74,8 @@ add_custom_target(runtime_starpu_include ALL SOURCES ${RUNTIME_HDRS})
# -----------------------------------------------------
set(RUNTIME_COMMON_GENERATED "")
set(ZSRC
- control/zprofiling.c
- control/zlocality.c
+ control/runtime_zprofiling.c
+ control/runtime_zlocality.c
)
precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}"
@@ -83,13 +83,13 @@ precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}"
TARGETDIR "control")
set(RUNTIME_COMMON
- control/control.c
- control/context.c
- control/descriptor.c
- control/async.c
- control/options.c
- control/profiling.c
- control/workspace.c
+ control/runtime_control.c
+ control/runtime_context.c
+ control/runtime_descriptor.c
+ control/runtime_async.c
+ control/runtime_options.c
+ control/runtime_profiling.c
+ control/runtime_workspace.c
codelets/codelet_dataflush.c
${RUNTIME_COMMON_GENERATED}
)
@@ -98,7 +98,7 @@ set(flags_to_add "")
foreach(_prec ${CHAMELEON_PRECISION})
set(flags_to_add "${flags_to_add} -DPRECISION_${_prec}")
endforeach()
-set_source_files_properties(control/profiling.c PROPERTIES COMPILE_FLAGS "${flags_to_add}")
+set_source_files_properties(control/runtime_profiling.c PROPERTIES COMPILE_FLAGS "${flags_to_add}")
# Generate the morse sources for all possible precisions
# ------------------------------------------------------
diff --git a/runtime/starpu/codelets/codelet_zasum.c b/runtime/starpu/codelets/codelet_zasum.c
index ca8a2969e..0d5cab3ae 100644
--- a/runtime/starpu/codelets/codelet_zasum.c
+++ b/runtime/starpu/codelets/codelet_zasum.c
@@ -25,7 +25,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
#include "runtime_z.h"
void MORSE_TASK_dzasum(MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_zaxpy.c b/runtime/starpu/codelets/codelet_zaxpy.c
index fb1d4510b..ff26364b5 100644
--- a/runtime/starpu/codelets/codelet_zaxpy.c
+++ b/runtime/starpu/codelets/codelet_zaxpy.c
@@ -23,7 +23,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
void MORSE_TASK_zaxpy(MORSE_option_t *options,
int M, MORSE_Complex64_t alpha,
diff --git a/runtime/starpu/codelets/codelet_zcallback.c b/runtime/starpu/codelets/codelet_zcallback.c
index d274326fe..3fcf9d85b 100644
--- a/runtime/starpu/codelets/codelet_zcallback.c
+++ b/runtime/starpu/codelets/codelet_zcallback.c
@@ -25,7 +25,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
CHAMELEON_CL_CB(zasum, starpu_matrix_get_nx(task->handles[0]), starpu_matrix_get_ny(task->handles[0]), 0, M*N);
CHAMELEON_CL_CB(zaxpy, starpu_matrix_get_nx(task->handles[0]), starpu_matrix_get_nx(task->handles[1]), 0, M);
diff --git a/runtime/starpu/codelets/codelet_zgeadd.c b/runtime/starpu/codelets/codelet_zgeadd.c
index a1c3fda65..a6c8c30c6 100644
--- a/runtime/starpu/codelets/codelet_zgeadd.c
+++ b/runtime/starpu/codelets/codelet_zgeadd.c
@@ -27,7 +27,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zgelqt.c b/runtime/starpu/codelets/codelet_zgelqt.c
index 241f64f23..b0ee80073 100644
--- a/runtime/starpu/codelets/codelet_zgelqt.c
+++ b/runtime/starpu/codelets/codelet_zgelqt.c
@@ -30,7 +30,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index 37059ac74..e230c96f6 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zgeqrt.c b/runtime/starpu/codelets/codelet_zgeqrt.c
index 4ace1e060..e4b844e45 100644
--- a/runtime/starpu/codelets/codelet_zgeqrt.c
+++ b/runtime/starpu/codelets/codelet_zgeqrt.c
@@ -30,7 +30,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zgessm.c b/runtime/starpu/codelets/codelet_zgessm.c
index a0a000a00..97a8ab7f8 100644
--- a/runtime/starpu/codelets/codelet_zgessm.c
+++ b/runtime/starpu/codelets/codelet_zgessm.c
@@ -31,7 +31,7 @@
#include "coreblas/include/cblas.h"
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zgessq.c b/runtime/starpu/codelets/codelet_zgessq.c
index d30d90440..424da15fe 100644
--- a/runtime/starpu/codelets/codelet_zgessq.c
+++ b/runtime/starpu/codelets/codelet_zgessq.c
@@ -25,7 +25,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
void MORSE_TASK_zgessq( MORSE_option_t *options,
int m, int n,
diff --git a/runtime/starpu/codelets/codelet_zgetrf.c b/runtime/starpu/codelets/codelet_zgetrf.c
index ead284b28..7b0c9c7b5 100644
--- a/runtime/starpu/codelets/codelet_zgetrf.c
+++ b/runtime/starpu/codelets/codelet_zgetrf.c
@@ -28,7 +28,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
void MORSE_TASK_zgetrf(MORSE_option_t *options,
int m, int n, int nb,
diff --git a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
index 9c46345eb..b7c944ce7 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
@@ -30,7 +30,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
index a7bb8dc9d..3db007331 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
@@ -26,7 +26,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index 5f3083a61..4c700b698 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c
index 7d6b78750..de2b09367 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/runtime/starpu/codelets/codelet_zher2k.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index 19897f4a2..5d3a7e301 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zhessq.c b/runtime/starpu/codelets/codelet_zhessq.c
index 7b34c96d1..6577b1e8f 100644
--- a/runtime/starpu/codelets/codelet_zhessq.c
+++ b/runtime/starpu/codelets/codelet_zhessq.c
@@ -25,7 +25,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
void MORSE_TASK_zhessq( MORSE_option_t *options,
MORSE_enum uplo, int n,
diff --git a/runtime/starpu/codelets/codelet_zlacpy.c b/runtime/starpu/codelets/codelet_zlacpy.c
index 9b95d2e4b..31d370846 100644
--- a/runtime/starpu/codelets/codelet_zlacpy.c
+++ b/runtime/starpu/codelets/codelet_zlacpy.c
@@ -30,7 +30,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zlag2c.c b/runtime/starpu/codelets/codelet_zlag2c.c
index c39f1112c..b2941d710 100644
--- a/runtime/starpu/codelets/codelet_zlag2c.c
+++ b/runtime/starpu/codelets/codelet_zlag2c.c
@@ -28,7 +28,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zlange.c b/runtime/starpu/codelets/codelet_zlange.c
index 026c2edfa..c536dad45 100644
--- a/runtime/starpu/codelets/codelet_zlange.c
+++ b/runtime/starpu/codelets/codelet_zlange.c
@@ -28,7 +28,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
void MORSE_TASK_zlange(MORSE_option_t *options,
MORSE_enum norm, int M, int N, int NB,
diff --git a/runtime/starpu/codelets/codelet_zlanhe.c b/runtime/starpu/codelets/codelet_zlanhe.c
index 0093edb21..1539de98e 100644
--- a/runtime/starpu/codelets/codelet_zlanhe.c
+++ b/runtime/starpu/codelets/codelet_zlanhe.c
@@ -10,7 +10,7 @@
/**
*
- * @file codelet_zlange.c
+ * @file codelet_zlanhe.c
*
* MORSE codelets kernel
* MORSE is a software package provided by Inria Bordeaux - Sud-Ouest, LaBRI,
@@ -27,7 +27,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
void MORSE_TASK_zlanhe(MORSE_option_t *options,
MORSE_enum norm, MORSE_enum uplo, int N, int NB,
diff --git a/runtime/starpu/codelets/codelet_zlansy.c b/runtime/starpu/codelets/codelet_zlansy.c
index a605bf2a5..09fc7d37e 100644
--- a/runtime/starpu/codelets/codelet_zlansy.c
+++ b/runtime/starpu/codelets/codelet_zlansy.c
@@ -28,7 +28,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
void MORSE_TASK_zlansy(MORSE_option_t *options,
MORSE_enum norm, MORSE_enum uplo, int N, int NB,
diff --git a/runtime/starpu/codelets/codelet_zlantr.c b/runtime/starpu/codelets/codelet_zlantr.c
index da0e26c97..34d6fe52d 100644
--- a/runtime/starpu/codelets/codelet_zlantr.c
+++ b/runtime/starpu/codelets/codelet_zlantr.c
@@ -25,7 +25,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
void MORSE_TASK_zlantr(MORSE_option_t *options,
MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag,
diff --git a/runtime/starpu/codelets/codelet_zlaset.c b/runtime/starpu/codelets/codelet_zlaset.c
index 0d45831db..c9644af39 100644
--- a/runtime/starpu/codelets/codelet_zlaset.c
+++ b/runtime/starpu/codelets/codelet_zlaset.c
@@ -29,7 +29,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
diff --git a/runtime/starpu/codelets/codelet_zlaset2.c b/runtime/starpu/codelets/codelet_zlaset2.c
index f14069ad8..f87193a52 100644
--- a/runtime/starpu/codelets/codelet_zlaset2.c
+++ b/runtime/starpu/codelets/codelet_zlaset2.c
@@ -29,7 +29,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
diff --git a/runtime/starpu/codelets/codelet_zlauum.c b/runtime/starpu/codelets/codelet_zlauum.c
index 5628bf671..619060f86 100644
--- a/runtime/starpu/codelets/codelet_zlauum.c
+++ b/runtime/starpu/codelets/codelet_zlauum.c
@@ -30,7 +30,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zpamm.c b/runtime/starpu/codelets/codelet_zpamm.c
index f6fc58adc..22aff4faf 100644
--- a/runtime/starpu/codelets/codelet_zpamm.c
+++ b/runtime/starpu/codelets/codelet_zpamm.c
@@ -30,7 +30,7 @@
#include "coreblas/include/cblas.h"
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zplghe.c b/runtime/starpu/codelets/codelet_zplghe.c
index 4f63a143b..73df1e374 100644
--- a/runtime/starpu/codelets/codelet_zplghe.c
+++ b/runtime/starpu/codelets/codelet_zplghe.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
void MORSE_TASK_zplghe( MORSE_option_t *options,
double bump, int m, int n, MORSE_desc_t *A, int Am, int An, int lda,
diff --git a/runtime/starpu/codelets/codelet_zplgsy.c b/runtime/starpu/codelets/codelet_zplgsy.c
index 03d4fe177..62e0f86df 100644
--- a/runtime/starpu/codelets/codelet_zplgsy.c
+++ b/runtime/starpu/codelets/codelet_zplgsy.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
diff --git a/runtime/starpu/codelets/codelet_zplrnt.c b/runtime/starpu/codelets/codelet_zplrnt.c
index d703f42b7..a5c0f2dec 100644
--- a/runtime/starpu/codelets/codelet_zplrnt.c
+++ b/runtime/starpu/codelets/codelet_zplrnt.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
diff --git a/runtime/starpu/codelets/codelet_zplssq.c b/runtime/starpu/codelets/codelet_zplssq.c
index 7069f279c..f86cfa069 100644
--- a/runtime/starpu/codelets/codelet_zplssq.c
+++ b/runtime/starpu/codelets/codelet_zplssq.c
@@ -26,7 +26,7 @@
**/
#include <math.h>
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/*****************************************************************************
*
diff --git a/runtime/starpu/codelets/codelet_zpotrf.c b/runtime/starpu/codelets/codelet_zpotrf.c
index ce8931fe4..2f1f9cfd3 100644
--- a/runtime/starpu/codelets/codelet_zpotrf.c
+++ b/runtime/starpu/codelets/codelet_zpotrf.c
@@ -30,7 +30,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zssssm.c b/runtime/starpu/codelets/codelet_zssssm.c
index cf0c6d38f..019daf9f1 100644
--- a/runtime/starpu/codelets/codelet_zssssm.c
+++ b/runtime/starpu/codelets/codelet_zssssm.c
@@ -30,7 +30,7 @@
**/
#include "coreblas/include/cblas.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index ec4b1b832..dfa54ca0e 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c
index b480dfbab..161caa119 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index bba022212..9388048ee 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zsyssq.c b/runtime/starpu/codelets/codelet_zsyssq.c
index 85f9b7e21..fdef038e6 100644
--- a/runtime/starpu/codelets/codelet_zsyssq.c
+++ b/runtime/starpu/codelets/codelet_zsyssq.c
@@ -25,7 +25,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
void MORSE_TASK_zsyssq( MORSE_option_t *options,
MORSE_enum uplo, int n,
diff --git a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
index 28bf29d37..df6bf32a3 100644
--- a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
void MORSE_TASK_zsytrf_nopiv(MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_ztile_zero.c b/runtime/starpu/codelets/codelet_ztile_zero.c
index 400eff376..08830ca60 100644
--- a/runtime/starpu/codelets/codelet_ztile_zero.c
+++ b/runtime/starpu/codelets/codelet_ztile_zero.c
@@ -25,7 +25,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/*****************************************************************************
*
diff --git a/runtime/starpu/codelets/codelet_ztrasm.c b/runtime/starpu/codelets/codelet_ztrasm.c
index 92b4279cc..49927d142 100644
--- a/runtime/starpu/codelets/codelet_ztrasm.c
+++ b/runtime/starpu/codelets/codelet_ztrasm.c
@@ -25,7 +25,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
void MORSE_TASK_ztrasm(MORSE_option_t *options,
MORSE_enum storev, MORSE_enum uplo, MORSE_enum diag, int M, int N,
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index 87ea1f29e..5fe76f76b 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c
index 0e5fdd2fa..da6f1cf31 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_ztrssq.c b/runtime/starpu/codelets/codelet_ztrssq.c
index c680839aa..391695652 100644
--- a/runtime/starpu/codelets/codelet_ztrssq.c
+++ b/runtime/starpu/codelets/codelet_ztrssq.c
@@ -25,7 +25,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
void MORSE_TASK_ztrssq( MORSE_option_t *options,
MORSE_enum uplo, MORSE_enum diag,
diff --git a/runtime/starpu/codelets/codelet_ztrtri.c b/runtime/starpu/codelets/codelet_ztrtri.c
index 00cef02ab..8103fd87b 100644
--- a/runtime/starpu/codelets/codelet_ztrtri.c
+++ b/runtime/starpu/codelets/codelet_ztrtri.c
@@ -30,7 +30,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_ztslqt.c b/runtime/starpu/codelets/codelet_ztslqt.c
index 8edeeaa9e..a7e5bf60c 100644
--- a/runtime/starpu/codelets/codelet_ztslqt.c
+++ b/runtime/starpu/codelets/codelet_ztslqt.c
@@ -30,7 +30,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
#undef REAL
#define COMPLEX
diff --git a/runtime/starpu/codelets/codelet_ztsmlq.c b/runtime/starpu/codelets/codelet_ztsmlq.c
index 8f2d4eab4..03b74668e 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq.c
@@ -31,7 +31,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_ztsmqr.c b/runtime/starpu/codelets/codelet_ztsmqr.c
index ea98c08e0..554688432 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr.c
+++ b/runtime/starpu/codelets/codelet_ztsmqr.c
@@ -31,7 +31,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_ztsqrt.c b/runtime/starpu/codelets/codelet_ztsqrt.c
index 5580eb650..84b37b64b 100644
--- a/runtime/starpu/codelets/codelet_ztsqrt.c
+++ b/runtime/starpu/codelets/codelet_ztsqrt.c
@@ -30,7 +30,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
#undef REAL
#define COMPLEX
diff --git a/runtime/starpu/codelets/codelet_ztstrf.c b/runtime/starpu/codelets/codelet_ztstrf.c
index 59216ba42..e76985b02 100644
--- a/runtime/starpu/codelets/codelet_ztstrf.c
+++ b/runtime/starpu/codelets/codelet_ztstrf.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
#include "coreblas/include/cblas.h"
#include <math.h>
diff --git a/runtime/starpu/codelets/codelet_zttlqt.c b/runtime/starpu/codelets/codelet_zttlqt.c
index 6ea48b3e3..e4cdf3db7 100644
--- a/runtime/starpu/codelets/codelet_zttlqt.c
+++ b/runtime/starpu/codelets/codelet_zttlqt.c
@@ -30,7 +30,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zttmlq.c b/runtime/starpu/codelets/codelet_zttmlq.c
index b7b609c3c..311cd7a63 100644
--- a/runtime/starpu/codelets/codelet_zttmlq.c
+++ b/runtime/starpu/codelets/codelet_zttmlq.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zttmqr.c b/runtime/starpu/codelets/codelet_zttmqr.c
index df79c5fbf..e11d6b579 100644
--- a/runtime/starpu/codelets/codelet_zttmqr.c
+++ b/runtime/starpu/codelets/codelet_zttmqr.c
@@ -29,7 +29,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zttqrt.c b/runtime/starpu/codelets/codelet_zttqrt.c
index 087c1b42b..3905e4d82 100644
--- a/runtime/starpu/codelets/codelet_zttqrt.c
+++ b/runtime/starpu/codelets/codelet_zttqrt.c
@@ -30,7 +30,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zunmlq.c b/runtime/starpu/codelets/codelet_zunmlq.c
index b6589b16c..2bc5834eb 100644
--- a/runtime/starpu/codelets/codelet_zunmlq.c
+++ b/runtime/starpu/codelets/codelet_zunmlq.c
@@ -31,7 +31,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/codelets/codelet_zunmqr.c b/runtime/starpu/codelets/codelet_zunmqr.c
index 505947a6d..b4de7a5d1 100644
--- a/runtime/starpu/codelets/codelet_zunmqr.c
+++ b/runtime/starpu/codelets/codelet_zunmqr.c
@@ -30,7 +30,7 @@
**/
#include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
/**
*
diff --git a/runtime/starpu/control/async.c b/runtime/starpu/control/runtime_async.c
similarity index 98%
rename from runtime/starpu/control/async.c
rename to runtime/starpu/control/runtime_async.c
index 541adad58..849a5ce53 100644
--- a/runtime/starpu/control/async.c
+++ b/runtime/starpu/control/runtime_async.c
@@ -10,7 +10,7 @@
/**
*
- * @file async.c
+ * @file runtime_async.c
*
* MORSE auxiliary routines
* MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/control/context.c b/runtime/starpu/control/runtime_context.c
similarity index 98%
rename from runtime/starpu/control/context.c
rename to runtime/starpu/control/runtime_context.c
index 0e25a6cdb..1d031cee3 100644
--- a/runtime/starpu/control/context.c
+++ b/runtime/starpu/control/runtime_context.c
@@ -10,7 +10,7 @@
/**
*
- * @file context.c
+ * @file runtime_context.c
*
* MORSE auxiliary routines
* MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/control/control.c b/runtime/starpu/control/runtime_control.c
similarity index 92%
rename from runtime/starpu/control/control.c
rename to runtime/starpu/control/runtime_control.c
index 9208e6942..54e838e12 100644
--- a/runtime/starpu/control/control.c
+++ b/runtime/starpu/control/runtime_control.c
@@ -10,7 +10,7 @@
/**
*
- * @file control.c
+ * @file runtime_control.c
*
* MORSE auxiliary routines
* MORSE is a software package provided by Univ. of Tennessee,
@@ -39,12 +39,12 @@ int RUNTIME_rank(MORSE_context_t *morse)
/*******************************************************************************
*
**/
-int RUNTIME_init_scheduler( MORSE_context_t *morse, int nworkers, int ncudas, int nthreads_per_worker)
+int RUNTIME_init_scheduler( MORSE_context_t *morse, int ncpus, int ncudas, int nthreads_per_worker)
{
starpu_conf_t *conf = (starpu_conf_t*)(morse->schedopt);
int hres = -1;
- conf->ncpus = nworkers;
+ conf->ncpus = ncpus;
conf->ncuda = ncudas;
conf->nopencl = 0;
@@ -70,7 +70,7 @@ int RUNTIME_init_scheduler( MORSE_context_t *morse, int nworkers, int ncudas, in
conf->sched_policy_name = "ws";
#endif
- if ((nworkers == -1)||(nthreads_per_worker == -1))
+ if ((ncpus == -1)||(nthreads_per_worker == -1))
{
morse->parallel_enabled = MORSE_FALSE;
@@ -81,17 +81,17 @@ int RUNTIME_init_scheduler( MORSE_context_t *morse, int nworkers, int ncudas, in
morse->parallel_enabled = MORSE_TRUE;
- for (worker = 0; worker < nworkers; worker++)
+ for (worker = 0; worker < ncpus; worker++)
conf->workers_bindid[worker] = (worker+1)*nthreads_per_worker - 1;
- for (worker = 0; worker < nworkers; worker++)
+ for (worker = 0; worker < ncpus; worker++)
conf->workers_bindid[worker + ncudas] = worker*nthreads_per_worker;
conf->use_explicit_workers_bindid = 1;
hres = starpu_init( conf );
- morse->nworkers = nworkers;
+ morse->nworkers = ncpus;
morse->nthreads_per_worker = nthreads_per_worker;
}
diff --git a/runtime/starpu/control/descriptor.c b/runtime/starpu/control/runtime_descriptor.c
similarity index 97%
rename from runtime/starpu/control/descriptor.c
rename to runtime/starpu/control/runtime_descriptor.c
index 558300bf9..026e028f3 100644
--- a/runtime/starpu/control/descriptor.c
+++ b/runtime/starpu/control/runtime_descriptor.c
@@ -10,7 +10,7 @@
/**
*
- * @file descriptor.c
+ * @file runtime_descriptor.c
*
* MORSE auxiliary routines
* MORSE is a software package provided by Univ. of Tennessee,
@@ -66,7 +66,7 @@ void RUNTIME_desc_create( MORSE_desc_t *desc )
* Register allocated memory as CUDA pinned memory
*/
{
- int64_t eltsze = morse_element_size(desc->dtyp);
+ int64_t eltsze = MORSE_Element_Size(desc->dtyp);
size_t size = (size_t)(desc->llm) * (size_t)(desc->lln) * eltsze;
/* Register the matrix as pinned memory */
@@ -156,7 +156,7 @@ void RUNTIME_desc_destroy( MORSE_desc_t *desc )
#if defined(CHAMELEON_USE_CUDA)
if (desc->use_mat == 1 && desc->register_mat == 1){
- int64_t eltsze = morse_element_size(desc->dtyp);
+ int64_t eltsze = MORSE_Element_Size(desc->dtyp);
size_t size = (size_t)(desc->llm) * (size_t)(desc->lln) * eltsze;
/* Unmap the pinned memory associated to the matrix */
@@ -263,7 +263,7 @@ void *RUNTIME_desc_getaddr( MORSE_desc_t *desc, int m, int n )
if (*ptrtile == NULL) {
int64_t block_ind = desc->lmt * n + m;
- int64_t eltsze = morse_element_size(desc->dtyp);
+ int64_t eltsze = MORSE_Element_Size(desc->dtyp);
int myrank = desc->myrank;
int owner = desc->get_rankof( desc, m, n );
int tempmm = (m == desc->lmt-1) ? (desc->lm - m * desc->mb) : desc->mb;
diff --git a/runtime/starpu/control/options.c b/runtime/starpu/control/runtime_options.c
similarity index 98%
rename from runtime/starpu/control/options.c
rename to runtime/starpu/control/runtime_options.c
index de121a513..902d49417 100644
--- a/runtime/starpu/control/options.c
+++ b/runtime/starpu/control/runtime_options.c
@@ -10,7 +10,7 @@
/**
*
- * @file options.c
+ * @file runtime_options.c
*
* MORSE auxiliary routines
* MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/control/profiling.c b/runtime/starpu/control/runtime_profiling.c
similarity index 99%
rename from runtime/starpu/control/profiling.c
rename to runtime/starpu/control/runtime_profiling.c
index f6666cfa6..4c7d2e1b3 100644
--- a/runtime/starpu/control/profiling.c
+++ b/runtime/starpu/control/runtime_profiling.c
@@ -10,7 +10,7 @@
/**
*
- * @file profiling.c
+ * @file runtime_profiling.c
*
* MORSE auxiliary routines
* MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/control/workspace.c b/runtime/starpu/control/runtime_workspace.c
similarity index 99%
rename from runtime/starpu/control/workspace.c
rename to runtime/starpu/control/runtime_workspace.c
index a67232cd0..af1e1231c 100644
--- a/runtime/starpu/control/workspace.c
+++ b/runtime/starpu/control/runtime_workspace.c
@@ -10,7 +10,7 @@
/**
*
- * @file workspace.c
+ * @file runtime_workspace.c
*
* MORSE codelets kernel
* MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/control/zlocality.c b/runtime/starpu/control/runtime_zlocality.c
similarity index 98%
rename from runtime/starpu/control/zlocality.c
rename to runtime/starpu/control/runtime_zlocality.c
index 4ece91efe..a83ddceb5 100644
--- a/runtime/starpu/control/zlocality.c
+++ b/runtime/starpu/control/runtime_zlocality.c
@@ -10,7 +10,7 @@
/**
*
- * @file zlocality.c
+ * @file runtime_zlocality.c
*
* MORSE codelets kernel
* MORSE is a software package provided by Univ. of Tennessee,
@@ -26,7 +26,7 @@
*
**/
#include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
#ifdef CHAMELEON_USE_CUDA
/* Only codelets with multiple choices are present here */
diff --git a/runtime/starpu/control/zprofiling.c b/runtime/starpu/control/runtime_zprofiling.c
similarity index 99%
rename from runtime/starpu/control/zprofiling.c
rename to runtime/starpu/control/runtime_zprofiling.c
index 8f82e052f..98476046c 100644
--- a/runtime/starpu/control/zprofiling.c
+++ b/runtime/starpu/control/runtime_zprofiling.c
@@ -10,7 +10,7 @@
/**
*
- * @file zprofiling.c
+ * @file runtime_zprofiling.c
*
* MORSE codelets kernel
* MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/include/morse_starpu.h b/runtime/starpu/include/morse_starpu.h
index 277ef6ae5..501f022ab 100644
--- a/runtime/starpu/include/morse_starpu.h
+++ b/runtime/starpu/include/morse_starpu.h
@@ -46,10 +46,10 @@
#endif
#include "control/common.h"
-#include "codelets.h"
-#include "profiling.h"
-#include "codelet_profile.h"
-#include "workspace.h"
+#include "runtime/starpu/include/runtime_codelets.h"
+#include "runtime/starpu/include/runtime_profiling.h"
+#include "runtime/starpu/include/runtime_codelet_profile.h"
+#include "runtime/starpu/include/runtime_workspace.h"
typedef struct starpu_conf starpu_conf_t;
diff --git a/runtime/starpu/include/codelet_profile.h b/runtime/starpu/include/runtime_codelet_profile.h
similarity index 99%
rename from runtime/starpu/include/codelet_profile.h
rename to runtime/starpu/include/runtime_codelet_profile.h
index de61f471c..99303041a 100644
--- a/runtime/starpu/include/codelet_profile.h
+++ b/runtime/starpu/include/runtime_codelet_profile.h
@@ -10,7 +10,7 @@
/**
*
- * @file codelet_profile.h
+ * @file runtime_codelet_profile.h
*
* MORSE codelets kernel
* MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/include/codelet_z.h b/runtime/starpu/include/runtime_codelet_z.h
similarity index 96%
rename from runtime/starpu/include/codelet_z.h
rename to runtime/starpu/include/runtime_codelet_z.h
index d2ea96654..3d93bc46c 100644
--- a/runtime/starpu/include/codelet_z.h
+++ b/runtime/starpu/include/runtime_codelet_z.h
@@ -10,7 +10,7 @@
/**
*
- * @file codelet_z.h
+ * @file runtime_codelet_z.h
*
* MORSE codelets kernel
* MORSE is a software package provided by Univ. of Tennessee,
@@ -30,7 +30,7 @@
#define _CODELETS_Z_H_
#include <stdio.h>
-#include "runtime/starpu/include/codelets.h"
+#include "runtime/starpu/include/runtime_codelets.h"
/*
* Management functions
diff --git a/runtime/starpu/include/codelets.h b/runtime/starpu/include/runtime_codelets.h
similarity index 98%
rename from runtime/starpu/include/codelets.h
rename to runtime/starpu/include/runtime_codelets.h
index c8862e909..f6c329e94 100644
--- a/runtime/starpu/include/codelets.h
+++ b/runtime/starpu/include/runtime_codelets.h
@@ -10,7 +10,7 @@
/**
*
- * @file codelets.h
+ * @file runtime_codelets.h
*
* MORSE codelets kernel
* MORSE is a software package provided by Univ. of Tennessee,
@@ -28,7 +28,7 @@
#ifndef _CODELETS_H_
#define _CODELETS_H_
-#include "codelet_profile.h"
+#include "runtime_codelet_profile.h"
//#undef STARPU_CUDA_ASYNC
#ifdef STARPU_CUDA_ASYNC
diff --git a/runtime/starpu/include/profiling.h b/runtime/starpu/include/runtime_profiling.h
similarity index 97%
rename from runtime/starpu/include/profiling.h
rename to runtime/starpu/include/runtime_profiling.h
index c0fda76e2..4e712053d 100644
--- a/runtime/starpu/include/profiling.h
+++ b/runtime/starpu/include/runtime_profiling.h
@@ -10,7 +10,7 @@
/**
*
- * @file progiling.h
+ * @file runtime_progiling.h
*
* MORSE codelets kernel
* MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/include/workspace.h b/runtime/starpu/include/runtime_workspace.h
similarity index 98%
rename from runtime/starpu/include/workspace.h
rename to runtime/starpu/include/runtime_workspace.h
index 37bf993bc..e1bd1859d 100644
--- a/runtime/starpu/include/workspace.h
+++ b/runtime/starpu/include/runtime_workspace.h
@@ -10,7 +10,7 @@
/**
*
- * @file workspace.h
+ * @file runtime_workspace.h
*
* MORSE codelets kernel
* MORSE is a software package provided by Univ. of Tennessee,
--
GitLab