Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
bc150edc
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
bc150edc
编写于
11月 23, 2021
作者:
W
Wangzheee
提交者:
GitHub
11月 23, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Paddle Inference] Fix_nearest: align_corners != true (#37368)
* fix_nearest * fix_nearest * fix_nearest * fix_nearest
上级
ccad31f5
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
37 addition
and
32 deletion
+37
-32
paddle/fluid/inference/tensorrt/convert/nearest_interp_op.cc
paddle/fluid/inference/tensorrt/convert/nearest_interp_op.cc
+4
-2
paddle/fluid/inference/tensorrt/op_teller.cc
paddle/fluid/inference/tensorrt/op_teller.cc
+28
-27
python/paddle/fluid/tests/unittests/ir/inference/test_trt_convert_nearest_interp.py
...unittests/ir/inference/test_trt_convert_nearest_interp.py
+2
-0
python/paddle/fluid/tests/unittests/ir/inference/test_trt_nearest_interp_op.py
...ests/unittests/ir/inference/test_trt_nearest_interp_op.py
+3
-3
未找到文件。
paddle/fluid/inference/tensorrt/convert/nearest_interp_op.cc
浏览文件 @
bc150edc
...
...
@@ -38,8 +38,10 @@ class NearestInterpolateOpConverter : public OpConverter {
auto
input
=
engine_
->
GetITensor
(
input_name
);
auto
data_layout
=
framework
::
StringToDataLayout
(
BOOST_GET_CONST
(
std
::
string
,
op_desc
.
GetAttr
(
"data_layout"
)));
auto
data_layout
=
!
op_desc
.
HasAttr
(
"data_layout"
)
?
framework
::
DataLayout
::
kNCHW
:
framework
::
StringToDataLayout
(
BOOST_GET_CONST
(
std
::
string
,
op_desc
.
GetAttr
(
"data_layout"
)));
auto
interp_method
=
BOOST_GET_CONST
(
std
::
string
,
op_desc
.
GetAttr
(
"interp_method"
));
bool
align_corners
=
...
...
paddle/fluid/inference/tensorrt/op_teller.cc
浏览文件 @
bc150edc
...
...
@@ -667,28 +667,25 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
}
if
(
op_type
==
"nearest_interp"
)
{
std
::
vector
<
std
::
string
>
attrs
{
"data_layout"
,
"interp_method"
,
"align_corners"
,
"scale"
,
std
::
vector
<
std
::
string
>
attrs
{
"interp_method"
,
"align_corners"
,
"scale"
,
"out_h"
,
"out_w"
};
for
(
auto
const
attr
:
attrs
)
{
if
(
!
desc
.
HasAttr
(
attr
))
return
false
;
}
if
(
desc
.
HasAttr
(
"data_layout"
))
{
auto
data_layout
=
framework
::
StringToDataLayout
(
BOOST_GET_CONST
(
std
::
string
,
desc
.
GetAttr
(
"data_layout"
)));
if
(
data_layout
!=
framework
::
DataLayout
::
kNCHW
&&
data_layout
!=
framework
::
DataLayout
::
kNHWC
)
return
false
;
}
auto
interp_method
=
BOOST_GET_CONST
(
std
::
string
,
desc
.
GetAttr
(
"interp_method"
));
if
(
interp_method
!=
"nearest"
)
return
false
;
if
(
!
desc
.
HasAttr
(
"scale"
)
||
!
desc
.
HasAttr
(
"out_h"
)
||
!
desc
.
HasAttr
(
"out_w"
))
{
return
false
;
}
else
{
auto
scale
=
BOOST_GET_CONST
(
float
,
desc
.
GetAttr
(
"scale"
));
auto
out_h
=
BOOST_GET_CONST
(
int
,
desc
.
GetAttr
(
"out_h"
));
auto
out_w
=
BOOST_GET_CONST
(
int
,
desc
.
GetAttr
(
"out_w"
));
auto
align_corners
=
BOOST_GET_CONST
(
bool
,
desc
.
GetAttr
(
"align_corners"
));
if
(
!
(
scale
>
0.
f
&&
(
out_h
<=
0
&&
out_w
<=
0
)))
{
if
(
out_h
<=
0
)
{
VLOG
(
3
)
<<
"out_h must be greater than 0 if scale is not set."
;
...
...
@@ -703,6 +700,10 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
VLOG
(
3
)
<<
"dynamic shape not support scale not set."
;
return
false
;
}
// When align_corners = true, the paddle's and trt_layer's results has
// diff
if
(
align_corners
&&
scale
!=
1
)
{
return
false
;
}
}
...
...
python/paddle/fluid/tests/unittests/ir/inference/test_trt_convert_nearest_interp.py
浏览文件 @
bc150edc
...
...
@@ -124,6 +124,8 @@ class TrtConvertNearestInterpTest(TrtLayerAutoScanTest):
if
program_config
.
ops
[
0
].
attrs
[
'scale'
]
<=
0
and
self
.
dynamic_shape
.
min_input_shape
:
return
True
if
program_config
.
ops
[
0
].
attrs
[
'align_corners'
]
==
True
:
return
True
return
False
self
.
add_skip_case
(
...
...
python/paddle/fluid/tests/unittests/ir/inference/test_trt_nearest_interp_op.py
浏览文件 @
bc150edc
...
...
@@ -61,9 +61,9 @@ class TRTNearestInterpTest(InferencePassTest):
def
set_params
(
self
):
self
.
bs
=
4
self
.
scale
=
1
self
.
scale
=
0
self
.
channels
=
3
self
.
origin_shape
=
(
32
,
32
)
# HW
self
.
origin_shape
=
(
4
,
4
)
# HW
self
.
resize_shape
=
(
64
,
64
)
# HW
self
.
align_corners
=
True
self
.
data_layout
=
'NCHW'
...
...
@@ -114,7 +114,7 @@ class TRTNearestInterpTest2(TRTNearestInterpTest):
class
TRTNearestInterpTest3
(
TRTNearestInterpTest
):
def
set_params
(
self
):
self
.
bs
=
4
self
.
scale
=
-
1
self
.
scale
=
0
self
.
channels
=
3
self
.
origin_shape
=
(
32
,
32
)
# HW
self
.
resize_shape
=
(
64
,
64
)
# HW
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录