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

fix_convert_all_blocks #60613

Merged
merged 2 commits into from
Jan 9, 2024
Merged

fix_convert_all_blocks #60613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cee5713
fix_convert_all_blocks
Wangzheee Jan 8, 2024
e961767
fix
Wangzheee Jan 8, 2024
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
27 changes: 19 additions & 8 deletions paddle/fluid/framework/ir/pass.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ namespace ir {

static const char kParamScopeAttr[] = "__param_scope__"; // NOLINT

static const std::vector<std::string> support_subgraph_passes = {
"feed_fetch_subgraph_pass",
"set_subgraph_edge_pass",
"trt_map_ops_to_matrix_multiply_pass",
"tensorrt_subgraph_pass",
static const std::vector<std::string> gpu_support_subgraph_passes = {
"simplify_with_basic_ops_pass",
"fused_multi_transformer_encoder_pass",
"fused_multi_transformer_decoder_pass",
Expand All @@ -55,6 +51,14 @@ static const std::vector<std::string> support_subgraph_passes = {
"delete_weight_dequant_linear_op_pass",
};

static const std::vector<std::string> trt_support_subgraph_passes = {
"feed_fetch_subgraph_pass",
"set_subgraph_edge_pass",
"trt_map_ops_to_matrix_multiply_pass",
"tensorrt_subgraph_pass",
"simplify_with_basic_ops_pass",
};

static const std::vector<std::string> xpu_support_subgraph_passes = {
"delete_assign_op_pass",
"delete_dropout_op_pass",
Expand Down Expand Up @@ -127,13 +131,20 @@ Graph *Pass::Apply(Graph *graph) const {

std::vector<std::string> subgraph_passes;
bool use_xpu = Has("use_xpu") && Get<bool>("use_xpu");
bool use_tensorrt = Has("use_tensorrt") && Get<bool>("use_tensorrt");
bool all_blocks_convert = false;
if (use_xpu) {
subgraph_passes = xpu_support_subgraph_passes;
all_blocks_convert = FLAGS_convert_all_blocks;
} else if (use_tensorrt) {
subgraph_passes = trt_support_subgraph_passes;
all_blocks_convert =
FLAGS_all_blocks_convert_trt && FLAGS_convert_all_blocks;
} else {
subgraph_passes = support_subgraph_passes;
subgraph_passes = gpu_support_subgraph_passes;
all_blocks_convert = FLAGS_convert_all_blocks;
}
if (FLAGS_all_blocks_convert_trt && FLAGS_convert_all_blocks &&
graph->IsMainGraph() &&
if (all_blocks_convert && graph->IsMainGraph() &&
(std::count(subgraph_passes.begin(), subgraph_passes.end(), Type()) ||
std::count(support_subgraph_generate_passes.begin(),
support_subgraph_generate_passes.end(),
Expand Down
3 changes: 3 additions & 0 deletions paddle/fluid/inference/analysis/ir_pass_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ void IRPassManager::CreatePasses(Argument *argument,
// "use_xpu" is used for passes in subgraphs.
pass->Set("use_xpu", new bool(argument->use_xpu()));

// "use_tensorrt" is used for passes in subgraphs.
pass->Set("use_tensorrt", new bool(argument->use_tensorrt()));

if (pass_name == "graph_viz_pass") {
std::string optim_cache_dir = argument->optim_cache_dir();
std::string dot_file_path;
Expand Down