Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Chameleon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
solverstack
Chameleon
Commits
d443b96f
Commit
d443b96f
authored
8 years ago
by
PRUVOST Florent
Browse files
Options
Downloads
Patches
Plain Diff
normalize spaces when calling the set cmake macro
parent
4ab7cc5c
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+18
-18
18 additions, 18 deletions
CMakeLists.txt
runtime/parsec/CMakeLists.txt
+1
-1
1 addition, 1 deletion
runtime/parsec/CMakeLists.txt
runtime/starpu/CMakeLists.txt
+1
-1
1 addition, 1 deletion
runtime/starpu/CMakeLists.txt
with
20 additions
and
20 deletions
CMakeLists.txt
+
18
−
18
View file @
d443b96f
...
...
@@ -414,7 +414,7 @@ if(NOT CHAMELEON_SIMULATION)
message
(
"--
${
Blue
}
Add definition CHAMELEON_USE_CUDA"
" - Activate CUDA in Chameleon
${
ColourReset
}
"
)
set
(
EXTRA_LIBRARIES_CUDA
)
set
(
CHAMELEON_USE_CUDA 1
)
set
(
CHAMELEON_USE_CUDA 1
)
if
(
CUDA_VERSION VERSION_LESS
"3.0"
)
set
(
CUDA_HOST_COMPILATION_CPP OFF
)
endif
(
CUDA_VERSION VERSION_LESS
"3.0"
)
...
...
@@ -458,7 +458,7 @@ if(NOT CHAMELEON_SIMULATION)
endif
()
#FindHeader(CUDA cublas_v2.h)
#if(CUDA_cublas_v2.h_DIRS)
#set
(CHAMELEON_USE_CUBLAS_V2 1)
#set(CHAMELEON_USE_CUBLAS_V2 1)
#endif()
endif
(
CUDA_FOUND
)
...
...
@@ -472,7 +472,7 @@ if(NOT CHAMELEON_SIMULATION)
if
(
MAGMA_FOUND
)
message
(
"--
${
Blue
}
Add definition CHAMELEON_USE_MAGMA"
" - Use GPU kernels from MAGMA
${
ColourReset
}
"
)
set
(
CHAMELEON_USE_MAGMA 1
)
set
(
CHAMELEON_USE_MAGMA 1
)
if
(
MAGMA_INCLUDE_DIRS
)
include_directories
(
${
MAGMA_INCLUDE_DIRS
}
)
endif
()
...
...
@@ -518,7 +518,7 @@ if(NOT CHAMELEON_SIMULATION)
if
(
MPI_C_FOUND
)
message
(
"--
${
Blue
}
Add definition CHAMELEON_USE_MPI"
" - Activate MPI in Chameleon
${
ColourReset
}
"
)
set
(
CHAMELEON_USE_MPI 1
)
set
(
CHAMELEON_USE_MPI 1
)
list
(
APPEND EXTRA_LIBRARIES
${
MPI_C_LIBRARIES
}
)
include_directories
(
${
MPI_C_INCLUDE_PATH
}
)
# tests for intel mpi
...
...
@@ -545,7 +545,7 @@ else (NOT CHAMELEON_SIMULATION)
message
(
"--
${
Blue
}
Add definition CHAMELEON_SIMULATION"
" - Activate simulation mode in Chameleon (to use with StarPU+SimGrid)
${
ColourReset
}
"
)
set
(
CHAMELEON_SIMULATION 1
)
set
(
CHAMELEON_SIMULATION 1
)
add_subdirectory
(
simucore
)
...
...
@@ -570,10 +570,10 @@ else (NOT CHAMELEON_SIMULATION)
# Add CUDA definition if required
if
(
CHAMELEON_USE_CUDA
)
set
(
CHAMELEON_USE_CUDA 1
)
set
(
CHAMELEON_USE_CUDA 1
)
# Add MAGMA definition if required
if
(
CHAMELEON_USE_MAGMA
)
set
(
CHAMELEON_USE_MAGMA 1
)
set
(
CHAMELEON_USE_MAGMA 1
)
endif
()
endif
()
...
...
@@ -639,7 +639,7 @@ else (NOT CHAMELEON_SIMULATION)
if
(
MPI_C_FOUND
)
message
(
"--
${
Blue
}
Add definition CHAMELEON_USE_MPI"
" - Activate MPI in Chameleon
${
ColourReset
}
"
)
set
(
CHAMELEON_USE_MPI 1
)
set
(
CHAMELEON_USE_MPI 1
)
list
(
APPEND EXTRA_LIBRARIES
${
MPI_C_LIBRARIES
}
)
include_directories
(
${
MPI_C_INCLUDE_PATH
}
)
if
(
MPI_C_LINK_FLAGS
)
...
...
@@ -682,7 +682,7 @@ if( CHAMELEON_SCHED_STARPU )
if
(
STARPU_FOUND
)
message
(
"--
${
Blue
}
Add definition CHAMELEON_SCHED_STARPU"
" - Activate StarPU in Chameleon
${
ColourReset
}
"
)
set
(
CHAMELEON_SCHED_STARPU 1
)
set
(
CHAMELEON_SCHED_STARPU 1
)
include_directories
(
${
STARPU_INCLUDE_DIRS_DEP
}
)
if
(
STARPU_LINKER_FLAGS
)
list
(
APPEND CMAKE_EXE_LINKER_FLAGS
"
${
STARPU_LINKER_FLAGS
}
"
)
...
...
@@ -703,17 +703,17 @@ if( CHAMELEON_SCHED_STARPU )
string
(
REPLACE
";"
" "
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
"
)
check_function_exists
(
starpu_data_idle_prefetch_on_node STARPU_IDLE_PREFETCH_FOUND
)
if
(
STARPU_IDLE_PREFETCH_FOUND
)
set
(
CHAMELEON_USE_STARPU_IDLE_PREFETCH 1
)
set
(
CHAMELEON_USE_STARPU_IDLE_PREFETCH 1
)
message
(
"--
${
Blue
}
Add definition CHAMELEON_USE_STARPU_IDLE_PREFETCH
${
ColourReset
}
"
)
endif
()
check_function_exists
(
starpu_data_wont_use STARPU_DATA_WONT_USE_FOUND
)
if
(
STARPU_DATA_WONT_USE_FOUND
)
set
(
CHAMELEON_USE_STARPU_DATA_WONT_USE 1
)
set
(
CHAMELEON_USE_STARPU_DATA_WONT_USE 1
)
message
(
"--
${
Blue
}
Add definition CHAMELEON_USE_STARPU_DATA_WONT_USE
${
ColourReset
}
"
)
endif
()
check_function_exists
(
starpu_malloc_on_node_set_default_flags STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS
)
if
(
STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS
)
set
(
CHAMELEON_USE_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS 1
)
set
(
CHAMELEON_USE_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS 1
)
message
(
"--
${
Blue
}
Add definition CHAMELEON_USE_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS
${
ColourReset
}
"
)
endif
()
if
(
CHAMELEON_ENABLE_TRACING
)
...
...
@@ -723,7 +723,7 @@ if( CHAMELEON_SCHED_STARPU )
if
(
STARPU_FXT_START_PROFILING_FOUND
)
message
(
"--
${
Blue
}
Add definition HAVE_STARPU_FXT_PROFILING"
" - Activate FxT profiling through StarPU
${
ColourReset
}
"
)
set
(
HAVE_STARPU_FXT_PROFILING 1
)
set
(
HAVE_STARPU_FXT_PROFILING 1
)
else
()
message
(
"--
${
Red
}
Looking for starpu with fxt"
" - starpu_fxt_start_profiling() test fails in StarPU
${
ColourReset
}
"
)
...
...
@@ -737,7 +737,7 @@ if( CHAMELEON_SCHED_STARPU )
if
(
STARPU_MPI_DATA_REGISTER_FOUND
)
message
(
"--
${
Blue
}
Add definition HAVE_STARPU_MPI_DATA_REGISTER - Activate"
" use of starpu_mpi_data_register() in Chameleon with StarPU
${
ColourReset
}
"
)
set
(
HAVE_STARPU_MPI_DATA_REGISTER 1
)
set
(
HAVE_STARPU_MPI_DATA_REGISTER 1
)
else
()
message
(
"--
${
Red
}
Looking for starpu with starpu_mpi_data_register"
" - starpu_mpi_data_register() test fails in StarPU
${
ColourReset
}
"
)
...
...
@@ -748,7 +748,7 @@ if( CHAMELEON_SCHED_STARPU )
if
(
STARPU_MPI_COMM_RANK_FOUND
)
message
(
"--
${
Blue
}
Add definition HAVE_STARPU_MPI_COMM_RANK - Activate"
" use of starpu_mpi_comm_rank() in Chameleon with StarPU
${
ColourReset
}
"
)
set
(
HAVE_STARPU_MPI_COMM_RANK 1
)
set
(
HAVE_STARPU_MPI_COMM_RANK 1
)
else
()
message
(
"--
${
Red
}
Looking for starpu with starpu_mpi_comm_rank"
" - starpu_mpi_comm_rank() test fails in StarPU
${
ColourReset
}
"
)
...
...
@@ -864,7 +864,7 @@ if( CHAMELEON_SCHED_PARSEC )
message
(
"--
${
Blue
}
Add definition CHAMELEON_SCHED_PARSEC"
" - Activate PaRSEC in Chameleon
${
ColourReset
}
"
)
set
(
CHAMELEON_SCHED_PARSEC 1
)
set
(
CHAMELEON_SCHED_PARSEC 1
)
include_directories
(
${
PARSEC_INCLUDE_DIRS_DEP
}
)
include_directories
(
${
PARSEC_INCLUDE_DIRS
}
/daguepp
)
set
(
CMAKE_REQUIRED_INCLUDES
"
${
PARSEC_INCLUDE_DIRS_DEP
}
"
)
...
...
@@ -940,7 +940,7 @@ if( CHAMELEON_SCHED_QUARK )
if
(
QUARK_FOUND
)
message
(
"--
${
Blue
}
Add definition CHAMELEON_SCHED_QUARK"
" - Activate QUARK in Chameleon
${
ColourReset
}
"
)
set
(
CHAMELEON_SCHED_QUARK 1
)
set
(
CHAMELEON_SCHED_QUARK 1
)
include_directories
(
${
QUARK_INCLUDE_DIRS
}
)
if
(
QUARK_LIBRARY_DIRS
)
# the RPATH to be used when installing
...
...
@@ -992,7 +992,7 @@ endif()
# ------------------------------------------------------------------
message
(
"--
${
Blue
}
Add definition ADD_"
" - For Fortran mangling
${
ColourReset
}
"
)
set
(
ADD_ 1
)
set
(
ADD_ 1
)
#------------------------------------------------------------------------------
if
(
CHAMELEON_SCHED_STARPU
)
...
...
This diff is collapsed.
Click to expand it.
runtime/parsec/CMakeLists.txt
+
1
−
1
View file @
d443b96f
...
...
@@ -36,7 +36,7 @@ if ( CBLAS_FOUND AND LAPACKE_FOUND AND LAPACK_FOUND AND CUDA_FOUND AND CUDA_CUBL
check_function_exists
(
magma_dgetrf_incpiv_gpu MAGMA_DGETRF_INCPIV_GPU_FOUND
)
if
(
MAGMA_DGETRF_INCPIV_GPU_FOUND
)
message
(
STATUS
"Set HAVE_MAGMA_GETRF_INCPIV_GPU"
)
set
(
HAVE_MAGMA_GETRF_INCPIV_GPU 1
)
set
(
HAVE_MAGMA_GETRF_INCPIV_GPU 1
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
runtime/starpu/CMakeLists.txt
+
1
−
1
View file @
d443b96f
...
...
@@ -36,7 +36,7 @@ if ( CBLAS_FOUND AND LAPACKE_FOUND AND LAPACK_FOUND AND CUDA_FOUND AND CUDA_CUBL
check_function_exists
(
magma_dgetrf_incpiv_gpu MAGMA_DGETRF_INCPIV_GPU_FOUND
)
if
(
MAGMA_DGETRF_INCPIV_GPU_FOUND
)
message
(
STATUS
"Set HAVE_MAGMA_GETRF_INCPIV_GPU"
)
set
(
HAVE_MAGMA_GETRF_INCPIV_GPU 1
)
set
(
HAVE_MAGMA_GETRF_INCPIV_GPU 1
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment