Skip to content

Commit c9310a7

Browse files
committed
CHOLMOD: Fail early when trying to build CHOLMOD_CUDA without OpenMP.
Building CHOLMOD_CUDA requires OpenMP. Instead of failing later on during compilation, emit an error during configuration that point to the underlying issue.
1 parent 799a72f commit c9310a7

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

CHOLMOD/CMakeLists.txt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -573,15 +573,9 @@ endif ( )
573573

574574
# CHOLMOD_CUDA
575575
if ( CHOLMOD_HAS_CUDA )
576-
# cmake now configures cholmod.h with "#define CHOLMOD_HAS_CUDA" if CHOLMOD is
577-
# being compiled with CUDA, so the -DCHOLMOD_HAS_CUDA flag is no longer needed.
578-
# if ( BUILD_SHARED_LIBS )
579-
# target_compile_definitions ( CHOLMOD PUBLIC "CHOLMOD_HAS_CUDA" )
580-
# endif ( )
581-
# set ( CHOLMOD_CFLAGS "${CHOLMOD_CFLAGS} -DCHOLMOD_HAS_CUDA" )
582-
# if ( BUILD_STATIC_LIBS )
583-
# target_compile_definitions ( CHOLMOD_static PUBLIC "CHOLMOD_HAS_CUDA" )
584-
# endif ( )
576+
if ( NOT CHOLMOD_HAS_OPENMP )
577+
message ( FATAL_ERROR "CHOLMOD_CUDA requires OpenMP. But it has been disabled, or no working OpenMP could be found." )
578+
endif ()
585579
if ( BUILD_SHARED_LIBS )
586580
target_link_libraries ( CHOLMOD PRIVATE CUDA::nvrtc CUDA::cudart_static CUDA::cublas )
587581
target_include_directories ( CHOLMOD INTERFACE

0 commit comments

Comments
 (0)