Skip to content

[cmake] fix sm86 only for cuda >= 11.1 #925

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.

Sign up for GitHub

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
simogasp merged 2 commits into from
Nov 23, 2020
Merged

[cmake] fix sm86 only for cuda >= 11.1 #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4724a52
[cmake] fix sm86 only for cuda >= 11.1
simogasp Oct 29, 2020
c73afe1
[cmake] update version of popsift to match fixes to sm86
simogasp Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ if(AV_BUILD_POPSIFT)
set(POPSIFT_TARGET popsift)
ExternalProject_Add(${POPSIFT_TARGET}
GIT_REPOSITORY https://github.com/alicevision/popsift
GIT_TAG c8a669bce33db2525f6873a89c6d7c7434f93537
GIT_TAG v1.0.0-rc3
PREFIX ${BUILD_DIR}
BUILD_IN_SOURCE 0
BUILD_ALWAYS 0
Expand Down
4 changes: 3 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,8 +738,10 @@ if(ALICEVISION_HAVE_CUDA)

set(CUDA_NVCC_FLAGS_DEBUG "${CUDA_NVCC_FLAGS_DEBUG};-G;-g")
# set(CUDA_NVCC_FLAGS_RELEASE "${CUDA_NVCC_FLAGS_RELEASE};-O3")
if(CUDA_VERSION_MAJOR GREATER_EQUAL 11)
if(CUDA_VERSION VERSION_GREATER_EQUAL 11.1)
set(ALICEVISION_CUDA_CC_LIST_BASIC 35 50 52 60 61 62 70 72 75 80 86)
elseif(CUDA_VERSION_MAJOR GREATER_EQUAL 11)
set(ALICEVISION_CUDA_CC_LIST_BASIC 35 50 52 60 61 62 70 72 75 80)
elseif(CUDA_VERSION_MAJOR GREATER_EQUAL 10)
set(ALICEVISION_CUDA_CC_LIST_BASIC 30 35 50 52 60 61 62 70 72 75)
elseif(CUDA_VERSION_MAJOR GREATER_EQUAL 9)
Expand Down