[for 2.0-alpha] add alias in paddle.nn and paddle.tensor test=develop

python/paddle/__init__.py

@@ -43,10 +43,12 @@
 import paddle.incubate.complex as complex
 
 # TODO: define alias in tensor and framework directory
+
 from .tensor.random import randperm
+
 from .tensor.attribute import rank  #DEFINE_ALIAS
 from .tensor.attribute import shape  #DEFINE_ALIAS
-# from .tensor.creation import create_tensor        #DEFINE_ALIAS
+from .tensor.creation import create_tensor  #DEFINE_ALIAS
 # from .tensor.creation import create_lod_tensor        #DEFINE_ALIAS
 # from .tensor.creation import create_random_int_lodtensor        #DEFINE_ALIAS
 from .tensor.creation import crop_tensor  #DEFINE_ALIAS
@@ -102,25 +104,25 @@
 from .tensor.manipulation import expand_as  #DEFINE_ALIAS
 from .tensor.manipulation import flatten  #DEFINE_ALIAS
 from .tensor.manipulation import gather  #DEFINE_ALIAS
-# from .tensor.manipulation import gather_nd        #DEFINE_ALIAS
+from .tensor.manipulation import gather_nd  #DEFINE_ALIAS
 from .tensor.manipulation import reshape  #DEFINE_ALIAS
 from .tensor.manipulation import reverse  #DEFINE_ALIAS
 from .tensor.manipulation import scatter  #DEFINE_ALIAS
-# from .tensor.manipulation import scatter_nd_add        #DEFINE_ALIAS
-# from .tensor.manipulation import scatter_nd        #DEFINE_ALIAS
-# from .tensor.manipulation import shard_index        #DEFINE_ALIAS
+from .tensor.manipulation import scatter_nd_add  #DEFINE_ALIAS
+from .tensor.manipulation import scatter_nd  #DEFINE_ALIAS
+from .tensor.manipulation import shard_index  #DEFINE_ALIAS
 from .tensor.manipulation import slice  #DEFINE_ALIAS
 from .tensor.manipulation import split  #DEFINE_ALIAS
 from .tensor.manipulation import squeeze  #DEFINE_ALIAS
 from .tensor.manipulation import stack  #DEFINE_ALIAS
 from .tensor.manipulation import strided_slice  #DEFINE_ALIAS
 from .tensor.manipulation import transpose  #DEFINE_ALIAS
 from .tensor.manipulation import unique  #DEFINE_ALIAS
-# from .tensor.manipulation import unique_with_counts        #DEFINE_ALIAS
+from .tensor.manipulation import unique_with_counts  #DEFINE_ALIAS
 from .tensor.manipulation import unsqueeze  #DEFINE_ALIAS
 from .tensor.manipulation import unstack  #DEFINE_ALIAS
 from .tensor.manipulation import flip  #DEFINE_ALIAS
-# from .tensor.manipulation import unbind        #DEFINE_ALIAS
+from .tensor.manipulation import unbind  #DEFINE_ALIAS
 from .tensor.manipulation import roll  #DEFINE_ALIAS
 from .tensor.math import abs  #DEFINE_ALIAS
 from .tensor.math import acos  #DEFINE_ALIAS
@@ -140,10 +142,10 @@
 from .tensor.math import elementwise_sub  #DEFINE_ALIAS
 from .tensor.math import exp  #DEFINE_ALIAS
 from .tensor.math import floor  #DEFINE_ALIAS
-# from .tensor.math import increment        #DEFINE_ALIAS
+from .tensor.math import increment  #DEFINE_ALIAS
 from .tensor.math import log  #DEFINE_ALIAS
 from .tensor.math import mul  #DEFINE_ALIAS
-# from .tensor.math import multiplex        #DEFINE_ALIAS
+from .tensor.math import multiplex  #DEFINE_ALIAS
 from .tensor.math import pow  #DEFINE_ALIAS
 from .tensor.math import reciprocal  #DEFINE_ALIAS
 from .tensor.math import reduce_max  #DEFINE_ALIAS
@@ -159,7 +161,7 @@
 from .tensor.math import square  #DEFINE_ALIAS
 from .tensor.math import stanh  #DEFINE_ALIAS
 from .tensor.math import sum  #DEFINE_ALIAS
-# from .tensor.math import sums        #DEFINE_ALIAS
+from .tensor.math import sums  #DEFINE_ALIAS
 from .tensor.math import tanh  #DEFINE_ALIAS
 from .tensor.math import elementwise_sum  #DEFINE_ALIAS
 from .tensor.math import max  #DEFINE_ALIAS

python/paddle/nn/__init__.py

@@ -33,12 +33,12 @@
 from .clip import GradientClipByValue  #DEFINE_ALIAS
 # from .clip import set_gradient_clip        #DEFINE_ALIAS
 from .clip import clip  #DEFINE_ALIAS
-# from .clip import clip_by_norm        #DEFINE_ALIAS
+from .clip import clip_by_norm  #DEFINE_ALIAS
 from .control_flow import case  #DEFINE_ALIAS
 from .control_flow import cond  #DEFINE_ALIAS
 # from .control_flow import DynamicRNN        #DEFINE_ALIAS
 # from .control_flow import StaticRNN        #DEFINE_ALIAS
-# from .control_flow import switch_case        #DEFINE_ALIAS
+from .control_flow import switch_case  #DEFINE_ALIAS
 from .control_flow import while_loop  #DEFINE_ALIAS
 # from .control_flow import rnn        #DEFINE_ALIAS
 # from .decode import BeamSearchDecoder        #DEFINE_ALIAS
@@ -48,7 +48,7 @@
 # from .decode import crf_decoding        #DEFINE_ALIAS
 # from .decode import ctc_greedy_decoder        #DEFINE_ALIAS
 # from .decode import dynamic_decode        #DEFINE_ALIAS
-# from .decode import gather_tree        #DEFINE_ALIAS
+from .decode import gather_tree  #DEFINE_ALIAS
 from .input import data  #DEFINE_ALIAS
 # from .input import Input        #DEFINE_ALIAS
 # from .layer.activation import PReLU        #DEFINE_ALIAS
@@ -90,6 +90,7 @@
 # from .layer.rnn import RNNCell        #DEFINE_ALIAS
 # from .layer.rnn import GRUCell        #DEFINE_ALIAS
 # from .layer.rnn import LSTMCell        #DEFINE_ALIAS
+
 from .layer import loss  #DEFINE_ALIAS
 from .layer import conv  #DEFINE_ALIAS
 from ..fluid.dygraph.layers import Layer  #DEFINE_ALIAS

python/paddle/nn/clip.py

@@ -18,12 +18,14 @@
 from ..fluid.clip import GradientClipByValue  #DEFINE_ALIAS
 from ..fluid.layers import clip  #DEFINE_ALIAS
 
+from ..fluid.layers import clip_by_norm  #DEFINE_ALIAS
+
 __all__ = [
     #       'ErrorClipByValue',
     'GradientClipByGlobalNorm',
     'GradientClipByNorm',
     'GradientClipByValue',
     #       'set_gradient_clip',
     'clip',
-    #       'clip_by_norm'
+    'clip_by_norm'
 ]

python/paddle/nn/control_flow.py

@@ -17,12 +17,14 @@
 from ..fluid.layers import cond  #DEFINE_ALIAS
 from ..fluid.layers import while_loop  #DEFINE_ALIAS
 
+from ..fluid.layers import switch_case  #DEFINE_ALIAS
+
 __all__ = [
     'case',
     'cond',
     #       'DynamicRNN',
     #       'StaticRNN',
-    #       'switch_case',
+    'switch_case',
     'while_loop',
     #       'rnn'
 ]

python/paddle/nn/decode.py

@@ -16,6 +16,8 @@
 from ..fluid.layers import beam_search  #DEFINE_ALIAS
 from ..fluid.layers import beam_search_decode  #DEFINE_ALIAS
 
+from ..fluid.layers import gather_tree  #DEFINE_ALIAS
+
 __all__ = [
     #       'BeamSearchDecoder',
     #       'Decoder',
@@ -24,5 +26,5 @@
     #       'crf_decoding',
     #       'ctc_greedy_decoder',
     #       'dynamic_decode',
-    #       'gather_tree'
+    'gather_tree'
 ]

python/paddle/nn/functional/__init__.py

@@ -52,11 +52,11 @@
 from .activation import log_softmax  #DEFINE_ALIAS
 from .common import dropout  #DEFINE_ALIAS
 # from .common import embedding        #DEFINE_ALIAS
-# from .common import fc        #DEFINE_ALIAS
+# from .common import fc  #DEFINE_ALIAS
 from .common import label_smooth  #DEFINE_ALIAS
 from .common import one_hot  #DEFINE_ALIAS
 from .common import pad  #DEFINE_ALIAS
-# from .common import pad_constant_like        #DEFINE_ALIAS
+from .common import pad_constant_like  #DEFINE_ALIAS
 from .common import pad2d  #DEFINE_ALIAS
 from .common import unfold  #DEFINE_ALIAS
 # from .common import bilinear_tensor_product        #DEFINE_ALIAS
@@ -68,19 +68,19 @@
 from .conv import conv3d_transpose  #DEFINE_ALIAS
 from .extension import add_position_encoding  #DEFINE_ALIAS
 # from .extension import autoincreased_step_counter        #DEFINE_ALIAS
-# from .extension import continuous_value_model        #DEFINE_ALIAS
-# from .extension import filter_by_instag        #DEFINE_ALIAS
+from .extension import continuous_value_model  #DEFINE_ALIAS
+from .extension import filter_by_instag  #DEFINE_ALIAS
 # from .extension import linear_chain_crf        #DEFINE_ALIAS
 # from .extension import merge_selected_rows        #DEFINE_ALIAS
 from .extension import multiclass_nms  #DEFINE_ALIAS
-# from .extension import polygon_box_transform        #DEFINE_ALIAS
-# from .extension import random_crop        #DEFINE_ALIAS
+from .extension import polygon_box_transform  #DEFINE_ALIAS
+from .extension import random_crop  #DEFINE_ALIAS
 from .extension import row_conv  #DEFINE_ALIAS
-# from .extension import rpn_target_assign        #DEFINE_ALIAS
-# from .extension import similarity_focus        #DEFINE_ALIAS
+from .extension import rpn_target_assign  #DEFINE_ALIAS
+from .extension import similarity_focus  #DEFINE_ALIAS
 from .extension import target_assign  #DEFINE_ALIAS
 from .extension import temporal_shift  #DEFINE_ALIAS
-# from .extension import warpctc        #DEFINE_ALIAS
+from .extension import warpctc  #DEFINE_ALIAS
 from .extension import diag_embed  #DEFINE_ALIAS
 from .learning_rate import cosine_decay  #DEFINE_ALIAS
 from .learning_rate import exponential_decay  #DEFINE_ALIAS
@@ -123,17 +123,17 @@
 from .loss import center_loss  #DEFINE_ALIAS
 from .loss import cross_entropy  #DEFINE_ALIAS
 from .loss import dice_loss  #DEFINE_ALIAS
-# from .loss import edit_distance        #DEFINE_ALIAS
-# from .loss import huber_loss        #DEFINE_ALIAS
+from .loss import edit_distance  #DEFINE_ALIAS
+from .loss import huber_loss  #DEFINE_ALIAS
 from .loss import iou_similarity  #DEFINE_ALIAS
 from .loss import kldiv_loss  #DEFINE_ALIAS
 from .loss import log_loss  #DEFINE_ALIAS
-# from .loss import margin_rank_loss        #DEFINE_ALIAS
+from .loss import margin_rank_loss  #DEFINE_ALIAS
 from .loss import mse_loss  #DEFINE_ALIAS
 # from .loss import nce        #DEFINE_ALIAS
 from .loss import npair_loss  #DEFINE_ALIAS
 from .loss import rank_loss  #DEFINE_ALIAS
-# from .loss import sampled_softmax_with_cross_entropy        #DEFINE_ALIAS
+from .loss import sampled_softmax_with_cross_entropy  #DEFINE_ALIAS
 from .loss import sigmoid_cross_entropy_with_logits  #DEFINE_ALIAS
 from .loss import sigmoid_focal_loss  #DEFINE_ALIAS
 from .loss import smooth_l1  #DEFINE_ALIAS
@@ -169,27 +169,27 @@
 from .vision import density_prior_box  #DEFINE_ALIAS
 from .vision import detection_output  #DEFINE_ALIAS
 from .vision import distribute_fpn_proposals  #DEFINE_ALIAS
-# from .vision import fsp_matrix        #DEFINE_ALIAS
+from .vision import fsp_matrix  #DEFINE_ALIAS
 from .vision import generate_mask_labels  #DEFINE_ALIAS
 from .vision import generate_proposal_labels  #DEFINE_ALIAS
 from .vision import generate_proposals  #DEFINE_ALIAS
 from .vision import grid_sampler  #DEFINE_ALIAS
 from .vision import image_resize  #DEFINE_ALIAS
-# from .vision import image_resize_short        #DEFINE_ALIAS
+from .vision import image_resize_short  #DEFINE_ALIAS
 # from .vision import multi_box_head        #DEFINE_ALIAS
-# from .vision import pixel_shuffle        #DEFINE_ALIAS
+from .vision import pixel_shuffle  #DEFINE_ALIAS
 from .vision import prior_box  #DEFINE_ALIAS
 from .vision import prroi_pool  #DEFINE_ALIAS
 from .vision import psroi_pool  #DEFINE_ALIAS
 from .vision import resize_bilinear  #DEFINE_ALIAS
 from .vision import resize_nearest  #DEFINE_ALIAS
 from .vision import resize_trilinear  #DEFINE_ALIAS
-# from .vision import retinanet_detection_output        #DEFINE_ALIAS
-# from .vision import retinanet_target_assign        #DEFINE_ALIAS
+from .vision import retinanet_detection_output  #DEFINE_ALIAS
+from .vision import retinanet_target_assign  #DEFINE_ALIAS
 from .vision import roi_align  #DEFINE_ALIAS
-# from .vision import roi_perspective_transform        #DEFINE_ALIAS
+from .vision import roi_perspective_transform  #DEFINE_ALIAS
 from .vision import roi_pool  #DEFINE_ALIAS
-# from .vision import shuffle_channel        #DEFINE_ALIAS
+from .vision import shuffle_channel  #DEFINE_ALIAS
 from .vision import space_to_depth  #DEFINE_ALIAS
 from .vision import yolo_box  #DEFINE_ALIAS
 from .vision import yolov3_loss  #DEFINE_ALIAS

python/paddle/nn/functional/common.py

@@ -25,14 +25,17 @@
 from ...fluid.layers import unfold  #DEFINE_ALIAS
 from ...fluid.layers import assign  #DEFINE_ALIAS
 
+#from ...fluid.layers import fc  #DEFINE_ALIAS
+from ...fluid.layers import pad_constant_like  #DEFINE_ALIAS
+
 __all__ = [
     'dropout',
     #       'embedding',
     #       'fc',
     'label_smooth',
     'one_hot',
     'pad',
-    #       'pad_constant_like',
+    'pad_constant_like',
     'pad2d',
     'unfold',
     #       'bilinear_tensor_product',

python/paddle/nn/functional/conv.py

@@ -99,8 +99,8 @@ def conv2d(input,
            data_format="NCHW",
            name=None):
     """
-	:alias_main: paddle.nn.functional.conv2d
-	:alias: paddle.nn.functional.conv2d,paddle.nn.functional.conv.conv2d
+	:alias_main: paddle.nn.functional.conv2d
+	:alias: paddle.nn.functional.conv2d,paddle.nn.functional.conv.conv2d
 
     The convolution2D layer calculates the output based on the input, filter
     and strides, paddings, dilations, groups parameters. Input and
@@ -336,8 +336,8 @@ def conv2d_transpose(input,
                      data_format='NCHW',
                      name=None):
     """
-	:alias_main: paddle.nn.functional.conv2d_transpose
-	:alias: paddle.nn.functional.conv2d_transpose,paddle.nn.functional.conv.conv2d_transpose
+	:alias_main: paddle.nn.functional.conv2d_transpose
+	:alias: paddle.nn.functional.conv2d_transpose,paddle.nn.functional.conv.conv2d_transpose
 
     The convolution2D transpose layer calculates the output based on the input,
     filter, and dilations, strides, paddings. Input(Input) and output(Output)
@@ -578,8 +578,8 @@ def conv3d(input,
            data_format="NCDHW",
            name=None):
     """
-	:alias_main: paddle.nn.functional.conv3d
-	:alias: paddle.nn.functional.conv3d,paddle.nn.functional.conv.conv3d
+	:alias_main: paddle.nn.functional.conv3d
+	:alias: paddle.nn.functional.conv3d,paddle.nn.functional.conv.conv3d
 
     The convolution3D layer calculates the output based on the input, filter
     and strides, paddings, dilations, groups parameters. Input(Input) and
@@ -795,8 +795,8 @@ def conv3d_transpose(input,
                      data_format='NCDHW',
                      name=None):
     """
-	:alias_main: paddle.nn.functional.conv3d_transpose
-	:alias: paddle.nn.functional.conv3d_transpose,paddle.nn.functional.conv.conv3d_transpose
+	:alias_main: paddle.nn.functional.conv3d_transpose
+	:alias: paddle.nn.functional.conv3d_transpose,paddle.nn.functional.conv.conv3d_transpose
 
     The convolution3D transpose layer calculates the output based on the input,
     filter, and dilations, strides, paddings. Input(Input) and output(Output)

python/paddle/nn/functional/extension.py

@@ -18,22 +18,30 @@
 from ...fluid.layers import target_assign  #DEFINE_ALIAS
 from ...fluid.layers import temporal_shift  #DEFINE_ALIAS
 
+from ...fluid.layers import continuous_value_model  #DEFINE_ALIAS
+from ...fluid.layers import filter_by_instag  #DEFINE_ALIAS
+from ...fluid.layers import polygon_box_transform  #DEFINE_ALIAS
+from ...fluid.layers import random_crop  #DEFINE_ALIAS
+from ...fluid.layers import rpn_target_assign  #DEFINE_ALIAS
+from ...fluid.layers import similarity_focus  #DEFINE_ALIAS
+from ...fluid.layers import warpctc  #DEFINE_ALIAS
+
 __all__ = [
     'add_position_encoding',
     #       'autoincreased_step_counter',
-    #       'continuous_value_model',
-    #       'filter_by_instag',
+    'continuous_value_model',
+    'filter_by_instag',
     #       'linear_chain_crf',
     #       'merge_selected_rows',
     'multiclass_nms',
-    #       'polygon_box_transform',
-    #       'random_crop',
+    'polygon_box_transform',
+    'random_crop',
     'row_conv',
-    #       'rpn_target_assign',
-    #       'similarity_focus',
+    'rpn_target_assign',
+    'similarity_focus',
     'target_assign',
     'temporal_shift',
-    #       'warpctc',
+    'warpctc',
     'diag_embed'
 ]
 
@@ -48,8 +56,8 @@
 
 def diag_embed(input, offset=0, dim1=-2, dim2=-1):
     """
-	:alias_main: paddle.nn.functional.diag_embed
-	:alias: paddle.nn.functional.diag_embed,paddle.nn.functional.extension.diag_embed
+	:alias_main: paddle.nn.functional.diag_embed
+	:alias: paddle.nn.functional.diag_embed,paddle.nn.functional.extension.diag_embed
 
     This OP creates a tensor whose diagonals of certain 2D planes (specified by dim1 and dim2) 
     are filled by ``input``. By default, a 2D plane formed by the last two dimensions 
@@ -168,8 +176,8 @@ def __check_input(input, offset, dim1, dim2):
 @templatedoc()
 def row_conv(input, weight, act=None):
     """
-	:alias_main: paddle.nn.functional.row_conv
-	:alias: paddle.nn.functional.row_conv,paddle.nn.functional.extension.row_conv
+	:alias_main: paddle.nn.functional.row_conv
+	:alias: paddle.nn.functional.row_conv,paddle.nn.functional.extension.row_conv
 
     ${comment}