Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ujs_wantz
Paddle
提交
096afbe1
P
Paddle
项目概览
ujs_wantz
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
096afbe1
编写于
1月 17, 2022
作者:
R
ronnywang
提交者:
GitHub
1月 17, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix paddle.where torch diff (#38870)
* fix paddle.where torch diff * update
上级
724d49da
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
60 addition
and
7 deletion
+60
-7
python/paddle/fluid/tests/unittests/test_where_op.py
python/paddle/fluid/tests/unittests/test_where_op.py
+38
-0
python/paddle/tensor/search.py
python/paddle/tensor/search.py
+22
-7
未找到文件。
python/paddle/fluid/tests/unittests/test_where_op.py
浏览文件 @
096afbe1
...
@@ -305,6 +305,36 @@ class TestWhereDygraphAPI(unittest.TestCase):
...
@@ -305,6 +305,36 @@ class TestWhereDygraphAPI(unittest.TestCase):
b_shape
=
[
2
,
2
,
1
]
b_shape
=
[
2
,
2
,
1
]
self
.
__test_where_with_broadcast_dygraph
(
cond_shape
,
a_shape
,
b_shape
)
self
.
__test_where_with_broadcast_dygraph
(
cond_shape
,
a_shape
,
b_shape
)
def
test_where_condition
(
self
):
data
=
np
.
array
([[
True
,
False
],
[
False
,
True
]])
with
program_guard
(
Program
(),
Program
()):
x
=
fluid
.
layers
.
data
(
name
=
'x'
,
shape
=
[
-
1
,
2
])
y
=
paddle
.
where
(
x
)
self
.
assertEqual
(
type
(
y
),
tuple
)
self
.
assertEqual
(
len
(
y
),
2
)
z
=
fluid
.
layers
.
concat
(
list
(
y
),
axis
=
1
)
exe
=
fluid
.
Executor
(
fluid
.
CPUPlace
())
res
,
=
exe
.
run
(
feed
=
{
'x'
:
data
},
fetch_list
=
[
z
.
name
],
return_numpy
=
False
)
expect_out
=
np
.
array
([[
0
,
0
],
[
1
,
1
]])
self
.
assertTrue
(
np
.
allclose
(
expect_out
,
np
.
array
(
res
)))
data
=
np
.
array
([
True
,
True
,
False
])
with
program_guard
(
Program
(),
Program
()):
x
=
fluid
.
layers
.
data
(
name
=
'x'
,
shape
=
[
-
1
])
y
=
paddle
.
where
(
x
)
self
.
assertEqual
(
type
(
y
),
tuple
)
self
.
assertEqual
(
len
(
y
),
1
)
z
=
fluid
.
layers
.
concat
(
list
(
y
),
axis
=
1
)
exe
=
fluid
.
Executor
(
fluid
.
CPUPlace
())
res
,
=
exe
.
run
(
feed
=
{
'x'
:
data
},
fetch_list
=
[
z
.
name
],
return_numpy
=
False
)
expect_out
=
np
.
array
([[
0
],
[
1
]])
self
.
assertTrue
(
np
.
allclose
(
expect_out
,
np
.
array
(
res
)))
class
TestWhereOpError
(
unittest
.
TestCase
):
class
TestWhereOpError
(
unittest
.
TestCase
):
def
test_errors
(
self
):
def
test_errors
(
self
):
...
@@ -326,6 +356,14 @@ class TestWhereOpError(unittest.TestCase):
...
@@ -326,6 +356,14 @@ class TestWhereOpError(unittest.TestCase):
self
.
assertRaises
(
TypeError
,
test_type
)
self
.
assertRaises
(
TypeError
,
test_type
)
def
test_value_error
(
self
):
with
fluid
.
dygraph
.
guard
():
cond_shape
=
[
2
,
2
,
4
]
cond_tmp
=
paddle
.
rand
(
cond_shape
)
cond
=
cond_tmp
<
0.3
a
=
paddle
.
rand
(
cond_shape
)
self
.
assertRaises
(
ValueError
,
paddle
.
where
,
cond
,
a
)
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
unittest
.
main
()
unittest
.
main
()
python/paddle/tensor/search.py
浏览文件 @
096afbe1
...
@@ -523,23 +523,26 @@ def mode(x, axis=-1, keepdim=False, name=None):
...
@@ -523,23 +523,26 @@ def mode(x, axis=-1, keepdim=False, name=None):
return
values
,
indices
return
values
,
indices
def
where
(
condition
,
x
,
y
,
name
=
None
):
def
where
(
condition
,
x
=
None
,
y
=
None
,
name
=
None
):
r
"""
r
"""
Return a tensor of elements selected from either $x$ or $y$, depending on $condition$.
Return a tensor of elements selected from either $x$ or $y$, depending on $condition$.
**Note**:
``paddle.where(condition)`` is identical to ``paddle.nonzero(condition, as_tuple=True)``.
.. math::
.. math::
out_i =
out_i =
\
\
begin{cases}
\begin{cases}
x_i, \quad \
\text{if} \\ condition_i \\ is \\ True \\
\\
x_i, \quad \
text{if} \ condition_i \ is \ True
\\
y_i, \quad \
\text{if} \\ condition_i \\ is \\ False \\
\\
y_i, \quad \
text{if} \ condition_i \ is \ False
\\
\
\
end{cases}
\end{cases}
Args:
Args:
condition(Tensor): The condition to choose x or y.
condition(Tensor): The condition to choose x or y.
x(Tensor
): x is a Tensor with data type float32, float64, int32, int64
.
x(Tensor
, optional): x is a Tensor with data type float32, float64, int32, int64. Either both or neither of x and y should be given
.
y(Tensor
): y is a Tensor with data type float32, float64, int32, int64
.
y(Tensor
, optional): y is a Tensor with data type float32, float64, int32, int64. Either both or neither of x and y should be given
.
name(str, optional): The default value is None. Normally there is no
name(str, optional): The default value is None. Normally there is no
need for user to set this property. For more information, please
need for user to set this property. For more information, please
...
@@ -559,7 +562,19 @@ def where(condition, x, y, name=None):
...
@@ -559,7 +562,19 @@ def where(condition, x, y, name=None):
print(out)
print(out)
#out: [1.0, 1.0, 3.2, 1.2]
#out: [1.0, 1.0, 3.2, 1.2]
out = paddle.where(x>1)
print(out)
#out: (Tensor(shape=[2, 1], dtype=int64, place=CPUPlace, stop_gradient=True,
# [[2],
# [3]]),)
"""
"""
if
x
is
None
and
y
is
None
:
return
nonzero
(
condition
,
as_tuple
=
True
)
if
x
is
None
or
y
is
None
:
raise
ValueError
(
"either both or neither of x and y should be given"
)
if
not
in_dygraph_mode
():
if
not
in_dygraph_mode
():
check_variable_and_dtype
(
condition
,
'condition'
,
[
'bool'
],
'where'
)
check_variable_and_dtype
(
condition
,
'condition'
,
[
'bool'
],
'where'
)
check_variable_and_dtype
(
check_variable_and_dtype
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录