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

Removing conflict w/ CUDA_CHECK #378

Merged

Conversation

cjnolet
Copy link
Member

@cjnolet cjnolet commented Nov 15, 2021

Closes #128

definign macro. Also adding new raft-scoped macros
@cjnolet cjnolet added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Nov 15, 2021
@cjnolet cjnolet requested review from a team as code owners November 15, 2021 23:18
@github-actions github-actions bot added the cpp label Nov 15, 2021
@cjnolet cjnolet changed the title Removing conflict w/ CUDA_CHECK and other projects by conditionally Removing conflict w/ CUDA_CHECK Nov 15, 2021
Copy link
Member

@divyegala divyegala left a comment

Choose a reason for hiding this comment

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

LGTM

* TODO: Rename original implementations in 22.04 to fix
* https://github.com/rapidsai/raft/issues/128
*/
#define RAFT_CUDA_CHECK(call) CUDA_CHECK(call)
Copy link
Contributor

Choose a reason for hiding this comment

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

I would have done this in reverse. That is, I would have conditionally defined CUDA_CHECK as a call to RAFT_CUDA_CHECK which would make the next change smaller. But this way is fine too.

@cjnolet
Copy link
Member Author

cjnolet commented Nov 16, 2021

@gpucibot merge

@rapids-bot rapids-bot bot merged commit 258c116 into rapidsai:branch-21.12 Nov 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cpp 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.

[BUG] RAFT header conflicts
3 participants