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
yao
dc937c10f9
change a test image of pyrlk
2013-06-04 11:31:54 +08:00
peng xiao
97b86aa259
Initialize OpenCL context at the end of getDevice call.
...
Added for better compatibility with the current samples/test cases.
User now will be able to initialize OpenCL context explicitly with
ocl::getDevice api.
This may be obsoleted in future releases.
2013-05-31 16:48:40 +08:00
yao
15a213d3fc
fix a crash on Linux
2013-05-31 15:35:54 +08:00
yao
abefcc6061
Adjust perf_filters, as this function only supports 3x3 kernel
2013-05-31 15:16:03 +08:00
peng xiao
b1c248fcc9
Fix ocl::filter2D.
...
In current implementation, this function only works when anchor point is
in the kernel center and kernel size supported is either 3x3 or 5x5.
2013-05-31 10:53:52 +08:00
peng xiao
fdc133d8c9
Fix ocl::pyrup kernel build on Mac.
2013-05-30 16:34:20 +08:00
Vadim Pisarevsky
37091b086c
Merge pull request #932 from bitwangyaoyao:2.4_fixBFM
2013-05-30 12:21:27 +04:00
yao
5b598f8a0e
a few fixes of ocl::perf test cases
2013-05-30 16:20:31 +08:00
Vadim Pisarevsky
5a4efe8bcf
Merge pull request #924 from pengx17:2.4_arithm_fix
2013-05-30 12:01:25 +04:00
Vadim Pisarevsky
678371be39
Merge pull request #925 from pengx17:2.4_canny_tmp_fix
2013-05-30 12:01:09 +04:00
Vadim Pisarevsky
c176131a67
Merge pull request #927 from bitwangyaoyao:2.4_perf
2013-05-30 12:00:47 +04:00
yao
7ed9c0e87a
Fix brute_force_matcher's hung on some Intel CPU OCL
2013-05-30 14:57:15 +08:00
peng xiao
fd7ba355ee
Add non-stump based ocl Haar cascade classifier support.
...
For example, haarcascade_frontalface_alt2.xml is now supported.
Note that classifier's pattern of a cascade file must be consistent,
i.e., all trees must either have two nodes or one node, otherwise
unexpected results will occur.
Other fixes:
Test cases are updated.
Some unused codes are removed.
Fix some problems of haar when using OclCascadeClassifierBuf.
2013-05-30 14:01:19 +08:00
peng xiao
006e4242b2
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_oclgfft
2013-05-29 17:57:14 +08:00
yao
a9b7ff41bd
adjust test cases
2013-05-29 15:48:56 +08:00
peng xiao
d015fa76fa
Fix 2.4 ocl Canny.
...
This fix is a workaround for current 2.4 branch without introducing an
additional oclMat buffer into CannyBuf object.
Test case is cleaned up.
Volatile keywords in kernels are removed for performance concern.
2013-05-29 14:15:26 +08:00
Vadim Pisarevsky
2ccdf56119
Merge pull request #913 from janm399:2.4
2013-05-28 22:05:14 +04:00
Vadim Pisarevsky
24ca620c32
Merge pull request #916 from bitwangyaoyao:2.4_fixPyrLK
2013-05-28 22:04:37 +04:00
yao
d81c145fa9
fix memory leak
2013-05-28 18:07:41 +08:00
yao
14bd6402be
revise perf
2013-05-28 17:53:06 +08:00
peng xiao
1d0c283508
Fix a bug when pushing pointers of arguments into std::vector.
...
When argument pointers pushed into an vector and the pointers point to
address on stack, we need to make sure they are valid until kernels are
successfully flushed onto the queue.
2013-05-28 17:27:55 +08:00
peng xiao
6fae02c05d
Fix some OpenCL kernel file build errors on Mac.
2013-05-28 11:12:05 +08:00
yao
c58e0d5d73
fix hog
2013-05-24 13:46:21 +08:00
yao
d45f9ef866
fix Linux build errors
2013-05-23 17:58:50 +08:00
yao
a223b5624f
fix pyrLK's mismatch on Intel GPUs
2013-05-23 10:55:08 +08:00
Jan Machacek
46b770f255
Fixed include name in OpenCL on OS X
2013-05-22 13:22:16 +01:00
Roman Donchenko
519ee72f6f
Merge pull request #905 from bitwangyaoyao:2.4_TVL1
2013-05-22 12:08:16 +04:00
peng xiao
b4a4a05bdc
Add ocl's good features to track implementation.
...
Additional notes with this commit:
1. Add cornerHarris_dxdy and cornerMinEigenVal_dxdy to get
the interim dx and dy output of Sobel operator;
2. Add minMax_buf to allow user to reuse buffers in minMax;
3. Fix an error when either min or max pointer fed into minMax is NULL;
4. Corner sorter temporarily uses C++ STL's quick sort. A parallel
selection sort in OpneCL is contained in the implementation but disabled
due to poor performance at the moment.
5. Accuracy test for ocl gfft.
2013-05-22 13:46:42 +08:00
Vadim Pisarevsky
cbbc82a789
Merge pull request #882 from pengx17:2.4_rewrite_query_info
2013-05-20 14:01:03 +04:00
Vadim Pisarevsky
b51a1a7d15
Merge pull request #895 from bitwangyaoyao:2.4_perf
2013-05-20 14:00:47 +04:00
yao
d8b192c84d
Fix the mismatch on NV GPUs
2013-05-20 14:46:17 +08:00
yao
04399a27d0
fix a warning
2013-05-17 15:44:22 +08:00
yao
4162ebfad3
add OpticalFlowDual_TVL1_OCL function
2013-05-17 15:34:22 +08:00
yao
03c55db4fb
fix the waring in gemm test
2013-05-17 13:19:09 +08:00
yao
5f20fce6fd
add accuracy tests while running perf
2013-05-17 13:18:46 +08:00
Vadim Pisarevsky
7d9041460a
Merge pull request #885 from pengx17:2.4_bfmatcher_ocl
2013-05-15 14:21:50 +04:00
peng xiao
d053f2165d
Add BFMatcher_OCL class alias for BruteForceMatcher_OCL.
...
This adds a similar interface with pure-cpp and gpu versions.
2013-05-15 10:47:17 +08:00
peng xiao
3f93c3cc4e
Clean up spaces in ocl.hpp
2013-05-15 10:43:47 +08:00
peng xiao
1ecc765903
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix
2013-05-15 08:55:43 +08:00
peng xiao
df3997b108
Fix ocl::pyrUp
...
Use predefined OpenCL function to convert integers to floating points.
This is more accurate than before as it enables:
1. saturate cast
2. customized rounding
2013-05-15 08:51:21 +08:00
Vadim Pisarevsky
25e6902a43
Merge pull request #818 from bitwangyaoyao:2.4_optBlur
2013-05-14 15:56:56 +04:00
Vadim Pisarevsky
bd1d7cd208
Merge pull request #839 from pengx17:2.4_ocl_csbp
2013-05-14 15:56:07 +04:00
Vadim Pisarevsky
87765c0f16
Merge pull request #883 from bitwangyaoyao:2.4_fixMoments
2013-05-14 15:55:38 +04:00
yao
1d1d28baf2
fix black screen when input Mat is large
2013-05-14 18:02:53 +08: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
Vadim Pisarevsky
d79c05fec9
Merge pull request #872 from pengx17:2.4_create2dimage_fix
2013-05-13 23:12:25 +04:00
Vadim Pisarevsky
6eb5a95a59
Merge pull request #871 from bitwangyaoyao:2.4_acry
2013-05-13 23:04:11 +04:00
Vadim Pisarevsky
fd83f2f5ca
Merge pull request #819 from bitwangyaoyao:2.4_haarBuf
2013-05-13 22:36:10 +04:00
Andrey Kamaev
2665c39a0d
Fix build warnings from gcc 4.8
2013-05-13 17:07:30 +04:00
yao
e23884a238
fix the warnings in fft tests
2013-05-13 15:04:23 +08:00
Vadim Pisarevsky
9cce8ca4b6
Merge pull request #864 from pengx17:2.4_stereobm
2013-05-12 22:16:03 +04:00
yao
ada8f92cc7
fix warnings, unify test names
2013-05-09 17:57:13 +08:00
peng xiao
e14acabb3d
Fix ocl moudle build with latest Intel OpenCL SDK.
...
We found that cl.h file provided in latest Intel SDK muted deprecated interfaces.
2013-05-09 14:00:36 +08:00
peng xiao
69e6d0016e
Optimize stereobm a bit.
...
Speedup about 30% on 6730M GPU.
2013-05-08 17:29:24 +08:00
yao
b6313951dc
use clean EXPECT_MAT_NEAR (no string output)
2013-05-08 17:07:44 +08:00
yao
35c6860f06
further simplify the logics in filter tests
2013-05-08 16:08:33 +08:00
yao
1a53e2cfb2
remove interpolation.hpp
2013-05-08 15:27:35 +08:00
yao
3928c1ee26
add copyrights
2013-05-08 15:21:53 +08:00
yao
e4d3378230
simplify logics in filter tests, remove redundant code in arithm tests
2013-05-08 15:12:12 +08:00
yao
52dbbae82c
some cleanup, remove some commented codes
2013-05-07 16:14:50 +08:00
peng xiao
d34e7eca60
Suppress warning when compiling deprecated OpenCL function on GNU compilers.
2013-05-06 17:16:45 +08:00
peng xiao
ed2199a497
Fix build
2013-05-03 09:54:11 +08:00
peng xiao
1eca49f40b
ocl: Enable backward binary portability for setTo function.
2013-05-03 09:45:56 +08:00
peng xiao
168c0b0385
Optimize ocl::stereobm.
...
1. Use macro defines for some parameters(radius).
2. Reduce local memory usage.
3. Fix accuracy problem on Intel GPU.
2013-05-02 16:14:28 +08:00
peng xiao
355bc691fc
Add OpenCL version 1.2 query into ocl::Context::supportsFeature().
...
Add backwards portability for OpenCL 1.1 when OpenCV executables
are compiled with OpenCL 1.2 profile support.
2013-05-02 14:44:59 +08:00
Vadim Pisarevsky
2068c4582c
Merge pull request #844 from bitwangyaoyao:2.4_integral
2013-04-28 00:37:40 +04:00
yao
f788d010f7
fix a crash on CPU OCL for some specified image sizes
2013-04-24 14:12:41 +08:00
peng xiao
9cfa24e515
Fix thread sync for csbp.
2013-04-23 17:35:40 +08:00
yao
b386ea72aa
use float when sum overflow
2013-04-23 17:23:05 +08:00
peng xiao
3282aaa1f5
Fix a bug found on Intel OpenCL SDK.
2013-04-23 15:34:40 +08:00
Peng Xiao
c701d54281
Fix build errors
2013-04-21 11:19:37 +08:00
Peng Xiao
7b08d5ec69
Add OpenCL stereo CSBP implementation
2013-04-20 00:34:37 +08:00
Andrey Kamaev
28aefc4f5a
Merge pull request #817 from pengx17:2.4_ocl_bitwise_cleanup
2013-04-17 15:45:38 +04:00
Andrey Kamaev
f6848b66d6
Merge pull request #826 from pengx17:2.4_canny_clampfix
2013-04-17 11:09:49 +04:00
Andrey Kamaev
bf551df4cf
Merge pull request #825 from pengx17:2.4_query_cpu_wavesize
2013-04-17 11:09:37 +04:00
peng xiao
0f7d7100e5
Add clamping for y dimension.
2013-04-16 15:49:15 +08:00
peng xiao
6f63a5d8d5
Let wave_size=1 on CPU.
2013-04-16 14:41:30 +08:00
Andrey Kamaev
96b008cd29
Eliminate the need of ::testsing::ValuesIn() for CV_ENUM
...
Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS
2013-04-15 19:39:49 +04:00
yao
69a0b5dde5
Add OclCascadeClassifierBuf interface
2013-04-15 17:24:30 +08:00
yao
dec6a3b080
make boxfilter kernel compile on Mac GPU OCL
2013-04-15 16:46:25 +08:00
peng xiao
06a4bad809
Merge ocl and/or/xor operators into one kernel each.
2013-04-15 10:36:03 +08:00
Peng Xiao
6dd6013546
Use a faster way to count 1's (used by Hamming)
2013-04-13 14:34:30 +08:00
Peng Xiao
6b6b1c9cbf
Allow more query/train types for ocl::bfmatcher
2013-04-13 14:08:58 +08:00
Peng Xiao
1db20099a9
Enable runtime type definition in kernels
2013-04-13 12:50:17 +08:00
Peng Xiao
fd1528795e
Pass query type T into kernel
2013-04-13 11:39:13 +08:00
Peng Xiao
63813e83ae
Untabify
2013-04-13 11:22:22 +08:00
Peng Xiao
6a40383aee
Add HammingDist test case
2013-04-13 11:07:26 +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
Andrey Kamaev
18ca645fd2
Merge pull request #631 from bitwangyaoyao:2.4_stereo
2013-03-15 10:34:27 +04:00
Andrey Kamaev
ecf770d49d
Merge pull request #638 from bitwangyaoyao:2.4_fixErode
2013-03-14 11:41:02 +04:00
Andrey Kamaev
5f3eb0fc49
Merge pull request #628 from bitwangyaoyao:2.4_fixMoments
2013-03-14 11:40:47 +04:00
yao
084385cf38
Fix a bug in ocl::Erode/Dilate, simplify the host logic
2013-03-12 16:45:43 +08:00
peng xiao
3a565e001e
Remove unnecessary HAVE_OPENCL macro block.
2013-03-12 09:10:15 +08:00
yao
f8985bb7fc
fix warnings on Linux
2013-03-12 08:55:50 +08:00
peng xiao
34998b6034
Add ocl::SURF accurate test.
...
The test cases are ported from gpu module (masked version is still
missing).
Key point direction definition is synchronized with cv::SURF.
nonfree module dependency is added into ocl module's cmake file.
2013-03-11 18:35:30 +08:00
yao
3f81a152b9
remove the OpenCL define
2013-03-11 17:21:31 +08:00
yao
0f0a4c3099
add stereoBM function
2013-03-11 17:10:58 +08:00
yao
7f0d6d42f0
fix mismatch on NV OCL and some AMD GPUs
2013-03-08 10:30:01 +08:00
yao
65bb4250a4
Fix a bug in addWeighted x64 mode
...
And a potential problem in remap
2013-03-01 18:08:53 +08:00
Vadim Pisarevsky
a910360689
Merge pull request #586 from bitwangyaoyao:2.4_FixBFMatcher
2013-03-01 10:55:11 +04:00
yao
82b9854837
fix compile warnings
2013-03-01 08:47:20 +08:00
Andrey Kamaev
fba0e6fc5c
Merge pull request #587 from bitwangyaoyao:2.4_fixHog
2013-02-28 18:06:28 +04:00
Andrey Kamaev
4811988caf
Merge pull request #585 from bitwangyaoyao:2.4_SURF
2013-02-28 18:06:14 +04:00
Andrey Kamaev
d0e340bc80
Merge pull request #582 from bitwangyaoyao:2.4_fixBlend
2013-02-28 15:43:51 +04:00
yao
f12369a53c
Fix ocl::HOG crash on Intel OCL
2013-02-28 16:56:39 +08:00
yao
f791344810
linux warning fix
2013-02-28 14:37:37 +08:00
yao
504008dbe0
Fix ocl::bruteforcematcher crash on Intel OCL
2013-02-28 14:31:08 +08:00
yao
7c1f1d8837
fix bug #2787
2013-02-28 14:05:36 +08:00
yao
69eebdd608
fix the blend crash in some cases
2013-02-28 09:03:10 +08:00
Andrey Kamaev
0a8711d76b
Merge pull request #576 from bitwangyaoyao:2.4_customMat2
2013-02-27 19:33:54 +04:00
Andrey Kamaev
af13c8604d
Merge pull request #568 from bitwangyaoyao:2.4_moments
2013-02-27 19:33:26 +04:00
yao
cbff75db9e
fix build errors
2013-02-27 21:56:03 +08:00
yao
9ccf27c7f5
add interfaces enable custom oclMat device memory type
2013-02-27 17:32:32 +08:00
Andrey Kamaev
b836e3c65b
Merge pull request #556 from bitwangyaoyao:2.4_SURF
2013-02-27 11:37:04 +04:00
Andrey Kamaev
f03c04c151
Merge pull request #554 from bitwangyaoyao:2.4_impvInterFrame
2013-02-27 11:36:40 +04:00
Andrey Kamaev
c54c7c8b2c
Merge pull request #553 from bitwangyaoyao:2.4_perfTest
2013-02-27 11:36:23 +04:00
yao
dba2ec0539
remove the compile warnings
2013-02-27 14:53:27 +08:00
yao
6df23428af
Add moments function
2013-02-27 13:45:16 +08:00
yao
9ec5333a9b
pyrlk also take advantages of cl_image support detection
2013-02-27 10:45:07 +08:00
yao
da47ccec9c
Put the cl_image support detection in utils
2013-02-27 10:24:03 +08:00
Andrey Kamaev
dcf7a69430
Merge pull request #555 from bitwangyaoyao:2.4_fixFft
2013-02-26 18:31:17 +04:00
yao
04faaa9e35
Fix ocl::dft the compile warning on Linux
2013-02-26 21:18:51 +08:00
yao
3ff5689fe5
Merge branch '2.4_fixFft' of https://github.com/bitwangyaoyao/opencv into 2.4
2013-02-26 20:30:42 +08:00
yao
ea433cc496
remove the device specific logic
2013-02-26 17:53:08 +08:00
yao
62f8b0fc48
Fix ocl::dft error when program end on Linux
2013-02-26 17:44:19 +08:00
yao
0ac7f0d374
Simplify the bind texture logic of interpolate frame function
2013-02-26 17:12:03 +08:00
yao
e3a715882e
fix the mismatch of perf_test, add a performance sample for ocl module
2013-02-26 16:52:30 +08:00
Andrey Kamaev
6082f351ab
Merge pull request #541 from bitwangyaoyao:2.4_fixCvtColor
2013-02-25 14:04:02 +04:00
Andrey Kamaev
b6cdc849db
Merge pull request #540 from hgaspar:244
2013-02-25 14:03:36 +04:00
yao
59ebf4ed9f
Fix the ocl::cvtColor mismatch on some devices
2013-02-25 15:19:39 +08:00
hgaspar
60981565fa
updated the ocl module introduction
2013-02-24 22:34:44 -05:00
Andrey Kamaev
cfd019e2a2
Merge pull request #537 from bitwangyaoyao:2.4_fixWarpAffine
2013-02-24 15:26:42 +04:00
Andrey Kamaev
7047c23489
Merge pull request #535 from bitwangyaoyao:2.4_clean
2013-02-24 15:26:24 +04:00
yao
f1a5c1328c
remove the empty implementation when HAVE_OPENCL not defined
2013-02-23 20:50:03 +08:00
yao
b7ebedc23e
fix mismatch of WarpAffine
2013-02-23 17:43:10 +08:00
yao
9bbf170054
some cleanup
2013-02-23 15:34:43 +08:00
yao
720eaf1e1a
fix the haar kernel problems on Nvidia and Intel OCL
2013-02-23 15:19:46 +08:00
yao
d050159f07
Remove the perf running from ocl::matchTemplate accuracy tests
2013-02-23 14:30:04 +08:00
Andrey Kamaev
051aa4cb98
Merge pull request #530 from bitwangyaoyao:2.4_fixEqHist
2013-02-22 16:40:06 +04:00
Andrey Kamaev
58f546dd93
Merge pull request #529 from bitwangyaoyao:2.4_fixGemm
2013-02-22 16:39:50 +04:00
Andrey Kamaev
3406832aa2
Merge pull request #528 from bitwangyaoyao:2.4_fixPyrLK
2013-02-22 16:35:30 +04:00
Andrey Kamaev
b1975fb13d
Merge pull request #527 from bitwangyaoyao:2.4_fixMeanShift
2013-02-22 16:35:18 +04:00
yao
1a488c0542
fix the warning on Linux when OpenCL 1.2 not supported
2013-02-22 18:33:16 +08:00
yao
7810254198
Fix ocl::equalizeHist mismatch
2013-02-22 15:48:31 +08:00
yao
3316d0bfb2
Fix the compiling errors of gemm on Linux
2013-02-22 15:05:49 +08:00
yao
2e3f4fdada
fix pyrLK's mismatch on Linux
2013-02-22 11:23:43 +08:00
yao
f4ef0c1598
fix meanShift mismatch on none-double GPUs
2013-02-22 10:13:20 +08:00
Andrey Kamaev
c17e9ef7ba
Repair binary compatibility of ocl module
2013-02-22 01:58:01 +04:00
yao
429ae44ae3
add openCLExecuteKernelInterop method
2013-02-20 17:46:43 +08:00
Andrey Kamaev
c6f6f9ab35
Merge pull request #451 from bitwangyaoyao:2.4_operator
2013-02-18 18:04:44 +04:00
yao
9613135e8d
fix compiling errors on Linux
...
more operators use oclMatExpr
2013-02-16 18:41:43 +08:00
yao
69fd2d8273
add oclMatExpr class to prevent extra allocations
2013-02-16 11:05:23 +08:00
Andy Maloney
2075236757
If generating a bin file (second half of conditional), make sure the file is closed
...
(Also fix spelling in comment)
2013-02-10 21:55:20 -05:00
Andrey Kamaev
3ed6c09485
Merge pull request #428 from bitwangyaoyao:2.4_erode_dilate
2013-02-08 18:48:37 +04:00
Andrey Kamaev
4f4fe553bc
Merge pull request #450 from bitwangyaoyao:2.4_dft
2013-02-08 18:43:34 +04:00
yao
0b365f6aa5
add +-*/ operators to oclMat
2013-02-08 11:41:46 +08:00
yao
4d6827212d
some bugs fix in using AmdFft library
2013-02-08 10:46:43 +08:00
Andrey Kamaev
7cdede0c55
Merge pull request #438 from bitwangyaoyao:2.4_fixwarings
2013-02-06 14:04:28 +04:00
yao
e31e924cf7
remove the warnings in accuracy test
2013-02-06 09:12:40 +08:00
Andrey Kamaev
fe0516c877
Merge pull request #432 from bitwangyaoyao:2.4_blend
2013-02-05 14:53:49 +04:00
yao
568b935246
remove a warning on Linux
...
fix a error in doc
2013-02-05 17:16:40 +08:00
yao
9711ef6dee
blend use vector to optimize
2013-02-04 17:29:20 +08:00
Andrey Kamaev
650609aaeb
Merge pull request #429 from bitwangyaoyao:2.4_setdevEx
2013-02-04 12:03:24 +04:00
yao
a639a1ae5c
add setDeviceEx interface
...
simplify the logic of save binary
2013-02-04 15:06:36 +08:00
yao
3c5cb4931e
simplify the kernel logic when using rect kernel or without ROI
2013-02-04 13:33:27 +08:00
Andy Maloney
bc68dfb4e8
Remove unused vars
2013-02-01 18:09:58 -05:00
Andrey Kamaev
f489eb9a5d
Fix build warnings in OpenCL samples
2013-01-30 17:25:03 +04:00
Andy Maloney
5bd56e7464
Fix mem leak and mismatched new/delete
2013-01-28 17:57:19 -05:00
Andrey Kamaev
9509dfd1de
Fix OpenCL build warnings
2013-01-25 16:19:59 +04:00
Andrey Kamaev
ed949bc211
Merge pull request #324 from bitwangyaoyao:2.4_cvtcolor
2013-01-25 00:53:42 +04:00
Andrey Kamaev
20de2f35f9
Merge pull request #325 from bitwangyaoyao:2.4_fixcanny
2013-01-25 00:46:35 +04:00
Andrey Kamaev
f9ed0037b3
Merge pull request #327 from bitwangyaoyao:2.4_vs2012
2013-01-25 00:46:20 +04:00
Andrey Kamaev
d5b15d6523
Fix ocl build warnings
2013-01-24 17:08:30 +04:00
yao
2aae501234
make ocl module compile on VS2012
2013-01-24 15:45:29 +08:00
yao
d574e6dc09
fix canny crash in bug #2279
2013-01-24 14:58:41 +08:00
yao
4f778436b5
ocl::cvtColor support YUV and YCbCr formats
2013-01-24 14:33:28 +08:00
Andrey Kamaev
311d799344
Merge pull request #299 from branch 'bitwangyaoyao_ocl' into 2.4
2013-01-23 14:50:29 +04:00
yao
e05112a364
some host side optimizations to ocl::GaussianBlur
2013-01-23 14:48:04 +04:00
yao
9060365f5e
use format on filtering.cpp
2013-01-23 14:48:04 +04:00
yao
56c1a7fab6
make oclHaarDetectObjects running on more ocl platforms
2013-01-23 14:48:04 +04:00
yao
b5bd2cde9e
A few optimizations to ocl::pyrLK::sparse, make it running on more OCL platforms
2013-01-23 14:48:04 +04:00
yao
f6d82773f9
fix bug #2674
2013-01-23 14:48:04 +04:00
Alexander Smorkalov
8cb0343f4c
Documentation build warning fixes.
...
Invalid links and refences fixed.
SpaeseMat class documentation updated.
2013-01-14 17:58:27 +04:00
Andrey Kamaev
b401c6a0c3
Fix discrepancies between function signatures in headers and documentation
2012-12-26 18:24:50 +04:00
marina.kolpakova
334f6344dd
Merge pull request #120 from NikoKJ:ocl2.4.3
2012-11-01 19:16:22 +04:00
Vadim Pisarevsky
849a8c8d20
fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)
2012-10-31 15:15:51 +04:00
NikoKJ
2045c85ad5
a minor bug fix for brute force
2012-10-31 16:01:56 +08:00
NikoKJ
9ccdd17376
eliminate all the warnings on win32 and win64
...
add a new function abssum
fix the bug of test and perf because someone remove non-free module from cmakelist.txt
2012-10-30 13:01:42 +04:00
Andrey Kamaev
63397e825c
Cleanup CMakeLists.txt of ocl module
2012-10-25 14:55:37 +04:00
Andrey Kamaev
ecb707ca7b
Convert cl2cpp.py script to cmake
...
New version removes inner comments and empty lines
2012-10-22 17:19:55 +04:00
Andrey Kamaev
769f61f8c7
Merge pull request #55 from vpisarev/ocl_fixes
2012-10-22 16:40:18 +04:00
Niko
5df77a841e
remove redundant OPENCL_DIR flag
...
remove as much warnings as possible
use enum instead of MACRO for ocl.hpp
add command line parser in accuracy test and perf test
some bug fix for arthim functions
2012-10-22 15:14:22 +08:00
Andrey Kamaev
461b69f6ee
Eliminate discrepancies between signatures in documentation and OpenCV headers
...
All errors were found by doc/check_docs2.py
2012-10-17 21:24:55 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
vpisarev
f75946a16a
made opencv_ocl module build with VS2012
2012-10-17 15:08:03 +04:00
KOLANICH
c1f2b1fcc4
replaced python build script with WSH one for windows platforms
2012-10-12 23:03:30 +04:00
niko
97156897b2
format files to ANSI C style with coolformat
...
change the download channels to oclchannles()
fix bugs of arithm functions
perf fix of bilateral
bug fix of split test case
add build_warps functions
2012-10-11 16:22:47 +08:00
bitwangyaoyao
09359982b1
some optimizations to ocl::pyrDown, PyrLK and Canny
2012-09-24 20:28:35 +08:00
niko
0abe7f3196
many bugs fix for intel's HD4000
...
from my svn 855
2012-09-21 16:51:45 +08:00
yao
2e36338636
remove warnings of some functions in ocl module
2012-09-20 09:23:11 +08:00
yao
d38359620e
some optimizations to ocl::blend
2012-09-19 10:52:25 +08:00
yao
310bd8701c
a little optimizations to ocl::pyrDown
2012-09-18 17:57:37 +08:00
yao
78e89890b0
add PyrLK to ocl module
2012-09-17 09:48:34 +08:00
yao
9efd7019ad
A more reasonable verify method for ocl::HOG accuracy test
2012-09-14 17:07:29 +08:00
yao
656f06fa74
add bruteForceMatcher to ocl module
2012-09-12 11:40:13 +08:00
niko
23244a3565
rename all the perf test files
...
fix the channel 3 bug in matrix operation
perf and buf fix for LUT haardetect convertC3C4 resize warpaffine copytom settom
add convovle
remove stereo
2012-09-12 10:31:09 +08:00
yao
7d83db7d4d
fix ocl::columnsum bug
2012-09-10 14:52:28 +08:00
yao
1b6639aa3d
A little optimization on ocl/pyrdown, ocl/canny
2012-09-06 14:39:20 +08:00
yao
8f8a69d6f5
fix bug of ocl::canny
2012-09-04 08:51:08 +08:00
niko
11b403900e
add channel 3 for test/main.cpp
...
add remap
2012-09-03 18:07:31 +08:00
yao
c8bfc0fd89
A little fix to ocl accuracy tests, make them more uniformed
2012-09-03 17:23:13 +08:00
yao
0fdb55a54d
update some of the functions in ocl module to the latest version
2012-09-03 17:03:37 +08:00
niko
6f6e990988
use mutex provided by opencv itself
...
add getoclcontext and getoclcommandqueue so that other opencl program can interactive with opencv ocl module
correct haar test cases
add face detection sample
2012-08-31 14:08:52 +08:00
niko
b929012583
performance fix of convertC3C4
...
add OCL 1.2 feature for setTo
bug fix of integral
replace the error code -217 with suitable MACRO
simplify tests, no need apply a new context for each test case
add more control for tests in utility.hpp
2012-08-30 16:14:35 +08:00
niko
e7f4dd1a2e
temp build fix because the new core.hpp impact on this project
2012-08-20 10:06:41 +08:00
niko
2e685dcf0a
performance & bug fix for resize erode dilate sobel remap
2012-08-17 15:47:02 +08:00
bitwangyaoyao
fa78459c56
fix ocl/match_template compiling error on Linux
2012-08-11 13:10:43 +08:00
yao
fa5113f303
add Canny to ocl module
2012-08-10 11:59:47 +08:00
niko
37ca6d378b
add performance test code for ocl module
2012-08-08 17:09:29 +08:00
yao
64e9cf5d75
add SURF and HOG to ocl module
2012-08-08 15:55:39 +08:00
Andrey Kamaev
8aa2d6cddc
Fix several documentation build warnings
2012-08-07 18:00:09 +04:00
yao
c03ac12fcd
Add dft and gemm to ocl module, using AMD's clAmdFft and clAmdBlas libraries
2012-08-07 16:33:46 +08:00
yao
7d97e8112a
fix bugs in tests, set device for each test case
...
Signed-off-by: yao <bitwangyaoyao@gmail.com>
2012-08-06 15:51:27 +08:00
yao
0db69fbe19
Add blend, columnsum, pyrUp/down, matchTemplate for ocl module
2012-08-06 15:00:27 +08:00
yao
687d7639a8
Merge branch 'master' of git://code.opencv.org/opencv
2012-08-03 15:44:15 +08:00
niko
8eeacc8cc8
performance and bug fix for addWeighted cartToPolar div exp log resize setTo
...
add channel 3 support
add fast way Between CPU and GPU for the data which is aligned
2012-08-03 14:08:36 +08:00
yao
1eedcea58d
for test
...
Signed-off-by: yao <bitwangyaoyao@gmail.com>
2012-08-02 11:34:11 +08:00
niko
cf04fed369
fix the compilation bugs
2012-07-30 14:34:36 +08:00
Vadim Pisarevsky
9f4efab40a
merged ocl module from ocl branch (it's not quite usable yet; at least on Mac)
2012-07-16 17:08:14 +00:00
Vadim Pisarevsky
462d4a1dae
opencl module is not ready for trunk yet
2011-07-07 16:40:44 +00:00
salmanulhaq
1e691daab4
ocl folder contains the gpu implementations
2011-07-07 16:35:20 +00:00
salmanulhaq
fe86d25694
renamed gpu to ocl
2011-07-07 16:21:20 +00:00
salmanulhaq
e22ad8050b
OclMat implementation
2011-07-07 16:20:43 +00:00
salmanulhaq
64de562db2
Update OclMat to match GpuMat. Include ref counting, opearators, Scalar initialization. Tested for Intel OCL SDK.
2011-07-07 16:06:26 +00:00