Commit Graph

124 Commits

Author SHA1 Message Date
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Vladislav Vinogradov
85c904a4ba fixed build in gpu module (SURF and ORB) 2012-03-18 12:05:49 +00:00
Andrey Kamaev
18dbe6b3e5 cmake scripts are updated to prefer includes from the OpenCV source tree 2012-03-03 15:49:23 +00:00
Vladislav Vinogradov
6f7e3434ca moved finding CUDA_npp_LIBRARY to OpenCVDetectCUDA.cmake 2012-02-15 06:44:20 +00:00
Vladislav Vinogradov
77f286ada6 fixed build under linux
added PyrLKOpticalFlowDense performance test
2012-02-13 13:19:06 +00:00
Andrey Kamaev
5eb6ee6290 Fixing build with CUDA enabled 2012-02-03 12:54:52 +00:00
Andrey Kamaev
984eb99428 Global CMake reorganization:
[~] Automatically tracked dependencies between modules
 [+] Support for optional module dependencies
 [+] Options to choose modules to build
 [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
 [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
 [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Alexey Spizhevoy
ada9158521 Fixed the building process for (ubuntu 64bit debug cuda4.1) configuration 2012-02-02 14:06:13 +00:00
Andrey Kamaev
9d5c24cdc8 Updating opencv module definition in cmake (continued) 2012-01-25 09:04:49 +00:00
Andrey Kamaev
13f4e70e95 Updating opencv module definition in cmake 2012-01-24 16:55:47 +00:00
Vladislav Vinogradov
fcfa72081e moved GpuMat and DevMem2D to core module, some code refactoring 2011-11-09 13:13:52 +00:00
Vladislav Vinogradov
40ee754e28 added WITH_CUFFT and WITH_CUBLAS flags to cmake scripts
fixed gpu module error reporting
added asynchronous version of some functions
2011-10-19 09:53:22 +00:00
Vladislav Vinogradov
8009b5150e added performance tests for gpu module 2011-09-07 13:16:07 +00:00
Vadim Pisarevsky
f9ef92d45a multilib support added (ticket #363) 2011-08-10 12:49:52 +00:00
Vladislav Vinogradov
3ab2728da1 gpu device layer code refactoring 2011-08-03 12:10:36 +00:00
Andrey Kamaev
3aea74d408 Fixed precompiled headers support (fixed formatting, fixed dependencies generation) 2011-07-24 19:22:58 +00:00
Vadim Pisarevsky
5649f35757 some more bugfixed in 2.3 propagated to trunk 2011-07-07 11:43:21 +00:00
Ethan Rublee
6259c9ac6a First pass at name mangling based on version number, to support
side by side installs of OpenCV2.3.0 OpenCV2.3.1 OpenCV2.4.x, etc...
2011-06-28 16:02:09 +00:00
Vadim Pisarevsky
49467947ac propagated some fixes from 2.3 to trunk 2011-06-23 12:00:09 +00:00
Anatoly Baksheev
117ff43cc3 default cuda target flags changed
cuda support is on by default
2011-06-15 08:05:34 +00:00
Alexander Shishkov
6ecebb7f66 fixed #768 ticket
renamed OPENCV_SOURCE_DIR to OpenCV_SOURCE_DIR
2011-06-14 10:19:56 +00:00
Alexander Shishkov
ca758a9dac fixed #768 ticket 2011-06-14 10:11:16 +00:00
Alexey Spizhevoy
5538e206f9 mac worlaround 2011-06-01 13:57:14 +00:00
Anatoly Baksheev
e4bbcdac17 minor 2011-06-01 08:01:04 +00:00
Alexander Shishkov
63dc1cdd2c removed OPENCV_BUILD_SHARED_LIB in favor of BUILD_SHARED_LIBS
removed one more OPENCV_BUILD_SHARED_LIB flag
2011-05-31 14:22:25 +00:00
Alexander Shishkov
6aabf72bc5 removed OPENCV_BUILD_SHARED_LIB in favor of BUILD_SHARED_LIBS 2011-05-31 13:17:59 +00:00
Ethan Rublee
76538fbe6b Making the install and lib, bin directories consistent. 2011-05-30 22:13:32 +00:00
Alexey Spizhevoy
7d350280c0 compilation under mac 2011-05-18 13:02:27 +00:00
Anatoly Baksheev
69f28ef65c solution folder flag disabled by default 2011-05-17 09:40:06 +00:00
Anatoly Baksheev
17e1bcb006 fixed pch for non-windows 2011-05-11 13:50:17 +00:00
Anatoly Baksheev
c49dc37761 [+] added use_folders cmake feature if cmake version is greater then 2.8.0
[~] fixed warning in featuers2d under windows (can't generate assignment operator)
2011-05-11 13:37:20 +00:00
Anatoly Baksheev
1c18e5fef9 fixed ~300 warnings under windows (had to hack gtest a bit) 2011-05-06 21:45:48 +00:00
Anton Obukhov
8a54967e0b [~] Updated GPU module install target to copy NCV.hpp and NPP_staging.hpp to the package include directory 2011-04-25 16:07:48 +00:00
Andrey Kamaev
b906ad3108 Test system included into Android build 2011-04-11 14:47:06 +00:00
Anatoly Baksheev
d0e66f7766 minor 2011-03-28 06:56:37 +00:00
Alexey Spizhevoy
289af671ee added projectPoints and transformPoints into GPU module 2011-02-21 10:58:05 +00:00
Anatoly Baksheev
047c7e0fd6 *applied patch from NVidia (nppstTraspose bug)
*fixed some warnings
*finished gpu test port to gtest framework
2011-02-18 12:23:18 +00:00
Alexey Spizhevoy
7b2ec0a1e6 fixed gpu/CMakeLists.txt 2011-02-18 10:04:31 +00:00
Alexey Spizhevoy
048689876e removed unnecessary code from gpu/CMakeLists.txt 2011-02-18 10:01:30 +00:00
Alexey Spizhevoy
7bf2816f28 removed CMakeLists.txt from gpu/test folder to avoid precompiled header associated warnings under Ubuntu 2011-02-18 07:43:15 +00:00
Alexey Spizhevoy
51cee84123 created GPU new-style test project, ported StereoBP test 2011-02-16 11:38:58 +00:00
Anatoly Baksheev
7539b7de65 fixed build under ubuntu, but FS is still disabled 2011-02-07 13:47:10 +00:00
Anatoly Baksheev
f42a449df9 fix compilation under win32 with gpu 2011-02-07 09:18:11 +00:00
Anatoly Baksheev
7b1c265563 fixed some compilation under ubuntu 2011-02-04 18:29:05 +00:00
Anatoly Baksheev
0747f2d863 1) NPP_staging as sources. Binaries removed.
2) NVidia tests for GPU
3) FD sample that uses NVidia's interface.
2011-02-04 15:15:25 +00:00
Anatoly Baksheev
1a94186195 First version of CascadeClassifier_GPU.
Only for VS2008 now.
Sample for it.
new NPP_staging for VS2008 only
2011-01-13 13:04:00 +00:00
Anatoly Baksheev
9dd4a22a5e temporary added NPP_staging, functionality from the library will be moved to NPP with next release. 2010-12-17 15:41:26 +00:00
Alexey Spizhevoy
40304721a7 added support of CV_TM_CCORR (via FFT) into gpu::matchTemplate (versions both with block and without blocks) 2010-12-08 13:03:53 +00:00
Anatoly Baksheev
652fb1212e module reorganization: added folder with pure device functions, cuda_shared.hpp renamed to internal_shared.hpp 2010-12-06 16:37:32 +00:00
Vladislav Vinogradov
8891acb67a added BruteForceMatcher_GPU 2010-12-06 12:06:51 +00:00
Anatoly Baksheev
36ebf4ef0d cuda+npp version check at configure time. 2010-11-25 10:42:09 +00:00
Anatoly Baksheev
d6686240d5 added version detection for NPP 2010-11-24 18:44:11 +00:00
Alexey Spizhevoy
13134595fd added HOGDescriptor on GPU 2010-11-15 11:01:56 +00:00
Anatoly Baksheev
7a3b0785d7 fixed gpu module build system (in case when WITH_CUDA is set, but CUDA Toolkit is not found) 2010-10-06 12:45:31 +00:00
Anatoly Baksheev
74c4b5a5a9 Added compilation with NPP to GPU module(FindNPP script). Tested only on win32, but it does not influence on OpenCV compilation if WITH_CUDA flag unset. 2010-09-12 15:17:37 +00:00
Andrey Morozov
bbc2015014 created build infrastructure for NPP linking in CMake. 2010-09-10 11:02:52 +00:00
Vladislav Vinogradov
0a73af8e22 added cvtColor on gpu (supports conversion between RGB, BGR and GRAY) 2010-08-30 13:41:26 +00:00
Andrey Morozov
199ffc632d added flags OpenCV_COMPUTE_CAPABILITIES, which stores the version compute capability from which it is compiled opencv
now use opencv with cuda in your application  in the such way : set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ${OpenCV_COMPUTE_CAPABILITIES})
2010-08-25 12:49:17 +00:00
Anatoly Baksheev
97d17d8ad1 fixed warnings
added comments in gpu.hpp
2010-08-18 17:13:01 +00:00
Anatoly Baksheev
024283ceae warning level switched to W3 fpr gpu module 2010-08-13 12:53:34 +00:00
Andrey Morozov
53057afcb8 minor fix 2010-08-12 10:59:51 +00:00
Andrey Morozov
b5e3cb0f9b minor fix 2010-08-12 08:06:17 +00:00
Andrey Morozov
c27397dba1 minor fix 2010-08-12 07:57:53 +00:00
Andrey Morozov
789b02ad76 added choise in compute capability 2010-08-11 15:52:55 +00:00
Anatoly Baksheev
22f5376e82 refactoring and minor code improvements
added cuda_shared.hpp header was reorganized in order to speed up compilation
2010-07-26 15:04:56 +00:00
Anatoly Baksheev
1135bc2495 saturate_cast_gpu.hpp 2010-07-26 08:13:23 +00:00
Anatoly Baksheev
e07d3601e7 -arch=sm_13 2010-07-22 16:06:43 +00:00
Anatoly Baksheev
3a481f93ee EHsc- warning fixed 2010-07-20 11:46:04 +00:00
Anatoly Baksheev
3a3745daac disabled W4 warnings for GPU module. 2010-07-19 17:35:39 +00:00
Anatoly Baksheev
07825bad1e compilation with no cuda re factored 2010-07-19 09:31:12 +00:00
Andrey Morozov
1d93ca00de Added files for implementation of operations SetTo() 2010-07-17 11:17:29 +00:00
Anatoly Baksheev
2c84a66ec7 added support to build without cuda. 2010-07-15 13:36:00 +00:00
Andrey Morozov
e1bd5aeadd fixed problem with building module gpu on linux 2010-07-15 12:24:06 +00:00
Anatoly Baksheev
7f6fb6ef97 First gpu code draft. Interface might be significantly changed in future.
Simple implementation of StereoBM_GPU.
It is excluded from compilation now.
2010-07-14 15:55:16 +00:00