Skip to content

Commit 217ca77

Browse files
XiaoguangHu01XiaoguangHu01
authored
[for 2.0-alpha] add alias in paddle.nn and paddle.tensor test=develop (#24561)
* add alias in paddle.nn and paddle.tensor test=develop * add alias in paddle.nn and paddle.tensor dir test=develop * fix same conflict manually test=develop * update fc and dygraph alias test=develop * fix initalizer.py typo test=develop
1 parent 2b6d004 commit 217ca77

24 files changed

+244
-220
lines changed

‎python/paddle/__init__.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,12 @@
4343
import paddle.incubate.complex as complex
4444

4545
# TODO: define alias in tensor and framework directory
46+
4647
from .tensor.random import randperm
48+
4749
from .tensor.attribute import rank #DEFINE_ALIAS
4850
from .tensor.attribute import shape #DEFINE_ALIAS
49-
# from .tensor.creation import create_tensor #DEFINE_ALIAS
51+
from .tensor.creation import create_tensor #DEFINE_ALIAS
5052
# from .tensor.creation import create_lod_tensor #DEFINE_ALIAS
5153
# from .tensor.creation import create_random_int_lodtensor #DEFINE_ALIAS
5254
from .tensor.creation import crop_tensor #DEFINE_ALIAS
@@ -102,25 +104,25 @@
102104
from .tensor.manipulation import expand_as #DEFINE_ALIAS
103105
from .tensor.manipulation import flatten #DEFINE_ALIAS
104106
from .tensor.manipulation import gather #DEFINE_ALIAS
105-
# from .tensor.manipulation import gather_nd #DEFINE_ALIAS
107+
from .tensor.manipulation import gather_nd #DEFINE_ALIAS
106108
from .tensor.manipulation import reshape #DEFINE_ALIAS
107109
from .tensor.manipulation import reverse #DEFINE_ALIAS
108110
from .tensor.manipulation import scatter #DEFINE_ALIAS
109-
# from .tensor.manipulation import scatter_nd_add #DEFINE_ALIAS
110-
# from .tensor.manipulation import scatter_nd #DEFINE_ALIAS
111-
# from .tensor.manipulation import shard_index #DEFINE_ALIAS
111+
from .tensor.manipulation import scatter_nd_add #DEFINE_ALIAS
112+
from .tensor.manipulation import scatter_nd #DEFINE_ALIAS
113+
from .tensor.manipulation import shard_index #DEFINE_ALIAS
112114
from .tensor.manipulation import slice #DEFINE_ALIAS
113115
from .tensor.manipulation import split #DEFINE_ALIAS
114116
from .tensor.manipulation import squeeze #DEFINE_ALIAS
115117
from .tensor.manipulation import stack #DEFINE_ALIAS
116118
from .tensor.manipulation import strided_slice #DEFINE_ALIAS
117119
from .tensor.manipulation import transpose #DEFINE_ALIAS
118120
from .tensor.manipulation import unique #DEFINE_ALIAS
119-
# from .tensor.manipulation import unique_with_counts #DEFINE_ALIAS
121+
from .tensor.manipulation import unique_with_counts #DEFINE_ALIAS
120122
from .tensor.manipulation import unsqueeze #DEFINE_ALIAS
121123
from .tensor.manipulation import unstack #DEFINE_ALIAS
122124
from .tensor.manipulation import flip #DEFINE_ALIAS
123-
# from .tensor.manipulation import unbind #DEFINE_ALIAS
125+
from .tensor.manipulation import unbind #DEFINE_ALIAS
124126
from .tensor.manipulation import roll #DEFINE_ALIAS
125127
from .tensor.math import abs #DEFINE_ALIAS
126128
from .tensor.math import acos #DEFINE_ALIAS
@@ -140,10 +142,10 @@
140142
from .tensor.math import elementwise_sub #DEFINE_ALIAS
141143
from .tensor.math import exp #DEFINE_ALIAS
142144
from .tensor.math import floor #DEFINE_ALIAS
143-
# from .tensor.math import increment #DEFINE_ALIAS
145+
from .tensor.math import increment #DEFINE_ALIAS
144146
from .tensor.math import log #DEFINE_ALIAS
145147
from .tensor.math import mul #DEFINE_ALIAS
146-
# from .tensor.math import multiplex #DEFINE_ALIAS
148+
from .tensor.math import multiplex #DEFINE_ALIAS
147149
from .tensor.math import pow #DEFINE_ALIAS
148150
from .tensor.math import reciprocal #DEFINE_ALIAS
149151
from .tensor.math import reduce_max #DEFINE_ALIAS
@@ -159,7 +161,7 @@
159161
from .tensor.math import square #DEFINE_ALIAS
160162
from .tensor.math import stanh #DEFINE_ALIAS
161163
from .tensor.math import sum #DEFINE_ALIAS
162-
# from .tensor.math import sums #DEFINE_ALIAS
164+
from .tensor.math import sums #DEFINE_ALIAS
163165
from .tensor.math import tanh #DEFINE_ALIAS
164166
from .tensor.math import elementwise_sum #DEFINE_ALIAS
165167
from .tensor.math import max #DEFINE_ALIAS

‎python/paddle/nn/__init__.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
from .clip import GradientClipByValue #DEFINE_ALIAS
3434
# from .clip import set_gradient_clip #DEFINE_ALIAS
3535
from .clip import clip #DEFINE_ALIAS
36-
# from .clip import clip_by_norm #DEFINE_ALIAS
36+
from .clip import clip_by_norm #DEFINE_ALIAS
3737
from .control_flow import case #DEFINE_ALIAS
3838
from .control_flow import cond #DEFINE_ALIAS
3939
# from .control_flow import DynamicRNN #DEFINE_ALIAS
4040
# from .control_flow import StaticRNN #DEFINE_ALIAS
41-
# from .control_flow import switch_case #DEFINE_ALIAS
41+
from .control_flow import switch_case #DEFINE_ALIAS
4242
from .control_flow import while_loop #DEFINE_ALIAS
4343
# from .control_flow import rnn #DEFINE_ALIAS
4444
# from .decode import BeamSearchDecoder #DEFINE_ALIAS
@@ -48,7 +48,7 @@
4848
# from .decode import crf_decoding #DEFINE_ALIAS
4949
# from .decode import ctc_greedy_decoder #DEFINE_ALIAS
5050
# from .decode import dynamic_decode #DEFINE_ALIAS
51-
# from .decode import gather_tree #DEFINE_ALIAS
51+
from .decode import gather_tree #DEFINE_ALIAS
5252
from .input import data #DEFINE_ALIAS
5353
# from .input import Input #DEFINE_ALIAS
5454
# from .layer.activation import PReLU #DEFINE_ALIAS
@@ -90,6 +90,7 @@
9090
# from .layer.rnn import RNNCell #DEFINE_ALIAS
9191
# from .layer.rnn import GRUCell #DEFINE_ALIAS
9292
# from .layer.rnn import LSTMCell #DEFINE_ALIAS
93+
9394
from .layer import loss #DEFINE_ALIAS
9495
from .layer import conv #DEFINE_ALIAS
9596
from ..fluid.dygraph.layers import Layer #DEFINE_ALIAS

‎python/paddle/nn/clip.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
from ..fluid.clip import GradientClipByValue #DEFINE_ALIAS
1919
from ..fluid.layers import clip #DEFINE_ALIAS
2020

21+
from ..fluid.layers import clip_by_norm #DEFINE_ALIAS
22+
2123
__all__ = [
2224
# 'ErrorClipByValue',
2325
'GradientClipByGlobalNorm',
2426
'GradientClipByNorm',
2527
'GradientClipByValue',
2628
# 'set_gradient_clip',
2729
'clip',
28-
# 'clip_by_norm'
30+
'clip_by_norm'
2931
]

‎python/paddle/nn/control_flow.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
from ..fluid.layers import cond #DEFINE_ALIAS
1818
from ..fluid.layers import while_loop #DEFINE_ALIAS
1919

20+
from ..fluid.layers import switch_case #DEFINE_ALIAS
21+
2022
__all__ = [
2123
'case',
2224
'cond',
2325
# 'DynamicRNN',
2426
# 'StaticRNN',
25-
# 'switch_case',
27+
'switch_case',
2628
'while_loop',
2729
# 'rnn'
2830
]

‎python/paddle/nn/decode.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
from ..fluid.layers import beam_search #DEFINE_ALIAS
1717
from ..fluid.layers import beam_search_decode #DEFINE_ALIAS
1818

19+
from ..fluid.layers import gather_tree #DEFINE_ALIAS
20+
1921
__all__ = [
2022
# 'BeamSearchDecoder',
2123
# 'Decoder',
@@ -24,5 +26,5 @@
2426
# 'crf_decoding',
2527
# 'ctc_greedy_decoder',
2628
# 'dynamic_decode',
27-
# 'gather_tree'
29+
'gather_tree'
2830
]

‎python/paddle/nn/functional/__init__.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@
5252
from .activation import log_softmax #DEFINE_ALIAS
5353
from .common import dropout #DEFINE_ALIAS
5454
# from .common import embedding #DEFINE_ALIAS
55-
# from .common import fc #DEFINE_ALIAS
55+
# from .common import fc #DEFINE_ALIAS
5656
from .common import label_smooth #DEFINE_ALIAS
5757
from .common import one_hot #DEFINE_ALIAS
5858
from .common import pad #DEFINE_ALIAS
59-
# from .common import pad_constant_like #DEFINE_ALIAS
59+
from .common import pad_constant_like #DEFINE_ALIAS
6060
from .common import pad2d #DEFINE_ALIAS
6161
from .common import unfold #DEFINE_ALIAS
6262
# from .common import bilinear_tensor_product #DEFINE_ALIAS
@@ -68,19 +68,19 @@
6868
from .conv import conv3d_transpose #DEFINE_ALIAS
6969
from .extension import add_position_encoding #DEFINE_ALIAS
7070
# from .extension import autoincreased_step_counter #DEFINE_ALIAS
71-
# from .extension import continuous_value_model #DEFINE_ALIAS
72-
# from .extension import filter_by_instag #DEFINE_ALIAS
71+
from .extension import continuous_value_model #DEFINE_ALIAS
72+
from .extension import filter_by_instag #DEFINE_ALIAS
7373
# from .extension import linear_chain_crf #DEFINE_ALIAS
7474
# from .extension import merge_selected_rows #DEFINE_ALIAS
7575
from .extension import multiclass_nms #DEFINE_ALIAS
76-
# from .extension import polygon_box_transform #DEFINE_ALIAS
77-
# from .extension import random_crop #DEFINE_ALIAS
76+
from .extension import polygon_box_transform #DEFINE_ALIAS
77+
from .extension import random_crop #DEFINE_ALIAS
7878
from .extension import row_conv #DEFINE_ALIAS
79-
# from .extension import rpn_target_assign #DEFINE_ALIAS
80-
# from .extension import similarity_focus #DEFINE_ALIAS
79+
from .extension import rpn_target_assign #DEFINE_ALIAS
80+
from .extension import similarity_focus #DEFINE_ALIAS
8181
from .extension import target_assign #DEFINE_ALIAS
8282
from .extension import temporal_shift #DEFINE_ALIAS
83-
# from .extension import warpctc #DEFINE_ALIAS
83+
from .extension import warpctc #DEFINE_ALIAS
8484
from .extension import diag_embed #DEFINE_ALIAS
8585
from .learning_rate import cosine_decay #DEFINE_ALIAS
8686
from .learning_rate import exponential_decay #DEFINE_ALIAS
@@ -123,17 +123,17 @@
123123
from .loss import center_loss #DEFINE_ALIAS
124124
from .loss import cross_entropy #DEFINE_ALIAS
125125
from .loss import dice_loss #DEFINE_ALIAS
126-
# from .loss import edit_distance #DEFINE_ALIAS
127-
# from .loss import huber_loss #DEFINE_ALIAS
126+
from .loss import edit_distance #DEFINE_ALIAS
127+
from .loss import huber_loss #DEFINE_ALIAS
128128
from .loss import iou_similarity #DEFINE_ALIAS
129129
from .loss import kldiv_loss #DEFINE_ALIAS
130130
from .loss import log_loss #DEFINE_ALIAS
131-
# from .loss import margin_rank_loss #DEFINE_ALIAS
131+
from .loss import margin_rank_loss #DEFINE_ALIAS
132132
from .loss import mse_loss #DEFINE_ALIAS
133133
# from .loss import nce #DEFINE_ALIAS
134134
from .loss import npair_loss #DEFINE_ALIAS
135135
from .loss import rank_loss #DEFINE_ALIAS
136-
# from .loss import sampled_softmax_with_cross_entropy #DEFINE_ALIAS
136+
from .loss import sampled_softmax_with_cross_entropy #DEFINE_ALIAS
137137
from .loss import sigmoid_cross_entropy_with_logits #DEFINE_ALIAS
138138
from .loss import sigmoid_focal_loss #DEFINE_ALIAS
139139
from .loss import smooth_l1 #DEFINE_ALIAS
@@ -169,27 +169,27 @@
169169
from .vision import density_prior_box #DEFINE_ALIAS
170170
from .vision import detection_output #DEFINE_ALIAS
171171
from .vision import distribute_fpn_proposals #DEFINE_ALIAS
172-
# from .vision import fsp_matrix #DEFINE_ALIAS
172+
from .vision import fsp_matrix #DEFINE_ALIAS
173173
from .vision import generate_mask_labels #DEFINE_ALIAS
174174
from .vision import generate_proposal_labels #DEFINE_ALIAS
175175
from .vision import generate_proposals #DEFINE_ALIAS
176176
from .vision import grid_sampler #DEFINE_ALIAS
177177
from .vision import image_resize #DEFINE_ALIAS
178-
# from .vision import image_resize_short #DEFINE_ALIAS
178+
from .vision import image_resize_short #DEFINE_ALIAS
179179
# from .vision import multi_box_head #DEFINE_ALIAS
180-
# from .vision import pixel_shuffle #DEFINE_ALIAS
180+
from .vision import pixel_shuffle #DEFINE_ALIAS
181181
from .vision import prior_box #DEFINE_ALIAS
182182
from .vision import prroi_pool #DEFINE_ALIAS
183183
from .vision import psroi_pool #DEFINE_ALIAS
184184
from .vision import resize_bilinear #DEFINE_ALIAS
185185
from .vision import resize_nearest #DEFINE_ALIAS
186186
from .vision import resize_trilinear #DEFINE_ALIAS
187-
# from .vision import retinanet_detection_output #DEFINE_ALIAS
188-
# from .vision import retinanet_target_assign #DEFINE_ALIAS
187+
from .vision import retinanet_detection_output #DEFINE_ALIAS
188+
from .vision import retinanet_target_assign #DEFINE_ALIAS
189189
from .vision import roi_align #DEFINE_ALIAS
190-
# from .vision import roi_perspective_transform #DEFINE_ALIAS
190+
from .vision import roi_perspective_transform #DEFINE_ALIAS
191191
from .vision import roi_pool #DEFINE_ALIAS
192-
# from .vision import shuffle_channel #DEFINE_ALIAS
192+
from .vision import shuffle_channel #DEFINE_ALIAS
193193
from .vision import space_to_depth #DEFINE_ALIAS
194194
from .vision import yolo_box #DEFINE_ALIAS
195195
from .vision import yolov3_loss #DEFINE_ALIAS

‎python/paddle/nn/functional/common.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@
2525
from ...fluid.layers import unfold #DEFINE_ALIAS
2626
from ...fluid.layers import assign #DEFINE_ALIAS
2727

28+
#from ...fluid.layers import fc #DEFINE_ALIAS
29+
from ...fluid.layers import pad_constant_like #DEFINE_ALIAS
30+
2831
__all__ = [
2932
'dropout',
3033
# 'embedding',
3134
# 'fc',
3235
'label_smooth',
3336
'one_hot',
3437
'pad',
35-
# 'pad_constant_like',
38+
'pad_constant_like',
3639
'pad2d',
3740
'unfold',
3841
# 'bilinear_tensor_product',

‎python/paddle/nn/functional/conv.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ def conv2d(input,
9999
data_format="NCHW",
100100
name=None):
101101
"""
102-
:alias_main: paddle.nn.functional.conv2d
103-
:alias: paddle.nn.functional.conv2d,paddle.nn.functional.conv.conv2d
102+
:alias_main: paddle.nn.functional.conv2d
103+
:alias: paddle.nn.functional.conv2d,paddle.nn.functional.conv.conv2d
104104
105105
The convolution2D layer calculates the output based on the input, filter
106106
and strides, paddings, dilations, groups parameters. Input and
@@ -336,8 +336,8 @@ def conv2d_transpose(input,
336336
data_format='NCHW',
337337
name=None):
338338
"""
339-
:alias_main: paddle.nn.functional.conv2d_transpose
340-
:alias: paddle.nn.functional.conv2d_transpose,paddle.nn.functional.conv.conv2d_transpose
339+
:alias_main: paddle.nn.functional.conv2d_transpose
340+
:alias: paddle.nn.functional.conv2d_transpose,paddle.nn.functional.conv.conv2d_transpose
341341
342342
The convolution2D transpose layer calculates the output based on the input,
343343
filter, and dilations, strides, paddings. Input(Input) and output(Output)
@@ -578,8 +578,8 @@ def conv3d(input,
578578
data_format="NCDHW",
579579
name=None):
580580
"""
581-
:alias_main: paddle.nn.functional.conv3d
582-
:alias: paddle.nn.functional.conv3d,paddle.nn.functional.conv.conv3d
581+
:alias_main: paddle.nn.functional.conv3d
582+
:alias: paddle.nn.functional.conv3d,paddle.nn.functional.conv.conv3d
583583
584584
The convolution3D layer calculates the output based on the input, filter
585585
and strides, paddings, dilations, groups parameters. Input(Input) and
@@ -795,8 +795,8 @@ def conv3d_transpose(input,
795795
data_format='NCDHW',
796796
name=None):
797797
"""
798-
:alias_main: paddle.nn.functional.conv3d_transpose
799-
:alias: paddle.nn.functional.conv3d_transpose,paddle.nn.functional.conv.conv3d_transpose
798+
:alias_main: paddle.nn.functional.conv3d_transpose
799+
:alias: paddle.nn.functional.conv3d_transpose,paddle.nn.functional.conv.conv3d_transpose
800800
801801
The convolution3D transpose layer calculates the output based on the input,
802802
filter, and dilations, strides, paddings. Input(Input) and output(Output)

‎python/paddle/nn/functional/extension.py

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,30 @@
1818
from ...fluid.layers import target_assign #DEFINE_ALIAS
1919
from ...fluid.layers import temporal_shift #DEFINE_ALIAS
2020

21+
from ...fluid.layers import continuous_value_model #DEFINE_ALIAS
22+
from ...fluid.layers import filter_by_instag #DEFINE_ALIAS
23+
from ...fluid.layers import polygon_box_transform #DEFINE_ALIAS
24+
from ...fluid.layers import random_crop #DEFINE_ALIAS
25+
from ...fluid.layers import rpn_target_assign #DEFINE_ALIAS
26+
from ...fluid.layers import similarity_focus #DEFINE_ALIAS
27+
from ...fluid.layers import warpctc #DEFINE_ALIAS
28+
2129
__all__ = [
2230
'add_position_encoding',
2331
# 'autoincreased_step_counter',
24-
# 'continuous_value_model',
25-
# 'filter_by_instag',
32+
'continuous_value_model',
33+
'filter_by_instag',
2634
# 'linear_chain_crf',
2735
# 'merge_selected_rows',
2836
'multiclass_nms',
29-
# 'polygon_box_transform',
30-
# 'random_crop',
37+
'polygon_box_transform',
38+
'random_crop',
3139
'row_conv',
32-
# 'rpn_target_assign',
33-
# 'similarity_focus',
40+
'rpn_target_assign',
41+
'similarity_focus',
3442
'target_assign',
3543
'temporal_shift',
36-
# 'warpctc',
44+
'warpctc',
3745
'diag_embed'
3846
]
3947

@@ -48,8 +56,8 @@
4856

4957
def diag_embed(input, offset=0, dim1=-2, dim2=-1):
5058
"""
51-
:alias_main: paddle.nn.functional.diag_embed
52-
:alias: paddle.nn.functional.diag_embed,paddle.nn.functional.extension.diag_embed
59+
:alias_main: paddle.nn.functional.diag_embed
60+
:alias: paddle.nn.functional.diag_embed,paddle.nn.functional.extension.diag_embed
5361
5462
This OP creates a tensor whose diagonals of certain 2D planes (specified by dim1 and dim2)
5563
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):
168176
@templatedoc()
169177
def row_conv(input, weight, act=None):
170178
"""
171-
:alias_main: paddle.nn.functional.row_conv
172-
:alias: paddle.nn.functional.row_conv,paddle.nn.functional.extension.row_conv
179+
:alias_main: paddle.nn.functional.row_conv
180+
:alias: paddle.nn.functional.row_conv,paddle.nn.functional.extension.row_conv
173181
174182
${comment}
175183

0 commit comments

Comments
 (0)