Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
4de77970
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
4de77970
编写于
1月 11, 2017
作者:
L
liaogang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove git submodule from docs
上级
19a0a32f
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
8 addition
and
37 deletion
+8
-37
doc/faq/index_cn.rst
doc/faq/index_cn.rst
+0
-19
doc/getstarted/build_and_install/build_from_source_en.md
doc/getstarted/build_and_install/build_from_source_en.md
+6
-3
doc/getstarted/build_and_install/docker_install_en.rst
doc/getstarted/build_and_install/docker_install_en.rst
+2
-13
doc/howto/dev/contribute_to_paddle_cn.md
doc/howto/dev/contribute_to_paddle_cn.md
+0
-1
doc/howto/dev/contribute_to_paddle_en.md
doc/howto/dev/contribute_to_paddle_en.md
+0
-1
未找到文件。
doc/faq/index_cn.rst
浏览文件 @
4de77970
...
@@ -286,22 +286,3 @@ PaddlePaddle的参数使用名字 :code:`name` 作为参数的ID,相同名字
...
@@ -286,22 +286,3 @@ PaddlePaddle的参数使用名字 :code:`name` 作为参数的ID,相同名字
.. code-block:: bash
.. code-block:: bash
paddle train --use_gpu=true --trainer_count=2 --gpu_id=2
paddle train --use_gpu=true --trainer_count=2 --gpu_id=2
12. 编译源码提示warp-ctc/include/ctc.h 找不到的情况
---------------------------------------------------
目前Paddle使用\ :code:`git submodule`\ 来引用一些第三方模块。简单的\
:code:`git clone`\ 命令不能得到第三方模块的代码。需要使用\:
.. code-block:: bash
git clone --recursive https://github.com/PaddlePaddle/Paddle.git
来获取所有源码。对于已经clone的git版本库,可以在Paddle的源码目录中执行\:
.. code-block:: bash
git submodule init
git submodule update
来获得所有第三方模块。
doc/getstarted/build_and_install/build_from_source_en.md
浏览文件 @
4de77970
...
@@ -17,7 +17,7 @@ cd paddle
...
@@ -17,7 +17,7 @@ cd paddle
To compile the source code, your computer must be equipped with the following dependencies.
To compile the source code, your computer must be equipped with the following dependencies.
-
**Compiler**
: GCC >= 4.8 or Clang >= 3.3 (AppleClang >= 5.1)
-
**Compiler**
: GCC >= 4.8 or Clang >= 3.3 (AppleClang >= 5.1)
-
**CMake**
: version >= 3.0
-
**CMake**
: version >= 3.0
(at least CMake 3.4 on Mac OS X)
-
**BLAS**
: MKL, OpenBlas or ATLAS
-
**BLAS**
: MKL, OpenBlas or ATLAS
**Note:**
For CUDA 7.0 and CUDA 7.5, GCC 5.0 and up are not supported!
**Note:**
For CUDA 7.0 and CUDA 7.5, GCC 5.0 and up are not supported!
...
@@ -64,10 +64,13 @@ As a simple example, consider the following:
...
@@ -64,10 +64,13 @@ As a simple example, consider the following:
1.
**BLAS Dependencies(optional)**
1.
**BLAS Dependencies(optional)**
Paddle will find BLAS from system's default path. But you can specify MKL, OpenBLAS or ATLAS via
`
CBLAS_INC_DIR`
and
`CBLAS_LIBRARIES
`
.
Paddle will find BLAS from system's default path. But you can specify MKL, OpenBLAS or ATLAS via
`
MKL_ROOT`
,
`OPENBLAS_ROOT`
or
`ATLAS_ROOT
`
.
```bash
```bash
cmake .. -DCBLAS_INC_DIR=<cblas_inc> -DCBLAS_LIBRARIES=<cblas_libs>
# specify MKL
cmake .. -DMKL_ROOT=<mkl_path>
# or specify OpenBLAS
cmake .. -DOPENBLAS_ROOT=<openblas_path>
```
```
2.
**Doc Dependencies(optional)**
2.
**Doc Dependencies(optional)**
...
...
doc/getstarted/build_and_install/docker_install_en.rst
浏览文件 @
4de77970
...
@@ -16,23 +16,13 @@ Developers can work on PaddlePaddle using Docker. This allows
...
@@ -16,23 +16,13 @@ Developers can work on PaddlePaddle using Docker. This allows
developers to work on different platforms -- Linux, Mac OS X, and
developers to work on different platforms -- Linux, Mac OS X, and
Windows -- in a consistent way.
Windows -- in a consistent way.
The general development workflow with Docker and
Bazel
is as follows:
The general development workflow with Docker and
CMake
is as follows:
1. Get the source code of Paddle:
1. Get the source code of Paddle:
.. code-block:: bash
.. code-block:: bash
git clone --recursive https://github.com/PaddlePaddle/Paddle.git
git clone https://github.com/PaddlePaddle/Paddle.git
Here **git clone --recursive is required** as we have a submodule `warp-ctc <https://github.com/baidu-research/warp-ctc>`_.
If you have used :code:`git clone https://github.com/PaddlePaddle/Paddle` and find that the directory :code:`warp-ctc` is
empty, please use the following command to get the submodule.
.. code-block:: bash
git submodule update --init --recursive
2. Build a development Docker image :code:`paddle:dev` from the source
2. Build a development Docker image :code:`paddle:dev` from the source
...
@@ -162,7 +152,6 @@ source code:
...
@@ -162,7 +152,6 @@ source code:
cd ~
cd ~
git clone https://github.com/PaddlePaddle/Paddle.git
git clone https://github.com/PaddlePaddle/Paddle.git
cd Paddle
cd Paddle
git submodule update --init --recursive
docker build --build-arg WITH_AVX=OFF -t paddle:cpu-noavx -f paddle/scripts/docker/Dockerfile .
docker build --build-arg WITH_AVX=OFF -t paddle:cpu-noavx -f paddle/scripts/docker/Dockerfile .
docker build --build-arg WITH_AVX=OFF -t paddle:gpu-noavx -f paddle/scripts/docker/Dockerfile.gpu .
docker build --build-arg WITH_AVX=OFF -t paddle:gpu-noavx -f paddle/scripts/docker/Dockerfile.gpu .
...
...
doc/howto/dev/contribute_to_paddle_cn.md
浏览文件 @
4de77970
...
@@ -33,7 +33,6 @@ cd Paddle
...
@@ -33,7 +33,6 @@ cd Paddle
git checkout
-b
develop
# 创建 develop 分支
git checkout
-b
develop
# 创建 develop 分支
git remote add upstream https://github.com/PaddlePaddle/Paddle.git
# 添加 upstream 到 baidu/Paddle
git remote add upstream https://github.com/PaddlePaddle/Paddle.git
# 添加 upstream 到 baidu/Paddle
git pull upstream develop
# 更新 upstream
git pull upstream develop
# 更新 upstream
git submodule update
--init
--recursive
```
```
然后你可以通过做一个本地开发分支开始开发
然后你可以通过做一个本地开发分支开始开发
...
...
doc/howto/dev/contribute_to_paddle_en.md
浏览文件 @
4de77970
...
@@ -38,7 +38,6 @@ cd Paddle
...
@@ -38,7 +38,6 @@ cd Paddle
git checkout
-b
develop
# create develop branch.
git checkout
-b
develop
# create develop branch.
git remote add upstream https://github.com/PaddlePaddle/Paddle.git
# add upstream to baidu/Paddle
git remote add upstream https://github.com/PaddlePaddle/Paddle.git
# add upstream to baidu/Paddle
git pull upstream develop
# update to upstream
git pull upstream develop
# update to upstream
git submodule update
--init
--recursive
```
```
Then you can start to develop by making a local developement branch
Then you can start to develop by making a local developement branch
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录