-
Notifications
You must be signed in to change notification settings - Fork 5.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add embedding 2.0 #26649
Merged
seiriosPlus
merged 27 commits into
PaddlePaddle:develop
from
seiriosPlus:feature/embedding_2.0
Sep 1, 2020
Merged
add embedding 2.0 #26649
Changes from 24 commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
8d9ea96
add embedding 2.0
seiriosPlus 1c2fe3e
add embedding 2.0
seiriosPlus a275b2f
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
seiriosPlus 309b9b1
fix reviewer's comments
seiriosPlus d7b4ded
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
seiriosPlus c48e73c
fix fuse
seiriosPlus c5a569d
add nn.Embedding
seiriosPlus fc528b2
add nn.Embedding
seiriosPlus a4194bd
add nn.Embedding
seiriosPlus 51611c4
add nn.Embedding
seiriosPlus 1bc093a
add nn.Embedding
seiriosPlus c2ebb07
merge develop
seiriosPlus 9be1b04
merge develop
seiriosPlus 0f791fb
merge develop
seiriosPlus ac9f917
fix API
seiriosPlus e4e440f
fix UT
seiriosPlus 7fb14a5
fix docstring
seiriosPlus cd3dd55
fix UT
seiriosPlus 4d19d63
support INT32 input
seiriosPlus 924851b
support INT32 input
seiriosPlus b41fd74
support INT32 input
seiriosPlus 1c387bc
support INT32 input
seiriosPlus bdb2399
fix embedding 2.0 doc
seiriosPlus 8cf4b3a
add BugfixWithBehaviorChanged
seiriosPlus 5e3de1c
add UT
seiriosPlus ac328cc
add UT
seiriosPlus 569536d
add cuda support for int32
seiriosPlus File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
36 changes: 36 additions & 0 deletions
36
python/paddle/fluid/tests/unittests/test_nn_functional_embedding_dygraph.py
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from __future__ import print_function | ||
|
||
import unittest | ||
|
||
|
||
class EmbeddingDygraph(unittest.TestCase): | ||
def test_1(self): | ||
import paddle | ||
import paddle.nn as nn | ||
import numpy as np | ||
paddle.disable_static() | ||
|
||
# example 1 | ||
inp_word = np.array([[2, 3, 5], [4, 2, 1]]).astype('int64') | ||
inp_word.shape # [2, 3] | ||
dict_size = 20 | ||
|
||
emb = nn.Embedding(dict_size, 32, weight_attr='emb.w', sparse=False) | ||
|
||
|
||
if __name__ == '__main__': | ||
unittest.main() |
82 changes: 82 additions & 0 deletions
82
python/paddle/fluid/tests/unittests/test_nn_functional_embedding_static.py
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from __future__ import print_function | ||
|
||
import unittest | ||
import numpy as np | ||
import paddle.fluid as fluid | ||
import paddle.nn.functional as functional | ||
|
||
|
||
class EmbeddingStatic(unittest.TestCase): | ||
def test_1(self): | ||
prog = fluid.Program() | ||
with fluid.program_guard(prog): | ||
|
||
def test_bad_x(): | ||
initializer = fluid.initializer.NumpyArrayInitializer( | ||
np.random.random(size=(128, 100))) | ||
|
||
param_attr = fluid.ParamAttr( | ||
name="emb_weight", | ||
learning_rate=0.5, | ||
initializer=initializer, | ||
trainable=True) | ||
|
||
weight = prog.global_block().create_parameter( | ||
(128, 100), attr=param_attr, dtype="float32") | ||
|
||
label = fluid.layers.data( | ||
name="label", | ||
shape=[4], | ||
append_batch_size=False, | ||
dtype="int64") | ||
|
||
emb = functional.embedding( | ||
x=label, weight=weight, sparse=True, name="embedding") | ||
|
||
test_bad_x() | ||
|
||
def test_2(self): | ||
prog = fluid.Program() | ||
with fluid.program_guard(prog): | ||
|
||
def test_bad_x(): | ||
initializer = fluid.initializer.NumpyArrayInitializer( | ||
np.random.random(size=(128, 100))) | ||
|
||
param_attr = fluid.ParamAttr( | ||
name="emb_weight", | ||
learning_rate=0.5, | ||
initializer=initializer, | ||
trainable=True) | ||
|
||
weight = prog.global_block().create_parameter( | ||
(128, 100), attr=param_attr, dtype="float32") | ||
|
||
label = fluid.layers.data( | ||
name="label", | ||
shape=[4], | ||
append_batch_size=False, | ||
dtype="int32") | ||
|
||
emb = functional.embedding( | ||
x=label, weight=weight, sparse=True, name="embedding") | ||
|
||
test_bad_x() | ||
|
||
|
||
if __name__ == '__main__': | ||
unittest.main() |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个embedding和 functional下面的embedding不一样,应该直接说这个接口被直接废弃了