Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into...

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into feature/enhance_layer_generator

Dockerfile

@@ -22,7 +22,8 @@ COPY ./paddle/scripts/docker/root/ /root/
 
 RUN apt-get update && \
     apt-get install -y \
-    git python-pip python-dev openssh-server bison libnccl-dev \
+    git python-pip python-dev openssh-server bison \
+    libnccl2=2.1.2-1+cuda8.0 libnccl-dev=2.1.2-1+cuda8.0 \
     wget unzip unrar tar xz-utils bzip2 gzip coreutils ntp \
     curl sed grep graphviz libjpeg-dev zlib1g-dev  \
     python-matplotlib gcc-4.8 g++-4.8 \

doc/api/overview.rst

-API Overview
-============
+V2 API Overview
+================
 
-TBD
+The PaddlePaddle V2 API is designed to provide a modern user interface for PaddlePaddle V1(the original layer-based platform of PaddlePaddle),
+it proposes some high-level concepts such as `Layers <http://www.paddlepaddle.org/docs/develop/api/en/v2/config/layer.html>`_ , `Optimizer <http://www.paddlepaddle.org/docs/develop/api/en/v2/config/optimizer.html>`_ , `Evaluator <http://www.paddlepaddle.org/docs/develop/api/en/v2/config/evaluators.html>`_  and `Data Reader <http://www.paddlepaddle.org/docs/develop/api/en/v2/data/data_reader.html>`_ to make the model configuration more familiar to users.
+
+A model is composed of the computation described by a group of `Layers`, with `Evaluator` to define the error, `Optimizer` to update the parameters and `Data Reader` to feed in the data.
+
+We also provide the `interface for Training and Inference <http://www.paddlepaddle.org/docs/develop/api/en/v2/run_logic.html>`_ to help control the training and inference phrase,
+it has several easy to use methods
+
+- `paddle.train` 
+- `paddle.test`
+- `paddle.infer`
+
+to better expose the internal running details, different `events <http://www.paddlepaddle.org/docs/develop/api/en/v2/run_logic.html#event>`_ are available to users by writing some callbacks.

doc/api/v2/fluid/data_feeder.rst

@@ -8,7 +8,7 @@ data_feeder
 DataFeeder
 ----------
 
-..  autoclass:: paddle.v2.fluid.data_feeder.DataFeeder
+..  autoclass:: paddle.fluid.data_feeder.DataFeeder
     :members:
     :noindex:
 

doc/api/v2/fluid/evaluator.rst

@@ -8,14 +8,14 @@ evaluator
 Accuracy
 --------
 
-..  autoclass:: paddle.v2.fluid.evaluator.Accuracy
+..  autoclass:: paddle.fluid.evaluator.Accuracy
     :members:
     :noindex:
 
 ChunkEvaluator
 --------------
 
-..  autoclass:: paddle.v2.fluid.evaluator.ChunkEvaluator
+..  autoclass:: paddle.fluid.evaluator.ChunkEvaluator
     :members:
     :noindex:
 

doc/api/v2/fluid/executor.rst

@@ -8,25 +8,25 @@ executor
 Executor
 --------
 
-..  autoclass:: paddle.v2.fluid.executor.Executor
+..  autoclass:: paddle.fluid.executor.Executor
     :members:
     :noindex:
 
 global_scope
 ------------
 
-..  autofunction:: paddle.v2.fluid.executor.global_scope
+..  autofunction:: paddle.fluid.executor.global_scope
     :noindex:
 
 scope_guard
 -----------
 
-..  autofunction:: paddle.v2.fluid.executor.scope_guard
+..  autofunction:: paddle.fluid.executor.scope_guard
     :noindex:
 
 switch_scope
 ------------
 
-..  autofunction:: paddle.v2.fluid.executor.switch_scope
+..  autofunction:: paddle.fluid.executor.switch_scope
     :noindex:
 

doc/api/v2/fluid/gen_doc.py

@@ -17,7 +17,7 @@ import argparse
 import sys
 import types
 
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 
 
 def parse_arg():
@@ -70,7 +70,7 @@ class DocGenerator(object):
 
     def print_class(self, name):
         self._print_header_(name, dot='-', is_title=False)
-        self.stream.write('''..  autoclass:: paddle.v2.fluid.{0}.{1}
+        self.stream.write('''..  autoclass:: paddle.fluid.{0}.{1}
     :members:
     :noindex:
 
@@ -78,7 +78,7 @@ class DocGenerator(object):
 
     def print_method(self, name):
         self._print_header_(name, dot='-', is_title=False)
-        self.stream.write('''..  autofunction:: paddle.v2.fluid.{0}.{1}
+        self.stream.write('''..  autofunction:: paddle.fluid.{0}.{1}
     :noindex:
 
 '''.format(self.module_name, name))

doc/api/v2/fluid/initializer.rst

@@ -8,28 +8,28 @@ initializer
 Constant
 --------
 
-..  autoclass:: paddle.v2.fluid.initializer.Constant
+..  autoclass:: paddle.fluid.initializer.Constant
     :members:
     :noindex:
 
 Uniform
 -------
 
-..  autoclass:: paddle.v2.fluid.initializer.Uniform
+..  autoclass:: paddle.fluid.initializer.Uniform
     :members:
     :noindex:
 
 Normal
 ------
 
-..  autoclass:: paddle.v2.fluid.initializer.Normal
+..  autoclass:: paddle.fluid.initializer.Normal
     :members:
     :noindex:
 
 Xavier
 ------
 
-..  autoclass:: paddle.v2.fluid.initializer.Xavier
+..  autoclass:: paddle.fluid.initializer.Xavier
     :members:
     :noindex:
 

doc/api/v2/fluid/io.rst

@@ -8,54 +8,54 @@ io
 save_vars
 ---------
 
-..  autofunction:: paddle.v2.fluid.io.save_vars
+..  autofunction:: paddle.fluid.io.save_vars
     :noindex:
 
 save_params
 -----------
 
-..  autofunction:: paddle.v2.fluid.io.save_params
+..  autofunction:: paddle.fluid.io.save_params
     :noindex:
 
 save_persistables
 -----------------
 
-..  autofunction:: paddle.v2.fluid.io.save_persistables
+..  autofunction:: paddle.fluid.io.save_persistables
     :noindex:
 
 load_vars
 ---------
 
-..  autofunction:: paddle.v2.fluid.io.load_vars
+..  autofunction:: paddle.fluid.io.load_vars
     :noindex:
 
 load_params
 -----------
 
-..  autofunction:: paddle.v2.fluid.io.load_params
+..  autofunction:: paddle.fluid.io.load_params
     :noindex:
 
 load_persistables
 -----------------
 
-..  autofunction:: paddle.v2.fluid.io.load_persistables
+..  autofunction:: paddle.fluid.io.load_persistables
     :noindex:
 
 save_inference_model
 --------------------
 
-..  autofunction:: paddle.v2.fluid.io.save_inference_model
+..  autofunction:: paddle.fluid.io.save_inference_model
     :noindex:
 
 load_inference_model
 --------------------
 
-..  autofunction:: paddle.v2.fluid.io.load_inference_model
+..  autofunction:: paddle.fluid.io.load_inference_model
     :noindex:
 
 get_inference_program
 ---------------------
 
-..  autofunction:: paddle.v2.fluid.io.get_inference_program
+..  autofunction:: paddle.fluid.io.get_inference_program
     :noindex:
 

doc/api/v2/fluid/layers.rst

@@ -11,167 +11,167 @@ control_flow
 split_lod_tensor
 ----------------
 
-..  autofunction:: paddle.v2.fluid.layers.split_lod_tensor
+..  autofunction:: paddle.fluid.layers.split_lod_tensor
     :noindex:
 
 merge_lod_tensor
 ----------------
 
-..  autofunction:: paddle.v2.fluid.layers.merge_lod_tensor
+..  autofunction:: paddle.fluid.layers.merge_lod_tensor
     :noindex:
 
 BlockGuard
 ----------
 
-..  autoclass:: paddle.v2.fluid.layers.BlockGuard
+..  autoclass:: paddle.fluid.layers.BlockGuard
     :members:
     :noindex:
 
 BlockGuardWithCompletion
 ------------------------
 
-..  autoclass:: paddle.v2.fluid.layers.BlockGuardWithCompletion
+..  autoclass:: paddle.fluid.layers.BlockGuardWithCompletion
     :members:
     :noindex:
 
 StaticRNNMemoryLink
 -------------------
 
-..  autoclass:: paddle.v2.fluid.layers.StaticRNNMemoryLink
+..  autoclass:: paddle.fluid.layers.StaticRNNMemoryLink
     :members:
     :noindex:
 
 WhileGuard
 ----------
 
-..  autoclass:: paddle.v2.fluid.layers.WhileGuard
+..  autoclass:: paddle.fluid.layers.WhileGuard
     :members:
     :noindex:
 
 While
 -----
 
-..  autoclass:: paddle.v2.fluid.layers.While
+..  autoclass:: paddle.fluid.layers.While
     :members:
     :noindex:
 
 lod_rank_table
 --------------
 
-..  autofunction:: paddle.v2.fluid.layers.lod_rank_table
+..  autofunction:: paddle.fluid.layers.lod_rank_table
     :noindex:
 
 max_sequence_len
 ----------------
 
-..  autofunction:: paddle.v2.fluid.layers.max_sequence_len
+..  autofunction:: paddle.fluid.layers.max_sequence_len
     :noindex:
 
 topk
 ----
 
-..  autofunction:: paddle.v2.fluid.layers.topk
+..  autofunction:: paddle.fluid.layers.topk
     :noindex:
 
 lod_tensor_to_array
 -------------------
 
-..  autofunction:: paddle.v2.fluid.layers.lod_tensor_to_array
+..  autofunction:: paddle.fluid.layers.lod_tensor_to_array
     :noindex:
 
 array_to_lod_tensor
 -------------------
 
-..  autofunction:: paddle.v2.fluid.layers.array_to_lod_tensor
+..  autofunction:: paddle.fluid.layers.array_to_lod_tensor
     :noindex:
 
 increment
 ---------
 
-..  autofunction:: paddle.v2.fluid.layers.increment
+..  autofunction:: paddle.fluid.layers.increment
     :noindex:
 
 array_write
 -----------
 
-..  autofunction:: paddle.v2.fluid.layers.array_write
+..  autofunction:: paddle.fluid.layers.array_write
     :noindex:
 
 create_array
 ------------
 
-..  autofunction:: paddle.v2.fluid.layers.create_array
+..  autofunction:: paddle.fluid.layers.create_array
     :noindex:
 
 less_than
 ---------
 
-..  autofunction:: paddle.v2.fluid.layers.less_than
+..  autofunction:: paddle.fluid.layers.less_than
     :noindex:
 
 array_read
 ----------
 
-..  autofunction:: paddle.v2.fluid.layers.array_read
+..  autofunction:: paddle.fluid.layers.array_read
     :noindex:
 
 shrink_memory
 -------------
 
-..  autofunction:: paddle.v2.fluid.layers.shrink_memory
+..  autofunction:: paddle.fluid.layers.shrink_memory
     :noindex:
 
 array_length
 ------------
 
-..  autofunction:: paddle.v2.fluid.layers.array_length
+..  autofunction:: paddle.fluid.layers.array_length
     :noindex:
 
 IfElse
 ------
 
-..  autoclass:: paddle.v2.fluid.layers.IfElse
+..  autoclass:: paddle.fluid.layers.IfElse
     :members:
     :noindex:
 
 DynamicRNN
 ----------
 
-..  autoclass:: paddle.v2.fluid.layers.DynamicRNN
+..  autoclass:: paddle.fluid.layers.DynamicRNN
     :members:
     :noindex:
 
 ConditionalBlock
 ----------------
 
-..  autoclass:: paddle.v2.fluid.layers.ConditionalBlock
+..  autoclass:: paddle.fluid.layers.ConditionalBlock
     :members:
     :noindex:
 
 StaticRNN
 ---------
 
-..  autoclass:: paddle.v2.fluid.layers.StaticRNN
+..  autoclass:: paddle.fluid.layers.StaticRNN
     :members:
     :noindex:
 
 reorder_lod_tensor_by_rank
 --------------------------
 
-..  autofunction:: paddle.v2.fluid.layers.reorder_lod_tensor_by_rank
+..  autofunction:: paddle.fluid.layers.reorder_lod_tensor_by_rank
     :noindex:
 
 ParallelDo
 ----------
 
-..  autoclass:: paddle.v2.fluid.layers.ParallelDo
+..  autoclass:: paddle.fluid.layers.ParallelDo
     :members:
     :noindex:
 
 Print
 -----
 
-..  autofunction:: paddle.v2.fluid.layers.Print
+..  autofunction:: paddle.fluid.layers.Print
     :noindex:
 
 device
@@ -180,7 +180,7 @@ device
 get_places
 ----------
 
-..  autofunction:: paddle.v2.fluid.layers.get_places
+..  autofunction:: paddle.fluid.layers.get_places
     :noindex:
 
 io
@@ -189,27 +189,27 @@ io
 data
 ----
 
-..  autofunction:: paddle.v2.fluid.layers.data
+..  autofunction:: paddle.fluid.layers.data
     :noindex:
 
 BlockGuardServ
 --------------
 
-..  autoclass:: paddle.v2.fluid.layers.BlockGuardServ
+..  autoclass:: paddle.fluid.layers.BlockGuardServ
     :members:
     :noindex:
 
 ListenAndServ
 -------------
 
-..  autoclass:: paddle.v2.fluid.layers.ListenAndServ
+..  autoclass:: paddle.fluid.layers.ListenAndServ
     :members:
     :noindex:
 
 Send
 ----
 
-..  autofunction:: paddle.v2.fluid.layers.Send
+..  autofunction:: paddle.fluid.layers.Send
     :noindex:
 
 nn
@@ -218,259 +218,259 @@ nn
 fc
 --
 
-..  autofunction:: paddle.v2.fluid.layers.fc
+..  autofunction:: paddle.fluid.layers.fc
     :noindex:
 
 embedding
 ---------
 
-..  autofunction:: paddle.v2.fluid.layers.embedding
+..  autofunction:: paddle.fluid.layers.embedding
     :noindex:
 
 dynamic_lstm
 ------------
 
-..  autofunction:: paddle.v2.fluid.layers.dynamic_lstm
+..  autofunction:: paddle.fluid.layers.dynamic_lstm
     :noindex:
 
 dynamic_lstmp
 -------------
 
-..  autofunction:: paddle.v2.fluid.layers.dynamic_lstmp
+..  autofunction:: paddle.fluid.layers.dynamic_lstmp
     :noindex:
 
 dynamic_gru
 -----------
 
-..  autofunction:: paddle.v2.fluid.layers.dynamic_gru
+..  autofunction:: paddle.fluid.layers.dynamic_gru
     :noindex:
 
 gru_unit
 --------
 
-..  autofunction:: paddle.v2.fluid.layers.gru_unit
+..  autofunction:: paddle.fluid.layers.gru_unit
     :noindex:
 
 linear_chain_crf
 ----------------
 
-..  autofunction:: paddle.v2.fluid.layers.linear_chain_crf
+..  autofunction:: paddle.fluid.layers.linear_chain_crf
     :noindex:
 
 crf_decoding
 ------------
 
-..  autofunction:: paddle.v2.fluid.layers.crf_decoding
+..  autofunction:: paddle.fluid.layers.crf_decoding
     :noindex:
 
 cos_sim
 -------
 
-..  autofunction:: paddle.v2.fluid.layers.cos_sim
+..  autofunction:: paddle.fluid.layers.cos_sim
     :noindex:
 
 cross_entropy
 -------------
 
-..  autofunction:: paddle.v2.fluid.layers.cross_entropy
+..  autofunction:: paddle.fluid.layers.cross_entropy
     :noindex:
 
 square_error_cost
 -----------------
 
-..  autofunction:: paddle.v2.fluid.layers.square_error_cost
+..  autofunction:: paddle.fluid.layers.square_error_cost
     :noindex:
 
 accuracy
 --------
 
-..  autofunction:: paddle.v2.fluid.layers.accuracy
+..  autofunction:: paddle.fluid.layers.accuracy
     :noindex:
 
 chunk_eval
 ----------
 
-..  autofunction:: paddle.v2.fluid.layers.chunk_eval
+..  autofunction:: paddle.fluid.layers.chunk_eval
     :noindex:
 
 sequence_conv
 -------------
 
-..  autofunction:: paddle.v2.fluid.layers.sequence_conv
+..  autofunction:: paddle.fluid.layers.sequence_conv
     :noindex:
 
 conv2d
 ------
 
-..  autofunction:: paddle.v2.fluid.layers.conv2d
+..  autofunction:: paddle.fluid.layers.conv2d
     :noindex:
 
 sequence_pool
 -------------
 
-..  autofunction:: paddle.v2.fluid.layers.sequence_pool
+..  autofunction:: paddle.fluid.layers.sequence_pool
     :noindex:
 
 pool2d
 ------
 
-..  autofunction:: paddle.v2.fluid.layers.pool2d
+..  autofunction:: paddle.fluid.layers.pool2d
     :noindex:
 
 batch_norm
 ----------
 
-..  autofunction:: paddle.v2.fluid.layers.batch_norm
+..  autofunction:: paddle.fluid.layers.batch_norm
     :noindex:
 
 layer_norm
 ----------
 
-..  autofunction:: paddle.v2.fluid.layers.layer_norm
+..  autofunction:: paddle.fluid.layers.layer_norm
     :noindex:
 
 beam_search_decode
 ------------------
 
-..  autofunction:: paddle.v2.fluid.layers.beam_search_decode
+..  autofunction:: paddle.fluid.layers.beam_search_decode
     :noindex:
 
 conv2d_transpose
 ----------------
 
-..  autofunction:: paddle.v2.fluid.layers.conv2d_transpose
+..  autofunction:: paddle.fluid.layers.conv2d_transpose
     :noindex:
 
 sequence_expand
 ---------------
 
-..  autofunction:: paddle.v2.fluid.layers.sequence_expand
+..  autofunction:: paddle.fluid.layers.sequence_expand
     :noindex:
 
 lstm_unit
 ---------
 
-..  autofunction:: paddle.v2.fluid.layers.lstm_unit
+..  autofunction:: paddle.fluid.layers.lstm_unit
     :noindex:
 
 reduce_sum
 ----------
 
-..  autofunction:: paddle.v2.fluid.layers.reduce_sum
+..  autofunction:: paddle.fluid.layers.reduce_sum
     :noindex:
 
 reduce_mean
 -----------
 
-..  autofunction:: paddle.v2.fluid.layers.reduce_mean
+..  autofunction:: paddle.fluid.layers.reduce_mean
     :noindex:
 
 reduce_max
 ----------
 
-..  autofunction:: paddle.v2.fluid.layers.reduce_max
+..  autofunction:: paddle.fluid.layers.reduce_max
     :noindex:
 
 reduce_min
 ----------
 
-..  autofunction:: paddle.v2.fluid.layers.reduce_min
+..  autofunction:: paddle.fluid.layers.reduce_min
     :noindex:
 
 sequence_first_step
 -------------------
 
-..  autofunction:: paddle.v2.fluid.layers.sequence_first_step
+..  autofunction:: paddle.fluid.layers.sequence_first_step
     :noindex:
 
 sequence_last_step
 ------------------
 
-..  autofunction:: paddle.v2.fluid.layers.sequence_last_step
+..  autofunction:: paddle.fluid.layers.sequence_last_step
     :noindex:
 
 dropout
 -------
 
-..  autofunction:: paddle.v2.fluid.layers.dropout
+..  autofunction:: paddle.fluid.layers.dropout
     :noindex:
 
 split
 -----
 
-..  autofunction:: paddle.v2.fluid.layers.split
+..  autofunction:: paddle.fluid.layers.split
     :noindex:
 
 ctc_greedy_decoder
 ------------------
 
-..  autofunction:: paddle.v2.fluid.layers.ctc_greedy_decoder
+..  autofunction:: paddle.fluid.layers.ctc_greedy_decoder
     :noindex:
 
 edit_distance
 -------------
 
-..  autofunction:: paddle.v2.fluid.layers.edit_distance
+..  autofunction:: paddle.fluid.layers.edit_distance
     :noindex:
 
 l2_normalize
 ------------
 
-..  autofunction:: paddle.v2.fluid.layers.l2_normalize
+..  autofunction:: paddle.fluid.layers.l2_normalize
     :noindex:
 
 matmul
 ------
 
-..  autofunction:: paddle.v2.fluid.layers.matmul
+..  autofunction:: paddle.fluid.layers.matmul
     :noindex:
 
 warpctc
 -------
 
-..  autofunction:: paddle.v2.fluid.layers.warpctc
+..  autofunction:: paddle.fluid.layers.warpctc
     :noindex:
 
 sequence_reshape
 ----------------
 
-..  autofunction:: paddle.v2.fluid.layers.sequence_reshape
+..  autofunction:: paddle.fluid.layers.sequence_reshape
     :noindex:
 
 transpose
 ---------
 
-..  autofunction:: paddle.v2.fluid.layers.transpose
+..  autofunction:: paddle.fluid.layers.transpose
     :noindex:
 
 im2sequence
 -----------
 
-..  autofunction:: paddle.v2.fluid.layers.im2sequence
+..  autofunction:: paddle.fluid.layers.im2sequence
     :noindex:
 
 nce
 ---
 
-..  autofunction:: paddle.v2.fluid.layers.nce
+..  autofunction:: paddle.fluid.layers.nce
     :noindex:
 
 beam_search
 -----------
 
-..  autofunction:: paddle.v2.fluid.layers.beam_search
+..  autofunction:: paddle.fluid.layers.beam_search
     :noindex:
 
 row_conv
 --------
 
-..  autofunction:: paddle.v2.fluid.layers.row_conv
+..  autofunction:: paddle.fluid.layers.row_conv
     :noindex:
 
 multiplex
 ---------
 
-..  autofunction:: paddle.v2.fluid.layers.multiplex
+..  autofunction:: paddle.fluid.layers.multiplex
     :noindex:
 
 ops
@@ -479,259 +479,259 @@ ops
 mean
 ----
 
-..  autofunction:: paddle.v2.fluid.layers.mean
+..  autofunction:: paddle.fluid.layers.mean
     :noindex:
 
 mul
 ---
 
-..  autofunction:: paddle.v2.fluid.layers.mul
+..  autofunction:: paddle.fluid.layers.mul
     :noindex:
 
 reshape
 -------
 
-..  autofunction:: paddle.v2.fluid.layers.reshape
+..  autofunction:: paddle.fluid.layers.reshape
     :noindex:
 
 scale
 -----
 
-..  autofunction:: paddle.v2.fluid.layers.scale
+..  autofunction:: paddle.fluid.layers.scale
     :noindex:
 
 sigmoid_cross_entropy_with_logits
 ---------------------------------
 
-..  autofunction:: paddle.v2.fluid.layers.sigmoid_cross_entropy_with_logits
+..  autofunction:: paddle.fluid.layers.sigmoid_cross_entropy_with_logits
     :noindex:
 
 elementwise_add
 ---------------
 
-..  autofunction:: paddle.v2.fluid.layers.elementwise_add
+..  autofunction:: paddle.fluid.layers.elementwise_add
     :noindex:
 
 elementwise_div
 ---------------
 
-..  autofunction:: paddle.v2.fluid.layers.elementwise_div
+..  autofunction:: paddle.fluid.layers.elementwise_div
     :noindex:
 
 elementwise_sub
 ---------------
 
-..  autofunction:: paddle.v2.fluid.layers.elementwise_sub
+..  autofunction:: paddle.fluid.layers.elementwise_sub
     :noindex:
 
 elementwise_mul
 ---------------
 
-..  autofunction:: paddle.v2.fluid.layers.elementwise_mul
+..  autofunction:: paddle.fluid.layers.elementwise_mul
     :noindex:
 
 elementwise_max
 ---------------
 
-..  autofunction:: paddle.v2.fluid.layers.elementwise_max
+..  autofunction:: paddle.fluid.layers.elementwise_max
     :noindex:
 
 elementwise_min
 ---------------
 
-..  autofunction:: paddle.v2.fluid.layers.elementwise_min
+..  autofunction:: paddle.fluid.layers.elementwise_min
     :noindex:
 
 elementwise_pow
 ---------------
 
-..  autofunction:: paddle.v2.fluid.layers.elementwise_pow
+..  autofunction:: paddle.fluid.layers.elementwise_pow
     :noindex:
 
 clip
 ----
 
-..  autofunction:: paddle.v2.fluid.layers.clip
+..  autofunction:: paddle.fluid.layers.clip
     :noindex:
 
 clip_by_norm
 ------------
 
-..  autofunction:: paddle.v2.fluid.layers.clip_by_norm
+..  autofunction:: paddle.fluid.layers.clip_by_norm
     :noindex:
 
 sequence_softmax
 ----------------
 
-..  autofunction:: paddle.v2.fluid.layers.sequence_softmax
+..  autofunction:: paddle.fluid.layers.sequence_softmax
     :noindex:
 
 sigmoid
 -------
 
-..  autofunction:: paddle.v2.fluid.layers.sigmoid
+..  autofunction:: paddle.fluid.layers.sigmoid
     :noindex:
 
 logsigmoid
 ----------
 
-..  autofunction:: paddle.v2.fluid.layers.logsigmoid
+..  autofunction:: paddle.fluid.layers.logsigmoid
     :noindex:
 
 exp
 ---
 
-..  autofunction:: paddle.v2.fluid.layers.exp
+..  autofunction:: paddle.fluid.layers.exp
     :noindex:
 
 relu
 ----
 
-..  autofunction:: paddle.v2.fluid.layers.relu
+..  autofunction:: paddle.fluid.layers.relu
     :noindex:
 
 tanh
 ----
 
-..  autofunction:: paddle.v2.fluid.layers.tanh
+..  autofunction:: paddle.fluid.layers.tanh
     :noindex:
 
 tanh_shrink
 -----------
 
-..  autofunction:: paddle.v2.fluid.layers.tanh_shrink
+..  autofunction:: paddle.fluid.layers.tanh_shrink
     :noindex:
 
 softshrink
 ----------
 
-..  autofunction:: paddle.v2.fluid.layers.softshrink
+..  autofunction:: paddle.fluid.layers.softshrink
     :noindex:
 
 sqrt
 ----
 
-..  autofunction:: paddle.v2.fluid.layers.sqrt
+..  autofunction:: paddle.fluid.layers.sqrt
     :noindex:
 
 abs
 ---
 
-..  autofunction:: paddle.v2.fluid.layers.abs
+..  autofunction:: paddle.fluid.layers.abs
     :noindex:
 
 ceil
 ----
 
-..  autofunction:: paddle.v2.fluid.layers.ceil
+..  autofunction:: paddle.fluid.layers.ceil
     :noindex:
 
 floor
 -----
 
-..  autofunction:: paddle.v2.fluid.layers.floor
+..  autofunction:: paddle.fluid.layers.floor
     :noindex:
 
 round
 -----
 
-..  autofunction:: paddle.v2.fluid.layers.round
+..  autofunction:: paddle.fluid.layers.round
     :noindex:
 
 reciprocal
 ----------
 
-..  autofunction:: paddle.v2.fluid.layers.reciprocal
+..  autofunction:: paddle.fluid.layers.reciprocal
     :noindex:
 
 log
 ---
 
-..  autofunction:: paddle.v2.fluid.layers.log
+..  autofunction:: paddle.fluid.layers.log
     :noindex:
 
 square
 ------
 
-..  autofunction:: paddle.v2.fluid.layers.square
+..  autofunction:: paddle.fluid.layers.square
     :noindex:
 
 softplus
 --------
 
-..  autofunction:: paddle.v2.fluid.layers.softplus
+..  autofunction:: paddle.fluid.layers.softplus
     :noindex:
 
 softsign
 --------
 
-..  autofunction:: paddle.v2.fluid.layers.softsign
+..  autofunction:: paddle.fluid.layers.softsign
     :noindex:
 
 brelu
 -----
 
-..  autofunction:: paddle.v2.fluid.layers.brelu
+..  autofunction:: paddle.fluid.layers.brelu
     :noindex:
 
 leaky_relu
 ----------
 
-..  autofunction:: paddle.v2.fluid.layers.leaky_relu
+..  autofunction:: paddle.fluid.layers.leaky_relu
     :noindex:
 
 soft_relu
 ---------
 
-..  autofunction:: paddle.v2.fluid.layers.soft_relu
+..  autofunction:: paddle.fluid.layers.soft_relu
     :noindex:
 
 elu
 ---
 
-..  autofunction:: paddle.v2.fluid.layers.elu
+..  autofunction:: paddle.fluid.layers.elu
     :noindex:
 
 relu6
 -----
 
-..  autofunction:: paddle.v2.fluid.layers.relu6
+..  autofunction:: paddle.fluid.layers.relu6
     :noindex:
 
 pow
 ---
 
-..  autofunction:: paddle.v2.fluid.layers.pow
+..  autofunction:: paddle.fluid.layers.pow
     :noindex:
 
 stanh
 -----
 
-..  autofunction:: paddle.v2.fluid.layers.stanh
+..  autofunction:: paddle.fluid.layers.stanh
     :noindex:
 
 hard_shrink
 -----------
 
-..  autofunction:: paddle.v2.fluid.layers.hard_shrink
+..  autofunction:: paddle.fluid.layers.hard_shrink
     :noindex:
 
 thresholded_relu
 ----------------
 
-..  autofunction:: paddle.v2.fluid.layers.thresholded_relu
+..  autofunction:: paddle.fluid.layers.thresholded_relu
     :noindex:
 
 hard_sigmoid
 ------------
 
-..  autofunction:: paddle.v2.fluid.layers.hard_sigmoid
+..  autofunction:: paddle.fluid.layers.hard_sigmoid
     :noindex:
 
 swish
 -----
 
-..  autofunction:: paddle.v2.fluid.layers.swish
+..  autofunction:: paddle.fluid.layers.swish
     :noindex:
 
 tensor
@@ -740,66 +740,66 @@ tensor
 create_tensor
 -------------
 
-..  autofunction:: paddle.v2.fluid.layers.create_tensor
+..  autofunction:: paddle.fluid.layers.create_tensor
     :noindex:
 
 create_parameter
 ----------------
 
-..  autofunction:: paddle.v2.fluid.layers.create_parameter
+..  autofunction:: paddle.fluid.layers.create_parameter
     :noindex:
 
 create_global_var
 -----------------
 
-..  autofunction:: paddle.v2.fluid.layers.create_global_var
+..  autofunction:: paddle.fluid.layers.create_global_var
     :noindex:
 
 cast
 ----
 
-..  autofunction:: paddle.v2.fluid.layers.cast
+..  autofunction:: paddle.fluid.layers.cast
     :noindex:
 
 concat
 ------
 
-..  autofunction:: paddle.v2.fluid.layers.concat
+..  autofunction:: paddle.fluid.layers.concat
     :noindex:
 
 sums
 ----
 
-..  autofunction:: paddle.v2.fluid.layers.sums
+..  autofunction:: paddle.fluid.layers.sums
     :noindex:
 
 assign
 ------
 
-..  autofunction:: paddle.v2.fluid.layers.assign
+..  autofunction:: paddle.fluid.layers.assign
     :noindex:
 
 fill_constant_batch_size_like
 -----------------------------
 
-..  autofunction:: paddle.v2.fluid.layers.fill_constant_batch_size_like
+..  autofunction:: paddle.fluid.layers.fill_constant_batch_size_like
     :noindex:
 
 fill_constant
 -------------
 
-..  autofunction:: paddle.v2.fluid.layers.fill_constant
+..  autofunction:: paddle.fluid.layers.fill_constant
     :noindex:
 
 ones
 ----
 
-..  autofunction:: paddle.v2.fluid.layers.ones
+..  autofunction:: paddle.fluid.layers.ones
     :noindex:
 
 zeros
 -----
 
-..  autofunction:: paddle.v2.fluid.layers.zeros
+..  autofunction:: paddle.fluid.layers.zeros
     :noindex:
 

doc/api/v2/fluid/nets.rst

@@ -8,24 +8,24 @@ nets
 simple_img_conv_pool
 --------------------
 
-..  autofunction:: paddle.v2.fluid.nets.simple_img_conv_pool
+..  autofunction:: paddle.fluid.nets.simple_img_conv_pool
     :noindex:
 
 sequence_conv_pool
 ------------------
 
-..  autofunction:: paddle.v2.fluid.nets.sequence_conv_pool
+..  autofunction:: paddle.fluid.nets.sequence_conv_pool
     :noindex:
 
 glu
 ---
 
-..  autofunction:: paddle.v2.fluid.nets.glu
+..  autofunction:: paddle.fluid.nets.glu
     :noindex:
 
 scaled_dot_product_attention
 ----------------------------
 
-..  autofunction:: paddle.v2.fluid.nets.scaled_dot_product_attention
+..  autofunction:: paddle.fluid.nets.scaled_dot_product_attention
     :noindex:
 

doc/api/v2/fluid/optimizer.rst

@@ -8,42 +8,42 @@ optimizer
 SGD
 ---
 
-..  autoclass:: paddle.v2.fluid.optimizer.SGD
+..  autoclass:: paddle.fluid.optimizer.SGD
     :members:
     :noindex:
 
 Momentum
 --------
 
-..  autoclass:: paddle.v2.fluid.optimizer.Momentum
+..  autoclass:: paddle.fluid.optimizer.Momentum
     :members:
     :noindex:
 
 Adagrad
 -------
 
-..  autoclass:: paddle.v2.fluid.optimizer.Adagrad
+..  autoclass:: paddle.fluid.optimizer.Adagrad
     :members:
     :noindex:
 
 Adam
 ----
 
-..  autoclass:: paddle.v2.fluid.optimizer.Adam
+..  autoclass:: paddle.fluid.optimizer.Adam
     :members:
     :noindex:
 
 Adamax
 ------
 
-..  autoclass:: paddle.v2.fluid.optimizer.Adamax
+..  autoclass:: paddle.fluid.optimizer.Adamax
     :members:
     :noindex:
 
 DecayedAdagrad
 --------------
 
-..  autoclass:: paddle.v2.fluid.optimizer.DecayedAdagrad
+..  autoclass:: paddle.fluid.optimizer.DecayedAdagrad
     :members:
     :noindex:
 

doc/api/v2/fluid/param_attr.rst

@@ -8,14 +8,14 @@ param_attr
 ParamAttr
 ---------
 
-..  autoclass:: paddle.v2.fluid.param_attr.ParamAttr
+..  autoclass:: paddle.fluid.param_attr.ParamAttr
     :members:
     :noindex:
 
 WeightNormParamAttr
 -------------------
 
-..  autoclass:: paddle.v2.fluid.param_attr.WeightNormParamAttr
+..  autoclass:: paddle.fluid.param_attr.WeightNormParamAttr
     :members:
     :noindex:
 

doc/api/v2/fluid/profiler.rst

@@ -8,18 +8,18 @@ profiler
 cuda_profiler
 -------------
 
-..  autofunction:: paddle.v2.fluid.profiler.cuda_profiler
+..  autofunction:: paddle.fluid.profiler.cuda_profiler
     :noindex:
 
 reset_profiler
 --------------
 
-..  autofunction:: paddle.v2.fluid.profiler.reset_profiler
+..  autofunction:: paddle.fluid.profiler.reset_profiler
     :noindex:
 
 profiler
 --------
 
-..  autofunction:: paddle.v2.fluid.profiler.profiler
+..  autofunction:: paddle.fluid.profiler.profiler
     :noindex:
 

doc/api/v2/fluid/regularizer.rst

@@ -8,20 +8,20 @@ regularizer
 append_regularization_ops
 -------------------------
 
-..  autofunction:: paddle.v2.fluid.regularizer.append_regularization_ops
+..  autofunction:: paddle.fluid.regularizer.append_regularization_ops
     :noindex:
 
 L1Decay
 -------
 
-..  autoclass:: paddle.v2.fluid.regularizer.L1Decay
+..  autoclass:: paddle.fluid.regularizer.L1Decay
     :members:
     :noindex:
 
 L2Decay
 -------
 
-..  autoclass:: paddle.v2.fluid.regularizer.L2Decay
+..  autoclass:: paddle.fluid.regularizer.L2Decay
     :members:
     :noindex:
 

doc/templates/conf.py.cn.in

@@ -18,6 +18,7 @@ import shlex
 from recommonmark import parser, transform
 import paddle
 import paddle.v2
+import paddle.fluid
 
 MarkdownParser = parser.CommonMarkParser
 AutoStructify = transform.AutoStructify

doc/templates/conf.py.en.in

@@ -18,6 +18,7 @@ import shlex
 from recommonmark import parser, transform
 import paddle
 import paddle.v2
+import paddle.fluid
 
 
 MarkdownParser = parser.CommonMarkParser

paddle/fluid/framework/CMakeLists.txt

@@ -68,9 +68,9 @@ py_proto_compile(framework_py_proto SRCS framework.proto)
 add_custom_target(framework_py_proto_init ALL COMMAND ${CMAKE_COMMAND} -E touch __init__.py)
 add_dependencies(framework_py_proto framework_py_proto_init)
 add_custom_command(TARGET framework_py_proto POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${PADDLE_SOURCE_DIR}/python/paddle/v2/fluid/proto
-    COMMAND cp *.py ${PADDLE_SOURCE_DIR}/python/paddle/v2/fluid/proto/
-    COMMENT "Copy generated python proto into directory paddle/v2/fluid/proto."
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${PADDLE_SOURCE_DIR}/python/paddle/fluid/proto
+    COMMAND cp *.py ${PADDLE_SOURCE_DIR}/python/paddle/fluid/proto/
+    COMMENT "Copy generated python proto into directory paddle/fluid/proto."
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 cc_library(backward SRCS backward.cc DEPS net_op)

paddle/fluid/inference/tests/book/CMakeLists.txt

@@ -4,7 +4,7 @@ function(inference_test TARGET_NAME)
   set(multiValueArgs ARGS)
   cmake_parse_arguments(inference_test "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-  set(PYTHON_TESTS_DIR ${PADDLE_SOURCE_DIR}/python/paddle/v2/fluid/tests)
+  set(PYTHON_TESTS_DIR ${PADDLE_SOURCE_DIR}/python/paddle/fluid/tests)
   set(arg_list "")
   if(inference_test_ARGS)
     foreach(arg ${inference_test_ARGS})

paddle/fluid/platform/nccl_test.cu

@@ -129,9 +129,6 @@ TEST(NCCL, all_reduce) {
 }  // namespace paddle
 
 int main(int argc, char** argv) {
-  // FIXME(tonyyang-svail):
-  //   Due to the driver issue on our CI, disable for now
-  return 0;
   dev_count = paddle::platform::GetCUDADeviceCount();
   if (dev_count <= 1) {
     LOG(WARNING)

paddle/scripts/docker/build.sh

@@ -171,7 +171,7 @@ EOF
 EOF
 
     if [[ ${WITH_GPU} == "ON"  ]]; then
-        NCCL_DEPS="apt-get install -y libnccl-dev &&"
+        NCCL_DEPS="apt-get install -y libnccl2=2.1.2-1+cuda8.0 libnccl-dev=2.1.2-1+cuda8.0 &&"
     else
         NCCL_DEPS=""
     fi

python/CMakeLists.txt

@@ -3,12 +3,14 @@ file(GLOB TRAINER_PY_FILES . ./paddle/trainer/*.py)
 file(GLOB HELPERS_PY_FILES . ./paddle/trainer_config_helpers/*.py)
 file(GLOB UTILS_PY_FILES . ./paddle/utils/*.py)
 file(GLOB_RECURSE V2_PY_FILES ./paddle/v2/ *.py)
+file(GLOB_RECURSE FLUID_PY_FILES ./paddle/fluid/ *.py)
 
 set(PY_FILES paddle/__init__.py
   ${TRAINER_PY_FILES}
   ${HELPERS_PY_FILES}
   ${UTILS_PY_FILES}
-  ${V2_PY_FILES})
+  ${V2_PY_FILES}
+  ${FLUID_PY_FILES})
 
 add_custom_target(copy_paddle_master)
 
@@ -43,10 +45,10 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in
     ${CMAKE_CURRENT_BINARY_DIR}/setup.py)
 
 
-add_custom_command(OUTPUT ${PADDLE_SOURCE_DIR}/python/paddle/v2/fluid/core.so
-        COMMAND cmake -E copy $<TARGET_FILE:paddle_pybind> ${PADDLE_SOURCE_DIR}/python/paddle/v2/fluid/core.so
+add_custom_command(OUTPUT ${PADDLE_SOURCE_DIR}/python/paddle/fluid/core.so
+        COMMAND cmake -E copy $<TARGET_FILE:paddle_pybind> ${PADDLE_SOURCE_DIR}/python/paddle/fluid/core.so
         DEPENDS paddle_pybind)
-add_custom_target(copy_paddle_pybind ALL DEPENDS ${PADDLE_SOURCE_DIR}/python/paddle/v2/fluid/core.so)
+add_custom_target(copy_paddle_pybind ALL DEPENDS ${PADDLE_SOURCE_DIR}/python/paddle/fluid/core.so)
 
 
 add_custom_command(OUTPUT ${PADDLE_PYTHON_BUILD_DIR}/.timestamp
@@ -72,7 +74,7 @@ if (WITH_TESTING)
     add_subdirectory(paddle/v2/tests)
     add_subdirectory(paddle/v2/reader/tests)
     add_subdirectory(paddle/v2/plot/tests)
-    add_subdirectory(paddle/v2/fluid/tests)
+    add_subdirectory(paddle/fluid/tests)
   endif()
 endif()
 install(DIRECTORY ${PADDLE_PYTHON_PACKAGE_DIR}

python/paddle/v2/fluid/backward.py → 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/v2/fluid/default_scope_funcs.py → python/paddle/fluid/default_scope_funcs.py

@@ -26,7 +26,7 @@ A `scoped_function` will take a `function` as input. That function will be
 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 @@ __all__ = [
 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/v2/fluid/io.py → 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/v2/fluid/layer_helper.py → python/paddle/fluid/layer_helper.py

@@ -17,7 +17,7 @@ import itertools
 
 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/v2/fluid/net_drawer.py → python/paddle/fluid/net_drawer.py

@@ -17,8 +17,8 @@ import json
 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/v2/fluid/op.py → 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/v2/fluid/tests/book/notest_rnn_encoder_decoer.py → 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/v2/fluid/tests/book/test_fit_a_line.py → 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/v2/fluid/tests/book/test_image_classification.py → 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/v2/fluid/tests/book/test_label_semantic_roles.py → python/paddle/fluid/tests/book/test_label_semantic_roles.py

@@ -17,8 +17,8 @@ import math
 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

python/paddle/v2/fluid/tests/book/test_machine_translation.py → python/paddle/fluid/tests/book/test_machine_translation.py

@@ -15,10 +15,10 @@ import contextlib
 
 import numpy as np
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.framework as framework
-import paddle.v2.fluid.layers as pd
-from paddle.v2.fluid.executor import Executor
+import paddle.fluid as fluid
+import paddle.fluid.framework as framework
+import paddle.fluid.layers as pd
+from paddle.fluid.executor import Executor
 import unittest
 
 dict_size = 30000

python/paddle/v2/fluid/tests/book/test_recognize_digits.py → python/paddle/fluid/tests/book/test_recognize_digits.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 from __future__ import print_function
 import argparse
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import paddle.v2 as paddle
 import sys
 import numpy

python/paddle/v2/fluid/tests/book/test_recommender_system.py → python/paddle/fluid/tests/book/test_recommender_system.py

@@ -16,12 +16,12 @@ import math
 import sys
 import numpy as np
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.framework as framework
-import paddle.v2.fluid.layers as layers
-import paddle.v2.fluid.nets as nets
-from paddle.v2.fluid.executor import Executor
-from paddle.v2.fluid.optimizer import SGDOptimizer
+import paddle.fluid as fluid
+import paddle.fluid.framework as framework
+import paddle.fluid.layers as layers
+import paddle.fluid.nets as nets
+from paddle.fluid.executor import Executor
+from paddle.fluid.optimizer import SGDOptimizer
 
 IS_SPARSE = True
 USE_GPU = False

python/paddle/v2/fluid/tests/book/test_understand_sentiment.py → python/paddle/fluid/tests/book/test_understand_sentiment.py

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

python/paddle/v2/fluid/tests/book/test_word2vec.py → python/paddle/fluid/tests/book/test_word2vec.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import unittest
 import os
 import numpy as np

python/paddle/v2/fluid/tests/book_distribute/notest_dist_fit_a_line.py → python/paddle/fluid/tests/book_distribute/notest_dist_fit_a_line.py

@@ -14,7 +14,7 @@
 
 import numpy as np
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import os
 
 x = fluid.layers.data(name='x', shape=[13], dtype='float32')

python/paddle/v2/fluid/tests/book_distribute/notest_dist_image_classification.py → python/paddle/fluid/tests/book_distribute/notest_dist_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 os
 import sys
 

python/paddle/v2/fluid/tests/book_distribute/notest_dist_label_semantic_roles.py → python/paddle/fluid/tests/book_distribute/notest_dist_label_semantic_roles.py

@@ -17,7 +17,7 @@ import math
 import numpy as np
 import paddle.v2 as paddle
 import paddle.v2.dataset.conll05 as conll05
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import time
 import os
 

python/paddle/v2/fluid/tests/book_distribute/notest_dist_word2vec.py → python/paddle/fluid/tests/book_distribute/notest_dist_word2vec.py

@@ -15,7 +15,7 @@
 from __future__ import print_function
 import numpy as np
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import os
 
 PASS_NUM = 100

python/paddle/v2/fluid/tests/book_distribute/notest_machine_translation.py → python/paddle/fluid/tests/book_distribute/notest_machine_translation.py

@@ -14,11 +14,11 @@
 
 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
-from paddle.v2.fluid.executor import Executor
+import paddle.fluid as fluid
+import paddle.fluid.core as core
+import paddle.fluid.framework as framework
+import paddle.fluid.layers as layers
+from paddle.fluid.executor import Executor
 import os
 
 dict_size = 30000

python/paddle/v2/fluid/tests/book_distribute/notest_recognize_digits_conv_dist.py → python/paddle/fluid/tests/book_distribute/notest_recognize_digits_conv_dist.py

@@ -15,7 +15,7 @@
 from __future__ import print_function
 import numpy as np
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import os
 
 images = fluid.layers.data(name='pixel', shape=[1, 28, 28], dtype='float32')

python/paddle/v2/fluid/tests/book_distribute/notest_recognize_digits_mlp_dist.py → python/paddle/fluid/tests/book_distribute/notest_recognize_digits_mlp_dist.py

@@ -15,7 +15,7 @@
 from __future__ import print_function
 import numpy as np
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import os
 
 BATCH_SIZE = 128

python/paddle/v2/fluid/tests/book_distribute/notest_recommender_system_dist.py → python/paddle/fluid/tests/book_distribute/notest_recommender_system_dist.py

@@ -15,11 +15,11 @@
 import numpy as np
 import os
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.core as core
-import paddle.v2.fluid.layers as layers
-import paddle.v2.fluid.nets as nets
-from paddle.v2.fluid.optimizer import SGDOptimizer
+import paddle.fluid as fluid
+import paddle.fluid.core as core
+import paddle.fluid.layers as layers
+import paddle.fluid.nets as nets
+from paddle.fluid.optimizer import SGDOptimizer
 
 IS_SPARSE = True
 BATCH_SIZE = 256

python/paddle/v2/fluid/tests/book_distribute/notest_understand_sentiment_conv_dist.py → python/paddle/fluid/tests/book_distribute/notest_understand_sentiment_conv_dist.py

@@ -16,7 +16,7 @@ from __future__ import print_function
 import os
 import numpy as np
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 
 
 def convolution_net(data, label, input_dim, class_dim=2, emb_dim=32,

python/paddle/v2/fluid/tests/book_distribute/notest_understand_sentiment_dynamic_lstm.py → python/paddle/fluid/tests/book_distribute/notest_understand_sentiment_dynamic_lstm.py

@@ -15,7 +15,7 @@
 import numpy as np
 import os
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 
 
 def stacked_lstm_net(data,

python/paddle/v2/fluid/tests/book_memory_optimization/test_memopt_fit_a_line.py → python/paddle/fluid/tests/book_memory_optimization/test_memopt_fit_a_line.py

@@ -14,7 +14,7 @@
 
 import numpy as np
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import math
 import sys
 

python/paddle/v2/fluid/tests/book_memory_optimization/test_memopt_image_classification_train.py → python/paddle/fluid/tests/book_memory_optimization/test_memopt_image_classification_train.py

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

python/paddle/v2/fluid/tests/book_memory_optimization/test_memopt_machine_translation.py → python/paddle/fluid/tests/book_memory_optimization/test_memopt_machine_translation.py

@@ -14,11 +14,11 @@
 
 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
-from paddle.v2.fluid.executor import Executor
+import paddle.fluid as fluid
+import paddle.fluid.core as core
+import paddle.fluid.framework as framework
+import paddle.fluid.layers as layers
+from paddle.fluid.executor import Executor
 import math
 import sys
 

python/paddle/v2/fluid/tests/demo/fc_gan.py → python/paddle/fluid/tests/demo/fc_gan.py

@@ -20,7 +20,7 @@ import matplotlib
 import numpy
 
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 
 matplotlib.use('Agg')
 import matplotlib.pyplot as plt

python/paddle/v2/fluid/tests/notest_concurrency.py → python/paddle/fluid/tests/notest_concurrency.py

@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.core as core
-from paddle.v2.fluid.executor import Executor
+import paddle.fluid as fluid
+import paddle.fluid.core as core
+from paddle.fluid.executor import Executor
 
 
 class TestRoutineOp(unittest.TestCase):

python/paddle/v2/fluid/tests/notest_csp.py → python/paddle/fluid/tests/notest_csp.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 
 
 class TestCSPFramework(unittest.TestCase):

python/paddle/v2/fluid/tests/test_cpp_reader.py → python/paddle/fluid/tests/test_cpp_reader.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 numpy as np
 
 prog = fluid.framework.Program()

python/paddle/v2/fluid/tests/test_data_feeder.py → python/paddle/fluid/tests/test_data_feeder.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 
 
 def test_converter():

python/paddle/v2/fluid/tests/test_detection.py → python/paddle/fluid/tests/test_detection.py

@@ -13,9 +13,9 @@
 # limitations under the License.
 
 from __future__ import print_function
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.layers as layers
-from paddle.v2.fluid.framework import Program, program_guard
+import paddle.fluid as fluid
+import paddle.fluid.layers as layers
+from paddle.fluid.framework import Program, program_guard
 import unittest
 
 

python/paddle/v2/fluid/tests/test_error_clip.py → python/paddle/fluid/tests/test_error_clip.py

@@ -15,7 +15,7 @@
 from __future__ import print_function
 import numpy as np
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 
 BATCH_SIZE = 128
 CLIP_MAX = 2e-6

python/paddle/v2/fluid/tests/test_gradient_clip.py → python/paddle/fluid/tests/test_gradient_clip.py

@@ -14,7 +14,7 @@
 
 import numpy as np
 import paddle.v2 as paddle
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 
 BATCH_SIZE = 128
 CLIP = 1

python/paddle/v2/fluid/tests/test_mnist_if_else_op.py → python/paddle/fluid/tests/test_mnist_if_else_op.py

@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle.v2.fluid.layers as layers
-from paddle.v2.fluid.framework import Program, program_guard, default_main_program, default_startup_program
-from paddle.v2.fluid.executor import Executor
-from paddle.v2.fluid.optimizer import MomentumOptimizer
-import paddle.v2.fluid.core as core
+import paddle.fluid.layers as layers
+from paddle.fluid.framework import Program, program_guard, default_main_program, default_startup_program
+from paddle.fluid.executor import Executor
+from paddle.fluid.optimizer import MomentumOptimizer
+import paddle.fluid.core as core
 import paddle.v2 as paddle
 import unittest
 import numpy as np

python/paddle/v2/fluid/tests/test_python_operator_overriding.py → python/paddle/fluid/tests/test_python_operator_overriding.py

@@ -16,9 +16,9 @@ import unittest
 
 import numpy as np
 
-import paddle.v2.fluid.layers as layers
-import paddle.v2.fluid.framework as framework
-import paddle.v2.fluid as fluid
+import paddle.fluid.layers as layers
+import paddle.fluid.framework as framework
+import paddle.fluid as fluid
 
 
 class TestPythonOperatorOverride(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/decorators.py → python/paddle/fluid/tests/unittests/decorators.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 
 __all__ = ['many_times', 'prog_scope']
 

python/paddle/v2/fluid/tests/unittests/op_test.py → python/paddle/fluid/tests/unittests/op_test.py

@@ -16,12 +16,12 @@ import unittest
 import numpy as np
 import random
 import itertools
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 import collections
-from paddle.v2.fluid.backward import append_backward
-from paddle.v2.fluid.op import Operator
-from paddle.v2.fluid.executor import Executor
-from paddle.v2.fluid.framework import Program, OpProtoHolder
+from paddle.fluid.backward import append_backward
+from paddle.fluid.op import Operator
+from paddle.fluid.executor import Executor
+from paddle.fluid.framework import Program, OpProtoHolder
 
 
 def randomize_probability(batch_size, class_num, dtype='float32'):

python/paddle/v2/fluid/tests/unittests/test_adagrad_op.py → python/paddle/fluid/tests/unittests/test_adagrad_op.py

@@ -14,8 +14,8 @@
 
 import unittest
 import numpy as np
-import paddle.v2.fluid.core as core
-from paddle.v2.fluid.op import Operator
+import paddle.fluid.core as core
+from paddle.fluid.op import Operator
 from op_test import OpTest
 import math
 

python/paddle/v2/fluid/tests/unittests/test_adam_op.py → python/paddle/fluid/tests/unittests/test_adam_op.py

@@ -15,8 +15,8 @@
 import unittest
 import numpy as np
 from op_test import OpTest
-from paddle.v2.fluid import core
-from paddle.v2.fluid.op import Operator
+from paddle.fluid import core
+from paddle.fluid.op import Operator
 
 
 class TestAdamOp1(OpTest):

python/paddle/v2/fluid/tests/unittests/test_array_read_write_op.py → python/paddle/fluid/tests/unittests/test_array_read_write_op.py

@@ -13,11 +13,11 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid.core as core
-import paddle.v2.fluid.layers as layers
-from paddle.v2.fluid.executor import Executor
-from paddle.v2.fluid.backward import append_backward
-from paddle.v2.fluid.framework import default_main_program
+import paddle.fluid.core as core
+import paddle.fluid.layers as layers
+from paddle.fluid.executor import Executor
+from paddle.fluid.backward import append_backward
+from paddle.fluid.framework import default_main_program
 import numpy
 
 

python/paddle/v2/fluid/tests/unittests/test_assign_value_op.py → python/paddle/fluid/tests/unittests/test_assign_value_op.py

@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.layers as layers
+import paddle.fluid as fluid
+import paddle.fluid.layers as layers
 import op_test
 import numpy
 import unittest
-import paddle.v2.fluid.framework as framework
+import paddle.fluid.framework as framework
 
 
 class TestAssignValueOp(op_test.OpTest):

python/paddle/v2/fluid/tests/unittests/test_batch_norm_op.py → python/paddle/fluid/tests/unittests/test_batch_norm_op.py

@@ -15,9 +15,9 @@
 import unittest
 import numpy as np
 from op_test import OpTest
-import paddle.v2.fluid.core as core
-from paddle.v2.fluid.op import Operator
-from paddle.v2.fluid.framework import grad_var_name
+import paddle.fluid.core as core
+from paddle.fluid.op import Operator
+from paddle.fluid.framework import grad_var_name
 
 
 def get_backward_op(scope, op, no_grad_set):

python/paddle/v2/fluid/tests/unittests/test_beam_search_decode_op.py → python/paddle/fluid/tests/unittests/test_beam_search_decode_op.py

@@ -15,8 +15,8 @@
 import unittest
 
 import numpy as np
-import paddle.v2.fluid.core as core
-from paddle.v2.fluid.op import Operator
+import paddle.fluid.core as core
+from paddle.fluid.op import Operator
 
 
 class TestBeamSearchDecodeOp(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_beam_search_op.py → python/paddle/fluid/tests/unittests/test_beam_search_op.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import logging
-from paddle.v2.fluid.op import Operator, DynamicRecurrentOp
-import paddle.v2.fluid.core as core
+from paddle.fluid.op import Operator, DynamicRecurrentOp
+import paddle.fluid.core as core
 import unittest
 import numpy as np
 

python/paddle/v2/fluid/tests/unittests/test_calc_gradient.py → python/paddle/fluid/tests/unittests/test_calc_gradient.py

@@ -14,11 +14,11 @@
 
 import unittest
 
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.layers as layers
-import paddle.v2.fluid.framework as framework
-import paddle.v2.fluid.optimizer as optimizer
-from paddle.v2.fluid.backward import calc_gradient
+import paddle.fluid as fluid
+import paddle.fluid.layers as layers
+import paddle.fluid.framework as framework
+import paddle.fluid.optimizer as optimizer
+from paddle.fluid.backward import calc_gradient
 
 
 class TestCalcGradient(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_cast_op.py → python/paddle/fluid/tests/unittests/test_cast_op.py

@@ -15,7 +15,7 @@
 import op_test
 import unittest
 import numpy as np
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 
 
 class TestCastOp(op_test.OpTest):

python/paddle/v2/fluid/tests/unittests/test_cond_op.py → python/paddle/fluid/tests/unittests/test_cond_op.py

@@ -13,10 +13,10 @@
 # limitations under the License.
 
 import logging
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 import unittest
 import numpy as np
-from paddle.v2.fluid.op import Operator, CondOp
+from paddle.fluid.op import Operator, CondOp
 
 
 class PySimpleCond(object):

python/paddle/v2/fluid/tests/unittests/test_conditional_block.py → python/paddle/fluid/tests/unittests/test_conditional_block.py

@@ -13,11 +13,11 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid.layers as layers
-import paddle.v2.fluid.core as core
-from paddle.v2.fluid.framework import default_startup_program, default_main_program
-from paddle.v2.fluid.executor import Executor
-from paddle.v2.fluid.backward import append_backward
+import paddle.fluid.layers as layers
+import paddle.fluid.core as core
+from paddle.fluid.framework import default_startup_program, default_main_program
+from paddle.fluid.executor import Executor
+from paddle.fluid.backward import append_backward
 import numpy
 
 

python/paddle/v2/fluid/tests/unittests/test_const_value.py → python/paddle/fluid/tests/unittests/test_const_value.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid.framework as framework
+import paddle.fluid.framework as framework
 
 
 class ConditionalBlock(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_conv2d_op.py → python/paddle/fluid/tests/unittests/test_conv2d_op.py

@@ -15,7 +15,7 @@
 import unittest
 import numpy as np
 
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 from op_test import OpTest
 
 

python/paddle/v2/fluid/tests/unittests/test_conv2d_transpose_op.py → python/paddle/fluid/tests/unittests/test_conv2d_transpose_op.py

@@ -15,7 +15,7 @@
 import unittest
 import numpy as np
 
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 from op_test import OpTest
 
 

python/paddle/v2/fluid/tests/unittests/test_conv3d_op.py → python/paddle/fluid/tests/unittests/test_conv3d_op.py

@@ -15,7 +15,7 @@
 import unittest
 import numpy as np
 
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 from op_test import OpTest
 
 

python/paddle/v2/fluid/tests/unittests/test_conv3d_transpose_op.py → python/paddle/fluid/tests/unittests/test_conv3d_transpose_op.py

@@ -15,7 +15,7 @@
 import unittest
 import numpy as np
 
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 from op_test import OpTest
 
 

python/paddle/v2/fluid/tests/unittests/test_create_op_doc_string.py → python/paddle/fluid/tests/unittests/test_create_op_doc_string.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid.layers as layers
+import paddle.fluid.layers as layers
 
 
 class TestDocString(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_default_scope_funcs.py → python/paddle/fluid/tests/unittests/test_default_scope_funcs.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle.v2.fluid.default_scope_funcs import *
+from paddle.fluid.default_scope_funcs import *
 import unittest
 
 

python/paddle/v2/fluid/tests/unittests/test_dyn_rnn.py → python/paddle/fluid/tests/unittests/test_dyn_rnn.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import paddle.v2 as paddle
 import unittest
 import numpy

python/paddle/v2/fluid/tests/unittests/test_dynrnn_gradient_check.py → python/paddle/fluid/tests/unittests/test_dynrnn_gradient_check.py

@@ -15,7 +15,7 @@
 import numpy
 import random
 import collections
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import unittest
 from decorators import *
 

python/paddle/v2/fluid/tests/unittests/test_dynrnn_static_input.py → python/paddle/fluid/tests/unittests/test_dynrnn_static_input.py

@@ -14,11 +14,11 @@
 
 import unittest
 import paddle.v2 as paddle
-import paddle.v2.fluid.core as core
-import paddle.v2.fluid as fluid
-from paddle.v2.fluid.backward import append_backward
-import paddle.v2.fluid.framework as framework
-from paddle.v2.fluid.framework import Program, switch_main_program
+import paddle.fluid.core as core
+import paddle.fluid as fluid
+from paddle.fluid.backward import append_backward
+import paddle.fluid.framework as framework
+from paddle.fluid.framework import Program, switch_main_program
 import bisect
 import numpy as np
 

python/paddle/v2/fluid/tests/unittests/test_exception.py → python/paddle/fluid/tests/unittests/test_exception.py

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

python/paddle/v2/fluid/tests/unittests/test_executor_and_mul.py → python/paddle/fluid/tests/unittests/test_executor_and_mul.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 
-from paddle.v2.fluid.executor import Executor
-from paddle.v2.fluid.layers import mul, data
+from paddle.fluid.executor import Executor
+from paddle.fluid.layers import mul, data
 
 
 class TestExecutor(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_feed_fetch_method.py → python/paddle/fluid/tests/unittests/test_feed_fetch_method.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 import unittest
 import numpy as np
 

python/paddle/v2/fluid/tests/unittests/test_fetch_var.py → python/paddle/fluid/tests/unittests/test_fetch_var.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.layers as layers
+import paddle.fluid as fluid
+import paddle.fluid.layers as layers
 import op_test
 import numpy
 import unittest

python/paddle/v2/fluid/tests/unittests/test_fill_op.py → python/paddle/fluid/tests/unittests/test_fill_op.py

@@ -15,7 +15,7 @@
 import unittest
 import numpy as np
 from op_test import OpTest
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 
 
 class TestFillOp(OpTest):

python/paddle/v2/fluid/tests/unittests/test_framework_debug_str.py → python/paddle/fluid/tests/unittests/test_framework_debug_str.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import unittest
-from paddle.v2.fluid.framework import Program
+from paddle.fluid.framework import Program
 
 
 class TestDebugStringFramework(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_gaussian_random_op.py → python/paddle/fluid/tests/unittests/test_gaussian_random_op.py

@@ -15,10 +15,10 @@
 import unittest
 import numpy
 
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.core as core
-from paddle.v2.fluid.op import Operator
-from paddle.v2.fluid.executor import Executor
+import paddle.fluid as fluid
+import paddle.fluid.core as core
+from paddle.fluid.op import Operator
+from paddle.fluid.executor import Executor
 
 
 class TestGaussianRandomOp(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_get_places_op.py → python/paddle/fluid/tests/unittests/test_get_places_op.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import decorators
 import unittest
 

python/paddle/v2/fluid/tests/unittests/test_image_classification_layer.py → python/paddle/fluid/tests/unittests/test_image_classification_layer.py

@@ -14,9 +14,9 @@
 
 import unittest
 
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.nets as nets
-from paddle.v2.fluid.framework import Program
+import paddle.fluid as fluid
+import paddle.fluid.nets as nets
+from paddle.fluid.framework import Program
 
 
 def conv_block(input, num_filter, groups, dropouts):

python/paddle/v2/fluid/tests/unittests/test_infer_shape.py → python/paddle/fluid/tests/unittests/test_infer_shape.py

@@ -14,7 +14,7 @@
 
 import unittest
 
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 
 
 class TestInferShape(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_inference_model_io.py → python/paddle/fluid/tests/unittests/test_inference_model_io.py

@@ -15,13 +15,13 @@
 import unittest
 
 import numpy as np
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 
-import paddle.v2.fluid.executor as executor
-import paddle.v2.fluid.layers as layers
-import paddle.v2.fluid.optimizer as optimizer
-from paddle.v2.fluid.framework import Program, program_guard
-from paddle.v2.fluid.io import save_inference_model, load_inference_model
+import paddle.fluid.executor as executor
+import paddle.fluid.layers as layers
+import paddle.fluid.optimizer as optimizer
+from paddle.fluid.framework import Program, program_guard
+from paddle.fluid.io import save_inference_model, load_inference_model
 
 
 class TestBook(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_initializer.py → python/paddle/fluid/tests/unittests/test_initializer.py

@@ -15,8 +15,8 @@
 import numpy as np
 import unittest
 
-import paddle.v2.fluid.framework as framework
-import paddle.v2.fluid.initializer as initializer
+import paddle.fluid.framework as framework
+import paddle.fluid.initializer as initializer
 
 DELTA = 0.00001
 

python/paddle/v2/fluid/tests/unittests/test_is_empty_op.py → python/paddle/fluid/tests/unittests/test_is_empty_op.py

@@ -14,8 +14,8 @@
 
 import unittest
 import numpy as np
-from paddle.v2.fluid.op import Operator
-import paddle.v2.fluid.core as core
+from paddle.fluid.op import Operator
+import paddle.fluid.core as core
 
 
 def create_tensor(scope, name, np_data):

python/paddle/v2/fluid/tests/unittests/test_layer_norm_op.py → python/paddle/fluid/tests/unittests/test_layer_norm_op.py

@@ -16,9 +16,9 @@ import numpy as np
 
 from operator import mul
 from op_test import OpTest
-import paddle.v2.fluid.core as core
-from paddle.v2.fluid.op import Operator
-from paddle.v2.fluid.framework import grad_var_name
+import paddle.fluid.core as core
+from paddle.fluid.op import Operator
+from paddle.fluid.framework import grad_var_name
 
 np.random.random(123)
 

python/paddle/v2/fluid/tests/unittests/test_layers.py → python/paddle/fluid/tests/unittests/test_layers.py

@@ -15,10 +15,10 @@
 from __future__ import print_function
 import unittest
 
-import paddle.v2.fluid.layers as layers
-import paddle.v2.fluid.nets as nets
-from paddle.v2.fluid.framework import Program, program_guard, default_main_program
-from paddle.v2.fluid.param_attr import ParamAttr
+import paddle.fluid.layers as layers
+import paddle.fluid.nets as nets
+from paddle.fluid.framework import Program, program_guard, default_main_program
+from paddle.fluid.param_attr import ParamAttr
 import decorators
 
 

python/paddle/v2/fluid/tests/unittests/test_learning_rate_decay.py → python/paddle/fluid/tests/unittests/test_learning_rate_decay.py

@@ -17,10 +17,10 @@ import unittest
 import math
 import copy
 
-import paddle.v2.fluid.framework as framework
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.layers as layers
-import paddle.v2.fluid.learning_rate_decay as lr_decay
+import paddle.fluid.framework as framework
+import paddle.fluid as fluid
+import paddle.fluid.layers as layers
+import paddle.fluid.learning_rate_decay as lr_decay
 
 
 def exponential_decay(learning_rate,

python/paddle/v2/fluid/tests/unittests/test_lod_array_length_op.py → python/paddle/fluid/tests/unittests/test_lod_array_length_op.py

@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid.layers as layers
-from paddle.v2.fluid.executor import Executor
-import paddle.v2.fluid.core as core
+import paddle.fluid.layers as layers
+from paddle.fluid.executor import Executor
+import paddle.fluid.core as core
 import numpy
 
 

python/paddle/v2/fluid/tests/unittests/test_lod_rank_table.py → python/paddle/fluid/tests/unittests/test_lod_rank_table.py

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle.v2.fluid.layers import lod_rank_table, data
-from paddle.v2.fluid.executor import Executor
-import paddle.v2.fluid.core as core
+from paddle.fluid.layers import lod_rank_table, data
+from paddle.fluid.executor import Executor
+import paddle.fluid.core as core
 import numpy
 import unittest
 

python/paddle/v2/fluid/tests/unittests/test_lod_tensor_array.py → python/paddle/fluid/tests/unittests/test_lod_tensor_array.py

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

python/paddle/v2/fluid/tests/unittests/test_lod_tensor_array_ops.py → python/paddle/fluid/tests/unittests/test_lod_tensor_array_ops.py

@@ -13,12 +13,12 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 import numpy
-import paddle.v2.fluid.layers as layers
-from paddle.v2.fluid.framework import Program, program_guard
-from paddle.v2.fluid.executor import Executor
-from paddle.v2.fluid.backward import append_backward
+import paddle.fluid.layers as layers
+from paddle.fluid.framework import Program, program_guard
+from paddle.fluid.executor import Executor
+from paddle.fluid.backward import append_backward
 
 
 class TestCPULoDTensorArrayOps(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_math_op_patch.py → python/paddle/fluid/tests/unittests/test_math_op_patch.py

@@ -14,7 +14,7 @@
 
 import unittest
 import decorators
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import numpy
 
 

python/paddle/v2/fluid/tests/unittests/test_memory_optimization_transpiler.py → python/paddle/fluid/tests/unittests/test_memory_optimization_transpiler.py

@@ -15,10 +15,10 @@
 from __future__ import print_function
 import unittest
 
-import paddle.v2.fluid.layers as layers
-import paddle.v2.fluid.optimizer as optimizer
-from paddle.v2.fluid.framework import Program, program_guard
-from paddle.v2.fluid.memory_optimization_transpiler import memory_optimize
+import paddle.fluid.layers as layers
+import paddle.fluid.optimizer as optimizer
+from paddle.fluid.framework import Program, program_guard
+from paddle.fluid.memory_optimization_transpiler import memory_optimize
 
 
 class TestControlFlowGraph(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_multihead_attention.py → python/paddle/fluid/tests/unittests/test_multihead_attention.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.core as core
+import paddle.fluid as fluid
+import paddle.fluid.core as core
 import numpy as np
 
 

python/paddle/v2/fluid/tests/unittests/test_net.py → python/paddle/fluid/tests/unittests/test_net.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
-from paddle.v2.fluid.op import Operator
+import paddle.fluid.core as core
+from paddle.fluid.op import Operator
 import unittest
 
 

python/paddle/v2/fluid/tests/unittests/test_normalization_wrapper.py → python/paddle/fluid/tests/unittests/test_normalization_wrapper.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.core as core
+import paddle.fluid as fluid
+import paddle.fluid.core as core
 import numpy as np
 
 

python/paddle/v2/fluid/tests/unittests/test_one_hot_op.py → python/paddle/fluid/tests/unittests/test_one_hot_op.py

@@ -16,10 +16,10 @@ import unittest
 import numpy as np
 import math
 from op_test import OpTest
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.core as core
-import paddle.v2.fluid.framework as framework
-from paddle.v2.fluid.framework import Program, program_guard
+import paddle.fluid as fluid
+import paddle.fluid.core as core
+import paddle.fluid.framework as framework
+from paddle.fluid.framework import Program, program_guard
 
 
 class TestOneHotOp(OpTest):

python/paddle/v2/fluid/tests/unittests/test_op_support_gpu.py → python/paddle/fluid/tests/unittests/test_op_support_gpu.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 
 
 class TestOpSupportGPU(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_operator.py → python/paddle/fluid/tests/unittests/test_operator.py

@@ -14,8 +14,8 @@
 
 import unittest
 
-import paddle.v2.fluid.op as op
-import paddle.v2.fluid.proto.framework_pb2 as framework_pb2
+import paddle.fluid.op as op
+import paddle.fluid.proto.framework_pb2 as framework_pb2
 
 
 class TestGetAllProtos(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_operator_desc.py → python/paddle/fluid/tests/unittests/test_operator_desc.py

@@ -14,9 +14,9 @@
 
 import unittest
 
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 
-from paddle.v2.fluid.framework import Program, default_startup_program
+from paddle.fluid.framework import Program, default_startup_program
 
 main_program = default_startup_program()
 

python/paddle/v2/fluid/tests/unittests/test_optimizer.py → python/paddle/fluid/tests/unittests/test_optimizer.py

@@ -14,9 +14,9 @@
 
 import unittest
 
-import paddle.v2.fluid.framework as framework
-import paddle.v2.fluid.optimizer as optimizer
-from paddle.v2.fluid.backward import append_backward
+import paddle.fluid.framework as framework
+import paddle.fluid.optimizer as optimizer
+from paddle.fluid.backward import append_backward
 
 
 class TestOptimizer(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_parallel_op.py → python/paddle/fluid/tests/unittests/test_parallel_op.py

@@ -14,7 +14,7 @@
 
 import unittest
 
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 import numpy
 
 

python/paddle/v2/fluid/tests/unittests/test_parameter.py → python/paddle/fluid/tests/unittests/test_parameter.py

@@ -13,11 +13,11 @@
 # limitations under the License.
 
 import unittest
-from paddle.v2.fluid.framework import default_main_program
-import paddle.v2.fluid.core as core
-from paddle.v2.fluid.executor import Executor
-import paddle.v2.fluid.io as io
-from paddle.v2.fluid.initializer import ConstantInitializer
+from paddle.fluid.framework import default_main_program
+import paddle.fluid.core as core
+from paddle.fluid.executor import Executor
+import paddle.fluid.io as io
+from paddle.fluid.initializer import ConstantInitializer
 import numpy as np
 
 main_program = default_main_program()

python/paddle/v2/fluid/tests/unittests/test_pool2d_op.py → python/paddle/fluid/tests/unittests/test_pool2d_op.py

@@ -15,7 +15,7 @@
 import unittest
 import numpy as np
 
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 from op_test import OpTest
 
 

python/paddle/v2/fluid/tests/unittests/test_pool3d_op.py → python/paddle/fluid/tests/unittests/test_pool3d_op.py

@@ -15,7 +15,7 @@
 import unittest
 import numpy as np
 
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 from op_test import OpTest
 
 

python/paddle/v2/fluid/tests/unittests/test_print_op.py → python/paddle/fluid/tests/unittests/test_print_op.py

@@ -13,12 +13,12 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid.core as core
-from paddle.v2.fluid.executor import Executor
-import paddle.v2.fluid.layers as layers
-from paddle.v2.fluid.backward import append_backward
-from paddle.v2.fluid.framework import switch_main_program
-from paddle.v2.fluid.framework import Program
+import paddle.fluid.core as core
+from paddle.fluid.executor import Executor
+import paddle.fluid.layers as layers
+from paddle.fluid.backward import append_backward
+from paddle.fluid.framework import switch_main_program
+from paddle.fluid.framework import Program
 import numpy as np
 
 

python/paddle/v2/fluid/tests/unittests/test_profiler.py → python/paddle/fluid/tests/unittests/test_profiler.py

@@ -15,10 +15,10 @@
 import unittest
 import os
 import numpy as np
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.profiler as profiler
-import paddle.v2.fluid.layers as layers
-import paddle.v2.fluid.core as core
+import paddle.fluid as fluid
+import paddle.fluid.profiler as profiler
+import paddle.fluid.layers as layers
+import paddle.fluid.core as core
 
 
 class TestProfiler(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_program.py → python/paddle/fluid/tests/unittests/test_program.py

@@ -15,8 +15,8 @@
 from __future__ import print_function
 import unittest
 
-from paddle.v2.fluid.framework import Program, default_main_program, program_guard, grad_var_name
-import paddle.v2.fluid.layers as layers
+from paddle.fluid.framework import Program, default_main_program, program_guard, grad_var_name
+import paddle.fluid.layers as layers
 
 main_program = default_main_program()
 

python/paddle/v2/fluid/tests/unittests/test_protobuf.py → python/paddle/fluid/tests/unittests/test_protobuf.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle.v2.fluid.proto.framework_pb2 as framework_pb2
+import paddle.fluid.proto.framework_pb2 as framework_pb2
 import unittest
 
 

python/paddle/v2/fluid/tests/unittests/test_protobuf_descs.py → python/paddle/fluid/tests/unittests/test_protobuf_descs.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 
 
 class TestOpDesc(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_recurrent_op.py → python/paddle/fluid/tests/unittests/test_recurrent_op.py

@@ -14,12 +14,12 @@
 
 import unittest
 
-import paddle.v2.fluid.layers as layers
-from paddle.v2.fluid.framework import Program, grad_var_name
-from paddle.v2.fluid.executor import Executor
-from paddle.v2.fluid.backward import append_backward
+import paddle.fluid.layers as layers
+from paddle.fluid.framework import Program, grad_var_name
+from paddle.fluid.executor import Executor
+from paddle.fluid.backward import append_backward
 import numpy as np
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 
 
 class PyRNNBase(object):

python/paddle/v2/fluid/tests/unittests/test_recv_op.py → python/paddle/fluid/tests/unittests/test_recv_op.py

@@ -14,8 +14,8 @@
 
 import unittest
 
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.layers as layers
+import paddle.fluid as fluid
+import paddle.fluid.layers as layers
 import numpy
 from multiprocessing import Process
 import os, sys

python/paddle/v2/fluid/tests/unittests/test_registry.py → python/paddle/fluid/tests/unittests/test_registry.py

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

python/paddle/v2/fluid/tests/unittests/test_regularizer.py → python/paddle/fluid/tests/unittests/test_regularizer.py

@@ -14,10 +14,10 @@
 
 import unittest
 
-import paddle.v2.fluid.framework as framework
-import paddle.v2.fluid.optimizer as optimizer
-import paddle.v2.fluid.regularizer as regularizer
-from paddle.v2.fluid.backward import append_backward
+import paddle.fluid.framework as framework
+import paddle.fluid.optimizer as optimizer
+import paddle.fluid.regularizer as regularizer
+from paddle.fluid.backward import append_backward
 
 
 class TestL2DecayRegularizer(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_reorder_lod_tensor.py → python/paddle/fluid/tests/unittests/test_reorder_lod_tensor.py

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

python/paddle/v2/fluid/tests/unittests/test_rnn_memory_helper_op.py → python/paddle/fluid/tests/unittests/test_rnn_memory_helper_op.py

@@ -14,11 +14,11 @@
 
 import unittest
 
-from paddle.v2.fluid.framework import Program
-from paddle.v2.fluid.executor import Executor
-from paddle.v2.fluid.backward import append_backward
+from paddle.fluid.framework import Program
+from paddle.fluid.executor import Executor
+from paddle.fluid.backward import append_backward
 import numpy as np
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 
 
 class RNNMemoryHelperOpTest(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_scope.py → python/paddle/fluid/tests/unittests/test_scope.py

@@ -12,25 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle.v2.fluid.core
+import paddle.fluid.core
 import unittest
 
 
 class TestScope(unittest.TestCase):
     def test_create_destroy(self):
-        paddle_c = paddle.v2.fluid.core
+        paddle_c = paddle.fluid.core
         scope = paddle_c.Scope()
         self.assertIsNotNone(scope)
         scope_with_parent = scope.new_scope()
         self.assertIsNotNone(scope_with_parent)
 
     def test_none_variable(self):
-        paddle_c = paddle.v2.fluid.core
+        paddle_c = paddle.fluid.core
         scope = paddle_c.Scope()
         self.assertIsNone(scope.find_var("test"))
 
     def test_create_var_get_var(self):
-        paddle_c = paddle.v2.fluid.core
+        paddle_c = paddle.fluid.core
         scope = paddle_c.Scope()
         var_a = scope.var("var_a")
         self.assertIsNotNone(var_a)
@@ -39,7 +39,7 @@ class TestScope(unittest.TestCase):
         self.assertIsNotNone(scope2.find_var('var_a'))
 
     def test_var_get_int(self):
-        paddle_c = paddle.v2.fluid.core
+        paddle_c = paddle.fluid.core
         scope = paddle_c.Scope()
         var = scope.var("test_int")
         var.set_int(10)

python/paddle/v2/fluid/tests/unittests/test_selected_rows.py → python/paddle/fluid/tests/unittests/test_selected_rows.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 import unittest
 import numpy as np
 

python/paddle/v2/fluid/tests/unittests/test_sgd_op.py → python/paddle/fluid/tests/unittests/test_sgd_op.py

@@ -14,8 +14,8 @@
 
 import unittest
 import numpy as np
-import paddle.v2.fluid.core as core
-from paddle.v2.fluid.op import Operator
+import paddle.fluid.core as core
+from paddle.fluid.op import Operator
 from op_test import OpTest
 
 

python/paddle/v2/fluid/tests/unittests/test_shrink_rnn_memory.py → python/paddle/fluid/tests/unittests/test_shrink_rnn_memory.py

@@ -13,12 +13,12 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid.core as core
-from paddle.v2.fluid.executor import Executor
-import paddle.v2.fluid.layers as layers
-from paddle.v2.fluid.backward import append_backward
-from paddle.v2.fluid.framework import default_main_program, switch_main_program
-from paddle.v2.fluid.framework import Program
+import paddle.fluid.core as core
+from paddle.fluid.executor import Executor
+import paddle.fluid.layers as layers
+from paddle.fluid.backward import append_backward
+from paddle.fluid.framework import default_main_program, switch_main_program
+from paddle.fluid.framework import Program
 import numpy as np
 
 

python/paddle/v2/fluid/tests/unittests/test_split_and_merge_lod_tensor_op.py → python/paddle/fluid/tests/unittests/test_split_and_merge_lod_tensor_op.py

@@ -13,12 +13,12 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 import numpy as np
-import paddle.v2.fluid.layers as layers
-from paddle.v2.fluid.framework import Program, program_guard
-from paddle.v2.fluid.executor import Executor
-from paddle.v2.fluid.backward import append_backward
+import paddle.fluid.layers as layers
+from paddle.fluid.framework import Program, program_guard
+from paddle.fluid.executor import Executor
+from paddle.fluid.backward import append_backward
 
 
 class TestCPULoDTensorArrayOps(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_split_selected_rows_op.py → python/paddle/fluid/tests/unittests/test_split_selected_rows_op.py

@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid.core as core
+import paddle.fluid.core as core
 import numpy as np
-from paddle.v2.fluid.op import Operator
+from paddle.fluid.op import Operator
 
 
 class TestSpliteSelectedRows(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_split_var.py → python/paddle/fluid/tests/unittests/test_split_var.py

@@ -14,9 +14,9 @@
 
 import math
 import unittest
-from paddle.v2.fluid.distribute_transpiler import split_dense_variable
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.core as core
+from paddle.fluid.distribute_transpiler import split_dense_variable
+import paddle.fluid as fluid
+import paddle.fluid.core as core
 import random
 
 

python/paddle/v2/fluid/tests/unittests/test_switch.py → python/paddle/fluid/tests/unittests/test_switch.py

@@ -14,11 +14,11 @@
 
 import unittest
 
-import paddle.v2.fluid.core as core
-import paddle.v2.fluid.layers as layers
-import paddle.v2.fluid.framework as framework
-from paddle.v2.fluid.executor import Executor
-from paddle.v2.fluid.framework import default_startup_program
+import paddle.fluid.core as core
+import paddle.fluid.layers as layers
+import paddle.fluid.framework as framework
+from paddle.fluid.executor import Executor
+from paddle.fluid.framework import default_startup_program
 
 
 class TestSwitch(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_tensor.py → python/paddle/fluid/tests/unittests/test_tensor.py

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

python/paddle/v2/fluid/tests/unittests/test_unique_name.py → python/paddle/fluid/tests/unittests/test_unique_name.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid as fluid
+import paddle.fluid as fluid
 
 
 class TestUniqueName(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_variable.py → python/paddle/fluid/tests/unittests/test_variable.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import unittest
-from paddle.v2.fluid.framework import default_main_program, Program, convert_np_dtype_to_dtype_
-import paddle.v2.fluid.core as core
+from paddle.fluid.framework import default_main_program, Program, convert_np_dtype_to_dtype_
+import paddle.fluid.core as core
 import numpy as np
 
 

python/paddle/v2/fluid/tests/unittests/test_weight_normalization.py → python/paddle/fluid/tests/unittests/test_weight_normalization.py

@@ -15,10 +15,10 @@
 import unittest
 import numpy
 import collections
-import paddle.v2.fluid as fluid
-import paddle.v2.fluid.core as core
-from paddle.v2.fluid.initializer import ConstantInitializer
-from paddle.v2.fluid.param_attr import WeightNormParamAttr
+import paddle.fluid as fluid
+import paddle.fluid.core as core
+from paddle.fluid.initializer import ConstantInitializer
+from paddle.fluid.param_attr import WeightNormParamAttr
 
 
 class TestWeightNormalization(unittest.TestCase):

python/paddle/v2/fluid/tests/unittests/test_while_op.py → python/paddle/fluid/tests/unittests/test_while_op.py

@@ -13,10 +13,10 @@
 # limitations under the License.
 
 import unittest
-import paddle.v2.fluid.layers as layers
-from paddle.v2.fluid.executor import Executor
-import paddle.v2.fluid.core as core
-from paddle.v2.fluid.backward import append_backward
+import paddle.fluid.layers as layers
+from paddle.fluid.executor import Executor
+import paddle.fluid.core as core
+from paddle.fluid.backward import append_backward
 import numpy
 
 

python/setup.py.in

@@ -71,9 +71,9 @@ packages=['paddle',
           'paddle.v2.reader',
           'paddle.v2.master',
           'paddle.v2.plot',
-          'paddle.v2.fluid',
-          'paddle.v2.fluid.proto',
-          'paddle.v2.fluid.layers',
+          'paddle.fluid',
+          'paddle.fluid.proto',
+          'paddle.fluid.layers',
           'py_paddle']
 
 with open('@PADDLE_SOURCE_DIR@/python/requirements.txt') as f:
@@ -102,14 +102,14 @@ setup(name='${PACKAGE_NAME}',
       ext_modules=[Extension('_foo', ['stub.cc'])],
       package_data={
         'paddle.v2.master': ['libpaddle_master.so'],
-        'paddle.v2.fluid': ['core.so'],
+        'paddle.fluid': ['core.so'],
         'py_paddle':['*.py','_swig_paddle.so']
       },
       package_dir={
           '': '${CMAKE_CURRENT_SOURCE_DIR}',
-          # The paddle.v2.fluid.proto will be generated while compiling.
+          # The paddle.fluid.proto will be generated while compiling.
           # So that package points to other directory.
-          'paddle.v2.fluid.proto': '${PADDLE_BINARY_DIR}/paddle/fluid/framework',
+          'paddle.fluid.proto': '${PADDLE_BINARY_DIR}/paddle/fluid/framework',
           'py_paddle': '${PADDLE_SOURCE_DIR}/paddle/py_paddle'
       },
       scripts=paddle_bins,