Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
afeixing77
Paddle
提交
c62383e9
P
Paddle
项目概览
afeixing77
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
c62383e9
编写于
1月 08, 2018
作者:
T
Tao Luo
提交者:
GitHub
1月 08, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7255 from tensor-tang/capi
fix capi package
上级
0f353ab4
6de20496
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
12 deletion
+20
-12
cmake/external/mkldnn.cmake
cmake/external/mkldnn.cmake
+13
-0
cmake/external/mklml.cmake
cmake/external/mklml.cmake
+4
-0
paddle/scripts/docker/build.sh
paddle/scripts/docker/build.sh
+1
-10
python/CMakeLists.txt
python/CMakeLists.txt
+2
-2
未找到文件。
cmake/external/mkldnn.cmake
浏览文件 @
c62383e9
...
...
@@ -77,3 +77,16 @@ FILE(WRITE ${dummyfile} "const char * dummy = \"${dummyfile}\";")
ADD_LIBRARY
(
mkldnn STATIC
${
dummyfile
}
)
TARGET_LINK_LIBRARIES
(
mkldnn
${
MKLDNN_LIB
}
${
MKLML_LIB
}
${
MKLML_IOMP_LIB
}
)
ADD_DEPENDENCIES
(
mkldnn
${
MKLDNN_PROJECT
}
)
# copy the real so.0 lib to install dir
# it can be directly contained in wheel or capi
SET
(
MKLDNN_SHARED_LIB
${
MKLDNN_INSTALL_DIR
}
/libmkldnn.so.0
)
ADD_CUSTOM_COMMAND
(
OUTPUT
${
MKLDNN_SHARED_LIB
}
COMMAND cp
${
MKLDNN_LIB
}
${
MKLDNN_SHARED_LIB
}
DEPENDS mkldnn
)
ADD_CUSTOM_TARGET
(
mkldnn_shared_lib ALL DEPENDS
${
MKLDNN_SHARED_LIB
}
)
IF
(
WITH_C_API
)
INSTALL
(
FILES
${
MKLDNN_SHARED_LIB
}
DESTINATION lib
)
ENDIF
()
cmake/external/mklml.cmake
浏览文件 @
c62383e9
...
...
@@ -66,3 +66,7 @@ ADD_LIBRARY(mklml SHARED IMPORTED GLOBAL)
SET_PROPERTY
(
TARGET mklml PROPERTY IMPORTED_LOCATION
${
MKLML_LIB
}
)
ADD_DEPENDENCIES
(
mklml
${
MKLML_PROJECT
}
)
LIST
(
APPEND external_project_dependencies mklml
)
IF
(
WITH_C_API
)
INSTALL
(
FILES
${
MKLML_LIB
}
${
MKLML_IOMP_LIB
}
DESTINATION lib
)
ENDIF
()
paddle/scripts/docker/build.sh
浏览文件 @
c62383e9
...
...
@@ -197,18 +197,9 @@ function gen_capi_package() {
if
[[
${
WITH_C_API
}
==
"ON"
]]
;
then
install_prefix
=
"/paddle/build/capi_output"
rm
-rf
$install_prefix
make
DESTDIR
=
"
$install_prefix
"
install
if
[[
${
WITH_MKL
:-
OFF
}
==
"ON"
]]
;
then
find ./third_party/install
-name
'libmklml_gnu.so'
-exec
cp
{}
$install_prefix
/usr/local/lib
\;
find ./third_party/install
-name
'libmklml_intel.so'
-exec
cp
{}
$install_prefix
/usr/local/lib
\;
cp
-P
./third_party/install/mkldnn/lib/
*
$install_prefix
/usr/local/lib/
fi
find ./third_party/install
-name
'libiomp5.so'
-exec
cp
{}
$install_prefix
/usr/local/lib
\;
cd
$install_prefix
/usr/local
ls
| egrep
-v
"^Found.*item$"
| xargs
tar
/paddle/build/paddle.tgz
ls
| egrep
-v
"^Found.*item$"
| xargs
tar
-cf
/paddle/build/paddle.tgz
fi
}
...
...
python/CMakeLists.txt
浏览文件 @
c62383e9
...
...
@@ -29,8 +29,8 @@ if(WITH_MKLML)
endif
()
if
(
WITH_MKLDNN
)
list
(
APPEND MKL_SHARED_LIBS
"
${
MKLDNN_
LIB
}
"
"
${
MKLDNN_LIB
}
.0
"
)
list
(
APPEND MKL_DEPENDS mkldnn
)
list
(
APPEND MKL_SHARED_LIBS
"
${
MKLDNN_
SHARED_LIB
}
"
)
list
(
APPEND MKL_DEPENDS mkldnn
mkldnn_shared_lib
)
endif
()
if
(
WITH_GPU
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录