Alexander Alekhin
333a767be4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-28 18:34:37 +00:00
Peter Würtz
5012fc5d23
Merge pull request #16684 from pwuertz:ignore_clang_mat_inl
...
* Ignore clang warnings for deprecated enum+enum operations in mat.inl.hpp
* build: added customization macros, cmake flags for OpenCV build
2020-02-28 21:21:03 +03:00
Alexander Alekhin
45d073f889
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-26 20:09:03 +03:00
Alexander Alekhin
2617c9aa64
Merge pull request #16673 from alalek:exclude_contrib_modules_4.x
2020-02-26 14:03:52 +00:00
Alexander Alekhin
84bb67e49b
exclude opencv_contrib modules
2020-02-26 15:12:45 +03:00
Ivan Galanin
f9bd025722
Merge pull request #16639 from iigalanin:patch-1
...
* Update to new ICV packages
MacOS ia32 ICV package is no longer built.
* cmake(ippicv): add Apple 32-bit check
* Updated commit hash
2020-02-25 22:04:11 +03:00
Alexander Alekhin
77dd40c96c
Merge pull request #16619 from alalek:cmake_custom_cxx_standard_master
...
* cmake: allow customization of CMAKE_CXX_STANDARD value
* cmake: extra skip flag OPENCV_SKIP_CMAKE_CXX_STANDARD
* cmake: dump CMAKE_CXX_STANDARD value
- compiler option is missing in dumped flags
2020-02-20 14:18:43 +03:00
Alexander Alekhin
f3237fdc6e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-14 19:54:59 +03:00
Alexander Alekhin
c41f50f5f7
Merge pull request #16559 from alalek:cmake_msvc_mp_customize
2020-02-13 19:28:57 +00:00
Alexander Alekhin
d81a0da3e0
dnn: use OpenVINO 2020.1 defines
2020-02-12 17:21:08 +03:00
Alexander Alekhin
ef93aea0da
cmake: update handling of MSVC /MP flag
2020-02-11 21:05:44 +00:00
Alexander Alekhin
aa2777ed61
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-10 19:40:29 +03:00
Alexander Alekhin
9d0f16e8fe
Merge pull request #16505 from alalek:issue_16326
2020-02-10 15:51:49 +00:00
Ilya Lavrenov
41f444a230
CMAKE: more robust custom IE libraries support
...
backporting of commit 98d96f2cc8
2020-02-10 17:55:51 +03:00
Ilya Lavrenov
98d96f2cc8
CMAKE: more robust custom IE libraries support
2020-02-10 15:17:54 +03:00
Alexander Alekhin
f791cf825f
Merge pull request #16486 from alalek:cmake_use_target_compile_features
2020-02-08 20:01:12 +00:00
Alexander Alekhin
225566da7b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-04 19:49:24 +03:00
Alexander Alekhin
85a59ef292
cmake: hide IPPICV symbols using --exclude-libs
2020-02-04 18:11:07 +03:00
Alexander Alekhin
01c1b341a8
cmake: enable C++11 implicitly
2020-02-03 17:45:37 +03:00
Rajkiran Natarajan
579dcf12bd
GCC 10 warnings not caught by CMake ignore regex
2020-02-03 06:39:14 +00:00
Alexander Alekhin
bf2f7b0f8b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-01 17:26:00 +00:00
Sayed Adel
bd531bd828
core:vsx fix inline asm constraints
...
generalize constraints to 'wa' for VSX registers
2020-01-28 15:48:00 +02:00
Alexander Alekhin
f856c964e2
Merge pull request #16338 from alalek:abi_checker_exclude_modules
2020-01-28 12:58:45 +03:00
Alexander Alekhin
02f8a9470a
Merge pull request #16441 from alalek:abi_checker_exclude_modules_3.4
2020-01-27 13:26:23 +00:00
Alexander Alekhin
4af55e64e9
cmake: support OPENCV_ABI_SKIP_MODULES_LIST
...
backporting of commit f163778da7
2020-01-27 14:40:48 +03:00
Alexander Alekhin
3d14dd4e39
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-22 16:58:30 +03:00
Alexander Alekhin
8af87d5792
cmake: apply '-Wl,--as-needed' linker option
2020-01-21 19:09:38 +03:00
h6197627
fb3a334bbe
cmake: fix Linux system OpenEXR detection
2020-01-16 23:12:41 +02:00
Alexander Alekhin
f163778da7
cmake: support OPENCV_ABI_SKIP_MODULES_LIST
2020-01-13 17:17:47 +03:00
Alexander Alekhin
1996ae4a42
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-31 10:11:39 +00:00
Alexander Alekhin
d064079a4e
build: eliminate build warnings
2019-12-25 23:28:24 +00:00
Alexander Alekhin
c6c8783c60
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-16 21:30:30 +00:00
Tatsuro Shibamura
971ae00942
Merge pull request #16027 from shibayan:arm64-windows10
...
* Support ARM64 Windows 10 platform
* Fixed detection issue for ARM64 Windows 10
* Try enabling ARM NEON intrin
* build: disable NEON with MSVC compiler
* samples(directx): gdi32 dependency
2019-12-17 00:23:30 +03: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
60ba6ef916
Merge pull request #16163 from alalek:fix_16122
2019-12-14 18:51:22 +00:00
Alexander Alekhin
424e1150ae
cmake: fix OpenCV_ARCH
2019-12-14 15:02:43 +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
Alexander Alekhin
92b9888837
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-12 13:02:19 +03:00
Alexander Alekhin
6ea29a7696
cmake: prefer using CMAKE_SYSTEM_PROCESSOR / CMAKE_SIZEOF_VOID_P
...
Drop:
- discouraged CMAKE_CL_64
- MSVC64
- MINGW64
2019-12-11 00:21:10 +00:00
Pádraig Brady
7b298b0995
Fix pch generation when linker flags used with GCC
...
-c is required to avoid linking (and the associated missing "main" message)
when linker flags like "-Wl,-z,relro" are passed to GCC
2019-12-10 14:55:56 +00:00
Alexander Alekhin
1ddcfc5c68
gapi: update CMakeLists.txt, fix TBB dependency handling
2019-12-06 16:36:42 +03:00
Alexander Alekhin
4b0132ed7a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-02 16:26:52 +03:00
Lubov Batanina
7523c777c5
Merge pull request #15537 from l-bat:ngraph
...
* Support nGraph
* Fix resize
2019-12-02 16:16:06 +03:00
Alexander Alekhin
01a28db949
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-29 18:57:33 +03:00
Alexander Alekhin
70146700aa
Merge pull request #15839 from alalek:core_simd_v_setall_template
2019-11-27 19:19:35 +00:00
Alexander Alekhin
fc41c18c6f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-18 13:56:24 +03:00
Alexander Alekhin
6773b938b3
Merge pull request #15896 from alalek:build_gcc_9
2019-11-14 14:22:02 +00:00
Alexander Alekhin
7ecdcf6ca6
build: GCC9 compilation
2019-11-12 18:49:34 +03:00
Alexander Alekhin
b6a58818bb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-11 20:25:42 +00:00
Alexander Alekhin
af92a517a7
cmake: set _WIN32_WINNT for Windows 7 API
2019-11-11 20:19:40 +00:00
Alexander Alekhin
d32d31577c
Merge pull request #15835 from alalek:cmake_cpu_optimizations_fix_15802
2019-11-10 09:22:45 +00:00
Alexander Smorkalov
377fcc062d
Merge pull request #15159 from SSE4:fix_find_openexr
2019-11-06 13:37:37 +00:00
SSE4
2e20f06f8e
- fix FindOpenEXR to respect OPENEXR_ROOT
...
Signed-off-by: SSE4 <tomskside@gmail.com>
2019-11-06 17:26:52 +07:00
Alexander Alekhin
a893969ec9
core(simd): v_setall template
2019-11-03 12:49:25 +00:00
Alexander Alekhin
21c38bbdaf
cmake(cpu optmizations): fix cleanup of OPENCV_DEPENDANT_TARGETS_* vars
2019-11-02 10:34:54 +00:00
Alexander Alekhin
055ffc0425
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-24 18:21:19 +00:00
Yashas Samaga B L
613c12e590
Merge pull request #14827 from YashasSamaga:cuda4dnn-csl-low
...
CUDA backend for the DNN module
* stub cuda4dnn design
* minor fixes for tests and doxygen
* add csl public api directory to module headers
* add low-level CSL components
* add high-level CSL components
* integrate csl::Tensor into backbone code
* switch to CPU iff unsupported; otherwise, fail on error
* add fully connected layer
* add softmax layer
* add activation layers
* support arbitary rank TensorDescriptor
* pass input wrappers to `initCUDA()`
* add 1d/2d/3d-convolution
* add pooling layer
* reorganize and refactor code
* fixes for gcc, clang and doxygen; remove cxx14/17 code
* add blank_layer
* add LRN layer
* add rounding modes for pooling layer
* split tensor.hpp into tensor.hpp and tensor_ops.hpp
* add concat layer
* add scale layer
* add batch normalization layer
* split math.cu into activations.cu and math.hpp
* add eltwise layer
* add flatten layer
* add tensor transform api
* add asymmetric padding support for convolution layer
* add reshape layer
* fix rebase issues
* add permute layer
* add padding support for concat layer
* refactor and reorganize code
* add normalize layer
* optimize bias addition in scale layer
* add prior box layer
* fix and optimize normalize layer
* add asymmetric padding support for pooling layer
* add event API
* improve pooling performance for some padding scenarios
* avoid over-allocation of compute resources to kernels
* improve prior box performance
* enable layer fusion
* add const layer
* add resize layer
* add slice layer
* add padding layer
* add deconvolution layer
* fix channelwise ReLU initialization
* add vector traits
* add vectorized versions of relu, clipped_relu, power
* add vectorized concat kernels
* improve concat_with_offsets performance
* vectorize scale and bias kernels
* add support for multi-billion element tensors
* vectorize prior box kernels
* fix address alignment check
* improve bias addition performance of conv/deconv/fc layers
* restructure code for supporting multiple targets
* add DNN_TARGET_CUDA_FP64
* add DNN_TARGET_FP16
* improve vectorization
* add region layer
* improve tensor API, add dynamic ranks
1. use ManagedPtr instead of a Tensor in backend wrapper
2. add new methods to tensor classes
- size_range: computes the combined size of for a given axis range
- tensor span/view can be constructed from a raw pointer and shape
3. the tensor classes can change their rank at runtime (previously rank was fixed at compile-time)
4. remove device code from tensor classes (as they are unused)
5. enforce strict conditions on tensor class APIs to improve debugging ability
* fix parametric relu activation
* add squeeze/unsqueeze tensor API
* add reorg layer
* optimize permute and enable 2d permute
* enable 1d and 2d slice
* add split layer
* add shuffle channel layer
* allow tensors of different ranks in reshape primitive
* patch SliceOp to allow Crop Layer
* allow extra shape inputs in reshape layer
* use `std::move_backward` instead of `std::move` for insert in resizable_static_array
* improve workspace management
* add spatial LRN
* add nms (cpu) to region layer
* add max pooling with argmax ( and a fix to limits.hpp)
* add max unpooling layer
* rename DNN_TARGET_CUDA_FP32 to DNN_TARGET_CUDA
* update supportBackend to be more rigorous
* remove stray include from preventing non-cuda build
* include op_cuda.hpp outside condition #if
* refactoring, fixes and many optimizations
* drop DNN_TARGET_CUDA_FP64
* fix gcc errors
* increase max. tensor rank limit to six
* add Interp layer
* drop custom layers; use BackendNode
* vectorize activation kernels
* fixes for gcc
* remove wrong assertion
* fix broken assertion in unpooling primitive
* fix build errors in non-CUDA build
* completely remove workspace from public API
* fix permute layer
* enable accuracy and perf. tests for DNN_TARGET_CUDA
* add asynchronous forward
* vectorize eltwise ops
* vectorize fill kernel
* fixes for gcc
* remove CSL headers from public API
* remove csl header source group from cmake
* update min. cudnn version in cmake
* add numerically stable FP32 log1pexp
* refactor code
* add FP16 specialization to cudnn based tensor addition
* vectorize scale1 and bias1 + minor refactoring
* fix doxygen build
* fix invalid alignment assertion
* clear backend wrappers before allocateLayers
* ignore memory lock failures
* do not allocate internal blobs
* integrate NVTX
* add numerically stable half precision log1pexp
* fix indentation, following coding style, improve docs
* remove accidental modification of IE code
* Revert "add asynchronous forward"
This reverts commit 1154b9da9da07e9b52f8a81bdcea48cf31c56f70.
* [cmake] throw error for unsupported CC versions
* fix rebase issues
* add more docs, refactor code, fix bugs
* minor refactoring and fixes
* resolve warnings/errors from clang
* remove haveCUDA() checks from supportBackend()
* remove NVTX integration
* changes based on review comments
* avoid exception when no CUDA device is present
* add color code for CUDA in Net::dump
2019-10-21 14:28:00 +03:00
Alexander Alekhin
6e85e852d4
Merge pull request #15740 from xerus:fix_typo
2019-10-18 18:41:35 +00:00
Fei Wu
90af2835a2
Fix issue 15730.
2019-10-19 00:36:18 +08:00
Pavel Grunt
83e2e124a3
OpenCVFindMKL: Fix a typo
2019-10-18 18:33:06 +02:00
Alexander Alekhin
c4e2e17b0c
cmake: fix UWP scripts path
2019-10-16 21:42:31 +00:00
Alexander Alekhin
65573784c4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-09 19:46:18 +00:00
Alexander Alekhin
42ac089e12
build: update AVX2 check
...
- _mm256_bslli_epi128() works in GCC 4.9.3+ only
- Android NDK r10 doesn't support this instruction
2019-10-08 13:12:02 +03:00
Alexander Alekhin
626bfbf309
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-05 15:45:31 +00:00
Alexander Alekhin
98fc098216
Merge pull request #15646 from alalek:fix_avx512_detection
2019-10-05 15:30:09 +00:00
Alexander Alekhin
bdc097495a
fix avx512 detection
...
- renamed Cascade Lake AVX512_CEL => AVX512_CLX (align with Intel SDE tool)
- fixed CLX instruction sets (no IFMA/VBMI)
- added flag to bypass CPU baseline check: OPENCV_SKIP_CPU_BASELINE_CHECK
2019-10-05 11:03:57 +00:00
Alexander Alekhin
2b66495a9d
dnn: use OpenVINO 2019R3 defines
2019-10-02 18:47:01 +03:00
Alexander Alekhin
3fb6617d62
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-02 17:49:19 +03:00
Alexander Alekhin
c92f3072b4
cmake: add check for IPP IW license files
2019-10-01 18:24:03 +03:00
Alexander Alekhin
a74fe2ec01
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-20 21:11:49 +00:00
mipsopen-fwu
b1ea91d8bd
Merge pull request #15422 from mipsopen-fwu:msa-dev
...
* Added MSA implementations for mips platforms. Intrinsics for MSA and build scripts for MIPS platforms are added.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Removed some unused code in mips.toolchain.cmake.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Added comments for mips toolchain configuration and disabled compiling warnings for libpng.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Fixed the build error of unsupported opcode 'pause' when mips isa_rev is less than 2.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* 1. Removed FP16 related item in MSA option defines in OpenCVCompilerOptimizations.cmake.
2. Use CV_CPU_COMPILE_MSA instead of __mips_msa for MSA feature check in cv_cpu_dispatch.h.
3. Removed hasSIMD128() in intrin_msa.hpp.
4. Define CPU_MSA as 150.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* 1. Removed unnecessary CV_SIMD128_64F guarding in intrin_msa.hpp.
2. Removed unnecessary CV_MSA related code block in dotProd_8u().
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* 1. Defined CPU_MSA_FLAGS_ON as "-mmsa".
2. Removed CV_SIMD128_64F guardings in intrin_msa.hpp.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Removed unused msa_mlal_u16() and msa_mlal_s16 from msa_macros.h.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
2019-09-20 19:52:48 +03:00
Alexander Alekhin
33e9fe9312
Merge pull request #15540 from alalek:issue_15278_2
2019-09-18 20:12:36 +00:00
Alexander Alekhin
65c209fad3
Merge pull request #15519 from mshabunin:fix-custom-install
2019-09-18 15:31:25 +00:00
Alexander Alekhin
c657c6cbac
cmake: use 'long long' for atomic check
2019-09-18 15:18:09 +00:00
Maksim Shabunin
5a75808516
Windows: partially restore install config generation
2019-09-16 12:11:48 +03:00
Alexander Alekhin
b4c5b50a3e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-13 17:15:45 +00:00
Alexander Alekhin
89b82e796e
Merge pull request #15449 from mshabunin:cmake-download-params
2019-09-13 17:03:28 +00:00
Alexander Alekhin
bea2c75452
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-05 14:29:22 +03:00
huihut
fe42933ac5
Merge pull request #15433 from huihut:master
...
* fix 'chmod' is not recognized as an internal or external command in Windows
https://github.com/opencv/opencv/issues/14939
* cmake: update PCH command handling
2019-09-04 18:36:56 +03:00
Maksim Shabunin
9d4f01626c
cmake: add directory creation to download helper scripts
2019-09-04 17:09:13 +03:00
Maksim Shabunin
d974d4c6ce
cmake: download tries, customizable download parameters
2019-09-04 17:09:13 +03:00
Maksim Shabunin
8c849a48cc
Ported install layout refactoring from master branch
2019-08-29 17:01:49 +03:00
Maksim Shabunin
4e67eb6c42
Extracted install layout configuration to separate file
2019-08-26 18:15:32 +03:00
Alexander Alekhin
a7b954f655
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-23 19:24:37 +03:00
Ilya Lavrenov
d0c4a92b4c
Adopted detection of Inference Engine
2019-08-23 17:37:57 +03:00
Alexander Alekhin
464972855e
cmake: add libatomic check
2019-08-21 13:02:36 +03:00
Alexander Alekhin
19a4b51371
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-16 18:48:08 +03:00
luz.paz
57ccf14952
FIx misc. source and comment typos
...
Found via `codespell -q 3 -S ./3rdparty,./modules -L amin,ang,atleast,dof,endwhile,hist,uint`
backporting of commit: 32aba5e64b
2019-08-15 13:09:52 +03:00
Alexander Alekhin
a703b9ed84
Merge pull request #15101 from alalek:cmake_initialization
2019-08-14 19:17:07 +00:00
luz.paz
32aba5e64b
FIx misc. source and comment typos
...
Found via `codespell -q 3 -S ./3rdparty,./modules -L amin,ang,atleast,dof,endwhile,hist,uint`
2019-08-14 13:33:49 -04:00
Alexander Alekhin
dbf8e22fad
Merge pull request #15242 from vchiluka5:lazy_load_nvcuda_dll
2019-08-14 16:35:41 +00:00
Alexander Alekhin
2ad0487cec
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-13 18:32:29 +00:00
Alexander Alekhin
6f267be6f1
Merge pull request #15260 from tomoaki0705:suppressNoisyWarning
2019-08-08 15:45:29 +00:00
Tomoaki Teshima
40c71a2463
suppress noisy warning
...
* add -Wno-psabi when using GCC 6
* add -Wundef for CUDA 10
* add -Wdeprecated-declarations when using GCC 7
* add -Wstrict-aliasing and -Wtautological-compare for GCC 7
* replace cudaThreadSynchronize with cudaDeviceSynchronize
2019-08-08 21:49:32 +09:00
Alexander Alekhin
5ef548a985
cmake: update initialization
2019-08-08 15:23:16 +03:00
Alexander Alekhin
174b4ce29d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-05 18:11:43 +00:00
Vishal Chiluka
bca49b99ca
Removing static linking of cuda library
2019-08-05 21:42:10 +05:30
Victor Romero
987bb2ca61
Fix build for UWP
...
backport of commit: f18cbd036a
2019-08-05 17:19:36 +03:00
Victor Romero
f18cbd036a
Merge pull request #15207 from vicroms:fix-uwp-build
...
Fix build for UWP (#15207 )
* Guard non-WinRT calls to fix UWP build
* Remove unnecessary guard for WinRT
2019-08-03 22:53:38 +03:00
Hugo Lindström
03fe1cb7fc
Support building shared libraries on WINCE.
2019-08-01 15:28:04 +02:00
Alexander Alekhin
0cf479dd5c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-25 19:21:47 +00:00
Alexander Alekhin
d2911a8d41
dnn: use OpenVINO 2019R2 defines
2019-07-24 21:37:03 +00:00
Giles Payne
a897fc91ec
Add no_samples_build option to Android SDK build
2019-07-18 21:31:02 +09:00
Alexander Alekhin
8408587341
Merge pull request #14888 from vchiluka5:NVIDIA_Optical_Flow
2019-07-07 17:20:53 +03:00
Alexander Alekhin
0fc584961c
cmake: workaround to fix link issues with stubs/libcuda.so.1
2019-07-06 16:29:59 +00:00
Alexander Alekhin
097d81363b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-02 21:17:45 +00:00
Alexander Alekhin
ff877af2af
Merge pull request #14929 from alalek:cmake_rpath_link_support
2019-07-02 20:31:33 +00:00
Alexander Alekhin
3b8701e97e
Merge pull request #14963 from alalek:pr14925_fix
2019-07-02 19:43:09 +00:00
Alexander Alekhin
e3e8a58799
Merge pull request #14958 from tomoaki0705:fixArmFp16Behavior
2019-07-02 16:40:21 +00:00
Alexander Alekhin
275579a835
Merge pull request #14925 from StefanBruens:handle_absolute_include_path
2019-07-02 16:05:53 +00:00
Tomoaki Teshima
db6a6ccaba
re-enable CPU_BASELINE=FP16 on Armv7 platform
2019-07-02 21:57:15 +09:00
Alexander Alekhin
6fdce865b8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-29 17:27:48 +00:00
Alexander Alekhin
bc79f477dd
cmake: support rpath-link linker option
...
- builds with CMAKE_SKIP_RPATH=ON should properly find project .so files from <build>/lib directory
- $ORIGIN doesn't work properly in cross-compilation mode
2019-06-29 11:03:45 +00:00
Alexander Alekhin
e3aa96ccf2
cmake: normalize include directories in OpenCVConfig.cmake
2019-06-28 20:57:58 +00:00
Stefan Brüns
0a45b8c478
Handle absolute OPENCV_INCLUDE_INSTALL_PATH correctly
...
In case OPENCV_INCLUDE_INSTALL_PATH is absolute (i.e. starts with a "/"),
the path ends up with a double "/".
While this is mostly equivalent to a single slash, it may have a nasty
side effect when:
- OpenCV_INSTALL_PATH is empty
- OPENCV_INCLUDE_INSTALL_PATH is "/usr/include"
- the calling build script uses "-isystem" to specify the path to the
headers of dependencies (to avoid warnings)
Specifying "-isystem /usr/include" breaks the path ordering, and GCC can
no longer find its "stdlib.h", thus CMake filters such statements.
Unfortunately it fails to do so when using "//usr/include".
2019-06-28 15:44:45 +02:00
Stefan Brüns
e10c01047c
Fix detection of 32bit ARM builds on Aarch64
...
It is perfectly possible to compile ARM binaries on Aarch64. Generalize
the code to no only swap X86 with X86_64, but also ARM and AARCH64.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2019-06-28 14:17:30 +02:00
Alexander Alekhin
81fad9e247
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-11 20:43:40 +00:00
Vitaly Tuzov
d2aadabc5e
Merge pull request #14743 from terfendail:wui512_fixvswarn
...
Fix for MSVS2019 build warnings (#14743 )
* AVX512 arch support for MSVS
* Fix for MSVS2019 build warnings: updated integral() AVX512 implementation
* Fix for MSVS2019 build warnings: reworked v_rotate_right AVX512 implementation
* fix indentation
2019-06-11 23:07:39 +03:00
Alexander Alekhin
11b020b9f9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-10 19:05:28 +00:00
Alexander Alekhin
878af7ada8
Merge pull request #14725 from alalek:update_openexr_2.3.0
...
3rdparty: update OpenEXR 2.3.0 (#14725 )
* openexr 2.2.1
* openexr 2.3.0
* openexr: build fixes
* openexr: build dwa tables on-demand
2019-06-10 20:04:23 +03:00
Maksim Shabunin
f99f58d99f
Allow setting IS_PART_OF_WORLD in command line, fix videoio plugin linking
2019-06-10 14:13:54 +03:00
Alexander Alekhin
ddcf388270
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-07 19:02:55 +03:00
Maksim Shabunin
65919ed839
AVX 512 detection: workaround for older GCC
2019-06-07 13:58:09 +03:00
Alexander Alekhin
f3de2b4be7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-05 19:11:52 +03: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
d8b42792a6
cmake: update ENABLE_FAST_MATH option
2019-05-30 19:44:35 +03:00
Alexander Alekhin
216988b0b1
Merge pull request #14582 from alalek:android_update_debug
2019-05-29 11:22:53 +00:00
Alexander Alekhin
43467a2ac7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-28 18:29:48 +00:00
Maksim Shabunin
472f3b7347
Fix TBB debug
2019-05-27 10:26:06 +03:00
Alexander Alekhin
166ecaeda8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-23 19:50:20 +03:00
Maksim Shabunin
dc28a1aba2
highgui: fixed build GTK2+OpenGL
2019-05-23 16:30:22 +03:00
Maksim Shabunin
fff7b7e459
LAPACK: add support for complex numbers for MSVC
2019-05-22 18:43:45 +03:00
Sergiu Deitsch
bc4b2d521c
Merge pull request #13337 from sergiud:eigen-cross-compile
...
* added support for Eigen cross-compilation
* cmake: fix Eigen detection
2019-05-20 21:05:42 +03:00
Alexander Alekhin
3c1267dbe6
android: update 'debug' information support
2019-05-19 16:09:45 +00:00
Alexander Alekhin
b2abd8ca41
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-07 16:04:54 +00:00
Alexander Alekhin
eb161942de
Merge pull request #14486 from alalek:cmake_dispatch_all
2019-05-07 14:25:02 +00:00
Maksim Shabunin
5acfa524cb
Added support for Clang build hardening (including Apple)
2019-05-07 13:00:43 +03:00
Alexander Alekhin
6b6222bfbb
cmake: support CPU_DISPATCH=ALL, fix misused CPU_DISPATCH
...
- CPU_DISPATCH_FINAL should be used for filtering
2019-05-05 11:24:21 +00:00
Sayed Adel
5a77f4cee3
Merge pull request #14007 from seiko2plus:core_avx512_infa
...
* core: improve AVX512 infrastructure by adding more CPU features groups
* cmake: use groups for AVX512 optimization flags
* core: remove gap in CPU flags enumeration
* cmake: restore default CPU_DISPATCH
2019-05-05 14:19:49 +03:00
Alexander Alekhin
e28e3c9491
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-01 08:27:45 +00:00
Alexander Alekhin
82be2d6210
Merge pull request #14430 from alalek:cmake_fix_include_pkgconfig_3.4
2019-04-26 20:18:59 +00:00
Alexander Alekhin
b95fdc1992
Merge pull request #14394 from alalek:build_support_memory_sanitizers
2019-04-26 16:13:52 +00:00
Alexander Alekhin
90c34c5c17
cmake: fix pkg-config handling
...
backporting commit c9f3f4d1d3
2019-04-26 18:25:47 +03:00
Alexander Alekhin
c9f3f4d1d3
cmake: fix pkg-config handling
...
Avoid non-intentional call of "include(FindPkgConfig)"
It should be handled in the root CMakeLists.txt (safely for cross-compiling)
2019-04-26 18:19:03 +03:00
Alexander Alekhin
0023d8a106
Merge pull request #14410 from adamrankin:master
2019-04-25 18:45:14 +00:00
Adam Rankin
a164a131f9
BUG: Qt5 components not correctly detected if only Qt5_DIR is provided, when this is supported by Qt CMake system.
...
Fixed by updating Qt5 find_package call to use modern CMake syntax
2019-04-24 15:46:30 -04:00
Alexander Alekhin
c1981f28ad
build: +OPENCV_ENABLE_MEMORY_SANITIZER flag
2019-04-22 21:35:25 +00:00
Alexander Alekhin
d0032b0717
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-22 18:17:28 +00:00
Alexander Alekhin
319e891d7d
cmake: guard macro definitions in PCH scripts
...
fixes build with VTK
2019-04-22 17:43:32 +03:00
Alexander Alekhin
c024edb9a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-19 15:43:58 +03:00
Alexander Alekhin
2e4d771005
cmake: fix PDB handling
2019-04-19 14:53:35 +03:00
Alexander Alekhin
2b84039a16
Merge pull request #14313 from alalek:cmake_pch_fix_defines_from_interface_targets
2019-04-17 19:02:28 +00:00
Alexander Alekhin
6d3ae8d4ca
Merge pull request #14341 from alalek:cmake_fix_pkgconfig_libs
2019-04-16 19:04:07 +00:00
Alexander Alekhin
7c1d9fea8b
Merge pull request #14308 from m000:master
2019-04-16 11:58:21 +00:00
Alexander Alekhin
0d747daf47
cmake: use absolute library paths from 'pkgconfig'
...
- drop legacy check_module() macro
- drop 'ALIASOF_'
2019-04-15 22:11:49 +00:00
Alexander Alekhin
a56c12278e
cmake: fix C++11 flags (ENABLE_CXX11 is not required)
2019-04-15 20:00:55 +03:00
lain
246733382f
Fix OpenCVConfig.cmake for Arch Linux.
2019-04-14 12:22:57 -07:00
Alexander Alekhin
4635356435
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-13 20:00:54 +00:00
Manolis Stamatogiannakis
ef16e4203e
Fix compile error with external TBB and -DBUILD_SHARED_LIBS=OFF.
...
Adds IMPORTED for the TBB::tbb alias target as otherwise cmake produces
the following error:
CMake Error: install(EXPORT "OpenCVModules" ...) includes target "opencv_core" which requires target "tbb" that is not in the export set.
This problem occurs with the defaults used by homebrew on macOS, which
compiles both static and shared versions of TBB and OpenCV.
2019-04-13 21:53:04 +02:00
Alexander Alekhin
9515137cb2
cmake: fix PCH generation
...
process defines from INTERFACE targets
2019-04-12 17:39:02 +03:00
Alexander Alekhin
a9ddf12187
Merge pull request #14078 from alalek:test_python_from_modules
2019-04-12 11:39:12 +00:00
Alexander Alekhin
39630e076a
Merge pull request #14294 from alalek:issue_14286
...
cmake: fix WITH_OPENCL_D3D11_NV check
2019-04-11 17:50:15 +03:00
Alexander Alekhin
a0a1fb5fec
python: discover tests from module/misc/python/test paths
2019-04-10 18:35:35 +00:00
Alexander Alekhin
4001346a30
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-03 19:33:52 +00:00
Alexander Alekhin
d8b8c3b145
Merge pull request #14233 from alalek:cmake_fix_license_install
2019-04-03 19:30:47 +00:00
Alexander Alekhin
8483801eab
dnn: use OpenVINO 2019R1 defines
2019-04-03 15:39:47 +03:00
Alexander Alekhin
4fa4bef41d
cmake: fix licenses install rules
2019-04-02 19:24:14 +03:00
Alexander Alekhin
3d7a3a51a7
cmake: don't add tests dirs as include directories
...
- use relative paths for includes
- fix PCH generation with GCC (dummy file has been used)
2019-04-02 13:46:25 +03:00
Alexander Alekhin
2a2d195240
cmake: don't add tests dirs as include directories
...
- use relative paths for includes
- fix PCH generation with GCC (dummy file has been used)
2019-04-02 12:28:25 +03:00
Alexander Alekhin
90df5e00b4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-26 18:56:54 +00:00
iPanda
097fc1a271
Merge pull request #13972 from Mainvooid:add_cuda_support_for_D3D11_interop
...
* Add CUDA support for D3D11 interop. #13888
color_detail.hpp: fixed build error : dynamic initialization is not supported for a __constant__ variable.
directx.cpp: Add CUDA support(cl_nv_d3d11_sharing) for D3D11 interop. #13888
Update directx.cpp
Format adjustment.
Update directx.cpp
fix error.
Update directx.cpp
Format adjustment
Update directx.cpp
fix trailing whitespace.
fix format errors
convert indentation to spaces .
Trim trailing whitespace.
Add information about source of cl_d3d11_ext.h
Avoid unrelated changes.
Increase compile-time conditional judgment.
Increase the judgment of whether the OCL device has the required extensions at compile time.
Add compilation option `HAVE_CLNVEXT`.Check CL support in runtime.
Check result of `clGetExtensionFunctionAddressForPlatform` for KHR is invalid.It always can get the address(from OpenCL.dll),So I check NV support(from nvopencl64.dll) before KHR when `HAVE_CLNVEXT` is enabled.
Delete cl_d3d11_ext.h
Modified parameter list
fix "cannot open include file: 'CL/cl_d3d11_ext.h'"
remove not referenced var
fix C2143: syntax error
Improve compile-time judgment.
dlrectx.cpp Modify the detection order.
initializeContextFromD3D11Device:
```
// try with NV(Need to check it first)
// try with KHR
```
fix warnig C4100
Revert "fix warnig C4100"
This reverts commit 76e5becb67780071d0cbde61cc4f5f807ad7c5ac.
fix warning C4100
fix warning C4505
Format alignment
Format adjustment and automatically detect header files.
Automatically detect header files when users are not configured or configuration errors occur.
avoid unrelated changes.
Update .cmake
Update .cmake
* fix build errors
* fix warning:defined but not used
* Revert "fix warning:defined but not used"
This reverts commit 7ab3537cd0
.
* fix warning:defined but not used
* fix build error for mac
* fix build error for win
* optimizing branch judgment
* Revert "optimizing branch judgment"
This reverts commit 88b72b870e
.
* fix warning C4702: unreachable code
* remove unused code
* Fix problems that may lead to undefined behavior
* Add status check
* fix error C2664,C2665 : cannot convert argument
* Format adjustment
VSCODE will automatically format the indentation to 4 spaces in some situation.
* fix error C2440
* fix error C2440
* add cl_d3d11_ext.h
* Format adjustment
* remove unnecessary checks
2019-03-24 18:34:09 +03:00
Alexander Alekhin
8c25a8eb7b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-22 19:31:31 +03:00
Alexander Alekhin
65fc863d86
cmake: support OpenVINO env variable: INTEL_OPENVINO_DIR
2019-03-22 00:03:03 +03:00
Sayed Adel
0df607e5dd
cmake:vsx Fix compilation fail on aligned runtime test when c++11 enabled
2019-03-21 11:21:00 +02:00
Sayed Adel
f41359688b
core:vsx Add support for VSX3 half precision conversions
2019-03-20 10:19:42 +02:00
Alexander Alekhin
fdf6323942
Merge pull request #14026 from Palmitoxico:android-ndk
2019-03-18 15:40:03 +00:00
Augusto Fraga Giachero
032e458085
Avoid unexpected line breaks in version_string.inc
...
The Android NDK 16b has a bug that sets the ANDROID_NDK_REVISION
variable incorrectly, generating an unexpected line break in the
middle of the string. This breaks the build as the generated
version_string.inc presents an invalid C string.
Remove leading and trailing line breaks, warns for line breaks in the
middle of 'msg' and escape them before appending to
OPENCV_BUILD_INFO_STR.
2019-03-18 11:57:05 -03:00
Alexander Alekhin
26087e28ad
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-15 22:42:57 +00:00
Alexander Alekhin
ccbc16f3a9
cmake: clean unreferenced functions from OpenCV modules too
2019-03-15 18:54:08 +03:00
Sayed Adel
872e7894b4
core:vsx working around gcc aligned memory access bug
...
- allow cmake to check sanity of vsx aligned ld/st
- force universal intrinsics v_load_aligned/v_store_aligned
to failback to unaligned ld/st if cmake runtime vsx aligned test fail
2019-03-14 01:55:40 +02:00
Alexander Alekhin
332c37f332
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-06 11:43:16 +03:00
Alexander Alekhin
8ee1be7d09
cmake: support MSVS 2019
2019-03-05 13:38:47 +03:00
Alexander Alekhin
9a6f2630b2
cmake: +opencv_videoio_plugins virtual target
...
- support comma-separated list in VIDEOIO_PLUGIN_LIST
- opencv tests/samples depend on plugins virtual target
2019-03-02 09:19:08 +00:00
Alexander Alekhin
c3cf35ab63
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-26 17:34:42 +03:00
Maksim Shabunin
8c1e0537ec
Merge pull request #13889 from mshabunin:enable-narrowing-warning
...
* Enabled -Wnarrowing warning
* Fixed type narrowing issues
* Cast python constants
* Use long long for python constants
* Use int for python constants with fallback to long
* Update cv2.cpp
2019-02-26 13:15:59 +03:00
Maksim Shabunin
73959fed45
Merge pull request #13422 from mshabunin:split-videoio-cmake
...
* Split videoio dependencies search into pieces, removed obsolete backends
2018-12-26 15:50:20 +03:00
Alexander Alekhin
1dee705074
Merge branch '3.4' into merge-3.4
2018-12-22 05:40:15 +00:00
Alexander Alekhin
578ea4bae9
Merge pull request #13386 from alalek:android_gradle
2018-12-21 13:56:03 +00:00
Alexander Alekhin
832217907f
Merge pull request #13435 from alalek:issue_13434
2018-12-21 11:01:04 +00:00
Alexander Alekhin
bbdc987fc6
dnn: add OpenVINO 2018R5 defines
...
https://software.intel.com/en-us/openvino-toolkit
2018-12-21 05:52:27 +00:00
Alexander Alekhin
2b35c1708b
android: gradle-based package and samples
...
- drop hello-android sample
2018-12-19 14:59:48 +03:00
Alexander Alekhin
7fb70e1701
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-18 19:07:43 +00:00
Alexander Alekhin
b0a08cced9
Merge pull request #13466 from pstieber:AddTuringCudaGeneration
2018-12-18 18:35:47 +00:00
Peter J. Stieber
50ef9830e2
Added Turing to the _generations list.
2018-12-18 08:52:15 -08:00
Alexander Alekhin
bb8c19aad3
cmake: fix python install paths
2018-12-17 14:32:29 +03:00
Alexander Alekhin
8d907d2e32
cmake(java): add OPENCV_JAVA_SOURCE_VERSION/OPENCV_JAVA_TARGET_VERSION
2018-12-14 00:15:57 +00:00
Alexander Alekhin
0c16d8f6c3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-13 15:12:26 +03:00
Alexander Alekhin
b7bb79c7c8
videoio(MSMF): backport WITH_MSMF_DXVA flag
2018-12-13 14:56:20 +03:00
Alexander Alekhin
aa666dfa9c
Merge pull request #13430 from tomoaki0705:fixCudaJetsonTX2file
2018-12-13 09:14:26 +00:00
Tomoaki Teshima
3e710d8eec
use correct CC value for Jetson Xavier
2018-12-13 13:35:19 +09:00
Alexander Alekhin
6fa23f330f
cmake: fix compiler flags filtering
2018-12-12 13:35:43 +03:00
Alexander Alekhin
ea64e860de
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-09 13:21:58 +00:00
Alexander Alekhin
e5f298cca5
Merge pull request #13385 from alalek:cmake_cleanup_build_junk_dir
2018-12-08 17:51:09 +00:00
Alexander Alekhin
85b1750660
Merge pull request #13316 from alalek:cmake_fix_baseline_detect
2018-12-08 17:50:03 +00:00
Maksim Shabunin
05131af8da
Merge pull request #13367 from mshabunin:cmake-verify
...
* Added dependency verification mechanism for cmake
2018-12-07 15:57:25 +03:00
Alexander Alekhin
d77612fe70
cmake: hide 'junk' dir from the root of build directory
...
moved to CMakeFiles (no conflicts are expected)
2018-12-07 05:14:08 +00:00
Kartik Mohta
80a3d7bffa
Fix comment marker in OpenCVDetectCudaArch.cu
2018-12-04 11:47:28 -08:00
Alexander Alekhin
487f631243
Merge pull request #13320 from alalek:api_checks_4.0.0
2018-11-28 19:51:29 +00:00
Alexander Alekhin
59fa477edb
opencv4: fix abi-checker (to enable API/source checks only)
2018-11-28 18:42:19 +03:00
Alexander Alekhin
fab0eb0d75
cmake: fix compiler flags (CPU_BASELINE_REQUIRED=xxx + CPU_BASELINE=DETECT)
2018-11-28 14:04:03 +03:00
Alexander Alekhin
8f4e5c2fb8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-26 15:37:45 +03:00
Alexander Alekhin
c0016d7fe9
Merge pull request #13253 from alalek:fix_13201
...
* cmake: install 'legacy/constants_c.h' files
* samples: add compatibility test code
2018-11-23 20:02:46 +03:00
Alexander Alekhin
adf2013052
Merge pull request #13209 from alalek:issue_12865
2018-11-21 14:30:32 +00:00
Alexander Alekhin
7fa7fa0226
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-21 08:33:39 +00:00
Sayed Adel
474a0dac49
core: several improves and fixes on ppc64le infrastructure
...
- add infrastructure support for Power9/VSX3
- fix missing VSX flags on GCC4.9 and CLANG4(#13210 , #13222 )
- fix disable VSX optimzation on GCC by using flag ENABLE_VSX
- flag ENABLE_VSX is deprecated now, use CPU_BASELINE, CPU_DISPATCH instead
- add VSX3 to arithmetic dispatchable flags
2018-11-20 15:28:46 +00:00
Alexander Alekhin
1317c3d178
cmake: don't generate dllmain for cudev module
2018-11-19 19:11:52 +03:00
Alexander Alekhin
22dbcf98c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-17 14:17:35 +00:00
Alexander Alekhin
53af811530
cmake: emit warnings about unsupported options if turned ON only
2018-11-16 20:24:31 +00:00
Alexander Alekhin
a4b21d9e2e
Merge pull request #13177 from alalek:update_win32_scripts
2018-11-16 22:45:57 +03:00
Alexander Alekhin
b321851e53
Merge pull request #12977 from alalek:python_package
2018-11-16 22:45:33 +03:00
Alexander Alekhin
ce6acd3ecd
python: bindings loader package
...
Configures and loads OpenCV bindings extension including 3rdparty dependencies
Based on running Python specify:
- configure PYTHON_PATH (via "sys.path")
- configure LD_LIBRARY_PATH / PATH
2018-11-16 00:51:16 +00:00
Alexander Alekhin
8792bddb0a
win32: update setupvars.cmd
...
- drop EnableDelayedExpansion
- pause on failed commands (non-interactive mode)
2018-11-15 23:36:26 +00:00
Dmitry Kurtaev
b5c54e447c
Extra hyperparameters for Intel's Inference Engine layers
2018-11-15 20:06:37 +03:00
Alexander Alekhin
5f2074d757
Merge pull request #13140 from alalek:opencv3_opencv4
2018-11-12 22:34:10 +03:00
Alexander Alekhin
fc3fc6005e
Merge pull request #13126 from mshabunin:remove_libv4l
2018-11-12 22:10:49 +03:00
Alexander Alekhin
27fd913c86
build: fix version 3->4
2018-11-12 19:05:58 +00:00
Alexander Alekhin
e0e828ef5c
videoio: remove using of HAVE_CAMV4L
2018-11-12 18:53:19 +00:00
Alexander Alekhin
f5b212a9d4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-12 17:58:45 +03:00
Alexander Alekhin
c54676d625
cmake: fix supporting of legacy flags
2018-11-12 14:11:57 +03:00
Pavel Rojtberg
0d65397ae7
videoio: remove cap_libv4l in favour of cap_v4l
...
cap_libv4l depends on an external library (libv4l) yet is still larger
(1966 loc vs 1822 loc).
It was initially introduced copy pasting cap_v4l in order to offload
various color conversions to libv4l.
However nowadays we handle most of the needed color conversions inside
OpenCV. Our own implementation is better tested and (probably) also
better performing. (as it can optionally leverage IPP/ OpenCL)
Currently cap_v4l is better maintained and generally the code is in
better shape. There is however an API
difference in getting unconverted frames:
* on cap_libv4l one need to set `CV_CAP_MODE_GRAY=1` or
`CV_CAP_MODE_YUYV=1`
* on cap_v4l one needs to set `CV_CAP_PROP_CONVERT_RGB=0`
the latter is more flexible though as it also allows accessing undecoded
JPEG images.
fixes #4563
2018-11-12 13:38:59 +03:00
Alexander Alekhin
1913482cf5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-10 20:50:26 +00:00
Alexander Alekhin
ebc8015638
Merge pull request #13074 from alalek:cleanup_videoio
2018-11-08 19:09:32 +03:00
Alexander Alekhin
467eb4d240
Merge pull request #12901 from alalek:cmake_unsupported_option_warning
2018-11-08 12:21:38 +00:00
Alexander Alekhin
5869415a57
videoio: drop obsolete backends
...
- VFW
- QuickTime/QtKit
- Unicap - GPL, no active support: https://github.com/unicap/unicap
- DC1394 (1st version) / CMU1394
2018-11-07 19:49:09 +03:00
Alexander Alekhin
b059a361dd
highgui: drop obsolete Carbon API
...
https://en.wikipedia.org/wiki/Carbon_(API)
In 2012, with the release of OS X 10.8 Mountain Lion, most Carbon APIs were considered deprecated.
2018-11-07 19:21:33 +03:00
Alexander Alekhin
d9be552bbc
Merge pull request #13006 from alalek:cmake_setup_vars
...
cmake: introduce setup_vars scripts
2018-11-06 23:52:00 +03:00
Alexander Alekhin
2c6f1ab57d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-06 20:04:31 +00:00
Alexander Alekhin
687fa6a8ca
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-02 05:33:35 +00:00
Alexander Alekhin
36d00f0200
Merge pull request #13003 from native-api:cross_cutting_frameworks
2018-11-01 16:46:11 +00:00
Ivan Pozdeev
dbc6fe3a0f
Detect cross-cutting frameworks before libraries so the latter can use them
2018-11-01 18:16:41 +03:00
Alexander Alekhin
fbe41703e4
cmake: introduce setup_vars scripts
...
- CMake install COMPONENT: "scripts"
2018-11-01 17:38:40 +03:00
Alexander Alekhin
98a73de526
cmake: eliminate GCC4.x warnings
2018-10-31 16:04:55 +03:00
WuZhiwen
6e3ea8b49d
Merge pull request #12703 from wzw-intel:vkcom
...
* dnn: Add a Vulkan based backend
This commit adds a new backend "DNN_BACKEND_VKCOM" and a
new target "DNN_TARGET_VULKAN". VKCOM means vulkan based
computation library.
This backend uses Vulkan API and SPIR-V shaders to do
the inference computation for layers. The layer types
that implemented in DNN_BACKEND_VKCOM include:
Conv, Concat, ReLU, LRN, PriorBox, Softmax, MaxPooling,
AvePooling, Permute
This is just a beginning work for Vulkan in OpenCV DNN,
more layer types will be supported and performance
tuning is on the way.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* dnn/vulkan: Add FindVulkan.cmake to detect Vulkan SDK
In order to build dnn with Vulkan support, need installing
Vulkan SDK and setting environment variable "VULKAN_SDK" and
add "-DWITH_VULKAN=ON" to cmake command.
You can download Vulkan SDK from:
https://vulkan.lunarg.com/sdk/home#linux
For how to install, see
https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html
https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html
https://vulkan.lunarg.com/doc/sdk/latest/mac/getting_started.html
respectively for linux, windows and mac.
To run the vulkan backend, also need installing mesa driver.
On Ubuntu, use this command 'sudo apt-get install mesa-vulkan-drivers'
To test, use command '$BUILD_DIR/bin/opencv_test_dnn --gtest_filter=*VkCom*'
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* dnn/Vulkan: dynamically load Vulkan runtime
No compile-time dependency on Vulkan library.
If Vulkan runtime is unavailable, fallback to CPU path.
Use environment "OPENCL_VULKAN_RUNTIME" to specify path to your
own vulkan runtime library.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* dnn/Vulkan: Add a python script to compile GLSL shaders to SPIR-V shaders
The SPIR-V shaders are in format of text-based 32-bit hexadecimal
numbers, and inserted into .cpp files as unsigned int32 array.
* dnn/Vulkan: Put Vulkan headers into 3rdparty directory and some other fixes
Vulkan header files are copied from
https://github.com/KhronosGroup/Vulkan-Docs/tree/master/include/vulkan
to 3rdparty/include
Fix the Copyright declaration issue.
Refine OpenCVDetectVulkan.cmake
* dnn/Vulkan: Add vulkan backend tests into existing ones.
Also fixed some test failures.
- Don't use bool variable as uniform for shader
- Fix dispathed group number beyond max issue
- Bypass "group > 1" convolution. This should be support in future.
* dnn/Vulkan: Fix multiple initialization in one thread.
2018-10-29 17:51:26 +03:00
Alexander Alekhin
50bec53afc
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-26 17:56:55 +03:00
Alexander Alekhin
7e2c65ce3c
Merge pull request #12925 from alalek:fix_cmake_conditions
2018-10-25 11:52:39 +00:00
Alexander Alekhin
465ae048a0
Merge pull request #12887 from alalek:fix_cmake_conditions
2018-10-24 13:17:54 +00:00
Alexander Alekhin
2933b58a2f
Merge pull request #12909 from alalek:cmake_fix_baseline_detect_flags
2018-10-24 13:05:14 +00:00
maver1
e397434cb6
Merge pull request #12877 from maver1:3.4
...
* Updated ICV packages and IPP integration
* core(test): minMaxIdx IPP regression test
* core(ipp): workaround minMaxIdx problem
* core(ipp): workaround meanStdDev() CV_32FC3 buffer overrun
* Returned semicolon after CV_INSTRUMENT_REGION_IPP()
2018-10-24 15:02:53 +03:00
Alexander Alekhin
0f07edded6
cmake: don't change baseline compiler flags in 'detection' mode
2018-10-24 03:54:31 +00:00
Alexander Alekhin
971c4ca10b
cmake: don't undefine passed options
2018-10-23 14:46:26 +03: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
Alexander Alekhin
a2e754c136
build: eliminate warnings
2018-10-17 08:43:18 +00:00
jasjuang
a66fd527b0
add support for latest Turing gpu and cuda 10
2018-10-15 10:40:24 -07:00
Alexander Alekhin
5115e5decb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-13 16:19:05 +00:00
Alexander Alekhin
1be75437b7
Merge pull request #12802 from alalek:cmake_pdb
2018-10-13 12:25:36 +00:00
Alexander Alekhin
1ed9ff17e1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-12 10:05:55 +00:00
Alexander Alekhin
be76b451cb
Merge pull request #12791 from alalek:win32_dllmain_detect_termination
2018-10-11 19:28:29 +00:00
Alexander Alekhin
7b9b876726
cmake: improve PDB support
2018-10-11 10:54:37 +00:00
Alexander Alekhin
2b3c7490d5
Merge pull request #12521 from allnes:detect_qr_code
...
Objdetect: QRCode detect + decode
2018-10-11 12:42:05 +03:00
Alexander Alekhin
f731515628
cmake: fix Python detection for standalone bindings
2018-10-10 22:59:42 +03:00
Alexander Alekhin
404893810c
cmake: fix Python detection for standalone bindings
2018-10-10 16:58:23 +00:00
Alexander Nesterov
53ec8f286b
Added QR code decoding.
2018-10-10 15:27:00 +00:00
Alexander Alekhin
70f2ee917e
cmake: add DllMain() into each OpenCV DLL
...
to detect process termination after ExitProcess() call
2018-10-10 11:00:59 +00:00
Alexander Alekhin
dada5a422d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-09 21:20:15 +00:00
Alexander Alekhin
913c4151bf
Merge pull request #12725 from alalek:cmake_python_win32
...
* cmake: don't ignore Python from PATH environment variable
- this breaks selection between 32/64-bit Python
- this breaks Anaconda/Conda environments
- it is not the CMake default behavior, expected by many projects
* cmake: add Python version check, fallback path on CMake 3.12+
* cmake: drop Python 2.6, allow version selection for Python 3.x
2018-10-08 17:45:50 +03:00
Georgy Mironov
60c26f8f1e
Fix install with external protobuf
2018-10-04 13:48:59 +03:00
Reid Kleckner
ffaf58349c
Fix CMake for clang-cl
...
Avoids passing -Wall, which will enable literally every warning in
Clang. Avoids passing -ffunction-sections etc to clang-cl, which each
generate warnings.
2018-10-02 14:55:26 -07:00
Alexander Alekhin
a956732874
cmake: update install paths (Linux)
2018-09-19 15:43:52 +03:00
Alexander Alekhin
e6171d17f8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-18 12:49:52 +03:00
Alexander Alekhin
29bee6f07e
cmake: move Matlab scripts to opencv_contrib ( #12541 )
...
* matlab: move to opencv_contrib
* cmake: preserve variables scope for processing modules
- use macro instead of function to avoid scope resets
2018-09-17 14:55:42 +03:00
Alexander Alekhin
808ba552c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-14 23:44:35 +00:00
Alexander Alekhin
d66f3efd36
Merge pull request #12504 from kraj:3.4
2018-09-13 14:19:25 +00:00
Maksim Shabunin
78c500e97a
Removed unnecessary build-time MediaSDK detection
2018-09-13 13:43:11 +03:00
Khem Raj
a4f53988c4
Check for clang before using -isystem
...
When cross compiling with clang, the internal C++ headers are not found
when adding sysroot to -isystem, that is redundant anyway because it
will look for headers insider --sysroot path with same quality as it
would do with -isystem otherwise
Fixes errors like
FAILED: 3rdparty/openexr/CMakeFiles/IlmImf.dir/Iex/IexBaseExc.cpp.o
....
In file included from
TOPDIR/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/opencv/3.4.3+gitAUTOINC+b38c50b3d0_1f6d6f0626_bdb7bb85f3_34e4206aef_fccf7cd6a4-r0/git/3rdparty/openexr/Iex/IexBaseExc.cpp:43:
In file included from
TOPDIR/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/opencv/3.4.3+gitAUTOINC+b38c50b3d0_1f6d6f0626_bdb7bb85f3_34e4206aef_fccf7cd6a4-r0/git/3rdparty/openexr/Iex/IexBaseExc.h:48:
In file included from
TOPDIR/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/opencv/3.4.3+gitAUTOINC+b38c50b3d0_1f6d6f0626_bdb7bb85f3_34e4206aef_fccf7cd6a4-r0/recipe-sysroot/usr/lib//arm-bec-linux-musleabi/8.2.0/../../../include/c++/8.2.0/string:52:
In file included from
TOPDIR/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/opencv/3.4.3+gitAUTOINC+b38c50b3d0_1f6d6f0626_bdb7bb85f3_34e4206aef_fccf7cd6a4-r0/recipe-sysroot/usr/lib//arm-bec-linux-musleabi/8.2.0/../../../include/c++/8.2.0/bits/basic_string.h:6391:
In file included from
TOPDIR/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/opencv/3.4.3+gitAUTOINC+b38c50b3d0_1f6d6f0626_bdb7bb85f3_34e4206aef_fccf7cd6a4-r0/recipe-sysroot/usr/lib//arm-bec-linux-musleabi/8.2.0/../../../include/c++/8.2.0/ext/string_conversions.h:41:
TOPDIR/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/opencv/3.4.3+gitAUTOINC+b38c50b3d0_1f6d6f0626_bdb7bb85f3_34e4206aef_fccf7cd6a4-r0/recipe-sysroot/usr/lib//arm-bec-linux-musleabi/8.2.0/../../../include/c++/8.2.0/cstdlib:75:15:
fatal error: 'stdlib.h' file not found
^~~~~~~~~~
1 error generated.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-09-12 18:16:39 -07:00
Alexander Alekhin
e73e393c82
Merge pull request #12477 from alalek:drop_legacy_headers
2018-09-11 19:31:16 +00:00
George Mironov
8e0781648b
Fix include paths when building with external protobuf
2018-09-10 16:39:39 +03:00
Alexander Alekhin
9097ccf515
drop legacy headers
2018-09-10 08:33:16 +00:00
Alexander Alekhin
dca657a2fd
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-10 00:10:21 +03:00
Hamdi Sahloul
5e241e7c36
CMAKE: Improve python detection
2018-09-10 04:40:06 +09:00
Alexander Alekhin
73bfe68821
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-07 12:40:27 +03:00
Vadim Pisarevsky
54279523a3
Merge pull request #12437 from vpisarev:avx2_fixes
...
* trying to fix the custom AVX2 builder test failures (false alarms)
* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests
* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests
* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests
* seemingly disabled false alarm warning in surf.cpp; increased tolerance thresholds in the tests for SolvePnP and in DNN/ENet
2018-09-06 18:56:55 +03:00
Alexander Alekhin
d74b98c3d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-04 18:39:03 +00:00
Jakub Golinowski
9f1218b00b
Merge pull request #11897 from Jakub-Golinowski:hpx_backend
...
* Add HPX backend for OpenCV implementation
Adds hpx backend for cv::parallel_for_() calls respecting the nstripes chunking parameter. C++ code for the backend is added to modules/core/parallel.cpp. Also, the necessary changes to cmake files are introduced.
Backend can operate in 2 versions (selectable by cmake build option WITH_HPX_STARTSTOP): hpx (runtime always on) and hpx_startstop (start and stop the backend for each cv::parallel_for_() call)
* WIP: Conditionally include hpx_main.hpp to tests in core module
Header hpx_main.hpp is included to both core/perf/perf_main.cpp and core/test/test_main.cpp.
The changes to cmake files for linking hpx library to above mentioned test executalbles are proposed but have issues.
* Add coditional iclusion of hpx_main.hpp to cpp cpu modules
* Remove start/stop version of hpx backend
2018-08-31 16:23:26 +03:00
Alexander Alekhin
e86287d8ae
cleanup: IPP Async (IPP_A)
...
except header file with conversion routines (will be removed in OpenCV 4.0)
2018-08-30 18:53:07 +03:00
Alexander Alekhin
c1db75e0c7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-29 16:24:56 +03:00
Alexander Alekhin
dd06540e1f
openvino: use 2018R3 defines
2018-08-28 15:57:19 +03:00
Alexander Alekhin
4e59d6fd12
Merge pull request #12224 from cv3d:improvments/CUDA_detection
2018-08-16 09:51:13 +00:00
Hamdi Sahloul
e136c11c7c
Avoid detecting dublicate CUDA archs
2018-08-16 17:40:09 +09:00
Hamdi Sahloul
0e80f56e44
Bugfix: Detect CUDA archs for Windows
2018-08-16 17:10:08 +09:00
pasbi
9f5f64e14e
Merge pull request #12192 from pasbi:pfm
...
* created new decoder and encoder for PFM
pfm file format stores binary RGB or grayscale float images.
* added test for pfm codec
* replaced large with short licence header
* little/big-endian-check is now compile time
* fixed width/height confusion, improved big/little endian recognition, fixed scaling issue and Improved signature check
* adapted tests to handle float images well
* removed data-dependency: lena.pfm
the lena image is now loaded is pam and converted to pfm.
* fixed bug in endianess detection macro
* Added endianess detection for android and win
* removed fancy endianess detection
endianess detection will be implemented in cmake scripts soonish.
* fixed minor warnings
* fixed stupid elif defined bug
* silenced some implicit cast warnings
* replaced std::to_string with std::stringstream solution
std::to_string variant did not build on android.
* replaced new endianess macros with existing ones
* improved readability
2018-08-13 13:14:12 +03:00
Alexander Alekhin
216cd7dc61
cmake: allow to specify own libva paths
...
via CMake:
- `-DVA_LIBRARIES=/opt/intel/mediasdk/lib64/libva.so.2\;/opt/intel/mediasdk/lib64/libva-drm.so.2`
2018-08-10 16:03:10 +03:00
Alexander Alekhin
4eb2966559
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-07 20:12:10 +03:00
Alexander Alekhin
183cfd3a2e
Merge pull request #12097 from xsacha:master
2018-08-04 13:14:22 +00:00
Alexander Alekhin
b4cea8d6d1
Merge pull request #12120 from alalek:core_test_intrin_dispatched
2018-08-03 17:07:17 +00:00
Sacha
9ff4475695
Support WITH_CUDA with clang compiler.
2018-08-03 16:42:28 +10:00
Maksim Shabunin
2df0345985
cmake: add download helper scripts
2018-08-01 15:57:53 +03:00
Alexander Alekhin
47e3e89e30
Merge pull request #12116 from luzpaz:misc-typos
2018-08-01 11:35:57 +00:00
Alexander Alekhin
3f302cabb8
core(test): intrinsic tests for all dispatched CPU optimizations
...
- tests for both SIMD128 / SIMD256
- different dispatched + baseline(SIMD128) intrinsics
2018-08-01 13:50:42 +03:00
Alexander Alekhin
82c477c9f7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-31 21:35:00 +03:00
Maksim Shabunin
5aceee5a36
Restored tests dependencies processing
2018-07-31 19:34:19 +03:00
luz.paz
2003eb1b9b
Misc. typos
...
Found via `codespell -q 3 -I ../opencv-whitelist.txt --skip="./3rdparty"`
2018-07-31 18:44:23 +03:00
Maksim Shabunin
7cf52de47e
dnn: modified IE search, R2 compatibility fixed
2018-07-31 14:48:06 +03:00
Maksim Shabunin
597db69151
ts: test case list is printed after cmd line parsing, refactored
2018-07-26 16:43:43 +03:00
Alexander Alekhin
9787ab598b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-24 22:48:54 +03:00
Dmitry Kurtaev
0c4d5ffecd
Do not copy cv_cpu_helper.h to parent if OpenCV is a submodule
2018-07-24 09:36:28 +03: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
5b72e83687
cmake: prefer using find_package(InferenceEngine)
2018-07-17 15:31:11 +03:00
Alexander Alekhin
60994389a6
Merge pull request #11985 from alalek:cmake_update_inference_engine_detection
2018-07-16 15:49:19 +00:00
Alexander Alekhin
014ae55379
cmake: update DL IE detection to align with OpenVINO 2018 R2
...
These CMake options are enough:
- `-DWITH_INF_ENGINE=ON`
- `-DIE_PLUGINS_PATH=lib/ubuntu_16.04/intel64`
- `-DENABLE_CXX11=ON` (OpenCV 3.4 only)
2018-07-16 14:02:23 +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
3165baa1f1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-02 14:58:29 +03:00
Kuang Fangjun
8e24a8b7c0
remove a redundant option.
2018-07-02 09:45:28 +08:00
Alexander Alekhin
0d6518aaa0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
2018-06-13 19:34:44 +03:00
Pavel Rojtberg
bfc227b8d4
videoio: update librealsense to API 2.0
...
this enables the usage of current sensors, while dropping support for
legacy devices, see:
https://github.com/IntelRealSense/librealsense#overview
Given limited resources, and that the legacy sensors where not that
great, I think we should focus on v2.
2018-06-08 18:23:00 +02:00
Alexander Alekhin
dd7f88bd68
python: support standalone Python bindings build
...
- requires OpenCV source directory
- requires OpenCV binary directory with built modules and 'python_bindings_generator' target
2018-06-07 15:16:39 +03:00
Alexander Alekhin
45dd575ed2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb
.
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489
.
2018-06-04 19:26:10 +03:00
Alexander Alekhin
ec30b1294f
Merge pull request #11636 from alalek:cmake_ffmpeg_find_package
2018-06-04 14:37:36 +00:00
Kuang Fangjun
9ae28415ec
fix doc.
2018-06-03 17:44:24 +08:00
Alexander Alekhin
b934702c7f
cmake: support find_package(FFMPEG)
...
Use "OPENCV_FFMPEG_USE_FIND_PACKAGE" variable to specify find_package() parameters
2018-05-31 18:27:01 +03:00
Dmitry Kurtaev
f96f934426
Update Intel's Inference Engine deep learning backend ( #11587 )
...
* Update Intel's Inference Engine deep learning backend
* Remove cpu_extension dependency
* Update Darknet accuracy tests
2018-05-31 14:05:21 +03:00
Alexander Alekhin
5e68f35500
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-22 19:02:01 +03:00
Alexander Enaldiev
84584002f2
Merge pull request #11417 from Turim:imgcodecs_cmake_decoders_customize_formats
...
* imgcodecs cmake: the option to customize supported formats list (WITH_IMGCODEC_HDR, WITH_IMGCODEC_SUNRASTER, WITH_IMGCODEC_PXM)
* imgcodecs: fixes
- fixed CMake scripts (=OFF doesn't really work)
- restore dropped GDCM block
- added _IMGCODEC_ prefix
- fixed tests
- include PAM format under WITH_IMGCODEC_PXM option
2018-05-22 15:10:15 +00:00
Alexander Alekhin
573e790107
Merge pull request #11558 from alalek:issue_11552
2018-05-22 14:19:13 +00:00
Maksim Shabunin
020ad1ac76
dnn: allow setting IE paths via command line
2018-05-22 14:40:03 +03:00
Alexander Alekhin
ba1bd64bf9
Merge pull request #11532 from paroj:realsense
2018-05-21 15:59:46 +00:00
Alexander Alekhin
d4a8a9ee96
cmake: filter NVCC compiler flags (Wimplicit-fallthrough, OPENCV_CUDA_NVCC_FILTEROUT_OPTIONS)
...
issue 11552
2018-05-21 17:54:11 +03:00
Pavel Rojtberg
936d2963a2
videoio: add rudimentary librealsense 1.x support
...
it is reusing CAP_INTELPERC* enums as Intel PerC is deprecated and
librealsense replaces it.
2018-05-17 11:56:52 +02:00
Alexander Alekhin
68c92908d5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-14 15:17:35 +03:00
Alexander Alekhin
c6a9de812b
Merge pull request #11497 from alalek:libjpeg-turbo
2018-05-14 12:17:10 +00:00
Alexander Alekhin
f8252702a8
3rdparty: integrate libjpeg-turbo build scripts into OpenCV
2018-05-11 18:29:57 +03:00
Alexander Alekhin
43177b1f6f
cmake: added check_flake8 target
2018-05-11 17:32:22 +03:00
Alexander Alekhin
000a13b6a3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-03 14:30:38 +00:00
Sayed Adel
788d6a7105
cmake: Disable -Wsuggest-override option in case of using PCH #11433
2018-05-02 09:12:55 +00:00
Alexander Alekhin
80934dc488
cmake: update 'git describe' information
2018-04-28 17:17:31 +03:00
Alexander Alekhin
e7adce851c
Merge pull request #11314 from terfendail:msmf_camera
2018-04-27 19:34:29 +03:00
Alexander Alekhin
1031dfe4e8
Merge pull request #11402 from alalek:build_warnings
2018-04-26 19:04:37 +00:00
Alexander Alekhin
56222f35bb
cmake: fix CPU_BASELINE_FINAL filling
...
- remove duplicates
- restore "always on" missing entries
- fix FP16 detection on MSVC
2018-04-26 17:13:42 +03:00
Alexander Alekhin
2a330e3006
cuda: eliminate warnings
2018-04-26 15:06:59 +03:00
Alexander Enaldiev
677dc802ae
protobuf build documenting: move the WITH_PROTOBUF option to the top level
2018-04-26 13:58:13 +03:00
Alexander Alekhin
cd2b188c9a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-24 18:13:06 +03:00
Alexander Alekhin
ef2548778c
build: -Wimplicit-fallthrough warning for GCC 7+ only
2018-04-24 16:03:40 +03:00
Vitaly Tuzov
80600e5cdc
Added DXVA hardware acceleration to MSMF-based VideoCapture
2018-04-24 13:42:49 +03:00
Alexander Alekhin
a2d6fc7ac0
cmake: fix popcnt detection
...
via GCC/Clang __POPCNT__ define
2018-04-24 12:40:25 +03:00
Alexander Alekhin
ff6ce6cd01
cmake: change CPU_BASELINE=DETECT for MacOSX
2018-04-23 19:42:49 +03:00
Alexander Alekhin
4d7d630e92
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-23 18:45:02 +03:00
Alexander Alekhin
dca9ca1cac
Merge pull request #11363 from mshabunin:compat-vc2017
2018-04-23 09:24:39 +00:00
Alexander Alekhin
29b4fd2774
Merge pull request #11351 from dkurt:dnn_enable_inf_engine_tests
2018-04-23 09:16:39 +00:00
Maksim Shabunin
abce51fb7b
cmake config: adding fallback to VS 2015 if distribution does not have VS 2017 binaries
2018-04-23 09:33:27 +03:00
Dmitry Kurtaev
bd77d100e1
Enable some tests for clDNN plugin from Intel's Inference Engine
2018-04-20 10:47:46 +03:00
Alexander Alekhin
12e8e33144
build: enable -Wimplicit-fallthrough warning for OpenCV modules
2018-04-19 19:54:03 +03:00
Alexander Alekhin
97882d03cc
core: fix FP16 conversion with CV_DISABLE_OPTIMIZATION option
...
Reproducer:
cmake -DCPU_BASELINE=AVX2 -DCV_DISABLE_OPTIMIZATION=ON ...
2018-04-18 14:13:03 +03:00
Alexander Alekhin
5b867b6f1f
cmake: fix CPU_BASELINE=NATIVE on MSVS
2018-04-17 19:34:35 +03:00
Alexander Alekhin
4b2d1aaeea
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-16 12:41:47 +03:00
Alexander Alekhin
a2d6ee2d31
Merge pull request #11305 from tomoaki0705:typoNVIDIA
2018-04-13 12:56:42 +00:00
Tomoaki Teshima
a40354d16f
use correct name for NVIDIA
...
* remove NVidia and Nvidia
* replace Cuda with CUDA
* keep the letters for API
2018-04-13 20:33:19 +09:00
Tomoaki Teshima
779a42678d
fix CUDA build crash
...
* add --std=c++11 flag to nvcc definition
* remove not used abs functions
2018-04-11 17:19:09 +09:00
Alexander Alekhin
c6aa97c9aa
next(android): java3 -> java4
2018-04-10 18:09:54 +03:00
Alexander Alekhin
250941bd47
next: drop WITH_CSTRIPES
2018-04-10 18:09:54 +03:00
Alexander Alekhin
d4688e6474
cmake: require C++11 and CMake 3.5.1+
2018-04-10 18:09:54 +03:00
Vladislav Sovrasov
e7e29cb63c
cmake: add compilation test for VTK
2018-04-10 18:09:54 +03:00
Alexander Alekhin
73f4907dc0
Merge pull request #11280 from alalek:fix_cmake_warning_ninja_pylintrc
2018-04-10 14:36:12 +00:00
Alexander Alekhin
333973b846
Merge pull request #11276 from alalek:install_pdb
2018-04-10 14:35:32 +00:00
Alexander Alekhin
5e03011496
cmake: fix Ninja generator warning about pylintrc
...
CMake generated files is a part of target depends list.
Details: `cmake --help-policy CMP0058`
2018-04-10 12:23:10 +03:00
Alexander Alekhin
b76ce0e0a4
Merge pull request #11253 from mshabunin:decrease-tbb-dependency
2018-04-09 16:03:34 +00:00
Alexander Alekhin
784c8436fd
cmake: update PDB installation
2018-04-09 18:50:58 +03:00
Vladislav Sovrasov
0d9c63744e
Add CPU default extensions loading in IE dnn backend ( #11252 )
...
* Add CPU default extensions loading in IE dnn backend
* Load cpu_extensions for the future Intel's Inference Engine
2018-04-09 16:22:19 +03:00
Vadim Pisarevsky
29869c5b91
Merge pull request #11243 from alalek:with_cuda_default_off
2018-04-09 09:46:34 +00:00
Maksim Shabunin
b88609a921
Reduced direct TBB dependencies
2018-04-06 14:21:15 +03:00
Alexander Alekhin
4990506948
cuda: WITH_CUDA=OFF by default (need to enable it explicitly)
2018-04-05 19:23:58 +00:00
Alexander Alekhin
6abfc6761e
android: refactor Android SDK detection
...
- properly detect Android SDK support of Ant/Gradle projects
- divide processing of And/Gradle based projects
2018-04-05 19:19:31 +00:00
Alexander Alekhin
87498bc6d4
cmake: workaround CPATH ipp_iw issue
...
CPATH entries are processed before any -isystem:
https://gcc.gnu.org/onlinedocs/cpp/Environment-Variables.html
2018-03-28 18:43:28 +03:00
Alexander Alekhin
0ede1b5b22
cmake: enable override warnings (requires C++11 compilation mode)
2018-03-28 18:43:28 +03:00
Alexander Alekhin
6c8014e7d1
cmake: disable checks for protobuf generated files
2018-03-28 18:43:28 +03:00
Alexander Alekhin
6bd80ba71b
cmake: use SYSTEM include directories
2018-03-28 17:57:58 +03:00
Alexander Alekhin
167034fb04
Merge pull request #11098 from dkurt:dnn_native_inf_engine
2018-03-28 14:52:08 +00:00
Dmitry Kurtaev
2f3a9ba1d4
Update OpenCVDetectInferenceEngine.cmake
2018-03-28 16:34:37 +03:00
Alexander Alekhin
8388b630ac
Merge pull request #11167 from alalek:cmake_compiler_vars
2018-03-28 12:38:31 +00:00
Alexander Alekhin
5da7805623
cmake: add module/src include dir in case of enabled precompiled headers
2018-03-27 17:38:54 +03:00
Alexander Alekhin
08941b7890
cmake: avoid amending of CMAKE_COMPILER_IS_[GNUCXX|CLANGCXX|CCACHE] vars
...
- Recommended compiler checks:
- GCC: CV_GCC
- Clang: CV_CLANG
- fixed problem with CMAKE_CXX_COMPILER_ID=Clang/AppleClang mess on MacOSX
Details: cmake --help-policy CMP0025
- do not declare Clang as GCC compiler
2018-03-27 16:16:59 +03:00
Alexander Alekhin
6c051a55e5
cmake: don't add include <module>/src directory to avoid conflicts
...
during opencv_world builds
2018-03-19 11:14:15 +03:00
Alexander Alekhin
47dea29e4e
Merge pull request #11081 from alalek:cmake_fix_android_examples_dependencies
2018-03-16 16:32:49 +00:00
Alexander Alekhin
1e808a495d
cmake: fix android examples dependencies
...
add_dependencies(${target}) doesn't control regeneration of .apk file,
because "${target}" is dummy target.
2018-03-15 14:17:02 +03:00
Sonny Kurniawan
c11eaeec49
Help Cmake find OpenNI2 include path
...
When compiling with OpenNI2 flag active, CMake will not be able to find OpenNI.h due to the environment path not set in OpenCVFindOpenNI2.cmake. This PR rectifies this issue.
2018-03-15 18:39:07 +09:00
jchazalon
bf5f7380cf
Update OpenCVDownload.cmake to fix log crash
...
This suppresses the interpretation of string literals by switching the ocv_download_log from a macro to a function.
This avoid crashes when the string to log contains escape characters.
More details about the problem this PR fixes are available at: https://github.com/opencv/opencv_contrib/issues/1131
2018-03-07 15:35:37 +01:00
Alexander Alekhin
514f4193db
Merge pull request #10959 from alalek:cmake_ocl4dnn
2018-03-07 10:26:14 +00:00
Maksim Shabunin
7bbe002a2f
Add install component for 3rdparty libraries licenses
2018-03-06 16:32:30 +03:00
Alexander Alekhin
560ca8c5aa
Merge pull request #10961 from alalek:fix_clang_avx512
2018-03-02 11:36:57 +00:00
Alexander Alekhin
1b83bc48a1
dnn: make OpenCL DNN code optional
2018-03-01 12:12:40 +03:00
Alexander Alekhin
0b4428e92f
cmake: AVX512 with clang
2018-02-27 15:46:09 +03:00
Maksim Shabunin
f0c0e0c6fa
CPU dispatching: additional AVX-512 check for mingw-w64
2018-02-25 15:12:53 +03:00
Maksim Shabunin
3fd2384b81
Fixed mingw compilation on Windows
2018-02-22 17:11:18 +03:00
Vadim Pisarevsky
88b689bcf1
Merge pull request #10876 from alalek:android_static_libs
2018-02-19 14:16:06 +00:00
Alexander Alekhin
ddb482b14a
android: move .a files into 'staticlibs' directory
...
to reduce overhead of gradle builds
2018-02-15 16:31:49 +03:00
Alexander Alekhin
36f11a54e1
cmake: customize OpenCV build via CMake script hooks
2018-02-15 14:03:38 +03:00
Alexander Alekhin
c434198ee5
Merge pull request #10864 from alalek:cmake_update_debug_info
2018-02-14 12:47:43 +00:00
Alexander Alekhin
95014f311d
cmake: debug info
2018-02-14 13:44:10 +03:00
Maksim Shabunin
2d1350a9d6
Added group targets for samples (opencv_samples, opencv_samples_<group>), install samples/data inseparate component 'samples_data'
2018-02-12 18:42:36 +03:00
Maksim Shabunin
2200e13c71
cmake: refactored scripts with samples building:
...
- allow installing samples sources on all platforms
even if BUILD_EXAMPLES is disabled, fixed minor
issues in sources installation process
- use 'example_<group>_<name>' scheme for target and binary file naming
- use single function for sample executable creation
2018-02-12 18:42:36 +03:00
Alexander Alekhin
14032c6653
cmake: reset __content variable if file doesn't exist
...
Resolves CMake error after relaunch with updated source code:
Cannot find source file:
modules/dnn/layers/layers_common.avx512_skx.cpp
2018-02-12 17:30:53 +03:00