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

Port remaining scripts to cuvs_bench #368

Merged
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8add0ab
build and package cuvs_bench
divyegala Oct 1, 2024
db07cc3
add cpu bench package
divyegala Oct 1, 2024
dd16e2b
port remaining scripts
divyegala Oct 1, 2024
21b2660
additions to build.sh
divyegala Oct 1, 2024
66a01c3
attempt to fix syntax
divyegala Oct 1, 2024
dccef49
address review
divyegala Oct 1, 2024
dc9978d
sort dependencies alphabetically
divyegala Oct 1, 2024
f5cc010
get_cuvs.cmake to use libcuvs.so for bench
divyegala Oct 2, 2024
61bf8e2
FIX relative imports that were accidentally deleted
dantegd Oct 2, 2024
7ce126c
Style fixes
dantegd Oct 2, 2024
f103d6d
disable build on shared_libs option
divyegala Oct 2, 2024
72d1603
enable build on shared_libs option
divyegala Oct 2, 2024
7d23545
message to debug
divyegala Oct 2, 2024
54022c2
more debug msgs
divyegala Oct 2, 2024
7c0a54b
no shared libs
divyegala Oct 2, 2024
4bd1ab6
build all libcuvs in conda-python cuvs_bench
divyegala Oct 2, 2024
4b5abbf
merge upstream
divyegala Oct 2, 2024
58975f8
merge packaging
divyegala Oct 2, 2024
bbb94f5
address review
divyegala Oct 2, 2024
c40805b
fix cpu bench-ann building
divyegala Oct 2, 2024
265a8ac
include cutlass properly
divyegala Oct 2, 2024
86da10a
fix cpu bench-ann building
divyegala Oct 2, 2024
d03c28d
include cutlass properly
divyegala Oct 2, 2024
2d8691d
don't include get_cuvs.cmake in bench
divyegala Oct 3, 2024
996f11b
don't include get_cuvs.cmake in bench
divyegala Oct 3, 2024
c053faf
add openblass to recipe
divyegala Oct 3, 2024
1cda681
add openblass to recipe
divyegala Oct 3, 2024
d448b4c
Merge branch 'cuvs_bench_packaging' into cuvs_bench_remainder_scripts
divyegala Oct 3, 2024
18b81b2
Replacing more occurrences of raft with cuvs in cuvs_bench
cjnolet Oct 3, 2024
d8cc035
merge upstream
divyegala Oct 3, 2024
6b9a576
merge upstream
divyegala Oct 3, 2024
6c5b403
readd missing flags from build.sh
divyegala Oct 3, 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
Prev Previous commit
Next Next commit
merge upstream
  • Loading branch information
divyegala committed Oct 2, 2024
commit 4b5abbfa5e9b074033658dd659a3a46594cf808c
17 changes: 11 additions & 6 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -297,18 +297,25 @@ if(BUILD_SHARED_LIBS)
add_library(
cuvs SHARED
src/cluster/kmeans_balanced_fit_float.cu
src/cluster/kmeans_fit_mg_float.cu
src/cluster/kmeans_fit_mg_double.cu
src/cluster/kmeans_fit_double.cu
src/cluster/kmeans_fit_float.cu
src/cluster/kmeans_auto_find_k_float.cu
src/cluster/kmeans_fit_predict_double.cu
src/cluster/kmeans_fit_predict_float.cu
src/cluster/kmeans_predict_double.cu
src/cluster/kmeans_predict_float.cu
src/cluster/kmeans_balanced_fit_float.cu
src/cluster/kmeans_balanced_fit_predict_float.cu
src/cluster/kmeans_balanced_predict_float.cu
src/cluster/kmeans_balanced_fit_int8.cu
src/cluster/kmeans_balanced_fit_predict_int8.cu
src/cluster/kmeans_balanced_predict_int8.cu
src/cluster/kmeans_transform_double.cu
src/cluster/kmeans_transform_float.cu
src/cluster/single_linkage_float.cu
src/core/bitset.cu
src/distance/detail/pairwise_matrix/dispatch_canberra_float_float_float_int.cu
src/distance/detail/pairwise_matrix/dispatch_canberra_half_float_float_int.cu
src/distance/detail/pairwise_matrix/dispatch_canberra_double_double_double_int.cu
Expand Down Expand Up @@ -349,6 +356,8 @@ if(BUILD_SHARED_LIBS)
src/distance/detail/pairwise_matrix/dispatch_russel_rao_half_float_float_int.cu
src/distance/detail/pairwise_matrix/dispatch_russel_rao_double_double_double_int.cu
src/distance/detail/pairwise_matrix/dispatch_rbf.cu
src/distance/detail/pairwise_matrix/dispatch_l2_expanded_double_double_double_int64_t.cu
src/distance/detail/pairwise_matrix/dispatch_l2_expanded_float_float_float_int64_t.cu
src/distance/detail/fused_distance_nn.cu
src/distance/distance.cu
src/distance/pairwise_distance.cu
Expand Down Expand Up @@ -405,15 +414,12 @@ if(BUILD_SHARED_LIBS)
src/neighbors/ivf_pq/detail/ivf_pq_search_half_int64_t.cu
src/neighbors/ivf_pq/detail/ivf_pq_search_int8_t_int64_t.cu
src/neighbors/ivf_pq/detail/ivf_pq_search_uint8_t_int64_t.cu
src/neighbors/ivf_pq/detail/ivf_pq_search_with_filter_float_int64_t.cu
src/neighbors/ivf_pq/detail/ivf_pq_search_with_filter_half_int64_t.cu
src/neighbors/ivf_pq/detail/ivf_pq_search_with_filter_int8_t_int64_t.cu
src/neighbors/ivf_pq/detail/ivf_pq_search_with_filter_uint8_t_int64_t.cu
src/neighbors/nn_descent.cu
src/neighbors/nn_descent_float.cu
src/neighbors/nn_descent_half.cu
src/neighbors/nn_descent_int8.cu
src/neighbors/nn_descent_uint8.cu
src/neighbors/reachability.cu
src/neighbors/refine/detail/refine_device_float_float.cu
src/neighbors/refine/detail/refine_device_half_float.cu
src/neighbors/refine/detail/refine_device_int8_t_float.cu
Expand All @@ -424,14 +430,13 @@ if(BUILD_SHARED_LIBS)
src/neighbors/refine/detail/refine_host_uint8_t_float.cpp
src/neighbors/sample_filter.cu
src/selection/select_k_float_int64_t.cu
src/selection/select_k_float_int32_t.cu
src/selection/select_k_float_uint32_t.cu
src/selection/select_k_half_uint32_t.cu
src/stats/silhouette_score.cu
src/stats/trustworthiness_score.cu
)

target_compile_definitions(cuvs PRIVATE "CUVS_EXPLICIT_INSTANTIATE_ONLY")

target_compile_options(
cuvs INTERFACE $<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>:--expt-extended-lambda
--expt-relaxed-constexpr>
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.