Commit 7ca01e2b authored by PRUVOST Florent's avatar PRUVOST Florent

change file names to avoid confusion with files coming from chameleon/control

parent 5353c7c6
...@@ -39,11 +39,11 @@ if ( CBLAS_FOUND AND LAPACKE_FOUND AND LAPACK_FOUND AND CUDA_FOUND AND CUDA_CUBL ...@@ -39,11 +39,11 @@ if ( CBLAS_FOUND AND LAPACKE_FOUND AND LAPACK_FOUND AND CUDA_FOUND AND CUDA_CUBL
endif() endif()
endif() endif()
# Generate the magma headers for all possible precisions # Generate headers for all possible precisions
# ------------------------------------------------------ # --------------------------------------------
set(RUNTIME_HDRS_GENERATED "") set(RUNTIME_HDRS_GENERATED "")
set(ZHDR set(ZHDR
include/codelet_z.h include/runtime_codelet_z.h
) )
precisions_rules_py(RUNTIME_HDRS_GENERATED "${ZHDR}" precisions_rules_py(RUNTIME_HDRS_GENERATED "${ZHDR}"
...@@ -53,11 +53,11 @@ precisions_rules_py(RUNTIME_HDRS_GENERATED "${ZHDR}" ...@@ -53,11 +53,11 @@ precisions_rules_py(RUNTIME_HDRS_GENERATED "${ZHDR}"
# Define the list of headers # Define the list of headers
# -------------------------- # --------------------------
set(RUNTIME_HDRS set(RUNTIME_HDRS
include/codelet_profile.h
include/codelets.h
include/morse_starpu.h include/morse_starpu.h
include/profiling.h include/runtime_codelet_profile.h
include/workspace.h include/runtime_codelets.h
include/runtime_profiling.h
include/runtime_workspace.h
${RUNTIME_HDRS_GENERATED} ${RUNTIME_HDRS_GENERATED}
) )
...@@ -74,8 +74,8 @@ add_custom_target(runtime_starpu_include ALL SOURCES ${RUNTIME_HDRS}) ...@@ -74,8 +74,8 @@ add_custom_target(runtime_starpu_include ALL SOURCES ${RUNTIME_HDRS})
# ----------------------------------------------------- # -----------------------------------------------------
set(RUNTIME_COMMON_GENERATED "") set(RUNTIME_COMMON_GENERATED "")
set(ZSRC set(ZSRC
control/zprofiling.c control/runtime_zprofiling.c
control/zlocality.c control/runtime_zlocality.c
) )
precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}" precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}"
...@@ -83,13 +83,13 @@ precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}" ...@@ -83,13 +83,13 @@ precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}"
TARGETDIR "control") TARGETDIR "control")
set(RUNTIME_COMMON set(RUNTIME_COMMON
control/control.c control/runtime_control.c
control/context.c control/runtime_context.c
control/descriptor.c control/runtime_descriptor.c
control/async.c control/runtime_async.c
control/options.c control/runtime_options.c
control/profiling.c control/runtime_profiling.c
control/workspace.c control/runtime_workspace.c
codelets/codelet_dataflush.c codelets/codelet_dataflush.c
${RUNTIME_COMMON_GENERATED} ${RUNTIME_COMMON_GENERATED}
) )
...@@ -98,7 +98,7 @@ set(flags_to_add "") ...@@ -98,7 +98,7 @@ set(flags_to_add "")
foreach(_prec ${CHAMELEON_PRECISION}) foreach(_prec ${CHAMELEON_PRECISION})
set(flags_to_add "${flags_to_add} -DPRECISION_${_prec}") set(flags_to_add "${flags_to_add} -DPRECISION_${_prec}")
endforeach() 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 # Generate the morse sources for all possible precisions
# ------------------------------------------------------ # ------------------------------------------------------
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.h" #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" #include "runtime_z.h"
void MORSE_TASK_dzasum(MORSE_option_t *options, void MORSE_TASK_dzasum(MORSE_option_t *options,
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.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_zaxpy(MORSE_option_t *options, void MORSE_TASK_zaxpy(MORSE_option_t *options,
int M, MORSE_Complex64_t alpha, int M, MORSE_Complex64_t alpha,
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.h" #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(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); CHAMELEON_CL_CB(zaxpy, starpu_matrix_get_nx(task->handles[0]), starpu_matrix_get_nx(task->handles[1]), 0, M);
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
**/ **/
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
**/ **/
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "coreblas/include/cblas.h" #include "coreblas/include/cblas.h"
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.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_zgessq( MORSE_option_t *options, void MORSE_TASK_zgessq( MORSE_option_t *options,
int m, int n, int m, int n,
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
**/ **/
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.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, void MORSE_TASK_zgetrf(MORSE_option_t *options,
int m, int n, int nb, int m, int n, int nb,
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
**/ **/
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.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_zhessq( MORSE_option_t *options, void MORSE_TASK_zhessq( MORSE_option_t *options,
MORSE_enum uplo, int n, MORSE_enum uplo, int n,
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
**/ **/
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
**/ **/
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
**/ **/
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.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, void MORSE_TASK_zlange(MORSE_option_t *options,
MORSE_enum norm, int M, int N, int NB, MORSE_enum norm, int M, int N, int NB,
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
/** /**
* *
* @file codelet_zlange.c * @file codelet_zlanhe.c
* *
* MORSE codelets kernel * MORSE codelets kernel
* MORSE is a software package provided by Inria Bordeaux - Sud-Ouest, LaBRI, * MORSE is a software package provided by Inria Bordeaux - Sud-Ouest, LaBRI,
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.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_zlanhe(MORSE_option_t *options, void MORSE_TASK_zlanhe(MORSE_option_t *options,
MORSE_enum norm, MORSE_enum uplo, int N, int NB, MORSE_enum norm, MORSE_enum uplo, int N, int NB,
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
**/ **/
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.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, void MORSE_TASK_zlansy(MORSE_option_t *options,
MORSE_enum norm, MORSE_enum uplo, int N, int NB, MORSE_enum norm, MORSE_enum uplo, int N, int NB,
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.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_zlantr(MORSE_option_t *options, void MORSE_TASK_zlantr(MORSE_option_t *options,
MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag, MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag,
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
**/ **/
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
**/ **/
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
**/ **/
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "coreblas/include/cblas.h" #include "coreblas/include/cblas.h"
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.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_zplghe( MORSE_option_t *options, void MORSE_TASK_zplghe( MORSE_option_t *options,
double bump, int m, int n, MORSE_desc_t *A, int Am, int An, int lda, double bump, int m, int n, MORSE_desc_t *A, int Am, int An, int lda,
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
**/ **/
#include <math.h> #include <math.h>
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/***************************************************************************** /*****************************************************************************
* *
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
**/ **/
#include "coreblas/include/lapacke.h" #include "coreblas/include/lapacke.h"
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
**/ **/
#include "coreblas/include/cblas.h" #include "coreblas/include/cblas.h"
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"
/** /**
* *
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* *
**/ **/
#include "runtime/starpu/include/morse_starpu.h" #include "runtime/starpu/include/morse_starpu.h"
#include "runtime/starpu/include/codelet_z.h" #include "runtime/starpu/include/runtime_codelet_z.h"