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

Absorb SPQR_CUDA module into libspqr library #556

Merged
merged 2 commits into from
Dec 1, 2023
Merged

Absorb SPQR_CUDA module into libspqr library #556

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
3daf110
Absorb SPQR_CUDA module into libspqr library
mmuetzel Nov 29, 2023
46bcb02
SPQRGPU: Explicitly add template argument.
mmuetzel Nov 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
21 changes: 10 additions & 11 deletions SPQR/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ if ( SUITESPARSE_CUDA )
# with CUDA
add_subdirectory ( GPURuntime )
add_subdirectory ( GPUQREngine )
add_subdirectory ( SPQRGPU )
endif ( )

#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -220,15 +219,15 @@ endif ( )

if ( SUITESPARSE_CUDA )
# CUDA
add_subdirectory ( SPQRGPU )

if ( BUILD_SHARED_LIBS )
target_link_libraries ( SPQR PRIVATE
SPQR_CUDA GPUQREngine GPURuntime )
target_link_libraries ( SPQR PRIVATE GPUQREngine GPURuntime )
target_compile_definitions ( SPQR PUBLIC "SUITESPARSE_CUDA" )
endif ( )
set ( SPQR_CFLAGS "-DSUITESPARSE_CUDA" )
if ( BUILD_STATIC_LIBS )
target_link_libraries ( SPQR_static PUBLIC
SPQR_CUDA_static GPUQREngine_static GPURuntime_static )
target_link_libraries ( SPQR_static PUBLIC GPUQREngine_static GPURuntime_static )
target_compile_definitions ( SPQR_static PUBLIC "SUITESPARSE_CUDA" )
endif ( )
endif ( )
Expand Down Expand Up @@ -409,13 +408,13 @@ if ( DEMO )

if ( SUITESPARSE_CUDA )
if ( BUILD_SHARED_LIBS )
target_link_libraries ( qrdemo_gpu PUBLIC SPQR SPQR_CUDA )
target_link_libraries ( qrdemo_gpu2 PUBLIC SPQR SPQR_CUDA )
target_link_libraries ( qrdemo_gpu3 PUBLIC SPQR SPQR_CUDA )
target_link_libraries ( qrdemo_gpu PUBLIC SPQR )
target_link_libraries ( qrdemo_gpu2 PUBLIC SPQR )
target_link_libraries ( qrdemo_gpu3 PUBLIC SPQR )
else ( )
target_link_libraries ( qrdemo_gpu PUBLIC SPQR_static SPQR_CUDA_static )
target_link_libraries ( qrdemo_gpu2 PUBLIC SPQR_static SPQR_CUDA_static )
target_link_libraries ( qrdemo_gpu3 PUBLIC SPQR_static SPQR_CUDA_static )
target_link_libraries ( qrdemo_gpu PUBLIC SPQR_static )
target_link_libraries ( qrdemo_gpu2 PUBLIC SPQR_static )
target_link_libraries ( qrdemo_gpu3 PUBLIC SPQR_static )
endif ( )
target_link_libraries ( qrdemo_gpu
PUBLIC SuiteSparse::CHOLMOD SuiteSparse::SuiteSparseConfig )
Expand Down
28 changes: 14 additions & 14 deletions SPQR/Config/SPQRConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,19 @@ include ( CMakeFindDependencyMacro )

set ( _dependencies_found ON )

# Look for NVIDIA CUDA toolkit
if ( @SUITESPARSE_CUDA@ AND NOT CUDAToolkit_FOUND )
find_dependency ( CUDAToolkit @CUDAToolkit_VERSION_MAJOR@ )
if ( NOT CUDAToolkit_FOUND )
set ( _dependencies_found OFF )
endif ( )
endif ( )

if ( NOT _dependencies_found )
set ( SPQR_FOUND OFF )
return ( )
endif ( )

# Look for SuiteSparse_config and CHOLMOD targets
if ( @SUITESPARSE_IN_BUILD_TREE@ )
if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
Expand Down Expand Up @@ -98,28 +111,15 @@ if ( @SUITESPARSE_CUDA@ )
find_dependency ( GPUQREngine @SPQR_VERSION_MAJOR@.@SPQR_VERSION_MINOR@ )
endif ( )
endif ( )

if ( NOT SPQR_CUDA_FOUND )
# First check in a common build tree
find_dependency ( SPQR_CUDA ${SPQR_VERSION}
PATHS ${CMAKE_SOURCE_DIR}/../SPQR/build NO_DEFAULT_PATH )
# Then, check in the currently active CMAKE_MODULE_PATH
if ( NOT SPQR_CUDA_FOUND )
find_dependency ( SPQR_CUDA ${SPQR_VERSION} )
endif ( )
endif ( )
else ( )
if ( NOT SuiteSparse_GPURuntime_FOUND )
find_dependency ( SuiteSparse_GPURuntime @SPQR_VERSION_MAJOR@.@SPQR_VERSION_MINOR@ )
endif ( )
if ( NOT GPUQREngine_FOUND )
find_dependency ( GPUQREngine @SPQR_VERSION_MAJOR@.@SPQR_VERSION_MINOR@ )
endif ( )
if ( NOT SPQR_CUDA_FOUND )
find_dependency ( SPQR_CUDA ${SPQR_VERSION} )
endif ( )
endif ( )
if ( NOT SuiteSparse_GPURuntime_FOUND OR NOT GPUQREngine_FOUND OR NOT SPQR_CUDA_FOUND )
if ( NOT SuiteSparse_GPURuntime_FOUND OR NOT GPUQREngine_FOUND )
set ( _dependencies_found OFF )
endif ( )
endif ( )
Expand Down
19 changes: 0 additions & 19 deletions SPQR/Config/SPQR_CUDA.pc.in
View file
Open in desktop

This file was deleted.

163 changes: 0 additions & 163 deletions SPQR/Config/SPQR_CUDAConfig.cmake.in
View file
Open in desktop

This file was deleted.

Loading