Mentions légales du service

Skip to content
Snippets Groups Projects
Commit cf02f68e authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Cleanup extra dependencies and extra tests in cmakelists.txt files

parent 4a754cec
No related branches found
No related tags found
1 merge request!55Fix #42 - HQR header installation
Hide whitespace changes
Inline Side-by-side
example/lapack_to_morse/CMakeLists.txt
+ 37
− 80
View file @ cf02f68e
...@@ -39,96 +39,53 @@ set(LTM_SOURCES ...@@ -39,96 +39,53 @@ set(LTM_SOURCES
# ------------------------------------------ # ------------------------------------------
unset(libs_for_ltm) unset(libs_for_ltm)
list(APPEND libs_for_ltm list(APPEND libs_for_ltm
chameleon chameleon
coreblas
${LAPACKE_LIBRARIES}
) )
if(CHAMELEON_SCHED_STARPU)
list(APPEND libs_for_ltm
chameleon_starpu
${STARPU_LIBRARIES_DEP}
)
link_directories(${STARPU_LIBRARY_DIRS})
elseif(CHAMELEON_SCHED_PARSEC)
list(APPEND libs_for_ltm
chameleon_parsec
${PARSEC_LIBRARIES_DEP}
)
link_directories(${PARSEC_LIBRARY_DIRS_DEP})
elseif(CHAMELEON_SCHED_QUARK)
list(APPEND libs_for_ltm
chameleon_quark
${QUARK_LIBRARIES}
)
link_directories(${QUARK_LIBRARY_DIRS})
endif()
# specific compilation for step0 because we potentially want to use # specific compilation for step0 because we potentially want to use
# multithreaded BLAS and LAPACK libraries for this step # multithreaded BLAS and LAPACK libraries for this step
unset(libs_for_step0) unset(libs_for_step0)
list(APPEND libs_for_step0
if(NOT CHAMELEON_SIMULATION) ${libs_for_ltm}
${CBLAS_LIBRARIES}
if(CHAMELEON_USE_CUDA) )
list(APPEND libs_for_ltm
cudablas) if(LAPACK_PAR_LIBRARIES)
endif() list(APPEND libs_for_step0
if(CHAMELEON_USE_CUDA) ${LAPACK_PAR_LIBRARIES}
link_directories(${CUDA_LIBRARY_DIRS})
endif()
list(APPEND libs_for_step0 ${libs_for_ltm})
list(APPEND libs_for_ltm
coreblas
${LAPACKE_LIBRARIES}
${CBLAS_LIBRARIES}
${LAPACK_SEQ_LIBRARIES}
${BLAS_SEQ_LIBRARIES}
${EXTRA_LIBRARIES}
) )
if( BLA_VENDOR MATCHES "Intel10_64lp*" OR BLA_VENDOR MATCHES "ACML*")
if(BLAS_PAR_LIBRARIES)
set(CBLAS_LIBRARIES "${BLAS_PAR_LIBRARIES}")
endif()
if(LAPACK_PAR_LIBRARIES)
set(LAPACKE_LIBRARIES "${LAPACK_PAR_LIBRARIES}")
endif()
endif()
if (BLAS_PAR_LIBRARIES AND LAPACK_PAR_LIBRARIES)
list(APPEND libs_for_step0
coreblas
${LAPACKE_LIBRARIES}
${CBLAS_LIBRARIES}
${LAPACK_PAR_LIBRARIES}
${BLAS_PAR_LIBRARIES}
${EXTRA_LIBRARIES}
)
else()
list(APPEND libs_for_step0
coreblas
${LAPACKE_LIBRARIES}
${CBLAS_LIBRARIES}
${LAPACK_SEQ_LIBRARIES}
${BLAS_SEQ_LIBRARIES}
${EXTRA_LIBRARIES}
)
endif ()
link_directories(${LAPACKE_LIBRARY_DIRS})
link_directories(${LAPACK_LIBRARY_DIRS})
link_directories(${CBLAS_LIBRARY_DIRS})
link_directories(${BLAS_LIBRARY_DIRS})
else() else()
list(APPEND libs_for_step0
${LAPACK_SEQ_LIBRARIES}
)
endif()
list(APPEND libs_for_ltm ${EXTRA_LIBRARIES}) if(BLAS_PAR_LIBRARIES)
list(APPEND libs_for_step0 ${EXTRA_LIBRARIES}) list(APPEND libs_for_step0
${BLAS_PAR_LIBRARIES}
)
else()
list(APPEND libs_for_step0
${BLAS_SEQ_LIBRARIES}
)
endif() endif()
list(APPEND libs_for_step0
${EXTRA_LIBRARIES}
)
list(APPEND libs_for_ltm
${LAPACK_SEQ_LIBRARIES}
${BLAS_SEQ_LIBRARIES}
${EXTRA_LIBRARIES}
)
link_directories(${LAPACKE_LIBRARY_DIRS})
link_directories(${LAPACK_LIBRARY_DIRS})
link_directories(${CBLAS_LIBRARY_DIRS})
link_directories(${BLAS_LIBRARY_DIRS})
# message(STATUS "libs examples: ${libs_for_ltm}") # message(STATUS "libs examples: ${libs_for_ltm}")
foreach(_ltm ${LTM_SOURCES}) foreach(_ltm ${LTM_SOURCES})
......
example/out_of_core/CMakeLists.txt
+ 16
− 32
View file @ cf02f68e
...@@ -19,7 +19,13 @@ ...@@ -19,7 +19,13 @@
# @date 2016-08-23 # @date 2016-08-23
# #
### ###
if (NOT CHAMELEON_SCHED_STARPU)
message(ERROR "This directory should not be included if CHAMELEON_SCHED_STARPU is not enabled")
endif()
if(CHAMELEON_SIMULATION)
message(ERROR "This directory should not be included if CHAMELEON_SIMULATION is enabled")
endif()
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
...@@ -34,42 +40,20 @@ set(OOC_SOURCES ...@@ -34,42 +40,20 @@ set(OOC_SOURCES
unset(libs_for_ooc) unset(libs_for_ooc)
list(APPEND libs_for_ooc list(APPEND libs_for_ooc
chameleon chameleon
chameleon_starpu
${STARPU_LIBRARIES_DEP} ${STARPU_LIBRARIES_DEP}
) )
link_directories(${STARPU_LIBRARY_DIRS}) link_directories(${STARPU_LIBRARY_DIRS})
list(APPEND libs_for_ooc
if(NOT CHAMELEON_SIMULATION) ${LAPACKE_LIBRARIES}
${LAPACK_SEQ_LIBRARIES}
if(CHAMELEON_USE_CUDA) ${BLAS_SEQ_LIBRARIES}
list(APPEND libs_for_ooc ${EXTRA_LIBRARIES}
cudablas) )
endif()
if(CHAMELEON_USE_CUDA) link_directories(${LAPACKE_LIBRARY_DIRS})
link_directories(${CUDA_LIBRARY_DIRS}) link_directories(${LAPACK_LIBRARY_DIRS})
endif() link_directories(${BLAS_LIBRARY_DIRS})
list(APPEND libs_for_ooc
coreblas
${LAPACKE_LIBRARIES}
${CBLAS_LIBRARIES}
${LAPACK_SEQ_LIBRARIES}
${BLAS_SEQ_LIBRARIES}
${EXTRA_LIBRARIES}
)
link_directories(${LAPACKE_LIBRARY_DIRS})
link_directories(${LAPACK_LIBRARY_DIRS})
link_directories(${CBLAS_LIBRARY_DIRS})
link_directories(${BLAS_LIBRARY_DIRS})
else()
list(APPEND libs_for_ooc ${EXTRA_LIBRARIES})
endif()
# message(STATUS "libs examples: ${libs_for_ooc}") # message(STATUS "libs examples: ${libs_for_ooc}")
foreach(_ooc ${OOC_SOURCES}) foreach(_ooc ${OOC_SOURCES})
......
testing/CMakeLists.txt
+ 8
− 26
View file @ cf02f68e
...@@ -102,27 +102,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ...@@ -102,27 +102,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
# Define what libraries we have to link with # Define what libraries we have to link with
# ------------------------------------------ # ------------------------------------------
unset(libs_for_tests) unset(libs_for_tests)
list(APPEND libs_for_tests chameleon) list(APPEND libs_for_tests
chameleon
if(CHAMELEON_SCHED_STARPU) )
list(APPEND libs_for_tests
chameleon_starpu
${STARPU_LIBRARIES_DEP}
)
link_directories(${STARPU_LIBRARY_DIRS})
elseif(CHAMELEON_SCHED_PARSEC)
list(APPEND libs_for_tests
chameleon_parsec
${PARSEC_LIBRARIES_DEP}
)
link_directories(${PARSEC_LIBRARY_DIRS_DEP})
elseif(CHAMELEON_SCHED_QUARK)
list(APPEND libs_for_tests
chameleon_quark
${QUARK_LIBRARIES}
)
link_directories(${QUARK_LIBRARY_DIRS})
endif()
if(NOT CHAMELEON_SIMULATION) if(NOT CHAMELEON_SIMULATION)
...@@ -141,7 +123,6 @@ if(NOT CHAMELEON_SIMULATION) ...@@ -141,7 +123,6 @@ if(NOT CHAMELEON_SIMULATION)
${LAPACK_LIBRARIES} ${LAPACK_LIBRARIES}
${CBLAS_LIBRARIES} ${CBLAS_LIBRARIES}
${BLAS_LIBRARIES} ${BLAS_LIBRARIES}
${EXTRA_LIBRARIES}
) )
link_directories(${LAPACKE_LIBRARY_DIRS}) link_directories(${LAPACKE_LIBRARY_DIRS})
...@@ -150,12 +131,13 @@ if(NOT CHAMELEON_SIMULATION) ...@@ -150,12 +131,13 @@ if(NOT CHAMELEON_SIMULATION)
link_directories(${CBLAS_LIBRARY_DIRS}) link_directories(${CBLAS_LIBRARY_DIRS})
link_directories(${BLAS_LIBRARY_DIRS}) link_directories(${BLAS_LIBRARY_DIRS})
else()
list(APPEND libs_for_tests ${EXTRA_LIBRARIES})
endif() endif()
list(APPEND libs_for_tests
hqr
${EXTRA_LIBRARIES}
)
# message("LAPACKE_LIBRARY_DIRS: ${LAPACKE_LIBRARY_DIRS}") # message("LAPACKE_LIBRARY_DIRS: ${LAPACKE_LIBRARY_DIRS}")
# message("LAPACK_LIBRARY_DIRS: ${LAPACK_LIBRARY_DIRS}") # message("LAPACK_LIBRARY_DIRS: ${LAPACK_LIBRARY_DIRS}")
# message("CBLAS_LIBRARY_DIRS: ${CBLAS_LIBRARY_DIRS}") # message("CBLAS_LIBRARY_DIRS: ${CBLAS_LIBRARY_DIRS}")
......
testing/lin/CMakeLists.txt
+ 24
− 26
View file @ cf02f68e
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# Univ. of Tennessee, # Univ. of Tennessee,
# King Abdullah Univesity of Science and Technology # King Abdullah Univesity of Science and Technology
# Univ. of California Berkeley, # Univ. of California Berkeley,
# Univ. of Colorado Denver. # Univ. of Colorado Denver.
# #
# @version 0.9.0 # @version 0.9.0
# @author Cedric Castagnede # @author Cedric Castagnede
...@@ -44,7 +44,7 @@ set(SCLNTST slaord.f) ...@@ -44,7 +44,7 @@ set(SCLNTST slaord.f)
set(DZLNTST dlaord.f) set(DZLNTST dlaord.f)
set(SLINTST set(SLINTST
schkaa.f schkaa.f
schkge.f serrge.f sdrvge.f schkge.f serrge.f sdrvge.f
serrvx.f serrvx.f
...@@ -105,7 +105,7 @@ set(CLINTST ...@@ -105,7 +105,7 @@ set(CLINTST
cgeequ.f claqge.f cgeequ.f claqge.f
cpoequ.f claqsy.f cpocon.f clacn2.f clatrs.f csrscl.f cpoequ.f claqsy.f cpocon.f clacn2.f clatrs.f csrscl.f
clascl.f claset.f clatms.f clartg.f clatm1.f clarnd.f clarot.f clanhe.f claqhe.f clascl.f claset.f clatms.f clartg.f clatm1.f clarnd.f clarot.f clanhe.f claqhe.f
claror.f clagsy.f clagge.f claror.f clagsy.f clagge.f
claipd.f csbmv.f claipd.f csbmv.f
clauum.f ctrtri.f clauum.f ctrtri.f
clauu2.f ctrti2.f clauu2.f ctrti2.f
...@@ -129,7 +129,7 @@ set(ZLINTST ...@@ -129,7 +129,7 @@ set(ZLINTST
zgeequ.f zlaqge.f zgeequ.f zlaqge.f
zpoequ.f zlaqsy.f zpocon.f zlacn2.f zlatrs.f zdrscl.f zpoequ.f zlaqsy.f zpocon.f zlacn2.f zlatrs.f zdrscl.f
zlascl.f zlaset.f zlatms.f zlartg.f zlatm1.f zlarnd.f zlarot.f zlanhe.f zlaqhe.f zlascl.f zlaset.f zlatms.f zlartg.f zlatm1.f zlarnd.f zlarot.f zlanhe.f zlaqhe.f
zlaror.f zlagsy.f zlagge.f zlaror.f zlagsy.f zlagge.f
zlaipd.f zsbmv.f zlaipd.f zsbmv.f
zlauum.f ztrtri.f zlauum.f ztrtri.f
zlauu2.f ztrti2.f zlauu2.f ztrti2.f
...@@ -140,24 +140,22 @@ set(ZLINTST ...@@ -140,24 +140,22 @@ set(ZLINTST
# Define what libraries we have to link with # Define what libraries we have to link with
# ------------------------------------------ # ------------------------------------------
set(libs_for_tests "chameleon") set(libs_for_tests chameleon)
# TODO: Check for name of following libraries (it certainly changed between morse and new_chameleon) list(APPEND libs_for_tests
if(MORSE_SCHED_STARPU) ${LAPACKE_LIBRARIES}
list(APPEND libs_for_tests chameleon_starpu) ${TMG_LIBRARIES}
list(APPEND libs_for_tests ${STARPU_LIBRARIES_DEP}) ${CBLAS_LIBRARIES}
list(APPEND libs_for_tests coreblas) ${LAPACK_SEQ_LIBRARIES}
elseif(MORSE_SCHED_QUARK) ${BLAS_SEQ_LIBRARIES}
list(APPEND libs_for_tests chameleon_starpu) ${EXTRA_LIBRARIES}
list(APPEND libs_for_tests ${QUARK_LIBRARIES}) )
list(APPEND libs_for_tests coreblas)
endif() link_directories(${LAPACKE_LIBRARY_DIRS})
link_directories(${TMG_LIBRARY_DIRS})
foreach(_dep LAPACKE LAPACK CBLAS BLAS CUDA MPI DL) link_directories(${LAPACK_LIBRARY_DIRS})
if(HAVE_${_dep}) link_directories(${CBLAS_LIBRARY_DIRS})
list(APPEND libs_for_tests ${${_dep}_LIBRARY}) link_directories(${BLAS_LIBRARY_DIRS})
endif()
endforeach()
list(APPEND libs_for_tests ${CMAKE_Fortran_FLAGS}) list(APPEND libs_for_tests ${CMAKE_Fortran_FLAGS})
list(APPEND libs_for_tests ${CMAKE_Fortran_LDFLAGS}) list(APPEND libs_for_tests ${CMAKE_Fortran_LDFLAGS})
...@@ -165,28 +163,28 @@ list(APPEND libs_for_tests ${CMAKE_Fortran_LDFLAGS}) ...@@ -165,28 +163,28 @@ list(APPEND libs_for_tests ${CMAKE_Fortran_LDFLAGS})
# Define precisions to compile # Define precisions to compile
# ---------------------------- # ----------------------------
if(BUILD_SINGLE) if(CHAMELEON_PREC_S)
add_executable(morse_xlintsts ${ALINTST} ${SLINTST} ${SCLNTST}) add_executable(morse_xlintsts ${ALINTST} ${SLINTST} ${SCLNTST})
set_property(TARGET morse_xlintsts PROPERTY LINKER_LANGUAGE Fortran) set_property(TARGET morse_xlintsts PROPERTY LINKER_LANGUAGE Fortran)
target_link_libraries(morse_xlintsts ${libs_for_tests}) target_link_libraries(morse_xlintsts ${libs_for_tests})
install(TARGETS morse_xlintsts DESTINATION ${CMAKE_INSTALL_PREFIX}/testing/lin) install(TARGETS morse_xlintsts DESTINATION ${CMAKE_INSTALL_PREFIX}/testing/lin)
endif() endif()
if(BUILD_DOUBLE) if(CHAMELEON_PREC_S)
add_executable(morse_xlintstd ${ALINTST} ${DLINTST} ${DZLNTST}) add_executable(morse_xlintstd ${ALINTST} ${DLINTST} ${DZLNTST})
set_property(TARGET morse_xlintstd PROPERTY LINKER_LANGUAGE Fortran) set_property(TARGET morse_xlintstd PROPERTY LINKER_LANGUAGE Fortran)
target_link_libraries(morse_xlintstd ${libs_for_tests}) target_link_libraries(morse_xlintstd ${libs_for_tests})
install(TARGETS morse_xlintstd DESTINATION ${CMAKE_INSTALL_PREFIX}/testing/lin) install(TARGETS morse_xlintstd DESTINATION ${CMAKE_INSTALL_PREFIX}/testing/lin)
endif() endif()
if(BUILD_COMPLEX) if(CHAMELEON_PREC_C)
add_executable(morse_xlintstc ${ALINTST} ${CLINTST} ${SCLNTST}) add_executable(morse_xlintstc ${ALINTST} ${CLINTST} ${SCLNTST})
set_property(TARGET morse_xlintstc PROPERTY LINKER_LANGUAGE Fortran) set_property(TARGET morse_xlintstc PROPERTY LINKER_LANGUAGE Fortran)
target_link_libraries(morse_xlintstc ${libs_for_tests}) target_link_libraries(morse_xlintstc ${libs_for_tests})
install(TARGETS morse_xlintstc DESTINATION ${CMAKE_INSTALL_PREFIX}/testing/lin) install(TARGETS morse_xlintstc DESTINATION ${CMAKE_INSTALL_PREFIX}/testing/lin)
endif() endif()
if(BUILD_COMPLEX16) if(CHAMELEON_PREC_Z)
add_executable(morse_xlintstz ${ALINTST} ${ZLINTST} ${DZLNTST}) add_executable(morse_xlintstz ${ALINTST} ${ZLINTST} ${DZLNTST})
set_property(TARGET morse_xlintstz PROPERTY LINKER_LANGUAGE Fortran) set_property(TARGET morse_xlintstz PROPERTY LINKER_LANGUAGE Fortran)
target_link_libraries(morse_xlintstz ${libs_for_tests}) target_link_libraries(morse_xlintstz ${libs_for_tests})
......
timing/CMakeLists.txt
+ 17
− 38
View file @ cf02f68e
...@@ -163,47 +163,26 @@ if(NOT CHAMELEON_SIMULATION) ...@@ -163,47 +163,26 @@ if(NOT CHAMELEON_SIMULATION)
list(APPEND libs_for_timings chameleon_timing) list(APPEND libs_for_timings chameleon_timing)
endif() endif()
list(APPEND libs_for_timings chameleon) list(APPEND libs_for_timings
chameleon
)
# Add dependency toward StarPU for StarPU specific calls
if(CHAMELEON_SCHED_STARPU) if(CHAMELEON_SCHED_STARPU)
list(APPEND libs_for_timings list(APPEND libs_for_timings
chameleon_starpu ${STARPU_LIBRARIES_DEP}
${STARPU_LIBRARIES_DEP}
) )
link_directories(${STARPU_LIBRARY_DIRS}) link_directories(${STARPU_LIBRARY_DIRS})
elseif(CHAMELEON_SCHED_PARSEC)
list(APPEND libs_for_timings
chameleon_parsec
${PARSEC_LIBRARIES_DEP}
)
link_directories(${PARSEC_LIBRARY_DIRS_DEP})
elseif(CHAMELEON_SCHED_QUARK)
list(APPEND libs_for_timings
chameleon_quark
${QUARK_LIBRARIES}
)
link_directories(${QUARK_LIBRARY_DIRS})
endif() endif()
if(NOT CHAMELEON_SIMULATION) if(NOT CHAMELEON_SIMULATION)
if(CHAMELEON_USE_CUDA)
list(APPEND libs_for_timings
cudablas)
endif()
if(CHAMELEON_USE_CUDA)
link_directories(${CUDA_LIBRARY_DIRS})
endif()
list(APPEND libs_for_timings list(APPEND libs_for_timings
coreblas ${LAPACKE_LIBRARIES}
${LAPACKE_LIBRARIES} ${TMG_LIBRARIES}
${TMG_LIBRARIES} ${CBLAS_LIBRARIES}
${CBLAS_LIBRARIES} ${LAPACK_SEQ_LIBRARIES}
${LAPACK_SEQ_LIBRARIES} ${BLAS_SEQ_LIBRARIES}
${BLAS_SEQ_LIBRARIES}
${LIBHQR_LIBRARIES}
${EXTRA_LIBRARIES}
) )
link_directories(${LAPACKE_LIBRARY_DIRS}) link_directories(${LAPACKE_LIBRARY_DIRS})
...@@ -211,14 +190,14 @@ if(NOT CHAMELEON_SIMULATION) ...@@ -211,14 +190,14 @@ if(NOT CHAMELEON_SIMULATION)
link_directories(${LAPACK_LIBRARY_DIRS}) link_directories(${LAPACK_LIBRARY_DIRS})
link_directories(${CBLAS_LIBRARY_DIRS}) link_directories(${CBLAS_LIBRARY_DIRS})
link_directories(${BLAS_LIBRARY_DIRS}) link_directories(${BLAS_LIBRARY_DIRS})
link_directories(${LIBHQR_LIBRARY_DIRS})
else()
list(APPEND libs_for_timings${EXTRA_LIBRARIES})
endif() endif()
list(APPEND libs_for_timings
hqr
${EXTRA_LIBRARIES}
)
# message("BLAS_SEQ_LIBRARIES: ${BLAS_SEQ_LIBRARIES}") # message("BLAS_SEQ_LIBRARIES: ${BLAS_SEQ_LIBRARIES}")
# message("CBLAS_LIBRARIES: ${CBLAS_LIBRARIES}") # message("CBLAS_LIBRARIES: ${CBLAS_LIBRARIES}")
# message("LAPACK_SEQ_LIBRARIES: ${LAPACK_SEQ_LIBRARIES}") # message("LAPACK_SEQ_LIBRARIES: ${LAPACK_SEQ_LIBRARIES}")
......
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