replace paddle.v2.fluid by paddle.fluid in tests

Author: luotao1

python/paddle/fluid/backward.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle.v2.fluid import framework as framework
+from paddle.fluid import framework as framework
 from . import core
 import collections
 import copy

python/paddle/fluid/default_scope_funcs.py

@@ -26,7 +26,7 @@
 invoked in a new local scope.
 """
 
-import paddle.v2.fluid.core
+import paddle.fluid.core
 import threading
 
 __tl_scope__ = threading.local()
@@ -44,13 +44,13 @@
 def get_cur_scope():
     """
     Get current scope.
-    :rtype: paddle.v2.fluid.core.Scope
+    :rtype: paddle.fluid.core.Scope
     """
     cur_scope_stack = getattr(__tl_scope__, 'cur_scope', None)
     if cur_scope_stack is None:
         __tl_scope__.cur_scope = list()
     if len(__tl_scope__.cur_scope) == 0:
-        __tl_scope__.cur_scope.append(paddle.v2.fluid.core.Scope())
+        __tl_scope__.cur_scope.append(paddle.fluid.core.Scope())
     return __tl_scope__.cur_scope[-1]
 
 

python/paddle/fluid/io.py

@@ -14,8 +14,8 @@
 
 import os
 
-from paddle.v2.fluid.evaluator import Evaluator
-from paddle.v2.fluid.framework import Program, Parameter, default_main_program, Variable
+from paddle.fluid.evaluator import Evaluator
+from paddle.fluid.framework import Program, Parameter, default_main_program, Variable
 from . import core
 
 __all__ = [

python/paddle/fluid/layer_helper.py

@@ -17,7 +17,7 @@
 
 from framework import Variable, Parameter, default_main_program, default_startup_program, dtype_is_floating
 import unique_name
-from paddle.v2.fluid.initializer import Constant, Xavier
+from paddle.fluid.initializer import Constant, Xavier
 from param_attr import ParamAttr, WeightNormParamAttr
 
 

python/paddle/fluid/net_drawer.py

@@ -17,8 +17,8 @@
 import logging
 from collections import defaultdict
 
-import paddle.v2.fluid.core as core
-import paddle.v2.fluid.proto.framework_pb2 as framework_pb2
+import paddle.fluid.core as core
+import paddle.fluid.proto.framework_pb2 as framework_pb2
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)

python/paddle/fluid/op.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle.v2.fluid.core as core
-import paddle.v2.fluid.proto.framework_pb2 as framework_pb2
+import paddle.fluid.core as core
+import paddle.fluid.proto.framework_pb2 as framework_pb2
 
 
 def get_all_op_protos():

python/paddle/fluid/tests/book/notest_rnn_encoder_decoer.py

@@ -14,15 +14,15 @@
 
 import numpy as np
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.core as core
-import paddle.v2.fluid.framework as framework
-import paddle.v2.fluid.layers as layers
+import paddle.fluid as fluid
+import paddle.fluid.core as core
+import paddle.fluid.framework as framework
+import paddle.fluid.layers as layers
 import contextlib
 import math
 import sys
 import unittest
-from paddle.v2.fluid.executor import Executor
+from paddle.fluid.executor import Executor
 
 dict_size = 30000
 source_dict_dim = target_dict_dim = dict_size

python/paddle/fluid/tests/book/test_fit_a_line.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import contextlib
 import numpy
 import unittest

python/paddle/fluid/tests/book/test_image_classification.py

@@ -15,7 +15,7 @@
 from __future__ import print_function
 
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import contextlib
 import math
 import sys

python/paddle/fluid/tests/book/test_label_semantic_roles.py

@@ -17,8 +17,8 @@
 import numpy as np
 import paddle.v2 as paddle
 import paddle.v2.dataset.conll05 as conll05
-import paddle.v2.fluid as fluid
-from paddle.v2.fluid.initializer import init_on_cpu
+import paddle.fluid as fluid
+from paddle.fluid.initializer import init_on_cpu
 import contextlib
 import time
 import unittest