Roman Donchenko
af8aa8a2fa
Merge pull request #2433 from ilya-lavrenov:typos
2014-03-03 12:20:35 +04:00
Ilya Lavrenov
eedf86402d
typos
2014-03-02 21:04:17 +04:00
Vladislav Vinogradov
8b8c368148
fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)
2014-02-14 17:56:03 +04:00
Vladislav Vinogradov
3e1f74f2ca
fix nonfree module compilation without CUDA
2014-02-07 13:40:37 +04:00
Roman Donchenko
cd1ffd169c
Merge pull request #2261 from jet47:stitching-cuda-android
2014-02-03 15:35:55 +04:00
Vladislav Vinogradov
d8f7377122
turn on CUDA part of nonfree module on Android for non-dynamic build
2014-02-03 11:52:43 +04:00
Ilya Lavrenov
ede5b23753
rewrote perf tests for SURF
2014-02-03 02:00:29 +04:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Alexander Smorkalov
c48777a1c3
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
2013-12-27 11:18:10 +04:00
krodyush
fffac2f085
optimize SURF by
...
Inlining and customizing sampling functions to reduce memory traffic and compute
Improve calcOrientation implementation.
Using more efficient rounding routines.
Removing unnecessary use of local memory
2013-12-17 14:12:33 +04:00
Andrey Pavlenko
42c4f91ef4
Merge pull request #1495 from StevenPuttemans:bugfix_3282
2013-10-29 10:51:01 +04:00
Andrey Pavlenko
2b6fca68bf
fixing typo
2013-10-25 18:00:46 +04:00
Alexander Alekhin
57120c1a60
ocl: remove support_image2d(): we target on OpenCL 1.1 (with image2d support by default)
2013-10-11 17:16:03 +04:00
Alexander Alekhin
dd9ff587dc
ocl: file-based ProgramCache refactoring
2013-10-03 19:50:14 +04:00
Alexander Alekhin
b00f79ac5f
ocl: move program names into opencl_kernels.hpp
2013-10-03 19:50:14 +04:00
Alexander Alekhin
e8d9ed8955
ocl: split initialization.cpp into 3 files: context, operations, programcache
2013-10-03 19:50:14 +04:00
StevenPuttemans
f6c802b563
Applied fix suggested in bug 3282 and shortened code
2013-09-30 11:48:01 +02:00
Ilya Lavrenov
58b84c2fc0
removed needless divUp
2013-09-16 15:48:30 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
ac8506db32
Merge pull request #1210 from pengx17:2.4_ocl_surf_intel_fix
2013-08-16 12:22:18 +04:00
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
StevenPuttemans
ed76b2f98f
Like mentioned by Andrei Pavlenko after merging pullrequest #1206 , a wrong
...
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
2013-08-07 14:49:33 +02:00
StevenPuttemans
f28496c628
Added sample links in documentation for python2, ocl and gpu
2013-08-02 14:05:08 +02:00
peng xiao
fd77a49e76
Fix ocl compilation error when using Intel OpenCL SDK.
2013-08-01 13:06:33 +08:00
Andrey Pavlenko
6a40067424
Merge pull request #1206 from StevenPuttemans:feature_3169
2013-07-31 14:31:21 +04:00
StevenPuttemans
0c5244103f
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
...
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
2013-07-31 11:20:05 +02:00
Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
Roman Donchenko
3ea4836a0a
Changed the impls argument to be an array name.
...
Turns out, you can't use preprocessor directives inside macro arguments.
Who'd have thought?
2013-06-20 15:18:35 +04:00
Roman Donchenko
51a672ec40
Disabled the cuda variant when CUDA is not available.
2013-06-19 19:16:18 +04:00
Roman Donchenko
936236e4b1
Extended the CPU/GPU selection mechanism in performance tests.
...
Now it allows choosing between arbitrary implementation variants.
2013-06-19 17:55:42 +04:00
Ivan Korolev
fee8121040
Added regression tests for SURF/SIFT (related to #2892 )
2013-06-14 17:08:01 +04:00
Ivan Korolev
fc82150edc
Fixed a bug #2892
2013-06-14 08:21:42 +04:00
Roman Donchenko
29b13ec1de
Replaced most of the usages of parallel_for with that of parallel_for_.
...
This should allow many algorithms to take advantage of more parallelization
technologies.
2013-05-31 12:22:04 +04:00
Vadim Pisarevsky
cbbc82a789
Merge pull request #882 from pengx17:2.4_rewrite_query_info
2013-05-20 14:01:03 +04:00
Vladislav Vinogradov
ec52096e30
removed VIBE implementation
2013-05-16 13:47:24 +04:00
peng xiao
ac21cabda2
Copy ocl::queryDeviceInfo interface from master to 2.4.
...
Affected functions surf.ocl, pyrlk.ocl and hog.ocl are updated with the change.
2013-05-14 17:50:38 +08:00
Andrey Kamaev
36028bd8ad
Merge pull request #808 from bitwangyaoyao:2.4_mac
2013-04-12 14:59:45 +04:00
yao
719e8674ad
fix the compile errors on Mac
2013-04-12 17:38:59 +08:00
Roman Donchenko
e8721f1f6f
Automatically add CUDA support to a module if it has CUDA sources.
...
Backport from master.
2013-04-10 12:20:54 +04:00
Vladislav Vinogradov
642d7d6826
fixed nonfree test (run it only on one gpu device)
2013-04-02 13:24:39 +04:00
Vladislav Vinogradov
9086efa8e9
fixed warnings
2013-04-02 13:24:00 +04:00
Andrey Kamaev
56d62118d5
Merge pull request #707 from pengx17:2.4_surf
2013-03-29 18:20:45 +04:00
peng xiao
f2ecf4f905
Disable ocl::SURF accurate test
2013-03-27 13:25:08 +08:00
peng xiao
ad58c084a9
Fix compiler errors
2013-03-27 08:56:31 +08:00
peng xiao
8ffc15371d
Fix compiler errors
2013-03-26 17:23:38 +08:00
peng xiao
7476bf5cd7
Fix compiler errors
2013-03-26 16:40:30 +08:00
Vladislav Vinogradov
4dbd0f0e8f
fixed compilation issues with gpu modules:
...
* disabled warnings from thrust
* fixed warnings from ts_gtest.h
* possibly fixed superres compilation in Debug mode on Windows
2013-03-26 12:33:13 +04:00
peng xiao
9698079ca5
Pass warp size into SURF
2013-03-26 15:48:15 +08:00
peng xiao
f7b40cdc63
Add a macro to call additional barrier function on the fly
2013-03-26 11:51:02 +08:00