Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
d778737e
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
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看板
未验证
提交
d778737e
编写于
7月 17, 2023
作者:
M
ming1753
提交者:
GitHub
7月 17, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Paddle-TRT] add assign op (#55426)
* [Paddle-TRT] add assign op
上级
896d7cfa
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
206 addition
and
10 deletion
+206
-10
paddle/fluid/inference/api/analysis_predictor.cc
paddle/fluid/inference/api/analysis_predictor.cc
+1
-0
paddle/fluid/inference/tensorrt/convert/CMakeLists.txt
paddle/fluid/inference/tensorrt/convert/CMakeLists.txt
+2
-1
paddle/fluid/inference/tensorrt/convert/assign_op.cc
paddle/fluid/inference/tensorrt/convert/assign_op.cc
+39
-0
paddle/fluid/inference/tensorrt/op_teller.cc
paddle/fluid/inference/tensorrt/op_teller.cc
+4
-9
test/ir/inference/test_trt_convert_assign.py
test/ir/inference/test_trt_convert_assign.py
+160
-0
未找到文件。
paddle/fluid/inference/api/analysis_predictor.cc
浏览文件 @
d778737e
...
...
@@ -2915,6 +2915,7 @@ USE_TRT_CONVERTER(take_along_axis)
USE_TRT_CONVERTER
(
skip_groupnorm_act
)
USE_TRT_CONVERTER
(
preln_groupnorm_act
)
USE_TRT_CONVERTER
(
cumsum
)
USE_TRT_CONVERTER
(
assign
)
#if IS_TRT_VERSION_GE(8522)
USE_TRT_CONVERTER
(
flash_multihead_matmul
)
USE_TRT_CONVERTER
(
cross_multihead_matmul
)
...
...
paddle/fluid/inference/tensorrt/convert/CMakeLists.txt
浏览文件 @
d778737e
...
...
@@ -106,7 +106,8 @@ list(
expand_v2_op.cc
cumsum_op.cc
temporal_shift_op.cc
einsum_op.cc
)
einsum_op.cc
assign_op.cc
)
if
(
${
TENSORRT_MAJOR_VERSION
}
GREATER_EQUAL 7
)
list
(
APPEND CONVERT_FILES emb_eltwise_layernorm.cc
...
...
paddle/fluid/inference/tensorrt/convert/assign_op.cc
0 → 100644
浏览文件 @
d778737e
/* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include "paddle/fluid/inference/tensorrt/convert/op_converter.h"
namespace
paddle
{
namespace
inference
{
namespace
tensorrt
{
class
AssignOpConverter
:
public
OpConverter
{
public:
void
operator
()(
const
framework
::
proto
::
OpDesc
&
op
,
const
framework
::
Scope
&
scope
,
bool
test_mode
)
override
{
VLOG
(
3
)
<<
"convert a assign op to tensorrt"
;
framework
::
OpDesc
op_desc
(
op
,
nullptr
);
auto
*
input
=
engine_
->
GetITensor
(
op_desc
.
Input
(
"X"
)[
0
]);
auto
*
layer
=
TRT_ENGINE_ADD_LAYER
(
engine_
,
Identity
,
*
input
);
auto
output_name
=
op_desc
.
Output
(
"Out"
)[
0
];
RreplenishLayerAndOutput
(
layer
,
"assign"
,
{
output_name
},
test_mode
);
}
};
}
// namespace tensorrt
}
// namespace inference
}
// namespace paddle
REGISTER_TRT_OP_CONVERTER
(
assign
,
AssignOpConverter
);
paddle/fluid/inference/tensorrt/op_teller.cc
浏览文件 @
d778737e
...
...
@@ -695,13 +695,6 @@ struct SimpleOpTypeSetTeller : public Teller {
auto
*
input_var_desc
=
block
->
FindVar
(
input_var_name
);
auto
*
index_var_desc
=
block
->
FindVar
(
index_var_name
);
// The index input must be int32 datatype.
if
(
index_var_desc
->
GetDataType
()
!=
paddle
::
framework
::
proto
::
VarType_Type
::
VarType_Type_INT32
)
{
VLOG
(
3
)
<<
"take_along_axis op Index input data type must be int32"
;
return
false
;
}
const
auto
input_shape
=
input_var_desc
->
GetShape
();
const
auto
index_shape
=
index_var_desc
->
GetShape
();
if
(
input_shape
.
size
()
!=
index_shape
.
size
())
{
...
...
@@ -2903,7 +2896,8 @@ struct SimpleOpTypeSetTeller : public Teller {
"preln_groupnorm_act"
,
"temporal_shift"
,
"grid_sampler"
,
"cumsum"
};
"cumsum"
,
"assign"
};
std
::
unordered_set
<
std
::
string
>
teller_set
{
"matrix_multiply"
,
...
...
@@ -3065,7 +3059,8 @@ struct SimpleOpTypeSetTeller : public Teller {
"preln_groupnorm_act"
,
"temporal_shift"
,
"grid_sampler"
,
"cumsum"
};
"cumsum"
,
"assign"
};
};
struct
GenericPluginTeller
:
public
Teller
{
...
...
test/ir/inference/test_trt_convert_assign.py
0 → 100644
浏览文件 @
d778737e
# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import
unittest
from
functools
import
partial
from
typing
import
List
import
numpy
as
np
from
program_config
import
ProgramConfig
,
TensorConfig
from
trt_layer_auto_scan_test
import
TrtLayerAutoScanTest
import
paddle.inference
as
paddle_infer
class
TrtConvertAssignTest
(
TrtLayerAutoScanTest
):
def
is_program_valid
(
self
,
program_config
:
ProgramConfig
)
->
bool
:
compile_version
=
paddle_infer
.
get_trt_compile_version
()
runtime_version
=
paddle_infer
.
get_trt_runtime_version
()
if
(
compile_version
[
0
]
*
1000
+
compile_version
[
1
]
*
100
+
compile_version
[
2
]
*
10
<
8400
):
return
False
if
(
runtime_version
[
0
]
*
1000
+
runtime_version
[
1
]
*
100
+
runtime_version
[
2
]
*
10
<
8400
):
return
False
return
True
def
sample_program_configs
(
self
):
def
generate_input
(
type
):
if
self
.
dims
==
0
:
return
np
.
ones
([]).
astype
(
type
)
elif
self
.
dims
==
1
:
return
np
.
ones
([
1
]).
astype
(
type
)
else
:
return
np
.
ones
([
1
,
3
,
64
,
64
]).
astype
(
type
)
for
dims
in
[
0
,
1
,
4
]:
self
.
dims
=
dims
for
dtype
in
[
np
.
bool_
,
np
.
int32
,
np
.
float32
,
np
.
int64
,
]:
self
.
has_bool_dtype
=
dtype
==
np
.
bool_
ops_config
=
[
{
"op_type"
:
"assign"
,
"op_inputs"
:
{
"X"
:
[
"input_data"
]},
"op_outputs"
:
{
"Out"
:
[
"assign_output_data0"
]},
"op_attrs"
:
{},
},
{
"op_type"
:
"assign"
,
"op_inputs"
:
{
"X"
:
[
"assign_output_data0"
]},
"op_outputs"
:
{
"Out"
:
[
"assign_output_data1"
]},
"op_attrs"
:
{},
},
]
ops
=
self
.
generate_op_config
(
ops_config
)
program_config
=
ProgramConfig
(
ops
=
ops
,
weights
=
{},
inputs
=
{
"input_data"
:
TensorConfig
(
data_gen
=
partial
(
generate_input
,
dtype
)
)
},
outputs
=
[
"assign_output_data1"
],
)
yield
program_config
def
sample_predictor_configs
(
self
,
program_config
)
->
(
paddle_infer
.
Config
,
List
[
int
],
float
):
def
generate_dynamic_shape
(
attrs
):
if
self
.
dims
==
0
:
self
.
dynamic_shape
.
min_input_shape
=
{
"input_data"
:
[]}
self
.
dynamic_shape
.
max_input_shape
=
{
"input_data"
:
[]}
self
.
dynamic_shape
.
opt_input_shape
=
{
"input_data"
:
[]}
elif
self
.
dims
==
1
:
self
.
dynamic_shape
.
min_input_shape
=
{
"input_data"
:
[
1
]}
self
.
dynamic_shape
.
max_input_shape
=
{
"input_data"
:
[
1
]}
self
.
dynamic_shape
.
opt_input_shape
=
{
"input_data"
:
[
1
]}
else
:
self
.
dynamic_shape
.
min_input_shape
=
{
"input_data"
:
[
1
,
3
,
64
,
64
]
}
self
.
dynamic_shape
.
max_input_shape
=
{
"input_data"
:
[
1
,
3
,
64
,
64
]
}
self
.
dynamic_shape
.
opt_input_shape
=
{
"input_data"
:
[
1
,
3
,
64
,
64
]
}
def
clear_dynamic_shape
():
self
.
dynamic_shape
.
min_input_shape
=
{}
self
.
dynamic_shape
.
max_input_shape
=
{}
self
.
dynamic_shape
.
opt_input_shape
=
{}
def
generate_trt_nodes_num
(
attrs
,
dynamic_shape
):
if
not
dynamic_shape
and
(
self
.
has_bool_dtype
or
self
.
dims
==
1
or
self
.
dims
==
0
):
return
0
,
4
return
1
,
2
attrs
=
[
program_config
.
ops
[
i
].
attrs
for
i
in
range
(
len
(
program_config
.
ops
))
]
# for static_shape
clear_dynamic_shape
()
self
.
trt_param
.
precision
=
paddle_infer
.
PrecisionType
.
Float32
yield
self
.
create_inference_config
(),
generate_trt_nodes_num
(
attrs
,
False
),
1e-5
self
.
trt_param
.
precision
=
paddle_infer
.
PrecisionType
.
Half
yield
self
.
create_inference_config
(),
generate_trt_nodes_num
(
attrs
,
False
),
1e-2
# for dynamic_shape
generate_dynamic_shape
(
attrs
)
self
.
trt_param
.
precision
=
paddle_infer
.
PrecisionType
.
Float32
yield
self
.
create_inference_config
(),
generate_trt_nodes_num
(
attrs
,
True
),
1e-5
self
.
trt_param
.
precision
=
paddle_infer
.
PrecisionType
.
Half
yield
self
.
create_inference_config
(),
generate_trt_nodes_num
(
attrs
,
True
),
1e-2
def
test
(
self
):
self
.
run_test
()
if
__name__
==
"__main__"
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录