cyy
c6638d62e6
respect CUDA_HOST_COMPILER when detecting CUDA arch
2020-06-11 15:57:08 +08:00
Giles Payne
02385472b6
Merge pull request #17165 from komakai:objc-binding
...
Objc binding
* Initial work on Objective-C wrapper
* Objective-C generator script; update manually generated wrappers
* Add Mat tests
* Core Tests
* Imgproc wrapper generation and tests
* Fixes for Imgcodecs wrapper
* Miscellaneous fixes. Swift build support
* Objective-C wrapper build/install
* Add Swift wrappers for videoio/objdetect/feature2d
* Framework build;iOS support
* Fix toArray functions;Use enum types whenever possible
* Use enum types where possible;prepare test build
* Update test
* Add test runner scripts for iOS and macOS
* Add test scripts and samples
* Build fixes
* Fix build (cmake 3.17.x compatibility)
* Fix warnings
* Fix enum name conflicting handling
* Add support for document generation with Jazzy
* Swift/Native fast accessor functions
* Add Objective-C wrapper for calib3d, dnn, ml, photo and video modules
* Remove IntOut/FloatOut/DoubleOut classes
* Fix iOS default test platform value
* Fix samples
* Revert default framework name to opencv2
* Add converter util functions
* Fix failing test
* Fix whitespace
* Add handling for deprecated methods;fix warnings;define __OPENCV_BUILD
* Suppress cmake warnings
* Reduce severity of "jazzy not found" log message
* Fix incorrect #include of compatibility header in ios.h
* Use explicit returns in subscript/get implementation
* Reduce minimum required cmake version to 3.15 for Objective-C/Swift binding
2020-06-08 18:32:53 +00:00
Maksim Shabunin
29ff1129fb
Merge pull request #17431 from mshabunin:support-vtk9
...
* Added VTK 9 support
2020-06-05 17:55:53 +00: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
Jan Tojnar
765f333a1d
pkg-config: Drop broken include path
...
The legacy `includedir` was removed in 4.0 (https://github.com/opencv/opencv/pull/12477 ) but it was not removed from the `.pc` file.
This causes issues when trying to link against OpenCV using pkg-config in CMake.
2020-05-25 22:33:34 +02:00
Alexander Alekhin
c722625f28
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-28 16:53:19 +00:00
Alexander Alekhin
1d30a524fa
Merge pull request #17145 from asmorkalov:as/riscv
2020-04-28 10:41:41 +00:00
Alexander Smorkalov
7228d2a824
Added initial version of cmake toolchain for RISC-V architecture.
2020-04-27 12:42:38 +03:00
Alexander Alekhin
9181ecfc7b
cmake: fix protobuf handling
2020-04-27 02:11:19 +00:00
Alexander Alekhin
bfcc136dc7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-21 21:32:51 +00:00
Maksim Shabunin
2840362868
Merge pull request #16769 from mshabunin:fix-ipp-install
...
* Do not copy standalone IPP libraries to install for static builds
* Restored IPP installation under option
2020-04-17 14:28:42 +00:00
Alexander Alekhin
2cef100303
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-16 18:28:27 +00:00
Alexander Alekhin
c007228d0f
Merge pull request #17075 from alalek:dnn_updates_from_openvino_2020.2
2020-04-16 12:19:58 +00:00
Alexander Alekhin
ef68cc3d5f
dnn: use OpenVINO 2020.2 defines
...
original commit: 45263d7642
2020-04-15 11:14:43 +00:00
Alexander Alekhin
ca9756f6a1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-13 20:00:12 +00:00
Alexander Alekhin
49a75079f2
Merge pull request #17047 from alalek:fix_permissions
2020-04-13 12:34:08 +00:00
Alexander Alekhin
f0ffc52435
fix files permissions
2020-04-13 04:29:55 +00:00
Xiping Yan
5c7c80dd27
Merge pull request #17028 from xipingyan:patch-1
...
* Update OpenCVFindVA_INTEL.cmake
When set env VA_INTEL_IOCL_ROOT, "if($ENV{VA_INTEL_IOCL_ROOT})" don't work.
My modification as follow.
- if($ENV{VA_INTEL_IOCL_ROOT})
+ if(DEFINED ENV{VA_INTEL_IOCL_ROOT})
Refer: https://cmake.org/cmake/help/latest/variable/ENV.html
* based on merge comment, update code
2020-04-10 12:23:13 +00:00
Alexander Alekhin
1537a5f253
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-09 19:19:20 +00:00
Alexander Alekhin
5504d94e36
cmake: update generation of 'uninstall' target
...
Details: https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#can-i-do-make-uninstall-with-cmake
2020-04-07 22:03:12 +00:00
Alexander Alekhin
95a07ca11c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-27 16:49:59 +00:00
StefanBruens
8d78400052
Merge pull request #16494 from StefanBruens:jpeg2000_openjpeg_port
...
Jpeg2000 OpenJPEG port
* OpenJPEG based JPEG2000 decoder implementation
Currently, the following input color spaces and depth conversions are
supported:
- 8 bit -> 8 bit
- 16 bit -> 16 bit (IMREAD_UNCHANGED, IMREAD_ANYDEPTH)
- RGB(a) -> BGR
- RGBA -> BGRA (IMREAD_UNCHANGED)
- Y(a) -> Y(a) (IMREAD_ANYCOLOR, IMREAD_GRAY, IMREAD_UNCHANGED))
- YCC -> Y (IMREAD_GRAY)
* Check for OpenJPEG availability
This enables OpenJPEG based JPEG2000 imread support by default, which
can be disabled by -DWITH_OPENJPEG=OFF. In case OpenJPEG is enabled
and found, any checks for Jasper are skipped.
* Implement precision downscaling for precision > 8 without IMREAD_UNCHANGED
With IMREAD_UNCHANGED, values are kept from the input image, without it
components are downscaled to CV_8U range.
* Enable Jpeg2K tests when OpenJPEG is available
* Add support for some more color conversions
Support IMREAD_GRAY when input color space is RGB or unspecified.
Support YUV input color space for BGR output.
* fix: problems with unmanaged memory
* fix: CMake warning - HAVE_OPENJPEG is undefined
Removed trailing whitespaces
* fix: CMake find_package OpenJPEG add minimal version
* Basic JPEG2K encoder
Images with depth CV_8U and CV_16U are supported, with 1 to 4 channels.
* feature: Improved code for OpenJPEG2000 encoder/decoder
- Removed code duplication
- Added error handlers
- Extracted functions
* feature: Update conversion openjpeg array from/to Mat
* feature: Extend ChannelsIterator to fulfill RandomAccessIterator named requirements
- Removed channels split in copyFromMatImpl. With ChannelsIterator no allocations are performed.
- Split whole loop into 2 parts in copyToMat -> where std::copy and std::transforms are called.
* fix: Applied review comments.
- Changed `nullptr` in CV_LOG* functions to `NULL`
- Added `falls through` comment in decoder color space `switch`
- Added warning about unsupported parameters for the encoder
* feature: Added decode from in-memory buffers.
Co-authored-by: Vadim Levin <vadim.levin@xperience.ai>
2020-03-27 07:18:58 +00:00
Alexander Alekhin
7465125f67
build: add winpack_dldt build scripts
2020-03-25 21:26:41 +00:00
Alexander Alekhin
2a9a2fff66
cmake: fix find process for InferenceEngine extra libraries
2020-03-25 02:43:42 +00:00
Alexander Alekhin
0b4c101e8a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-23 16:54:35 +00:00
Andrei-Florin BENCSIK
8253562794
fix: minor typo in CMakeCVDetectPython
2020-03-21 11:15:07 +02:00
Alexander Alekhin
4cdb4652cf
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-20 21:41:15 +00:00
NesQl
bf224e61a9
Merge pull request #16832 from liqi-c:3.4-tengine-android
...
* Add android support for tengine
* modify tengine download use commit id
* Del some invalid log in Tengine
* Test. default enable tengine
* ndk version judegment
* Close test . set Tengine default OFF
* Logic problem
* test .Android NDK judgement .
* Cmake error modify.
* cmake: cleanup tengine scripts
* cmake: use tengine target name
* cmake: disable testing of BUILD_ANDROID_PROJECTS=OFF
* Close test .
2020-03-20 10:10:39 +00:00
Alexander Alekhin
ca23c0e630
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-17 13:23:33 +03:00
Alexander Alekhin
4e56c1326f
core: adjust type of allocator_stats counter, allow to disable
2020-03-11 20:12:29 +03:00
Alexander Alekhin
3a99ebb446
Merge pull request #16756 from alalek:cmake_opencv_test_extra_compile_options
2020-03-11 12:38:45 +00:00
Alexander Alekhin
9b3be01b83
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-09 20:27:34 +00:00
NesQl
0bcdf7d03e
Merge pull request #16724 from liqi-c:3.4-tengine
...
* Add Tengine support .
* Modify printf to CV_LOG_WARNING
* a few minor fixes in the code
* Renew Tengine version
* Add header file for CV_LOG_WARNING
* Add #ifdef HAVE_TENGINE in tengine_graph_convolution.cpp
* remove trailing whitespace
* Remove trailing whitespace
* Modify for compile problem
* Modify some code style error
* remove whitespace
* Move some code style problem
* test
* add ios limit and build problem
* Modified as alalek suggested
* Add cmake 2.8 support
* modify cmake 3.5.1 problem
* test and set BUILD_ANDROID_PROJECTS OFF
* remove some compile error
* remove some extra code in tengine
* close test.
* Test again
* disable android.
* delete ndk version judgement
* Remove setenv() call . and add License information
* Set tengine default OFF. Close test .
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
2020-03-09 14:59:23 +00:00
Alexander Alekhin
e0a9468488
cmake: allow extra compile options for tests
2020-03-07 15:37:21 +00:00
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