Commit b7a71b38 authored by Mathieu Faverge's avatar Mathieu Faverge

Remove the coreblas_include dependency in compute directory

parent da0c7350
...@@ -303,12 +303,8 @@ list(INSERT CHAMELEON_DEP 0 -lchameleon) ...@@ -303,12 +303,8 @@ list(INSERT CHAMELEON_DEP 0 -lchameleon)
add_dependencies(chameleon add_dependencies(chameleon
chameleon_include chameleon_include
coreblas_include
control_include control_include
) )
if (NOT CHAMELEON_SIMULATION)
add_dependencies(chameleon coreblas_include)
endif()
set_property(TARGET chameleon PROPERTY LINKER_LANGUAGE Fortran) set_property(TARGET chameleon PROPERTY LINKER_LANGUAGE Fortran)
set_property(TARGET chameleon PROPERTY Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/include") set_property(TARGET chameleon PROPERTY Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/include")
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* @precisions normal z -> s d c * @precisions normal z -> s d c
* *
**/ **/
#include <stdio.h>
#include <string.h>
#include <coreblas/lapacke.h> #include <coreblas/lapacke.h>
#include "control/common.h" #include "control/common.h"
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
* @precisions normal z -> s d c * @precisions normal z -> s d c
* *
**/ **/
#include <string.h>
#include <coreblas/lapacke.h> #include <coreblas/lapacke.h>
#include "control/common.h" #include "control/common.h"
......
...@@ -74,11 +74,6 @@ ...@@ -74,11 +74,6 @@
**/ **/
#include "morse.h" #include "morse.h"
#include "coreblas.h"
#if defined(CHAMELEON_USE_CUDA) && !defined(CHAMELEON_SIMULATION)
#include "cudablas.h"
#endif
#include "control/global.h" #include "control/global.h"
#include "control/auxiliary.h" #include "control/auxiliary.h"
#include "control/context.h" #include "control/context.h"
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
* @brief Group descriptor routines exposed to users * @brief Group descriptor routines exposed to users
* *
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <string.h>
#include "control/common.h" #include "control/common.h"
#include "control/descriptor.h" #include "control/descriptor.h"
#include "chameleon/morse_runtime.h" #include "chameleon/morse_runtime.h"
......
...@@ -44,8 +44,8 @@ set(RUNTIME_HDRS_GENERATED "") ...@@ -44,8 +44,8 @@ set(RUNTIME_HDRS_GENERATED "")
# Define the list of headers # Define the list of headers
# -------------------------- # --------------------------
set(RUNTIME_HDRS set(RUNTIME_HDRS
include/chameleon_parsec.h include/chameleon_parsec.h
) )
# Add generated headers # Add generated headers
# --------------------- # ---------------------
...@@ -111,10 +111,16 @@ add_library(chameleon_parsec ${RUNTIME_SRCS}) ...@@ -111,10 +111,16 @@ add_library(chameleon_parsec ${RUNTIME_SRCS})
set_property(TARGET chameleon_parsec PROPERTY LINKER_LANGUAGE Fortran) set_property(TARGET chameleon_parsec PROPERTY LINKER_LANGUAGE Fortran)
set_property(TARGET chameleon_parsec PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") set_property(TARGET chameleon_parsec PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
target_link_libraries(chameleon_parsec coreblas ${PARSEC_LIBRARIES_DEP}) target_link_libraries(chameleon_parsec
if(CHAMELEON_USE_CUDA) ${PARSEC_LIBRARIES_DEP})
target_link_libraries(chameleon_parsec cudablas) if (NOT CHAMELEON_SIMULATION)
endif(CHAMELEON_USE_CUDA) target_link_libraries(chameleon_parsec
coreblas)
if(CHAMELEON_USE_CUDA)
target_link_libraries(chameleon_parsec
cudablas)
endif(CHAMELEON_USE_CUDA)
endif(NOT CHAMELEON_SIMULATION)
add_dependencies(chameleon_parsec add_dependencies(chameleon_parsec
chameleon_include chameleon_include
...@@ -123,14 +129,18 @@ add_dependencies(chameleon_parsec ...@@ -123,14 +129,18 @@ add_dependencies(chameleon_parsec
runtime_parsec_include runtime_parsec_include
) )
if (CHAMELEON_USE_CUDA AND NOT CHAMELEON_SIMULATION) if (NOT CHAMELEON_SIMULATION)
add_dependencies(chameleon_parsec coreblas_include)
if (CHAMELEON_USE_CUDA)
add_dependencies(chameleon_parsec cudablas_include) add_dependencies(chameleon_parsec cudablas_include)
endif()
endif() endif()
# installation # installation
# ------------ # ------------
install(TARGETS chameleon_parsec install(TARGETS chameleon_parsec
DESTINATION lib) ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib)
### ###
### END CMakeLists.txt ### END CMakeLists.txt
......
...@@ -75,7 +75,7 @@ install( ...@@ -75,7 +75,7 @@ install(
DESTINATION include/runtime/starpu ) DESTINATION include/runtime/starpu )
# Generate the Chameleon common for all possible precisions # Generate the Chameleon common for all possible precisions
# ----------------------------------------------------- # ---------------------------------------------------------
set(RUNTIME_COMMON_GENERATED "") set(RUNTIME_COMMON_GENERATED "")
set(ZSRC set(ZSRC
control/runtime_zprofiling.c control/runtime_zprofiling.c
...@@ -106,7 +106,7 @@ endforeach() ...@@ -106,7 +106,7 @@ endforeach()
set_source_files_properties(control/runtime_profiling.c PROPERTIES COMPILE_FLAGS "${flags_to_add}") set_source_files_properties(control/runtime_profiling.c PROPERTIES COMPILE_FLAGS "${flags_to_add}")
# Generate the Chameleon sources for all possible precisions # Generate the Chameleon sources for all possible precisions
# ------------------------------------------------------ # ----------------------------------------------------------
set(RUNTIME_SRCS_GENERATED "") set(RUNTIME_SRCS_GENERATED "")
set(ZSRC set(ZSRC
codelets/codelet_zcallback.c codelets/codelet_zcallback.c
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_dzasum(const MORSE_option_t *options, void MORSE_TASK_dzasum(const MORSE_option_t *options,
MORSE_enum storev, MORSE_enum uplo, int M, int N, MORSE_enum storev, MORSE_enum uplo, int M, int N,
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zaxpy(const MORSE_option_t *options, void MORSE_TASK_zaxpy(const MORSE_option_t *options,
int M, MORSE_Complex64_t alpha, int M, MORSE_Complex64_t alpha,
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zbuild( const MORSE_option_t *options, void MORSE_TASK_zbuild( const MORSE_option_t *options,
const MORSE_desc_t *A, int Am, int An, int lda, const MORSE_desc_t *A, int Am, int An, int lda,
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
****************************************************************************** ******************************************************************************
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zgessq( const MORSE_option_t *options, void MORSE_TASK_zgessq( const MORSE_option_t *options,
int m, int n, int m, int n,
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zgetrf(const MORSE_option_t *options, void MORSE_TASK_zgetrf(const MORSE_option_t *options,
int m, int n, int nb, int m, int n, int nb,
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zhessq( const MORSE_option_t *options, void MORSE_TASK_zhessq( const MORSE_option_t *options,
MORSE_enum uplo, int n, MORSE_enum uplo, int n,
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zlange(const MORSE_option_t *options, void MORSE_TASK_zlange(const MORSE_option_t *options,
MORSE_enum norm, int M, int N, int NB, MORSE_enum norm, int M, int N, int NB,
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zlanhe(const MORSE_option_t *options, void MORSE_TASK_zlanhe(const 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,6 @@ ...@@ -28,7 +28,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zlansy(const MORSE_option_t *options, void MORSE_TASK_zlansy(const MORSE_option_t *options,
MORSE_enum norm, MORSE_enum uplo, int N, int NB, MORSE_enum norm, MORSE_enum uplo, int N, int NB,
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
void MORSE_TASK_zlantr(const MORSE_option_t *options, void MORSE_TASK_zlantr(const MORSE_option_t *options,
MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag, MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag,
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/** /**
* *
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/* MORSE_TASK_zplghe - Generate a tile for random hermitian (positive definite if bump is large enough) matrix. */ /* MORSE_TASK_zplghe - Generate a tile for random hermitian (positive definite if bump is large enough) matrix. */
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/* MORSE_TASK_zplgsy - Generate a tile for random symmetric (positive definite if 'bump' is large enough) matrix. */ /* MORSE_TASK_zplgsy - Generate a tile for random symmetric (positive definite if 'bump' is large enough) matrix. */
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
**/ **/
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/* MORSE_TASK_zplrnt - Generate a tile for random matrix. */ /* MORSE_TASK_zplrnt - Generate a tile for random matrix. */
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <math.h> #include <math.h>
#include "chameleon_starpu.h" #include "chameleon_starpu.h"
#include "runtime_codelet_z.h" #include "runtime_codelet_z.h"
#include "chameleon/morse_tasks_z.h"
/***************************************************************************** /*****************************************************************************
* *
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@