未验证 提交 d9187869 编写于 作者: W Wilber 提交者: GitHub

update trt engine addplugin name. (#32018)

* update trt engine addplugin name.

* update
上级 94736d60
...@@ -251,7 +251,7 @@ class ElementwiseTensorOpConverter : public OpConverter { ...@@ -251,7 +251,7 @@ class ElementwiseTensorOpConverter : public OpConverter {
#if IS_TRT_VERSION_GE(6000) #if IS_TRT_VERSION_GE(6000)
plugin::ElementwisePluginDynamic* plugin = plugin::ElementwisePluginDynamic* plugin =
new plugin::ElementwisePluginDynamic(op_type_, axis); new plugin::ElementwisePluginDynamic(op_type_, axis);
layer = engine_->AddPluginV2(itensors.data(), 2, plugin); layer = engine_->AddDynamicPlugin(itensors.data(), 2, plugin);
#else #else
PADDLE_THROW(platform::errors::Fatal( PADDLE_THROW(platform::errors::Fatal(
"You are running the TRT Dynamic Shape mode, need to confirm that " "You are running the TRT Dynamic Shape mode, need to confirm that "
......
...@@ -169,7 +169,7 @@ class EmbEltwiseLayerNormOpConverter : public OpConverter { ...@@ -169,7 +169,7 @@ class EmbEltwiseLayerNormOpConverter : public OpConverter {
plugin = new plugin::EmbEltwiseLayernormPluginDynamic( plugin = new plugin::EmbEltwiseLayernormPluginDynamic(
input_embs, bias, scale, emb_sizes, bias_size, scale_size, hidden, input_embs, bias, scale, emb_sizes, bias_size, scale_size, hidden,
eps, with_fp16); eps, with_fp16);
layer = engine_->AddPluginV2(input_ids.data(), input_num, plugin); layer = engine_->AddDynamicPlugin(input_ids.data(), input_num, plugin);
auto output_name = op_desc.Output("Out")[0]; auto output_name = op_desc.Output("Out")[0];
RreplenishLayerAndOutput(layer, "emb_eltwise_layernorm", {output_name}, RreplenishLayerAndOutput(layer, "emb_eltwise_layernorm", {output_name},
test_mode); test_mode);
......
...@@ -64,7 +64,7 @@ class GeluOpConverter : public OpConverter { ...@@ -64,7 +64,7 @@ class GeluOpConverter : public OpConverter {
engine_->WithFp16() && !engine_->disable_trt_plugin_fp16(); engine_->WithFp16() && !engine_->disable_trt_plugin_fp16();
plugin::GeluPluginDynamic* plugin = plugin::GeluPluginDynamic* plugin =
new plugin::GeluPluginDynamic(with_fp16); new plugin::GeluPluginDynamic(with_fp16);
layer = engine_->AddPluginV2(&input, input_num, plugin); layer = engine_->AddDynamicPlugin(&input, input_num, plugin);
#else #else
PADDLE_THROW(platform::errors::Fatal( PADDLE_THROW(platform::errors::Fatal(
"You are running the TRT Dynamic Shape mode, need to confirm that " "You are running the TRT Dynamic Shape mode, need to confirm that "
......
...@@ -227,7 +227,7 @@ class MultiheadMatMulOpConverter : public OpConverter { ...@@ -227,7 +227,7 @@ class MultiheadMatMulOpConverter : public OpConverter {
plugin::DynamicPluginTensorRT* plugin = plugin::DynamicPluginTensorRT* plugin =
new plugin::QkvToContextPluginDynamic(hidden_in, head_number, new plugin::QkvToContextPluginDynamic(hidden_in, head_number,
head_size, scale, with_fp16); head_size, scale, with_fp16);
layer = engine_->AddPluginV2(plugin_inputs.data(), 2, plugin); layer = engine_->AddDynamicPlugin(plugin_inputs.data(), 2, plugin);
} }
} else { } else {
PADDLE_THROW(platform::errors::Fatal( PADDLE_THROW(platform::errors::Fatal(
......
...@@ -147,7 +147,7 @@ class Pool2dOpConverter : public OpConverter { ...@@ -147,7 +147,7 @@ class Pool2dOpConverter : public OpConverter {
plugin::PoolPluginDynamic *plugin = plugin::PoolPluginDynamic *plugin =
new plugin::PoolPluginDynamic(ceil_mode, pool_type, adaptive, ksize, new plugin::PoolPluginDynamic(ceil_mode, pool_type, adaptive, ksize,
strides, paddings, global_pooling); strides, paddings, global_pooling);
layer = engine_->AddPluginV2(&input1, 1, plugin); layer = engine_->AddDynamicPlugin(&input1, 1, plugin);
#endif #endif
} }
auto output_name = op_desc.Output("Out")[0]; auto output_name = op_desc.Output("Out")[0];
......
...@@ -65,7 +65,7 @@ class PReluOpConverter : public OpConverter { ...@@ -65,7 +65,7 @@ class PReluOpConverter : public OpConverter {
#if IS_TRT_VERSION_GE(6000) #if IS_TRT_VERSION_GE(6000)
plugin::PReluPluginDynamic* plugin = new plugin::PReluPluginDynamic( plugin::PReluPluginDynamic* plugin = new plugin::PReluPluginDynamic(
alpha_data, alpha_tensor_temp->numel(), mode); alpha_data, alpha_tensor_temp->numel(), mode);
layer = engine_->AddPluginV2(&input, input_num, plugin); layer = engine_->AddDynamicPlugin(&input, input_num, plugin);
#else #else
PADDLE_THROW(platform::errors::Fatal( PADDLE_THROW(platform::errors::Fatal(
"You are running the TRT Dynamic Shape mode, need to confirm that " "You are running the TRT Dynamic Shape mode, need to confirm that "
......
...@@ -90,7 +90,7 @@ class SkipLayerNormOpConverter : public OpConverter { ...@@ -90,7 +90,7 @@ class SkipLayerNormOpConverter : public OpConverter {
plugin::SkipLayerNormPluginDynamic* plugin = plugin::SkipLayerNormPluginDynamic* plugin =
new plugin::SkipLayerNormPluginDynamic(bias, scale, bias_size, new plugin::SkipLayerNormPluginDynamic(bias, scale, bias_size,
scale_size, eps, with_fp16); scale_size, eps, with_fp16);
layer = engine_->AddPluginV2(inputs.data(), 2, plugin); layer = engine_->AddDynamicPlugin(inputs.data(), 2, plugin);
} }
} else { } else {
PADDLE_THROW(platform::errors::Fatal( PADDLE_THROW(platform::errors::Fatal(
......
...@@ -90,14 +90,14 @@ class SliceOpConverter : public OpConverter { ...@@ -90,14 +90,14 @@ class SliceOpConverter : public OpConverter {
// bool ban_fp16 = engine_->disable_trt_plugin_fp16(); // bool ban_fp16 = engine_->disable_trt_plugin_fp16();
plugin::SpecialSlicePluginDynamic* plugin = plugin::SpecialSlicePluginDynamic* plugin =
new plugin::SpecialSlicePluginDynamic(); new plugin::SpecialSlicePluginDynamic();
layer = engine_->AddPluginV2(plugin_inputs.data(), plugin_inputs.size(), layer = engine_->AddDynamicPlugin(plugin_inputs.data(),
plugin); plugin_inputs.size(), plugin);
} else { } else {
bool with_fp16 = bool with_fp16 =
engine_->WithFp16() && !engine_->disable_trt_plugin_fp16(); engine_->WithFp16() && !engine_->disable_trt_plugin_fp16();
plugin::SlicePluginDynamic* plugin = plugin::SlicePluginDynamic* plugin =
new plugin::SlicePluginDynamic(starts, ends, axes, with_fp16); new plugin::SlicePluginDynamic(starts, ends, axes, with_fp16);
layer = engine_->AddPluginV2(&input, 1, plugin); layer = engine_->AddDynamicPlugin(&input, 1, plugin);
} }
#else #else
PADDLE_THROW(platform::errors::Fatal( PADDLE_THROW(platform::errors::Fatal(
......
...@@ -90,7 +90,7 @@ class SplitOpConverter : public OpConverter { ...@@ -90,7 +90,7 @@ class SplitOpConverter : public OpConverter {
engine_->WithFp16() && !engine_->disable_trt_plugin_fp16(); engine_->WithFp16() && !engine_->disable_trt_plugin_fp16();
plugin::SplitPluginDynamic* plugin = plugin::SplitPluginDynamic* plugin =
new plugin::SplitPluginDynamic(axis, output_lengths, with_fp16); new plugin::SplitPluginDynamic(axis, output_lengths, with_fp16);
layer = engine_->AddPluginV2(&input, input_num, plugin); layer = engine_->AddDynamicPlugin(&input, input_num, plugin);
#else #else
PADDLE_THROW(platform::errors::Fatal( PADDLE_THROW(platform::errors::Fatal(
"You are running the TRT Dynamic Shape mode, need to confirm that " "You are running the TRT Dynamic Shape mode, need to confirm that "
......
...@@ -59,7 +59,7 @@ class StackOpConverter : public OpConverter { ...@@ -59,7 +59,7 @@ class StackOpConverter : public OpConverter {
engine_->WithFp16() && !engine_->disable_trt_plugin_fp16(); engine_->WithFp16() && !engine_->disable_trt_plugin_fp16();
plugin::StackPluginDynamic* plugin = plugin::StackPluginDynamic* plugin =
new plugin::StackPluginDynamic(axis, input_num, with_fp16); new plugin::StackPluginDynamic(axis, input_num, with_fp16);
layer = engine_->AddPluginV2(inputs, input_num, plugin); layer = engine_->AddDynamicPlugin(inputs, input_num, plugin);
assert(layer != nullptr); assert(layer != nullptr);
#else #else
PADDLE_THROW(platform::errors::Fatal( PADDLE_THROW(platform::errors::Fatal(
......
...@@ -65,7 +65,7 @@ class SwishOpConverter : public OpConverter { ...@@ -65,7 +65,7 @@ class SwishOpConverter : public OpConverter {
engine_->WithFp16() && !engine_->disable_trt_plugin_fp16(); engine_->WithFp16() && !engine_->disable_trt_plugin_fp16();
plugin::SwishPluginDynamic* plugin = plugin::SwishPluginDynamic* plugin =
new plugin::SwishPluginDynamic(beta, with_fp16); new plugin::SwishPluginDynamic(beta, with_fp16);
layer = engine_->AddPluginV2(&input, input_num, plugin); layer = engine_->AddDynamicPlugin(&input, input_num, plugin);
#else #else
PADDLE_THROW(platform::errors::Fatal( PADDLE_THROW(platform::errors::Fatal(
"You are running the TRT Dynamic Shape mode, need to confirm that " "You are running the TRT Dynamic Shape mode, need to confirm that "
......
...@@ -378,9 +378,9 @@ class TensorRTEngine { ...@@ -378,9 +378,9 @@ class TensorRTEngine {
bool with_dynamic_shape() { return with_dynamic_shape_; } bool with_dynamic_shape() { return with_dynamic_shape_; }
#if IS_TRT_VERSION_GE(6000) #if IS_TRT_VERSION_GE(6000)
nvinfer1::IPluginV2Layer* AddPluginV2(nvinfer1::ITensor* const* inputs, nvinfer1::IPluginV2Layer* AddDynamicPlugin(
int num_inputs, nvinfer1::ITensor* const* inputs, int num_inputs,
plugin::DynamicPluginTensorRT* plugin) { plugin::DynamicPluginTensorRT* plugin) {
owned_pluginv2_.emplace_back(plugin); owned_pluginv2_.emplace_back(plugin);
return network()->addPluginV2(inputs, num_inputs, *plugin); return network()->addPluginV2(inputs, num_inputs, *plugin);
} }
......
...@@ -364,6 +364,7 @@ RoiAlignPluginDynamicCreator::getFieldNames() { ...@@ -364,6 +364,7 @@ RoiAlignPluginDynamicCreator::getFieldNames() {
nvinfer1::IPluginV2Ext* RoiAlignPluginDynamicCreator::createPlugin( nvinfer1::IPluginV2Ext* RoiAlignPluginDynamicCreator::createPlugin(
const char* name, const nvinfer1::PluginFieldCollection* fc) { const char* name, const nvinfer1::PluginFieldCollection* fc) {
const nvinfer1::PluginField* fields = fc->fields; const nvinfer1::PluginField* fields = fc->fields;
return nullptr;
} }
nvinfer1::IPluginV2Ext* RoiAlignPluginDynamicCreator::deserializePlugin( nvinfer1::IPluginV2Ext* RoiAlignPluginDynamicCreator::deserializePlugin(
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册