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

Merge branch-0.18 into 0.19 #146

Merged
merged 24 commits into from
Feb 11, 2021
Merged

Merge branch-0.18 into 0.19 #146

merged 24 commits into from
Feb 11, 2021

Conversation

dantegd
Copy link
Member

@dantegd dantegd commented Feb 10, 2021

This PR fixes the merge conflicts in #136.

Just a reminder that this PR should not be squash merged. Use a merge-commit instead.

@dantegd dantegd added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Feb 10, 2021
@dantegd
Copy link
Member Author

dantegd commented Feb 10, 2021

@ajschmidt8 sorry for the conflicting PR, totally missed that there was one already!

@ajschmidt8 ajschmidt8 merged commit ebcf156 into rapidsai:branch-0.19 Feb 11, 2021
dantegd pushed a commit to dantegd/raft that referenced this pull request Jul 23, 2024
- The PR is one part of prefiltered brute force and should work with the PR of raft: rapidsai#2294

Authors:
  - rhdong (https://github.com/rhdong)

Approvers:
  - Corey J. Nolet (https://github.com/cjnolet)

URL: rapidsai/cuvs#146
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.

5 participants