Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refine doc #8801

Merged
merged 3 commits into from
Mar 12, 2018
Merged

Refine doc #8801

merged 3 commits into from
Mar 12, 2018

Conversation

ranqiu92
Copy link
Contributor

@ranqiu92 ranqiu92 commented Mar 6, 2018

@CLAassistant
Copy link

CLAassistant commented Mar 6, 2018

CLA assistant check
All committers have signed the CLA.

### 概述
### 直接下载安装

从CI系统直接下载 paddle.tgz 包。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里写的太简单了,用户也不知道去哪儿下载。
下载链接在http://www.paddlepaddle.org/docs/develop/documentation/zh/build_and_install/pip_install_cn.html#id17 这个表格的第三列。

  • @Yancey1989 讨论后,可以考虑将这个表格的第三列c-api从原表格(包括中英文表格)中挪出来,在这里重新建立一个表格。
  • 文字部分可改为:从CI系统中下载最新的c-api开发包进行安装, 您可以从下面的表格中找到需要的版本? 或者重新组织下。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


从CI系统直接下载 paddle.tgz 包。

### 从源码编译

使用 C-API 进行预测依赖于将 PaddlePaddle 核心代码编译成链接库,只需在编译时需配制下面这些编译选项:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

第9行可以调整下,前半句”使用 C-API 进行预测依赖于将 PaddlePaddle 核心代码编译成链接库“不是很通顺。
下面11-21行的列表能变成表格么?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

1. 链接`libpaddle_capi_shared.so` 动态库,需注意:
1. 如果编译时指定编译CPU版本,且使用`OpenBLAS`数学库,在使用C-API开发预测程序时,只需要链接`libpaddle_capi_shared.so`这一个库。
1. 如果是用编译时指定CPU版本,且使用`MKL`数学库,由于`MKL`库有自己独立的动态库文件,在使用PaddlePaddle C-API开发预测程序时,需要自己链接MKL链接库。
1. 如果编译时指定编译GPU版本,CUDA相关库会在预测程序运行时动态装载,需要将CUDA相关的库设置到`LD_LIBRARY_PATH`环境变量中。
- 这种方式最为简便,链接相对容易,**在无特殊需求情况下,推荐使用此方式**。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

111行使用-,前面几行都使用1,请参考 如何构建文档 生成预览文件。确定这里的格式正确。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Contributor

@abhinavarora abhinavarora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ranqiu92 , Could you also modify the English documents as well as per the new changes. This way both the documents will be in sync. I will fix the language in that document once you make the initial PR. Thank you.

@luotao1
Copy link
Contributor

luotao1 commented Mar 7, 2018

Thanks @abhinavarora, but in this PR, since English documents related to these Chinese documents are all missing, we will modify the Chinese documents first, and organize a group of translation from Chinese to English later. Can you help us to review the translation later?

@abhinavarora
Copy link
Contributor

@luotao1 That sounds good. Please send me the PR review when you translate the document.


使用 C-API 进行预测依赖于将 PaddlePaddle 核心代码编译成链接库,只需在编译时需配制下面这些编译选项
从CI系统中下载最新的C-API开发包进行安装,用户可以从下面的表格中找到需要的版本
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#8853 增加了noavx的capi版本,请merge最新代码后在这儿进行补充。并同时删掉doc/v2/build_and_install/pip_install_cn.rst 和 doc/v2/build_and_install/pip_install_en.rst 中capi的那列。

@luotao1 luotao1 mentioned this pull request Mar 8, 2018
Copy link
Contributor

@luotao1 luotao1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@luotao1 luotao1 merged commit 6c06841 into PaddlePaddle:develop Mar 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants