merge upstream

rapidsai · Oct 3, 2024 · d8cc035 · d8cc035
2 parents 18b81b2 + 5629977
commit d8cc035
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 5 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -294,7 +294,7 @@ if(BUILD_SHARED_LIBS)
   )
 
   add_library(
-    cuvs SHARED
+    cuvs_objs OBJECT
     src/cluster/kmeans_balanced_fit_float.cu
     src/cluster/kmeans_fit_mg_float.cu
     src/cluster/kmeans_fit_mg_double.cu
@@ -442,12 +442,67 @@ if(BUILD_SHARED_LIBS)
     src/stats/trustworthiness_score.cu
   )
 
+  set_target_properties(
+    cuvs_objs
+    PROPERTIES CXX_STANDARD 17
+               CXX_STANDARD_REQUIRED ON
+               CUDA_STANDARD 17
+               CUDA_STANDARD_REQUIRED ON
+               POSITION_INDEPENDENT_CODE ON
+  )
+  target_compile_options(
+    cuvs_objs PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CUVS_CXX_FLAGS}>"
+                      "$<$<COMPILE_LANGUAGE:CUDA>:${CUVS_CUDA_FLAGS}>"
+  )
+  target_link_libraries(
+    cuvs_objs PUBLIC raft::raft rmm::rmm ${CUVS_CTK_MATH_DEPENDENCIES}
+                     $<TARGET_NAME_IF_EXISTS:OpenMP::OpenMP_CXX>
+  )
+
+  add_library(cuvs SHARED $<TARGET_OBJECTS:cuvs_objs>)
+  add_library(cuvs_static STATIC $<TARGET_OBJECTS:cuvs_objs>)
+
   target_compile_options(
     cuvs INTERFACE $<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>:--expt-extended-lambda
                    --expt-relaxed-constexpr>
   )
 
   add_library(cuvs::cuvs ALIAS cuvs)
+  add_library(cuvs::cuvs_static ALIAS cuvs_static)
+
+  set_target_properties(
+    cuvs_static
+    PROPERTIES BUILD_RPATH "\$ORIGIN"
+               INSTALL_RPATH "\$ORIGIN"
+               CXX_STANDARD 17
+               CXX_STANDARD_REQUIRED ON
+               POSITION_INDEPENDENT_CODE ON
+               INTERFACE_POSITION_INDEPENDENT_CODE ON
+               EXPORT_NAME cuvs_static
+  )
+
+  target_compile_options(cuvs_static PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CUVS_CXX_FLAGS}>")
+
+  target_include_directories(
+    cuvs_objs
+    PUBLIC "$<BUILD_INTERFACE:${DLPACK_INCLUDE_DIR}>"
+           "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+    INTERFACE "$<INSTALL_INTERFACE:include>"
+  )
+
+  target_include_directories(
+    cuvs_static
+    PUBLIC "$<BUILD_INTERFACE:${DLPACK_INCLUDE_DIR}>"
+    INTERFACE "$<INSTALL_INTERFACE:include>"
+  )
+
+  # ensure CUDA symbols aren't relocated to the middle of the debug build binaries
+  target_link_options(cuvs_static PRIVATE $<HOST_LINK:${CMAKE_CURRENT_BINARY_DIR}/fatbin.ld>)
+
+  target_include_directories(
+    cuvs_static PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+                       "$<INSTALL_INTERFACE:include>"
+  )
 
   target_include_directories(
     cuvs PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
@@ -478,11 +533,18 @@ if(BUILD_SHARED_LIBS)
       PRIVATE nvidia::cutlass::cutlass $<TARGET_NAME_IF_EXISTS:OpenMP::OpenMP_CXX>
               cuvs-cagra-search
     )
+
+    target_link_libraries(
+      cuvs_static
+      PUBLIC rmm::rmm raft::raft ${CUVS_CTK_MATH_DEPENDENCIES}
+      PRIVATE nvidia::cutlass::cutlass $<TARGET_NAME_IF_EXISTS:OpenMP::OpenMP_CXX>
+              cuvs-cagra-search
+    )
   endif()
 
   if(BUILD_CAGRA_HNSWLIB)
-    target_link_libraries(cuvs PRIVATE hnswlib::hnswlib)
-    target_compile_definitions(cuvs PUBLIC CUVS_BUILD_CAGRA_HNSWLIB)
+    target_link_libraries(cuvs_objs PRIVATE hnswlib::hnswlib)
+    target_compile_definitions(cuvs_objs PUBLIC CUVS_BUILD_CAGRA_HNSWLIB)
   endif()
 
   # Endian detection
@@ -564,11 +626,16 @@ target_compile_definitions(cuvs::cuvs INTERFACE $<$<BOOL:${CUVS_NVTX}>:NVTX_ENAB
       src/neighbors/ivf_flat_c.cpp
       src/neighbors/ivf_pq_c.cpp
       src/neighbors/cagra_c.cpp
-      src/neighbors/hnsw_c.cpp
+      $<$<BOOL:${BUILD_CAGRA_HNSWLIB}>:src/neighbors/hnsw_c.cpp>
       src/neighbors/refine/refine_c.cpp
       src/distance/pairwise_distance_c.cpp
     )
 
+    if(BUILD_CAGRA_HNSWLIB)
+      target_link_libraries(cuvs_c PRIVATE hnswlib::hnswlib)
+      target_compile_definitions(cuvs_c PUBLIC CUVS_BUILD_CAGRA_HNSWLIB)
+    endif()
+
     add_library(cuvs::c_api ALIAS cuvs_c)
 
     set_target_properties(
@@ -607,7 +674,7 @@ target_compile_definitions(cuvs::cuvs INTERFACE $<$<BOOL:${CUVS_NVTX}>:NVTX_ENAB
   include(CPack)
 
   install(
-    TARGETS cuvs
+    TARGETS cuvs cuvs_static cuvs-cagra-search
     DESTINATION ${lib_dir}
     COMPONENT cuvs
     EXPORT cuvs-exports

diff --git a/cpp/test/CMakeLists.txt b/cpp/test/CMakeLists.txt
@@ -174,6 +174,8 @@ if(BUILD_TESTS)
 
   if(BUILD_CAGRA_HNSWLIB)
     ConfigureTest(NAME NEIGHBORS_HNSW_TEST PATH neighbors/hnsw.cu GPUS 1 PERCENT 100)
+    target_link_libraries(NEIGHBORS_HNSW_TEST PRIVATE hnswlib::hnswlib)
+    target_compile_definitions(NEIGHBORS_HNSW_TEST PUBLIC CUVS_BUILD_CAGRA_HNSWLIB)
   endif()
 
   ConfigureTest(
@@ -227,6 +229,8 @@ if(BUILD_C_TESTS)
 
   if(BUILD_CAGRA_HNSWLIB)
     ConfigureTest(NAME HNSW_C_TEST PATH neighbors/ann_hnsw_c.cu C_LIB)
+    target_link_libraries(NEIGHBORS_HNSW_TEST PRIVATE hnswlib::hnswlib)
+    target_compile_definitions(NEIGHBORS_HNSW_TEST PUBLIC CUVS_BUILD_CAGRA_HNSWLIB)
   endif()
 endif()