Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sq975
openpose
提交
20c9e23f
O
openpose
项目概览
sq975
/
openpose
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openpose
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
20c9e23f
编写于
5月 28, 2018
作者:
G
Gines
提交者:
GitHub
5月 28, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cpu in Windows non-nvidia machines (#620)
上级
50ce91e2
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
61 addition
and
25 deletion
+61
-25
.gitignore
.gitignore
+1
-0
CMakeLists.txt
CMakeLists.txt
+31
-18
cmake/OpenPose_CPU.vcxproj.user
cmake/OpenPose_CPU.vcxproj.user
+16
-0
examples/openpose/CMakeLists.txt
examples/openpose/CMakeLists.txt
+1
-1
examples/tests/CMakeLists.txt
examples/tests/CMakeLists.txt
+1
-1
examples/tutorial_add_module/CMakeLists.txt
examples/tutorial_add_module/CMakeLists.txt
+1
-1
examples/tutorial_pose/CMakeLists.txt
examples/tutorial_pose/CMakeLists.txt
+1
-1
examples/tutorial_thread/CMakeLists.txt
examples/tutorial_thread/CMakeLists.txt
+1
-1
examples/tutorial_wrapper/CMakeLists.txt
examples/tutorial_wrapper/CMakeLists.txt
+1
-1
src/openpose/net/netCaffe.cpp
src/openpose/net/netCaffe.cpp
+7
-1
未找到文件。
.gitignore
浏览文件 @
20c9e23f
...
...
@@ -102,6 +102,7 @@ distribute/
3rdparty/caffe/.github
3rdparty/eigen/
3rdparty/windows/caffe/
3rdparty/windows/caffe_cpu/
3rdparty/windows/caffe_opencl/
3rdparty/windows/caffe3rdparty/
3rdparty/windows/opencv/
...
...
CMakeLists.txt
浏览文件 @
20c9e23f
...
...
@@ -301,7 +301,7 @@ if (UNIX AND NOT APPLE)
elseif
(
OpenCV_INCLUDE_DIRS AND OpenCV_LIBS_DIR
)
file
(
GLOB_RECURSE OpenCV_LIBS
"
${
OpenCV_LIBS_DIR
}
*.so"
)
set
(
OpenCV_FOUND 1
)
else
()
else
(
OpenCV_CONFIG_FILE
)
find_package
(
OpenCV
)
endif
(
OpenCV_CONFIG_FILE
)
...
...
@@ -386,6 +386,8 @@ if (WIN32)
download_zip
(
"caffe3rdparty_2018_02_13.zip"
${
OP_WIN_URL
}
${
FIND_LIB_PREFIX
}
6653E07E3D2D7226D64FAD2DF0B407FB
)
if
(
${
GPU_MODE
}
MATCHES
"OPENCL"
)
download_zip
(
"caffe_opencl_2018_02_13.zip"
${
OP_WIN_URL
}
${
FIND_LIB_PREFIX
}
3ac3e1acf5ee6a4e57920be73053067a
)
elseif
(
${
GPU_MODE
}
MATCHES
"CPU_ONLY"
)
download_zip
(
"caffe_cpu_2018_05_27.zip"
${
OP_WIN_URL
}
${
FIND_LIB_PREFIX
}
87E8401B6DFBAC5B8E909DD20E3B3390
)
else
(
${
GPU_MODE
}
MATCHES
"OPENCL"
)
download_zip
(
"caffe_2018_01_18.zip"
${
OP_WIN_URL
}
${
FIND_LIB_PREFIX
}
4b8e548cc7ea20abea472950dd5301bd
)
endif
(
${
GPU_MODE
}
MATCHES
"OPENCL"
)
...
...
@@ -401,22 +403,30 @@ if (WIN32)
find_library
(
GLOG_LIBRARY_DEBUG glogd HINTS
${
FIND_LIB_PREFIX
}
/caffe3rdparty/lib
)
find_library
(
OpenCV_LIBS opencv_world310 HINTS
${
FIND_LIB_PREFIX
}
/opencv/x64/vc14/lib
)
if
(
${
GPU_MODE
}
MATCHES
"OPENCL"
)
SET
(
CAFFE_CL_CHECKED True CACHE BOOL
""
)
# If OpenPose builds it
if
(
BUILD_CAFFE
)
unset
(
Caffe_INCLUDE_DIRS CACHE
)
unset
(
Caffe_LIB CACHE
)
unset
(
Caffe_Proto_LIB CACHE
)
set
(
CL
"_CL"
)
endif
(
BUILD_CAFFE
)
# OpenCL
if
(
${
GPU_MODE
}
MATCHES
"OPENCL"
)
set
(
VCXPROJ_FILE_GPU_MODE
"_CL"
)
find_library
(
Caffe_LIB caffe HINTS
${
FIND_LIB_PREFIX
}
/caffe_opencl/lib
)
find_library
(
Caffe_Proto_LIB caffeproto HINTS
${
FIND_LIB_PREFIX
}
/caffe_opencl/lib
)
# CPU & CUDA
else
(
${
GPU_MODE
}
MATCHES
"OPENCL"
)
if
(
CAFFE_CL_CHECKED
)
unset
(
Caffe_LIB CACHE
)
unset
(
Caffe_Proto_LIB CACHE
)
endif
(
CAFFE_CL_CHECKED
)
set
(
CAFFE_CL_CHECKED 0
)
set
(
CL
""
)
find_library
(
Caffe_LIB caffe HINTS
${
FIND_LIB_PREFIX
}
/caffe/lib
)
find_library
(
Caffe_Proto_LIB caffeproto HINTS
${
FIND_LIB_PREFIX
}
/caffe/lib
)
# CPU
if
(
${
GPU_MODE
}
MATCHES
"CPU_ONLY"
)
set
(
VCXPROJ_FILE_GPU_MODE
"_CPU"
)
find_library
(
Caffe_LIB caffe HINTS
${
FIND_LIB_PREFIX
}
/caffe_cpu/lib
)
find_library
(
Caffe_Proto_LIB caffeproto HINTS
${
FIND_LIB_PREFIX
}
/caffe_cpu/lib
)
# CUDA
else
(
${
GPU_MODE
}
MATCHES
"CPU_ONLY"
)
set
(
VCXPROJ_FILE_GPU_MODE
""
)
find_library
(
Caffe_LIB caffe HINTS
${
FIND_LIB_PREFIX
}
/caffe/lib
)
find_library
(
Caffe_Proto_LIB caffeproto HINTS
${
FIND_LIB_PREFIX
}
/caffe/lib
)
endif
(
${
GPU_MODE
}
MATCHES
"CPU_ONLY"
)
endif
(
${
GPU_MODE
}
MATCHES
"OPENCL"
)
if
(
${
GPU_MODE
}
MATCHES
"OPENCL"
)
...
...
@@ -435,16 +445,19 @@ if (WIN32)
endif
(
WITH_FLIR_CAMERA
)
set
(
Caffe_LIBS
${
Caffe_LIB
}
;
${
Caffe_Proto_LIB
}
)
set
(
OpenCV_INCLUDE_DIRS
"3rdparty/windows/opencv/include"
)
# OpenCL
if
(
${
GPU_MODE
}
MATCHES
"OPENCL"
)
SET
(
CAFFE_CL_CHECKED2 True CACHE BOOL
""
)
unset
(
Caffe_INCLUDE_DIRS CACHE
)
set
(
Caffe_INCLUDE_DIRS
"3rdparty/windows/caffe_opencl/include;3rdparty/windows/caffe_opencl/include2"
CACHE FILEPATH
"Caffe_INCLUDE_DIRS"
)
# CUDA and CPU
else
(
${
GPU_MODE
}
MATCHES
"OPENCL"
)
if
(
CAFFE_CL_CHECKED2
)
unset
(
Caffe_INCLUDE_DIRS CACHE
)
endif
(
CAFFE_CL_CHECKED2
)
set
(
CAFFE_CL_CHECKED2 0
)
set
(
Caffe_INCLUDE_DIRS
"3rdparty/windows/caffe/include;3rdparty/windows/caffe/include2"
CACHE FILEPATH
"Caffe_INCLUDE_DIRS"
)
# CPU
if
(
${
GPU_MODE
}
MATCHES
"CPU_ONLY"
)
set
(
Caffe_INCLUDE_DIRS
"3rdparty/windows/caffe_cpu/include;3rdparty/windows/caffe_cpu/include2"
CACHE FILEPATH
"Caffe_INCLUDE_DIRS"
)
# CUDA
else
(
${
GPU_MODE
}
MATCHES
"CPU_ONLY"
)
set
(
Caffe_INCLUDE_DIRS
"3rdparty/windows/caffe/include;3rdparty/windows/caffe/include2"
CACHE FILEPATH
"Caffe_INCLUDE_DIRS"
)
endif
(
${
GPU_MODE
}
MATCHES
"CPU_ONLY"
)
endif
(
${
GPU_MODE
}
MATCHES
"OPENCL"
)
set
(
Boost_INCLUDE_DIRS
"3rdparty/windows/caffe3rdparty/include/boost-1_61"
)
set
(
WINDOWS_INCLUDE_DIRS
"3rdparty/windows/caffe3rdparty/include"
)
...
...
cmake/OpenPose_CPU.vcxproj.user
0 → 100644
浏览文件 @
20c9e23f
<?xml version="1.0" encoding="utf-8"?>
<Project
ToolsVersion=
"14.0"
xmlns=
"http://schemas.microsoft.com/developer/msbuild/2003"
>
<PropertyGroup
Condition=
"'$(Configuration)|$(Platform)'=='Release|x64'"
>
<LocalDebuggerEnvironment>
PATH=%PATH%;3rdparty\windows\caffe_cpu\bin\;3rdparty\windows\opencv\x64\vc14\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\
</LocalDebuggerEnvironment>
<DebuggerFlavor>
WindowsLocalDebugger
</DebuggerFlavor>
<LocalDebuggerWorkingDirectory>
..\..\..
</LocalDebuggerWorkingDirectory>
</PropertyGroup>
<PropertyGroup
Condition=
"'$(Configuration)|$(Platform)'=='Debug|x64'"
>
<LocalDebuggerEnvironment>
PATH=%PATH%;3rdparty\windows\caffe_cpu\bin\;3rdparty\windows\opencv\x64\vc14\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\
</LocalDebuggerEnvironment>
<DebuggerFlavor>
WindowsLocalDebugger
</DebuggerFlavor>
<LocalDebuggerWorkingDirectory>
..\..\..
</LocalDebuggerWorkingDirectory>
</PropertyGroup>
</Project>
\ No newline at end of file
examples/openpose/CMakeLists.txt
浏览文件 @
20c9e23f
...
...
@@ -17,7 +17,7 @@ foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
if
(
WIN32
)
set_property
(
TARGET
${
EXE_NAME
}
PROPERTY FOLDER
"Examples"
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/OpenPose
${
CL
}
.vcxproj.user
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/OpenPose
${
VCXPROJ_FILE_GPU_MODE
}
.vcxproj.user
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
EXE_NAME
}
.vcxproj.user @ONLY
)
# Properties->General->Output Directory
set_property
(
TARGET
${
EXE_NAME
}
PROPERTY RUNTIME_OUTPUT_DIRECTORY_RELEASE
${
PROJECT_BINARY_DIR
}
/$
(
Platform
)
/$
(
Configuration
))
...
...
examples/tests/CMakeLists.txt
浏览文件 @
20c9e23f
...
...
@@ -18,7 +18,7 @@ foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
if
(
WIN32
)
set_property
(
TARGET
${
EXE_NAME
}
PROPERTY FOLDER
"Examples/Tutorial/Tests"
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/OpenPose
${
CL
}
.vcxproj.user
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/OpenPose
${
VCXPROJ_FILE_GPU_MODE
}
.vcxproj.user
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
EXE_NAME
}
.vcxproj.user @ONLY
)
# Properties->General->Output Directory
set_property
(
TARGET
${
EXE_NAME
}
PROPERTY RUNTIME_OUTPUT_DIRECTORY_RELEASE
${
PROJECT_BINARY_DIR
}
/$
(
Platform
)
/$
(
Configuration
))
...
...
examples/tutorial_add_module/CMakeLists.txt
浏览文件 @
20c9e23f
...
...
@@ -19,7 +19,7 @@ foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
if
(
WIN32
)
set_property
(
TARGET
${
EXE_NAME
}
PROPERTY FOLDER
"Examples/Tutorial/AddModule"
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/OpenPose
${
CL
}
.vcxproj.user
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/OpenPose
${
VCXPROJ_FILE_GPU_MODE
}
.vcxproj.user
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
EXE_NAME
}
.vcxproj.user @ONLY
)
# Properties->General->Output Directory
set_property
(
TARGET
${
EXE_NAME
}
PROPERTY RUNTIME_OUTPUT_DIRECTORY_RELEASE
${
PROJECT_BINARY_DIR
}
/$
(
Platform
)
/$
(
Configuration
))
...
...
examples/tutorial_pose/CMakeLists.txt
浏览文件 @
20c9e23f
...
...
@@ -18,7 +18,7 @@ foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
if
(
WIN32
)
set_property
(
TARGET
${
EXE_NAME
}
PROPERTY FOLDER
"Examples/Tutorial/Pose"
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/OpenPose
${
CL
}
.vcxproj.user
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/OpenPose
${
VCXPROJ_FILE_GPU_MODE
}
.vcxproj.user
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
EXE_NAME
}
.vcxproj.user @ONLY
)
# Properties->General->Output Directory
set_property
(
TARGET
${
EXE_NAME
}
PROPERTY RUNTIME_OUTPUT_DIRECTORY_RELEASE
${
PROJECT_BINARY_DIR
}
/$
(
Platform
)
/$
(
Configuration
))
...
...
examples/tutorial_thread/CMakeLists.txt
浏览文件 @
20c9e23f
...
...
@@ -20,7 +20,7 @@ foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
if
(
WIN32
)
set_property
(
TARGET
${
EXE_NAME
}
PROPERTY FOLDER
"Examples/Tutorial/Thread"
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/OpenPose
${
CL
}
.vcxproj.user
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/OpenPose
${
VCXPROJ_FILE_GPU_MODE
}
.vcxproj.user
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
EXE_NAME
}
.vcxproj.user @ONLY
)
# Properties->General->Output Directory
set_property
(
TARGET
${
EXE_NAME
}
PROPERTY RUNTIME_OUTPUT_DIRECTORY_RELEASE
${
PROJECT_BINARY_DIR
}
/$
(
Platform
)
/$
(
Configuration
))
...
...
examples/tutorial_wrapper/CMakeLists.txt
浏览文件 @
20c9e23f
...
...
@@ -24,7 +24,7 @@ foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
if
(
WIN32
)
set_property
(
TARGET
${
EXE_NAME
}
PROPERTY FOLDER
"Examples/Tutorial/Wrapper"
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/OpenPose
${
CL
}
.vcxproj.user
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/OpenPose
${
VCXPROJ_FILE_GPU_MODE
}
.vcxproj.user
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
EXE_NAME
}
.vcxproj.user @ONLY
)
# Properties->General->Output Directory
set_property
(
TARGET
${
EXE_NAME
}
PROPERTY RUNTIME_OUTPUT_DIRECTORY_RELEASE
${
PROJECT_BINARY_DIR
}
/$
(
Platform
)
/$
(
Configuration
))
...
...
src/openpose/net/netCaffe.cpp
浏览文件 @
20c9e23f
...
...
@@ -149,10 +149,16 @@ namespace op
#ifdef USE_CUDA
caffe
::
Caffe
::
set_mode
(
caffe
::
Caffe
::
GPU
);
caffe
::
Caffe
::
SetDevice
(
upImpl
->
mGpuId
);
upImpl
->
upCaffeNet
.
reset
(
new
caffe
::
Net
<
float
>
{
upImpl
->
mCaffeProto
,
caffe
::
TEST
});
#else
caffe
::
Caffe
::
set_mode
(
caffe
::
Caffe
::
CPU
);
#ifdef _WIN32
upImpl
->
upCaffeNet
.
reset
(
new
caffe
::
Net
<
float
>
{
upImpl
->
mCaffeProto
,
caffe
::
TEST
,
caffe
::
Caffe
::
GetCPUDevice
()});
#else
upImpl
->
upCaffeNet
.
reset
(
new
caffe
::
Net
<
float
>
{
upImpl
->
mCaffeProto
,
caffe
::
TEST
});
#endif
#endif
upImpl
->
upCaffeNet
.
reset
(
new
caffe
::
Net
<
float
>
{
upImpl
->
mCaffeProto
,
caffe
::
TEST
});
upImpl
->
upCaffeNet
->
CopyTrainedLayersFrom
(
upImpl
->
mCaffeTrainedModel
);
#ifdef USE_CUDA
cudaCheck
(
__LINE__
,
__FUNCTION__
,
__FILE__
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录