Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitba298d1

Browse files
committed
stop showing old generations in default
* keep it possible to build for old CC * make sure old generations don't come up for choice * remove some related version check
1 parent6bd87e8 commitba298d1

File tree

3 files changed

+6
-20
lines changed

3 files changed

+6
-20
lines changed

‎cmake/OpenCVDetectCUDA.cmake‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,12 @@ if(CUDA_FOUND)
7272

7373
message(STATUS"CUDA detected: "${CUDA_VERSION})
7474

75-
set(_generations"Fermi""Kepler""Maxwell""Pascal""Volta""Turing")
75+
OCV_OPTION(CUDA_ENABLE_DEPRECATED_GENERATION"Enable deprecated generations in the list"OFF)
76+
set(_generations"Maxwell""Pascal""Volta""Turing")
77+
if(CUDA_ENABLE_DEPRECATED_GENERATION)
78+
set(_generations"Fermi""${_generations}")
79+
set(_generations"Kepler""${_generations}")
80+
endif()
7681
set(_arch_fermi"2.0")
7782
set(_arch_kepler"3.0;3.5;3.7")
7883
set(_arch_maxwell"5.0;5.2")
@@ -124,10 +129,6 @@ if(CUDA_FOUND)
124129
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
125130
endmacro()
126131

127-
macro(ocv_wipeout_deprecated _arch_bin_list)
128-
string(REPLACE"2.1""2.1(2.0)"${_arch_bin_list}"${${_arch_bin_list}}")
129-
endmacro()
130-
131132
set(__cuda_arch_ptx"")
132133
if(CUDA_GENERATIONSTREQUAL"Fermi")
133134
set(__cuda_arch_bin${_arch_fermi})
@@ -174,21 +175,13 @@ if(CUDA_FOUND)
174175
)
175176
endif()
176177
endif()
177-
ocv_wipeout_deprecated(__cuda_arch_bin)
178178

179179
set(CUDA_ARCH_BIN${__cuda_arch_bin}CACHESTRING"Specify 'real' GPU architectures to build binaries for, BIN(PTX) format is supported")
180180
set(CUDA_ARCH_PTX${__cuda_arch_ptx}CACHESTRING"Specify 'virtual' PTX architectures to build PTX intermediate code for")
181181

182182
string(REGEX REPLACE"\\.""" ARCH_BIN_NO_POINTS"${CUDA_ARCH_BIN}")
183183
string(REGEX REPLACE"\\.""" ARCH_PTX_NO_POINTS"${CUDA_ARCH_PTX}")
184184

185-
# Ckeck if user specified 1.0 compute capability: we don't support it
186-
string(REGEX MATCH"1.0" HAS_ARCH_10"${CUDA_ARCH_BIN}${CUDA_ARCH_PTX}")
187-
set(CUDA_ARCH_BIN_OR_PTX_10 0)
188-
if(NOT${HAS_ARCH_10}STREQUAL"")
189-
set(CUDA_ARCH_BIN_OR_PTX_10 1)
190-
endif()
191-
192185
# NVCC flags to be set
193186
set(NVCC_FLAGS_EXTRA"")
194187

‎cmake/templates/cvconfig.h.in‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
/* Compile for 'real' NVIDIA GPU architectures */
1414
#defineCUDA_ARCH_BIN "${OPENCV_CUDA_ARCH_BIN}"
1515

16-
/* Create PTX or BIN for 1.0 compute capability */
17-
#cmakedefine CUDA_ARCH_BIN_OR_PTX_10
18-
1916
/* NVIDIA GPU features are used */
2017
#defineCUDA_ARCH_FEATURES "${OPENCV_CUDA_ARCH_FEATURES}"
2118

‎modules/core/include/opencv2/core/private.cuda.hpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@
8181
#if (CUDART_VERSION < CUDART_MINIMUM_REQUIRED_VERSION)
8282
#error "Insufficient Cuda Runtime library version, please update it."
8383
#endif
84-
85-
#if defined(CUDA_ARCH_BIN_OR_PTX_10)
86-
#error "OpenCV CUDA module doesn't support NVIDIA compute capability 1.0"
87-
#endif
8884
#endif
8985

9086
//! @cond IGNORED

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp