mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-03 08:19:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,716 Commits 6 Branches 126 Tags 3 GiB
4dd6148646
Commit Graph

2167 Commits

Author SHA1 Message Date
Poly Takahiro Horikawa
cb0ab87646 Fix arithmetic exception when pass an empty mat with IPP option on. 2014-08-19 19:19:53 -07:00
Vadim Pisarevsky
70679b49fc Merge pull request #3121 from akarsakov:ocl_dft_opt 2014-08-19 08:57:53 +00:00
Marc Rollins
8fc1848918 Simplifying arithmetic and comparison operator implementation. 
Implementing + and - in terms of += and -=.
Implementing != in terms of ==.
 2014-08-18 12:25:48 -07:00
Marc Rollins
d3d9b538c7 Implementing division operators. 2014-08-18 11:48:38 -07:00
Marc Rollins
d7a8166720 Implementing *= operator. Implementing * in terms of it. 2014-08-18 11:42:10 -07:00
Dmitriy Anisimov
37b1a7560c first version of moving KDTree from core to ml 2014-08-18 22:40:31 +04:00
Alexander Karsakov
fa818d03b8 Changed twiddle buffer creation to use OCL buffer pool (if possible) 2014-08-18 18:22:52 +04:00
Vadim Pisarevsky
0ffc53bafe Merge pull request #3107 from vpisarev:fixed_win_build 2014-08-18 09:00:54 +00:00
Vadim Pisarevsky
dea40e5e99 Merge pull request #3086 from fpuja:pragma_warning4127_fixing 2014-08-16 16:50:41 +00:00
Vadim Pisarevsky
e9729a9601 multiple yet minor fixes to make most of the tests pass on Mac with Iris graphics 2014-08-16 00:29:10 +04:00
Vadim Pisarevsky
daaa5a1824 removed duplicated Hershey fonts 2014-08-15 12:09:16 +04:00
Vadim Pisarevsky
dfbeaddc72 Merge pull request #3106 from LeszekSwirski:fix-gemm-buf-allocate 2014-08-15 05:44:54 +00:00
jaco
dbb0fcdc7a #pragma warning4127 fixation modified 2 2014-08-14 19:27:53 +02:00
Roman Donchenko
fb9a143429 Set status to alpha 2014-08-14 19:17:29 +04:00
Leszek Swirski
de806330fd Fix reallocation of D buffer in gemm 2014-08-14 15:54:54 +01:00
Alexander Alekhin
52ac61d87c Merge pull request #3088 from vbystricky:ocl_enableNormEtc 2014-08-14 14:34:40 +00:00
vbystricky
942ff5be57 Disable OpenCL version of minMaxIdx with mask on AMD devices 2014-08-14 17:39:41 +04:00
Vadim Pisarevsky
95a4943762 Merge pull request #3103 from vpisarev:core_imgproc_optim_rearrangements 2014-08-14 13:39:01 +00:00
Vadim Pisarevsky
9a5aa4b23c trying to solve compile problems; temporarily disabled some tests for just added optimization algo's 2014-08-14 14:37:30 +04:00
Vadim Pisarevsky
00b2124876 fixing more compile problems with Java bindings etc 2014-08-14 13:48:52 +04:00
Vadim Pisarevsky
4530c7ad08 trying to fix builds 2014-08-14 13:18:04 +04:00
Vadim Pisarevsky
f7243be79c Merge pull request #3090 from akarsakov:ocl_reduce_fix 2014-08-14 08:52:18 +00:00
Vadim Pisarevsky
5240a03217 Merge pull request #3100 from vpisarev:disabled_neon_split_merge_on_ios 2014-08-14 08:51:44 +00:00
Vadim Pisarevsky
257463719b removed optim module; moved its functionality to core and photo modules; moved drawing functions from core to imgproc. Removed FilterEngine etc. from public API 2014-08-14 12:50:07 +04:00
vbystricky
aab6f6c56f Set sync=true in ocl_minMaxIdx kernel call. For tests 2014-08-14 12:14:56 +04:00
Vadim Pisarevsky
5d8098a2c3 avoid compiler warnings 2014-08-14 10:06:10 +04:00
VBystricky
c5632d412e Change epsilon for NORM_INF_2args accuracy tests 2014-08-13 23:50:32 +04:00
Vadim Pisarevsky
5f590ebed0 Merge pull request #3094 from Adil-Ibragimov:minor_fixes_in_Mat-data 2014-08-13 18:28:51 +00:00
Vadim Pisarevsky
71ff228ad3 Merge pull request #3089 from Adil-Ibragimov:fix_cuda_constness 2014-08-13 18:09:42 +00:00
Vadim Pisarevsky
a37876ab95 fixed build of iOS framework another time; clang does not like the new NEON-optimized split/merge 2014-08-13 19:59:26 +04:00
jaco
b81dcbdf2a #pragma warning4127 fixation modified 
Now use cleaner approach:

#pragma warning( push )
#pragma warning( disable: ThatWarning )
//code with ThatWarning here
#pragma warning( pop )
 2014-08-13 17:59:16 +02:00
vbystricky
1fe403f461 Enable OpenCL version of norm and convertScaleAbs or 32F data 
Fix error in minmaxloc.cl
Change test for convertScaleAbs
Fix minMaxIdx for _src2 align
Change epsilon on the tests
 2014-08-13 18:33:01 +04:00
Vadim Pisarevsky
d97f9fc477 now the tests pass with loop_times==30 2014-08-13 16:32:01 +04:00
Adil Ibragimov
8a4a1bb018 Several type of formal refactoring: 
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
 2014-08-13 15:21:35 +04:00
Vadim Pisarevsky
3cd7941098 Merge pull request #3083 from akarsakov:ocl_transpose_check_locmem 2014-08-13 10:50:51 +00:00
Vadim Pisarevsky
01bd4961e3 Merge pull request #3081 from akarsakov:small_fixes 2014-08-13 10:50:33 +00:00
Alexander Karsakov
c3100eeb19 Fixed buffer initialization in reduce kernel. Enabled OCL version of reduce for SUM, MAX, MIN modes. 2014-08-13 12:03:06 +04:00
Adil Ibragimov
dfd0b297ce datastart must be non-const in CUDA. 2014-08-13 11:11:33 +04:00
Alexander Karsakov
713ddb89bd Set minimum matrix size for AmdBlas::gemm to 20 since it works incorrect for small sizes 2014-08-12 18:02:29 +04:00
Vadim Pisarevsky
5505aa28ce Merge pull request #3078 from vpisarev:refactor_features2d_take3 2014-08-12 13:56:17 +00:00
jaco
58b3bc2d7e #pragma warning4127 fixed for cvstd.inl.hpp 2014-08-12 15:28:39 +02:00
Alexander Karsakov
3deea1c3ce Added check required local memory size for non-inplace transpose kernel 2014-08-12 16:26:08 +04:00
Alexander Alekhin
da806cc3e7 Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc 2014-08-12 10:21:41 +00:00
vbystricky
6fb282aa39 Remove mul24, for CV8UC3 3840x2160 it generates implementation specific result 2014-08-12 11:25:23 +04:00
Alexander Karsakov
10b3d00fd1 Increased epsilon for passing test with IPPICV 2014-08-12 10:42:42 +04:00
Alexander Karsakov
f3dfdfef8a Fixed warning with "uninitialized local variable" 2014-08-12 10:35:15 +04:00
Vadim Pisarevsky
27d2d3cbac fixed doc builder complains and the test failures 2014-08-12 00:03:40 +04:00
Vadim Pisarevsky
31df47b6ea moved nonfree and a part of features2d to opencv_contrib/xfeatures2d 2014-08-11 23:26:39 +04:00
Vadim Pisarevsky
6df1198e8b Merge pull request #3071 from mshabunin:stitch-fix 2014-08-11 16:08:40 +00:00
Alexander Alekhin
8fd61c9aa6 Merge pull request #3075 from akarsakov:ipp_imgproc_fix 2014-08-11 15:02:53 +00:00
Elena Gvozdeva
b73b28ab9c fix for ocl_lut 2014-08-11 16:21:55 +04:00
vbystricky
dfe5fff2f5 Restore OpenCL branch for minmaxLoc on float data 2014-08-11 15:57:29 +04:00
Alexander Karsakov
835b5e2179 Disabled ippiConvert_32f16s_C1R since it breaks OCL accuracy tests of remap with test_loop_times=30. 2014-08-11 15:50:06 +04:00
mshabunin
c54b8f9b00 Merge remote-tracking branch 'master' into stitch-fix 
* 'master' of github.com:itseez/opencv: (82 commits)
  moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
  added some basic functionality needed by the new face module (moved from the old "contrib")
  moved to the new opencv_contrib/face module
  fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
  Fixed review comment from Vadim Pisarevsky
  modified farneback sample to use T-API
  ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
  small fix for GaussianBlur ocl test
  fix binary package build
  small fix for ocl_resize
  fix IOS framework
  fixed test ocl_MatchTemplate for sparse matrix
  Fixed typos
  fixing error, wrong template method param.
  fixing Mac build
  some formal changes (generally adding constness)
  Fixed choice of kercn and rowsPerWI for non-Intel device.
  fixed nDiffs for CalcBackProject
  fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
  Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
  ...

Conflicts:
	modules/core/include/opencv2/core/mat.inl.hpp
 2014-08-11 14:50:08 +04:00
Vadim Pisarevsky
9ef373f6a5 Merge pull request #3038 from yury-gorbachev:core_arithm_neon 2014-08-10 20:20:04 +00:00
Vadim Pisarevsky
4de4ff5682 Merge pull request #3067 from vpisarev:minor_fixes2 2014-08-10 10:52:57 +00:00
Vadim Pisarevsky
e2f24f43c9 added some basic functionality needed by the new face module (moved from the old "contrib") 2014-08-10 01:54:16 +04:00
Vadim Pisarevsky
05e7c29de5 fixed various warnings and obvious errors reported by clang compiler and the coverity tool. 2014-08-10 00:10:05 +04:00
Yury Gorbachev
9a233999a9 Fixed review comment from Vadim Pisarevsky 2014-08-09 13:37:53 +04:00
Vadim Pisarevsky
09907eeb62 Merge pull request #2639 from kazuki-ma:cv_mat_foreach 2014-08-09 08:25:05 +00:00
Vadim Pisarevsky
99eed2d885 Merge pull request #3057 from Adil-Ibragimov:adding-constness 2014-08-08 17:27:47 +00:00
Vadim Pisarevsky
74457cd3b5 Merge pull request #3055 from akarsakov:copyto_UMat_fix 2014-08-08 14:20:02 +00:00
Vadim Pisarevsky
88672f414b Merge pull request #3056 from akarsakov:ocl_setIdentity_fix 2014-08-08 14:03:46 +00:00
Alexander Karsakov
6ad4521b78 Fixed typos 2014-08-08 13:11:35 +04:00
Adil Ibragimov
8dab2ffce7 fixing error, wrong template method param. 2014-08-07 17:43:32 +04:00
Adil Ibragimov
6b05ca589d fixing Mac build 2014-08-07 17:06:22 +04:00
Adil Ibragimov
98d5731ad8 some formal changes (generally adding constness) 2014-08-07 15:49:14 +04:00
Alexander Karsakov
c5ad6de596 Fixed choice of kercn and rowsPerWI for non-Intel device. 2014-08-07 15:37:26 +04:00
Alexander Karsakov
00221e96fd Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test. 2014-08-07 13:16:02 +04:00
Vadim Pisarevsky
ca183707f2 Merge pull request #3039 from alalek:ocv_world 2014-08-06 14:52:52 +00:00
Vadim Pisarevsky
d611684d9e Merge pull request #3041 from adrians:optimize_split 2014-08-06 09:22:38 +00:00
Alexander Alekhin
55188fe991 world fix 2014-08-05 20:12:35 +04:00
Alexander Alekhin
d2f1c00719 Merge pull request #3045 from vbystricky:ocl_MeanStdDevFix 2014-08-05 14:52:22 +00:00
vbystricky
774d277c1f Fix error in OpenCl version of meanstddev for continues src and not continues mask 2014-08-05 17:30:06 +04:00
vbystricky
2637b18b67 Fix epsilon for OpenCL function ConverTo, for convertation from float to integer types 2014-08-05 16:34:23 +04:00
Adrian Stratulat
b2acd1f75a Vectorize split & merge for NEON 2014-08-05 06:51:36 +00:00
Vadim Pisarevsky
a05ce00a65 Merge pull request #2879 from alalek:ocl_runtime_flags 2014-08-04 16:43:01 +00:00
Vadim Pisarevsky
a58767eff8 Merge pull request #3036 from vbystricky:ocl_NormAccurTestFix 2014-08-04 14:54:12 +00:00
Vadim Pisarevsky
432b7cb235 Merge pull request #3032 from vpisarev:refactor_ml2 2014-08-04 14:51:38 +00:00
Yury Gorbachev
61423a2d47 ARM NEON accelerated implementation of cv::addWeighted, cv::inRange and cv::compare functions. 
NOT verified on target platform, compilation passes with and without NEON.
 2014-08-04 16:44:51 +04:00
vbystricky
2d587ad691 Prevent generating test case with mask filled 0 only 2014-08-04 15:12:36 +04:00
Alexander Alekhin
add9ce46c3 Merge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix 2014-08-04 08:09:38 +00:00
Vadim Pisarevsky
28ca6ac05e fixed building html docs 2014-08-03 02:34:47 +04:00
VBystricky
2026094691 Increase epsilon for OpenCL version UMatDot and ReduceAvg accurency tests 2014-08-02 13:21:34 +04:00
Alexander Alekhin
11dd36f3aa Merge pull request #3028 from vbystricky:ocl_MergeAccurTestFix 2014-08-01 17:15:53 +00:00
vbystricky
aad4104297 Fix accurency test for OpenCL matrix operations 2014-08-01 18:30:20 +04:00
vbystricky
184c5917bf Fix accurency test of OpenCL merge function. 2014-08-01 17:53:24 +04:00
Roman Donchenko
983e75e5de Merge remote-tracking branch 'origin/master' into merge-2.4 2014-08-01 15:01:41 +04:00
vbystricky
b48e487d53 Enable ocl version of minmaxloc with mask 2014-07-31 19:12:10 +04:00
vbystricky
11a0e3ff78 Fix error in OCL minmaxloc 2014-07-31 19:04:38 +04:00
Elena Gvozdeva
9db8592aa8 fixed ocl_flip for cn==3 2014-07-31 16:57:47 +04:00
Vadim Pisarevsky
b0cd822924 trying to make the tests pass 2014-07-31 14:24:21 +04:00
Vadim Pisarevsky
ef8647fe30 put IPP ReduceSum_32f back 2014-07-30 19:12:11 +04:00
Vadim Pisarevsky
5267ed46c7 1. disabled OpenCL acceleration for cv::multiply() (CV_32F), cv::divide (CV_32F), cv::convertScaleAbs (CV_32F) and cv::reduce (SUM, CV_32F), cv::reduce (MIN & MAX), cv::flip (3-channel case). 
2. changed the number of test loops from 1 to 30 (except for cv::pow() test, which fails for yet unknown reason)
3. disabled IPP acceleration for 3-channel norms.
4. modified relativeNorm test function to handle very small values
 2014-07-30 18:19:47 +04:00
Vadim Pisarevsky
ba3783d205 initial commit; ml has been refactored; it compiles and the tests run well; some other modules, apps and samples do not compile; to be fixed 2014-07-29 23:54:23 +04:00
Vadim Pisarevsky
41df63aacd Merge pull request #3010 from vpisarev:ocl_disable_some_norms2 2014-07-28 17:24:42 +00:00
Vadim Pisarevsky
962b519708 Merge pull request #2996 from akarsakov:ocl_dft_new_concept 2014-07-28 15:59:59 +00:00
Vadim Pisarevsky
0c749fd7e5 Merge pull request #2998 from ernest-galbrun:cuda_concurrency 2014-07-28 15:59:43 +00:00
Vadim Pisarevsky
af83884dc7 disabled ocl_minmaxloc on 32-bit data completely 2014-07-28 19:35:06 +04:00
Vadim Pisarevsky
1925fab427 disabled some more stuff 2014-07-28 19:32:06 +04:00