Andrey Pavlenko
d695d4a0bf
Merge pull request #2406 from ilya-lavrenov:abf
2014-02-25 09:12:32 +04:00
Ilya Lavrenov
e1a598c5b3
disabled ABF tests
2014-02-24 23:26:01 +04:00
Ilya Lavrenov
aa5311ea9f
backport of master-based perf tests for matchTemplate to 2.4
2014-02-20 18:58:32 +04:00
Alexander Alekhin
d1606b4aa3
ocl: added SVM perf test
2014-02-14 16:36:46 +04:00
Zhigang Gong
9aef26e2ad
Workaround a LLVM/Clang 3.3 bug.
...
The LLVM/Clang 3.3 has a bug when compile a cl kernel with
assignment of a scalar to a vector data type. This patch
could work around this bug.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
2014-02-12 13:14:43 +08:00
Konstantin Matskevich
435615ba2e
update test CascadeClassifier
2014-02-05 12:23:36 +04:00
Andrey Pavlenko
0a4a1d7526
temporary disabling hanging test
2014-01-24 10:07:21 +04:00
Roman Donchenko
2fde4d8a94
Merge pull request #2145 from andreasBihlmaier:2.4
2014-01-14 11:55:29 +04:00
Roman Donchenko
2443e8090e
Merge pull request #2133 from apavlenko:2.4-perf_haar
2014-01-13 19:28:09 +04:00
ahb
49dfa5a17f
Fix the following error for ocl::getOpenCLPlatforms() on Ubuntu 12.04 with gcc 4.8
...
OpenCV Error: Unknown error code -6 (OpenCL function is not available: [clGetPlatformIDs]) in opencl_check_fn, file /home/ahb/software/opencv/modules/ocl/src/cl_runtime/cl_runtime.cpp, line 83
The issue results from modules/ocl/src/cl_runtime/cl_runtime.cpp checking for
"linux" instead of "__linux__" (cp. http://sourceforge.net/p/predef/wiki/OperatingSystems/ )
Adjust all other occurrences of "defined(linux)" as well.
2014-01-13 16:09:42 +01:00
Andrey Pavlenko
4c99196399
adding finish() to flush CL queue, renaming the test to match 'master' branch
2014-01-13 18:12:30 +04:00
Andrey Pavlenko
a7821c60e5
refactoring the test as it should be in 2.4
2014-01-13 11:20:17 +04:00
Andrey Pavlenko
4d28e8243c
'master'-like Haar perf test
2014-01-10 00:14:48 +04:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Roman Donchenko
0566ab4d3d
Merge pull request #2078 from ilya-lavrenov:warn
2013-12-27 18:17:21 +04:00
Ilya Lavrenov
d014cb8fb4
fixed warning [-Wempty-body]
2013-12-27 14:44:58 +04:00
Peng Xiao
0ccc903647
fixed a buffer overrun of ocl canny
...
the `map` buffer does not have the same size with CUDA and index starts at [1, 1] instead of [0, 0].
2013-12-27 11:54:08 +08:00
Alexander Smorkalov
4f6f6e8cac
static function qualifier replaced on inline to enable kernel compilation with OpenCL 1.1 embedded profile.
2013-12-26 21:20:32 +04:00
krodyush
e8dd31aacd
change code according reviewer suggesions
2013-12-20 13:51:51 +04:00
krodyush
27c1bd2762
Improve ocl cvt_color performance for the following conversions: RGB<->BGR, RGB->Gray, RGB<->XYZ, RGB<->YCrCb, RGB<->YUV, and mRGBA<->RGBA.
...
The improvement was done basically by processing more than 1 pixel by each work-item and using vector's operations.
new performance tests were added
2013-12-19 22:56:46 +04:00
Andrey Pavlenko
b674cd8571
Merge pull request #2007 from krodyush:pullreq/2.4-opt-131202-haar
2013-12-19 16:46:58 +04:00
Andrey Pavlenko
8c91a1af71
Merge pull request #2005 from krodyush:pullreq/2.4-opt-131114-extractCovData
2013-12-19 16:46:40 +04:00
Andrey Pavlenko
22a3cf0fba
Merge pull request #2008 from krodyush:pullreq/2.4-opt-131209-hog
2013-12-19 16:14:42 +04:00
Andrey Pavlenko
0cea828a10
Merge pull request #2006 from krodyush:pullreq/2.4-opt-131120-gfft
2013-12-19 13:48:40 +04:00
krodyush
1ae71fe205
intel device guard was added because of perf degradation on some non intel platform.
2013-12-18 14:27:51 +04:00
krodyush
34c630faf4
update doc to be consisted with headers
2013-12-17 17:46:09 +04:00
krodyush
ea0c9b7f5c
GFFT fix for linux build
2013-12-17 17:12:57 +04:00
krodyush
dfe7c98090
optimize separable filter by
...
Added "sep_filter_singlepass" kernel that performs separable filtering in one kernel call
Added appropriate host part - sepFilter2D_SinglePass function and SingleStepSeparableFilterEngine_GPU class
Changed function declarations to enable their usage
2013-12-17 14:09:06 +04:00
krodyush
f3ee1c3d2f
Changes the datatype of the angle of the gradient for Intel platforms.
2013-12-17 14:06:14 +04:00
krodyush
917b883cf0
remove extra calculations from haar to be consistent with native implementation
2013-12-17 14:04:10 +04:00
krodyush
a63576e76d
HOST side optimization for GFFT
2013-12-17 14:02:57 +04:00
krodyush
de431609db
optimize Dx and Dy calcualtion to make it as single opencl kernel
2013-12-17 14:01:01 +04:00
Matthias Bady
b7c97f6e30
fixed init of clCxt
2013-12-15 22:41:07 +01:00
Alexander Alekhin
17ca7f9545
ocl: add support for initialization from user-provided OpenCL handles
2013-12-12 19:59:22 +04:00
Alexander Alekhin
740b1f235e
ocl: implemented per-thread OpenCL command queue
2013-12-11 19:12:09 +04:00
Peter Andreas Entschev
def17f2baa
Removing ocl::oclMat::ptr() method.
...
The method ocl::oclMat::ptr() is being removed because it returns a pointer to a row of oclMat::data. The data attribute is a cl_mem structure and cannot be iterated outside an OpenCL kernel.
2013-12-06 09:31:18 -02:00
Andrey Pavlenko
72cfff4c59
Merge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4
2013-12-06 15:05:34 +04:00
Andrey Pavlenko
b0b199ee8a
Merge pull request #1929 from alalek:ocl_haar_amd_beta
2013-12-06 14:56:47 +04:00
Peter Andreas Entschev
3bc952ed34
ocl::BruteForceMatcher fix wrong use of oclMat::ptr().
...
The oclMat::ptr() method was mistakenly used in ocl::BruteForceMatcher to pass a pointer to a oclMat object. The ptr() method returns a uchar pointer to the cl_mem data structure and this method will be removed.
2013-12-05 19:27:10 -02:00
Andrey Pavlenko
9dea590ada
Merge pull request #1933 from gongzg:fix-ocl-kernel-2.4
2013-12-05 17:05:25 +04:00
Alexander Alekhin
3dcddad88a
ocl: added workaround into Haar kernels
2013-12-05 16:56:01 +04:00
Zhigang Gong
6ce03b0484
Fixed some implicitly type conversions between vector and scalar data type.
...
There are some mixed implicitly/explicitly type conversion between
scalar and vector. Although the spec allows those conversion, I prefer
to make them consistent and use explicitly all the cases.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
2013-12-05 09:35:21 +08:00
Alexander Alekhin
7b551af424
ocl: try to disable clFinish workaround
2013-12-04 13:00:37 +04:00
Alexander Alekhin
c962a9d61c
ocl:perf: fix moments test for plain impl
2013-12-03 16:02:55 +04:00
Andrey Pavlenko
8db6d9f9b2
Merge pull request #1906 from asmorkalov:android_ocl_warn_fix
2013-12-03 11:20:48 +04:00
Andrey Pavlenko
368bac7af6
Merge pull request #1744 from liuxing6666:2.4_fix_harris_test
2013-12-02 20:38:49 +04:00
Alexander Smorkalov
eab7603096
Warning fixes and suppression in ocl module for gcc 4.6 from Android NDK.
2013-12-02 17:51:29 +04:00
Alexander Smorkalov
8fe4ab280b
Build error fix for binary-complience-checker tool.
2013-11-26 17:39:40 +04:00
Andrey Pavlenko
d45ce086c1
Merge pull request #1856 from alalek:ocl_fix_mt
2013-11-26 09:58:22 +04:00
Roman Donchenko
4c5593b633
Merge pull request #1837 from asmorkalov:android_opencl
2013-11-25 12:19:20 +04:00
