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/dy2static] support infer mode in pir dy2static. #58588

Merged
merged 4 commits into from
Nov 3, 2023
Merged

[pir/dy2static] support infer mode in pir dy2static. #58588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3e5a1d
[pir/dy2static] support infer mode in pir dy2static. Adding RunablePr…
2742195759 Nov 1, 2023
e8c7774
merge and fix conflict.
2742195759 Nov 2, 2023
0094b7f
merge and fix conflict
2742195759 Nov 2, 2023
75abf37
fix
2742195759 Nov 2, 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
12 changes: 8 additions & 4 deletions paddle/fluid/eager/to_static/run_program_op_node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,15 +456,19 @@ inline void NewIRRunProgramAPI(

auto *forward_program =
forward_global_block->GetParentOp()->GetParentProgram();
auto *backward_program =
backward_global_block->GetParentOp()->GetParentProgram();

if (FLAGS_print_ir) {
std::ostringstream print_stream;
print_stream << "ForwardProgram is :\n";
forward_program->Print(print_stream);
print_stream << "BackwardProgram is:\n";
backward_program->Print(print_stream);
if (!is_test) {
auto *backward_program =
backward_global_block->GetParentOp()->GetParentProgram();
print_stream << "BackwardProgram is:\n";
backward_program->Print(print_stream);
} else {
print_stream << "BackwardProgram is empty in test mode.\n";
}
std::cout << "Program (fwd | bwd): \n" << print_stream.str() << std::endl;
}

Expand Down
44 changes: 27 additions & 17 deletions paddle/fluid/pybind/pir.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,20 +822,6 @@ Operation *BuildOpFrom(
return cloned_op;
}

std::shared_ptr<Program> ProgramClone(const Program &program) {
// Limitation of this function:
// 1. don't support Parameters.
// 2. don't support Regions in operator.
pir::IrContext *ctx = pir::IrContext::Instance();
auto cloned_program = std::make_shared<Program>(ctx);
std::unordered_map<pir::Value, pir::Value> value_map;
for (auto &op : *program.block()) {
auto *cloned_op = BuildOpFrom(op, value_map);
cloned_program->block()->push_back(cloned_op);
}
return cloned_program;
}

std::list<Operation *>::const_iterator list_offset(const Block *block,
int start_idx) {
auto it = block->begin();
Expand Down Expand Up @@ -951,7 +937,31 @@ static auto GetNoNeedBufferValue(const ::pir::Block *whole_block,
no_need_buffer_values.end());
}

SplitedResult ForwardBackwardSplit(
using OpResultMap = std::unordered_map<pir::OpResult, pir::OpResult>;
std::pair<std::shared_ptr<Program>, OpResultMap> CloneProgram(
const Program &program,
const std::vector<pir::OpResult> &op_result_forward_inputs,
const std::vector<pir::OpResult> &op_result_forward_params,
const std::vector<pir::OpResult> &op_result_forward_outputs) {
// Limitation of this function:
// 1. don't support Parameters.
// 2. don't support Regions in operator.
pir::IrContext *ctx = pir::IrContext::Instance();
auto cloned_program = std::make_shared<Program>(ctx);
std::unordered_map<pir::Value, pir::Value> value_map;
for (auto &op : *program.block()) {
auto *cloned_op = BuildOpFrom(op, value_map);
cloned_program->block()->push_back(cloned_op);
}
std::unordered_map<pir::OpResult, pir::OpResult> op_result_map;
for (auto &pair : value_map) {
op_result_map[pair.first.dyn_cast<pir::OpResult>()] =
pair.second.dyn_cast<pir::OpResult>();
}
return std::make_pair(cloned_program, op_result_map);
}

SplitedResult SplitForwardBackward(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SplitForwardBackward 这个函数我在使用时发现：对于相同的infer_program，如果调用之后，把fwd_program传入进来再次调用，就会出现非法的program，实现里对于 mid_value 和 output 会多次插入 SetParameterOp。我在create_output_fn_forward做了判断，但还需要仔细看下是否还存在其他类似的问题

const Program &program,
const std::vector<pir::OpResult> &op_result_forward_inputs,
const std::vector<pir::OpResult> &op_result_forward_params,
Expand Down Expand Up @@ -1188,8 +1198,8 @@ SplitedResult ForwardBackwardSplit(
}

void BindUtils(pybind11::module *m) {
m->def("program_clone", ProgramClone);
m->def("program_split", ForwardBackwardSplit);
m->def("clone_program", CloneProgram);
m->def("split_program", SplitForwardBackward);
m->def("fake_op_result", FakeOpResult);
m->def("is_fake_op_result", IsFakeOpResult);
m->def("set_global_program",
Expand Down
10 changes: 10 additions & 0 deletions paddle/pir/core/op_result.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,18 @@ class IR_API OpResult : public Value {
OpResult(detail::OpResultImpl *impl); // NOLINT
// Access classof annd dyn_cast_from.
friend Value;
friend struct std::hash<OpResult>;
static bool classof(Value value);
static OpResult dyn_cast_from(Value value);
};

} // namespace pir

namespace std {
template <>
struct hash<pir::OpResult> {
std::size_t operator()(const pir::OpResult &obj) const {
return std::hash<pir::Value>()(obj);
}
};
} // namespace std
Loading