this is a docs-restructuing pull-request, test=develop (#1768)

doc/fluid/advanced_usage/development/write_docs_cn.md → doc/fluid/advanced_guide/addon_development/contribute-docs/write_docs_cn.md

@@ -177,7 +177,7 @@ pip install -r requirements.txt
 
 ## 提交修改
 
-如果您希望修改代码，请在`Paddle`仓库下参考[如何贡献代码](../development/contribute_to_paddle/index_cn.html)执行操作。
+如果您希望修改代码，请在`Paddle`仓库下参考[如何贡献代码](../contribute_code/index_cn.html)执行操作。
 
 如果您仅修改文档：
 
@@ -198,7 +198,7 @@ pip install -r requirements.txt
 
 	3.在`FluidDoc`仓库下为您的修改提交PR
 
-提交修改与PR的步骤可以参考[如何贡献代码](../development/contribute_to_paddle/index_cn.html)
+提交修改与PR的步骤可以参考[如何贡献代码](../contribute_code/index_cn.html)
 
 ## 帮助改进预览工具
 

doc/fluid/advanced_usage/development/write_docs_en.md → doc/fluid/advanced_guide/addon_development/contribute-docs/write_docs_en.md

@@ -178,7 +178,7 @@ After completing the installation, you will also need to do:
 
 ## Submit changes
 
-If you wish to modify the code, please refer to [How to contribute code](../development/contribute_to_paddle/index_en.html) under the `Paddle` repository.
+If you wish to modify the code, please refer to [How to contribute code](../contribute_code/index_en.html) under the `Paddle` repository.
 
 If you just modify the document:
 
@@ -199,7 +199,7 @@ If you just modify the document:
 
 3.  Pull Request for your changes in the `FluidDoc` repository
 
-The steps to submit changes and PR can refer to [How to contribute code](../development/contribute_to_paddle/index_en.html)
+The steps to submit changes and PR can refer to [How to contribute code](../contribute_code/index_en.html)
 
 ## Help improve preview tool
 

doc/fluid/advanced_usage/development/contribute_to_paddle/local_dev_guide.md → doc/fluid/advanced_guide/addon_development/contribute_code/local_dev_guide.md

@@ -78,8 +78,8 @@ no changes added to commit (use "git add" and/or "git commit -a")
 
 ## 编译和单元测试
 
-关于编译 PaddlePaddle 的源码，请参见[从源码编译](../../../beginners_guide/install/compile/fromsource.html) 选择对应的操作系统。
-关于单元测试，可参考[Op单元测试](../../../advanced_usage/development/new_op/new_op.html#id7) 的运行方法。
+关于编译 PaddlePaddle 的源码，请参见[从源码编译](../../../install/compile/fromsource.html) 选择对应的操作系统。
+关于单元测试，可参考[Op单元测试](../new_op/new_op.html#id7) 的运行方法。
 
 ## 提交（commit）
 

doc/fluid/advanced_usage/development/contribute_to_paddle/local_dev_guide_en.md → doc/fluid/advanced_guide/addon_development/contribute_code/local_dev_guide_en.md

@@ -78,8 +78,8 @@ no changes added to commit (use "git add" and/or "git commit -a")
 
 ## Build and test
 
-Please refer to [Compile From Source Code](../../../beginners_guide/install/compile/fromsource_en.html) about more information of building PaddlePaddle source codes.
-Please refer to [Op Unit Tests](../../../advanced_usage/development/new_op/new_op_en.html#unit-tests) about more information of running unit tests.
+Please refer to [Compile From Source Code](../../../install/compile/fromsource_en.html) about more information of building PaddlePaddle source codes.
+Please refer to [Op Unit Tests](../new_op/new_op_en.html#unit-tests) about more information of running unit tests.
 
 ## Commit
 

doc/fluid/advanced_usage/design_idea/fluid_design_idea.md → doc/fluid/advanced_guide/addon_development/design_idea/fluid_design_idea.md

@@ -213,7 +213,7 @@ outs = exe.run(
 
 
 ## 代码实例
-本节通过[编程指南](../../beginners_guide/programming_guide/programming_guide.html)中简单的线性回归例子，为您介绍上述内容如何在代码中实现。
+本节通过[编程指南](../../../beginners_guide/basic_concept/programming_guide/programming_guide.html)中简单的线性回归例子，为您介绍上述内容如何在代码中实现。
 
 **定义Program**
 
@@ -360,5 +360,4 @@ Paddle使用Executor.run来运行一段Program。
        [6.099215 ]], dtype=float32), array([1.6935859], dtype=float32)]
 ```
 
-至此您已经了解了Paddle内部的执行流程的核心概念，更多框架使用细节请参考[使用指南](../../user_guides/index_cn.html)相关内容，[模型库](../../user_guides/models/index_cn.html
-)中也为您提供了丰富的模型示例以供参考。
+至此您已经了解了Paddle内部的执行流程的核心概念，更多框架使用细节可以参考[典型案例](../../../user_guides/index_cn.html)。

doc/fluid/advanced_usage/design_idea/fluid_design_idea_en.md → doc/fluid/advanced_guide/addon_development/design_idea/fluid_design_idea_en.md

@@ -214,7 +214,7 @@ outs = exe.run(
 
 
 ## Code Instance
-This section introduces how the above is implemented in your code through a simple linear regression example in the [Fluid Programming Guide](../../beginners_guide/programming_guide/programming_guide.html).
+This section introduces how the above is implemented in your code through a simple linear regression example in the [Fluid Programming Guide](../../../beginners_guide/basic_concept/programming_guide/programming_guide_en.html).
 
 **Define Program**
 
@@ -361,5 +361,4 @@ The output is:
        [6.099215 ]], dtype=float32), array([1.6935859], dtype=float32)]
 ```
 
-Till now you have already be notified of the core concepts of the internal execution process of Fluid. For more details on the usage of the framework, please refer to the [User Guide](../../user_guides/index_en.html) related content, [Model Library](../../user_guides/models/index_en.html
-) also provides you with a wealth of model examples for reference.
+Till now you have already be notified of the core concepts of the internal execution process of Fluid. For more details on the usage of the framework, please refer to the [User Guide](../../../user_guides/index_en.html).

doc/fluid/advanced_guide/addon_development/index_cn.rst

+..  _addon_development:
+
+########
+二次开发
+########
+
+..  toctree::
+    :hidden:
+
+    design_idea/fluid_design_idea.md
+    new_op/index_cn.rst
+    contribute_code/index_cn.rst
+    contribute-docs/write_docs_cn.md
+
+

doc/fluid/advanced_guide/addon_development/index_en.rst

+..  _addon_development_en:
+
+
+################
+Addon Development
+################
+
+..  toctree::
+    :hidden:
+
+    design_idea/fluid_design_idea_en.md
+    new_op/index_en.rst
+    contribute_code/index_en.rst
+    contribute-docs/write_docs_en.md
+
+

doc/fluid/advanced_usage/development/new_op/new_python_op.md → doc/fluid/advanced_guide/addon_development/new_op/new_python_op.md

@@ -138,4 +138,3 @@ fluid.layers.py_func(func=tanh, x=in_var, out=out_var, backward_func=tanh_grad_w
 
 - 若某个前向输出变量没有梯度，则 `backward_func` 将接收到 `None` 的输入。若某个前向输入变量没有梯度，则我们应在 `backward_func` 中主动返回
   `None`。
-  

doc/fluid/advanced_usage/development/new_op/op_notes.md → doc/fluid/advanced_guide/addon_development/new_op/op_notes.md

@@ -9,7 +9,7 @@ Op的核心方法是Run，Run方法需要两方面的资源：数据资源和计
 Fluid框架的设计理念是可以在多种设备及第三方库上运行，有些Op的实现可能会因为设备或者第三方库的不同而不同。为此，Fluid引入了OpKernel的方式，即一个Op可以有多个OpKernel，这类Op继承自`OperatorWithKernel`，这类Op的代表是conv_op，conv_op的OpKernel有：`GemmConvKernel`、`CUDNNConvOpKernel`、`ConvMKLDNNOpKernel`，且每个OpKernel都有double和float两种数据类型。不需要OpKernel的代表有`WhileOp`等。
 
 Operator继承关系图：
-![op_inheritance_relation_diagram](../../pics/op_inheritance_relation_diagram.png)
+![op_inheritance_relation_diagram](./op_inheritance_relation_diagram.png)
 
 进一步了解可参考：[multi_devices](https://github.com/PaddlePaddle/FluidDoc/tree/develop/doc/fluid/design/multi_devices)，[scope](https://github.com/PaddlePaddle/FluidDoc/blob/develop/doc/fluid/design/concepts/scope.md)，[Developer's_Guide_to_Paddle_Fluid](https://github.com/PaddlePaddle/FluidDoc/blob/release/1.2/doc/fluid/getstarted/Developer's_Guide_to_Paddle_Fluid.md)
 

doc/fluid/advanced_usage/development/new_op/op_notes_en.md → doc/fluid/advanced_guide/addon_development/new_op/op_notes_en.md

@@ -9,7 +9,7 @@ The core method of Op is Run. The Run method requires two resources: data resour
 The Fluid framework is designed to run on a variety of devices and third-party libraries, and some Op implementations may vary on different the devices or third-party libraries. Therefore, Fluid introduced the OpKernel's approach, which means an Op can have multiple OpKernels. Such Ops are derived from `OperatorWithKernel`, and the representative of such Ops is conv, the OpKernels of conv_op are: `GemmConvKernel`, `CUDNNConvOpKernel`, `ConvMKLDNNOpKernel`, and each OpKernel has two data types, double and float. Ops that do not need OpKernel inclue `WhileOp` and so on.
 
 Operator inheritance diagram:
-![op_inheritance_relation_diagram](../../pics/op_inheritance_relation_diagram.png)
+![op_inheritance_relation_diagram](./op_inheritance_relation_diagram.png)
 
 For further information, please refer to: [multi_devices](https://github.com/PaddlePaddle/FluidDoc/tree/develop/doc/fluid/design/multi_devices) , [scope](https://github.com/PaddlePaddle/FluidDoc/blob/develop/doc/fluid/design/concepts/scope.md) , [Developer's_Guide_to_Paddle_Fluid](https://github.com/PaddlePaddle/FluidDoc/blob/release/1.2/doc/fluid/getstarted/Developer's_Guide_to_Paddle_Fluid.md)
 
@@ -184,4 +184,3 @@ def fc(input,
        is_test=False,
        name=None)
 ```
-

doc/fluid/advanced_guide/distributed_training/index_cn.rst

+..  _user_guide_distribute:
+
+##########
+分布式训练
+##########
+
+..  toctree::
+    :maxdepth: 1
+
+    cluster_quick_start.rst
+    cluster_howto.rst
+    fleet_api_howto_cn.rst

doc/fluid/advanced_guide/distributed_training/index_en.rst

+..  _user_guide_distribute_en:
+
+######################
+Distributed Training
+######################
+
+.. toctree::
+   :maxdepth: 1
+
+   cluster_quick_start_en.rst
+   cluster_howto_en.rst
+   train_on_baidu_cloud_en.rst
+

doc/fluid/user_guides/howto/training/multi_node.rst → doc/fluid/advanced_guide/distributed_training/multi_node.rst

-########
+########
 多机训练
 ########
 
@@ -8,5 +8,3 @@
     cluster_quick_start.rst
     cluster_howto.rst
     fleet_api_howto_cn.rst
-    train_on_baidu_cloud_cn.rst
-    deploy_ctr_on_baidu_cloud_cn.rst

doc/fluid/user_guides/howto/training/src/dist_train_demo.py → doc/fluid/advanced_guide/distributed_training/src/dist_train_demo.py

@@ -27,6 +27,7 @@ import paddle.fluid as fluid
 BATCH_SIZE = 64
 PASS_NUM = 1
 
+
 def loss_net(hidden, label):
     prediction = fluid.layers.fc(input=hidden, size=10, act='softmax')
     loss = fluid.layers.cross_entropy(input=prediction, label=label)
@@ -34,6 +35,7 @@ def loss_net(hidden, label):
     acc = fluid.layers.accuracy(input=prediction, label=label)
     return prediction, avg_loss, acc
 
+
 def conv_net(img, label):
     conv_pool_1 = fluid.nets.simple_img_conv_pool(
         input=img,
@@ -79,8 +81,7 @@ def train(use_cuda, role, endpoints, current_endpoint, trainer_id, trainers):
         exe = fluid.Executor(place)
 
         train_reader = paddle.batch(
-            paddle.reader.shuffle(
-                paddle.dataset.mnist.train(), buf_size=500),
+            paddle.reader.shuffle(paddle.dataset.mnist.train(), buf_size=500),
             batch_size=BATCH_SIZE)
         test_reader = paddle.batch(
             paddle.dataset.mnist.test(), batch_size=BATCH_SIZE)
@@ -88,20 +89,23 @@ def train(use_cuda, role, endpoints, current_endpoint, trainer_id, trainers):
         exe.run(fluid.default_startup_program())
         for pass_id in range(PASS_NUM):
             for batch_id, data in enumerate(train_reader()):
-                acc_np, avg_loss_np = exe.run(prog,
-                                            feed=feeder.feed(data),
-                                            fetch_list=[acc, avg_loss])
+                acc_np, avg_loss_np = exe.run(
+                    prog, feed=feeder.feed(data), fetch_list=[acc, avg_loss])
                 if (batch_id + 1) % 10 == 0:
                     print(
                         'PassID {0:1}, BatchID {1:04}, Loss {2:2.2}, Acc {3:2.2}'.
                         format(pass_id, batch_id + 1,
-                                float(avg_loss_np.mean()), float(acc_np.mean())))
+                               float(avg_loss_np.mean()), float(
+                                   acc_np.mean())))
+
 
 if __name__ == '__main__':
     if len(sys.argv) != 6:
-        print("Usage: python %s role endpoints current_endpoint trainer_id trainers" % sys.argv[0])
+        print(
+            "Usage: python %s role endpoints current_endpoint trainer_id trainers"
+            % sys.argv[0])
         exit(0)
     role, endpoints, current_endpoint, trainer_id, trainers = \
         sys.argv[1:]
-    train(True, role, endpoints, current_endpoint, int(trainer_id), int(trainers))
-
+    train(True, role, endpoints, current_endpoint,
+          int(trainer_id), int(trainers))

doc/fluid/user_guides/howto/evaluation_and_debugging/debug/visualdl.md → doc/fluid/advanced_guide/evaluation_debugging/debug/visualdl.md

@@ -246,4 +246,3 @@ VisualDL 是由 [PaddlePaddle](http://www.paddlepaddle.org/) 和
 ## 更多细节
 
 想了解更多关于VisualDL的使用介绍，请查看[文档](https://github.com/PaddlePaddle/VisualDL/tree/develop/demo)
-

doc/fluid/user_guides/howto/evaluation_and_debugging/debug/visualdl_en.md → doc/fluid/advanced_guide/evaluation_debugging/debug/visualdl_en.md

@@ -262,4 +262,3 @@ We welcome everyone to use, comment and contribute to VisualDL :)
 ## More details
 
 For more details about how to use VisualDL, please take a look at [documents](https://github.com/PaddlePaddle/VisualDL/tree/develop/demo)
-