Thrust voting #62
Merged
Thrust voting #62
Conversation
This file contains 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
also adding libDevIL to test program detection
- switch to trusty - using boost from repository - no more matrix for building with different options - it builds with cuda 7, 7.5 and 8 for gcc and once without cuda - it builds without cuda for clang.
| (ext == ".png") || | ||
| (ext == ".ppm") || | ||
| (ext == ".tga") || | ||
| (ext == ".tif") ) |
There was a problem hiding this comment.
Are these file formats not supported by opencv, which is already in the dependencies?
| - compiler: gcc | ||
| env: CXX_COMPILER=g++-4.8 C_COMPILER=gcc-4.8 TOOLSET=gcc VISUAL_DEBUG=OFF CCTAG_SERIALIZE=ON WITH_CUDA=OFF | ||
| env: CXX_COMPILER=g++-4.8 C_COMPILER=gcc-4.8 TOOLSET=gcc WITH_CUDA=ON CUDA_VERSION_MAJOR="8" CUDA_VERSION_MINOR="0" CUDA_PKG_LONGVERSION="${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}.61-1" CUDA_PKG_VERSION="${CUDA_VERSION_MAJOR}-${CUDA_VERSION_MINOR}" |
There was a problem hiding this comment.
Is it not better to add a new variant?
In order to keep one build variant with "VISUAL_DEBUG=ON CCTAG_SERIALIZE=ON"?
To ensure that the code with debug exports is builded once and not broken by new changes.
There was a problem hiding this comment.
I restored it but not as a variant in the matrix: at the end of the build(s) without cuda, it restarts with those flags. It avoids to explose the matrix of possibilities and also it's faster.
|
Before merging maybe update the README/BUILD with the updated info: required/supported CUDA versions, supported HW etc |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Compiling and running on CUDA 8 works now. Tested only on the GTX 980 Ti so far.
CUB code is now compiled for CUDA < 8, Thrust code for CUDA >= 8
Note that CUB code with CUDA 7.5 will still fail on GTX 980 cards and other modern cards.
Test program detection can now use DevIL to load more image formats.
The CI on travis is also updated to test the build with different cuda versions (connected to #49) and upgrading to trusty (connected to #41 )