Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
活在明天
openpose
提交
9f891d04
O
openpose
项目概览
活在明天
/
openpose
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,体验更适合开发者的 AI 搜索 >>
提交
9f891d04
编写于
2月 11, 2019
作者:
R
Raaj
提交者:
Gines
2月 11, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Mac 10.14 support for OpenCL (#1083)
上级
ea9bfe01
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
47 addition
and
7 deletion
+47
-7
CMakeLists.txt
CMakeLists.txt
+1
-1
doc/installation.md
doc/installation.md
+3
-0
scripts/osx/mac_opencl_patch.txt
scripts/osx/mac_opencl_patch.txt
+37
-0
src/openpose/core/arrayCpuGpu.cpp
src/openpose/core/arrayCpuGpu.cpp
+6
-6
未找到文件。
CMakeLists.txt
浏览文件 @
9f891d04
...
...
@@ -690,7 +690,7 @@ if (UNIX OR APPLE)
set
(
CAFFE_CPU_ONLY ON
)
set
(
USE_CUDNN OFF
)
elseif
(
${
GPU_MODE
}
MATCHES
"OPENCL"
)
execute_process
(
COMMAND git checkout
opencl
WORKING_DIRECTORY
${
CMAKE_SOURCE_DIR
}
/3rdparty/caffe
)
execute_process
(
COMMAND git checkout
fe2a1102
WORKING_DIRECTORY
${
CMAKE_SOURCE_DIR
}
/3rdparty/caffe
)
set
(
USE_CUDNN OFF
)
endif
(
${
GPU_MODE
}
MATCHES
"CUDA"
)
...
...
doc/installation.md
浏览文件 @
9f891d04
...
...
@@ -350,6 +350,9 @@ Also as a side note, if the default installation fails (i.e., the one explained
3.
`Caffe_LIBS`
set to
`/usr/local/lib/libcaffe.dylib`
.
4.
Run
`Configure`
and
`Generate`
from CMake GUI.
You may also have to apply the following patch if you have the latest OSX 10.14. It can be done as follows:
`cd 3rdparty/caffe; git apply ../../scripts/osx/mac_opencl_patch.txt`
#### 3D Reconstruction Module
...
...
scripts/osx/mac_opencl_patch.txt
0 → 100644
浏览文件 @
9f891d04
diff --git a/cmake/Modules/FindvecLib.cmake b/cmake/Modules/FindvecLib.cmake
index 7459f623..9c5ee818 100644
--- a/cmake/Modules/FindvecLib.cmake
+++ b/cmake/Modules/FindvecLib.cmake
@@ -12,13 +12,17 @@ endif()
set(__veclib_include_suffix "Frameworks/vecLib.framework/Versions/Current/Headers")
-find_path(vecLib_INCLUDE_DIR vecLibTypes.h
+exec_program(xcode-select ARGS -print-path OUTPUT_VARIABLE CMAKE_XCODE_DEVELOPER_DIR)
+find_path(vecLib_INCLUDE_DIR vecLib.h
DOC "vecLib include directory"
PATHS /System/Library/Frameworks/Accelerate.framework/Versions/Current/${__veclib_include_suffix}
/System/Library/${__veclib_include_suffix}
- /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Headers/
+ ${CMAKE_XCODE_DEVELOPER_DIR}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Headers/
NO_DEFAULT_PATH)
+
+set(vecLib_INCLUDE_DIR "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/Headers/")
+
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(vecLib DEFAULT_MSG vecLib_INCLUDE_DIR)
diff --git a/src/caffe/layers/malis_loss_layer.cpp b/src/caffe/layers/malis_loss_layer.cpp
index dae3c7d1..68e8323a 100644
--- a/src/caffe/layers/malis_loss_layer.cpp
+++ b/src/caffe/layers/malis_loss_layer.cpp
@@ -1,6 +1,6 @@
#include <boost/pending/disjoint_sets.hpp>
-#include <opencv2/highgui/highgui.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
+//#include <opencv2/highgui/highgui.hpp>
+//#include <opencv2/imgproc/imgproc.hpp>
#include <algorithm>
#include <cfloat>
src/openpose/core/arrayCpuGpu.cpp
浏览文件 @
9f891d04
...
...
@@ -583,7 +583,7 @@ namespace op
{
try
{
#if defined(USE_CAFFE) &&
defined(USE_CUDA
)
#if defined(USE_CAFFE) &&
(defined(USE_CUDA) || defined(USE_OPENCL)
)
return
spImpl
->
pCaffeBlobT
->
gpu_shape
();
#else
error
(
"Required `USE_CAFFE` and `USE_CUDA` flags enabled."
,
__LINE__
,
__FUNCTION__
,
__FILE__
);
...
...
@@ -602,7 +602,7 @@ namespace op
{
try
{
#if defined(USE_CAFFE) &&
defined(USE_CUDA
)
#if defined(USE_CAFFE) &&
(defined(USE_CUDA) || defined(USE_OPENCL)
)
return
spImpl
->
pCaffeBlobT
->
gpu_data
();
#else
error
(
"Required `USE_CAFFE` and `USE_CUDA` flags enabled."
,
__LINE__
,
__FUNCTION__
,
__FILE__
);
...
...
@@ -621,7 +621,7 @@ namespace op
{
try
{
#if defined(USE_CAFFE) &&
defined(USE_CUDA
)
#if defined(USE_CAFFE) &&
(defined(USE_CUDA) || defined(USE_OPENCL)
)
spImpl
->
pCaffeBlobT
->
set_gpu_data
(
data
);
#else
UNUSED
(
data
);
...
...
@@ -657,7 +657,7 @@ namespace op
{
try
{
#if defined(USE_CAFFE) &&
defined(USE_CUDA
)
#if defined(USE_CAFFE) &&
(defined(USE_CUDA) || defined(USE_OPENCL)
)
return
spImpl
->
pCaffeBlobT
->
gpu_diff
();
#else
error
(
"Required `USE_CAFFE` and `USE_CUDA` flags enabled."
,
__LINE__
,
__FUNCTION__
,
__FILE__
);
...
...
@@ -694,7 +694,7 @@ namespace op
{
try
{
#if defined(USE_CAFFE) &&
defined(USE_CUDA
)
#if defined(USE_CAFFE) &&
(defined(USE_CUDA) || defined(USE_OPENCL)
)
return
spImpl
->
pCaffeBlobT
->
mutable_gpu_data
();
#else
error
(
"Required `USE_CAFFE` and `USE_CUDA` flags enabled."
,
__LINE__
,
__FUNCTION__
,
__FILE__
);
...
...
@@ -731,7 +731,7 @@ namespace op
{
try
{
#if defined(USE_CAFFE) &&
defined(USE_CUDA
)
#if defined(USE_CAFFE) &&
(defined(USE_CUDA) || defined(USE_OPENCL)
)
return
spImpl
->
pCaffeBlobT
->
mutable_gpu_diff
();
#else
error
(
"Required `USE_CAFFE` and `USE_CUDA` flags enabled."
,
__LINE__
,
__FUNCTION__
,
__FILE__
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录