mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,777 Commits 6 Branches 126 Tags 3 GiB
a57030a0cd
Commit Graph

732 Commits

Author SHA1 Message Date
Andrey Pavlenko
d5723480e1 Merge pull request #1592 from alalek:ocl_program_cache_update 2013-10-10 15:55:58 +04:00
Andrey Pavlenko
a351161fd7 Merge pull request #1591 from alalek:ocl_remove_cl_hpp_h 2013-10-10 15:55:13 +04:00
Ilya Lavrenov
9d1636daa6 catching OpenCL double not supported exceptions 2013-10-10 12:45:55 +04:00
Alexander Alekhin
d26f62569d ocl: fix compilation warnings, update openCLExecuteKernelInterop 2013-10-10 00:15:02 +04:00
Alexander Alekhin
43c638d07d ocl: remove cl.hpp dependency (it is missed on Nvidia SDK and on some platforms) 2013-10-09 23:53:25 +04:00
Alexander Alekhin
555c505b70 update cmake 'install' target for Windows platform 
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
 2013-10-09 17:49:10 +04:00
Ilya Lavrenov
fccd37de7e changes eps for NORM_L1 2013-10-09 14:18:07 +04:00
Ilya Lavrenov
488e6aafaf fixed the PR 1582 2013-10-09 14:16:36 +04:00
Andrey Pavlenko
6b69a66c3c Merge pull request #1579 from ilya-lavrenov:ocl_norm 2013-10-09 13:52:20 +04:00
Andrey Pavlenko
ff8e5a04a4 Merge pull request #1586 from ilya-lavrenov:ocl_setto_win_fix 2013-10-09 13:49:34 +04:00
Ilya Lavrenov
245ff93544 ocl setto fix for windows 2013-10-08 19:11:32 +04:00
Ilya Lavrenov
bdd5038da4 ocl setto fix for windows 2013-10-08 18:52:32 +04:00
Sebastian Krämer
3696174b14 fix documentation warning 2013-10-08 16:49:20 +02:00
Ilya Lavrenov
c404da784f fixed ocl::norm (previously the function used double as a work type) 2013-10-08 18:43:49 +04:00
Sebastian Krämer
4ffd3fb905 add ocl::abs 2013-10-08 15:23:24 +02:00
Sebastian Krämer
c844bbdd82 documentation update for ocl::min and ocl::max 2013-10-08 15:23:18 +02:00
Sebastian Krämer
33df7131ae add ocl::min and ocl::max (includes accuracy tests update) 2013-10-08 15:23:13 +02:00
Roman Donchenko
ae851af648 Merge pull request #1574 from alalek:svm_workaround 2013-10-08 15:31:42 +04:00
Roman Donchenko
65ec9f77d9 Merge pull request #1577 from ilya-lavrenov:ocl_setto_opencl12 2013-10-08 15:15:31 +04:00
Roman Donchenko
bc3669bfb1 Merge pull request #1576 from alalek:ocl_fix_cl_double 2013-10-08 14:20:11 +04:00
Roman Donchenko
ec409a436d Merge pull request #1545 from alalek:ocl_test_fix_rng 2013-10-08 12:59:50 +04:00
Ilya Lavrenov
32f11e6f40 enabled OpenCL 1.2 branch in oclMat::setTo 2013-10-08 12:49:29 +04:00
Alexander Alekhin
1d6327ba2a ocl: fix Context::CL_* usage 2013-10-08 12:23:46 +04:00
Alexander Alekhin
f63b0dfaf4 svm: disable failed tests 2013-10-07 18:17:10 +04:00
Roman Donchenko
46eeb106e2 Merge pull request #1564 from alalek:cl_runtime_fix_32bit 2013-10-04 18:29:04 +04:00
Roman Donchenko
0a13510293 Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update 2013-10-04 18:25:44 +04:00
Roman Donchenko
2660f4bc59 Merge pull request #1562 from ilya-lavrenov:ocl_integral 2013-10-04 18:12:43 +04:00
Roman Donchenko
aa80250a3d Merge pull request #1532 from alalek:stereo_csbp 2013-10-04 16:43:51 +04:00
Alexander Alekhin
de0f310e81 ocl: tests: RNG usage refactoring 2013-10-04 15:39:39 +04:00
Alexander Alekhin
90df620deb ocl: stereo_csbp: divUp -> roundUp 2013-10-04 12:48:26 +04:00
Alexander Alekhin
2d1a6687f9 autogenerated code 2013-10-04 12:40:08 +04:00
Alexander Alekhin
2fdfa37ea5 ocl: runtime, fix 32-bit builds 2013-10-04 12:40:08 +04:00
Ilya Lavrenov
10d60f99dc fixed ocl::integral and enabled perf test for it 2013-10-04 12:33:14 +04:00
Ilya Lavrenov
5f81988699 refactored arithm binary operations in order to make them more scalable 2013-10-04 12:13:22 +04:00
Alexander Alekhin
d74ca7b39d ocl: update module documentation 2013-10-03 23:26:06 +04:00
Alexander Alekhin
7f0680fc8b ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp 2013-10-03 23:26:06 +04:00
Alexander Alekhin
8beb514ecf ocl: merge with upstream/2.4 2013-10-03 23:26:06 +04:00
Alexander Alekhin
16adbda4d3 ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable 2013-10-03 19:50:14 +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
Ilya Lavrenov
dafd4da031 removed ocl::minMax_buf, updated doc (operation on matrices) 2013-10-03 18:19:15 +04:00
Ilya Lavrenov
adca219f18 fixed convertC3C4 and convertC4C3 functions in case cols == 1 2013-10-03 10:45:15 +04:00
Andrey Pavlenko
88419f8923 Merge pull request #1507 from pengx17:2.4_fix_test 2013-10-02 19:52:12 +04:00
Andrey Pavlenko
73744904a2 Merge pull request #1542 from alalek:cl_runtime 2013-10-02 19:50:35 +04:00
Alexander Alekhin
12eb340a4e removed invalid comment 2013-10-02 19:35:21 +04:00
Andrey Pavlenko
b396916cdb Merge pull request #1549 from ilya-lavrenov:ocl_perf_norm 2013-10-02 19:14:16 +04:00
Alexander Alekhin
5ab49c4cc2 ocl: cl_runtime: added autogenerated code 2013-10-02 18:32:33 +04:00
Alexander Alekhin
212ad97100 ocl: dynamic load of OpenCL libraries 
Support functions from OpenCL 1.1 / OpenCL 1.2
 2013-10-02 18:32:33 +04:00
Ilya Lavrenov
e8b93040d6 enabled ocl::norm perf test 2013-10-02 16:57:15 +04:00
Ilya Lavrenov
a613a1a1da fixed ocl::bitwise_not in case of CV_8UC1, CV_8UC2 2013-10-02 16:09:29 +04:00
Andrey Pavlenko
154fe4f657 Merge pull request #1519 from ilya-lavrenov:ocl_minMax 2013-10-01 20:16:48 +04:00
Ilya Lavrenov
4322c47bb2 removed test_norm.cpp from ocl tests 2013-10-01 17:53:14 +04:00
Alexander Alekhin
a8ac3ec72a ocl: perf test: disable MOG2 (random hungs), enable upload/download 2013-10-01 16:49:11 +04:00
Ilya Lavrenov
065b40c6c3 fixed and extended ocl::norm 2013-10-01 13:21:43 +04:00
Roman Donchenko
e35bc11504 Merge pull request #1457 from pengx17:2.4_oclsvm 2013-09-30 17:50:29 +04:00
Ilya Lavrenov
a562b5c985 fixed ocl::meanStddev and created accuracy test for this function 2013-09-30 17:37:19 +04:00
Roman Donchenko
54c902dccd Merge pull request #1509 from perping:2.4_docs 2013-09-30 17:37:19 +04:00
Ilya Lavrenov
7379152afb fixed ocl::setIdentity 2013-09-30 16:54:09 +04:00
Ilya Lavrenov
7edcefb2be fixed ocl::phase 2013-09-30 16:02:14 +04:00
Ilya Lavrenov
b864f48274 fixed ocl::sum, ocl::sqrSum, ocl::absSum 2013-09-30 15:12:38 +04:00
peng xiao
315c054379 Fix new blank line at EOF. 2013-09-30 16:20:43 +08:00
peng xiao
422396ef6a fix build error 2013-09-30 16:17:20 +08:00
peng xiao
f69ccfa43d Add opencl svm. 2013-09-30 16:17:19 +08:00
Ilya Lavrenov
b54228fb83 fixed ocl::countNonZero 2013-09-27 17:35:06 +04:00
Ilya Lavrenov
9dca7555b4 fixed ocl::minMax 2013-09-27 16:25:10 +04:00
perping
1bc20ae6f8 fix warning about addWeighted and remove magnitudeSqr(). 2013-09-27 09:50:37 +08:00
Andrey Pavlenko
3e91350a31 Merge pull request #1503 from ilya-lavrenov:ocl_arithm 2013-09-26 15:50:54 +04:00
perping
074f9e33cb fix three warning about mog, mog2 and KNearestNeighbour. 2013-09-26 15:30:44 +08:00
perping
f65286d3c6 Update the OpenCL documents. 2013-09-26 14:04:11 +08:00
peng xiao
28ac23c1a1 If device does not support double, returns immediately. 
Double floating points are not default supported by OpenCL.
 2013-09-26 12:59:21 +08:00
Ilya Lavrenov
f5af3ab851 changes in OpenCL matrix operations docs 2013-09-25 19:47:15 +04:00
Ilya Lavrenov
c8821bd909 replaced manually new/delete by AutoBuffer 2013-09-25 15:28:12 +04:00
Ilya Lavrenov
0faac595a8 fixed minMaxLoc kernel (removed compilation errors) 2013-09-25 15:14:10 +04:00
Ilya Lavrenov
544c02407e reverted and generalized original ocl::transpose 2013-09-25 14:22:37 +04:00
Jin Ma
c7c0a41e17 Resolved the bug that the work group size is not valid. 2013-09-25 17:42:56 +08:00
Ilya Lavrenov
c87d2d414d removed arithm_absdiff.cl 2013-09-24 14:18:42 +04:00
Ilya Lavrenov
8aa3eb817d refactored arithm.cpp. Extended param list for all the tests 2013-09-24 14:13:10 +04:00
Ilya Lavrenov
b4ad128218 refactoed and extended ocl::transpose 2013-09-24 14:07:54 +04:00
Ilya Lavrenov
799afab23b refactored and extended ocl::exp and ocl::log 2013-09-24 14:02:01 +04:00
Ilya Lavrenov
0730963576 refactored and extended ocl::compare 2013-09-24 13:58:18 +04:00
Ilya Lavrenov
8e0e352d77 refactored and extended binary bitwise operations 2013-09-24 13:54:46 +04:00
Ilya Lavrenov
161674bff2 refactored and extended ocl::addWeighted 2013-09-24 13:51:37 +04:00
Ilya Lavrenov
b20bd470fe refactored and extended ocl::LUT 2013-09-24 13:49:38 +04:00
Ilya Lavrenov
311a7233c2 removed comments from filtering.cpp and imgproc.cpp in ocl module 2013-09-24 13:46:08 +04:00
Ilya Lavrenov
bd36e556a1 removed ocl::magnitudeSqr 2013-09-24 13:39:07 +04:00
Ilya Lavrenov
0ad03162df refactored and extended arithm operations add/sub/mul/div/absdiff 2013-09-24 13:34:55 +04:00
Ilya Lavrenov
5ff5fdd73d marked some methods of ocl::Context as const 2013-09-24 13:17:09 +04:00
Ilya Lavrenov
d64fb235f7 removed needless arithm_2_mat.cl file 2013-09-24 13:15:05 +04:00
Alexander Smorkalov
d6d8e96003 Merge pull request #1489 from melody-rain:2_4_knearest_neighbor 2013-09-23 13:34:39 +04:00
Jin Ma
b88f5302e2 Removed unused constructor. 2013-09-23 15:10:00 +08:00
Jin Ma
1bfe39f485 Added knearest neighbor of OpenCL version. 
It includes the accuracy/performance test and the implementation of KNN.
 2013-09-22 10:23:54 +08:00
Jin Ma
06c33df307 Added knearest neighbor of OpenCL version. 
It includes the accuracy/performance test and the implementation of KNN.
 2013-09-22 10:22:09 +08:00
Ilya Lavrenov
362a67a695 fixed ocl::oclMat::setTo for 2-channel images 2013-09-20 15:57:38 +04:00
Alexander Alekhin
f1b5cbc8fe ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp 2013-09-18 01:14:41 +04:00
Alexander Smorkalov
6fae07ba88 Merge pull request #1460 from ilya-lavrenov:ocl_divUp 2013-09-17 15:37:44 +04:00
Alexander Smorkalov
14951dc387 Merge pull request #1461 from ilya-lavrenov:ocl_dataOperations 2013-09-17 15:21:34 +04:00
Alexander Smorkalov
d437183388 Merge pull request #1439 from ilya-lavrenov:convertTo 2013-09-17 15:12:02 +04:00
Andrey Pavlenko
b3bb42773b Merge pull request #1454 from ilya-lavrenov:ocl_pyrUp 2013-09-17 14:03:40 +04:00
Alexander Smorkalov
2dceb68a21 Merge pull request #1455 from ilya-lavrenov:ocl_test_output 2013-09-17 13:18:52 +04:00
Ilya Lavrenov
6a26c4483f added performance tests for data transfer operations 2013-09-16 23:51:36 +04:00
Ilya Lavrenov
58b84c2fc0 removed needless divUp 2013-09-16 15:48:30 +04:00
Ilya Lavrenov
e0325fe057 removed useless output 2013-09-15 22:04:22 +04:00
Ilya Lavrenov
a5c9d83617 fixed ocl::pyrUp for 2-byte types 2013-09-15 19:56:05 +04:00
Ilya Lavrenov
9311f84109 disabled MOG tests if no video input support 2013-09-13 12:47:25 +04:00
Roman Donchenko
e3710488a8 Merge pull request #1434 from melody-rain:Added_perf_kalman_cpp 2013-09-12 16:54:21 +04:00
Roman Donchenko
ac9bc6423a Merge pull request #1428 from ilya-lavrenov:ocl_pyr 2013-09-12 12:48:45 +04:00
Ilya Lavrenov
f20cc2bce8 extended ocl::convertTo 2013-09-12 12:39:03 +04:00
Jin Ma
f4d0c9b13c Revised the code according to the feedback of the community. 2013-09-12 09:43:30 +08:00
Jin Ma
b9d7e67589 Removed whitespace. 2013-09-11 11:28:36 +08:00
Jin Ma
2e0f613c38 Added performance for Kalman Filter. 2013-09-11 10:19:02 +08:00
Roman Donchenko
6a21eca7e7 Merge pull request #1421 from ilya-lavrenov:ocl_bilateral 2013-09-10 18:59:41 +04:00
Ilya Lavrenov
6b9c451938 added CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl::pyrDown 2013-09-10 17:36:18 +04:00
Roman Donchenko
747f7178ca Merge pull request #1417 from ilya-lavrenov:merge_fix 2013-09-10 11:33:25 +04:00
Roman Donchenko
68901ab471 Merge pull request #1420 from ilya-lavrenov:ocl_perf_hog 2013-09-10 11:32:35 +04:00
Roman Donchenko
260b283fb3 Merge pull request #1413 from melody-rain:2.4_kalman_filter 2013-09-10 11:28:22 +04:00
Ilya Lavrenov
16357418d5 increased time limit for bilateral filter performance tests 2013-09-09 18:16:53 +04:00
Ilya Lavrenov
b07b9aca5a fixed HOG perf test 2013-09-09 17:16:47 +04:00
Roman Donchenko
84435ba741 Merge pull request #1365 from bitwangyaoyao:2.4_bilateral 2013-09-09 16:46:33 +04:00
Ilya Lavrenov
7d8bde3330 fixed ocl::merge in case of 2 and types CV_32S and CV_32F 2013-09-09 16:12:01 +04:00
Jin Ma
a4ab3f4ea8 Removed whitespace. 2013-09-09 17:00:33 +08:00
Roman Donchenko
45512a93e0 Merge pull request #1396 from melody-rain:2.4_perf_bgfg_cpp 2013-09-09 12:39:12 +04:00
Jin Ma
2d5a1dacd0 Added Kalman Filter of OpenCL version. 2013-09-09 16:08:23 +08:00
Jin Ma
2fb0d23104 Removed unnecessary process for conversion to 4-channel format. 2013-09-07 10:40:30 +08:00
ilya-lavrenov
27947474ec fixed data path 2013-09-06 13:25:56 +04:00
Jin Ma
172242a94e Revised performance test according to the feedback of the community. 2013-09-06 13:39:41 +08:00
Jin Ma
1366df8250 MOG&MOG2: Modified the performance test according to the feedback of the community. 2013-09-05 19:33:27 +08:00
Roman Donchenko
70711ac6c2 Merge pull request #1400 from ilya-lavrenov:ocl_test_mog 2013-09-05 11:58:52 +04:00
ilya-lavrenov
722bdc52a0 enabled gemm and dft erf test 2013-09-04 20:02:02 +04:00
ilya-lavrenov
0f8f489658 changed data path and eps 2013-09-04 18:46:46 +04:00
Jin Ma
dd73016c8b Removed whitespace. 2013-09-04 15:00:36 +08:00
Jin Ma
e528f39def Added the performance test for mog and mog2. 2013-09-04 14:37:46 +08:00
Roman Donchenko
c42d61e464 Merge pull request #1283 from melody-rain:new_mog_mog2 2013-09-03 18:43:03 +04:00
Roman Donchenko
b3e73cf7d6 Merge pull request #1388 from bitwangyaoyao:2.4_CLAHE 2013-09-03 18:30:15 +04:00
Roman Donchenko
f50a829943 Merge pull request #1383 from pengx17:2.4_clblas 2013-09-03 12:05:01 +04:00
yao
a70bdfc13f a little fix to tests and sample 2013-09-03 15:02:18 +08:00
pengxiao
ea16539448 Fix a crash of ocl program if clAmdBlas is not linked. 2013-09-03 10:30:37 +08:00
peng xiao
7b3e3f69fb Modify according to @alalek. 2013-09-03 09:31:13 +08:00
Roman Donchenko
bd7930ada1 Merge pull request #1345 from pengx17:2.4_tvl1ocl_opt 2013-09-02 13:09:22 +04:00
peng xiao
3c2a8912ee Let clAmdBlas library initialize once during program lifetime. 2013-09-02 10:06:01 +08:00
Roman Donchenko
114bec52fe Merge pull request #1363 from ilya-lavrenov:ocl_enable_tests 2013-08-30 12:24:24 +04:00
ilya-lavrenov
a6084d2970 enabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and for some tests was disabled SANITY_CHECK, because plain and ocl results must not be completely equal 2013-08-29 18:39:09 +04:00
ilya-lavrenov
968c095403 gpu -> ocl 2013-08-29 18:32:06 +04:00
Jin Ma
114f3266d8 Removed performance test. 2013-08-29 17:35:47 +08:00
Jin Ma
4f3349ffe4 Added perf namespace. 2013-08-29 16:24:26 +08:00
Jin Ma
0233c4c198 Removed whitespace. 2013-08-29 15:49:02 +08:00
Jin Ma
14e083f1e0 Removed trailing whitespace 2013-08-29 14:09:00 +08:00
Jin Ma
5728612f95 Removed the trailing whitespace 2013-08-29 14:06:03 +08:00
yao
ab235cda74 fix warnings 2013-08-29 11:59:19 +08:00
yao
26b5eb3e39 add adaptive bilateral filter (cpp and ocl version) 2013-08-29 10:48:15 +08:00
Roman Donchenko
122d0f8685 Deleted the now-empty ocl perf_precomp.cpp. 
See pull request #1241 for why.
 2013-08-28 13:26:30 +04:00
ilya-lavrenov
3c86aa4ae1 appended ocl::finish to test_cycle defines 2013-08-28 00:39:58 +04:00
peng xiao
040b3b8265 Remove trailing whitespace. 2013-08-27 13:02:34 +08:00
peng xiao
c74c517ce3 Fix build error. 2013-08-27 11:56:11 +08:00
peng xiao
168d1dc18c Make some tweaks to make sum operations less frequently 2013-08-27 11:42:54 +08:00
ilya-lavrenov
d02ccc9590 the code was refactored and old test system code was removed 2013-08-26 12:36:31 +04:00
ilya-lavrenov
4c28a6f0f6 most of the performance tests was rewritten in google-test manner 2013-08-26 11:43:44 +04:00
Ilya Lavrenov
6c4ad9b597 fixer error with incorrect condition 2013-08-22 17:38:55 +04:00
Ilya Lavrenov
ec461a2ff0 added a test for ocl::norm 2013-08-22 17:37:48 +04:00
Jin Ma
1e8194fd3c Optimized mog and mog2, which have much better performance. 2013-08-22 15:42:07 +08:00
Roman Donchenko
3c137f7a04 Converted tabs to spaces. 2013-08-21 18:59:26 +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
Nghia Ho
c6858c3fb0 Buffer is accessed out of bounds. 2013-08-17 20:32:13 +10:00
Jin Ma
1bcd1fd3a2 Used perf_precomp.hpp instead of precomp.hpp for test. 2013-08-16 17:39:17 +08:00
Jin Ma
a3aa7966ae Resolved compiling errors under Linux. 2013-08-16 16:07:53 +08:00
Jin Ma
916b92bc3b Resolved a compiling warning under Windows. 2013-08-16 15:33:43 +08:00
Jin Ma
8feaadc69f Resolved a compiling error under Linux. 2013-08-16 15:25:11 +08:00
Jin Ma
3fb0bf6e99 Added MOG and MOG2. 2013-08-16 14:19:46 +08:00
Roman Donchenko
6ae9870de4 Merge pull request #1254 from pengx17:2.4_filter2d_ 2013-08-14 17:27:18 +04:00
peng xiao
124ede611b Update with apavlenko's suggestions. 2013-08-14 10:00:09 +08:00
Roman Donchenko
43c7a8ae93 Merge pull request #1259 from pengx17:2.4_fix_cvtcolor 2013-08-13 16:34:19 +04:00
peng xiao
2fb2ac8836 Apply bugfix #3121 for OCL. 2013-08-13 17:17:07 +08:00
peng xiao
7fe8403074 Let ocl::filter2D support kernel size >= 3. 2013-08-13 13:58:55 +08:00
Roman Donchenko
4dc63273f0 Renamed ocl tests' precomp files according to convention. 
Also, added the missing include guard to perf_precomp.hpp.
This should fix the build.
 2013-08-08 18:18:54 +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
Andrey Pavlenko
1c55096c01 Merge pull request #1232 from StevenPuttemans:fix_wrong_documentation 2013-08-07 21:05:43 +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
Roman Donchenko
95bdd4b670 Merge pull request #1189 from pengx17:2.4_sort_by_key 2013-08-07 11:41:23 +04:00
StevenPuttemans
f28496c628 Added sample links in documentation for python2, ocl and gpu 2013-08-02 14:05:08 +02:00
Andrey Pavlenko
0851766806 Merge pull request #1121 from pengx17:2.4_gftt_perf_test 2013-07-30 18:40:10 +04:00
Andrey Pavlenko
f7ce70f70a Merge pull request #1110 from SpecLad:config-cleanup 2013-07-30 17:39:35 +04:00
peng xiao
8b90cb375a Fix doc build error. 2013-07-30 14:12:22 +08:00
peng xiao
892c088e1b Some modifications to sortByKey API. 
Add documentation.
 2013-07-30 11:53:25 +08:00
peng xiao
a6d558042c Fix build errors 2013-07-26 14:32:37 +08:00
yao
270b2c7918 generating the lut table instead of hard coding one 2013-07-26 11:17:27 +08:00
peng xiao
e1f43e3b03 Add sort_by_key for oclMat. 
Most codes are ported from AMD's Bolt library.
Four methods are implemented:

SORT_BITONIC,   // only support power-of-2 buffer size
SORT_SELECTION, // cannot sort duplicate keys
SORT_MERGE,
SORT_RADIX      // only support signed int/float keys
 2013-07-18 17:25:00 +08:00
yao
f1060ac514 a little simplify to pyrlk kernel 2013-07-17 14:35:44 +08:00
peng xiao
ff73557304 Fix compilation error on Mac 2013-07-16 08:48:09 +08:00
peng xiao
e5c396bb24 Add ocl::gftt performance test. 2013-07-15 16:27:27 +08:00
yao
cdd9234fae fix hog mismatch on cpu ocl 2013-07-15 15:13:09 +08:00
Andrey Pavlenko
d1fe1a62c3 Merge pull request #1106 from pengx17:2.4_gftt_rename 2013-07-11 11:41:37 +04:00
Roman Donchenko
241e2d2360 Merge pull request #1077 from bitwangyaoyao:2.4_kmeans 2013-07-10 18:32:14 +04:00
Roman Donchenko
ac39bfb4cc Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04:00
peng xiao
5032240c9d Fix ocl gftt file name typo. 2013-07-10 14:51:40 +08:00
Andrey Pavlenko
fcb4c0e51c fixing working with test data and a small fix for init code 
- set init value for `numsdev` to prevent use of uninitialized value
- stop use of 'workdir' and files from samples
- forcing use of 'opencv_extra' instead
Note: set OPENCV_TEST_DATA_PATH to full path to 'opencv_extra/testdata' (gitolite@code.opencv.org:opencv_extra.git) before running the test!
 2013-07-09 13:25:21 +04:00
yao
88ed74a7ec fix the function name 2013-07-05 08:59:21 +08:00
Roman Donchenko
a2d576c1bb Merge pull request #1085 from bitwangyaoyao:2.4_optBP 2013-07-04 17:24:21 +04:00
Jin Ma
97e620b8f3 Fix oclMat constructor when roi is provided. 2013-07-04 16:14:55 +08:00
yao
f2333e90f6 optimize stereoBP kernel 2013-07-04 14:46:38 +08:00
yao
c23510785b remove the redundant function 2013-07-04 08:59:42 +08:00
yao
8d8dc29ced add kmeans 2013-07-03 13:13:04 +08:00
Roman Donchenko
6bf8f474fa Merge pull request #1051 from pengx17:2.4_fback_ocl 2013-07-01 13:45:43 +04:00
Roman Donchenko
c8cd2cf601 Merge pull request #1061 from bitwangyaoyao:2.4_fix2 2013-07-01 13:21:12 +04:00
Roman Donchenko
087bab6ceb Merge pull request #1060 from pengx17:2.4_setbinary_fix 2013-07-01 13:20:51 +04:00
Roman Donchenko
38cf0a692e Merge pull request #1055 from pengx17:2.4_ocl_hang_workaround 2013-07-01 13:20:04 +04:00
yao
c66e27d49e stereoBM fix an error on Linux when running full performance test 2013-06-28 17:45:39 +08:00
yao
c1a59b8d80 more fix to HOG 2013-06-28 13:38:58 +08:00
yao
f1d9680ba8 format the ocl's samples name 2013-06-28 11:44:43 +08:00
yao
587fb4940d some accuracy fix of HOG 2013-06-28 11:43:43 +08:00
peng xiao
a5383b8627 Move function definition from header to cpp. 2013-06-28 10:52:39 +08:00
peng xiao
e858a6c347 Renew function logic. 2013-06-28 10:39:09 +08:00
peng xiao
14dd345cdf Fix ocl::setBinaryDiskCache 
Previously the function requires Info::Impl implicitly. A call will create
new Context this function which is not intended.
The properties are now moved to global scope to fix this issue.
 2013-06-28 10:12:18 +08:00
Roman Donchenko
f477696cc5 Merge pull request #1050 from pengx17:2.4_clach_mod 2013-06-27 12:22:01 +04:00
peng xiao
b2da1cdcc2 Temporarily disable command queue release as it causes program hang at exit 2013-06-27 10:20:21 +08:00
peng xiao
fc64faa22e Remove empty cv::ocl::CLAHE class. 2013-06-27 10:06:37 +08:00
peng xiao
dcc4766129 Fix white-spacing 2013-06-27 09:57:42 +08:00
Roman Donchenko
bf6b119a3f Merge pull request #1045 from bitwangyaoyao:2.4_fix 2013-06-26 16:55:06 +04:00
Roman Donchenko
5b2b76763e Fix miscellaneous warnings from compiling with MinGW. 
Note that MinGW defines NOMINMAX by default.
 2013-06-26 14:59:00 +04:00
peng xiao
9270205947 Fix build errors 2013-06-26 17:24:09 +08:00
yao
2ec1140b25 fix pyrlk 2013-06-26 16:58:20 +08:00
peng xiao
132b885b24 Add opencl implementation of Farnback optical flow. 2013-06-26 16:35:19 +08:00
peng xiao
cc3fb3d182 Let CLAHE_OCL reuse cv::CLAHE abstract class. 2013-06-26 10:50:51 +08:00
yao
1227e00f3d fix moments 2013-06-25 16:26:33 +08:00
yao
dbdeff2069 fix stereobm crash on some cpu ocl 2013-06-25 14:12:02 +08:00
yao
6db776f957 add "-c" for cpu ocl mode in perf tests 2013-06-25 14:11:28 +08:00
Roman Donchenko
3bab7391d0 Merge pull request #1028 from SpecLad:ocl-clahe-dtor 2013-06-24 13:18:28 +04:00
Roman Donchenko
171a56fe82 Merge pull request #1034 from pengx17:2.4_oclmat_inoutarray 2013-06-24 12:27:26 +04:00
Roman Donchenko
7cb047e2d9 Merge pull request #1031 from pengx17:2.4_fix_converTo 2013-06-24 12:25:48 +04:00
Roman Donchenko
4ed3d33dd7 Merge pull request #1025 from bitwangyaoyao:2.4_tests 2013-06-24 12:11:04 +04:00
peng xiao
290c8db0a8 Revise naming for getOclMat function. 2013-06-21 14:51:23 +08:00
peng xiao
e129638263 Add a workaround to interpolate between oclMat and Input/OutputArray. 2013-06-21 14:05:29 +08:00
peng xiao
c1f4fe1637 Fix a bug of convertTo. 
The bug was found that all 3-channel oclMat's were converted to
4-channel oclMat's after using convertTo function.
 2013-06-20 11:26:22 +08:00
Roman Donchenko
1ed5fb937d Give cv::ocl::CLAHE a virtual destructor, for the usual reasons. 2013-06-19 15:39:11 +04:00
yao
2c198f6cd6 revise accuracy and perf tests 2013-06-19 13:03:35 +08:00
yao
26c246140a optimize hog 2013-06-19 11:20:45 +08:00
Roman Donchenko
47ea0614dc Merge pull request #969 from pengx17:2.4_binary_cache 2013-06-14 15:47:23 +04:00
peng xiao
e6b18fc492 Fix a bug caused by NDEBUG macro; it is now removed. 
Revise some descriptions of the enums.
 2013-06-14 16:37:00 +08:00
Roman Donchenko
b725cbf73f Merge pull request #986 from pengx17:2.4_initiated_context 2013-06-13 16:55:56 +04:00
peng xiao
5fd724b54a Add a function to query if global OpenCL context is initialized. 2013-06-13 10:46:12 +08:00
Peng Xiao
d9ab22e4ed Fix two bugs related to opencl context. 
1. As getDevice will implicitly call setDevice, in getContext we should not need to call it again.
2. Fix an incorrect type casting.
 2013-06-12 13:55:20 +08:00
Peng Xiao
c8398c9fdc Use anonymous enumerations instead of constants 2013-06-11 20:32:55 +08:00
Peng Xiao
1d8cd3a717 Add ocl CLACH implementation. 
Test cases (accuracy and performance) are provided.
 2013-06-10 18:37:48 +08:00
Peng Xiao
e77abeef16 Add a new global function to control ocl binary storage 
Previously the feature is controlled by setBinpath implicitly.
We add the function to cope with setBinpath and setBinpath is only
useful when setBinaryDiskCache is set.
Refer to the header to see more info.
 2013-06-10 16:38:22 +08:00
peng xiao
429f84e59e Fix a bug of cornerHarris and cornerMinEigenVal. 
The bug is a buffer overrun when border type is reflect101.
It is found that gfft crashed with input of size 100x100 on Intel CPU.
 2013-06-06 11:44:35 +08:00
Vadim Pisarevsky
119b7a298d Merge pull request #933 from pengx17:2.4_macfix_cont 2013-06-04 13:34:53 +04:00
Vadim Pisarevsky
2d88f20c1e Merge pull request #935 from pengx17:2.4_filter2d_fix 2013-06-04 13:34:40 +04:00
Vadim Pisarevsky
0cb1644825 Merge pull request #936 from bitwangyaoyao:2.4_perf 2013-06-04 13:34:25 +04:00
Vadim Pisarevsky
e0c2daadbf Merge pull request #937 from bitwangyaoyao:2.4_fixPyrLK 2013-06-04 13:34:09 +04:00
peng xiao
a7a94de74a Fix a bug of gfft. 
When user provided corners buffer is big enough to be copied to from
tmpCorners_, we allow the buffer to be reused other than allocate a new
cl_mem object.
 2013-06-04 15:55:33 +08:00