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
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
