Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

A copy of https://github.com/PaddlePaddle/Paddle/pull/51438 #53587

Merged
merged 9 commits into from
May 8, 2023
Merged

A copy of https://github.com/PaddlePaddle/Paddle/pull/51438 #53587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fdcc1de
add tmp FLAG for cache_kv max_seq_len. test=develop
heavengate Mar 9, 2023
d8d4085
fix custom_plugin. test=develop
heavengate Feb 25, 2023
7c8aabe
fix custom plugin attr setting. test=develop
heavengate Mar 9, 2023
e8bc372
fix format. test=develop
heavengate Mar 9, 2023
2db569f
remove useless code. test=develop
heavengate Mar 9, 2023
08cd7d4
fix format. test=develop
heavengate Mar 10, 2023
4c6056a
fix format. test=develop
heavengate Mar 12, 2023
5d66014
fix format. test=develop
heavengate Mar 13, 2023
3f4fd6b
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
jiweibo May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions paddle/fluid/inference/tensorrt/convert/generic_and_custom_plugin_creater.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,17 @@ class CustomPluginCreater : public OpConverter {
std::list<std::vector<int>> ints_attrs;
std::list<std::vector<float>> floats_attrs;

for (auto &attr_name : op_attrs_names) {
for (auto &attr_name_and_type : op_attrs_names) {
auto attr_name =
attr_name_and_type.substr(0, attr_name_and_type.find_first_of(":"));
nvinfer1::PluginField plugindata;
plugindata.name = attr_name.c_str();

// NOTE: to avoid string rewrite by iterator, deep copy here
std::vector<char> plugin_attr_name(attr_name.length() + 1, 0);
snprintf(
plugin_attr_name.data(), attr_name.length() + 1, attr_name.c_str());
plugindata.name = plugin_attr_name.data();

if (op_desc.GetAttrType(attr_name) == framework::proto::AttrType::INT) {
int_attrs.push_back(PADDLE_GET_CONST(int, attrs.at(attr_name)));
plugindata.data = &int_attrs.back();
Expand Down
14 changes: 7 additions & 7 deletions paddle/fluid/inference/tensorrt/convert/test_custom_plugin_creater.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ PD_BUILD_OP(custom_op)
.Inputs({"Input"})
.Outputs({"Output"})
.Attrs({
"float_attr",
"int_attr",
"bool_attr",
"string_attr",
"ints_attr",
"floats_attr",
"bools_attr",
"float_attr: float",
"int_attr: int",
"bool_attr: bool",
"string_attr: std::string",
"ints_attr: std::vector<int>",
"floats_attr: std::vector<float>",
"bools_attr: std::vector<bool>",
});

namespace paddle {
Expand Down