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

Forward merge branch-24.04 to branch-24.06 #80

Merged
merged 2 commits into from
Apr 12, 2024

Conversation

benfred
Copy link
Member

@benfred benfred commented Apr 11, 2024

No description provided.

raydouglass and others added 2 commits April 11, 2024 14:34
Fixes some versions so `24.04` can be released.

rapidsai#69 implements the changes in the script

This PR should replace rapidsai#76

---------

Co-authored-by: Jake Awe <[email protected]>
Co-authored-by: Corey J. Nolet <[email protected]>
Co-authored-by: ptaylor <[email protected]>
@benfred benfred requested a review from a team as a code owner April 11, 2024 21:41
@benfred benfred added improvement Improves an existing functionality non-breaking Introduces a non-breaking change labels Apr 11, 2024
@@ -105,5 +105,5 @@ jobs:
cuda: '["12.2"]'
build_command: |
sccache -z;
build-all -DBUILD_PRIMS_BENCH=ON -DBUILD_ANN_BENCH=ON --verbose;
build-all --verbose;
Copy link
Member

@cjnolet cjnolet Apr 11, 2024

Choose a reason for hiding this comment

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

Oh- good find. I guess we don't need this in cuVS yet, do we?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, it was a good catch - @trxcllnt fixed this in a6e1436

@AyodeAwe AyodeAwe merged commit bc9d2d5 into rapidsai:branch-24.06 Apr 12, 2024
54 checks passed
@benfred benfred deleted the branch-24.06-merge-24.04 branch April 12, 2024 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement Improves an existing functionality non-breaking Introduces a non-breaking change
Projects
Development

Successfully merging this pull request may close these issues.

None yet

5 participants