Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
d4087f19
Commit
d4087f19
authored
Dec 11, 2013
by
Alexander Smorkalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
All CUDA related stuff were moved to separate dynamic library.
parent
e88253cc
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
54 additions
and
7 deletions
+54
-7
CMakeLists.txt
modules/core/CMakeLists.txt
+16
-7
CMakeLists.txt
modules/core/cuda/CMakeLists.txt
+12
-0
main.cpp
modules/core/cuda/main.cpp
+24
-0
gpumat.hpp
modules/core/include/opencv2/core/gpumat.hpp
+2
-0
gpumat.cpp
modules/core/src/gpumat.cpp
+0
-0
gpumat_cuda.hpp
modules/core/src/gpumat_cuda.hpp
+0
-0
No files found.
modules/core/CMakeLists.txt
View file @
d4087f19
set
(
the_description
"The Core Functionality"
)
ocv_add_module
(
core PRIVATE_REQUIRED
${
ZLIB_LIBRARIES
}
)
ocv_module_include_directories
(
${
ZLIB_INCLUDE_DIR
}
)
if
(
HAVE_WINRT
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/ZW /GS /Gm- /AI
\"
${
WINDOWS_SDK_PATH
}
/References/CommonConfiguration/Neutral
\"
/AI
\"
${
VISUAL_STUDIO_PATH
}
/vcpackages
\"
"
)
endif
()
if
(
HAVE_CUDA
)
ocv_include_directories
(
"
${
OpenCV_SOURCE_DIR
}
/modules/gpu/include"
)
ocv_warnings_disable
(
CMAKE_CXX_FLAGS -Wundef
)
endif
()
file
(
GLOB lib_cuda_hdrs
"include/opencv2/
${
name
}
/cuda/*.hpp"
"include/opencv2/
${
name
}
/cuda/*.h"
)
file
(
GLOB lib_cuda_hdrs_detail
"include/opencv2/
${
name
}
/cuda/detail/*.hpp"
"include/opencv2/
${
name
}
/cuda/detail/*.h"
)
source_group
(
"Cuda Headers"
FILES
${
lib_cuda_hdrs
}
)
source_group
(
"Cuda Headers
\\
Detail"
FILES
${
lib_cuda_hdrs_detail
}
)
if
(
DYNAMIC_CUDA_SUPPORT
)
add_definitions
(
-DDYNAMIC_CUDA_SUPPORT
)
endif
()
ocv_add_module
(
core PRIVATE_REQUIRED
${
ZLIB_LIBRARIES
}
)
ocv_module_include_directories
(
${
ZLIB_INCLUDE_DIR
}
)
if
(
HAVE_CUDA
)
ocv_include_directories
(
"
${
OpenCV_SOURCE_DIR
}
/modules/gpu/include"
)
ocv_warnings_disable
(
CMAKE_CXX_FLAGS -Wundef
)
endif
()
ocv_glob_module_sources
(
SOURCES
"
${
opencv_core_BINARY_DIR
}
/version_string.inc"
HEADERS
${
lib_cuda_hdrs
}
${
lib_cuda_hdrs_detail
}
)
...
...
@@ -25,3 +30,7 @@ ocv_add_precompiled_headers(${the_module})
ocv_add_accuracy_tests
()
ocv_add_perf_tests
()
if
(
DYNAMIC_CUDA_SUPPORT
)
add_subdirectory
(
cuda
)
endif
()
modules/core/cuda/CMakeLists.txt
0 → 100644
View file @
d4087f19
project
(
opencv_core_cuda
)
set
(
HAVE_CUDA FALSE
)
add_definitions
(
"-DHAVE_CUDA"
)
include_directories
(
${
CUDA_INCLUDE_DIRS
}
"../src/"
"../include/opencv2/core/"
"
${
OpenCV_SOURCE_DIR
}
/modules/gpu/include"
)
ocv_warnings_disable
(
CMAKE_CXX_FLAGS -Wundef
)
cuda_add_library
(
opencv_core_cuda SHARED main.cpp ../src/cuda/matrix_operations.cu
)
target_link_libraries
(
opencv_core_cuda
${
CUDA_LIBRARIES
}
)
\ No newline at end of file
modules/core/cuda/main.cpp
0 → 100644
View file @
d4087f19
#include "opencv2/core/core.hpp"
#include "opencv2/core/gpumat.hpp"
#ifdef HAVE_CUDA
#include <cuda_runtime.h>
#include <npp.h>
#define CUDART_MINIMUM_REQUIRED_VERSION 4020
#define NPP_MINIMUM_REQUIRED_VERSION 4200
#if (CUDART_VERSION < CUDART_MINIMUM_REQUIRED_VERSION)
#error "Insufficient Cuda Runtime library version, please update it."
#endif
#if (NPP_VERSION_MAJOR * 1000 + NPP_VERSION_MINOR * 100 + NPP_VERSION_BUILD < NPP_MINIMUM_REQUIRED_VERSION)
#error "Insufficient NPP version, please update it."
#endif
#endif
using
namespace
cv
;
using
namespace
cv
::
gpu
;
#include "gpumat_cuda.hpp"
\ No newline at end of file
modules/core/include/opencv2/core/gpumat.hpp
View file @
d4087f19
...
...
@@ -48,6 +48,8 @@
#include "opencv2/core/core.hpp"
#include "opencv2/core/cuda_devptrs.hpp"
#define throw_nogpu CV_Error(CV_GpuNotSupported, "The library is compiled without CUDA support")
namespace
cv
{
namespace
gpu
{
//////////////////////////////// Initialization & Info ////////////////////////
...
...
modules/core/src/gpumat.cpp
View file @
d4087f19
This diff is collapsed.
Click to expand it.
modules/core/src/gpumat_cuda.hpp
0 → 100644
View file @
d4087f19
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment