[Paddle-TRT] Convert 0D tensor to 1D tensor, increase the shape tensor's number count when collecting shape #55503

ckl117 · 2023-07-18T05:18:28Z

PR types

Others

PR changes

Others

Description

P-card-71501
增加了paddle op到trt op转换时的shape检查；
将0维tensor处理成1维tensor，避免部分模型(grounding_dino)出错；
将shape tensor的个数上限7修改为8，以适配Grounding-SAM模型；
修改elementwise算子进入trt时的输入数据直接从tensor中查找，避免输入数据tensor的名字和其他参数名字重复导致的读取错误，同时兼容静态shape版本；

…check

paddle-bot · 2023-07-18T05:18:33Z

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

zhoutianzi666

LGTM

zhoutianzi666 · 2023-07-21T09:47:30Z

paddle/fluid/inference/tensorrt/convert/elementwise_op.cc

@@ -30,7 +30,7 @@ class ElementwiseTensorOpConverter : public OpConverter {
    auto* X = engine_->GetITensor(op_desc.Input("X").front());
    nvinfer1::ITensor* Y = nullptr;
    auto* Y_v = scope.FindVar(op_desc.Input("Y").front());
-    if (Y_v) {
+    if (Y_v && !engine_->with_dynamic_shape()) {


这个地方应该是为了兼容静态shape，没有完全删掉

paddle/fluid/inference/tensorrt/convert/op_converter.h

zhoutianzi666

LGTM

…r's number count when collecting shape (PaddlePaddle#55503) * make 0-D tensor to 1-D tensor to support Grounding-SAM and add shape check * recover identity_op_clean_pass.cc

ckl117 added 2 commits July 18, 2023 04:17

make 0-D tensor to 1-D tensor to support Grounding-SAM and add shape …

619179d

…check

recover identity_op_clean_pass.cc

4471916

ckl117 changed the title ~~Dino sam~~ support Grounding-SAM model Jul 18, 2023

zhoutianzi666 approved these changes Jul 21, 2023

View reviewed changes

zhoutianzi666 reviewed Jul 21, 2023

View reviewed changes

zhoutianzi666 approved these changes Jul 21, 2023

View reviewed changes

ckl117 changed the title ~~support Grounding-SAM model~~ [Paddle-TRT] Convert 0D tensor to 1D tensor, increase the shape tensor's number count, elementwise input data read, and some shape checks. Jul 21, 2023

ckl117 changed the title ~~[Paddle-TRT] Convert 0D tensor to 1D tensor, increase the shape tensor's number count, elementwise input data read, and some shape checks.~~ [Paddle-TRT] Convert 0D tensor to 1D tensor, increase the shape tensor's number count and some shape checks. Jul 21, 2023

ckl117 changed the title ~~[Paddle-TRT] Convert 0D tensor to 1D tensor, increase the shape tensor's number count and some shape checks.~~ [Paddle-TRT] Convert 0D tensor to 1D tensor, increase the shape tensor's number count when collecting shape Jul 21, 2023

zhangjun approved these changes Jul 24, 2023

View reviewed changes

zhangjun merged commit a3cf25e into PaddlePaddle:develop Jul 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Paddle-TRT] Convert 0D tensor to 1D tensor, increase the shape tensor's number count when collecting shape #55503

[Paddle-TRT] Convert 0D tensor to 1D tensor, increase the shape tensor's number count when collecting shape #55503

Uh oh!

ckl117 commented Jul 18, 2023

Uh oh!

paddle-bot bot commented Jul 18, 2023

Uh oh!

zhoutianzi666 left a comment

Uh oh!

zhoutianzi666 Jul 21, 2023

Uh oh!

Uh oh!

zhoutianzi666 left a comment

Uh oh!

Uh oh!

[Paddle-TRT] Convert 0D tensor to 1D tensor, increase the shape tensor's number count when collecting shape #55503

[Paddle-TRT] Convert 0D tensor to 1D tensor, increase the shape tensor's number count when collecting shape #55503

Uh oh!

Conversation

ckl117 commented Jul 18, 2023

PR types

PR changes

Description

Uh oh!

paddle-bot bot commented Jul 18, 2023

Uh oh!

zhoutianzi666 left a comment

Choose a reason for hiding this comment

Uh oh!

zhoutianzi666 Jul 21, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

zhoutianzi666 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!