Skip to content

Fix errors when building with cuda stubs#18641

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
rtimpe:fix_cuda_stubs
Oct 22, 2020
Merged

Fix errors when building with cuda stubs#18641
opencv-pushbot merged 1 commit intoopencv:3.4from
rtimpe:fix_cuda_stubs

Conversation

@rtimpe
Copy link
Copy Markdown

@rtimpe rtimpe commented Oct 21, 2020 •
edited by alalek
Loading

Fixes two errors when building with the options WITH_CUDA=ON and BUILD_CUDA_STUBS=ON on a machine without CUDA.

In the cudaarithm module, make sure cuda_runtime.h only gets included when CUDA is installed.

In the stitching module, don't assume that cuda is present just because cudaarithm and cudawarping are present (as is the case when building with the above options).

Fixes opencv/opencv_contrib#2724

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 Apache 2 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:16.04

Fix errors when building with cuda stubs
22ee5c0 
Fixes two errors when building with the options WITH_CUDA=ON and BUILD_CUDA_STUBS=ON on a machine without CUDA.

In the cudaarithm module, make sure cuda_runtime.h only gets included when CUDA is installed.

In the stitching module, don't assume that cuda is present just because cudaarithm and cudawarping are present (as is the case when building with the above options).
alalek
alalek approved these changes Oct 22, 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 for contribution 👍

@opencv-pushbot opencv-pushbot merged commit 8869d32 into opencv:3.4 Oct 22, 2020
@rtimpe
Copy link
Copy Markdown
Author

rtimpe commented Oct 22, 2020

Thanks for the merge. Do you have a rough idea of when this will be merged into master and included in the next 4.x release?

@alalek
Copy link
Copy Markdown
Member

alalek commented Oct 22, 2020

There are regular weekly / bi-weekly merges into master branch (with propagation of related patches for moved modules into opencv_contrib).

This was referenced Oct 26, 2020
Merged
Merged
@alalek alalek mentioned this pull request Nov 27, 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

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

Projects

None yet

Milestone

3.4.13

Development

Successfully merging this pull request may close these issues.

3 participants

@rtimpe @alalek @opencv-pushbot