Skip to content

Commit 1413336

Browse files
authored
unaligned error in some examples(#18486)
1 parent 61b9192 commit 1413336

File tree

4 files changed

+81
-81
lines changed

4 files changed

+81
-81
lines changed

paddle/fluid/API.spec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ paddle.fluid.initializer.TruncatedNormalInitializer.__init__ (ArgSpec(args=['sel
7070
paddle.fluid.initializer.XavierInitializer.__init__ (ArgSpec(args=['self', 'uniform', 'fan_in', 'fan_out', 'seed'], varargs=None, keywords=None, defaults=(True, None, None, 0)), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
7171
paddle.fluid.initializer.BilinearInitializer.__init__ (ArgSpec(args=['self'], varargs=None, keywords=None, defaults=None), ('document', 'd389912dc079cbef432335a00017cec0'))
7272
paddle.fluid.initializer.MSRAInitializer.__init__ (ArgSpec(args=['self', 'uniform', 'fan_in', 'seed'], varargs=None, keywords=None, defaults=(True, None, 0)), ('document', '53c757bed9345f2ad3361902531e7cf5'))
73-
paddle.fluid.initializer.force_init_on_cpu (ArgSpec(args=[], varargs=None, keywords=None, defaults=None), ('document', '53c01b661feb8e60d0efa2066976c1a8'))
74-
paddle.fluid.initializer.init_on_cpu (ArgSpec(args=[], varargs=None, keywords=None, defaults=None), ('document', '68bebc3963526880a07c98a5d6226794'))
73+
paddle.fluid.initializer.force_init_on_cpu (ArgSpec(args=[], varargs=None, keywords=None, defaults=None), ('document', '5f55553caf939d270c7fe8dc418084b2'))
74+
paddle.fluid.initializer.init_on_cpu (ArgSpec(args=[], varargs=None, keywords=None, defaults=None), ('document', 'eaa04fd68661a3af59abd0e19b3b6eda'))
7575
paddle.fluid.initializer.NumpyArrayInitializer.__init__ (ArgSpec(args=['self', 'value'], varargs=None, keywords=None, defaults=None), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
7676
paddle.fluid.layers.fc (ArgSpec(args=['input', 'size', 'num_flatten_dims', 'param_attr', 'bias_attr', 'act', 'is_test', 'name'], varargs=None, keywords=None, defaults=(1, None, None, None, False, None)), ('document', '1c74f52549814235077ecc34856a95eb'))
7777
paddle.fluid.layers.embedding (ArgSpec(args=['input', 'size', 'is_sparse', 'is_distributed', 'padding_idx', 'param_attr', 'dtype'], varargs=None, keywords=None, defaults=(False, False, None, None, 'float32')), ('document', '6f9f96d2a1517cd1affebc960c3526f7'))
@@ -127,7 +127,7 @@ paddle.fluid.layers.warpctc (ArgSpec(args=['input', 'label', 'blank', 'norm_by_t
127127
paddle.fluid.layers.sequence_reshape (ArgSpec(args=['input', 'new_dim'], varargs=None, keywords=None, defaults=None), ('document', 'f568714a876425004aca4ea2d4a27701'))
128128
paddle.fluid.layers.transpose (ArgSpec(args=['x', 'perm', 'name'], varargs=None, keywords=None, defaults=(None,)), ('document', '8e72db173d4c082e27cb11f31d8c9bfa'))
129129
paddle.fluid.layers.im2sequence (ArgSpec(args=['input', 'filter_size', 'stride', 'padding', 'input_image_size', 'out_stride', 'name'], varargs=None, keywords=None, defaults=(1, 1, 0, None, 1, None)), ('document', '33134416fc27dd65a767e5f15116ee16'))
130-
paddle.fluid.layers.nce (ArgSpec(args=['input', 'label', 'num_total_classes', 'sample_weight', 'param_attr', 'bias_attr', 'num_neg_samples', 'name', 'sampler', 'custom_dist', 'seed', 'is_sparse'], varargs=None, keywords=None, defaults=(None, None, None, None, None, 'uniform', None, 0, False)), ('document', '11a544a6e3fd0482509712dd54377fa1'))
130+
paddle.fluid.layers.nce (ArgSpec(args=['input', 'label', 'num_total_classes', 'sample_weight', 'param_attr', 'bias_attr', 'num_neg_samples', 'name', 'sampler', 'custom_dist', 'seed', 'is_sparse'], varargs=None, keywords=None, defaults=(None, None, None, None, None, 'uniform', None, 0, False)), ('document', '83d4ca6dfb957912807f535756e76992'))
131131
paddle.fluid.layers.sampled_softmax_with_cross_entropy (ArgSpec(args=['logits', 'label', 'num_samples', 'num_true', 'remove_accidental_hits', 'use_customized_samples', 'customized_samples', 'customized_probabilities', 'seed'], varargs=None, keywords=None, defaults=(1, True, False, None, None, 0)), ('document', '4521da36af223d5a95bb8f190b5c7add'))
132132
paddle.fluid.layers.hsigmoid (ArgSpec(args=['input', 'label', 'num_classes', 'param_attr', 'bias_attr', 'name', 'path_table', 'path_code', 'is_custom', 'is_sparse'], varargs=None, keywords=None, defaults=(None, None, None, None, None, False, False)), ('document', 'b83e7dfa81059b39bb137922dc914f50'))
133133
paddle.fluid.layers.beam_search (ArgSpec(args=['pre_ids', 'pre_scores', 'ids', 'scores', 'beam_size', 'end_id', 'level', 'is_accumulated', 'name', 'return_parent_idx'], varargs=None, keywords=None, defaults=(0, True, None, False)), ('document', '1270395ce97a4e1b556104abbb14f096'))
@@ -376,7 +376,7 @@ paddle.fluid.layers.inverse_time_decay (ArgSpec(args=['learning_rate', 'decay_st
376376
paddle.fluid.layers.polynomial_decay (ArgSpec(args=['learning_rate', 'decay_steps', 'end_learning_rate', 'power', 'cycle'], varargs=None, keywords=None, defaults=(0.0001, 1.0, False)), ('document', 'a343254c36c2e89512cd8cd8a1960ead'))
377377
paddle.fluid.layers.piecewise_decay (ArgSpec(args=['boundaries', 'values'], varargs=None, keywords=None, defaults=None), ('document', 'd9f654117542c6b702963dda107a247f'))
378378
paddle.fluid.layers.noam_decay (ArgSpec(args=['d_model', 'warmup_steps'], varargs=None, keywords=None, defaults=None), ('document', 'fd57228fb76195e66bbcc8d8e42c494d'))
379-
paddle.fluid.layers.cosine_decay (ArgSpec(args=['learning_rate', 'step_each_epoch', 'epochs'], varargs=None, keywords=None, defaults=None), ('document', 'f0d65d8c89d0fe78051ca689daa15e35'))
379+
paddle.fluid.layers.cosine_decay (ArgSpec(args=['learning_rate', 'step_each_epoch', 'epochs'], varargs=None, keywords=None, defaults=None), ('document', '1062e487dd3b50a6e58b5703b4f594c9'))
380380
paddle.fluid.layers.linear_lr_warmup (ArgSpec(args=['learning_rate', 'warmup_steps', 'start_lr', 'end_lr'], varargs=None, keywords=None, defaults=None), ('document', '0b529386b62cc73d27b711a5f618f3e4'))
381381
paddle.fluid.contrib.InitState.__init__ (ArgSpec(args=['self', 'init', 'shape', 'value', 'init_boot', 'need_reorder', 'dtype'], varargs=None, keywords=None, defaults=(None, None, 0.0, None, False, 'float32')), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
382382
paddle.fluid.contrib.StateCell.__init__ (ArgSpec(args=['self', 'inputs', 'states', 'out_state', 'name'], varargs=None, keywords=None, defaults=(None,)), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))

python/paddle/fluid/initializer.py

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ def force_init_on_cpu():
4242
4343
.. code-block:: python
4444
45-
import paddle.fluid as fluid
46-
if fluid.initializer.force_init_on_cpu():
47-
step = fluid.layers.create_global_var(
48-
shape=[2,3], value=1.0, dtype='float32')
45+
import paddle.fluid as fluid
46+
if fluid.initializer.force_init_on_cpu():
47+
step = fluid.layers.create_global_var(
48+
shape=[2,3], value=1.0, dtype='float32')
4949
5050
"""
5151
return _force_init_on_cpu_
@@ -59,10 +59,10 @@ def init_on_cpu():
5959
Examples:
6060
.. code-block:: python
6161
62-
import paddle.fluid as fluid
63-
with fluid.initializer.init_on_cpu():
64-
step = fluid.layers.create_global_var(
65-
shape=[2,3], value=1.0, dtype='float32')
62+
import paddle.fluid as fluid
63+
with fluid.initializer.init_on_cpu():
64+
step = fluid.layers.create_global_var(
65+
shape=[2,3], value=1.0, dtype='float32')
6666
6767
"""
6868
global _force_init_on_cpu_
@@ -295,10 +295,10 @@ class NormalInitializer(Initializer):
295295
Examples:
296296
.. code-block:: python
297297
298-
import paddle.fluid as fluid
299-
x = fluid.layers.data(name="data", shape=[32, 32], dtype="float32")
300-
fc = fluid.layers.fc(input=x, size=10,
301-
param_attr=fluid.initializer.Normal(loc=0.0, scale=2.0))
298+
import paddle.fluid as fluid
299+
x = fluid.layers.data(name="data", shape=[32, 32], dtype="float32")
300+
fc = fluid.layers.fc(input=x, size=10,
301+
param_attr=fluid.initializer.Normal(loc=0.0, scale=2.0))
302302
303303
"""
304304

@@ -611,11 +611,11 @@ class MSRAInitializer(Initializer):
611611
612612
Examples:
613613
.. code-block:: python
614-
615-
import paddle.fluid as fluid
616-
x = fluid.layers.data(name="data", shape=[32, 32], dtype="float32")
617-
fc = fluid.layers.fc(input=x, size=10,
618-
param_attr=fluid.initializer.MSRA(uniform=False))
614+
615+
import paddle.fluid as fluid
616+
x = fluid.layers.data(name="data", shape=[32, 32], dtype="float32")
617+
fc = fluid.layers.fc(input=x, size=10,
618+
param_attr=fluid.initializer.MSRA(uniform=False))
619619
620620
"""
621621

@@ -715,25 +715,25 @@ class BilinearInitializer(Initializer):
715715
716716
.. code-block:: python
717717
718-
import paddle.fluid as fluid
719-
factor = 2
720-
C = 2
721-
w_attr = fluid.initializer.ParamAttr(
722-
learning_rate=0.,
723-
regularizer=fluid.regularizer.L2Decay(0.),
718+
import paddle.fluid as fluid
719+
factor = 2
720+
C = 2
721+
w_attr = fluid.initializer.ParamAttr(
722+
learning_rate=0.,
723+
regularizer=fluid.regularizer.L2Decay(0.),
724724
initializer=fluid.initializer.Bilinear())
725-
x = fluid.layers.data(name="data", shape=[3, 32, 32],
726-
dtype="float32")
727-
conv_up = fluid.layers.conv2d_transpose(
728-
input=x,
729-
num_filters=C,
730-
output_size=None,
731-
filter_size=2 * factor - factor % 2,
732-
padding=int(math.ceil((factor - 1) / 2.)),
733-
stride=factor,
734-
groups=C,
735-
param_attr=w_attr,
736-
bias_attr=False)
725+
x = fluid.layers.data(name="data", shape=[3, 32, 32],
726+
dtype="float32")
727+
conv_up = fluid.layers.conv2d_transpose(
728+
input=x,
729+
num_filters=C,
730+
output_size=None,
731+
filter_size=2 * factor - factor % 2,
732+
padding=int(math.ceil((factor - 1) / 2.)),
733+
stride=factor,
734+
groups=C,
735+
param_attr=w_attr,
736+
bias_attr=False)
737737
738738
Where, `num_filters=C` and `groups=C` means this is channel-wise transposed
739739
convolution. The filter shape will be (C, 1, K, K) where K is `filer_size`,

python/paddle/fluid/layers/learning_rate_scheduler.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -403,23 +403,23 @@ def cosine_decay(learning_rate, step_each_epoch, epochs):
403403
404404
.. math::
405405
406-
decayed\_lr = learning\_rate * 0.5 * (math.cos * (epoch * \\frac{math.pi}{epochs} ) + 1)
407-
406+
decayed\_lr = learning\_rate * 0.5 * (math.cos * (epoch * \\frac{math.pi}{epochs} ) + 1)
407+
408408
Args:
409409
learning_rate(Variable|float): The initial learning rate.
410410
step_each_epoch(int): the number of steps in an epoch.
411411
epochs(int): the number of epochs.
412412
413413
Returns:
414-
Variable: The decayed learning rate.
414+
Variable: The decayed learning rate.
415415
416416
Examples:
417-
.. code-block:: python
417+
.. code-block:: python
418418
419-
import paddle.fluid as fluid
420-
base_lr = 0.1
421-
lr = fluid.layers.cosine_decay(
422-
learning_rate = base_lr, step_each_epoch=10000, epochs=120)
419+
import paddle.fluid as fluid
420+
base_lr = 0.1
421+
lr = fluid.layers.cosine_decay(
422+
learning_rate = base_lr, step_each_epoch=10000, epochs=120)
423423
"""
424424

425425
with default_main_program()._lr_schedule_guard():

python/paddle/fluid/layers/nn.py

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5691,40 +5691,40 @@ def nce(input,
56915691
.. code-block:: python
56925692
56935693
5694-
import paddle.fluid as fluid
5695-
import numpy as np
5696-
5697-
window_size = 5
5698-
words = []
5699-
for i in xrange(window_size):
5700-
words.append(fluid.layers.data(
5701-
name='word_{0}'.format(i), shape=[1], dtype='int64'))
5702-
5703-
dict_size = 10000
5704-
label_word = int(window_size / 2) + 1
5705-
5706-
embs = []
5707-
for i in xrange(window_size):
5708-
if i == label_word:
5709-
continue
5710-
5711-
emb = fluid.layers.embedding(input=words[i], size=[dict_size, 32],
5712-
param_attr='embed', is_sparse=True)
5713-
embs.append(emb)
5714-
5715-
embs = fluid.layers.concat(input=embs, axis=1)
5716-
loss = fluid.layers.nce(input=embs, label=words[label_word],
5717-
num_total_classes=dict_size, param_attr='nce.w_0',
5718-
bias_attr='nce.b_0')
5719-
5720-
#or use custom distribution
5721-
dist = np.array([0.05,0.5,0.1,0.3,0.05])
5722-
loss = fluid.layers.nce(input=embs, label=words[label_word],
5723-
num_total_classes=5, param_attr='nce.w_1',
5724-
bias_attr='nce.b_1',
5725-
num_neg_samples=3,
5726-
sampler="custom_dist",
5727-
custom_dist=dist)
5694+
import paddle.fluid as fluid
5695+
import numpy as np
5696+
5697+
window_size = 5
5698+
words = []
5699+
for i in xrange(window_size):
5700+
words.append(fluid.layers.data(
5701+
name='word_{0}'.format(i), shape=[1], dtype='int64'))
5702+
5703+
dict_size = 10000
5704+
label_word = int(window_size / 2) + 1
5705+
5706+
embs = []
5707+
for i in xrange(window_size):
5708+
if i == label_word:
5709+
continue
5710+
5711+
emb = fluid.layers.embedding(input=words[i], size=[dict_size, 32],
5712+
param_attr='embed', is_sparse=True)
5713+
embs.append(emb)
5714+
5715+
embs = fluid.layers.concat(input=embs, axis=1)
5716+
loss = fluid.layers.nce(input=embs, label=words[label_word],
5717+
num_total_classes=dict_size, param_attr='nce.w_0',
5718+
bias_attr='nce.b_0')
5719+
5720+
#or use custom distribution
5721+
dist = np.array([0.05,0.5,0.1,0.3,0.05])
5722+
loss = fluid.layers.nce(input=embs, label=words[label_word],
5723+
num_total_classes=5, param_attr='nce.w_1',
5724+
bias_attr='nce.b_1',
5725+
num_neg_samples=3,
5726+
sampler="custom_dist",
5727+
custom_dist=dist)
57285728
"""
57295729
helper = LayerHelper('nce', **locals())
57305730
assert isinstance(input, Variable)

0 commit comments

Comments
 (0)