Skip to content

Commit f72d52e

Browse files
jiweibojiweibo
authored
[cherry-pick] trt engine dtor when the last predictor dtor (#35881)
* cherry-pick 32842
1 parent edeb0ad commit f72d52e

File tree

7 files changed

+116
-10
lines changed

7 files changed

+116
-10
lines changed

‎cmake/external/lite.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ if (NOT LITE_SOURCE_DIR OR NOT LITE_BINARY_DIR)
4242
set(LITE_INSTALL_DIR ${THIRD_PARTY_PATH}/install/lite)
4343

4444
if(NOT LITE_GIT_TAG)
45-
set(LITE_GIT_TAG d3a3a6931b6d22d504d21ba32b3ae972770e9204)
45+
set(LITE_GIT_TAG 1c4698c6efd9a5f57a4f8369bd5b6374166f5ba4)
4646
endif()
4747

4848
if(NOT CUDA_ARCH_NAME)

‎paddle/fluid/framework/ir/fc_fuse_pass.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ int FCFusePass::ApplyFCPattern(Graph* graph, bool with_relu) const {
135135
}
136136

137137
// Create an FC Node.
138-
OpDesc desc;
138+
OpDesc desc(mul->Op()->Block());
139139
desc.SetType("fc");
140140

141141
// Set inputs of fc

‎paddle/fluid/framework/ir/map_matmul_to_mul_pass.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ void MapMatmul2MulPass::ApplyImpl(ir::Graph* graph) const {
220220
LOG(WARNING) << "Pass in op compat failed.";
221221
return;
222222
}
223-
OpDesc desc;
223+
OpDesc desc(matmul_op->Op()->Block());
224224
desc.SetType("mul");
225225
desc.SetInput("X", {matmul_in_x->Name()});
226226
desc.SetInput("Y", {matmul_in_y->Name()});
@@ -299,7 +299,7 @@ void Squeeze2MatmulFusePass::ApplyImpl(ir::Graph* graph) const {
299299
LOG(WARNING) << "Pass in op compat failed.";
300300
return;
301301
}
302-
OpDesc desc;
302+
OpDesc desc(matmul_op->Op()->Block());
303303
desc.SetType("mul");
304304
desc.SetInput("X", {squeeze2_in_x->Name()});
305305
desc.SetInput("Y", {matmul_in_y->Name()});
@@ -441,7 +441,7 @@ void Reshape2MatmulFusePass::ApplyImpl(ir::Graph* graph) const {
441441
LOG(WARNING) << "Pass in op compat failed.";
442442
return;
443443
}
444-
OpDesc desc;
444+
OpDesc desc(matmul_op->Op()->Block());
445445
desc.SetType("mul");
446446
desc.SetInput("X", {reshape2_in_x->Name()});
447447
desc.SetInput("Y", {matmul_in_y->Name()});
@@ -526,7 +526,7 @@ void Flatten2MatmulFusePass::ApplyImpl(ir::Graph* graph) const {
526526
LOG(WARNING) << "Pass in op compat failed.";
527527
return;
528528
}
529-
OpDesc desc;
529+
OpDesc desc(matmul_op->Op()->Block());
530530
desc.SetType("mul");
531531
desc.SetInput("X", {flatten2_in_x->Name()});
532532
desc.SetInput("Y", {matmul_in_y->Name()});

‎paddle/fluid/framework/op_desc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class OpDesc {
178178
}
179179

180180
proto::OpDesc desc_;
181-
BlockDesc *block_; // not_own
181+
BlockDesc *block_{nullptr}; // not_own
182182
// input arg name => input variable names
183183
VariableNameMap inputs_;
184184
// output arg name => output variable names

‎paddle/fluid/inference/api/analysis_predictor.cc‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,17 @@ void AnalysisPredictor::OptimizeInferenceProgram() {
645645
VLOG(5) << "to prepare executor";
646646
ARGUMENT_CHECK_FIELD((&argument_), ir_analyzed_program);
647647
inference_program_.reset(
648-
new framework::ProgramDesc(argument_.ir_analyzed_program()));
648+
new framework::ProgramDesc(argument_.ir_analyzed_program()),
649+
[](framework::ProgramDesc *prog) {
650+
// Note, please do NOT use any member variables, because member variables may
651+
// have been destructed in multiple threads.
652+
#if PADDLE_WITH_TENSORRT
653+
paddle::inference::Singleton<
654+
inference::tensorrt::TRTEngineManager>::Global()
655+
.DeleteAll();
656+
#endif
657+
delete prog;
658+
});
649659
// The config and argument take a lot of storage,
650660
// when the predictor settings are complete, we release these stores.
651661
argument_.PartiallyRelease();

‎paddle/fluid/inference/tensorrt/op_teller.cc‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
159159
if (op_type == "relu" || op_type == "relu6" || op_type == "tanh" ||
160160
op_type == "sigmoid") {
161161
auto* block = desc.Block();
162+
if (block == nullptr) {
163+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
164+
"Developers need to check whether block_desc is passed in "
165+
"the pass.";
166+
return false;
167+
}
162168
auto x_var_name = desc.Input("X")[0];
163169
auto* x_var_desc = block->FindVar(x_var_name);
164170
const auto x_shape = x_var_desc->GetShape();
@@ -274,6 +280,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
274280

275281
if (op_type == "matmul") {
276282
auto* block = desc.Block();
283+
if (block == nullptr) {
284+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
285+
"Developers need to check whether block_desc is passed in "
286+
"the pass.";
287+
return false;
288+
}
277289
for (auto& param_name : desc.Inputs()) {
278290
for (auto& var_name : param_name.second) {
279291
auto* var_desc = block->FindVar(var_name);
@@ -324,6 +336,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
324336
if (axis[0] == 0 && axis.size() == 2) return false;
325337

326338
auto* block = desc.Block();
339+
if (block == nullptr) {
340+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
341+
"Developers need to check whether block_desc is passed in "
342+
"the pass.";
343+
return false;
344+
}
327345
auto x_var_name = desc.Input("X")[0];
328346
auto* x_var_desc = block->FindVar(x_var_name);
329347
const auto x_shape = x_var_desc->GetShape();
@@ -372,6 +390,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
372390
return false;
373391
} else {
374392
auto* block = desc.Block();
393+
if (block == nullptr) {
394+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
395+
"Developers need to check whether block_desc is passed in "
396+
"the pass.";
397+
return false;
398+
}
375399
auto* x_var_desc = block->FindVar(desc.Input("X")[0]);
376400
const auto x_shape = x_var_desc->GetShape();
377401
if (x_shape.size() == 1) {
@@ -385,6 +409,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
385409
if (!with_dynamic_shape) return false;
386410

387411
auto* block = desc.Block();
412+
if (block == nullptr) {
413+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
414+
"Developers need to check whether block_desc is passed in "
415+
"the pass.";
416+
return false;
417+
}
388418
auto x_var_name = desc.Input("X")[0];
389419
auto index_var_name = desc.Input("Index")[0];
390420
auto* x_var_desc = block->FindVar(x_var_name);
@@ -428,6 +458,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
428458
if (data_layout != framework::DataLayout::kNCHW) return false;
429459

430460
auto* block = desc.Block();
461+
if (block == nullptr) {
462+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
463+
"Developers need to check whether block_desc is passed in "
464+
"the pass.";
465+
return false;
466+
}
431467
auto x_var_name = desc.Input("X")[0];
432468
auto* x_var_desc = block->FindVar(x_var_name);
433469
const auto x_shape = x_var_desc->GetShape();
@@ -439,6 +475,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
439475
if (op_type == "multiclass_nms") {
440476
if (with_dynamic_shape) return false;
441477
auto* block = desc.Block();
478+
if (block == nullptr) {
479+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
480+
"Developers need to check whether block_desc is passed in "
481+
"the pass.";
482+
return false;
483+
}
442484
for (auto& param_name : desc.Inputs()) {
443485
for (auto& var_name : param_name.second) {
444486
auto* var_desc = block->FindVar(var_name);
@@ -598,6 +640,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
598640
return false;
599641
}
600642
auto* block = desc.Block();
643+
if (block == nullptr) {
644+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
645+
"Developers need to check whether block_desc is passed in "
646+
"the pass.";
647+
return false;
648+
}
601649
auto x_var_name = desc.Input("X")[0];
602650
auto* x_var_desc = block->FindVar(x_var_name);
603651
const auto x_shape = x_var_desc->GetShape();
@@ -657,6 +705,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
657705
}
658706
}
659707
auto* block = desc.Block();
708+
if (block == nullptr) {
709+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
710+
"Developers need to check whether block_desc is passed in "
711+
"the pass.";
712+
return false;
713+
}
660714
auto x_var_name = desc.Input("X")[0];
661715
auto* x_var_desc = block->FindVar(x_var_name);
662716
const auto x_shape = x_var_desc->GetShape();
@@ -724,6 +778,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
724778
return false;
725779
}
726780
auto* block = desc.Block();
781+
if (block == nullptr) {
782+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
783+
"Developers need to check whether block_desc is passed in "
784+
"the pass.";
785+
return false;
786+
}
727787
auto* x_var_desc = block->FindVar(desc.Input("X")[0]);
728788
auto* y_var_desc = block->FindVar(desc.Input("Y")[0]);
729789
const auto x_shape = x_var_desc->GetShape();
@@ -775,6 +835,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
775835
}
776836

777837
auto* block = desc.Block();
838+
if (block == nullptr) {
839+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
840+
"Developers need to check whether block_desc is passed in "
841+
"the pass.";
842+
return false;
843+
}
778844
auto x_var_name = desc.Input("X")[0];
779845
auto* x_var_desc = block->FindVar(x_var_name);
780846
const auto x_shape = x_var_desc->GetShape();
@@ -856,6 +922,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
856922
}
857923
std::vector<int64_t> shape;
858924
auto* block = desc.Block();
925+
if (block == nullptr) {
926+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
927+
"Developers need to check whether block_desc is passed in "
928+
"the pass.";
929+
return false;
930+
}
859931
for (auto& param_name : desc.Inputs()) {
860932
for (auto& var_name : param_name.second) {
861933
auto* var_desc = block->FindVar(var_name);
@@ -881,6 +953,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
881953

882954
if (op_type == "scale") {
883955
auto* block = desc.Block();
956+
if (block == nullptr) {
957+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
958+
"Developers need to check whether block_desc is passed in "
959+
"the pass.";
960+
return false;
961+
}
884962
auto x_var_name = desc.Input("X")[0];
885963
auto* x_var_desc = block->FindVar(x_var_name);
886964
const auto x_shape = x_var_desc->GetShape();
@@ -892,6 +970,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
892970

893971
if (op_type == "swish") {
894972
auto* block = desc.Block();
973+
if (block == nullptr) {
974+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
975+
"Developers need to check whether block_desc is passed in "
976+
"the pass.";
977+
return false;
978+
}
895979
auto x_var_name = desc.Input("X")[0];
896980
auto* x_var_desc = block->FindVar(x_var_name);
897981
const auto x_shape = x_var_desc->GetShape();
@@ -916,6 +1000,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
9161000
}
9171001

9181002
auto* block = desc.Block();
1003+
if (block == nullptr) {
1004+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
1005+
"Developers need to check whether block_desc is passed in "
1006+
"the pass.";
1007+
return false;
1008+
}
9191009
auto* var_desc = block->FindVar(desc.Input("Alpha")[0]);
9201010
if (!var_desc) {
9211011
VLOG(3) << "Variable Alpha of prelu TRT converter not found.";
@@ -1051,6 +1141,12 @@ bool OpTeller::Tell(const framework::ir::Node* node, bool use_no_calib_int8,
10511141
}
10521142

10531143
auto* block = desc.Block();
1144+
if (block == nullptr) {
1145+
VLOG(3) << "The block desc is nullptr, we can't continue to analyze. "
1146+
"Developers need to check whether block_desc is passed in "
1147+
"the pass.";
1148+
return false;
1149+
}
10541150
auto x_var_name = desc.Input("X")[0];
10551151
auto* x_var_desc = block->FindVar(x_var_name);
10561152
const auto x_shape = x_var_desc->GetShape();

‎paddle/scripts/paddle_build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,8 +1161,8 @@ function parallel_test_base_gpu() {
11611161
EOF
11621162

11631163
set -x
1164-
# set trt_convert ut to run 30% cases.
1165-
export TEST_NUM_PERCENT_CASES=0.3
1164+
# set trt_convert ut to run 15% cases.
1165+
export TEST_NUM_PERCENT_CASES=0.15
11661166
precison_cases=""
11671167
bash $PADDLE_ROOT/tools/check_added_ut.sh
11681168
if [ ${PRECISION_TEST:-OFF} == "ON" ]; then

0 commit comments

Comments
 (0)