Merge pull request #630 from shippingwang/wsp-book-py3

Remove v2

.tools/cache_dataset.py

 #!/bin/env python
-import paddle.v2.dataset as dataset
+import paddle.dataset as dataset
 import nltk
 
 #cifar

02.recognize_digits/README.cn.md

@@ -321,7 +321,7 @@ def event_handler(event):
 
 
 ```python
-from paddle.v2.plot import Ploter
+from paddle.utils import Ploter
 
 train_title = "Train cost"
 test_title = "Test cost"

02.recognize_digits/README.md

@@ -320,7 +320,7 @@ def event_handler(event):
 ![png](./image/train_and_test.png)
 
 ```python
-from paddle.v2.plot import Ploter
+from paddle.utils import Ploter
 
 train_title = "Train cost"
 test_title = "Test cost"

02.recognize_digits/index.cn.html

@@ -363,7 +363,7 @@ def event_handler(event):
 
 
 ```python
-from paddle.v2.plot import Ploter
+from paddle.utils import Ploter
 
 train_title = "Train cost"
 test_title = "Test cost"

02.recognize_digits/index.html

@@ -362,7 +362,7 @@ def event_handler(event):
 ![png](./image/train_and_test.png)
 
 ```python
-from paddle.v2.plot import Ploter
+from paddle.utils import Ploter
 
 train_title = "Train cost"
 test_title = "Test cost"

03.image_classification/README.cn.md

@@ -385,7 +385,7 @@ test_reader = paddle.batch(
 ```python
 params_dirname = "image_classification_resnet.inference.model"
 
-from paddle.v2.plot import Ploter
+from paddle.utils import Ploter
 
 train_title = "Train cost"
 test_title = "Test cost"

03.image_classification/README.md

@@ -383,7 +383,7 @@ Callback function `event_handler` will be called during training when a pre-defi
 ```python
 params_dirname = "image_classification_resnet.inference.model"
 
-from paddle.v2.plot import Ploter
+from paddle.utils import Ploter
 
 train_title = "Train cost"
 test_title = "Test cost"

03.image_classification/index.cn.html

@@ -427,7 +427,7 @@ test_reader = paddle.batch(
 ```python
 params_dirname = "image_classification_resnet.inference.model"
 
-from paddle.v2.plot import Ploter
+from paddle.utils import Ploter
 
 train_title = "Train cost"
 test_title = "Test cost"

03.image_classification/index.html

@@ -425,7 +425,7 @@ Callback function `event_handler` will be called during training when a pre-defi
 ```python
 params_dirname = "image_classification_resnet.inference.model"
 
-from paddle.v2.plot import Ploter
+from paddle.utils import Ploter
 
 train_title = "Train cost"
 test_title = "Test cost"

05.recommender_system/README.cn.md

@@ -431,7 +431,7 @@ feed_order = [
 # Specify the directory path to save the parameters
 params_dirname = "recommender_system.inference.model"
 
-from paddle.v2.plot import Ploter
+from paddle.utils import Ploter
 test_title = "Test cost"
 plot_cost = Ploter(test_title)
 

05.recommender_system/README.md

@@ -406,7 +406,7 @@ For example, we can check the cost by `trainer.test` when `EndStepEvent` occurs
 # Specify the directory path to save the parameters
 params_dirname = "recommender_system.inference.model"
 
-from paddle.v2.plot import Ploter
+from paddle.utils import Ploter
 test_title = "Test cost"
 plot_cost = Ploter(test_title)
 

05.recommender_system/index.cn.html

@@ -473,7 +473,7 @@ feed_order = [
 # Specify the directory path to save the parameters
 params_dirname = "recommender_system.inference.model"
 
-from paddle.v2.plot import Ploter
+from paddle.utils import Ploter
 test_title = "Test cost"
 plot_cost = Ploter(test_title)
 

05.recommender_system/index.html

@@ -448,7 +448,7 @@ For example, we can check the cost by `trainer.test` when `EndStepEvent` occurs
 # Specify the directory path to save the parameters
 params_dirname = "recommender_system.inference.model"
 
-from paddle.v2.plot import Ploter
+from paddle.utils import Ploter
 test_title = "Test cost"
 plot_cost = Ploter(test_title)
 

serve/main.py

 import os
 import traceback
 
-import paddle.v2 as paddle
+import paddle as paddle
 from flask import Flask, jsonify, request
 from flask_cors import CORS
 from Queue import Queue