Andrey Pavlenko
d60924f4f2
Merge pull request #1694 from apavlenko:fix_typo
2013-10-25 19:35:19 +04:00
Andrey Pavlenko
2e5db6e56c
fixing typo
2013-10-25 18:53:24 +04:00
Andrey Pavlenko
2b6fca68bf
fixing typo
2013-10-25 18:00:46 +04:00
Ilya Lavrenov
e1596d69cc
fixed extrapolation in ocl::adaptiveBilateralFilter
2013-10-25 17:29:21 +04:00
Ilya Lavrenov
b33a62beb0
fixed separable filter extrapolation
2013-10-25 17:08:44 +04:00
peng xiao
68a8a11161
Rewrite distanceToCenters.
...
It supports NORM_L1 distance types now and can
use user provided indices.
Also fixed a bug of kmeans where distance pointers should be float instead
of double.
NORM_L2 changed to NORM_L2SQR, Accuracy and Perf tests are added
added ROI support in accuracy test of distanceToCenters
2013-10-25 15:02:00 +04:00
yao
dd0fa63ca8
fix the bug of ocl::bruteForceMatcher
2013-10-25 16:01:41 +08:00
Roman Donchenko
3b08bf6b62
Merge pull request #1682 from SpecLad:Wmissing-declarations
2013-10-24 22:19:17 +04:00
Roman Donchenko
f51e490bad
Fixed a Wmissing-declarations warning when compiling with MinGW.
2013-10-24 18:35:08 +04:00
Ilya Lavrenov
dab3000778
fixed bug in ocl::equalizeHist
2013-10-24 13:59:25 +04:00
Andrey Pavlenko
4cf598a862
Merge pull request #1669 from ilya-lavrenov:ocl_copyMakeBorder
2013-10-24 11:23:01 +04:00
Peng Xiao
4b712eeded
Update imgproc_canny.cl
...
Reordering condition checking.
2013-10-24 12:07:54 +08:00
konstantin
9f0995fbe0
try to made compatible with mac
2013-10-23 23:56:22 +04:00
Ilya Lavrenov
5864895ec6
fixed ocl::copyMakeBorder
2013-10-23 23:52:05 +04:00
konstantin
ebb2c3e01f
try to fix build error
2013-10-23 23:18:21 +04:00
konstantin
2f62940a0e
Added few opencl optimizations (as Intel platform codepath):
...
1. HaarDetetctor: repack nodes to reduce memory footprint
2. cornerMinEigVal: 4 ocl kernels are fused into 1 for sobel calculation
2013-10-23 20:38:11 +04:00
Alexander Alekhin
e7fd053478
ocl: fix FFT initialization
2013-10-21 19:48:36 +04:00
Alexander Alekhin
9acca12d2d
ocl: workaround for ProgramCache cleanup issue, use RAII to print kernel build error
2013-10-21 19:16:33 +04:00
Andrey Pavlenko
0ad04d66e3
Merge pull request #1645 from ilya-lavrenov:ocl_morph_test_fix
2013-10-21 16:00:13 +04:00
Andrey Pavlenko
bd1a1cc031
Merge pull request #1633 from ilya-lavrenov:ocl_imgproc
2013-10-21 15:59:00 +04:00
Ilya Lavrenov
9d923b50ac
fixed ocl::Laplacian for case when scale != 1
2013-10-21 14:27:34 +04:00
peng xiao
7285341083
1. Let btvRegWeights to be constant per process
call.
...
2. Let Farneback to be the default optical flow method.
3. Fix a timing method bug for ocl path.
4. Remove useless finish operation in farneback
5. Refactor buffer usage.
2013-10-21 10:21:37 +08:00
Ilya Lavrenov
4f68f35a78
added reflect, reflect101, replicate, wrap border types to ocl::remap
2013-10-19 23:38:50 +04:00
Ilya Lavrenov
b3e1a4598c
enabled double in copyMakeBorder kernel
2013-10-18 16:46:51 +04:00
Ilya Lavrenov
2681cef5d7
rewrote ocl::remap
2013-10-18 16:41:09 +04:00
Ilya Lavrenov
3fe74ad124
fixed ocl::copyMakeBorder
2013-10-18 16:39:47 +04:00
Ilya Lavrenov
36342eb425
added ROI support to ocl::convolve
2013-10-18 16:36:11 +04:00
Ilya Lavrenov
110a92c126
added ROI support to ocl::columnSum
2013-10-18 16:33:48 +04:00
Ilya Lavrenov
60f9ba0c64
added ROI support to ocl::CLAHE
2013-10-18 16:31:52 +04:00
Alexander Alekhin
fd4e705b14
ocl: update autogenerated code
2013-10-18 15:47:11 +04:00
Alexander Alekhin
6344da9ac3
ocl: force to use Khronos OpenCL headers
2013-10-18 15:47:11 +04:00
Andrey Pavlenko
97dfd65007
Merge pull request #1626 from ilya-lavrenov:ocl_filters
2013-10-18 13:44:41 +04:00
Ilya Lavrenov
da3b7c79b8
refactored filters in the ocl module; added an accuracy tests for ocl::medianFilter
2013-10-17 12:23:56 +04:00
Ilya Lavrenov
741e0242b3
replaced to_string by cv::format
2013-10-15 13:26:01 +04:00
Andrey Pavlenko
ae56eaa563
Merge pull request #1609 from ilya-lavrenov:ocl_some_optimization
2013-10-14 16:41:25 +04:00
Ilya Lavrenov
b18101b15a
some optimization of binary ocl::bitwise operations
2013-10-13 23:25:59 +04:00
Ilya Lavrenov
da607c6711
ocl::cvtColor works with ROI properly
2013-10-13 23:09:14 +04:00
Andrey Pavlenko
19dca324ae
Merge pull request #1608 from alalek:fix_warn_upd_haar
2013-10-12 16:24:04 +04:00
Andrey Pavlenko
f9fe1b9b09
Merge pull request #1607 from ilya-lavrenov:ocl_fft_cleanup
2013-10-12 16:12:05 +04:00
Andrey Pavlenko
a55cc60136
Merge pull request #1606 from ilya-lavrenov:ocl_imgproc
2013-10-12 16:10:04 +04:00
Andrey Pavlenko
4e31a3df24
Merge pull request #1603 from ilya-lavrenov:ocl_disable_svm_noblas
2013-10-12 16:04:05 +04:00
Ilya Lavrenov
dfbea3518a
refactored ocl/src/imgproc.cpp
2013-10-11 23:39:41 +04:00
Ilya Lavrenov
5a309e8f6e
fft cleanup ignoring
2013-10-11 20:25:03 +04:00
ilya-lavrenov
d63a38e9bf
disable SVM when AMD BLAS is not available
2013-10-11 19:25:34 +04:00
Alexander Alekhin
723af15228
ocl: fix warnings from GCC 4.8, update Haar
2013-10-11 18:42:17 +04:00
Alexander Alekhin
ce1177151e
ocl: fix cleanup in static builds
2013-10-11 18:07:38 +04:00
Alexander Alekhin
57120c1a60
ocl: remove support_image2d(): we target on OpenCL 1.1 (with image2d support by default)
2013-10-11 17:16:03 +04:00
ilya-lavrenov
ca32583fdd
fixed ocl optical flow: sparse and tvl1
2013-10-11 13:55:49 +04:00
Andrey Pavlenko
171e0e62ec
Merge pull request #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
2013-10-11 12:40:12 +04:00
Alexander Alekhin
238550cdad
ocl: code cleanup, fix .clb files
2013-10-11 01:19:46 +04:00
Ilya Lavrenov
1be77dd2f3
enabled accuracy tests for the functions that use inside AMD Blas/Fft
2013-10-11 00:37:52 +04:00
Ilya Lavrenov
1f51e6c0de
fixed kernel compilation warnings on MacOSX
2013-10-10 22:56:39 +04:00
Alexander Alekhin
6b9f74ae84
ocl: fix cleanup on Windows platform (for clAmdBlas/clAmdFft)
2013-10-10 16:58:45 +04:00
Andrey Pavlenko
d5723480e1
Merge pull request #1592 from alalek:ocl_program_cache_update
2013-10-10 15:55:58 +04:00
Andrey Pavlenko
a351161fd7
Merge pull request #1591 from alalek:ocl_remove_cl_hpp_h
2013-10-10 15:55:13 +04:00
Ilya Lavrenov
9d1636daa6
catching OpenCL double not supported exceptions
2013-10-10 12:45:55 +04:00
Alexander Alekhin
d26f62569d
ocl: fix compilation warnings, update openCLExecuteKernelInterop
2013-10-10 00:15:02 +04:00
Alexander Alekhin
43c638d07d
ocl: remove cl.hpp dependency (it is missed on Nvidia SDK and on some platforms)
2013-10-09 23:53:25 +04:00
Ilya Lavrenov
488e6aafaf
fixed the PR 1582
2013-10-09 14:16:36 +04:00
Andrey Pavlenko
6b69a66c3c
Merge pull request #1579 from ilya-lavrenov:ocl_norm
2013-10-09 13:52:20 +04:00
Andrey Pavlenko
ff8e5a04a4
Merge pull request #1586 from ilya-lavrenov:ocl_setto_win_fix
2013-10-09 13:49:34 +04:00
Ilya Lavrenov
245ff93544
ocl setto fix for windows
2013-10-08 19:11:32 +04:00
Ilya Lavrenov
bdd5038da4
ocl setto fix for windows
2013-10-08 18:52:32 +04:00
Sebastian Krmer
3696174b14
fix documentation warning
2013-10-08 16:49:20 +02:00
Ilya Lavrenov
c404da784f
fixed ocl::norm (previously the function used double as a work type)
2013-10-08 18:43:49 +04:00
Sebastian Krämer
4ffd3fb905
add ocl::abs
2013-10-08 15:23:24 +02:00
Sebastian Krämer
33df7131ae
add ocl::min and ocl::max (includes accuracy tests update)
2013-10-08 15:23:13 +02:00
Roman Donchenko
65ec9f77d9
Merge pull request #1577 from ilya-lavrenov:ocl_setto_opencl12
2013-10-08 15:15:31 +04:00
Ilya Lavrenov
32f11e6f40
enabled OpenCL 1.2 branch in oclMat::setTo
2013-10-08 12:49:29 +04:00
Alexander Alekhin
1d6327ba2a
ocl: fix Context::CL_* usage
2013-10-08 12:23:46 +04:00
Roman Donchenko
46eeb106e2
Merge pull request #1564 from alalek:cl_runtime_fix_32bit
2013-10-04 18:29:04 +04:00
Roman Donchenko
0a13510293
Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update
2013-10-04 18:25:44 +04:00
Roman Donchenko
2660f4bc59
Merge pull request #1562 from ilya-lavrenov:ocl_integral
2013-10-04 18:12:43 +04:00
Roman Donchenko
aa80250a3d
Merge pull request #1532 from alalek:stereo_csbp
2013-10-04 16:43:51 +04:00
Alexander Alekhin
90df620deb
ocl: stereo_csbp: divUp -> roundUp
2013-10-04 12:48:26 +04:00
Alexander Alekhin
2d1a6687f9
autogenerated code
2013-10-04 12:40:08 +04:00
Alexander Alekhin
2fdfa37ea5
ocl: runtime, fix 32-bit builds
2013-10-04 12:40:08 +04:00
Ilya Lavrenov
10d60f99dc
fixed ocl::integral and enabled perf test for it
2013-10-04 12:33:14 +04:00
Ilya Lavrenov
5f81988699
refactored arithm binary operations in order to make them more scalable
2013-10-04 12:13:22 +04:00
Alexander Alekhin
7f0680fc8b
ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp
2013-10-03 23:26:06 +04:00
Alexander Alekhin
8beb514ecf
ocl: merge with upstream/2.4
2013-10-03 23:26:06 +04:00
Alexander Alekhin
16adbda4d3
ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable
2013-10-03 19:50:14 +04:00
Alexander Alekhin
dd9ff587dc
ocl: file-based ProgramCache refactoring
2013-10-03 19:50:14 +04:00
Alexander Alekhin
b00f79ac5f
ocl: move program names into opencl_kernels.hpp
2013-10-03 19:50:14 +04:00
Alexander Alekhin
e8d9ed8955
ocl: split initialization.cpp into 3 files: context, operations, programcache
2013-10-03 19:50:14 +04:00
Ilya Lavrenov
dafd4da031
removed ocl::minMax_buf, updated doc (operation on matrices)
2013-10-03 18:19:15 +04:00
Ilya Lavrenov
adca219f18
fixed convertC3C4 and convertC4C3 functions in case cols == 1
2013-10-03 10:45:15 +04:00
Andrey Pavlenko
73744904a2
Merge pull request #1542 from alalek:cl_runtime
2013-10-02 19:50:35 +04:00
Alexander Alekhin
5ab49c4cc2
ocl: cl_runtime: added autogenerated code
2013-10-02 18:32:33 +04:00
Alexander Alekhin
212ad97100
ocl: dynamic load of OpenCL libraries
...
Support functions from OpenCL 1.1 / OpenCL 1.2
2013-10-02 18:32:33 +04:00
Ilya Lavrenov
a613a1a1da
fixed ocl::bitwise_not in case of CV_8UC1, CV_8UC2
2013-10-02 16:09:29 +04:00
Andrey Pavlenko
154fe4f657
Merge pull request #1519 from ilya-lavrenov:ocl_minMax
2013-10-01 20:16:48 +04:00
Ilya Lavrenov
065b40c6c3
fixed and extended ocl::norm
2013-10-01 13:21:43 +04:00
Ilya Lavrenov
a562b5c985
fixed ocl::meanStddev and created accuracy test for this function
2013-09-30 17:37:19 +04:00
Ilya Lavrenov
7379152afb
fixed ocl::setIdentity
2013-09-30 16:54:09 +04:00
Ilya Lavrenov
7edcefb2be
fixed ocl::phase
2013-09-30 16:02:14 +04:00
Ilya Lavrenov
b864f48274
fixed ocl::sum, ocl::sqrSum, ocl::absSum
2013-09-30 15:12:38 +04:00
peng xiao
422396ef6a
fix build error
2013-09-30 16:17:20 +08:00
peng xiao
f69ccfa43d
Add opencl svm.
2013-09-30 16:17:19 +08:00
Ilya Lavrenov
b54228fb83
fixed ocl::countNonZero
2013-09-27 17:35:06 +04:00
Ilya Lavrenov
9dca7555b4
fixed ocl::minMax
2013-09-27 16:25:10 +04:00
Andrey Pavlenko
3e91350a31
Merge pull request #1503 from ilya-lavrenov:ocl_arithm
2013-09-26 15:50:54 +04:00
Ilya Lavrenov
f5af3ab851
changes in OpenCL matrix operations docs
2013-09-25 19:47:15 +04:00
Ilya Lavrenov
c8821bd909
replaced manually new/delete by AutoBuffer
2013-09-25 15:28:12 +04:00
Ilya Lavrenov
0faac595a8
fixed minMaxLoc kernel (removed compilation errors)
2013-09-25 15:14:10 +04:00
Ilya Lavrenov
544c02407e
reverted and generalized original ocl::transpose
2013-09-25 14:22:37 +04:00
Jin Ma
c7c0a41e17
Resolved the bug that the work group size is not valid.
2013-09-25 17:42:56 +08:00
Ilya Lavrenov
c87d2d414d
removed arithm_absdiff.cl
2013-09-24 14:18:42 +04:00
Ilya Lavrenov
8aa3eb817d
refactored arithm.cpp. Extended param list for all the tests
2013-09-24 14:13:10 +04:00
Ilya Lavrenov
b4ad128218
refactoed and extended ocl::transpose
2013-09-24 14:07:54 +04:00
Ilya Lavrenov
799afab23b
refactored and extended ocl::exp and ocl::log
2013-09-24 14:02:01 +04:00
Ilya Lavrenov
0730963576
refactored and extended ocl::compare
2013-09-24 13:58:18 +04:00
Ilya Lavrenov
8e0e352d77
refactored and extended binary bitwise operations
2013-09-24 13:54:46 +04:00
Ilya Lavrenov
161674bff2
refactored and extended ocl::addWeighted
2013-09-24 13:51:37 +04:00
Ilya Lavrenov
b20bd470fe
refactored and extended ocl::LUT
2013-09-24 13:49:38 +04:00
Ilya Lavrenov
311a7233c2
removed comments from filtering.cpp and imgproc.cpp in ocl module
2013-09-24 13:46:08 +04:00
Ilya Lavrenov
bd36e556a1
removed ocl::magnitudeSqr
2013-09-24 13:39:07 +04:00
Ilya Lavrenov
0ad03162df
refactored and extended arithm operations add/sub/mul/div/absdiff
2013-09-24 13:34:55 +04:00
Ilya Lavrenov
5ff5fdd73d
marked some methods of ocl::Context as const
2013-09-24 13:17:09 +04:00
Ilya Lavrenov
d64fb235f7
removed needless arithm_2_mat.cl file
2013-09-24 13:15:05 +04:00
Alexander Smorkalov
d6d8e96003
Merge pull request #1489 from melody-rain:2_4_knearest_neighbor
2013-09-23 13:34:39 +04:00
Jin Ma
b88f5302e2
Removed unused constructor.
2013-09-23 15:10:00 +08:00
Jin Ma
1bfe39f485
Added knearest neighbor of OpenCL version.
...
It includes the accuracy/performance test and the implementation of KNN.
2013-09-22 10:23:54 +08:00
Jin Ma
06c33df307
Added knearest neighbor of OpenCL version.
...
It includes the accuracy/performance test and the implementation of KNN.
2013-09-22 10:22:09 +08:00
Ilya Lavrenov
362a67a695
fixed ocl::oclMat::setTo for 2-channel images
2013-09-20 15:57:38 +04:00
Alexander Alekhin
f1b5cbc8fe
ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp
2013-09-18 01:14:41 +04:00
Alexander Smorkalov
6fae07ba88
Merge pull request #1460 from ilya-lavrenov:ocl_divUp
2013-09-17 15:37:44 +04:00
Alexander Smorkalov
d437183388
Merge pull request #1439 from ilya-lavrenov:convertTo
2013-09-17 15:12:02 +04:00
Ilya Lavrenov
58b84c2fc0
removed needless divUp
2013-09-16 15:48:30 +04:00
Ilya Lavrenov
a5c9d83617
fixed ocl::pyrUp for 2-byte types
2013-09-15 19:56:05 +04:00
Ilya Lavrenov
f20cc2bce8
extended ocl::convertTo
2013-09-12 12:39:03 +04:00
Ilya Lavrenov
6b9c451938
added CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl::pyrDown
2013-09-10 17:36:18 +04:00
Roman Donchenko
747f7178ca
Merge pull request #1417 from ilya-lavrenov:merge_fix
2013-09-10 11:33:25 +04:00
Roman Donchenko
260b283fb3
Merge pull request #1413 from melody-rain:2.4_kalman_filter
2013-09-10 11:28:22 +04:00
Roman Donchenko
84435ba741
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
2013-09-09 16:46:33 +04:00
Ilya Lavrenov
7d8bde3330
fixed ocl::merge in case of 2 and types CV_32S and CV_32F
2013-09-09 16:12:01 +04:00
Jin Ma
a4ab3f4ea8
Removed whitespace.
2013-09-09 17:00:33 +08:00
Jin Ma
2d5a1dacd0
Added Kalman Filter of OpenCL version.
2013-09-09 16:08:23 +08:00
Roman Donchenko
c42d61e464
Merge pull request #1283 from melody-rain:new_mog_mog2
2013-09-03 18:43:03 +04:00
Roman Donchenko
f50a829943
Merge pull request #1383 from pengx17:2.4_clblas
2013-09-03 12:05:01 +04:00
pengxiao
ea16539448
Fix a crash of ocl program if clAmdBlas is not linked.
2013-09-03 10:30:37 +08:00
peng xiao
7b3e3f69fb
Modify according to @alalek.
2013-09-03 09:31:13 +08:00
Roman Donchenko
bd7930ada1
Merge pull request #1345 from pengx17:2.4_tvl1ocl_opt
2013-09-02 13:09:22 +04:00
peng xiao
3c2a8912ee
Let clAmdBlas library initialize once during program lifetime.
2013-09-02 10:06:01 +08:00
ilya-lavrenov
968c095403
gpu -> ocl
2013-08-29 18:32:06 +04:00
Jin Ma
0233c4c198
Removed whitespace.
2013-08-29 15:49:02 +08:00
Jin Ma
5728612f95
Removed the trailing whitespace
2013-08-29 14:06:03 +08:00
yao
26b5eb3e39
add adaptive bilateral filter (cpp and ocl version)
2013-08-29 10:48:15 +08: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