Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
ee4e5323
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
ee4e5323
编写于
1月 20, 2023
作者:
S
sprouteer
提交者:
GitHub
1月 20, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add unique support zero dim (#49260)
上级
073f7ced
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
55 addition
and
6 deletion
+55
-6
paddle/phi/infermeta/unary.cc
paddle/phi/infermeta/unary.cc
+15
-6
python/paddle/fluid/tests/unittests/test_zero_dim_tensor.py
python/paddle/fluid/tests/unittests/test_zero_dim_tensor.py
+40
-0
未找到文件。
paddle/phi/infermeta/unary.cc
浏览文件 @
ee4e5323
...
@@ -4596,10 +4596,10 @@ void UniqueRawInferMeta(const MetaTensor& x,
...
@@ -4596,10 +4596,10 @@ void UniqueRawInferMeta(const MetaTensor& x,
MetaTensor
*
index
,
MetaTensor
*
index
,
MetaTensor
*
counts
)
{
MetaTensor
*
counts
)
{
if
(
!
is_sorted
)
{
if
(
!
is_sorted
)
{
PADDLE_ENFORCE_EQ
(
PADDLE_ENFORCE_EQ
(
x
.
dims
().
size
()
==
1
||
x
.
dims
().
size
()
==
0
,
x
.
dims
().
size
()
,
true
,
1
,
phi
::
errors
::
InvalidArgument
(
phi
::
errors
::
InvalidArgument
(
"The Input(X) should be
1-D Tensor, "
"The Input(X) should be 0-D or
1-D Tensor, "
"But now the dims of Input(X) is %d."
,
"But now the dims of Input(X) is %d."
,
x
.
dims
().
size
()));
x
.
dims
().
size
()));
out
->
set_dims
(
phi
::
make_ddim
({
-
1
}));
out
->
set_dims
(
phi
::
make_ddim
({
-
1
}));
...
@@ -4607,6 +4607,15 @@ void UniqueRawInferMeta(const MetaTensor& x,
...
@@ -4607,6 +4607,15 @@ void UniqueRawInferMeta(const MetaTensor& x,
return
;
return
;
}
}
if
(
x
.
dims
().
size
()
==
0
)
{
PADDLE_ENFORCE_EQ
(
axis
.
empty
(),
true
,
phi
::
errors
::
InvalidArgument
(
"The Input(X) with 0-D Tensor, axis must be None"
"But now the axis is %d."
,
axis
[
0
]));
}
if
(
axis
.
empty
())
{
if
(
axis
.
empty
())
{
out
->
set_dims
(
phi
::
make_ddim
({
-
1
}));
out
->
set_dims
(
phi
::
make_ddim
({
-
1
}));
if
(
return_inverse
)
{
if
(
return_inverse
)
{
...
...
python/paddle/fluid/tests/unittests/test_zero_dim_tensor.py
浏览文件 @
ee4e5323
...
@@ -2445,6 +2445,29 @@ class TestNoBackwardAPI(unittest.TestCase):
...
@@ -2445,6 +2445,29 @@ class TestNoBackwardAPI(unittest.TestCase):
self
.
assertEqual
(
one_hot_label
.
shape
,
[
4
])
self
.
assertEqual
(
one_hot_label
.
shape
,
[
4
])
self
.
assertEqual
(
one_hot_label
.
numpy
()[
2
],
1
)
self
.
assertEqual
(
one_hot_label
.
numpy
()[
2
],
1
)
def
test_unique
(
self
):
places
=
[
'cpu'
]
if
paddle
.
is_compiled_with_cuda
():
places
.
append
(
'gpu'
)
for
place
in
places
:
paddle
.
set_device
(
place
)
x
=
paddle
.
rand
([])
y
,
index
,
inverse
,
counts
=
paddle
.
unique
(
x
,
return_index
=
True
,
return_inverse
=
True
,
return_counts
=
True
,
)
self
.
assertEqual
(
y
,
x
)
self
.
assertEqual
(
index
,
0
)
self
.
assertEqual
(
inverse
,
0
)
self
.
assertEqual
(
counts
,
1
)
self
.
assertEqual
(
y
.
shape
,
[
1
])
self
.
assertEqual
(
index
.
shape
,
[
1
])
self
.
assertEqual
(
inverse
.
shape
,
[
1
])
self
.
assertEqual
(
counts
.
shape
,
[
1
])
class
TestNoBackwardAPIStatic
(
unittest
.
TestCase
):
class
TestNoBackwardAPIStatic
(
unittest
.
TestCase
):
def
setUp
(
self
):
def
setUp
(
self
):
...
@@ -2647,6 +2670,23 @@ class TestNoBackwardAPIStatic(unittest.TestCase):
...
@@ -2647,6 +2670,23 @@ class TestNoBackwardAPIStatic(unittest.TestCase):
self
.
assertEqual
(
res
[
0
].
shape
,
(
4
,))
self
.
assertEqual
(
res
[
0
].
shape
,
(
4
,))
self
.
assertEqual
(
res
[
0
][
2
],
1
)
self
.
assertEqual
(
res
[
0
][
2
],
1
)
def
test_unique
(
self
):
x
=
paddle
.
rand
([])
y
,
index
,
inverse
,
counts
=
paddle
.
unique
(
x
,
return_index
=
True
,
return_inverse
=
True
,
return_counts
=
True
)
prog
=
paddle
.
static
.
default_main_program
()
res
=
self
.
exe
.
run
(
prog
,
fetch_list
=
[
y
,
index
,
inverse
,
counts
])
self
.
assertEqual
(
y
,
x
)
self
.
assertEqual
(
index
,
0
)
self
.
assertEqual
(
inverse
,
0
)
self
.
assertEqual
(
counts
,
1
)
self
.
assertEqual
(
res
[
0
].
shape
,
(
1
,))
self
.
assertEqual
(
res
[
1
].
shape
,
(
1
,))
self
.
assertEqual
(
res
[
2
].
shape
,
(
1
,))
self
.
assertEqual
(
res
[
3
].
shape
,
(
1
,))
unary_apis_with_complex_input
=
[
unary_apis_with_complex_input
=
[
paddle
.
real
,
paddle
.
real
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录