Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
6f78cb99
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,发现更多精彩内容 >>
提交
6f78cb99
编写于
2月 11, 2018
作者:
Q
qiaolongfei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add not_equal
上级
23ba79b1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
1 deletion
+14
-1
paddle/fluid/operators/compare_op.cc
paddle/fluid/operators/compare_op.cc
+2
-0
paddle/fluid/operators/compare_op.cu
paddle/fluid/operators/compare_op.cu
+1
-0
paddle/fluid/operators/compare_op.h
paddle/fluid/operators/compare_op.h
+8
-0
python/paddle/v2/fluid/layers/math_op_patch.py
python/paddle/v2/fluid/layers/math_op_patch.py
+2
-1
python/paddle/v2/fluid/tests/test_python_operator_overriding.py
.../paddle/v2/fluid/tests/test_python_operator_overriding.py
+1
-0
未找到文件。
paddle/fluid/operators/compare_op.cc
浏览文件 @
6f78cb99
...
...
@@ -102,3 +102,5 @@ REGISTER_LOGICAL_OP(less_equal, "Out = X <= Y");
REGISTER_LOGICAL_KERNEL
(
less_equal
,
CPU
,
paddle
::
operators
::
LessEqualFunctor
);
REGISTER_LOGICAL_OP
(
equal
,
"Out = X == Y"
);
REGISTER_LOGICAL_KERNEL
(
equal
,
CPU
,
paddle
::
operators
::
EqualFunctor
);
REGISTER_LOGICAL_OP
(
not_equal
,
"Out = X != Y"
);
REGISTER_LOGICAL_KERNEL
(
not_equal
,
CPU
,
paddle
::
operators
::
NotEqualFunctor
);
paddle/fluid/operators/compare_op.cu
浏览文件 @
6f78cb99
...
...
@@ -17,3 +17,4 @@ limitations under the License. */
REGISTER_LOGICAL_KERNEL
(
less_than
,
CUDA
,
paddle
::
operators
::
LessThanFunctor
);
REGISTER_LOGICAL_KERNEL
(
less_equal
,
CUDA
,
paddle
::
operators
::
LessEqualFunctor
);
REGISTER_LOGICAL_KERNEL
(
equal
,
CUDA
,
paddle
::
operators
::
EqualFunctor
);
REGISTER_LOGICAL_KERNEL
(
not_equal
,
CUDA
,
paddle
::
operators
::
NotEqualFunctor
);
paddle/fluid/operators/compare_op.h
浏览文件 @
6f78cb99
...
...
@@ -48,6 +48,14 @@ struct EqualFunctor {
}
};
template
<
typename
T
>
struct
NotEqualFunctor
{
using
ELEM_TYPE
=
T
;
HOSTDEVICE
bool
operator
()(
const
T
&
a
,
const
T
&
b
)
const
{
return
!
EqualFunctor
<
T
>
()(
a
,
b
);
}
};
template
<
typename
DeviceContext
,
typename
Functor
>
class
CompareOpKernel
:
public
framework
::
OpKernel
<
typename
Functor
::
ELEM_TYPE
>
{
...
...
python/paddle/v2/fluid/layers/math_op_patch.py
浏览文件 @
6f78cb99
...
...
@@ -154,8 +154,9 @@ def monkey_patch_variable():
(
"__rpow__"
,
"elementwise_pow"
,
True
),
# for logical compare
(
"__eq__"
,
"equal"
,
False
),
(
"__ne__"
,
"not_equal"
,
False
),
(
"__lt__"
,
"less_than"
,
False
),
(
"__le__"
,
"less_equal"
,
False
)
,
):
(
"__le__"
,
"less_equal"
,
False
)):
setattr
(
Variable
,
method_name
,
_elemwise_method_creator_
(
method_name
,
op_type
,
reverse
))
...
...
python/paddle/v2/fluid/tests/test_python_operator_overriding.py
浏览文件 @
6f78cb99
...
...
@@ -53,6 +53,7 @@ class TestPythonOperatorOverride(unittest.TestCase):
lambda
_a
,
_b
:
_a
>
_b
,
lambda
_a
,
_b
:
_a
<=
_b
,
lambda
_a
,
_b
:
_a
>=
_b
,
lambda
_a
,
_b
:
_a
!=
_b
,
]
# places to check
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录