Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
28d07e3c
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
694
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
28d07e3c
编写于
2月 24, 2018
作者:
Q
qiaolongfei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add python part of compare op
上级
d4e3495c
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
18 addition
and
12 deletion
+18
-12
paddle/fluid/operators/compare_op.cc
paddle/fluid/operators/compare_op.cc
+6
-5
paddle/fluid/operators/compare_op.cu
paddle/fluid/operators/compare_op.cu
+4
-4
paddle/fluid/operators/compare_op.h
paddle/fluid/operators/compare_op.h
+2
-2
python/paddle/v2/fluid/layers/math_op_patch.py
python/paddle/v2/fluid/layers/math_op_patch.py
+3
-1
python/paddle/v2/fluid/tests/unittests/test_compare_op.py
python/paddle/v2/fluid/tests/unittests/test_compare_op.py
+3
-0
未找到文件。
paddle/fluid/operators/compare_op.cc
浏览文件 @
28d07e3c
...
...
@@ -100,11 +100,12 @@ REGISTER_COMPARE_OP(less_than, "Out = X < Y");
REGISTER_COMPARE_KERNEL
(
less_than
,
CPU
,
paddle
::
operators
::
LessThanFunctor
);
REGISTER_COMPARE_OP
(
less_equal
,
"Out = X <= Y"
);
REGISTER_COMPARE_KERNEL
(
less_equal
,
CPU
,
paddle
::
operators
::
LessEqualFunctor
);
REGISTER_COMPARE_OP
(
larger_than
,
"Out = X > Y"
);
REGISTER_COMPARE_KERNEL
(
larger_than
,
CPU
,
paddle
::
operators
::
LargerThanFunctor
);
REGISTER_COMPARE_OP
(
larger_equal
,
"Out = X >= Y"
);
REGISTER_COMPARE_KERNEL
(
larger_equal
,
CPU
,
paddle
::
operators
::
LargerEqualFunctor
);
REGISTER_COMPARE_OP
(
greater_than
,
"Out = X > Y"
);
REGISTER_COMPARE_KERNEL
(
greater_than
,
CPU
,
paddle
::
operators
::
GreaterThanFunctor
);
REGISTER_COMPARE_OP
(
greater_equal
,
"Out = X >= Y"
);
REGISTER_COMPARE_KERNEL
(
greater_equal
,
CPU
,
paddle
::
operators
::
GreaterEqualFunctor
);
REGISTER_COMPARE_OP
(
equal
,
"Out = X == Y"
);
REGISTER_COMPARE_KERNEL
(
equal
,
CPU
,
paddle
::
operators
::
EqualFunctor
);
REGISTER_COMPARE_OP
(
not_equal
,
"Out = X != Y"
);
...
...
paddle/fluid/operators/compare_op.cu
浏览文件 @
28d07e3c
...
...
@@ -16,9 +16,9 @@ limitations under the License. */
REGISTER_COMPARE_KERNEL
(
less_than
,
CUDA
,
paddle
::
operators
::
LessThanFunctor
);
REGISTER_COMPARE_KERNEL
(
less_equal
,
CUDA
,
paddle
::
operators
::
LessEqualFunctor
);
REGISTER_COMPARE_KERNEL
(
larg
er_than
,
CUDA
,
paddle
::
operators
::
Larg
erThanFunctor
);
REGISTER_COMPARE_KERNEL
(
larg
er_equal
,
CUDA
,
paddle
::
operators
::
Larg
erEqualFunctor
);
REGISTER_COMPARE_KERNEL
(
great
er_than
,
CUDA
,
paddle
::
operators
::
Great
erThanFunctor
);
REGISTER_COMPARE_KERNEL
(
great
er_equal
,
CUDA
,
paddle
::
operators
::
Great
erEqualFunctor
);
REGISTER_COMPARE_KERNEL
(
equal
,
CUDA
,
paddle
::
operators
::
EqualFunctor
);
REGISTER_COMPARE_KERNEL
(
not_equal
,
CUDA
,
paddle
::
operators
::
NotEqualFunctor
);
paddle/fluid/operators/compare_op.h
浏览文件 @
28d07e3c
...
...
@@ -35,13 +35,13 @@ struct LessEqualFunctor {
};
template
<
typename
T
>
struct
Larg
erThanFunctor
{
struct
Great
erThanFunctor
{
using
ELEM_TYPE
=
T
;
HOSTDEVICE
bool
operator
()(
const
T
&
a
,
const
T
&
b
)
const
{
return
a
>
b
;
}
};
template
<
typename
T
>
struct
Larg
erEqualFunctor
{
struct
Great
erEqualFunctor
{
using
ELEM_TYPE
=
T
;
HOSTDEVICE
bool
operator
()(
const
T
&
a
,
const
T
&
b
)
const
{
return
a
>=
b
;
}
};
...
...
python/paddle/v2/fluid/layers/math_op_patch.py
浏览文件 @
28d07e3c
...
...
@@ -157,7 +157,9 @@ def monkey_patch_variable():
(
"__eq__"
,
"equal"
,
False
),
(
"__ne__"
,
"not_equal"
,
False
),
(
"__lt__"
,
"less_than"
,
False
),
(
"__le__"
,
"less_equal"
,
False
)):
(
"__le__"
,
"less_equal"
,
False
),
(
"__gt__"
,
"greater_than"
,
False
),
(
"__ge__"
,
"greater_equal"
,
False
)):
setattr
(
Variable
,
method_name
,
_elemwise_method_creator_
(
method_name
,
op_type
,
reverse
))
...
...
python/paddle/v2/fluid/tests/unittests/test_compare_op.py
浏览文件 @
28d07e3c
...
...
@@ -38,7 +38,10 @@ def create_test_class(op_type, typename, callback):
for
_type_name
in
{
'float32'
,
'float64'
,
'int32'
,
'int64'
}:
create_test_class
(
'less_than'
,
_type_name
,
lambda
_a
,
_b
:
_a
<
_b
)
create_test_class
(
'less_equal'
,
_type_name
,
lambda
_a
,
_b
:
_a
<=
_b
)
create_test_class
(
'greater_than'
,
_type_name
,
lambda
_a
,
_b
:
_a
>
_b
)
create_test_class
(
'greater_equal'
,
_type_name
,
lambda
_a
,
_b
:
_a
>=
_b
)
create_test_class
(
'equal'
,
_type_name
,
lambda
_a
,
_b
:
_a
==
_b
)
create_test_class
(
'not_equal'
,
_type_name
,
lambda
_a
,
_b
:
_a
!=
_b
)
if
__name__
==
'__main__'
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录