Commit 004c8548 authored by PRUVOST Florent's avatar PRUVOST Florent
Browse files

change the way we include our own header files --> relative to the root - when...

change the way we include our own header files --> relative to the root - when plasma is in the same env, chameleon can take some headers not belonging to it (ex: #include descriptor.h, this file states in plasma install dir also) which make compilation errors
parent c9999f43
...@@ -744,20 +744,16 @@ list(REMOVE_DUPLICATES CHAMELEON_DEP) ...@@ -744,20 +744,16 @@ list(REMOVE_DUPLICATES CHAMELEON_DEP)
# include headers # include headers
# --------------- # ---------------
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/coreblas/include)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/coreblas/include)
############################################################################### ###############################################################################
# simucore libraries # # simucore libraries #
###################### ######################
if ( CHAMELEON_SIMULATION ) if ( CHAMELEON_SIMULATION )
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/simucore/simucblas)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/simucore/simucblas)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/simucore/simulapacke)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/simucore/simulapacke)
add_subdirectory(simucore) add_subdirectory(simucore)
message("-- ${Blue}Add definition CHAMELEON_SIMULATION" message("-- ${Blue}Add definition CHAMELEON_SIMULATION"
" - Activate simulation mode in Chameleon (to use with StarPU+SimGrid)${ColourReset}") " - Activate simulation mode in Chameleon (to use with StarPU+SimGrid)${ColourReset}")
...@@ -778,8 +774,6 @@ add_subdirectory(coreblas) ...@@ -778,8 +774,6 @@ add_subdirectory(coreblas)
# Main library # # Main library #
################ ################
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/control)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/control)
add_subdirectory(include) add_subdirectory(include)
add_subdirectory(control) add_subdirectory(control)
add_subdirectory(compute) add_subdirectory(compute)
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* @precisions normal z -> s d c * @precisions normal z -> s d c
* *
**/ **/
#include "common.h" #include "control/common.h"
#define A(m,n) A, m, n #define A(m,n) A, m, n
#define B(m,n) B, m, n #define B(m,n) B, m, n
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* @precisions normal z -> s d c * @precisions normal z -> s d c
* *
**/ **/
#include "common.h" #include "control/common.h"
#define A(m,n) A, m, n #define A(m,n) A, m, n
#define T(m,n) T, m, n #define T(m,n) T, m, n
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
**/ **/
//ALLOC_WS : A->nb + ib*T->nb //ALLOC_WS : A->nb + ib*T->nb
//WS_ADD : A->nb + ib*T->nb //WS_ADD : A->nb + ib*T->nb
#include "common.h" #include "control/common.h"
#define A(m,n) A, (m), (n) #define A(m,n) A, (m), (n)
#define T(m,n) T, (m), (n) #define T(m,n) T, (m), (n)
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* @precisions normal z -> s d c * @precisions normal z -> s d c
* *
**/ **/
#include "common.h" #include "control/common.h"
#define A(m, n) A, m, n #define A(m, n) A, m, n
#define B(m, n) B, m, n #define B(m, n) B, m, n
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* @precisions normal z -> s d c * @precisions normal z -> s d c
* *
**/ **/
#include "common.h" #include "control/common.h"
#define A(m,n) A, m, n #define A(m,n) A, m, n
#define T(m,n) T, m, n #define T(m,n) T, m, n
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* @precisions normal z -> s d c * @precisions normal z -> s d c
* *
**/ **/
#include "common.h" #include "control/common.h"
#define A(m,n) A, (m), (n) #define A(m,n) A, (m), (n)
#define T(m,n) T, (m), (n) #define T(m,n) T, (m), (n)
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
**/ **/
//ALLOC_WS : ib*L->nb //ALLOC_WS : ib*L->nb
//WS_ADD : ib*L->nb //WS_ADD : ib*L->nb
#include "common.h" #include "control/common.h"
#define A(_m_,_n_) A, _m_, _n_ #define A(_m_,_n_) A, _m_, _n_
#if defined(CHAMELEON_COPY_DIAG) #if defined(CHAMELEON_COPY_DIAG)
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* @precisions normal z -> s d c * @precisions normal z -> s d c
* *
**/ **/
#include "common.h" #include "control/common.h"
#define A(m,n) A, m, n #define A(m,n) A, m, n
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* @precisions normal z -> c * @precisions normal z -> c
* *
**/ **/
#include "common.h" #include "control/common.h"
#define A(m,n) A, m, n #define A(m,n) A, m, n
#define B(m,n) B, m, n #define B(m,n) B, m, n
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* @precisions normal z -> c * @precisions normal z -> c
* *
**/ **/
#include "common.h" #include "control/common.h"
#define A(m,n) A, m, n #define A(m,n) A, m, n
#define B(m,n) B, m, n #define B(m,n) B, m, n
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* @precisions normal z -> c * @precisions normal z -> c
* *
**/ **/
#include "common.h" #include "control/common.h"
#define A(m,n) A, m, n #define A(m,n) A, m, n
#define C(m,n) C, m, n #define C(m,n) C, m, n
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* @precisions normal z -> s d c * @precisions normal z -> s d c
* *
**/ **/
#include "common.h" #include "control/common.h"
#define A(m,n) A, m, n #define A(m,n) A, m, n
#define B(m,n) B, m, n #define B(m,n) B, m, n
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* @precisions mixed zc -> ds * @precisions mixed zc -> ds
* *
**/ **/
#include "common.h" #include "control/common.h"
#define A(m,n) A, m, n #define A(m,n) A, m, n
#define B(m,n) B, m, n #define B(m,n) B, m, n
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
//ALLOC_WS : A->mb //ALLOC_WS : A->mb
//ALLOC_WS : A->nb //ALLOC_WS : A->nb
//WS_ADD : A->mb + A->nb //WS_ADD : A->mb + A->nb
#include "common.h" #include "control/common.h"
#define A(m, n) A, m, n #define A(m, n) A, m, n
#define VECNORMS_STEP1(m, n) VECNORMS_STEP1, m, n #define VECNORMS_STEP1(m, n) VECNORMS_STEP1, m, n
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
//#include <stdlib.h> //#include <stdlib.h>
//#include <math.h> //#include <math.h>
//WS_ADD : A->mb //WS_ADD : A->mb
#include "common.h" #include "control/common.h"
#define A(m, n) A, m, n #define A(m, n) A, m, n
#define VECNORMS_STEP1(m, n) VECNORMS_STEP1, m, n #define VECNORMS_STEP1(m, n) VECNORMS_STEP1, m, n
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
//WS_ADD : A->mb //WS_ADD : A->mb
#include "common.h" #include "control/common.h"
#define A(m, n) A, m, n #define A(m, n) A, m, n
#define VECNORMS_STEP1(m, n) VECNORMS_STEP1, m, n #define VECNORMS_STEP1(m, n) VECNORMS_STEP1, m, n
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
**/ **/
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include "common.h" #include "control/common.h"
#define A(m, n) A, m, n #define A(m, n) A, m, n
#define VECNORMS_STEP1(m, n) VECNORMS_STEP1, m, n #define VECNORMS_STEP1(m, n) VECNORMS_STEP1, m, n
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* @precisions normal z -> s d c * @precisions normal z -> s d c
* *
**/ **/
#include "common.h" #include "control/common.h"
#define A(m,n) A, m, n #define A(m,n) A, m, n
/***************************************************************************//** /***************************************************************************//**
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* @precisions normal z -> s d c * @precisions normal z -> s d c
* *
**/ **/
#include "common.h" #include "control/common.h"
#define A(m,n) A, m, n #define A(m,n) A, m, n
/***************************************************************************//** /***************************************************************************//**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment