Roman Donchenko
f07769e9d8
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectOpenCL.cmake
cmake/OpenCVModule.cmake
modules/imgproc/src/floodfill.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_programcache.hpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/mssegmentation.cpp
modules/ocl/src/precomp.hpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/stereo_csbp.cpp
modules/ocl/src/stereobm.cpp
modules/ocl/test/main.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/stereo_match.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-08 17:57:23 +04:00
Andrey Pavlenko
75d89f4331
Merge pull request #1533 from alalek:perf_test_update_relative_error_message
2013-10-01 20:17:52 +04:00
Alexander Alekhin
66e4aead97
perf tests: added SANITY_CHECK_NOTHING()
2013-10-01 16:49:11 +04:00
Alexander Alekhin
958604a68e
perf test: update error message about relative error
2013-09-30 20:11:39 +04:00
Vladislav Vinogradov
fd88654b45
replaced GPU -> CUDA
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
cfe4a71dc6
renamed gpu* source to cuda* in core module
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
e895b7455e
renamed gpu namespace -> cuda
2013-09-02 14:00:41 +04:00
Roman Donchenko
4d06c4c7b6
Merge commit '43aec5ad^' into merge-2.4
...
Conflicts:
modules/contrib/src/inputoutput.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpuarithm/perf/perf_element_operations.cpp
modules/gpuarithm/src/element_operations.cpp
modules/ts/src/precomp.hpp
2013-08-27 13:23:26 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Vladislav Vinogradov
2899d558ac
record cuda gpu name to output report
2013-08-21 10:12:44 +04:00
Roman Donchenko
3939d78336
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/types_c.h
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/error.cpp
modules/gpu/src/imgproc.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/shapedescr.cpp
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
Vladislav Vinogradov
f87ef77269
removed GPU_/CPU_ prefix from gpu's sanity test
2013-07-18 13:41:27 +04:00
Roman Donchenko
4cf9990d4e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
Roman Donchenko
7a104d2793
Added an option to print available implementation variants.
2013-06-19 18:47:15 +04:00
Roman Donchenko
b581f27249
Made perf tests record module name, selected implementation and number of threads.
2013-06-19 17:55:42 +04:00
Roman Donchenko
936236e4b1
Extended the CPU/GPU selection mechanism in performance tests.
...
Now it allows choosing between arbitrary implementation variants.
2013-06-19 17:55:42 +04:00
Vladislav Vinogradov
2dab93c2e8
refactored gpu info structures (TargetArchs and DeviceInfo)
...
now DeviceInfo provides full information about device (from cudaDeviceProp)
2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
4c9773d55f
renamed gpu headers (made it more consistent)
2013-06-10 12:40:30 +04:00
Vladislav Vinogradov
54e7c76d99
fixed compilation errors
2013-04-17 15:24:53 +04:00
marina.kolpakova
4096b54560
use static assertation where suitable
2013-03-25 00:29:12 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Alexey Spizhevoy
e0ead7b606
fixed assertion failure (vector out of range) for the 'vc10,debug' build ( #2775 )
2013-02-08 17:44:57 +04:00
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
Andrey Kamaev
4f1913ed26
Correct tolerance value for sanity checks with ERROR_RELATIVE
...
Use min/max bounds instead of local value to calculate acceptance threshold.
Threshold based on local values somethimes does not work because cancellation
of big values may produce error bigger than local value.
2013-01-31 15:47:14 +04:00
cuda-geek
11dfceb2c9
Merge pull request #328 from jet47:new-gpu-fixes
2013-01-29 11:00:37 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Ivan Korolev
6385b0f7ed
Fixed a formula to calculate the relative error
2013-01-25 11:19:38 +04:00
Vladislav Vinogradov
b7e6b5af1b
fixed tests (call resetDevice, if there was a gpu failure)
2013-01-23 21:05:04 +04:00
Vladislav Vinogradov
5138b7d209
Merge branch 'master' into cuda-dev
2012-12-24 13:48:33 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Vladislav Vinogradov
660d23aa04
added cv::gpu::resetDevice to RunPerfTestBody
2012-12-20 15:33:04 +04:00
Andrey Kamaev
80a1d569ca
Add support for multidimentional matrices into the sanity checks
2012-12-15 20:15:34 +04:00
Andrey Kamaev
f5cd20d80b
Merge branch 2.4
2012-12-14 14:46:41 +04:00
Andrey Kamaev
817a4c0c30
Merge branch 2.4 into perf_verify_sanity
2012-12-12 20:14:25 +04:00
Andrey Kamaev
e1afb1409f
Add --perf_verify_sanity option to performance tests
...
This option provides an easy way to identify tests having no regression data
for sanity checks
2012-12-12 19:42:24 +04:00
Andrey Kamaev
6e244c83cd
Corrected sanity checks in several perf tests
...
Also fixed a typo in performance testing framework and removed hardcoded
temporary file name from highgui perf test
2012-12-12 01:00:47 +04:00
Andrey Kamaev
c13eb07d47
Fix argument parsing for old command line parser
2012-10-23 12:07:01 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
d566c6bc86
Revert "add new version of CommandLineParser. add empty docs"
...
This reverts commit 54a202b3d5
2012-10-15 20:01:44 +04:00
Andrey Kamaev
52e490ef88
Revert "fixed compile error under linux"
...
This reverts commit e2d9fc4dcc
2012-10-15 20:01:44 +04:00
Andrey Kamaev
3ffe0f0117
Remove unused tbb::task_scheduler_init from perf tests
2012-10-15 16:25:06 +04:00
Andrey Kamaev
c3881ede62
Refactor thread management in performance tests
2012-10-15 16:14:11 +04:00
marina.kolpakova
800cb9d0e6
allow gpu module write sanity data for GPU and CPU tests in one xml
2012-10-12 14:46:18 +04:00
Andrey Kamaev
a3a658c034
Quiet MSVC warning
2012-10-12 12:19:34 +04:00
Andrey Kamaev
97640847c5
Add methods to sort keypoints and corresponding descriptors
2012-10-11 18:25:45 +04:00
Andrey Kamaev
18295bc778
Improve performance tests failures formatting
2012-10-11 17:41:02 +04:00
Andrey Kamaev
423837ddae
Restore theRNG seed reset on test SetUp as it is still needed
2012-10-10 18:07:03 +04:00
marina.kolpakova
b28acfc12e
add GPU module specific command line arguments
2012-10-10 16:13:25 +04:00
marina.kolpakova
f88be98ec4
print information message about target device for GPU module tests
2012-10-10 16:13:25 +04:00
