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

Adding greater than and less than equal ops to compare op #5609

Merged
merged 4 commits into from
Nov 14, 2017
Merged

Adding greater than and less than equal ops to compare op #5609

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09fae78
Adding greater than and less than equal ops to compare op
Nov 13, 2017
b7684ed
Changing the name of the less_than_equal and greater_than_equal op
Nov 14, 2017
e244a3c
Also changing the name of the functors
Nov 14, 2017
e0411b5
Merge remote-tracking branch 'origin/develop' into compare_op
Nov 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions paddle/operators/compare_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,14 @@ class CompareOp : public framework::OperatorWithKernel {

REGISTER_LOGICAL_OP(less_than, "Out = X < Y");
REGISTER_LOGICAL_KERNEL(less_than, CPU, paddle::operators::LessThanFunctor);
REGISTER_LOGICAL_OP(less_than_equal, "Out = X <= Y");
Copy link
Contributor

Choose a reason for hiding this comment

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

less_equal better? LE for short

REGISTER_LOGICAL_KERNEL(less_than_equal, CPU,
paddle::operators::LessThanEqualFunctor);
REGISTER_LOGICAL_OP(greater_than, "Out = X > Y");
REGISTER_LOGICAL_KERNEL(greater_than, CPU,
paddle::operators::GreaterThanFunctor);
REGISTER_LOGICAL_OP(greater_than_equal, "Out = X >= Y");
Copy link
Contributor

Choose a reason for hiding this comment

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

greater_equal

I find that the names in Tensorflow's comparison operators are more clear

https://www.tensorflow.org/versions/r0.12/api_docs/python/control_flow_ops/comparison_operators

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Even I prefer the names in Tensorflow. However, I kept this because we already had the less_than op. Do you think I should refactor all of them to have easy and simple names like Tensorflow?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think that the Tensorflow's name is better, shorter but not confusing.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated in the latest commit.

REGISTER_LOGICAL_KERNEL(greater_than_equal, CPU,
paddle::operators::GreaterThanEqualFunctor);
REGISTER_LOGICAL_OP(equal, "Out = X == Y");
REGISTER_LOGICAL_KERNEL(equal, CPU, paddle::operators::EqualFunctor);
6 changes: 6 additions & 0 deletions paddle/operators/compare_op.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,10 @@
#include "paddle/operators/compare_op.h"

REGISTER_LOGICAL_KERNEL(less_than, GPU, paddle::operators::LessThanFunctor);
REGISTER_LOGICAL_KERNEL(less_than_equal, GPU,
paddle::operators::LessThanEqualFunctor);
Copy link
Contributor

Choose a reason for hiding this comment

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

should these functors be changed too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. Thank you for pointing that out. Changed it in the latest commit.

REGISTER_LOGICAL_KERNEL(greater_than, GPU,
paddle::operators::GreaterThanFunctor);
REGISTER_LOGICAL_KERNEL(greater_than_equal, GPU,
paddle::operators::GreaterThanEqualFunctor);
REGISTER_LOGICAL_KERNEL(equal, GPU, paddle::operators::EqualFunctor);
18 changes: 18 additions & 0 deletions paddle/operators/compare_op.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,24 @@ struct LessThanFunctor {
HOSTDEVICE bool operator()(const T& a, const T& b) const { return a < b; }
};

template <typename T>
struct LessThanEqualFunctor {
using ELEM_TYPE = T;
HOSTDEVICE bool operator()(const T& a, const T& b) const { return a <= b; }
};

template <typename T>
struct GreaterThanFunctor {
using ELEM_TYPE = T;
HOSTDEVICE bool operator()(const T& a, const T& b) const { return a > b; }
};

template <typename T>
struct GreaterThanEqualFunctor {
using ELEM_TYPE = T;
HOSTDEVICE bool operator()(const T& a, const T& b) const { return a >= b; }
};

template <typename T>
struct EqualFunctor {
using ELEM_TYPE = T;
Expand Down
3 changes: 3 additions & 0 deletions python/paddle/v2/framework/tests/test_compare_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ def test_output(self):

for _type_name in {'float32', 'float64', 'int32', 'int64'}:
create_test_class('less_than', _type_name, lambda _a, _b: _a < _b)
create_test_class('less_than_equal', _type_name, lambda _a, _b: _a <= _b)
create_test_class('greater_than', _type_name, lambda _a, _b: _a > _b)
create_test_class('greater_than_equal', _type_name, lambda _a, _b: _a >= _b)
create_test_class('equal', _type_name, lambda _a, _b: _a == _b)

if __name__ == '__main__':
Expand Down