Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
7d350280
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,发现更多精彩内容 >>
提交
7d350280
编写于
5月 18, 2011
作者:
A
Alexey Spizhevoy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
compilation under mac
上级
8a47b3d5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
8 deletion
+19
-8
modules/gpu/CMakeLists.txt
modules/gpu/CMakeLists.txt
+10
-6
modules/gpu/src/nvidia/core/NCV.cu
modules/gpu/src/nvidia/core/NCV.cu
+1
-1
modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp
modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp
+8
-1
未找到文件。
modules/gpu/CMakeLists.txt
浏览文件 @
7d350280
...
...
@@ -35,12 +35,12 @@ if (HAVE_CUDA)
endif
()
if
(
HAVE_CUDA
)
get_filename_component
(
_path_to_findnpp
"
${
CMAKE_CURRENT_LIST_FILE
}
"
PATH
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
_path_to_findnpp
}
)
find_package
(
NPP 3.2.16 REQUIRED
)
message
(
STATUS
"NPP detected: "
${
NPP_VERSION
}
)
#
get_filename_component(_path_to_findnpp "${CMAKE_CURRENT_LIST_FILE}" PATH)
#
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_path_to_findnpp})
#
find_package(NPP 3.2.16 REQUIRED)
#
message(STATUS "NPP detected: " ${NPP_VERSION})
include_directories
(
${
CUDA_INCLUDE_DIRS
}
${
CUDA_NPP_INCLUDES
}
)
include_directories
(
${
CUDA_INCLUDE_DIRS
}
)
if
(
UNIX OR APPLE
)
set
(
CUDA_NVCC_FLAGS
${
CUDA_NVCC_FLAGS
}
"-Xcompiler;-fPIC;"
)
...
...
@@ -128,8 +128,12 @@ set_target_properties(${the_target} PROPERTIES
target_link_libraries
(
${
the_target
}
${
OPENCV_LINKER_LIBS
}
${
IPP_LIBS
}
${
DEPS
}
)
if
(
HAVE_CUDA
)
target_link_libraries
(
${
the_target
}
${
CUDA_LIBRARIES
}
${
CUDA_NPP_LIBRARIES
}
)
target_link_libraries
(
${
the_target
}
${
CUDA_LIBRARIES
}
)
CUDA_ADD_CUFFT_TO_TARGET
(
${
the_target
}
)
unset
(
CUDA_npp_LIBRARY CACHE
)
find_cuda_helper_libs
(
npp
)
target_link_libraries
(
${
the_target
}
${
CUDA_npp_LIBRARY
}
)
endif
()
if
(
MSVC
)
...
...
modules/gpu/src/nvidia/core/NCV.cu
浏览文件 @
7d350280
...
...
@@ -575,7 +575,7 @@ typedef struct _NcvTimeMoment NcvTimeMoment;
return
1000.0
*
2
*
((
t2
->
moment
)
-
(
t1
->
moment
))
/
(
t1
->
freq
+
t2
->
freq
);
}
#elif defined(__
unix__)
#elif defined(__
GNUC__)
#include <sys/time.h>
...
...
modules/gpu/test/nvidia/TestHaarCascadeApplication.cpp
浏览文件 @
7d350280
...
...
@@ -11,7 +11,7 @@
#include <float.h>
#if defined(__GNUC__)
#if defined(__GNUC__)
&& !defined(__APPLE__)
#include <fpu_control.h>
#endif
...
...
@@ -48,6 +48,9 @@ bool TestHaarCascadeApplication::init()
bool
TestHaarCascadeApplication
::
process
()
{
#if defined(__APPLE)
return
true
;
#endif
NCVStatus
ncvStat
;
bool
rcode
=
false
;
...
...
@@ -200,6 +203,8 @@ bool TestHaarCascadeApplication::process()
}
ncvAssertReturn
(
cudaSuccess
==
cudaStreamSynchronize
(
0
),
false
);
#if !defined(__APPLE__)
#if defined(__GNUC__)
//http://www.christian-seiler.de/projekte/fpmath/
...
...
@@ -229,6 +234,8 @@ bool TestHaarCascadeApplication::process()
searchRoiU
,
1
,
1.0
f
);
ncvAssertReturn
(
ncvStat
==
NCV_SUCCESS
,
false
);
_controlfp_s
(
&
fpu_cw
,
fpu_oldcw
,
_MCW_PC
);
#endif
#endif
NCV_SKIP_COND_END
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录