From 552a028f2bcfa5960c34b52a1721d6b79e5f52fe Mon Sep 17 00:00:00 2001 From: chengduozh Date: Fri, 15 Feb 2019 13:16:03 +0800 Subject: [PATCH] Remove paddle.v2 --- doc/fluid/api/CMakeLists.txt | 1 - doc/fluid/api_cn/layers_cn.rst | 8 ++++---- doc/fluid/getstarted/Developer's_Guide_to_Paddle_Fluid.md | 4 ++-- doc/fluid/howto/cluster/fluid_cluster_train_cn.md | 2 +- doc/fluid/howto/cluster/fluid_cluster_train_en.md | 2 +- .../howto/basic_concept/fluid_basic_concept.rst | 7 ++----- .../user_guides/howto/prepare_data/use_py_reader.rst | 4 ++-- .../user_guides/howto/prepare_data/use_py_reader_en.rst | 4 ++-- 8 files changed, 14 insertions(+), 18 deletions(-) diff --git a/doc/fluid/api/CMakeLists.txt b/doc/fluid/api/CMakeLists.txt index 435d6e10f..b117647e3 100644 --- a/doc/fluid/api/CMakeLists.txt +++ b/doc/fluid/api/CMakeLists.txt @@ -8,7 +8,6 @@ set(SPHINX_CACHE_DIR_EN "${CMAKE_CURRENT_BINARY_DIR}/en/_doctrees") set(SPHINX_HTML_DIR_EN "${CMAKE_CURRENT_BINARY_DIR}/en/html") set(IMPORT_PADDLE_STRING "import paddle") -set(IMPORT_PADDLEV2_STRING "import paddle.v2") configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/../../templates/conf.py.en.in" diff --git a/doc/fluid/api_cn/layers_cn.rst b/doc/fluid/api_cn/layers_cn.rst index 54e123a97..0f0d799cf 100644 --- a/doc/fluid/api_cn/layers_cn.rst +++ b/doc/fluid/api_cn/layers_cn.rst @@ -1063,7 +1063,7 @@ py_reader .. code-block:: python - import paddle.v2 + import paddle import paddle.fluid as fluid import paddle.dataset.mnist as mnist @@ -1071,7 +1071,7 @@ py_reader shapes=[(-1,3,224,224), (-1,1)], dtypes=['float32', 'int64']) reader.decorate_paddle_reader( - paddle.v2.reader.shuffle(paddle.batch(mnist.train()) + paddle.reader.shuffle(paddle.batch(mnist.train()) img, label = fluid.layers.read_file(reader) loss = network(img, label) # 一些网络定义 @@ -1095,7 +1095,7 @@ py_reader .. code-block:: python - import paddle.v2 + import paddle import paddle.fluid as fluid import paddle.dataset.mnist as mnist @@ -1109,7 +1109,7 @@ py_reader dtypes=['float32', 'int64'], name='train_reader') train_reader.decorate_paddle_reader( - paddle.v2.reader.shuffle(paddle.batch(mnist.train()) + paddle.reader.shuffle(paddle.batch(mnist.train()) test_reader = fluid.layers.py_reader(capacity=32, shapes=[(-1,3,224,224), (-1,1)], diff --git a/doc/fluid/getstarted/Developer's_Guide_to_Paddle_Fluid.md b/doc/fluid/getstarted/Developer's_Guide_to_Paddle_Fluid.md index a993a4300..cc2aa2536 100644 --- a/doc/fluid/getstarted/Developer's_Guide_to_Paddle_Fluid.md +++ b/doc/fluid/getstarted/Developer's_Guide_to_Paddle_Fluid.md @@ -367,7 +367,7 @@ - 打印可读的 `Program` ```python - from paddle.v2.fluid import debuger + from paddle.fluid import debuger print debuger.pprint_program_codes(framework.default_main_program().desc) ``` @@ -1626,7 +1626,7 @@ class ClipKernel : public framework::OpKernel { - 当在python端执行时： ```python - import paddle.v2.fluid as fluid + import paddle.fluid as fluid ``` [`framework.py`](https://github.com/PaddlePaddle/Paddle/blob/develop/python/paddle/fluid/framework.py#L1040)定义了两个全局`Program`: ```python diff --git a/doc/fluid/howto/cluster/fluid_cluster_train_cn.md b/doc/fluid/howto/cluster/fluid_cluster_train_cn.md index 55326940c..a3c0257b6 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.v2 as paddle +import paddle as paddle import paddle.fluid as fluid x = fluid.layers.data(name='x', shape=[13], dtype='float32') diff --git a/doc/fluid/howto/cluster/fluid_cluster_train_en.md b/doc/fluid/howto/cluster/fluid_cluster_train_en.md index b4465e826..26f7e6296 100644 --- a/doc/fluid/howto/cluster/fluid_cluster_train_en.md +++ b/doc/fluid/howto/cluster/fluid_cluster_train_en.md @@ -31,7 +31,7 @@ Let's take [Deep Learning 101](http://www.paddlepaddle.org/docs/develop/book/01. The non-cluster version of this demo with fluid API is as follows: ``` python -import paddle.v2 as paddle +import paddle import paddle.fluid as fluid x = fluid.layers.data(name='x', shape=[13], dtype='float32') diff --git a/doc/fluid/user_guides/howto/basic_concept/fluid_basic_concept.rst b/doc/fluid/user_guides/howto/basic_concept/fluid_basic_concept.rst index 55c3c761f..a915c2e3d 100644 --- a/doc/fluid/user_guides/howto/basic_concept/fluid_basic_concept.rst +++ b/doc/fluid/user_guides/howto/basic_concept/fluid_basic_concept.rst @@ -251,9 +251,8 @@ PaddleFluid 中以 :code:`fluid.layers.data` 来接收输入数据。 :: import numpy as np - + import paddle import paddle.fluid as fluid - import paddle.v2 as paddle # define the input layers for the network. x = fluid.layers.data(name="img", shape=[1, 28, 28], dtype="float32") @@ -350,10 +349,8 @@ Fluid 使用 Program 而不是计算图描述模型，一般情况下，用户 :: import numpy as np - + import paddle import paddle.fluid as fluid - import paddle.v2 as paddle - def main(): BATCH_SIZE = 128 diff --git a/doc/fluid/user_guides/howto/prepare_data/use_py_reader.rst b/doc/fluid/user_guides/howto/prepare_data/use_py_reader.rst index 7baa069b4..be9bcc152 100644 --- a/doc/fluid/user_guides/howto/prepare_data/use_py_reader.rst +++ b/doc/fluid/user_guides/howto/prepare_data/use_py_reader.rst @@ -49,9 +49,9 @@ PyReader对象。 .. code-block:: python + import paddle import paddle.fluid as fluid import paddle.dataset.mnist as mnist - import paddle.v2 import numpy @@ -109,7 +109,7 @@ PyReader对象提供 :code:`decorate_tensor_provider` 和 :code:`decorate_paddle use_cuda=True, share_vars_from=trainer, main_program=test_prog) train_reader.decorate_paddle_reader( - paddle.v2.reader.shuffle(paddle.batch(mnist.train(), 512), buf_size=8192)) + paddle.reader.shuffle(paddle.batch(mnist.train(), 512), buf_size=8192)) test_reader.decorate_paddle_reader(paddle.batch(mnist.test(), 512)) diff --git a/doc/fluid/user_guides/howto/prepare_data/use_py_reader_en.rst b/doc/fluid/user_guides/howto/prepare_data/use_py_reader_en.rst index e1058cafb..244cab4d9 100644 --- a/doc/fluid/user_guides/howto/prepare_data/use_py_reader_en.rst +++ b/doc/fluid/user_guides/howto/prepare_data/use_py_reader_en.rst @@ -54,9 +54,9 @@ Details are as follows: .. code-block:: python + import paddle import paddle.fluid as fluid import paddle.dataset.mnist as mnist - import paddle.v2 import numpy @@ -115,7 +115,7 @@ Details are as follows（the remaining part of the code above）: use_cuda=True, share_vars_from=trainer, main_program=test_prog) train_reader.decorate_paddle_reader( - paddle.v2.reader.shuffle(paddle.batch(mnist.train(), 512), buf_size=8192)) + paddle.reader.shuffle(paddle.batch(mnist.train(), 512), buf_size=8192)) test_reader.decorate_paddle_reader(paddle.batch(mnist.test(), 512)) -- GitLab