Commit Graph

196 Commits

Author SHA1 Message Date
yao 1d1d28baf2 fix black screen when input Mat is large 2013-05-14 18:02:53 +08:00
Andrey Kamaev 36028bd8ad Merge pull request #808 from bitwangyaoyao:2.4_mac 2013-04-12 14:59:45 +04:00
Vadim Pisarevsky 03e2a52e2c Merge pull request #807 from pengx17:2.4_ocl_bfm_opt 2013-04-12 13:46:55 +04:00
Vadim Pisarevsky a770d04e78 Merge pull request #781 from bitwangyaoyao:2.4_fixerr 2013-04-12 13:44:59 +04:00
yao 719e8674ad fix the compile errors on Mac 2013-04-12 17:38:59 +08:00
peng xiao 2338a895f5 Capitalize macro namings. 2013-04-12 16:56:49 +08:00
peng xiao 1bea9ee26c Rename test case category and code clean up. 2013-04-12 16:54:06 +08:00
peng xiao c9d8eb7a84 Fix build error on linux. 2013-04-12 16:52:21 +08:00
peng xiao 6eefd276cf Further optimize bfmatcher by passing macros. 2013-04-12 16:51:36 +08:00
peng xiao 113b7584e0 Optimize bfmatcher by passing macros. 2013-04-12 16:50:30 +08:00
peng xiao 1e49c00f4b Replace create with ensureSizeIsEnough thus buffer objects can be reused. 2013-04-12 16:47:44 +08:00
Andrey Kamaev 9ba25e9d09 Merge pull request #742 from bitwangyaoyao:2.4_fix 2013-04-11 11:33:45 +04:00
yao 7726e273a9 merge add and sub into one set of kernels 2013-04-06 13:37:36 +08:00
yao bee970ab94 remove the C3 kernels in arithm, as the oclMat will never store 3 channels data 2013-04-05 21:29:29 +08:00
Andrey Kamaev 72e49dc790 Merge pull request #777 from taka-no-me:ocl_win_hang 2013-04-05 13:00:03 +04:00
Andrey Kamaev a2d27429e4 Merge pull request #775 from bitwangyaoyao:2.4_fixerr 2013-04-05 12:59:45 +04:00
Andrey Kamaev 3400d83778 Workaround hanging of ocl module when ocl API in not really used 2013-04-05 11:01:28 +04:00
yao 8cc5b98051 Fix the problem of device selection on hybrid video systems. 2013-04-05 09:19:59 +08:00
yao 5022bc8c25 move the "cpu device checking" from supportsFeatures() to queryDeviceInfo() 2013-04-05 09:17:14 +08:00
yao bcc086baa9 fix all redefine build errors on some Intel OCL 2013-04-05 08:15:05 +08:00
peng xiao 917138f565 Fix compilation errors. 2013-04-03 17:36:05 +08:00
peng xiao 7758322fd3 Fix some build errors. 2013-04-03 16:42:44 +08:00
peng xiao ecea583afd Add ocl::stereobp function.
OpenCL StereoBeliefPropagation, ported from GPU implementation.
2013-04-03 15:57:26 +08:00
yao d5aaea2749 fix some mismatch on cpu device running OCL 2013-04-03 14:24:55 +08:00
yao cb63bbf001 fix hog on some CPU device running ocl 2013-04-03 13:58:44 +08:00
yao fd4a6f0af0 make the sparse method give correct results on CPU ocl
Add CL_CPU to supportsFeature check
simplify the logic of pyrlk
2013-04-03 13:23:04 +08:00
Andrey Kamaev 656594ad4f Merge pull request #736 from bitwangyaoyao:2.4_clflush 2013-04-02 15:25:19 +04:00
yao f3254b28f2 use clflush replaces clfinish 2013-04-02 14:41:02 +08:00
yao 10f6ebfdf7 fix the crash when calling dft 2013-04-02 11:35:40 +08:00
Andrey Kamaev 2a1cf23fab Merge pull request #713 from bitwangyaoyao:2.4_perf 2013-04-01 15:16:48 +04:00
Andrey Kamaev 56d62118d5 Merge pull request #707 from pengx17:2.4_surf 2013-03-29 18:20:45 +04:00
peng xiao 04a6ab4144 Fix OCL Canny 2013-03-27 15:08:51 +08:00
yao 5539e85a11 use perf test replace performance sample 2013-03-27 12:04:48 +08:00
peng xiao 8ffc15371d Fix compiler errors 2013-03-26 17:23:38 +08:00
peng xiao 9698079ca5 Pass warp size into SURF 2013-03-26 15:48:15 +08:00
peng xiao 0c19a07bf4 Add a function to query ocl device info
Currently the function only supports wavefront size query
2013-03-26 15:36:49 +08:00
yao d6f1ad8c14 more fix 2013-03-26 14:23:26 +08:00
yao f36db3a037 more fix of mismatch 2013-03-26 14:10:29 +08:00
yao ad6aae4583 more fix of mismatch functions on CPU OCL 2013-03-26 13:41:13 +08:00
yao 2c06e59a69 fix some mismatch 2013-03-26 13:05:01 +08:00
Andrey Kamaev 4bd721ad3b Fix build errors 2013-03-21 18:37:34 +04:00
Andrey Kamaev 1b4afcca30 Move OpenCl SURF perf tests to nonfree and fix build of samples 2013-03-21 18:19:52 +04:00
Andrey Kamaev 77ad07adf3 Disable crashing ocl tests 2013-03-21 18:18:17 +04:00
Andrey Kamaev 7b8ad4cb04 Refactor OpenCL initialization and allow to use ocl module witout explicit setup 2013-03-21 18:18:15 +04:00
Andrey Kamaev dd678121b3 Trying to make ocl surf work
1. Added more sync to reduction.
2. Turned off Image2D feature. Probably its support is not detected correctly.
3. Temporary disabled descriptor tests - can't localize a problem of the ocl descriptor.
2013-03-21 18:16:59 +04:00
Andrey Kamaev 1be58f9a00 SURF accuracy test is moved to nonfree 2013-03-21 18:15:46 +04:00
Andrey Kamaev 6846f881a2 Move OpenCL SURF to nonfree module 2013-03-21 17:59:35 +04:00
Andrey Kamaev 91ac9688a8 Allow OpenCL acceleration in every OpenCV module 2013-03-21 17:57:01 +04:00
Andrey Kamaev d28df08eb0 Refactor OpenCL search 2013-03-21 17:56:59 +04:00
Andrey Kamaev 00d8ad9e7e Merge pull request #632 from pengx17:2.4 2013-03-15 10:34:43 +04:00