From 24ce73a3b75f2cdbcdfe1862f341203fce653254 Mon Sep 17 00:00:00 2001 From: chengduozh Date: Fri, 15 Feb 2019 13:21:54 +0800 Subject: [PATCH] Remove paddle.v2 --- doc/fluid/api/data/data_reader.rst | 30 +++++++++---------- doc/fluid/api/data/image.rst | 2 +- doc/fluid/design/others/gan_api.md | 2 +- .../howto/cluster/fluid_cluster_train_cn.md | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/fluid/api/data/data_reader.rst b/doc/fluid/api/data/data_reader.rst index ac227a505..96eae82f2 100644 --- a/doc/fluid/api/data/data_reader.rst +++ b/doc/fluid/api/data/data_reader.rst @@ -6,50 +6,50 @@ Data Reader DataTypes ========= -.. autofunction:: paddle.v2.data_type.dense_array +.. autofunction:: paddle.data_type.dense_array :noindex: -.. autofunction:: paddle.v2.data_type.integer_value +.. autofunction:: paddle.data_type.integer_value :noindex: -.. autofunction:: paddle.v2.data_type.integer_value_sequence +.. autofunction:: paddle.data_type.integer_value_sequence :noindex: -.. autofunction:: paddle.v2.data_type.integer_value_sub_sequence +.. autofunction:: paddle.data_type.integer_value_sub_sequence :noindex: -.. autofunction:: paddle.v2.data_type.sparse_binary_vector +.. autofunction:: paddle.data_type.sparse_binary_vector :noindex: -.. autofunction:: paddle.v2.data_type.sparse_binary_vector_sequence +.. autofunction:: paddle.data_type.sparse_binary_vector_sequence :noindex: -.. autofunction:: paddle.v2.data_type.sparse_binary_vector_sub_sequence +.. autofunction:: paddle.data_type.sparse_binary_vector_sub_sequence :noindex: -.. autofunction:: paddle.v2.data_type.sparse_float_vector +.. autofunction:: paddle.data_type.sparse_float_vector :noindex: -.. autofunction:: paddle.v2.data_type.sparse_float_vector_sequence +.. autofunction:: paddle.data_type.sparse_float_vector_sequence :noindex: -.. autofunction:: paddle.v2.data_type.sparse_float_vector_sub_sequence +.. autofunction:: paddle.data_type.sparse_float_vector_sub_sequence :noindex: -.. autofunction:: paddle.v2.data_type.sparse_non_value_slot +.. autofunction:: paddle.data_type.sparse_non_value_slot :noindex: -.. autofunction:: paddle.v2.data_type.sparse_value_slot +.. autofunction:: paddle.data_type.sparse_value_slot :noindex: -.. autoclass:: paddle.v2.data_type.InputType +.. autoclass:: paddle.data_type.InputType :members: :noindex: DataFeeder ========== -.. automodule:: paddle.v2.data_feeder +.. automodule:: paddle.data_feeder :members: :noindex: @@ -67,6 +67,6 @@ Reader minibatch ========= -.. automodule:: paddle.v2.minibatch +.. automodule:: paddle.minibatch :members: :noindex: diff --git a/doc/fluid/api/data/image.rst b/doc/fluid/api/data/image.rst index 97651ffa6..1393db4f1 100644 --- a/doc/fluid/api/data/image.rst +++ b/doc/fluid/api/data/image.rst @@ -1,5 +1,5 @@ Image Interface =============== -.. automodule:: paddle.v2.image +.. automodule:: paddle.image :members: diff --git a/doc/fluid/design/others/gan_api.md b/doc/fluid/design/others/gan_api.md index 716747008..b00c0c570 100644 --- a/doc/fluid/design/others/gan_api.md +++ b/doc/fluid/design/others/gan_api.md @@ -201,7 +201,7 @@ Generally, the user of GAN just need to the following things: - Specify two optimizers for two different losses with respect to different parameters. ```python # pd for short, should be more concise. -from paddle.v2 as pd +import paddle as pd import numpy as np import logging diff --git a/doc/fluid/howto/cluster/fluid_cluster_train_cn.md b/doc/fluid/howto/cluster/fluid_cluster_train_cn.md index a3c0257b6..a1d1b8bf4 100644 --- a/doc/fluid/howto/cluster/fluid_cluster_train_cn.md +++ b/doc/fluid/howto/cluster/fluid_cluster_train_cn.md @@ -19,7 +19,7 @@ cmake .. -DWITH_DOC=OFF -DWITH_GPU=OFF -DWITH_DISTRIBUTE=ON -DWITH_SWIG_PY=ON -D 这里,我们以[Deep Learing 101](http://www.paddlepaddle.org/docs/develop/book/01.fit_a_line/index.html)课程中的第一章 fit a line 为例,描述如何将单机训练脚本改造成支持集群训练的版本。 ### 单机训练脚本示例 ```python -import paddle as paddle +import paddle import paddle.fluid as fluid x = fluid.layers.data(name='x', shape=[13], dtype='float32') -- GitLab