Adding patch to Opencv (3.3.0-3.4.1) for fixing conflict between CUDA and OpenCV dnn header file#8502
Merged
adamjstewart merged 4 commits intospack:developfrom Jun 18, 2018
samfux84:opencv_341_cuda_dnn_patch
Merged
Adding patch to Opencv (3.3.0-3.4.1) for fixing conflict between CUDA and OpenCV dnn header file#8502adamjstewart merged 4 commits intospack:developfrom samfux84:opencv_341_cuda_dnn_patch
adamjstewart merged 4 commits intospack:developfrom
samfux84:opencv_341_cuda_dnn_patch
Conversation
Member
|
Has this patch been submitted upstream? |
Contributor
Author
|
@adamjstewart: I have opened an issue in the OpenCV github repo (opencv/opencv#11745). One of the OpenCV developers already fixed this issue in the develop branch along with many other commits. I just created a patch to fix the problem for 3.4.1 and older versions (since I could reproduce it also with 3.3.0, iI have used when='@3.3.0:3.4.1'), and posted the patch in the issue opencv/opencv#11745 but did not report it elsewhere. |
adamjstewart
approved these changes
Jun 18, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #8461
When installing OpenCV 3.4.1 or older versions (I could reproduce the same behavior also with version 3.3.0) with +cuda and +dnn, then the compilation failed, because one of the header files from the OpenCV dnn module has the same name as a cuda header file and the cuda header file is included instead of the OpenCV one.
Issue #8461 contains more information on the problem.