Skip to content

[Java] Cleaner approach to Enums #995

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

Closed
narangvivek10 wants to merge 3 commits into from
Closed

[Java] Cleaner approach to Enums #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66ff00e
replace tabs with spaces
narangvivek10 Jun 6, 2025
6b42a1b
cleanup - remove unused imports
narangvivek10 Jun 6, 2025
60c1ddb
replace integer values with enum options
narangvivek10 Jun 6, 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
1 change: 0 additions & 1 deletion java/cuvs-java/src/main/java/com/nvidia/cuvs/CagraIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.nio.file.Path;
import java.util.Objects;

import com.nvidia.cuvs.BruteForceIndex.Builder;
import com.nvidia.cuvs.spi.CuVSProvider;

/**
Expand Down
29 changes: 18 additions & 11 deletions java/cuvs-java/src/main/java22/com/nvidia/cuvs/internal/BruteForceIndexImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@
import static com.nvidia.cuvs.internal.panama.headers_h.omp_set_num_threads;
import static com.nvidia.cuvs.internal.panama.headers_h.cudaMemcpy;
import static com.nvidia.cuvs.internal.panama.headers_h.cudaStream_t;
import static com.nvidia.cuvs.internal.panama.headers_h.kDLCUDA;
import static com.nvidia.cuvs.internal.panama.headers_h.kDLFloat;
import static com.nvidia.cuvs.internal.panama.headers_h.kDLInt;
import static com.nvidia.cuvs.internal.panama.headers_h.kDLUInt;
import static com.nvidia.cuvs.internal.panama.headers_h.NO_FILTER;
import static com.nvidia.cuvs.internal.panama.headers_h_1.cudaMemcpyDefault;
import static com.nvidia.cuvs.internal.panama.headers_h_1.cudaMemcpyHostToDevice;

import java.io.FileInputStream;
import java.io.FileOutputStream;
Expand Down Expand Up @@ -170,11 +177,11 @@ private IndexReference build() throws Throwable {
// IMPORTANT: this should only come AFTER cuvsRMMAlloc call
MemorySegment datasetMemorySegmentP = datasetMemorySegment.get(C_POINTER, 0);

returnValue = cudaMemcpy(datasetMemorySegmentP, datasetMemSegment, datasetBytes, 4);
returnValue = cudaMemcpy(datasetMemorySegmentP, datasetMemSegment, datasetBytes, cudaMemcpyDefault());
checkCudaError(returnValue, "cudaMemcpy");

long datasetShape[] = { rows, cols };
MemorySegment datasetTensor = prepareTensor(arena, datasetMemorySegmentP, datasetShape, 2, 32, 2, 2, 1);
MemorySegment datasetTensor = prepareTensor(arena, datasetMemorySegmentP, datasetShape, kDLFloat(), 32, 2, kDLCUDA(), 1, MemorySegment.NULL);

MemorySegment index = arena.allocate(cuvsBruteForceIndex_t);

Expand Down Expand Up @@ -261,21 +268,21 @@ public SearchResults search(BruteForceQuery cuvsQuery) throws Throwable {
MemorySegment neighborsDP = neighborsD.get(C_POINTER, 0);
MemorySegment distancesDP = distancesD.get(C_POINTER, 0);

returnValue = cudaMemcpy(queriesDP, querySeg, queriesBytes, 4);
returnValue = cudaMemcpy(queriesDP, querySeg, queriesBytes, cudaMemcpyDefault());
checkCudaError(returnValue, "cudaMemcpy");

long queriesShape[] = { numQueries, vectorDimension };
MemorySegment queriesTensor = prepareTensor(arena, queriesDP, queriesShape, 2, 32, 2, 2, 1);
MemorySegment queriesTensor = prepareTensor(arena, queriesDP, queriesShape, kDLFloat(), 32, 2, kDLCUDA(), 1, MemorySegment.NULL);
long neighborsShape[] = { numQueries, topk };
MemorySegment neighborsTensor = prepareTensor(arena, neighborsDP, neighborsShape, 0, 64, 2, 2, 1);
MemorySegment neighborsTensor = prepareTensor(arena, neighborsDP, neighborsShape, kDLInt(), 64, 2, kDLCUDA(), 1, MemorySegment.NULL);
long distancesShape[] = { numQueries, topk };
MemorySegment distancesTensor = prepareTensor(arena, distancesDP, distancesShape, 2, 32, 2, 2, 1);
MemorySegment distancesTensor = prepareTensor(arena, distancesDP, distancesShape, kDLFloat(), 32, 2, kDLCUDA(), 1, MemorySegment.NULL);

MemorySegment prefilter = cuvsFilter.allocate(arena);
MemorySegment prefilterTensor;

if (prefilterDataMemorySegment == MemorySegment.NULL) {
cuvsFilter.type(prefilter, 0); // NO_FILTER
cuvsFilter.type(prefilter, NO_FILTER());
cuvsFilter.addr(prefilter, 0);
} else {
long prefilterShape[] = { (prefilterDataLength + 31) / 32 };
Expand All @@ -287,10 +294,10 @@ public SearchResults search(BruteForceQuery cuvsQuery) throws Throwable {

prefilterDP = prefilterD.get(C_POINTER, 0);

returnValue = cudaMemcpy(prefilterDP, prefilterDataMemorySegment, prefilterBytes, 1);
returnValue = cudaMemcpy(prefilterDP, prefilterDataMemorySegment, prefilterBytes, cudaMemcpyHostToDevice());
checkCudaError(returnValue, "cudaMemcpy");

prefilterTensor = prepareTensor(arena, prefilterDP, prefilterShape, 1, 32, 1, 2, 1);
prefilterTensor = prepareTensor(arena, prefilterDP, prefilterShape, kDLUInt(), 32, 1, kDLCUDA(), 1, MemorySegment.NULL);

cuvsFilter.type(prefilter, 2);
cuvsFilter.addr(prefilter, prefilterTensor.address());
Expand All @@ -306,9 +313,9 @@ public SearchResults search(BruteForceQuery cuvsQuery) throws Throwable {
returnValue = cuvsStreamSync(cuvsResources);
checkCuVSError(returnValue, "cuvsStreamSync");

returnValue = cudaMemcpy(neighborsMemorySegment, neighborsDP, neighborsBytes, 4);
returnValue = cudaMemcpy(neighborsMemorySegment, neighborsDP, neighborsBytes, cudaMemcpyDefault());
checkCudaError(returnValue, "cudaMemcpy");
returnValue = cudaMemcpy(distancesMemorySegment, distancesDP, distanceBytes, 4);
returnValue = cudaMemcpy(distancesMemorySegment, distancesDP, distanceBytes, cudaMemcpyDefault());
checkCudaError(returnValue, "cudaMemcpy");

returnValue = cuvsRMMFree(cuvsResources, neighborsDP, neighborsBytes);
Expand Down
Loading