[Java] Exposing merge API for multiple CAGRA indices by punAhuja · Pull Request #891 · rapidsai/cuvs

punAhuja · 2025-05-13T13:59:15Z

Exposing the C merge API in the Java layer.

This is work in progress.

Pull request for merge API in C is not merged yet:
#860

copy-pr-bot · 2025-05-13T13:59:18Z

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

punAhuja · 2025-05-21T15:08:58Z

#860 is merged now, will rebase my branch with branch-25.06 and update this pull request.

…alues

…ve whitespace and formatting issues

-Added description for function merge_cagra_indexes -passing parameters instead of builder instance for consistency -Initialized outputIndexParams in builder class of CagraMegeParams -Added license header in CagramergeParams -Commented out Logical Merge test as it is not yet implemented in C -Using File and InputStream instead of java.io.File

narangvivek10 · 2025-05-27T13:43:38Z

    return seg;
  }

+  private static MemorySegment segmentFromIndexParams(CagraIndexParams params, CuVSResourcesImpl resources) {


This method is almost identical (except for being static) to the one above. Should be just one.

Done, please review.

cjnolet · 2025-05-27T19:07:30Z

/ok to test e682d01

chatman · 2025-05-27T19:12:24Z

@narangvivek10 I incorporated your review feedback on behalf of @punAhuja.
@cjnolet I added a commit just a couple of minutes after your "ok to test", can you please trigger it again?

cjnolet · 2025-05-27T20:19:00Z

/ok to test 6b65b70

chatman · 2025-05-27T21:09:59Z

Java tests passed here :-) I think this is ready for merge now.

cjnolet · 2025-05-27T21:12:33Z

+            CagraIndex physicalMergedIndex = CagraIndex.merge(new CagraIndex[]{index1, index2}, physicalMergeParams);
+            log.info("Physical merge completed successfully");
+
+            // CagraMergeParams logicalMergeParams = new CagraMergeParams.Builder()


Please don't leave commented out code in here

Fixed, thanks!

…itional 10 items

chatman · 2025-05-27T21:28:46Z

@cjnolet fixed the uncommented code, and also added more repetitions to the randomized cagra test (to catch bugs, if any). It is a good to have test fix regardless of this feature. If you have any objections, I can revert that change.

If it looks good, please trigger another CI and merge. Thanks!

chatman · 2025-05-28T16:53:07Z

@cjnolet Can you please review and merge this?

cjnolet · 2025-05-28T21:43:21Z

@narangvivek10 @chatman please allow CI to fail the Recently updated checker before hitting the Update branch button. The branch doesn't have to be lockstep with the commits in main- this was done by design. But every time you hit the "Update branch" button, it's guaranteed to have to rerun CI.

cjnolet · 2025-05-28T21:43:35Z

/ok to test 3a749e9

narangvivek10 · 2025-05-29T01:01:16Z

d9a7089 commit is for conflict resolution caused due to the merging of #902

FYI @cjnolet

cjnolet · 2025-05-29T01:41:38Z

/ok to test 6f855d4

cjnolet · 2025-05-29T11:41:42Z

/merge

Exposing the C merge API in the Java layer. This is work in progress. Pull request for merge API in C is not merged yet: rapidsai#860 Authors: - https://github.com/punAhuja - Vivek Narang (https://github.com/narangvivek10) Approvers: - Ishan Chattopadhyaya (https://github.com/chatman) - Corey J. Nolet (https://github.com/cjnolet) URL: rapidsai#891

punAhuja requested a review from a team as a code owner May 13, 2025 13:59

github-actions Bot added the cpp label May 13, 2025

punAhuja closed this May 13, 2025

punAhuja changed the title ~~[Java] Suppor for merge API for multiple CAGRA indices~~ [Java] Support for merge API for multiple CAGRA indices May 13, 2025

punAhuja changed the title ~~[Java] Support for merge API for multiple CAGRA indices~~ [Java][WIP] Exposing merge API for multiple CAGRA indices May 13, 2025

punAhuja reopened this May 13, 2025

cjnolet assigned punAhuja May 19, 2025

cjnolet added improvement Improves an existing functionality non-breaking Introduces a non-breaking change labels May 19, 2025

cjnolet added this to Unstructured Data Processing May 19, 2025

cjnolet moved this to In Progress in Unstructured Data Processing May 19, 2025

punAhuja added 2 commits May 21, 2025 23:49

[Java] Merge API changes passing merge_params as NULL using default v…

da9163a

…alues

[Java] Added changes to support custom merge_params during merge

7cac5d2

punAhuja force-pushed the merge-api-java-support branch from 0afbed8 to 7cac5d2 Compare May 21, 2025 18:20

github-actions Bot removed the cpp label May 21, 2025

Consolidate Cagra index merge tests into CagraBuildAndSearchIT; resol…

d2a1e3d

…ve whitespace and formatting issues

punAhuja changed the title ~~[Java][WIP] Exposing merge API for multiple CAGRA indices~~ [Java] Exposing merge API for multiple CAGRA indices May 23, 2025

narangvivek10 reviewed May 26, 2025

View reviewed changes

Comment thread java/internal/src/cuvs_java.c

narangvivek10 reviewed May 26, 2025

View reviewed changes

Comment thread java/cuvs-java/src/main/java/com/nvidia/cuvs/CagraMergeParams.java Outdated

narangvivek10 reviewed May 26, 2025

View reviewed changes

Comment thread java/cuvs-java/src/main/java/com/nvidia/cuvs/CagraMergeParams.java Outdated

narangvivek10 reviewed May 26, 2025

View reviewed changes

Comment thread java/cuvs-java/src/main/java/com/nvidia/cuvs/CagraMergeParams.java

narangvivek10 reviewed May 27, 2025

View reviewed changes

Comment thread java/cuvs-java/src/test/java/com/nvidia/cuvs/CagraBuildAndSearchIT.java Outdated

narangvivek10 reviewed May 27, 2025

View reviewed changes

Comment thread java/cuvs-java/src/test/java/com/nvidia/cuvs/CagraBuildAndSearchIT.java Outdated

narangvivek10 reviewed May 27, 2025

View reviewed changes

Merge branch 'branch-25.06' into merge-api-java-support

e682d01

Incorporating review feedback

3d81107

Merge branch 'branch-25.06' into merge-api-java-support

6b65b70

cjnolet reviewed May 27, 2025

View reviewed changes

Ishan Chattopadhyaya added 2 commits May 28, 2025 02:54

Removing commented out code

6aadcb5

Increasing test iterations, relaxing topK checking by considering add…

d8f7edf

…itional 10 items

Merge branch 'branch-25.06' into merge-api-java-support

282fd70

chatman approved these changes May 28, 2025

View reviewed changes

narangvivek10 added 3 commits May 28, 2025 16:31

Merge branch 'branch-25.06' into merge-api-java-support

baadde4

Merge branch 'branch-25.06' into merge-api-java-support

9bada34

Merge branch 'branch-25.06' into merge-api-java-support

3a749e9

Merge branch 'branch-25.06' into merge-api-java-support

d9a7089

fix compilation error - set vectors to null

6f855d4

cjnolet approved these changes May 29, 2025

View reviewed changes

rapids-bot Bot merged commit c7a1b57 into rapidsai:branch-25.06 May 29, 2025
75 checks passed

github-project-automation Bot moved this from In Progress to Done in Unstructured Data Processing May 29, 2025

Conversation

punAhuja commented May 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

copy-pr-bot Bot commented May 13, 2025

Uh oh!

punAhuja commented May 21, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

narangvivek10 May 27, 2025

Choose a reason for hiding this comment

Uh oh!

chatman May 27, 2025

Choose a reason for hiding this comment

Uh oh!

cjnolet commented May 27, 2025

Uh oh!

chatman commented May 27, 2025

Uh oh!

cjnolet commented May 27, 2025

Uh oh!

chatman commented May 27, 2025

Uh oh!

cjnolet May 27, 2025

Choose a reason for hiding this comment

Uh oh!

chatman May 27, 2025

Choose a reason for hiding this comment

Uh oh!

chatman commented May 27, 2025

Uh oh!

chatman commented May 28, 2025

Uh oh!

cjnolet commented May 28, 2025

Uh oh!

cjnolet commented May 28, 2025

Uh oh!

narangvivek10 commented May 29, 2025

Uh oh!

cjnolet commented May 29, 2025

Uh oh!

cjnolet commented May 29, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

punAhuja commented May 13, 2025 •

edited

Loading