Skip to content

Pthread fix #1872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
umar456 merged 2 commits into from
Jul 19, 2017
Merged

Pthread fix #1872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d315c5
Fix pthreads linking error when linking with lapacke
umar456 Jul 17, 2017
c962cee
Add pthreads always
umar456 Jul 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/backend/cpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ ELSE(APPLE) # Linux and Windows
FIND_PACKAGE(LAPACKE)
ENDIF(APPLE)

IF(NOT LAPACK_FOUND)
MESSAGE(WARNING "LAPACK not found. Functionality will be disabled")
ELSE(NOT LAPACK_FOUND)
IF(LAPACK_FOUND)
ADD_DEFINITIONS(-DWITH_CPU_LINEAR_ALGEBRA)
ELSE()
MESSAGE(WARNING "LAPACK not found. Functionality will be disabled")
ENDIF()

IF(NOT UNIX)
Expand Down Expand Up @@ -212,13 +212,15 @@ ADD_LIBRARY(afcpu SHARED
ENDIF(DEFINED BLAS_SYM_FILE)

TARGET_LINK_LIBRARIES(afcpu
PRIVATE ${CBLAS_LIBRARIES}
PRIVATE ${FFTW_LIBRARIES}
PRIVATE ${FreeImage_LIBS}
)
PRIVATE
${CBLAS_LIBRARIES}
${FFTW_LIBRARIES}
${FreeImage_LIBS}
${CMAKE_THREAD_LIBS_INIT}
)

IF(LAPACK_FOUND)
TARGET_LINK_LIBRARIES(afcpu PRIVATE ${LAPACK_LIBRARIES})
TARGET_LINK_LIBRARIES(afcpu PRIVATE ${LAPACK_LIBRARIES})
ENDIF()

LIST(LENGTH GRAPHICS_DEPENDENCIES GRAPHICS_DEPENDENCIES_LEN)
Expand Down
21 changes: 12 additions & 9 deletions src/backend/cuda/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,15 +351,18 @@ MY_CUDA_ADD_LIBRARY(afcuda SHARED
${scan_by_key_sources}
OPTIONS ${CUDA_GENERATE_CODE} ${CUDA_ADD_LIBRARY_OPTIONS})

TARGET_LINK_LIBRARIES(afcuda PRIVATE ${CUDA_CUBLAS_LIBRARIES}
PRIVATE ${CUDA_LIBRARIES}
PRIVATE ${FreeImage_LIBS}
PRIVATE ${CUDA_CUFFT_LIBRARIES}
PRIVATE ${CUDA_cusparse_LIBRARY}
PRIVATE ${CUDA_cusolver_LIBRARY}
PRIVATE ${CUDA_nvrtc_LIBRARY}
PRIVATE ${CUDA_CUDA_LIBRARY}
)
TARGET_LINK_LIBRARIES(afcuda
PRIVATE
${CUDA_CUBLAS_LIBRARIES}
${CUDA_LIBRARIES}
${FreeImage_LIBS}
${CUDA_CUFFT_LIBRARIES}
${CUDA_cusparse_LIBRARY}
${CUDA_cusolver_LIBRARY}
${CUDA_nvrtc_LIBRARY}
${CUDA_CUDA_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
)

ADD_DEPENDENCIES(afcuda ${jit_kernel_targets})
LIST(LENGTH GRAPHICS_DEPENDENCIES GRAPHICS_DEPENDENCIES_LEN)
Expand Down
28 changes: 16 additions & 12 deletions src/backend/opencl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ ELSE(APPLE) # Linux and Windows
FIND_PACKAGE(LAPACKE)
ENDIF(APPLE)

IF(NOT LAPACK_FOUND)
MESSAGE(WARNING "LAPACK not found. Functionality will be disabled")
ELSE(NOT LAPACK_FOUND)
IF(LAPACK_FOUND)
ADD_DEFINITIONS(-DWITH_OPENCL_LINEAR_ALGEBRA)

IF(NOT USE_OPENCL_MKL)
Expand All @@ -47,6 +45,8 @@ ELSE(NOT LAPACK_FOUND)
MESSAGE(SEND_ERROR "CBLAS Library not set")
ENDIF()
ENDIF()
ELSE(LAPACK_FOUND)
MESSAGE(WARNING "LAPACK not found. Functionality will be disabled")
ENDIF()

IF(USE_OPENCL_MKL) # Manual MKL Setup
Expand Down Expand Up @@ -337,18 +337,22 @@ ELSE(DEFINED BLAS_SYM_FILE)
ENDIF()

TARGET_LINK_LIBRARIES(afopencl
PRIVATE ${OpenCL_LIBRARIES}
PRIVATE ${CLBLAST_LIBRARIES}
PRIVATE ${CLBLAS_LIBRARIES}
PRIVATE ${CLFFT_LIBRARIES}
PRIVATE ${CMAKE_DL_LIBS}
PRIVATE ${FreeImage_LIBS}
)
PRIVATE
${OpenCL_LIBRARIES}
${CLBLAST_LIBRARIES}
${CLBLAS_LIBRARIES}
${CLFFT_LIBRARIES}
${CMAKE_DL_LIBS}
${FreeImage_LIBS}
${CMAKE_THREAD_LIBS_INIT}
)

IF(LAPACK_FOUND)
TARGET_LINK_LIBRARIES(afopencl
PRIVATE ${LAPACK_LIBRARIES}
PRIVATE ${CBLAS_LIBRARIES})
PRIVATE
${LAPACK_LIBRARIES}
${CBLAS_LIBRARIES}
)
ENDIF(LAPACK_FOUND)

LIST(LENGTH GRAPHICS_DEPENDENCIES GRAPHICS_DEPENDENCIES_LEN)
Expand Down