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
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
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
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
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
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
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
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
Alexander Smorkalov
514e97223c
Some hacks to build and run OpenCL on Qualcomm S800.
...
Some of functions were enabled on Qualcomm S800 by changing grid size;
OpenCL kernel grid size unification for different platfroms;
Test pass rate improvements by inclreasing threshold;
Some tests were disabled for Android;
run.py was adopted for devices with brackets in in name.
2013-11-22 16:13:38 +04:00
Alexander Alekhin
d650efc069
ocl: multi-threading: opencl buffer memory guard
2013-11-22 14:39:51 +04:00
Alexander Alekhin
96a4a7b339
ocl: multi-threading: fix bug in intialization
2013-11-22 14:39:33 +04:00
Ilya Lavrenov
60b59eeb73
workaround for AMD bug: UNREACHABLE EXECUTED
2013-11-20 15:40:56 +04:00
Roman Donchenko
e69d2c1bb1
Merge pull request #1819 from ilya-lavrenov:ocl_resize_AREA
2013-11-19 16:25:47 +04:00
Ilya Lavrenov
198cd1a40d
added area fast mode to ocl::resize
2013-11-19 13:43:50 +04:00
Ilya Lavrenov
c0456df611
workaround for ocl::absSum (eliminated error: unreachable executed)
2013-11-18 20:38:39 +04:00
Ilya Lavrenov
f70d63e4c9
added INTER_AREA interpolation to ocl::resize
2013-11-18 18:28:49 +04:00
Roman Donchenko
4fd1960425
Merge pull request #1807 from KonstantinMatskevich:intel_bug
2013-11-18 15:16:37 +04:00
Roman Donchenko
3f927abb4d
Merge pull request #1809 from ilya-lavrenov:ocl_resize_nn
2013-11-18 14:55:24 +04:00
Konstantin Matskevich
327d9f274b
fixed Split for device version equals 78712
2013-11-18 13:20:57 +04:00
Konstantin Matskevich
0e1717c14c
fixing bugs for Intel platform CPU device
2013-11-18 13:20:54 +04:00
Roman Donchenko
f5ded41016
Merge pull request #1808 from alalek:ocl_fix_cvtcolor_xyz
2013-11-18 12:20:58 +04:00
Alexander Alekhin
0a698bf145
ocl: fix cvtColor XYZ: variables on stack
2013-11-16 13:45:39 +04:00
Ilya Lavrenov
cc237b7aba
generalized ocl::resize for all data types (INTER_NEAREST mode)
2013-11-15 22:52:29 +04:00
Roman Donchenko
4e2ec7b97d
Merge pull request #1803 from ilya-lavrenov:ocl_cvtColor
2013-11-15 15:55:29 +04:00
Roman Donchenko
be88b20154
Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor
2013-11-14 14:46:43 +04:00
