Skip to content
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

Jump to bottom

CMake: Import CUDA toolkit targets when importing CHOLMOD_CUDA. #358

Merged
merged 2 commits into from
Aug 29, 2023
Merged

CMake: Import CUDA toolkit targets when importing CHOLMOD_CUDA. #358

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
6fadcd0
CMake: Import CUDA toolkit targets when importing CHOLMOD_CUDA.
mmuetzel Aug 29, 2023
eebd03e
CHOLMOD: Avoid shadowing CMake target with variable.
mmuetzel Aug 29, 2023
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
20 changes: 6 additions & 14 deletions CHOLMOD/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,14 +269,8 @@ add_subdirectory ( GPU )
if ( SUITESPARSE_CUDA )
# with CUDA
message ( STATUS "CUDA libraries: " ${CUDA_LIBRARIES} )
set ( CHOLMOD_CUDA CHOLMOD_CUDA ${CUDA_LIBRARIES} )
set ( CHOLMOD_CUDA_STATIC CHOLMOD_CUDA_static ${CUDA_LIBRARIES} )
include_directories ( GPU ${CUDAToolkit_INCLUDE_DIRS} )
link_directories ( "GPU" "${CUDA_LIBRARIES}" "/usr/local/cuda/lib64/stubs" "/usr/local/cuda/lib64" )
else ( )
# without CUDA and RMM
set ( CHOLMOD_CUDA )
set ( CHOLMOD_CUDA_STATIC )
endif ( )

#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -473,14 +467,12 @@ endif ( )

# CHOLMOD_CUDA
if ( SUITESPARSE_CUDA )
# this must be a PUBLIC link, not PRIVATE, so that libraries using
# CHOLMOD can link against these libraries
message ( STATUS "CHOLMOD cuda: " ${CHOLMOD_CUDA} )
target_link_libraries ( CHOLMOD PUBLIC ${CHOLMOD_CUDA} )
target_link_libraries ( CHOLMOD PRIVATE CHOLMOD_CUDA ${CUDA_LIBRARIES} )
if ( NOT NSTATIC )
target_link_libraries ( CHOLMOD_static PUBLIC ${CHOLMOD_CUDA_static} )
target_link_libraries ( CHOLMOD_static PUBLIC CHOLMOD_CUDA_static ${CUDA_LIBRARIES} )
endif ( )
target_link_libraries ( CHOLMOD PUBLIC CUDA::nvrtc CUDA::cudart_static
target_link_libraries ( CHOLMOD PRIVATE CUDA::nvrtc CUDA::cudart_static
CUDA::nvToolsExt CUDA::cublas )
if ( NOT NSTATIC )
target_link_libraries ( CHOLMOD_static PUBLIC CUDA::nvrtc CUDA::cudart_static
Expand Down Expand Up @@ -607,9 +599,9 @@ if ( DEMO )
endif ( )

# Libraries required for Demo programs
target_link_libraries ( cholmod_demo PUBLIC CHOLMOD ${CHOLMOD_CUDA} SuiteSparse::SuiteSparseConfig )
target_link_libraries ( cholmod_l_demo PUBLIC CHOLMOD ${CHOLMOD_CUDA} SuiteSparse::SuiteSparseConfig )
target_link_libraries ( cholmod_simple PUBLIC CHOLMOD ${CHOLMOD_CUDA} )
target_link_libraries ( cholmod_demo PUBLIC CHOLMOD CHOLMOD_CUDA SuiteSparse::SuiteSparseConfig )
target_link_libraries ( cholmod_l_demo PUBLIC CHOLMOD CHOLMOD_CUDA SuiteSparse::SuiteSparseConfig )
target_link_libraries ( cholmod_simple PUBLIC CHOLMOD CHOLMOD_CUDA )

else ( )

Expand Down
5 changes: 5 additions & 0 deletions CHOLMOD/Config/CHOLMOD_CUDAConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ set ( CHOLMOD_CUDA_VERSION_MINOR @CHOLMOD_VERSION_MINOR@ )
set ( CHOLMOD_CUDA_VERSION_PATCH @CHOLMOD_VERSION_SUB@ )
set ( CHOLMOD_CUDA_VERSION "@CHOLMOD_VERSION_MAJOR@.@CHOLMOD_VERSION_MINOR@.@CHOLMOD_VERSION_SUB@" )

if ( @SUITESPARSE_CUDA@ )
# Look for NVIDIA CUDA toolkit if CHOLMOD_CUDA was built as a non-empty library.
FindCUDAToolkit ( @CUDAToolkit_VERSION_MAJOR@ REQUIRED )
endif ( )

include ( ${CMAKE_CURRENT_LIST_DIR}/CHOLMOD_CUDATargets.cmake )

# The following is only for backward compatibility with FindCHOLMOD_CUDA.
Expand Down
4 changes: 1 addition & 3 deletions CHOLMOD/GPU/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,7 @@ set_target_properties ( CHOLMOD_CUDA_static PROPERTIES POSITION_INDEPENDENT_CODE
endif ( )

if ( SUITESPARSE_CUDA )
# this must be a PUBLIC link, not PRIVATE, so the CHOLMOD library
# itself can link against these libraries
target_link_libraries ( CHOLMOD_CUDA PUBLIC CUDA::nvrtc CUDA::cudart_static
target_link_libraries ( CHOLMOD_CUDA PRIVATE CUDA::nvrtc CUDA::cudart_static
CUDA::nvToolsExt CUDA::cublas )
if ( NOT NSTATIC )
target_link_libraries ( CHOLMOD_CUDA_static PUBLIC CUDA::nvrtc CUDA::cudart_static
Expand Down