Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
371a9cd8
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
371a9cd8
编写于
6月 18, 2013
作者:
V
Vladislav Vinogradov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed build with CUDA 5.5 on arm platforms
上级
748210e1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
12 deletion
+44
-12
cmake/OpenCVDetectCUDA.cmake
cmake/OpenCVDetectCUDA.cmake
+36
-4
modules/gpu/CMakeLists.txt
modules/gpu/CMakeLists.txt
+8
-8
未找到文件。
cmake/OpenCVDetectCUDA.cmake
浏览文件 @
371a9cd8
...
...
@@ -29,10 +29,42 @@ if(CUDA_FOUND)
if
(
${
CUDA_VERSION
}
VERSION_LESS
"5.5"
)
find_cuda_helper_libs
(
npp
)
else
()
find_cuda_helper_libs
(
nppc
)
find_cuda_helper_libs
(
nppi
)
find_cuda_helper_libs
(
npps
)
set
(
CUDA_npp_LIBRARY
${
CUDA_nppc_LIBRARY
}
${
CUDA_nppi_LIBRARY
}
${
CUDA_npps_LIBRARY
}
)
# hack for CUDA 5.5
if
(
${
CMAKE_SYSTEM_PROCESSOR
}
STREQUAL
"arm"
)
unset
(
CUDA_TOOLKIT_INCLUDE CACHE
)
unset
(
CUDA_CUDART_LIBRARY CACHE
)
unset
(
CUDA_cublas_LIBRARY CACHE
)
unset
(
CUDA_cufft_LIBRARY CACHE
)
unset
(
CUDA_npp_LIBRARY CACHE
)
if
(
SOFTFP
)
set
(
cuda_arm_path
"
${
CUDA_TOOLKIT_ROOT_DIR
}
/targets/armv7-linux-gnueabi"
)
else
()
set
(
cuda_arm_path
"
${
CUDA_TOOLKIT_ROOT_DIR
}
/targets/armv7-linux-gnueabihf"
)
endif
()
set
(
CUDA_TOOLKIT_INCLUDE
"
${
cuda_arm_path
}
/include"
CACHE PATH
"include path"
)
set
(
CUDA_INCLUDE_DIRS
${
CUDA_TOOLKIT_INCLUDE
}
)
set
(
cuda_arm_library_path
"
${
cuda_arm_path
}
/lib"
)
set
(
CUDA_CUDART_LIBRARY
"
${
cuda_arm_library_path
}
/libcudart.so"
CACHE FILEPATH
"cudart library"
)
set
(
CUDA_LIBRARIES
${
CUDA_CUDART_LIBRARY
}
)
set
(
CUDA_cublas_LIBRARY
"
${
cuda_arm_library_path
}
/libcublas.so"
CACHE FILEPATH
"cublas library"
)
set
(
CUDA_cufft_LIBRARY
"
${
cuda_arm_library_path
}
/libcufft.so"
CACHE FILEPATH
"cufft library"
)
set
(
CUDA_nppc_LIBRARY
"
${
cuda_arm_library_path
}
/libnppc.so"
CACHE FILEPATH
"nppc library"
)
set
(
CUDA_nppi_LIBRARY
"
${
cuda_arm_library_path
}
/libnppi.so"
CACHE FILEPATH
"nppi library"
)
set
(
CUDA_npps_LIBRARY
"
${
cuda_arm_library_path
}
/libnpps.so"
CACHE FILEPATH
"npps library"
)
set
(
CUDA_npp_LIBRARY
"
${
CUDA_nppc_LIBRARY
}
;
${
CUDA_nppi_LIBRARY
}
;
${
CUDA_npps_LIBRARY
}
"
CACHE STRING
"npp library"
)
else
()
unset
(
CUDA_npp_LIBRARY CACHE
)
find_cuda_helper_libs
(
nppc
)
find_cuda_helper_libs
(
nppi
)
find_cuda_helper_libs
(
npps
)
set
(
CUDA_npp_LIBRARY
"
${
CUDA_nppc_LIBRARY
}
;
${
CUDA_nppi_LIBRARY
}
;
${
CUDA_npps_LIBRARY
}
"
CACHE STRING
"npp library"
)
endif
()
endif
()
if
(
WITH_NVCUVID
)
...
...
modules/gpu/CMakeLists.txt
浏览文件 @
371a9cd8
...
...
@@ -43,6 +43,14 @@ if(HAVE_CUDA)
ocv_cuda_compile
(
cuda_objs
${
lib_cuda
}
${
ncv_cuda
}
)
set
(
cuda_link_libs
${
CUDA_LIBRARIES
}
${
CUDA_npp_LIBRARY
}
)
if
(
HAVE_CUFFT
)
set
(
cuda_link_libs
${
cuda_link_libs
}
${
CUDA_cufft_LIBRARY
}
)
endif
()
if
(
HAVE_CUBLAS
)
set
(
cuda_link_libs
${
cuda_link_libs
}
${
CUDA_cublas_LIBRARY
}
)
endif
()
if
(
WITH_NVCUVID
)
set
(
cuda_link_libs
${
cuda_link_libs
}
${
CUDA_CUDA_LIBRARY
}
${
CUDA_nvcuvid_LIBRARY
}
)
...
...
@@ -71,14 +79,6 @@ ocv_set_module_sources(
ocv_create_module
(
${
cuda_link_libs
}
)
if
(
HAVE_CUDA
)
if
(
HAVE_CUFFT
)
CUDA_ADD_CUFFT_TO_TARGET
(
${
the_module
}
)
endif
()
if
(
HAVE_CUBLAS
)
CUDA_ADD_CUBLAS_TO_TARGET
(
${
the_module
}
)
endif
()
install
(
FILES src/nvidia/NPP_staging/NPP_staging.hpp src/nvidia/core/NCV.hpp
DESTINATION
${
OPENCV_INCLUDE_INSTALL_PATH
}
/opencv2/
${
name
}
COMPONENT main
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录