Merge branch 'develop' of https://github.com/PaddlePaddle/FluidDoc into 1211-update-layers

Author: haowang101779990

doc/fluid/advanced_usage/deploy/index_cn.rst

@@ -2,7 +2,7 @@
 预测部署
 ########
 
-- `原生预测引擎 <inference/index_cn.html>`_ ：介绍了支持模型部署上线的Fluid C++ API
+- `服务器端部署 <inference/index_cn.html>`_ ：介绍了支持模型部署上线的Fluid C++ API
 
 - `移动端部署 <mobile/index_cn.html>`_：介绍了 PaddlePaddle组织下的嵌入式平台深度学习框架Paddle-Mobile
 

doc/fluid/advanced_usage/deploy/inference/windows_cpp_inference.md

@@ -48,33 +48,33 @@ Cmake可以在[官网进行下载](https://cmake.org/download/)，并添加到
 执行完毕后，build 目录如图所示，打开箭头指向的 solution 文件：
 
 <p align="center">
-<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/user_guides/howto/inference/image/image3.png">
+<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/advanced_usage/deploy/inference/image/image3.png">
 </p>
 
 修改编译属性为 `/MT` ：
 
 <p align="center">
-<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/user_guides/howto/inference/image/image4.png">
+<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/advanced_usage/deploy/inference/image/image4.png">
 </p>
 
 <p align="center">
-<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/user_guides/howto/inference/image/image5.png">
+<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/advanced_usage/deploy/inference/image/image5.png">
 </p>
 
 编译生成选项改成 `Release` 。
 
 <p align="center">
-<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/user_guides/howto/inference/image/image6.png">
+<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/advanced_usage/deploy/inference/image/image6.png">
 </p>
 
 <p align="center">
-<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/user_guides/howto/inference/image/image7.png">
+<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/advanced_usage/deploy/inference/image/image7.png">
 </p>
 
 将提供的依赖包中，Release下的openblas和模型文件拷贝到编译生成的Release下。
 
 <p align="center">
-<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/user_guides/howto/inference/image/image8.png">
+<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/advanced_usage/deploy/inference/image/image8.png">
 </p>
 
 通过cmd进到Release目录执行：
@@ -88,6 +88,6 @@ Cmake可以在[官网进行下载](https://cmake.org/download/)，并添加到
   	`simple_on_word2vec.exe --dirname=.\word2vec.inference.model`
 
 <p align="center">
-<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/user_guides/howto/inference/image/image9.png">
+<img src="https://raw.githubusercontent.com/PaddlePaddle/FluidDoc/develop/doc/fluid/advanced_usage/deploy/inference/image/image9.png">
 </p>
 

doc/fluid/api_cn/clip_cn.rst

@@ -108,12 +108,12 @@ GradientClipByNorm
 
 .. code-block:: python
         
-    w_param_attrs = ParamAttr(name=None,
-                              initializer=UniformInitializer(low=-1.0, high=1.0, seed=0),
+    w_param_attrs = fluid.ParamAttr(name=None,
+                              initializer=fluid.initializer.UniformInitializer(low=-1.0, high=1.0, seed=0),
                               learning_rate=1.0,
-                              regularizer=L1Decay(1.0),
+                              regularizer=fluid.regularizer.L1Decay(1.0),
                               trainable=True,
-                              clip=GradientClipByNorm(clip_norm=2.0))
+                              clip=fluid.clip.GradientClipByNorm(clip_norm=2.0))
     y_predict = fluid.layers.fc(input=x, size=1, param_attr=w_param_attrs)
 
 
@@ -147,12 +147,12 @@ GradientClipByValue
 
 .. code-block:: python
         
-     w_param_attrs = ParamAttr(name=None,
-                               initializer=UniformInitializer(low=-1.0, high=1.0, seed=0),
+     w_param_attrs = fluid.ParamAttr(name=None,
+                               initializer=fluid.initializer.UniformInitializer(low=-1.0, high=1.0, seed=0),
                                learning_rate=1.0,
-                               regularizer=L1Decay(1.0),
+                               regularizer=fluid.regualrizer.L1Decay(1.0),
                                trainable=True,
-                               clip=GradientClipByValue(-1.0, 1.0))
+                               clip=fluid.clip.GradientClipByValue(-1.0, 1.0))
      y_predict = fluid.layers.fc(input=x, size=1, param_attr=w_param_attrs)
      
 

doc/fluid/api_cn/executor_cn.rst

@@ -81,10 +81,11 @@ feed map为该program提供输入数据。fetch_list提供program训练结束后
 ..  code-block:: python
 
 
-	data = layers.data(name='X', shape=[1], dtype='float32')
-	hidden = layers.fc(input=data, size=10)
-	layers.assign(hidden, out)
-	loss = layers.mean(out)
+	data = fluid.layers.data(name='X', shape=[1], dtype='float32')
+	out = fluid.layers.create_tensor(dtype='float32')
+	hidden = fluid.layers.fc(input=data, size=10)
+	fluid.layers.assign(hidden, out)
+	loss = fluid.layers.mean(out)
 	adam = fluid.optimizer.Adam()
 	adam.minimize(loss)
 
@@ -93,8 +94,8 @@ feed map为该program提供输入数据。fetch_list提供program训练结束后
 	
 	
 	cpu = core.CPUPlace()
-	exe = Executor(cpu)
-	exe.run(default_startup_program())
+	exe = fluid.Executor(cpu)
+	exe.run(fluid.default_startup_program())
 	
 ..  code-block:: python
 	

doc/fluid/api_cn/fluid_cn.rst

@@ -1060,12 +1060,12 @@ name_scope
 
 .. code-block:: python
           
-	  with name_scope("encoder"):
-             ...
-          with name_scope("decoder"):
-             ...
-             with name_scope("attention"):
-                ...
+    with name_scope("encoder"):
+        ...
+    with name_scope("decoder"):
+        ...
+    with name_scope("attention"):
+        ...
 
 
 

doc/fluid/api_cn/index_cn.rst

@@ -16,7 +16,7 @@ API
     io_cn.rst
     layers_cn.rst
     metrics_cn.rst
-    net_cn.rst
+    nets_cn.rst
     optimizer_cn.rst
     param_attr_cn.rst
     profiler_cn.rst