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

Rename CUDA_TRY macro to CUDF_CUDA_TRY, rename CHECK_CUDA macro to CUDF_CHECK_CUDA. #10589

Merged
merged 7 commits into from
Apr 5, 2022

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Apr 5, 2022

This PR renames the CUDA_TRY macro to CUDF_CUDA_TRY to avoid name conflicts with other libraries. Resolves #9660.

Similarly, CHECK_CUDA has been renamed to CUDF_CHECK_CUDA.

@bdice bdice added code quality improvement Improvement / enhancement to an existing function breaking Breaking change labels Apr 5, 2022
@bdice bdice self-assigned this Apr 5, 2022
@bdice bdice requested review from a team as code owners April 5, 2022 03:55
@github-actions github-actions bot added Java Affects Java cuDF API. libcudf Affects libcudf (C++/CUDA) code. labels Apr 5, 2022
@codecov
Copy link

codecov bot commented Apr 5, 2022

Codecov Report

Merging #10589 (126964d) into branch-22.06 (0aef0c1) will increase coverage by 0.02%.
The diff coverage is n/a.

❗ Current head 126964d differs from pull request most recent head 9fa4d7c. Consider uploading reports for the commit 9fa4d7c to get more accurate results

@@               Coverage Diff                @@
##           branch-22.06   #10589      +/-   ##
================================================
+ Coverage         86.29%   86.31%   +0.02%     
================================================
  Files               140      140              
  Lines             22255    22255              
================================================
+ Hits              19205    19210       +5     
+ Misses             3050     3045       -5     
Impacted Files Coverage Δ
python/cudf/cudf/core/column/string.py 89.10% <0.00%> (+0.12%) ⬆️
python/cudf/cudf/core/groupby/groupby.py 91.72% <0.00%> (+0.22%) ⬆️
python/cudf/cudf/core/column/numerical.py 96.17% <0.00%> (+0.29%) ⬆️
python/cudf/cudf/core/tools/datetimes.py 84.49% <0.00%> (+0.30%) ⬆️
python/cudf/cudf/core/column/lists.py 90.49% <0.00%> (+0.45%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0aef0c1...9fa4d7c. Read the comment docs.

cpp/docs/DEVELOPER_GUIDE.md Outdated Show resolved Hide resolved

CHECK_CUDA(stream.value());
CUDF_CHECK_CUDA(stream.value());
Copy link
Contributor

Choose a reason for hiding this comment

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

This one seems unnecessary. The CHECK_CUDA does a cudaStreamSynchronize on the stream.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I agree with your assessment, good catch.

Copy link
Contributor

Choose a reason for hiding this comment

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

The CHECK_CUDA does a cudaStreamSynchronize on the stream.

Only in debug mode.

cpp/include/cudf/utilities/error.hpp Show resolved Hide resolved
@bdice bdice requested a review from davidwendt April 5, 2022 12:45
@bdice bdice changed the title Rename CUDA_TRY macro to CUDF_CUDA_TRY. Rename CUDA_TRY macro to CUDF_CUDA_TRY, rename CHECK_CUDA macro to CUDF_CHECK_CUDA. Apr 5, 2022
@bdice
Copy link
Contributor Author

bdice commented Apr 5, 2022

@gpucibot merge

@rapids-bot rapids-bot bot merged commit e8d189c into rapidsai:branch-22.06 Apr 5, 2022
rapids-bot bot pushed a commit to rapidsai/cuspatial that referenced this pull request Apr 13, 2022
Following rapidsai/cudf#10589, this PR removes the dependency to `cudf::CUDA_TRY` and introduces `CUSPATIAL_CUDA_TRY`.

Contributes to #474

Authors:
  - Michael Wang (https://github.com/isVoid)

Approvers:
  - Mark Harris (https://github.com/harrism)
  - H. Thomson Comer (https://github.com/thomcom)

URL: #516
abellina added a commit to abellina/cudf that referenced this pull request Apr 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking Breaking change improvement Improvement / enhancement to an existing function Java Affects Java cuDF API. libcudf Affects libcudf (C++/CUDA) code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] CUDA_TRY macro conflicts with other RAPIDS libraries
4 participants