Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Crayon鑫
Paddle
提交
b031c389
P
Paddle
项目概览
Crayon鑫
/
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看板
未验证
提交
b031c389
编写于
1月 13, 2022
作者:
S
shangliang Xu
提交者:
GitHub
1月 13, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[bug fix] fix unfold bug in compile time (#38925)
上级
f082e171
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
29 deletion
+16
-29
paddle/fluid/operators/unfold_op.cc
paddle/fluid/operators/unfold_op.cc
+15
-20
paddle/fluid/operators/unfold_op.h
paddle/fluid/operators/unfold_op.h
+1
-9
未找到文件。
paddle/fluid/operators/unfold_op.cc
浏览文件 @
b031c389
...
@@ -143,22 +143,18 @@ class UnfoldOp : public framework::OperatorWithKernel {
...
@@ -143,22 +143,18 @@ class UnfoldOp : public framework::OperatorWithKernel {
"but recieved dilations_height: %d dilations_width: %d."
,
"but recieved dilations_height: %d dilations_width: %d."
,
dilations
[
0
],
dilations
[
1
]));
dilations
[
0
],
dilations
[
1
]));
bool
contain_unknown_dim
=
framework
::
contain_unknown_dim
(
in_dims
);
std
::
vector
<
int
>
out_dims
;
bool
check
=
ctx
->
IsRuntime
()
||
!
contain_unknown_dim
;
out_dims
.
push_back
(
in_dims
[
0
]);
if
(
check
)
{
int
output_channels
=
in_dims
[
1
]
*
kernel_sizes
[
0
]
*
kernel_sizes
[
1
];
std
::
vector
<
int
>
out_dims
;
out_dims
.
push_back
(
output_channels
);
out_dims
.
push_back
(
in_dims
[
0
]);
int
output_height
=
int
output_channels
=
in_dims
[
1
]
*
kernel_sizes
[
0
]
*
kernel_sizes
[
1
];
CalcOutputSize
(
in_dims
[
2
],
kernel_sizes
[
0
],
dilations
[
0
],
paddings
[
0
],
out_dims
.
push_back
(
output_channels
);
paddings
[
2
],
strides
[
0
]);
int
output_width
=
CalcOutputSize
(
in_dims
[
3
],
kernel_sizes
[
1
],
dilations
[
1
],
int
output_height
=
paddings
[
1
],
paddings
[
3
],
strides
[
1
]);
CalcOutputSize
(
in_dims
[
2
],
kernel_sizes
[
0
],
dilations
[
0
],
paddings
[
0
],
if
(
ctx
->
IsRuntime
())
{
paddings
[
2
],
strides
[
0
]);
// only check output height and width in runtime
int
output_width
=
CalcOutputSize
(
in_dims
[
3
],
kernel_sizes
[
1
],
dilations
[
1
],
paddings
[
1
],
paddings
[
3
],
strides
[
1
]);
// check output height and width
PADDLE_ENFORCE_GT
(
PADDLE_ENFORCE_GT
(
output_height
,
0
,
output_height
,
0
,
platform
::
errors
::
InvalidArgument
(
platform
::
errors
::
InvalidArgument
(
...
@@ -179,11 +175,10 @@ class UnfoldOp : public framework::OperatorWithKernel {
...
@@ -179,11 +175,10 @@ class UnfoldOp : public framework::OperatorWithKernel {
in_dims
[
2
],
in_dims
[
3
],
kernel_sizes
[
0
],
kernel_sizes
[
1
],
in_dims
[
2
],
in_dims
[
3
],
kernel_sizes
[
0
],
kernel_sizes
[
1
],
strides
[
0
],
strides
[
1
],
dilations
[
0
],
dilations
[
1
],
output_height
,
strides
[
0
],
strides
[
1
],
dilations
[
0
],
dilations
[
1
],
output_height
,
output_width
));
output_width
));
int
output_col_length
=
output_height
*
output_width
;
out_dims
.
push_back
(
output_col_length
);
ctx
->
SetOutputDim
(
"Y"
,
framework
::
make_ddim
(
out_dims
));
}
}
int
output_col_length
=
output_height
*
output_width
;
out_dims
.
push_back
(
output_col_length
);
ctx
->
SetOutputDim
(
"Y"
,
framework
::
make_ddim
(
out_dims
));
}
}
protected:
protected:
...
...
paddle/fluid/operators/unfold_op.h
浏览文件 @
b031c389
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
#include <memory>
#include <memory>
#include <vector>
#include <vector>
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/operators/math/im2col.h"
#include "paddle/fluid/operators/math/im2col.h"
#include "paddle/fluid/operators/math/math_function.h"
#include "paddle/fluid/operators/math/math_function.h"
...
@@ -29,15 +30,6 @@ inline int CalcOutputSize(int input_size, int filter_size, int dilation,
...
@@ -29,15 +30,6 @@ inline int CalcOutputSize(int input_size, int filter_size, int dilation,
int
padding1
,
int
padding2
,
int
stride
)
{
int
padding1
,
int
padding2
,
int
stride
)
{
const
int
dkernel
=
dilation
*
(
filter_size
-
1
)
+
1
;
const
int
dkernel
=
dilation
*
(
filter_size
-
1
)
+
1
;
int
output_size
=
(
input_size
+
padding1
+
padding2
-
dkernel
)
/
stride
+
1
;
int
output_size
=
(
input_size
+
padding1
+
padding2
-
dkernel
)
/
stride
+
1
;
PADDLE_ENFORCE_GT
(
output_size
,
0UL
,
platform
::
errors
::
InvalidArgument
(
"Due to the settings of padding(%d, %d), filter_size(%d), "
"dilation(%d) and "
"stride(%d), the output size is less than 0, please check "
"again. Input_size:%d"
,
padding1
,
padding2
,
filter_size
,
dilation
,
stride
,
input_size
));
return
output_size
;
return
output_size
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录