Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
cabc5f36
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看板
未验证
提交
cabc5f36
编写于
9月 13, 2021
作者:
J
JZ-LIANG
提交者:
GitHub
9月 13, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Bugfix] reshape with zero input tensor (#35642)
* reshape support zero-input * add unitest * revise error message
上级
ecfe8375
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
0 deletion
+31
-0
paddle/fluid/operators/reshape_op.cc
paddle/fluid/operators/reshape_op.cc
+17
-0
python/paddle/fluid/tests/unittests/test_reshape_op.py
python/paddle/fluid/tests/unittests/test_reshape_op.py
+14
-0
未找到文件。
paddle/fluid/operators/reshape_op.cc
浏览文件 @
cabc5f36
...
...
@@ -185,6 +185,8 @@ class ReshapeOp : public framework::OperatorWithKernel {
framework
::
make_ddim
(
shape
),
i
,
shape
[
i
]));
}
// NOTE all non-zero values will be converted to True (include negative
// value)
capacity
*=
(
shape
[
i
]
?
shape
[
i
]
:
in_dims
[
i
]);
output_shape
[
i
]
=
(
shape
[
i
]
?
static_cast
<
int64_t
>
(
shape
[
i
])
:
in_dims
[
i
]);
...
...
@@ -222,6 +224,21 @@ class ReshapeOp : public framework::OperatorWithKernel {
in_dims
,
in_size
,
framework
::
make_ddim
(
shape
),
capacity
));
}
}
// support reshape with zero-input(input tensor with product(shape) == 0)
// by now we require that if the input tensor is zero shape, the target
// shape of output must be zero
if
(
in_size
==
0
)
{
PADDLE_ENFORCE_EQ
(
capacity
,
in_size
,
platform
::
errors
::
InvalidArgument
(
"The 'shape' in ReshapeOp is invalid. "
"The input tensor X's shape = [%s], X's capacity = %d."
"But the target shape of Out is [%s], the "
"capacity of 'Out' is %d."
,
in_dims
,
in_size
,
framework
::
make_ddim
(
shape
),
capacity
));
}
return
framework
::
make_ddim
(
output_shape
);
}
...
...
python/paddle/fluid/tests/unittests/test_reshape_op.py
浏览文件 @
cabc5f36
...
...
@@ -464,5 +464,19 @@ class TestDygraphReshapeInplaceAPI(TestDygraphReshapeAPI):
self
.
reshape
=
paddle
.
reshape_
class
TestReshapeZeroTensor
(
unittest
.
TestCase
):
def
test_reshape_zero_tensor_success
(
self
):
zero_tensor
=
paddle
.
zeros
([
0
,
2
,
3
])
# since we use "0" as the dimension copy semantically in reshape,
# we need to copy the 0 dim in the src tensor in order to make a successful zero tensor reshape
zero_tensor
=
zero_tensor
.
reshape
([
0
,
6
])
self
.
assertTrue
(
list
(
zero_tensor
.
shape
)
==
[
0
,
6
])
def
test_reshape_zero_tensor_error
(
self
):
zero_tensor
=
paddle
.
zeros
([
0
,
2
,
3
])
with
self
.
assertRaises
(
ValueError
):
zero_tensor
.
reshape
([
2
,
3
])
if
__name__
==
"__main__"
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录