Skip to content

Forward-merge branch-24.10 into branch-24.12#6099

Merged
AyodeAwe merged 2 commits intobranch-24.12from
branch-24.10
Oct 10, 2024
Merged

Forward-merge branch-24.10 into branch-24.12#6099
AyodeAwe merged 2 commits intobranch-24.12from
branch-24.10

Conversation

@rapids-bot
Copy link
Copy Markdown
Contributor

@rapids-bot rapids-bot Bot commented Oct 4, 2024

Forward-merge triggered by push to branch-24.10 that creates a PR to keep branch-24.12 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge. See forward-merger docs for more info.

This PR updates to use cuVS instead of RAFT for vector search, pairwise distances and clustering. This is required for us to deprecate the vector search functionality in RAFT, in favour of the code in cuVS.

Because some code hasn't been migrated over to cuvs yet, we will continue to use the version in RAFT - but with RAFT in header only mode. In particular this functionality will be used in RAFT header only mode:

* Random Ball Cover (see rapidsai/cuvs#218)
* Sparse KNN
* nn-descent rapidsai/cuvs#364
* [MetricProcessor](c7d1b0e)
* knn_merge_parts
* build_dendrogram_host
* build_sorted_mst
*  raft DistanceType

Because sparse KNN in RAFT uses the DistanceType in RAFT, we can't fully move over to use the DistanceType code in cuVS with this PR. (Also the DistanceType code in RAFT has a `Precomputed` option that isn't available in cuvs - but is needed by cuml for dbscan.)  This means that we have both the raft and cuvs DistanceType enum's in use with this change, with conversions between them.

Authors:
  - Ben Frederickson (https://github.com/benfred)
  - Bradley Dice (https://github.com/bdice)
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)
  - Corey J. Nolet (https://github.com/cjnolet)

Approvers:
  - Corey J. Nolet (https://github.com/cjnolet)
  - Dante Gama Dessavre (https://github.com/dantegd)
  - Bradley Dice (https://github.com/bdice)

URL: #6085
@rapids-bot rapids-bot Bot requested review from a team as code owners October 4, 2024 03:03
@rapids-bot rapids-bot Bot requested review from AyodeAwe, cjnolet and dantegd October 4, 2024 03:03
@rapids-bot
Copy link
Copy Markdown
Contributor Author

rapids-bot Bot commented Oct 4, 2024

FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/

IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the /merge comment). Instead, an admin must manually merge by changing the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

@github-actions github-actions Bot added conda conda issue Cython / Python Cython or Python issue CMake CUDA/C++ ci labels Oct 4, 2024
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (branch-24.12@65a02f6). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff               @@
##             branch-24.12    #6099   +/-   ##
===============================================
  Coverage                ?   68.24%           
===============================================
  Files                   ?      193           
  Lines                   ?    12837           
  Branches                ?        0           
===============================================
  Hits                    ?     8761           
  Misses                  ?     4076           
  Partials                ?        0           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@AyodeAwe AyodeAwe merged commit ded22dd into branch-24.12 Oct 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci CMake conda conda issue CUDA/C++ Cython / Python Cython or Python issue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants