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 has_structed_kerenl and has_fluid_kernel #56779

Merged
merged 11 commits into from
Sep 4, 2023
Merged

Remove has_structed_kerenl and has_fluid_kernel #56779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1f022dc
remove has_structed_kerenl and has_fluid_kernel
AndSonder Aug 29, 2023
745f87c
add test_fused_layernorm_op to STATIC_BUILD_TESTS list
AndSonder Aug 29, 2023
786c476
open static_build flag
AndSonder Aug 30, 2023
c015093
remove distributed_fused_lamb_init from StaticBuildBlackList
AndSonder Aug 31, 2023
c99ee19
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
AndSonder Aug 31, 2023
9127b16
use initialized replacing IsInitialized
AndSonder Aug 31, 2023
69ea73b
Merge branch 'remove_flag2' of https://github.com/AndSonder/Paddle in…
AndSonder Aug 31, 2023
f7010a6
recover codes
AndSonder Sep 1, 2023
03e47bc
delete useless codes
AndSonder Sep 2, 2023
2cb8c5a
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
AndSonder Sep 4, 2023
7d3896d
close the flag
AndSonder Sep 4, 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
9 changes: 1 addition & 8 deletions 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 @@ -47,8 +47,6 @@ std::set<std::string> StaticBuildBlackList = {
"cinn_launch" /*: to handle subgraph infermeta*/,
"run_program" /*: to handle scope output*/,
"sparse_sparse_coo_tensor" /*: to handle sparse output*/,
"shuffle_batch",
"shuffle_batch_grad",
"distributed_fused_lamb_init"};

namespace paddle {
Expand All @@ -60,8 +58,6 @@ bool BlockCanBeStaticBuilt(const framework::BlockDesc& block) {
// is_operator_base = (kernelCode >> 6) & 1
// is_custom_op = (kernelCode >> 5) & 1
// use_mkldnn = (kernelCode >> 4) & 1
// has_fluid_kernel = (kernelCode >> 3) & 1
// has_structed_kernel = (kernelCode >> 2) & 1
using KernelCode = int8_t;
std::set<std::pair<std::string, KernelCode>> invalid_ops;
for (auto& op : block.AllOps()) {
Expand All @@ -81,13 +77,11 @@ bool BlockCanBeStaticBuilt(const framework::BlockDesc& block) {
use_mkldnn = attr.index() == 1 ? PADDLE_GET_CONST(int, attr)
: PADDLE_GET_CONST(bool, attr);
}
bool has_fluid_kernel = OperatorWithKernel::AllOpKernels().count(op_type);
bool has_structured_kernel =
phi::KernelFactory::Instance().HasStructuredKernel(op_type);

KernelCode kernel_code = (in_black_list << 7) + (is_operator_base << 6) +
(is_custom_op << 5) + (use_mkldnn << 4) +
(has_fluid_kernel << 3) +
(has_structured_kernel << 2);
if (!OpsCanSkipedFakeAllocInStaticBuild.count(op_type)) {
if (in_black_list ||
Expand All @@ -107,8 +101,7 @@ bool BlockCanBeStaticBuilt(const framework::BlockDesc& block) {
<< ", is_operator_base = " << (item.second >> 6 & 1)
<< ", is_custom_op = " << (item.second >> 5 & 1)
<< ", use_mkldnn = " << (item.second >> 4 & 1)
<< ", has_fluid_kernel = " << (item.second >> 3 & 1)
<< ", has_structed_kerenl = " << (item.second >> 2 & 1) << "]\n";
<< (item.second >> 2 & 1) << "]\n";
}
VLOG(1) << ss.str();
}
Expand Down
1 change: 1 addition & 0 deletions test/legacy_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,6 +1290,7 @@ set(STATIC_BUILD_TESTS
test_fuse_bn_act_pass
test_fused_feedforward_op
test_fused_feedforward_pass
test_fused_layernorm_op
test_imperative_optimizer
test_lamb_op
test_layer_norm_op
Expand Down