Alexander Alekhin
ef32d7fd16
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-11-10 20:09:18 +00:00
Alexander Alekhin
c3e7a23da5
Merge pull request #18752 from alalek:dnn_defines_openvino_2021.1.0
2020-11-08 18:09:52 +00:00
catree
df7bf9a048
Fix typo in OpenCVFindOpenBLAS.cmake file.
2020-11-08 14:42:47 +01:00
Alexander Alekhin
bed5debca6
dnn: use OpenVINO 2021.1 defines
2020-11-07 17:27:33 +00:00
Alexander Alekhin
7459613623
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-11-05 18:59:10 +00:00
Alexander Alekhin
a6e15b2f57
cmake: prefer using Eigen configuration files
...
- for better compatibility with Ceres 2.0.0 CMake scripts
2020-11-05 17:01:23 +00:00
Dmitry Matveev
a110ede0a2
Merge pull request #18716 from dmatveev:dm/upstream_onnx
...
* G-API: Introduce ONNX backend for Inference
- Basic operations are implemented (Infer, -ROI, -List, -List2);
- Implemented automatic preprocessing for ONNX models;
- Test suite is extended with `OPENCV_GAPI_ONNX_MODEL_PATH` env for test data
(test data is an ONNX Model Zoo repo snapshot);
- Fixed kernel lookup logic in core G-API:
- Lookup NN kernels not in the default package, but in the associated
backend's aux package. Now two NN backends can work in the same graph.
- Added Infer SSD demo and a combined ONNX/IE demo;
* G-API/ONNX: Fix some of CMake issues
Co-authored-by: Pashchenkov, Maxim <maxim.pashchenkov@intel.com>
2020-11-03 18:39:16 +00:00
Alexander Alekhin
d9a62c42e5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-10-28 14:41:08 +00:00
Alexander Alekhin
364702b1c9
cmake(3rdparty): use EXCLUDE_FROM_ALL
2020-10-28 11:56:12 +00:00
mtfrctl
7de189114b
Merge pull request #18547 from mtfrctl:objc-conversions-macosx
...
Mat conversions for macOS/AppKit
* Extract CoreGraphics conversion logics from ios_conversions.mm to apple_conversions.h, apple_conversions. Add macosx_conversions.mm
* Add macosx.h
* Add Mat+Conversions.h and Mat+Conversions.mm
* Delete duplicated declaration from apple_conversion.mm
* Use short license header
* Add compile guard
* Delete unused imports
* Move precomp.hpp import from header to implementation
* Add macosx.h to skip headers
* Fix compile guard condition
* Use short license header
* Remove commented out unused code
2020-10-14 16:58:06 +00: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
Alexander Alekhin
691c655630
ippicv: install third-party-programs.txt file
2020-09-25 22:09:25 +00:00
Tomoaki Teshima
ac58b2f857
compute capability 8.6
...
- CC for RTX3090, RTX3080 and RTX3070
2020-09-25 22:33:55 +09:00
Odianosen Ejale
862fc06b6f
Fixed and updated OpenCL-VA interoperability
2020-09-25 16:11:50 +03:00
Alexander Alekhin
f52a2cf5e1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-09-19 17:03:08 +00:00
Maksim Shabunin
2dff2f36bf
Install: added prebuilt samples installation
2020-09-08 20:22:26 +03:00
Dustin Rodrigues
05ad3a535f
don't use VTK_USE_FILE for VTK >= 8.90
2020-09-06 15:47:43 -04:00
Vadim Levin
0384eb7d8c
3rdparty: integrate OpenJPEG build to the OpenCV CMake
...
- adopted build scripts
- OpenJPEG build warnings are suppressed
2020-09-02 20:45:35 +00:00
Vadim Pisarevsky
5108e3ced6
Merge pull request #18073 from vpisarev:apache2_license
...
changed OpenCV license from BSD to Apache 2 license
* as discussed and announced earlier, changed OpenCV license from BSD to Apache 2. Many files still contain old-style copyrights though
* changed wording a bit; preserve the original OpenCV BSD license
2020-08-17 11:49:11 +00:00
Alexander Alekhin
fa25faa2d2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-08-06 14:15:52 +00:00
Alexander Alekhin
422f802ec9
Merge pull request #17922 from joy2myself:build_riscv_with_c++_intrin
2020-08-04 09:45:32 +00:00
Zhangyin
ff4c3873f2
Added cmake toolchain for RISC-V with clang.
...
- Added cross compile cmake file for target riscv64-clang
- Extended cmake for RISC-V and added instruction checks
- Created intrin_rvv.hpp with C++ version universal intrinsics
2020-08-03 20:18:56 +08: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
9b7b22ee0e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-07-16 20:13:27 +00:00
Alexander Alekhin
435b6df989
dnn: use OpenVINO 2020.4 defines
...
original commit: 2813aa7eb9
2020-07-15 20:13:40 +00: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 Alekhin
5a15369d4d
Merge pull request #17729 from modeste2015:3.4
2020-07-04 17:17:57 +00:00
Alexander Alekhin
56b5a7d977
cmake: fix ENABLE_PROFILING
2020-07-03 19:31:41 +00:00
Heritier Kinke
cb3a098b25
forget to look in sub folder of include/openblas
2020-07-02 03:33:07 +02: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
4e6a108bda
Merge pull request #17665 from komakai:fix-ios-dynamic-build
2020-06-27 20:12:08 +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
Giles Payne
59ba33658a
Dynamic build for Objective-C/Swift wrapper
2020-06-26 08:26:05 +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