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

Updating cugraph to use consolidated libraft target #3348

Merged
merged 6 commits into from
Mar 21, 2023

Conversation

cjnolet
Copy link
Member

@cjnolet cjnolet commented Mar 18, 2023

Pleae note, this should not be merged until rapidsai/raft#1333 is ready to be merged.

@cjnolet cjnolet requested review from a team as code owners March 18, 2023 15:33
rapids-bot bot pushed a commit to rapidsai/raft that referenced this pull request Mar 20, 2023
…#1333)

Now that we no longer need to rely on the FAISS dependency, this PR:
1. Consolidates  the `libraft-distance` and `libraft-nn` targets into a single `libraft` artifact
2. Introduces a new `raft::compiled` target to link against the new `libraft.so` binary. Removes `raft::distance`and `raft::nn` targets.
3. Consolidates `RAFT_DISTANCE_COMPILED` and `RAFT_NN_COMPILED` pre-processor vars into a single `RAFT_COMPILED` (to match similar pattern implementated by `spdlog`)
4. Consolidates `specializations.cuh` headers
5. Updates all docs, scripts, and build infra

This change has been a long time coming and is intended to be a 23.04 feature. This is further going to require updates to several projects downstream. Here's a checklist to track that progress:
- [x] offline announcement
- [x] cuml rapidsai/cuml#5272
- [x] cugraph rapidsai/cugraph#3348
- [x] cuopt rapidsai/cuopt#1023
- [x] cugraph-ops rapidsai/cugraph-ops#429


This PR depended on #1340 (removing FAISS from the build) and on #1202 (replacing the FAISS bfknn w/ our own), both of which have been merged. 

Closes #824

Authors:
  - Corey J. Nolet (https://github.com/cjnolet)
  - Ben Frederickson (https://github.com/benfred)

Approvers:
  - Sevag H (https://github.com/sevagh)
  - Divye Gala (https://github.com/divyegala)
  - Ben Frederickson (https://github.com/benfred)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #1333
@cjnolet
Copy link
Member Author

cjnolet commented Mar 21, 2023

This should be good to merge whenever CI is complete.

@ChuckHastings ChuckHastings added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Mar 21, 2023
@ChuckHastings
Copy link
Collaborator

/merge

@rapids-bot rapids-bot bot merged commit cbd18ab into rapidsai:branch-23.04 Mar 21, 2023
@@ -11,6 +11,8 @@ rapids-print-env

rapids-logger "Begin cpp build"

rapids-mamba-retry mambabuild conda/recipes/libcugraph
LIBRAFT_CHANNEL=$(rapids-get-artifact ci/raft/pull-request/1333/c60c0cb/raft_conda_cpp_cuda11_$(arch).tar.gz)
Copy link
Member

Choose a reason for hiding this comment

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

@cjnolet, @sevagh, changes like this are fine for temporarily testing upstream packages, but they should never be merged.

when changes like this are merged, there's too much potential to forget to revert them in the future which will cause unexpected issues in later builds.

@cjnolet
Copy link
Member Author

cjnolet commented Mar 24, 2023

Understood, We only did this to unblock cugraph while CI was struggling to get the artifacts deployed.

@jnke2016 has a PR to revert them.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants