Clean text.py and decode.py for API 2.0 #26853
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for your contribution! |
…into add-dy-decode
|
该PR完成了： |
guoshengCS
changed the title
guoshengCS
commented
Oct 10, 2020
python/paddle/fluid/layers/rnn.py
Outdated
| weight_linear = paddle.to_tensor( | ||
| np.array(np.random.rand(32, 32), dtype=paddle.get_default_dtype())) | ||
| trg_embeder = lambda x: F.embedding(x, weight=weight, padding_idx=0) | ||
| output_layer = lambda x: F.linear(x, weight=weight_linear) |
There was a problem hiding this comment.
是否将这里换成nn.Embedding和nn.Linear会更直观一些
| np.array(np.random.rand(32, 32), dtype=paddle.get_default_dtype())) | ||
| trg_embeder = lambda x: F.embedding(x, weight=weight, padding_idx=0) | ||
| output_layer = lambda x: F.linear(x, weight=weight_linear) | ||
| decoder_cell = GRUCell(input_size=32, hidden_size=32) | ||
| decoder = BeamSearchDecoder(decoder_cell, | ||
| start_token=0, | ||
| end_token=1, | ||
| beam_size=4, | ||
| embedding_fn=trg_embeder, | ||
| output_fn=output_layer) |
There was a problem hiding this comment.
embedding_fn和output_fn是否需要调整参数命名
python/paddle/fluid/layers/rnn.py
Outdated
| when using fluid.layers.embedding, must unsqueeze in embedding_fn.** | ||
| **Note that paddle.nn.functional.embedding should be used here rather than | ||
| paddle.nn.Embedding, since shape of ids is [batch_size, beam_size]. | ||
| when using paddle.nn.Embedding, must unsqueeze in embedding_fn.** |
There was a problem hiding this comment.
请检查确认这里的正确性，paddle.nn.Embedding接受的输入的形状应该是和paddle.nn.functional.embedding一样的
| output_time_major=False, | ||
| impute_finished=False, | ||
| is_test=False, | ||
| return_length=False, |
There was a problem hiding this comment.
可以考虑API中的return_length是否可以去掉
| would be called once after the decoding loop. | ||
|
|
||
| Parameters: | ||
| decoder(Decoder): An instance of `Decoder`. |
There was a problem hiding this comment.
是否需要将BeamSearchDecoder的基类Decoder也暴露出来
guoshengCS
requested review from
ZeyuChen,
XiaoguangHu01,
jzhang533,
saxon-zh and
qingqing01
…into add-dy-decode
kolinwei
previously approved these changes
Oct 14, 2020
saxon-zh
reviewed
Oct 14, 2020
python/paddle/fluid/layers/rnn.py
Outdated
| decoder_cell = GRUCell(hidden_size=128) | ||
| import numpy as np | ||
| import paddle | ||
| from paddle.fluid.layers import BeamSearchDecoder, dynamic_decode |
LiuChiachi
dismissed stale reviews from XiaoguangHu01, saxon-zh, ZeyuChen, and kolinwei
via
b4a6148
kolinwei
approved these changes
Oct 15, 2020
LiuChiachi
added a commit
to LiuChiachi/Paddle
that referenced
this pull request
Oct 16, 2020
* Make dynamic_decode support dygraph and expose to API 2.0 test=develop * update info about BeamSearchDecoder and dynamic_decode * remove all APIs in paddle.text, expose BeamSearchDecoder and dynamic_decode * update example code * delete test_text.py, decode.py, update some doc, fix example code float64 * delete decode import from paddle.nn * fix unittest bugs * use dygraph.Embedding instead of nn.Embedding, add paddle.enbale_static() * update, correct doc * move dynamic_decode, BeamSearchDecoder API to paddle.nn * fix code style * update unittest param, delete import pf text.py * set dtype of beamsearchtest float64 * update example code of BeamSearchDecoder, dynamic_decode Co-authored-by: LiuChiaChi <[email protected]>
guoshengCS
added a commit
that referenced
this pull request
Oct 17, 2020
* Make dynamic_decode support dygraph and expose to API 2.0 test=develop * update info about BeamSearchDecoder and dynamic_decode * remove all APIs in paddle.text, expose BeamSearchDecoder and dynamic_decode * update example code * delete test_text.py, decode.py, update some doc, fix example code float64 * delete decode import from paddle.nn * fix unittest bugs * use dygraph.Embedding instead of nn.Embedding, add paddle.enbale_static() * update, correct doc * move dynamic_decode, BeamSearchDecoder API to paddle.nn * fix code style * update unittest param, delete import pf text.py * set dtype of beamsearchtest float64 * update example code of BeamSearchDecoder, dynamic_decode Co-authored-by: LiuChiaChi <[email protected]> Co-authored-by: Guo Sheng <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR types
New features
PR changes
APIs
Describe