Alexander Alekhin
907743eee7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-07-30 14:50:36 +00:00
Xerxes Battiwalla
1e1984a586
Fixed typo in error message in OpenCVDetectCUDA.cmake
...
There was a minor typo in the FATAL error message when the specified CUDA generation does not match any known generation
2021-07-26 14:54:27 +10:00
Alexander Alekhin
c8ebe0eb86
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-10-11 17:19:22 +00:00
Alexander Alekhin
171fbf879f
cmake: fix typo in CUDA_GENERATION=Auto cache
2020-10-09 22:00:02 +00:00
Alexander Alekhin
295afd5882
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-09-28 21:33:29 +00:00
Tomoaki Teshima
ac58b2f857
compute capability 8.6
...
- CC for RTX3090, RTX3080 and RTX3070
2020-09-25 22:33:55 +09:00
Alexander Alekhin
fa25faa2d2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-08-06 14:15:52 +00:00
Tomoaki Teshima
d92af2aa85
* stop showing old generations
...
* keep it possible to build for old CC
* make sure old generations don't come up for the choice
* remove related version check of old one
2020-07-29 17:31:39 +09:00
Alexander Alekhin
e5e767abc1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-07-13 19:54:49 +00:00
Tomoaki Teshima
269b810601
re-enable automatic CC detection on Jetson
...
* treat both CMAKE_C_COMPILER and c_compiler_realpath as candidate
2020-07-12 21:22:12 +09:00
Alexander Alekhin
8bf1b9a422
cmake(cuda): repair ccbin, re-implement execute_process() cache
...
- preventive fix for arch "11.0" (CUDA_ARCH_BIN_OR_PTX_10 bug)
- new var: OPENCV_CUDA_DETECTION_NVCC_FLAGS
- new var: OPENCV_CMAKE_CUDA_DEBUG
2020-07-08 07:34:17 +00:00
Alexander Alekhin
e0f9eac521
cmake: backport CUDA scripts
2020-07-08 07:33:54 +00:00
Alexander Alekhin
524a2fffe9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-07-06 23:05:04 +00:00
Alexander Alekhin
eb6678ebef
Merge pull request #17699 from alalek:build_core_cuda
...
* core(cuda): fix build
- MSVS 19.25.28612.0
- CUDA release 11.0, V11.0.167
* cmake(cuda): backport workaround for CUDA 11
* cmake(cuda): call CUDA_BUILD_CLEAN_TARGET() on finalize
* cmake(cuda): use CMAKE_SUPPRESS_REGENERATION with MSVS
2020-07-06 22:58:17 +00:00
Alexander Smorkalov
0ccc839397
Restored compatibility with CMake older than 3.7.
2020-06-30 11:28:36 +03:00
Alexander Alekhin
98ad7d01d5
cmake(cuda): update handling of -std=c++11/14 flags
2020-06-29 01:49:00 +03:00
cyy
206c843f36
Merge pull request #17499 from cyyever:fix_CUDA11
...
Fix cuda11
* use cudnn_version.h to detect version when it is available
* remove nppi from CUDA11
* use ocv_list_filterout
* dnn(cuda): temporary disable CUDNN 8.0
2020-06-27 20:34:44 +00:00
Alexander Alekhin
c62e63909a
Merge pull request #17671 from tomoaki0705:fixCUDANativeDetection
2020-06-26 22:51:34 +00:00
Tomoaki Teshima
4cec9e5ff1
fix native detection on Jetson
2020-06-26 16:36:59 +09:00
Alexander Alekhin
c81d785ada
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-23 19:15:47 +00:00
Tomoaki Teshima
95ac650af6
make the fail safe path actually safe
...
* use only supported CC in the list
* workaround of #17526
2020-06-21 07:20:47 +09:00
Alexander Alekhin
5ed65460d1
Merge pull request #17526 from cyyever:fix_cuda_detection
2020-06-20 21:07:05 +00:00
Tomoaki Teshima
52844614c4
add Ampere CC
...
* Ampere has CC 8.0
* Arm64 server support has been added in CUDA 11 (only V100 for now)
2020-06-19 20:46:18 +09:00
Alexander Alekhin
e3d502310f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-19 07:33:50 +00:00
Alexander Alekhin
6bd87e8146
Merge pull request #17571 from tomoaki0705:fixAutomaticCC
2020-06-18 07:39:14 +00:00
Tomoaki Teshima
1cba763189
fix build error of automatic CC detection
2020-06-17 22:02:51 +09:00
Alexander Alekhin
d01cbe9320
cudacodec(build): fix detection in CMake, cleanup duplicate includes
2020-06-17 09:09:40 +00:00
Tomoaki Teshima
d4af89781b
fix corner case of libnvcuvid
...
* detect header automatically and not based on version number
2020-06-11 23:06:18 +09:00
cyy
c6638d62e6
respect CUDA_HOST_COMPILER when detecting CUDA arch
2020-06-11 15:57:08 +08:00
Alexander Alekhin
7722a2b8a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-04 17:58:34 +00:00
Tomoaki Teshima
156406b56c
select the architecture based on nvcc result
...
* cache the result
* DRY
* brush up based on review
2020-06-02 05:07:53 +09:00
Alexander Alekhin
ba7b0f4c54
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-15 11:23:46 +00:00
Alexander Alekhin
a45928045a
Merge pull request #16150 from alalek:cmake_avoid_deprecated_link_private
...
* cmake: avoid deprecated LINK_PRIVATE/LINK_PUBLIC
see CMP0023 (CMake 2.8.12+)
* cmake: fix 3rdparty list
- don't include OpenCV modules
2019-12-13 17:52:40 +03:00
Vishal Chiluka
bca49b99ca
Removing static linking of cuda library
2019-08-05 21:42:10 +05:30
Alexander Alekhin
0fc584961c
cmake: workaround to fix link issues with stubs/libcuda.so.1
2019-07-06 16:29:59 +00:00
Yashas Samaga B L
ae279966c2
Merge pull request #14660 from YashasSamaga:dnn-cuda-build
...
add cuDNN dependency and setup build for cuda4dnn (#14660 )
* update cmake for cuda4dnn
- Adds FindCUDNN
- Adds new options:
* WITH_CUDA
* OPENCV_DNN_CUDA
- Adds CUDA4DNN preprocessor symbol for the DNN module
* FIX: append EXCLUDE_CUDA instead of overwrite
* remove cuDNN dependency for user apps
* fix unused variable warning
2019-06-02 14:47:15 +03:00
Alexander Alekhin
7fb70e1701
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-18 19:07:43 +00:00
Peter J. Stieber
50ef9830e2
Added Turing to the _generations list.
2018-12-18 08:52:15 -08:00
Alexander Alekhin
0c16d8f6c3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-13 15:12:26 +03:00
Tomoaki Teshima
3e710d8eec
use correct CC value for Jetson Xavier
2018-12-13 13:35:19 +09:00
Alexander Alekhin
465ae048a0
Merge pull request #12887 from alalek:fix_cmake_conditions
2018-10-24 13:17:54 +00:00
Alexander Alekhin
d6a8e08acc
cmake: fix variable expand in CMake conditions
2018-10-21 15:02:40 +00:00
Alexander Alekhin
9c23f2f1a6
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-20 11:37:54 +00:00
jasjuang
a66fd527b0
add support for latest Turing gpu and cuda 10
2018-10-15 10:40:24 -07:00
Hamdi Sahloul
0e80f56e44
Bugfix: Detect CUDA archs for Windows
2018-08-16 17:10:08 +09:00
Alexander Alekhin
4eb2966559
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-07 20:12:10 +03:00
Sacha
9ff4475695
Support WITH_CUDA with clang compiler.
2018-08-03 16:42:28 +10:00
Alexander Alekhin
4560909a5e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-17 19:27:48 +03:00
Alexander Alekhin
e79c729b20
CUDA: allow to use external FindCUDA from modern CMake
...
CMake 3.9.0+ is required
2018-07-12 14:33:14 +03:00
Alexander Alekhin
5e68f35500
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-22 19:02:01 +03:00