generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,541 Commits 3 Branches 47 Tags
Commit Graph

44 Commits

Author SHA1 Message Date
Roman Donchenko
bae85660da Merge remote-tracking branch 'origin/2.4' 
Pull requests:
	#943 from jet47:cuda-5.5-support
	#944 from jet47:cmake-2.8.11-cuda-fix
	#912 from SpecLad:contributing
	#934 from SpecLad:parallel-for
	#931 from jet47:gpu-test-fixes
	#932 from bitwangyaoyao:2.4_fixBFM
	#918 from bitwangyaoyao:2.4_samples
	#924 from pengx17:2.4_arithm_fix
	#925 from pengx17:2.4_canny_tmp_fix
	#927 from bitwangyaoyao:2.4_perf
	#930 from pengx17:2.4_haar_ext
	#928 from apavlenko:bugfix_3027
	#920 from asmorkalov:android_move
	#910 from pengx17:2.4_oclgfft
	#913 from janm399:2.4
	#916 from bitwangyaoyao:2.4_fixPyrLK
	#919 from abidrahmank:2.4
	#923 from pengx17:2.4_macfix

Conflicts:
	modules/calib3d/src/stereobm.cpp
	modules/features2d/src/detectors.cpp
	modules/gpu/src/error.cpp
	modules/gpu/src/precomp.hpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/morph.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/precomp.cpp
	modules/ocl/perf/precomp.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/pyrlk.cpp
	modules/video/src/bgfg_gaussmix2.cpp
	modules/video/src/lkpyramid.cpp
	platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
	platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
	platforms/scripts/ABI_compat_generator.py
	samples/ocl/facedetect.cpp
 2013-06-05 15:42:07 +04:00
Vladislav Vinogradov
58e472754a fixed norm diff function (it uses pre-allocated buffer now) 2013-06-03 13:37:44 +04:00
Andrey Kamaev
416fb50594 Revert "Merge pull request #836 from jet47:gpu-modules" 
This reverts commit fba72cb60d27905cce9f1390250adf13d5355c03, reversing
changes made to 02131ffb620f349617a65da334591eca5d3cb23b.
 2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
31c8b527c6 gpuarithm module for arithmetics operations on matrices 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
54e7c76d99 fixed compilation errors 2013-04-17 15:24:53 +04:00
Vladislav Vinogradov
b50090f850 restore cudaSafeCall 2013-04-08 17:25:16 +04:00
Vladislav Vinogradov
204a19b431 moved common gpu utility functionality to gpu_private.hpp 2013-04-08 17:25:15 +04:00
Andrey Kamaev
f77a375354 Merge branch '2.4' 2013-03-29 19:38:35 +04:00
marina.kolpakova
84f45e1e03 fixed build with CUDA after latest merge 2013-03-25 08:08:36 +04:00
Vladislav Vinogradov
f0b19d4659 updated license header in whole gpu module 2013-03-22 14:03:15 +04:00
Vladislav Vinogradov
61b54149b1 added mask support to gpu norm and sum 2013-02-13 15:54:50 +04:00
Vladislav Vinogradov
281d036fcf optimizations: 
- new reduce implementation (with kepler optimizations)
- saturate_cast via asm command
- video SIMD instructions in element operations
- float arithmetics instead of double
- new deviceSupports function
 2013-01-23 21:05:07 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Anatoly Baksheev
55b1d7c097 added CUDA_DISABLER preprocessor commands 2012-10-01 23:57:38 +04:00
Anatoly Baksheev
70204a8e68 Removed PtrElemStep, Marked DevMem1D as deprecated, now should use PtrStepSz now 2012-08-24 02:02:42 +04:00
Anatoly Baksheev
543825f2f5 compilation with CUDA5.0 (#1982, thanks to Rodrigo) 2012-05-25 09:44:00 +00:00
Vladislav Vinogradov
eaea6782d5 added more assertion on device features to gpu functions and tests 
moved TargerArchs and DeviceInfo to core
fixed bug in GpuMat::copy with mask (incorrect index in function tab)
 2012-03-27 10:34:30 +00:00
Vladislav Vinogradov
26691e00d4 fixed gpu core tests (added additional check for device's feature support) 
added assertion on double types for old devices
 2012-03-26 14:33:43 +00:00
Vladislav Vinogradov
2d30480982 created wrappers for new NPP functions 
removed void integral(const GpuMat& src, GpuMat& sum, GpuMat& sqsum, Stream& stream) - it fails with NPP_NOT_IMPLEMENTED error
updated docs, accuracy and performance tests
 2012-02-22 10:00:53 +00:00
Vladislav Vinogradov
f8aba8608d fixed build under CUDA 4.1 2012-01-30 13:15:20 +00:00
Vladislav Vinogradov
0f53f2993e removed BEGIN_OPENCV_DEVICE_NAMESPACE macros 2011-11-14 09:02:06 +00:00
Vladislav Vinogradov
fcfa72081e moved GpuMat and DevMem2D to core module, some code refactoring 2011-11-09 13:13:52 +00:00
Anatoly Baksheev
7076dfd7d6 gpu module: refactored devmem2d.hpp (atomic bomb) 2011-10-13 15:14:04 +00:00
Vladislav Vinogradov
8b23c79294 implemented gpu::reduce 2011-09-22 07:08:26 +00:00
Vladislav Vinogradov
42ced17c2c fixed some warnings under win64 2011-08-08 11:28:14 +00:00
Vladislav Vinogradov
926a6bba00 modified according to CUDA 4.0 API updates 2011-05-31 08:31:10 +00:00
Vladislav Vinogradov
6a03be2632 added lightweight class DeviceBuffer to matrix_reductions.cpp 2011-05-11 07:30:46 +00:00
Vladislav Vinogradov
1c9f4e7ca2 fixed gpu::meanStdDev and gpu::norm under CUDA 4.0 
fixed compilation under Win64
 2011-05-10 12:39:12 +00:00
Anatoly Baksheev
6b34532901 minor + warnings 2011-02-15 15:09:54 +00:00
Alexey Spizhevoy
63806c9ab9 renamed gpu::DeviceInfo::has into gpu::DeviceInfo::supports 2011-02-09 12:31:05 +00:00
Alexey Spizhevoy
16e74ab306 added buffered version of norm, updated performance sample and docs 2011-02-01 10:46:19 +00:00
Alexey Spizhevoy
3795142604 implemented gpu::norm via absSum, sqrSum, and minMax (removed norm_diff call), added support of other data types 2011-02-01 10:23:10 +00:00
Alexey Spizhevoy
ae529f4bc6 added absSum function 2011-01-31 14:37:03 +00:00
Alexey Spizhevoy
575fd1fe4c reafactoring: replaced query device props functions with the DeviceInfo class 2011-01-28 11:59:26 +00:00
Alexey Spizhevoy
891e2ff310 replaced has* methods in the GPU module with the TargetArchs monostate 2011-01-27 10:06:38 +00:00
Vladislav Vinogradov
811ba31897 added synchronization after NPP calls 2011-01-24 10:32:57 +00:00
Alexey Spizhevoy
db41449be8 fixed errors under MacOS 2011-01-21 10:53:07 +00:00
Alexey Spizhevoy
01dafce1a1 fixed some bugs in GPU matrix reductions, removed <functional> into precomp.hpp 2011-01-21 07:43:11 +00:00
Alexey Spizhevoy
0da71a01ff fixed some GPU tests failing when compiled for 1.1(no doubles) and run on 1.3(with doubles) 2011-01-20 15:08:48 +00:00
Alexey Spizhevoy
8779306800 updated main CMakeLists.txt gpu module section, now user can manage binary and intermediate code versions of the gpu module image 
added more functions to check version of gpu code in runtime
 2011-01-20 09:22:05 +00:00
Alexey Spizhevoy
90ae1e3aed refactored gpu module 2011-01-19 10:54:58 +00:00
Alexey Spizhevoy
cbb132ccb1 added ensureSizeIsEnough into gpu module, updated reduction methods 2011-01-18 12:36:01 +00:00
Alexey Spizhevoy
df8529377b refactoring: moved gpu reduction-based functions into separated file 2010-12-20 09:51:25 +00:00
Anatoly Baksheev
0f30fe080f renamed constantspacebp -> stereocsbp line all other algs 
created element_operations and matrix_reductions files for farther refactoring
 2010-12-19 17:20:54 +00:00