Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add the L2 distance layer. #5736

Merged
merged 5 commits into from
Nov 19, 2017
Merged

Add the L2 distance layer. #5736

merged 5 commits into from
Nov 19, 2017

Conversation

lcy-seso
Copy link
Contributor

@lcy-seso lcy-seso commented Nov 17, 2017 •
edited
Loading

fixes #5739

@lcy-seso lcy-seso force-pushed the l2_distance branch 2 times, most recently from 97bae9a to 122f5bf Compare November 17, 2017 08:58
@lcy-seso lcy-seso force-pushed the l2_distance branch 3 times, most recently from 3c57ac7 to 6806dbe Compare November 17, 2017 09:10
ranqiu92
ranqiu92 reviewed Nov 17, 2017
View reviewed changes
python/paddle/trainer_config_helpers/layers.py Outdated
@layer_support()
def l2_distance_layer(x, y, name=None, layer_attr=None):
"""
This layer calculate and return the Euclidean distance between two input
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...calculates...returns...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

python/paddle/trainer_config_helpers/layers.py Outdated
Layer(
name=name,
type=LayerType.L2_DISTANCE,
inputs=[x.name, x.name],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

y.name

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, thank you.

python/paddle/trainer/config_parser.py Outdated
config_assert(len(self.inputs) == 2, 'CosSimLayer must have 2 inputs')
config_assert(
self.get_input_layer(0).size == self.get_input_layer(1).size,
'inputs of CosSimLayer must have same dim')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

首字母大写，dim单词不要简写

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

guoshengCS
guoshengCS approved these changes Nov 17, 2017
View reviewed changes
Copy link
Contributor

@guoshengCS guoshengCS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lcy-seso lcy-seso merged commit c6ec26d into PaddlePaddle:develop Nov 19, 2017
@lcy-seso lcy-seso deleted the l2_distance branch November 19, 2017 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ranqiu92 ranqiu92 ranqiu92 left review comments

@guoshengCS guoshengCS guoshengCS approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add a L2 norm distance layer.
3 participants
@lcy-seso @guoshengCS @ranqiu92