Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
13a6d0b9
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
13a6d0b9
编写于
1月 27, 2011
作者:
A
Alexey Spizhevoy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed parsing GPU archs in BIN(PTX) format
上级
d70d2edc
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
24 addition
and
14 deletion
+24
-14
CMakeLists.txt
CMakeLists.txt
+14
-4
cvconfig.h.cmake
cvconfig.h.cmake
+4
-4
modules/gpu/src/initialization.cpp
modules/gpu/src/initialization.cpp
+5
-5
modules/gpu/src/precomp.hpp
modules/gpu/src/precomp.hpp
+1
-1
未找到文件。
CMakeLists.txt
浏览文件 @
13a6d0b9
...
...
@@ -712,24 +712,32 @@ if(WITH_CUDA)
set
(
CUDA_ARCH_PTX
"1.1 1.3"
CACHE STRING
"Specify 'virtual' PTX architectures to build PTX intermediate code for"
)
# These variables are used in config templates
string
(
REGEX REPLACE
"
\\
."
""
ARCH_
GPU
_NO_POINTS
"
${
CUDA_ARCH_BIN
}
"
)
string
(
REGEX REPLACE
"
\\
."
""
ARCH_
BIN
_NO_POINTS
"
${
CUDA_ARCH_BIN
}
"
)
string
(
REGEX REPLACE
"
\\
."
""
ARCH_PTX_NO_POINTS
"
${
CUDA_ARCH_PTX
}
"
)
# Ckeck if user specified 1.0 compute capability
string
(
REGEX MATCH
"1.0"
HAS_ARCH_10
"
${
CUDA_ARCH_BIN
}
${
CUDA_ARCH_PTX
}
"
)
set
(
CUDA_ARCH_BIN_OR_PTX_10 0
)
if
(
NOT
${
HAS_ARCH_10
}
STREQUAL
""
)
set
(
OPENCV_ARCH_GPU
_OR_PTX_10 1
)
set
(
CUDA_ARCH_BIN
_OR_PTX_10 1
)
endif
()
# Flags to be set
set
(
NVCC_FLAGS_EXTRA
""
)
# These variables are passed into the template
set
(
OPENCV_CUDA_ARCH_BIN
""
)
set
(
OPENCV_CUDA_ARCH_PTX
""
)
# Tell nvcc to add binaries for the specified GPUs
string
(
REGEX MATCHALL
"[0-9()]+"
ARCH_LIST
"
${
ARCH_
GPU
_NO_POINTS
}
"
)
string
(
REGEX MATCHALL
"[0-9()]+"
ARCH_LIST
"
${
ARCH_
BIN
_NO_POINTS
}
"
)
foreach
(
ARCH IN LISTS ARCH_LIST
)
if
(
ARCH MATCHES
"([0-9]+)
\\
(([0-9]+)
\\
)"
)
set
(
NVCC_FLAGS_EXTRA
${
NVCC_FLAGS_EXTRA
}
-gencode arch=compute_
${
CMAKE_MATCH_2
}
,code=sm_
${
CMAKE_MATCH_1
}
)
set
(
OPENCV_CUDA_ARCH_BIN
"
${
OPENCV_CUDA_ARCH_BIN
}
${
CMAKE_MATCH_1
}
"
)
else
()
set
(
NVCC_FLAGS_EXTRA
${
NVCC_FLAGS_EXTRA
}
-gencode arch=compute_
${
ARCH
}
,code=sm_
${
ARCH
}
)
set
(
OPENCV_CUDA_ARCH_BIN
"
${
OPENCV_CUDA_ARCH_BIN
}
${
ARCH
}
"
)
endif
()
endforeach
()
...
...
@@ -737,8 +745,10 @@ if(WITH_CUDA)
string
(
REGEX MATCHALL
"[0-9]+"
ARCH_LIST
"
${
ARCH_PTX_NO_POINTS
}
"
)
foreach
(
ARCH IN LISTS ARCH_LIST
)
set
(
NVCC_FLAGS_EXTRA
${
NVCC_FLAGS_EXTRA
}
-gencode arch=compute_
${
ARCH
}
,code=compute_
${
ARCH
}
)
set
(
OPENCV_CUDA_ARCH_PTX
"
${
OPENCV_CUDA_ARCH_PTX
}
${
ARCH
}
"
)
endforeach
()
# Wil; be processed in other scripts
set
(
CUDA_NVCC_FLAGS
${
CUDA_NVCC_FLAGS
}
${
NVCC_FLAGS_EXTRA
}
)
set
(
OpenCV_CUDA_CC
"
${
NVCC_FLAGS_EXTRA
}
"
)
...
...
cvconfig.h.cmake
浏览文件 @
13a6d0b9
...
...
@@ -167,13 +167,13 @@
#cmakedefine HAVE_CUDA
/* Compile for 'real' NVIDIA GPU architectures */
#define
OPENCV_ARCH_GPU "${ARCH_GPU_NO_POINTS
}"
#define
CUDA_ARCH_BIN "${OPENCV_CUDA_ARCH_BIN
}"
/* Compile for 'virtual' NVIDIA PTX architectures */
#define
OPENCV_ARCH_PTX "${ARCH_PTX_NO_POINTS
}"
#define
CUDA_ARCH_PTX "${OPENCV_CUDA_ARCH_PTX
}"
/* Create PTX or
CU
BIN for 1.0 compute capability */
#cmakedefine
OPENCV_ARCH_GPU
_OR_PTX_10
/* Create PTX or BIN for 1.0 compute capability */
#cmakedefine
CUDA_ARCH_BIN
_OR_PTX_10
/* VideoInput library */
#cmakedefine HAVE_VIDEOINPUT
...
...
modules/gpu/src/initialization.cpp
浏览文件 @
13a6d0b9
...
...
@@ -164,33 +164,33 @@ namespace
CV_EXPORTS
bool
cv
::
gpu
::
hasPtxVersion
(
int
major
,
int
minor
)
{
return
::
compare
(
OPENCV
_ARCH_PTX
,
major
*
10
+
minor
,
std
::
equal_to
<
int
>
());
return
::
compare
(
CUDA
_ARCH_PTX
,
major
*
10
+
minor
,
std
::
equal_to
<
int
>
());
}
CV_EXPORTS
bool
cv
::
gpu
::
hasLessOrEqualPtxVersion
(
int
major
,
int
minor
)
{
return
::
compare
(
OPENCV
_ARCH_PTX
,
major
*
10
+
minor
,
return
::
compare
(
CUDA
_ARCH_PTX
,
major
*
10
+
minor
,
std
::
less_equal
<
int
>
());
}
CV_EXPORTS
bool
cv
::
gpu
::
hasGreaterOrEqualPtxVersion
(
int
major
,
int
minor
)
{
return
::
compare
(
OPENCV
_ARCH_PTX
,
major
*
10
+
minor
,
return
::
compare
(
CUDA
_ARCH_PTX
,
major
*
10
+
minor
,
std
::
greater_equal
<
int
>
());
}
CV_EXPORTS
bool
cv
::
gpu
::
hasCubinVersion
(
int
major
,
int
minor
)
{
return
::
compare
(
OPENCV_ARCH_GPU
,
major
*
10
+
minor
,
std
::
equal_to
<
int
>
());
return
::
compare
(
CUDA_ARCH_BIN
,
major
*
10
+
minor
,
std
::
equal_to
<
int
>
());
}
CV_EXPORTS
bool
cv
::
gpu
::
hasGreaterOrEqualCubinVersion
(
int
major
,
int
minor
)
{
return
::
compare
(
OPENCV_ARCH_GPU
,
major
*
10
+
minor
,
return
::
compare
(
CUDA_ARCH_BIN
,
major
*
10
+
minor
,
std
::
greater_equal
<
int
>
());
}
...
...
modules/gpu/src/precomp.hpp
浏览文件 @
13a6d0b9
...
...
@@ -85,7 +85,7 @@
#error "Insufficient NPP version, please update it."
#endif
#if defined(
OPENCV_ARCH_GPU
_OR_PTX_10)
#if defined(
CUDA_ARCH_BIN
_OR_PTX_10)
#error "OpenCV GPU module doesn't support NVIDIA compute capability 1.0"
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录