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

[PIR] Complement op defs #60475

Merged
merged 13 commits into from
Jan 2, 2024
Merged

[PIR] Complement op defs #60475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3af238f
fix property overwrite
kangguangli Dec 21, 2023
b30788f
fix op test
kangguangli Dec 21, 2023
b80345f
fix op test
kangguangli Dec 21, 2023
3d6f811
fix op test
kangguangli Dec 22, 2023
2c65ea7
fix op test
kangguangli Dec 22, 2023
663678b
remove unit test
kangguangli Dec 25, 2023
a98b4cf
remove debug messages
kangguangli Dec 25, 2023
6aa9856
remove unit test
kangguangli Dec 25, 2023
0256058
Merge branch 'develop' of github.com:PaddlePaddle/Paddle into fix_pro…
kangguangli Dec 27, 2023
600da4d
complement translation of legacy matmul
kangguangli Dec 28, 2023
489676f
Merge branch 'develop' of github.com:PaddlePaddle/Paddle into fix_pro…
kangguangli Dec 28, 2023
be3b056
fix
kangguangli Dec 29, 2023
afa1d32
Merge branch 'develop' of github.com:PaddlePaddle/Paddle into fix_pro…
kangguangli Dec 29, 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
10 changes: 10 additions & 0 deletions paddle/fluid/ir_adaptor/translator/op_compat_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,16 @@ def insert_new_mutable_attributes(
)

# special mapping list
op_name_mappings["deformable_conv_v1"] = "deformable_conv"
op_name_mappings["deformable_conv_v1_grad"] = "deformable_conv_grad"
op_arg_name_mappings["deformable_conv_v1"] = {
"x": "Input",
"offset": "Offset",
"filter": "Filter",
"mask": "Mask",
"out": "Output",
}

op_arg_name_mappings["set_value_grad"]["values_grad"] = "ValueTensor@GRAD"
op_arg_name_mappings["fetch"] = {"x": "X"}
op_arg_name_mappings["elementwise_add_grad_grad"] = {
Expand Down
12 changes: 11 additions & 1 deletion paddle/fluid/ir_adaptor/translator/op_translator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,9 @@ std::vector<pir::Value> OpTranscriber::GenerateOperationInput(
info.name,
op_desc.Type());
IR_ENFORCE(param_map->count(legacy_input_vars[0]),
"Input [%s] of op [%s] not found in param map",
"Input [%s: %s] of op [%s] not found in param map",
info.name,
legacy_input_vars[0],
op_desc.Type());
auto defining_info = (*param_map)[legacy_input_vars[0]];
op_inputs.push_back(defining_info.value);
Expand Down Expand Up @@ -2989,6 +2990,14 @@ struct LegacyMatmulOpTranscriber : public OpTranscriber {
param_map->PushValue(output_vars[0],
VariableDefiningInfo(scale_op.out(), false, -1));
}

void HandleNonexistentAttribute(pir::IrContext* ctx,
pir::AttributeMap* attribute_map,
const OpAttributeInfo& info) override {
if (info.name == "transpose_x" || info.name == "transpose_y") {
(*attribute_map)[info.name] = pir::BoolAttribute::get(ctx, false);
}
}
};

struct CEmbeddingOpTranscriber : public OpTranscriber {
Expand Down Expand Up @@ -3042,6 +3051,7 @@ OpTranslator::OpTranslator() {
special_handlers["sum"] = AddNOpTranscriber();
special_handlers["tril_triu"] = TrilAndTriuOpTranscriber();
special_handlers["tril_triu_grad"] = TrilAndTriuGradOpTranscriber();
special_handlers["matmul"] = LegacyMatmulOpTranscriber();
special_handlers["matrix_rank"] = MatrixRankOpTranscriber();
special_handlers["mul"] = MulOpTranscriber();
special_handlers["mul_grad"] = MulGradOpTranscriber();
Expand Down