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.

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

[IR] refine program translator #54719

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 6 deletions paddle/fluid/eager/auto_code_generator/generator/eager_gen.py
Original file line number Diff line number Diff line change
Expand Up @@ -1013,12 +1013,9 @@ def GenerateNodeCreationCodes(self, for_backward=False, is_inplaced=False):
name in forward_outputs_position_map.keys()
), AssertMessage(name, forward_outputs_position_map.keys())

if is_optional:
set_tensor_wrappers = f"{indent}if({name}) grad_node->SetTensorWrapper{name}(*{name});"
else:
set_tensor_wrappers = (
f"{indent}grad_node->SetTensorWrapper{name}({name});"
)
set_tensor_wrappers = (
f"{indent}grad_node->SetTensorWrapper{name}({name});"
)
set_output_tensor_wrappers_list.append(set_tensor_wrappers)
set_input_tensor_wrappers_str = "\n".join(
set_input_tensor_wrappers_list
Expand Down
127 changes: 126 additions & 1 deletion paddle/fluid/ir/dialect/pd_op.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
attrs:
- {typename: str, name: name}
outputs:
- {typename: Tensor, name: out, optional: false, intermediate: false}
- {typename: Tensor, name: out, optional: false, intermediate: false}
no_need_buffer: null
data_transform: null
infer_meta:
Expand All @@ -35,3 +35,128 @@
force_backend: null
inplace: null
backward: null

- name: share_buffer_
inputs:
- typename: Tensor[]
name: x
optional: false
no_need_buffer: false
data_transform: {}
attrs:
- {typename: 'bool[]', name: share_dims_and_dtype, default_value: '{}'}
outputs:
- {typename: 'Tensor[]', name: out, size: x.size(), optional: false, intermediate: false}
- {typename: 'Tensor[]', name: xout, size: x.size(), optional: false, intermediate: false}
no_need_buffer: null
data_transform: null
inplace: null
backward: null

- name: assert
inputs:
- typename: Tensor
name: cond
optional: false
no_need_buffer: false
data_transform: {}
- typename: Tensor[]
name: data
optional: false
no_need_buffer: false
data_transform: {}
attrs:
- {typename: 'int64_t', name: summarize, default_value: '-1'}
outputs: []
no_need_buffer: null
data_transform: null
inplace: null
backward: null

- name: print
inputs:
- typename: Tensor
name: in
optional: false
no_need_buffer: false
data_transform: {}
attrs:
- {typename: 'int', name: first_n}
- {typename: 'str', name: message}
- {typename: 'int', name: summarize}
- {typename: 'bool', name: print_tensor_name, default_value: 'true'}
- {typename: 'bool', name: print_tensor_type, default_value: 'true'}
- {typename: 'bool', name: print_tensor_shape, default_value: 'true'}
- {typename: 'bool', name: print_tensor_layout, default_value: 'true'}
- {typename: 'bool', name: print_tensor_lod, default_value: 'true'}
- {typename: 'str', name: print_phase, default_value: 'BOTH'}
- {typename: 'bool', name: is_forward, default_value: 'true'}
outputs:
- typename: Tensor
name: out
optional: false
no_need_buffer: false
data_transform: {}
no_need_buffer: null
data_transform: null
inplace: null
backward: null

- name: add_n_
inputs:
- typename: Tensor[]
name: inputs
optional: false
no_need_buffer: false
data_transform: {}
attrs: []
outputs:
- {typename: Tensor, name: out, optional: false, intermediate: false}
no_need_buffer: null
data_transform: null
invoke: {func: add_n_impl, args: inputs}
backward: add_n_grad

- name: write_to_array
inputs:
- typename: Tensor
name: i
optional: false
no_need_buffer: false
data_transform: {}
- typename: Tensor
name: x
optional: false
no_need_buffer: false
data_transform: {}
attrs: []
outputs:
- {typename: 'Tensor[]', name: out, optional: false, intermediate: false}
no_need_buffer: null
data_transform: null
backward: write_to_array_grad

- name: lod_array_length
inputs:
- typename: Tensor[]
name: x
optional: false
no_need_buffer: false
data_transform: {}
attrs: []
outputs:
- {typename: 'Tensor', name: out, optional: false, intermediate: false}
no_need_buffer: null
data_transform: null

- name: py_func_
inputs:
- {typename: 'Tensor', name: x, optional: false, no_need_buffer: false, data_transform: {}}
attrs:
- {typename: 'int', name: forward_callable_id, default_value: '0'}
- {typename: 'int', name: backward_callable_id, default_value: '-1'}
- {typename: 'str[]', name: backward_skip_vars, default_value: '{}'}
outputs:
- {typename: 'Tensor', name: out, optional: false, intermediate: false}
no_need_buffer: null
data_transform: null
4 changes: 4 additions & 0 deletions paddle/fluid/ir/transforms/pd_op_to_kernel_pass.cc
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,10 @@ phi::KernelKey GetKernelKey(
}
}

if (kernel_backend == phi::Backend::UNDEFINED) {
kernel_backend = paddle::experimental::ParseBackend(place);
}

phi::KernelKey res(kernel_backend, kernel_layout, kernel_data_type);
return res;
}
Expand Down
31 changes: 29 additions & 2 deletions paddle/fluid/ir_adaptor/translator/attribute_translator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ class AttributeVisitor {
return ir::Int32Attribute::get(ctx, i);
}

virtual ir::Attribute operator()(int64_t i) {
VLOG(10) << "translating int";
return ir::Int64Attribute::get(ctx, i);
}

virtual ir::Attribute operator()(float f) {
VLOG(10) << "translating float";
return ir::FloatAttribute::get(ctx, f);
Expand Down Expand Up @@ -146,6 +151,21 @@ class AttributeVisitor {
}
};

class Int64ArrayAttributeVisitor : public AttributeVisitor {
public:
using AttributeVisitor::AttributeVisitor;

ir::Attribute operator()(const std::vector<int>& is) override {
VLOG(10) << "translating vector<int64>";
std::vector<ir::Attribute> attrs;
attrs.reserve(is.size());
for (const auto& v : is) {
attrs.push_back(ir::Int64Attribute::get(ctx, v));
}
return ir::ArrayAttribute::get(ctx, attrs);
}
};

class IntArrayAttributeVisitor : public AttributeVisitor {
public:
using AttributeVisitor::AttributeVisitor;
Expand All @@ -171,15 +191,20 @@ class DataTypeAttributeVisitor : public AttributeVisitor {
auto phi_dtype = phi::TransToPhiDataType(i);
return paddle::dialect::DataTypeAttribute::get(ctx, phi_dtype);
}

ir::Attribute operator()(const paddle::blank& blank) override {
VLOG(10) << "translating paddle::blank to DataType::UNDEFINED";
return paddle::dialect::DataTypeAttribute::get(ctx, phi::DataType());
}
};

class PlaceAttributeVisitor : public AttributeVisitor {
public:
using AttributeVisitor::AttributeVisitor;

ir::Attribute operator()(const paddle::blank& blank) override {
VLOG(10) << "translating paddle::blank";
phi::Place data(phi::AllocationType::CPU);
VLOG(10) << "translating paddle::blank to Place::UNDEFINED";
phi::Place data(phi::AllocationType::UNDEFINED);
return paddle::dialect::PlaceAttribute::get(ctx, data);
}
};
Expand All @@ -192,6 +217,8 @@ AttributeTranslator::AttributeTranslator() {
new DataTypeAttributeVisitor();
special_visitors["paddle::dialect::PlaceAttribute"] =
new PlaceAttributeVisitor();
special_visitors["ir::ArrayAttribute<ir::Int64Attribute>"] =
new Int64ArrayAttributeVisitor();
}

ir::Attribute AttributeTranslator::operator()(
Expand Down
Loading