Skip to content

[Fix] Various fixes for 25.02.01 point release #695

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Feb 24, 2025
Merged

[Fix] Various fixes for 25.02.01 point release #695

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ac5cc15
[Fix] CAGRA 'merge' API compilation error under CUDA 12.4
rhdong Feb 14, 2025
8447421
fix by index::dataset_index_t
rhdong Feb 14, 2025
d4366ce
[Fix] Duplicated node issue on Cagra NN-descent
rhdong Feb 14, 2025
88b018d
Fix for a crash situation when using different threads (#680)
Feb 13, 2025
1b36e8c
Java: Fixing the broken pre-filtering for Brute Force
Feb 19, 2025
85d8644
FIX add sklearn as dependency of cuvs-bench
dantegd Feb 20, 2025
6a36092
[Fix] Brute force with prefilter java test failure
rhdong Feb 22, 2025
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
13 changes: 12 additions & 1 deletion java/internal/src/cuvs_java.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,8 @@ void search_brute_force_index(cuvsBruteForceIndex_t index, float *queries, int t

int64_t *neighbors;
float *distances, *queries_d;
uint32_t *prefilter_d = NULL;
Copy link
Member Author

@rhdong rhdong Feb 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @chatman @cjnolet, here is the pre-filter failure fix, please help to review it before merging. Thanks a lot!

int64_t prefilter_len = 0;

cuvsRMMAlloc(cuvs_resources, (void**) &queries_d, sizeof(float) * n_queries * dimensions);
cuvsRMMAlloc(cuvs_resources, (void**) &neighbors, sizeof(int64_t) * n_queries * topk);
Expand All @@ -289,6 +291,7 @@ void search_brute_force_index(cuvsBruteForceIndex_t index, float *queries, int t
DLManagedTensor distances_tensor = prepare_tensor(distances, distances_shape, kDLFloat, 32, 2, kDLCUDA);

cuvsFilter prefilter;
DLManagedTensor prefilter_tensor;
if (prefilter_data == NULL) {
prefilter.type = NO_FILTER;
prefilter.addr = (uintptr_t)NULL;
Expand All @@ -297,7 +300,12 @@ void search_brute_force_index(cuvsBruteForceIndex_t index, float *queries, int t
int num_integers = (prefilter_data_length+63)/64 * 2;
int extraPaddingByteExists = prefilter_data_length % 64 > 32? 0: 1;
int64_t prefilter_shape[1] = {(prefilter_data_length + 31) / 32};
DLManagedTensor prefilter_tensor = prepare_tensor(prefilter_data, prefilter_shape, kDLUInt, 32, 1, kDLCUDA);

prefilter_len = prefilter_shape[0];
cuvsRMMAlloc(cuvs_resources, (void**) &prefilter_d, sizeof(uint32_t) * prefilter_len);
cudaMemcpy(prefilter_d, prefilter_data, sizeof(uint32_t) * prefilter_len, cudaMemcpyHostToDevice);

prefilter_tensor = prepare_tensor(prefilter_d, prefilter_shape, kDLUInt, 32, 1, kDLCUDA);
prefilter.type = BITMAP;
prefilter.addr = (uintptr_t)&prefilter_tensor;
}
Expand All @@ -311,6 +319,9 @@ void search_brute_force_index(cuvsBruteForceIndex_t index, float *queries, int t
cuvsRMMFree(cuvs_resources, neighbors, sizeof(int64_t) * n_queries * topk);
cuvsRMMFree(cuvs_resources, distances, sizeof(float) * n_queries * topk);
cuvsRMMFree(cuvs_resources, queries_d, sizeof(float) * n_queries * dimensions);
if(prefilter_d != NULL) {
cuvsRMMFree(cuvs_resources, prefilter_d, sizeof(uint32_t) * prefilter_len);
}
}

/**
Expand Down
Loading