@@ -84,8 +84,11 @@ elseif(NOT BUILD_SHARED_LIBS)
8484endif ()
8585
8686if (NOT BUILD_SHARED_LIBS and CUVS_COMPILE_DYNAMIC_ONLY)
87- message (VERBOSE "cuVS: Ignoring `BUILD_SHARED_LIBS` and forcing shared library due to `CUVS_COMPILE_DYNAMIC_ONLY`" )
88- endif ()
87+ message (
88+ VERBOSE
89+ "cuVS: Ignorning `BUILD_SHARED_LIBS` and forcing shared library due to `CUVS_COMPILE_DYNAMIC_ONLY`"
90+ )
91+ endif ()
8992
9093set (cuvs_compile_mode = "both" )
9194set (_cuvs_lib_targets cuvs cuvs_static)
@@ -97,7 +100,6 @@ elseif(NOT BUILD_SHARED_LIBS)
97100 set (_cuvs_lib_targets cuvs_static)
98101endif ()
99102
100-
101103# Needed because GoogleBenchmark changes the state of FindThreads.cmake, causing subsequent runs to
102104# have different values for the `Threads::Threads` target. Setting this flag ensures
103105# `Threads::Threads` is the same value across all builds so that cache hits occur
@@ -579,36 +581,35 @@ if(NOT BUILD_CPU_ONLY)
579581 target_compile_definitions (cuvs_objs PUBLIC CUVS_BUILD_CAGRA_HNSWLIB )
580582 endif ()
581583
582-
583584 set (CUVS_CUSOLVER_DEPENDENCY CUDA::cusolver${_ctk_static_suffix} )
584585 set (CUVS_CUBLAS_DEPENDENCY CUDA::cublas${_ctk_static_suffix} )
585586 set (CUVS_CURAND_DEPENDENCY CUDA::curand${_ctk_static_suffix} )
586587 set (CUVS_CUSPARSE_DEPENDENCY CUDA::cusparse${_ctk_static_suffix} )
587588
588589 set (CUVS_CTK_MATH_DEPENDENCIES ${CUVS_CUBLAS_DEPENDENCY} ${CUVS_CUSOLVER_DEPENDENCY}
589- ${CUVS_CUSPARSE_DEPENDENCY} ${CUVS_CURAND_DEPENDENCY}
590+ ${CUVS_CUSPARSE_DEPENDENCY} ${CUVS_CURAND_DEPENDENCY}
590591 )
591592
592-
593593 if (NOT cuvs_compile_mode STREQUAL "static_only" )
594594 add_library (cuvs SHARED $<TARGET_OBJECTS :cuvs_objs >)
595595 add_library (cuvs::cuvs ALIAS cuvs )
596596 set_target_properties (
597597 cuvs
598598 PROPERTIES BUILD_RPATH "\$ ORIGIN"
599- INSTALL_RPATH "\$ ORIGIN"
600- CXX_STANDARD 17
601- CXX_STANDARD_REQUIRED ON
602- CUDA_STANDARD 17
603- CUDA_STANDARD_REQUIRED ON
604- INTERFACE_POSITION_INDEPENDENT_CODE ON
605- POSITION_INDEPENDENT_CODE ON
599+ INSTALL_RPATH "\$ ORIGIN"
600+ CXX_STANDARD 17
601+ CXX_STANDARD_REQUIRED ON
602+ CUDA_STANDARD 17
603+ CUDA_STANDARD_REQUIRED ON
604+ INTERFACE_POSITION_INDEPENDENT_CODE ON
605+ POSITION_INDEPENDENT_CODE ON
606606 )
607607 target_compile_options (
608- cuvs INTERFACE $<$<COMPILE_LANG_AND_ID :CUDA ,NVIDIA >:--expt -extended -lambda
609- --expt -relaxed -constexpr >
610- PRIVATE "$<$<COMPILE_LANGUAGE :CXX >:${CUVS_CXX_FLAGS} >"
611- "$<$<COMPILE_LANGUAGE :CUDA >:${CUVS_CUDA_FLAGS} >"
608+ cuvs
609+ INTERFACE $<$<COMPILE_LANG_AND_ID :CUDA ,NVIDIA >:--expt -extended -lambda
610+ --expt -relaxed -constexpr >
611+ PRIVATE "$<$<COMPILE_LANGUAGE :CXX >:${CUVS_CXX_FLAGS} >"
612+ "$<$<COMPILE_LANGUAGE :CUDA >:${CUVS_CUDA_FLAGS} >"
612613 )
613614
614615 target_include_directories (
@@ -625,8 +626,8 @@ if(NOT BUILD_CPU_ONLY)
625626
626627 # ensure CUDA symbols aren't relocated to the middle of the debug build binaries
627628 file (
628- WRITE "${CMAKE_CURRENT_BINARY_DIR} /fatbin.ld"
629- [=[
629+ WRITE "${CMAKE_CURRENT_BINARY_DIR} /fatbin.ld"
630+ [=[
630631SECTIONS
631632{
632633.nvFatBinSegment : { *(.nvFatBinSegment) }
@@ -674,7 +675,7 @@ SECTIONS
674675 PUBLIC rmm::rmm raft::raft ${CUVS_CTK_MATH_DEPENDENCIES}
675676 PRIVATE nvidia::cutlass::cutlass $<TARGET_NAME_IF_EXISTS :OpenMP ::OpenMP_CXX >
676677 )
677- endif ()
678+ endif ()
678679
679680 # ################################################################################################
680681 # * NVTX support in cuvs -----------------------------------------------------
0 commit comments