Commit Graph

137 Commits

Author SHA1 Message Date
StevenPuttemans
e96de8821c bug 2740 added fix 2014-05-12 15:26:56 +02:00
Ilya Lavrenov
7df92bbb77 fixed C4505 2014-03-31 17:30:15 +04:00
Andrey Pavlenko
a1d151924d Merge pull request #2527 from apavlenko:ocl_surf_24 2014-03-26 19:03:44 +04:00
Andrey Pavlenko
fa5705613d splitting plain and OCL tests for SURF. 2014-03-26 17:18:05 +04:00
Andrey Pavlenko
c1acbb02bc disabling calls to SURF_OCL causing tests failures 2014-03-25 14:09:49 +04:00
Andrey Pavlenko
63a746c6ea fixing conditional compilation 2014-03-25 13:16:42 +04:00
Andrey Pavlenko
7e03a8b279 fixing check_docs2.py issue 2014-03-25 13:15:56 +04:00
Andrey Pavlenko
259b9e093c disabling failing tests 2014-03-24 10:12:02 +04:00
Andrey Pavlenko
5421d741bc making OCL tests conform to the comon style 2014-03-24 10:08:44 +04:00
Andrey Pavlenko
fe5eaae102 adding missing include (fixing 'no ocl implementation' error) 2014-03-21 14:30:49 +04:00
Roman Donchenko
a1e5bd71f1 Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control 2014-03-19 14:49:22 +04:00
Ilya Lavrenov
357a856cf6 nonfree perf tests 2014-03-13 22:35:08 +04:00
Alexander Smorkalov
b3e18d23a3 Implicit CUDA and OpenCL control for module definition added.
Feature allows to exclude CUDA or OpenCL optimizations at all even CUDA is used
on build. Exclusion of CUDA or OpenCL cut unwanted dependencies.
2014-03-06 10:31:33 +04:00
Vadim Pisarevsky
22f42a639f fixed doc builder warnings; make sure the tests give reasonable results when OpenCL is not available 2014-03-05 18:48:19 +04:00
Vadim Pisarevsky
60ce2b2e9f modified SURF's performance test to test OpenCL version as well 2014-03-05 17:10:51 +04:00
Vadim Pisarevsky
da70b04262 made SURF_OCL default constructor parameters the same as SURF 2014-03-05 17:04:49 +04:00
Vadim Pisarevsky
3c1917771b modified OpenCL SURF API and the tests in 2.4.x to prove that it gives different from CPU results 2014-03-05 16:31:41 +04:00
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