add inference api:exp_disable_tensorrt_dynamic_shape_ops #62352
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
你的PR提交成功，感谢你对开源项目的贡献! |
yuanlehome
reviewed
Mar 5, 2024
| @@ -813,6 +813,8 @@ struct PD_INFER_DECL AnalysisConfig { | |||
| void Exp_DisableTensorRtSubgraph( | |||
| const std::vector<std::string>& var_name_not_trt); | |||
|
|
|||
| void Exp_DisableDynamicTensorRTOPs(bool trt_forbid_dynamic_op); | |||
There was a problem hiding this comment.
Exp_DisableDynamicTensorRTOPs -> Exp_DisableTensorRTDynamicShapeOPs是不是更易理解？
yuanlehome
reviewed
Mar 5, 2024
| @@ -34,6 +34,41 @@ namespace paddle { | |||
| namespace inference { | |||
| namespace tensorrt { | |||
|
|
|||
| bool checkForDynamicShapes(const framework::OpDesc& desc) { | |||
There was a problem hiding this comment.
根据Paddle命名规范，checkForDynamicShapes->CheckForDynamicShapes
yuanlehome
reviewed
Mar 5, 2024
Comment on lines
3255
to
3258
| if (forbid_dynamic_op_enter_into_trt) { | ||
| bool is_dynamic = checkForDynamicShapes(desc); | ||
| return is_dynamic; | ||
| } |
There was a problem hiding this comment.
这里逻辑不太对吧，如果是动态shape，返回true？如果当前op没有支持trt converter并且是动态shape也返回true?
yuanlehome
reviewed
Mar 5, 2024
Comment on lines
3343
to
3346
| if (forbid_dynamic_op_enter_into_trt) { | ||
| bool is_dynamic = checkForDynamicShapes(desc); | ||
| return is_dynamic; | ||
| } |
yuanlehome
reviewed
Mar 5, 2024
Comment on lines
3385
to
3388
| if (forbid_dynamic_op_enter_into_trt) { | ||
| bool is_dynamic = checkForDynamicShapes(desc); | ||
| return is_dynamic; | ||
| } |
lizexu123
changed the title
Wangzheee
reviewed
Mar 5, 2024
| if (forbid_dynamic_op_enter_into_trt && IsDynamicShapeOp(desc)) { | ||
| return false; | ||
| } | ||
|
|
||
| if (with_dynamic_shape) { |
| if (forbid_dynamic_op_enter_into_trt && IsDynamicShapeOp(desc)) { | ||
| return false; | ||
| } | ||
|
|
| @@ -34,6 +34,42 @@ namespace paddle { | |||
| namespace inference { | |||
| namespace tensorrt { | |||
|
|
|||
| // 检查是否是动态shape,如果是动态shape,则返回true,否则返回false | |||
| @@ -34,6 +34,42 @@ namespace paddle { | |||
| namespace inference { | |||
| namespace tensorrt { | |||
|
|
|||
| // 检查是否是动态shape,如果是动态shape,则返回true,否则返回false | |||
| bool IsDynamicShapeOp(const framework::OpDesc& desc) { | |||
There was a problem hiding this comment.
DynamicShape 这个是和tensorrt的DynamicShape 一样吗？
zhoutianzi666
approved these changes
Mar 6, 2024
yuanlehome
approved these changes
Mar 6, 2024
|
最近添加的几个相关api，需要在paddle-inference-demo仓库中补充下api文档～ |
Wangzheee
approved these changes
Mar 6, 2024
|
zhoutianzi666
approved these changes
Mar 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR types
New features
PR changes
Others
Description
Pcard-71501
推理新增dynamic_shape op禁止使用trt推理，使用原生gpu推理。
此处的dynamic shape op指的是，运行的时候shape会改变的Op，这些Op被禁止进入TRT。
如上图，tensorrt_engine的输入为dynamic_shape，使用
如图所示，使用原生gpu推理