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.

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

KNN bruteforce and IVF methods C/C++ API #33

Merged
merged 30 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
20658f8
Adding IVF-Flat and IVF-PQ
viclafargue Feb 7, 2024
6976acc
Adding bruteforce KNN
viclafargue Feb 7, 2024
9baadc8
Expose IVF methods
viclafargue Feb 7, 2024
9944bae
Adding bruteforce test
viclafargue Feb 9, 2024
b4fdee0
IVF-Flat and IVF-PQ tests
viclafargue Feb 16, 2024
85e0fba
Update IVF-Flat test
viclafargue Feb 19, 2024
1bae6b9
Update bruteforce KNN API
viclafargue Mar 1, 2024
2619b13
Update IVF-PQ testing
viclafargue Mar 1, 2024
540be0d
IVF-FLAT C API
viclafargue Mar 4, 2024
fe60dcc
Merge branch 'branch-24.04' into add-ivf_flat-and-ivf_pq
cjnolet Mar 4, 2024
e38d530
IVF-PQ C API
viclafargue Mar 4, 2024
089f67b
Merge branch 'branch-24.04' into add-ivf_flat-and-ivf_pq
cjnolet Mar 4, 2024
493165e
BRUTEFORCE C API
viclafargue Mar 5, 2024
33ffa18
REVERT cmake-format changes
viclafargue Mar 5, 2024
8738810
Fixing style/doc/comments issues
viclafargue Mar 8, 2024
1e1eb58
Solidify bruteforce index
viclafargue Mar 18, 2024
3e81649
IVF-FLAT compiled index
viclafargue Mar 18, 2024
0ac4820
IVF-PQ compiled index
viclafargue Mar 18, 2024
58dc152
Removing macros from headers
viclafargue Mar 18, 2024
f5aeffc
Merge remote-tracking branch 'rapidsai/branch-24.04' into add-ivf_fla…
viclafargue Mar 18, 2024
6aff838
IVF-Flat documentation
viclafargue Mar 18, 2024
5359afb
IVF-PQ documentation
viclafargue Mar 19, 2024
ab35e10
Bruteforce documentation
viclafargue Mar 19, 2024
675bf2a
C doc update
viclafargue Mar 19, 2024
00f67c2
C++ IVF-Flat doc examples
viclafargue Mar 19, 2024
ef5e3a4
C++ IVF-Flat and IVF-PQ doc examples
viclafargue Mar 19, 2024
53f6265
C++ Bruteforce doc examples
viclafargue Mar 19, 2024
82c003a
Add documentation for distance types
viclafargue Mar 19, 2024
d84d3cc
Python code generators
viclafargue Mar 19, 2024
7111bfb
Restore CMakeLists.txt style
viclafargue Mar 20, 2024
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,9 @@ docs/source/_static/rust
# clang tooling
compile_commands.json
.clangd/

# serialized ann indexes
cagra_index
ivf_flat_index
ivf_pq_index

85 changes: 55 additions & 30 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ include(cmake/thirdparty/get_cutlass.cmake)

add_library(
cuvs SHARED
src/neighbors/brute_force_index.cu
src/neighbors/brute_force.cu
src/neighbors/cagra_build_float.cpp
src/neighbors/cagra_build_int8.cpp
src/neighbors/cagra_build_uint8.cpp
Expand All @@ -197,6 +199,30 @@ add_library(
src/neighbors/cagra_serialize_float.cpp
src/neighbors/cagra_serialize_int8.cpp
src/neighbors/cagra_serialize_uint8.cpp
src/neighbors/ivf_flat_index.cpp
src/neighbors/ivf_flat/ivf_flat_build_float_int64_t.cpp
src/neighbors/ivf_flat/ivf_flat_build_int8_t_int64_t.cpp
src/neighbors/ivf_flat/ivf_flat_build_uint8_t_int64_t.cpp
src/neighbors/ivf_flat/ivf_flat_extend_float_int64_t.cpp
src/neighbors/ivf_flat/ivf_flat_extend_int8_t_int64_t.cpp
src/neighbors/ivf_flat/ivf_flat_extend_uint8_t_int64_t.cpp
src/neighbors/ivf_flat/ivf_flat_search_float_int64_t.cpp
src/neighbors/ivf_flat/ivf_flat_search_int8_t_int64_t.cpp
src/neighbors/ivf_flat/ivf_flat_search_uint8_t_int64_t.cpp
src/neighbors/ivf_flat/ivf_flat_serialize_float_int64_t.cpp
src/neighbors/ivf_flat/ivf_flat_serialize_int8_t_int64_t.cpp
src/neighbors/ivf_flat/ivf_flat_serialize_uint8_t_int64_t.cpp
src/neighbors/ivf_pq_index.cpp
src/neighbors/ivf_pq/ivf_pq_build_float_int64_t.cpp
src/neighbors/ivf_pq/ivf_pq_build_int8_t_int64_t.cpp
src/neighbors/ivf_pq/ivf_pq_build_uint8_t_int64_t.cpp
src/neighbors/ivf_pq/ivf_pq_extend_float_int64_t.cpp
src/neighbors/ivf_pq/ivf_pq_extend_int8_t_int64_t.cpp
src/neighbors/ivf_pq/ivf_pq_extend_uint8_t_int64_t.cpp
src/neighbors/ivf_pq/ivf_pq_search_float_int64_t.cpp
src/neighbors/ivf_pq/ivf_pq_search_int8_t_int64_t.cpp
src/neighbors/ivf_pq/ivf_pq_search_uint8_t_int64_t.cpp
src/neighbors/ivf_pq_serialize.cpp
)

target_compile_options(
Expand All @@ -213,16 +239,13 @@ target_include_directories(

if(NOT BUILD_CPU_ONLY)
# Keep cuVS as lightweight as possible. Only CUDA libs and rmm should be used in global target.
target_link_libraries(cuvs
PUBLIC
rmm::rmm
$<$<NOT:$<BOOL:${CUDA_STATIC_RUNTIME}>>:raft::raft>
$<$<NOT:$<BOOL:${CUDA_STATIC_RUNTIME}>>:raft::compiled>
PRIVATE
$<$<BOOL:${CUDA_STATIC_RUNTIME}>:raft::raft>
$<$<BOOL:${CUDA_STATIC_RUNTIME}>:raft::compiled_static>
nvidia::cutlass::cutlass
)
target_link_libraries(
cuvs
PUBLIC rmm::rmm $<$<NOT:$<BOOL:${CUDA_STATIC_RUNTIME}>>:raft::raft>
$<$<NOT:$<BOOL:${CUDA_STATIC_RUNTIME}>>:raft::compiled>
PRIVATE $<$<BOOL:${CUDA_STATIC_RUNTIME}>:raft::raft>
$<$<BOOL:${CUDA_STATIC_RUNTIME}>:raft::compiled_static> nvidia::cutlass::cutlass
viclafargue marked this conversation as resolved.
Show resolved Hide resolved
)
endif()

# Endian detection
Expand Down Expand Up @@ -277,14 +300,14 @@ endif()

set_target_properties(
cuvs
PROPERTIES BUILD_RPATH "\$ORIGIN"
INSTALL_RPATH "\$ORIGIN"
CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON
CUDA_STANDARD 17
CUDA_STANDARD_REQUIRED ON
PROPERTIES BUILD_RPATH "\$ORIGIN"
INSTALL_RPATH "\$ORIGIN"
CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON
CUDA_STANDARD 17
CUDA_STANDARD_REQUIRED ON
INTERFACE_POSITION_INDEPENDENT_CODE ON
POSITION_INDEPENDENT_CODE ON
POSITION_INDEPENDENT_CODE ON
viclafargue marked this conversation as resolved.
Show resolved Hide resolved
)

target_compile_options(
Expand All @@ -297,19 +320,22 @@ target_link_options(cuvs PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/fatbin.ld")
# ##################################################################################################
# * cuvs_c -------------------------------------------------------------------------------
if(BUILD_C_LIBRARY)
add_library(cuvs_c SHARED src/core/c_api.cpp src/neighbors/cagra_c.cpp)
add_library(
cuvs_c SHARED src/core/c_api.cpp src/neighbors/brute_force_c.cpp src/neighbors/ivf_flat_c.cpp
src/neighbors/ivf_pq_c.cpp src/neighbors/cagra_c.cpp
)

add_library(cuvs::c_api ALIAS cuvs_c)

set_target_properties(
cuvs_c
PROPERTIES BUILD_RPATH "\$ORIGIN"
INSTALL_RPATH "\$ORIGIN"
CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON
POSITION_INDEPENDENT_CODE ON
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 c_api
EXPORT_NAME c_api
viclafargue marked this conversation as resolved.
Show resolved Hide resolved
)

target_compile_options(cuvs_c PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CUVS_CXX_FLAGS}>")
Expand All @@ -320,12 +346,11 @@ if(BUILD_C_LIBRARY)
INTERFACE "$<INSTALL_INTERFACE:include>"
)

target_link_libraries(cuvs_c
PUBLIC
cuvs::cuvs
PRIVATE
$<$<BOOL:${CUDA_STATIC_RUNTIME}>:raft::raft>
)
target_link_libraries(
cuvs_c
PUBLIC cuvs::cuvs
PRIVATE $<$<BOOL:${CUDA_STATIC_RUNTIME}>:raft::raft>
)

# ensure CUDA symbols aren't relocated to the middle of the debug build binaries
target_link_options(cuvs_c PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/fatbin.ld")
Expand Down
6 changes: 3 additions & 3 deletions cpp/include/cuvs/core/detail/interop.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@ DLDataType data_type_to_DLDataType()
}
}

bool is_dlpack_device_compatible(DLTensor tensor)
inline bool is_dlpack_device_compatible(DLTensor tensor)
{
return tensor.device.device_type == kDLCUDAManaged || tensor.device.device_type == kDLCUDAHost ||
tensor.device.device_type == kDLCUDA;
}

bool is_dlpack_host_compatible(DLTensor tensor)
inline bool is_dlpack_host_compatible(DLTensor tensor)
{
return tensor.device.device_type == kDLCUDAManaged || tensor.device.device_type == kDLCUDAHost ||
tensor.device.device_type == kDLCPU;
}

template <typename MdspanType, typename = raft::is_mdspan_t<MdspanType>>
MdspanType from_dlpack(DLManagedTensor* managed_tensor)
inline MdspanType from_dlpack(DLManagedTensor* managed_tensor)
{
auto tensor = managed_tensor->dl_tensor;

Expand Down
6 changes: 3 additions & 3 deletions cpp/include/cuvs/core/interop.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace cuvs::core {
* @param[in] tensor DLTensor object to check underlying memory type
* @return bool
*/
bool is_dlpack_device_compatible(DLTensor tensor)
inline bool is_dlpack_device_compatible(DLTensor tensor)
{
return detail::is_dlpack_device_compatible(tensor);
}
Expand All @@ -46,7 +46,7 @@ bool is_dlpack_device_compatible(DLTensor tensor)
* @param tensor DLTensor object to check underlying memory type
* @return bool
*/
bool is_dlpack_host_compatible(DLTensor tensor)
inline bool is_dlpack_host_compatible(DLTensor tensor)
{
return detail::is_dlpack_host_compatible(tensor);
}
Expand All @@ -72,7 +72,7 @@ bool is_dlpack_host_compatible(DLTensor tensor)
* @return MdspanType
*/
template <typename MdspanType, typename = raft::is_mdspan_t<MdspanType>>
MdspanType from_dlpack(DLManagedTensor* managed_tensor)
inline MdspanType from_dlpack(DLManagedTensor* managed_tensor)
{
return detail::from_dlpack<MdspanType>(managed_tensor);
}
Expand Down
70 changes: 70 additions & 0 deletions cpp/include/cuvs/distance/distance_types.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/*
* Copyright (c) 2024, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#ifdef __cplusplus
extern "C" {
#endif

/** enum to tell how to compute distance */
viclafargue marked this conversation as resolved.
Show resolved Hide resolved
enum DistanceType {

/** evaluate as dist_ij = sum(x_ik^2) + sum(y_ij)^2 - 2*sum(x_ik * y_jk) */
L2Expanded = 0,
/** same as above, but inside the epilogue, perform square root operation */
L2SqrtExpanded = 1,
/** cosine distance */
CosineExpanded = 2,
/** L1 distance */
L1 = 3,
/** evaluate as dist_ij += (x_ik - y-jk)^2 */
L2Unexpanded = 4,
/** same as above, but inside the epilogue, perform square root operation */
L2SqrtUnexpanded = 5,
/** basic inner product **/
InnerProduct = 6,
/** Chebyshev (Linf) distance **/
Linf = 7,
/** Canberra distance **/
Canberra = 8,
/** Generalized Minkowski distance **/
LpUnexpanded = 9,
/** Correlation distance **/
CorrelationExpanded = 10,
/** Jaccard distance **/
JaccardExpanded = 11,
/** Hellinger distance **/
HellingerExpanded = 12,
/** Haversine distance **/
Haversine = 13,
/** Bray-Curtis distance **/
BrayCurtis = 14,
/** Jensen-Shannon distance**/
JensenShannon = 15,
/** Hamming distance **/
HammingUnexpanded = 16,
/** KLDivergence **/
KLDivergence = 17,
/** RusselRao **/
RusselRaoExpanded = 18,
/** Dice-Sorensen distance **/
DiceExpanded = 19,
/** Precomputed (special value) **/
Precomputed = 100
};

#ifdef __cplusplus
}
#endif
Loading
Loading