Skip to content

CUDA: Fix cuda fail safe path#17599

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
tomoaki0705:fixCUDAFailSafePath
Jun 21, 2020
Merged

CUDA: Fix cuda fail safe path#17599
opencv-pushbot merged 1 commit intoopencv:3.4from
tomoaki0705:fixCUDAFailSafePath

Conversation

@tomoaki0705
Copy link
Copy Markdown
Contributor

@tomoaki0705 tomoaki0705 commented Jun 20, 2020 •
edited by alalek
Loading

resolves #17598
relates #17526

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under OpenCV (BSD) License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake
force_builders=Custom
buildworker:Custom=linux-4
build_image:Custom=ubuntu-cuda:18.04

@tomoaki0705
make the fail safe path actually safe
95ac650 
  * use only supported CC in the list
  * workaround of opencv#17526
@tomoaki0705
Copy link
Copy Markdown
Contributor Author

tomoaki0705 commented Jun 20, 2020

The original issue #17598 happens on master, but this path is not safe in both branch anyway, so I fix it from 3.4.
BTW, why #17526 was directly merged in to master, and not int the "regular 3.4 procedure" ?

@alalek
Copy link
Copy Markdown
Member

alalek commented Jun 21, 2020

@tomoaki0705 AFAIK, CUDA build scripts diverged from this #12224 (patch contains an improvement, so it was under a risk to put that on the stable 3.4 branch).
I believe the all necessary bugfixes after that PR are integrated, so it would be nice to backport changes from master to 3.4 (synchronize CUDA CMake scripts).

alalek
alalek approved these changes Jun 21, 2020
View reviewed changes
Copy link
Copy Markdown
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 1b49553 into opencv:3.4 Jun 21, 2020
@tomoaki0705 tomoaki0705 deleted the fixCUDAFailSafePath branch June 21, 2020 21:30
@alalek alalek mentioned this pull request Jun 23, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: build/install category: gpu/cuda (contrib) OpenCV 4.0+: moved to opencv_contrib

Projects

None yet

Milestone

3.4.11

Development

Successfully merging this pull request may close these issues.

3 participants

@tomoaki0705 @alalek @opencv-pushbot