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

remove batch norm from StaticBuildBlackList #57510

Merged
merged 15 commits into from
Oct 9, 2023
Merged

remove batch norm from StaticBuildBlackList #57510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b47f735
remove batch norm from StaticBuildBlackList
AndSonder Sep 19, 2023
4e519f6
turn off the flag
AndSonder Sep 20, 2023
9afc144
fix batch_norm register kernel info
AndSonder Sep 25, 2023
49d0cd1
remove dequantize_linear to phi
AndSonder Sep 26, 2023
1cec81d
fix build error
AndSonder Sep 26, 2023
e06d47e
add sig file
AndSonder Sep 26, 2023
657f12c
update test and cmakelist
AndSonder Sep 26, 2023
b4a438e
fix test_split_program error in static_build mode
AndSonder Oct 2, 2023
91feb39
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
AndSonder Oct 2, 2023
bad20e8
move fuse_bn_add_act to phi
AndSonder Oct 4, 2023
f64dac3
fix error in test_cudnn_bn_add_relu
AndSonder Oct 7, 2023
60f7aff
fix shape error
AndSonder Oct 7, 2023
65a52c4
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
AndSonder Oct 7, 2023
2056ac8
fix date
AndSonder Oct 8, 2023
0143a9f
close the static_build flag
AndSonder Oct 8, 2023
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
17 changes: 16 additions & 1 deletion paddle/fluid/framework/new_executor/interpreter/static_build.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ std::set<std::string> OpsCanSkipedFakeAllocInStaticBuild = {
"nop"};

std::set<std::string> StaticBuildBlackList = {
"batch_norm" /*: to handle reserve_space output*/,
"cinn_instruction_run" /*: to handle subgraph infermeta*/,
"cinn_launch" /*: to handle subgraph infermeta*/,
"run_program" /*: to handle scope output*/,
Expand Down Expand Up @@ -206,6 +205,14 @@ bool TensorShouldBeFakeInitialized(const OperatorBase& op,
}
}

if (op_type == "batch_norm" && parameter_name == "ReserveSpace") {
if (dynamic_cast<const OperatorWithKernel*>(&op)->kernel_type()->place_ ==
phi::CPUPlace()) {
VLOG(2) << "Skip fake initialization for: " << parameter_name;
return false;
}
}

if (op_type == "coalesce_tensor" && parameter_name == "Output") {
VLOG(2) << "Skip fake initialization for: " << parameter_name;
return false;
Expand Down Expand Up @@ -250,6 +257,12 @@ bool TensorShouldBeFakeInitialized(const OperatorBase& op,
}
}

if ((op_type == "flatten" || op_type == "flatten_contiguous_range") &&
parameter_name == "XShape") {
VLOG(2) << "Skip fake initialization for: " << parameter_name;
return false;
}

if (op_type == "segment_pool" && parameter_name == "SummedIds") {
return op.Attr<std::string>("pooltype") == "MEAN" &&
dynamic_cast<const OperatorWithKernel*>(&op)
Expand Down Expand Up @@ -856,6 +869,8 @@ void FakeInitializeOutputsForFunctionKernel(
dtype = InferDTypeFromAttr(op, runtime_ctx, "dtype");
} else if (op_type == "bincount" || op_type == "reduce_sum_grad") {
dtype = GetInputDType(runtime_ctx, "X");
} else if (op_type == "dequantize_linear") {
dtype = GetInputDType(runtime_ctx, "Scale");
} else if (op_type == "lamb") {
bool multi_precision = op.Attr<bool>("multi_precision");
dtype = GetInputDType(runtime_ctx, "Moment1");
Expand Down
Loading