Konstantin Matskevich
5304e9f259
extending openCL info dump
2013-11-06 15:20:05 +04:00
Alexander Alekhin
03646e7e01
ocl: workaround for subbuffer memory leaks
2013-11-06 14:02:41 +04:00
Andrey Pavlenko
43c9157220
Merge pull request #1750 from alalek:ocl_update_documentation
2013-11-06 13:32:00 +04:00
Andrey Pavlenko
a3fa7a243d
Merge pull request #1740 from ilya-lavrenov:ocl_corners
2013-11-06 13:31:44 +04:00
Andrey Pavlenko
95767676b7
Merge pull request #1739 from pengx17:2.4_ocl_overload_haar
2013-11-06 13:31:11 +04:00
Roman Donchenko
5c44afa427
Merge pull request #1743 from ilya-lavrenov:ocl_repeat
2013-11-06 13:24:22 +04:00
peng xiao
53d1873776
Revert back test image.
2013-11-06 11:19:26 +08:00
Alexander Alekhin
3952a0df44
ocl: update comments in ocl.hpp
2013-11-05 23:53:52 +04:00
Alexander Alekhin
5a333bfff4
ocl: update documentation
2013-11-05 23:53:51 +04:00
Andrey Pavlenko
be37d99567
Merge pull request #1752 from alalek:ocl_memory_cleanup_workaround
2013-11-05 23:49:37 +04:00
Andrey Pavlenko
14c3560750
Merge pull request #1751 from ilya-lavrenov:ocl_copyMakeBorder_test_fix
2013-11-05 23:49:12 +04:00
Alexander Alekhin
691d5f4187
ocl: memory cleanup workaround: clFinish() before clReleaseMemObject() + 64kb memory guard
2013-11-05 19:43:07 +04:00
Ilya Lavrenov
e544e34eed
fixed ocl::copyMakeBorder accuracy test
2013-11-05 18:23:34 +04:00
Roman Donchenko
9c83f6c4fb
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
Alexander Alekhin
7704dbf866
ocl: svm: restore non BLAS version
2013-11-05 15:15:26 +04:00
Alexander Alekhin
9a63508f50
Revert "disable SVM when AMD BLAS is not available"
...
This reverts commit d63a38e9bf
.
Conflicts:
modules/ocl/test/test_ml.cpp
2013-11-05 15:13:30 +04:00
Ilya Lavrenov
e7e7e04dce
came back to relative error
2013-11-05 14:17:31 +04:00
Ilya Lavrenov
2df53d97c5
added ocl::repeat
2013-11-05 12:23:20 +04:00
peng xiao
2a111f7a6c
Let perf/accuracy test of ocl haar uses detectMultiScale api.
...
Fix image to be used by perf test.
2013-11-05 10:40:27 +08:00
Ilya Lavrenov
c89dfd333c
fixed warnings in OpenCL kernels
2013-11-04 15:30:00 +04:00
Ilya Lavrenov
a8426e1c12
fixed ocl::cornerHarris, ocl::cornerMinEigenVal and their accuracy tests
2013-11-04 15:16:00 +04:00
peng xiao
8c1eb5bf0e
Overload detectMultiScale API for ocl::haar.
2013-11-04 14:59:28 +08:00
Andrey Pavlenko
dd942df08b
Merge pull request #1736 from alalek:ocl_fix_corner_memory_access
2013-11-01 18:37:35 +04:00
Andrey Pavlenko
2767be9a5e
Merge pull request #1731 from perping:2.4_haar
2013-11-01 16:46:18 +04:00
Alexander Alekhin
99ae9d9cc1
ocl: corner*: fix memory access in kernels; change error check to relative
2013-11-01 16:38:04 +04:00
Alexander Alekhin
3b293d6855
ocl: fix testdata for blendLinear
2013-11-01 14:44:13 +04:00
perping
af77111cd6
remove whitespace.
2013-11-01 17:53:35 +08:00
Roman Donchenko
e7e6d9d63c
Merge pull request #1729 from ilya-lavrenov:ocl_moments
2013-11-01 11:56:49 +04:00
perping
af33c118b4
fixed a bug of haar.
2013-11-01 14:07:10 +08:00
Ilya Lavrenov
a8b7573db0
fixed ocl::Moments test
2013-11-01 00:09:11 +04:00
Ilya Lavrenov
1f9ab2e0ca
fixed warnings in ocl kernels
2013-10-31 23:48:02 +04:00
Andrey Pavlenko
dfa5a27bee
Merge pull request #1727 from ilya-lavrenov:ocl_warpPerspective
2013-10-31 15:32:34 +04:00
Andrey Pavlenko
fbabc323ed
Merge pull request #1726 from melody-rain:2.4_tvl1_ocl
2013-10-31 14:03:36 +04:00
Andrey Pavlenko
bf58049d11
Merge pull request #1724 from ilya-lavrenov:ocl_thresh
2013-10-31 13:55:04 +04:00
Andrey Pavlenko
e80f5bed2d
Merge pull request #1710 from melody-rain:2.4_moments_ocl
2013-10-31 13:54:46 +04:00
Ilya Lavrenov
c8aed4996e
fixed ocl::warpPerspective
2013-10-31 13:53:11 +04:00
Jin Ma
3dbcd05407
fixed a typo.
2013-10-31 16:25:50 +08:00
Jin Ma
145ece8f9c
removed test for double since not all platforms support double, thus the sanity check cannot pass on all the platforms.
2013-10-31 16:21:08 +08:00
Jin Ma
599cf6bea0
Resolved a bug and used ocl::multiply.
2013-10-31 16:09:33 +08:00
Ilya Lavrenov
1d5f5d2364
vectorized ocl::threshold for single channel images
2013-10-31 12:00:53 +04:00
Jin Ma
1bb47f4bdf
modified the copyright info.
2013-10-31 08:47:59 +08:00
Andrey Pavlenko
ef9f690598
Merge pull request #1709 from ilya-lavrenov:ocl_cornerharris
2013-10-31 00:22:37 +04:00
Andrey Pavlenko
5795bb326d
Merge pull request #1723 from ilya-lavrenov:ocl_norm
2013-10-31 00:21:29 +04:00
Andrey Pavlenko
ead37e4a29
Merge pull request #1721 from alalek:ocl_fix_filter2D_64F_kernel
2013-10-31 00:21:10 +04:00
Andrey Pavlenko
68c916aa26
Merge pull request #1719 from ilya-lavrenov:ocl_gaussianBlur
2013-10-31 00:20:51 +04:00
Andrey Pavlenko
089cf423a0
Merge pull request #1717 from alalek:ocl_adjust_worksize
2013-10-31 00:20:34 +04:00
Ilya Lavrenov
16df5b007d
disabled upload and download perf tests
2013-10-30 17:08:57 +04:00
Ilya Lavrenov
c674d3cf49
fixed ocl::norm (with NORM_RELATIVE specified) when norm(src2) == 0
2013-10-30 16:48:12 +04:00
Alexander Alekhin
0104f59feb
ocl: filter2D: fix processing of kernel with double datatype
2013-10-30 16:27:46 +04:00
Ilya Lavrenov
8dfde47f89
changed eps in ocl::GaussianBlur test
2013-10-30 16:04:48 +04:00
Alexander Alekhin
7b0f018a74
ocl: adjust worksize for filter2D and boxFilter
2013-10-30 15:30:47 +04:00
Alexander Alekhin
50d2c1066b
ocl: split: update tests and implementation
2013-10-30 14:08:37 +04:00
Roman Donchenko
d11921f1a4
Merge pull request #1675 from krodyush:opencl-optimization
2013-10-30 12:28:31 +04:00
Jin Ma
7469c2eb9d
fixed a bug when double is not supported.
2013-10-30 14:37:13 +08:00
Ilya Lavrenov
bf6b5ee925
fixed extrapolation for ocl::cornerMinEigenVal and ocl::cornerHarris; enabled CV_32FC1 for the first function
2013-10-29 19:59:21 +04:00
Jin Ma
b6b190df5c
Rewrote moments of opencl version.
2013-10-29 18:05:29 +08:00
Roman Donchenko
75087580de
Merge pull request #1704 from SpecLad:merge-2.4
2013-10-29 13:13:05 +04:00
Andrey Pavlenko
616db74e49
Merge pull request #1663 from vpisarev:ocl_experiments3
2013-10-29 11:14:16 +04:00
Andrey Pavlenko
c5e8a9a29b
Merge pull request #1702 from alalek:ocl_memory_corruption_check
2013-10-29 11:07:04 +04:00
Andrey Pavlenko
c6a01f2641
Merge pull request #1688 from alalek:ocl_fix_filters
2013-10-29 11:05:10 +04:00
Andrey Pavlenko
ea64589164
Merge pull request #1687 from bitwangyaoyao:2.4_fix
2013-10-29 11:03:34 +04:00
Andrey Pavlenko
f4b8babbc8
Merge pull request #1677 from pengx17:patch-1
2013-10-29 11:00:26 +04:00
Andrey Pavlenko
9bfa346c38
Merge pull request #1544 from ilya-lavrenov:ocl_blendLinear
2013-10-29 10:49:46 +04:00
Andrey Pavlenko
e52459a324
Merge pull request #1708 from ilya-lavrenov:ocl_threshold
2013-10-29 10:43:44 +04:00
Andrey Pavlenko
106d5eda5f
Merge pull request #1700 from ilya-lavrenov:ocl_bitwise_perf
2013-10-29 10:43:27 +04:00
Andrey Pavlenko
acadfcff2d
Merge pull request #1707 from ilya-lavrenov:ocl_morph
2013-10-29 10:38:23 +04:00
Andrey Pavlenko
2b05dc7d1e
Merge pull request #1699 from ilya-lavrenov:ocl_minMax
2013-10-29 10:35:58 +04:00
Andrey Pavlenko
5fa6d70ab0
Merge pull request #1695 from ilya-lavrenov:ocl_showDiff
2013-10-29 10:35:42 +04:00
Ilya Lavrenov
c49c3e0a91
fixed and generalized ocl::blendLinear
2013-10-28 23:56:40 +04:00
Ilya Lavrenov
58be2546ca
fixed OpenCL morph operations for case when kernel does not have zero element
2013-10-28 20:09:49 +04:00
Alexander Alekhin
b10e1e5c7e
ocl: filters: update documentation
2013-10-28 20:09:49 +04:00
Alexander Alekhin
98f73705df
ocl: fix morph filters
2013-10-28 20:09:49 +04:00
Alexander Alekhin
0f95f0d8b3
ocl: rewrite filter2D
2013-10-28 20:09:49 +04:00
Alexander Alekhin
0bf9ece998
ocl: rewrite boxFilter
2013-10-28 20:09:49 +04:00
Alexander Alekhin
cb6ea8bfa1
ocl: update filter tests
2013-10-28 20:09:49 +04:00
Alexander Alekhin
447c052e59
ocl: memory corruption check
2013-10-28 19:33:00 +04:00
Andrey Pavlenko
95bd32b516
Merge pull request #1705 from ilya-lavrenov:ocl_flip
2013-10-28 19:02:24 +04:00
Andrey Pavlenko
bb15c00665
Merge pull request #1703 from bitwangyaoyao:2.4_fix1480
2013-10-28 19:01:51 +04:00
Andrey Pavlenko
d3c0b36cd0
Merge pull request #1701 from alalek:ocl_fix_canny
2013-10-28 19:01:13 +04:00
Andrey Pavlenko
1cc58f9770
Merge pull request #1698 from ilya-lavrenov:ocl_warp
2013-10-28 18:59:08 +04:00
Ilya Lavrenov
7afbae57ba
fixed ocl::minMax for FP-types
2013-10-28 18:49:16 +04:00
Ilya Lavrenov
eb2f8a2948
ocl tests: show diff when cv::countNonZero(diff) > 0
2013-10-28 18:20:02 +04:00
Ilya Lavrenov
1f7f9c9682
rewrote and generalized ocl::threshold
2013-10-28 18:11:24 +04:00
Ilya Lavrenov
e70dfe5a50
fixed OpenCL morph operations for case when kernel does not have zero element
2013-10-28 16:46:41 +04:00
Ilya Lavrenov
cf5df1a7e7
fixed ocl::flip
2013-10-28 13:57:29 +04:00
Roman Donchenko
d3bcf609f1
Merge pull request #1657 from KonstantinMatskevich:ocldistanceToCenters
2013-10-28 13:46:32 +04:00
Roman Donchenko
78be4f66f7
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
yao
0fd872bfa9
fix bug #1480
2013-10-28 17:36:43 +08:00
yao
632452cdd8
fix the mismatch running on cpu devices
2013-10-28 16:32:46 +08:00
Roman Donchenko
88f5ef9acc
Merge pull request #1696 from apavlenko:fix_typo_GpuMaterials
2013-10-28 12:18:42 +04:00
Peng Xiao
ab2bd58f5c
Fixed a missing barrier.
2013-10-28 14:17:59 +08:00
konstantin
973137c78e
fix bugs on host and device sides for imgprog_sobel3.cl
2013-10-28 00:14:07 +04:00
Alexander Alekhin
eb4f50ca59
ocl: Canny: port CUDA-based implementation of edgesHysteresisLocal
2013-10-28 00:10:47 +04:00
Ilya Lavrenov
900c303636
added performance tests for ocl::bitwise_or and ocl::bitwose_xor
2013-10-27 20:08:50 +04:00
Alexander Alekhin
9e527fc9f4
ocl: Canny: replace unsafe buffer to oclMat
2013-10-27 18:55:42 +04:00
Ilya Lavrenov
839245e420
fixed tests for ocl::warpAffine and ocl::warpPerspective
2013-10-27 14:49:37 +04:00
konstantin
ddd2b106fb
rename imageproc_sobel2.cl -> imageproc_sobel3.cl for consistency
2013-10-25 21:44:01 +04:00
Andrey Pavlenko
66e5be2d64
Merge pull request #1655 from pengx17:2.4_opt_superres_ocl
2013-10-25 19:47:38 +04:00
Andrey Pavlenko
fc64a4071c
Merge pull request #1689 from ilya-lavrenov:ocl_bilateralFilter
2013-10-25 19:41:56 +04:00
Andrey Pavlenko
4e57f92e6e
Merge pull request #1692 from ilya-lavrenov:ocl_separableFilter
2013-10-25 19:39:21 +04:00
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
Ilya Lavrenov
9ea6001d08
enabled ocl::bilateralFilter ROI testing
2013-10-25 13:32:35 +04:00
Andrey Pavlenko
f177e65871
Merge pull request #1683 from alalek:ocl_restore_showdiff
2013-10-25 13:19:02 +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
2279c209c8
Merge pull request #1676 from ilya-lavrenov:ocl_resize_test
2013-10-24 11:23:55 +04:00
Andrey Pavlenko
931a2ae14f
Merge pull request #1673 from ilya-lavrenov:ocl_norm
2013-10-24 11:23:36 +04:00
Andrey Pavlenko
e7f39eb46e
Merge pull request #1672 from ilya-lavrenov:ocl_arithm
2013-10-24 11:23:19 +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
Alexander Alekhin
133d889e33
ocl: show diff
2013-10-24 03:44:56 +04: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
Ilya Lavrenov
7c1443cbdd
fixed an accuracy test for ocl::resize (in some cases dsize.area() was equal to 0)
2013-10-23 22:13:18 +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
Ilya Lavrenov
29499ed51a
moved to relative errors in ocl::norm tests
2013-10-23 19:53:04 +04:00
Ilya Lavrenov
87fc3441f2
workaround for cv::multiply bug
2013-10-23 18:42:55 +04:00
Roman Donchenko
4036f6a3d0
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt
2013-10-22 14:28:00 +04:00
Vadim Pisarevsky
d8c8339bec
the first draft of transparent API and new UMat class. more files
2013-10-22 14:05:15 +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
aec7d9c1db
Merge pull request #1647 from ilya-lavrenov:ocl_tests_demonstrative
2013-10-21 16:06:36 +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
e82fd12a67
Merge pull request #1644 from ilya-lavrenov:ocl_matrix_operations
2013-10-21 15:59:19 +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
Ilya Lavrenov
6085c416a7
missed initialization of kernel size
2013-10-21 14:27:14 +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
e9cef2990e
made more demonstrative message about test fails
2013-10-19 01:17:46 +04:00
Ilya Lavrenov
022b5d6c74
refactored ocl matrix operations accuracy tests
2013-10-18 17:36:38 +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
Ilya Lavrenov
4a81be7d0b
refactored all the tests in ocl/test/test_imgproc.cpp
2013-10-18 16:29:10 +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
4cbf0cb31e
Merge pull request #1640 from alalek:ocl_fix_exp_test
2013-10-18 13:45:12 +04:00
Andrey Pavlenko
97dfd65007
Merge pull request #1626 from ilya-lavrenov:ocl_filters
2013-10-18 13:44:41 +04:00