Skip to content

cudev - Rework some code #13903

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

Merged
merged 1 commit into from
Feb 25, 2019
Merged

cudev - Rework some code #13903

merged 1 commit into from
Feb 25, 2019

Conversation

nglee
Copy link
Contributor

@nglee nglee commented Feb 25, 2019

  • Use shfl_down, instead of __shfl_down, on scan.hpp
modules/cudev/include/opencv2/cudev/warp/scan.hpp
modules/cudev/include/opencv2/cudev/warp/shuffle.hpp

This fix is applied to make the code conform to the structure of cudev module. __shfl_down should be directly called at shuffle.hpp and other files in cudev module should call shfl_down, which is a wrapper for __shfl_down.

  • Remove race conditions
modules/cudev/include/opencv2/cudev/block/scan.hpp
modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp

This fix is applied to pass the following cuda-memcheck --tool racecheck tests:

cuda-memcheck --tool racecheck opencv_test_cudev
cuda-memcheck --tool racecheck opencv_test_cudaarithm --gtest_filter=*Integral*
force_builders=Custom
buildworker:Custom=linux-1,linux-2,linux-4
docker_image:Custom=ubuntu-cuda:16.04

- Use shfl_down, instead of __shfl_down, on warp scan
- Remove race conditions
Copy link
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Thank you!

@opencv-pushbot opencv-pushbot merged commit 2b6be3c into opencv:3.4 Feb 25, 2019
@nglee nglee deleted the dev_CudevRework branch February 25, 2019 16:57
@alalek alalek mentioned this pull request Feb 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug category: gpu/cuda (contrib) OpenCV 4.0+: moved to opencv_contrib
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants