Skip to content

[PIR] fix test_write_python_container in pir mode #61692

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

Merged
winter-wang merged 1 commit into from
Feb 8, 2024
+14 −9
Merged

[PIR] fix test_write_python_container in pir mode #61692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions paddle/fluid/framework/new_executor/instruction/control_flow/while_instruction.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,20 +205,11 @@ void WhileInstruction::ShareDatasToOutputs() {
auto& out_var_name = body_outputs_[i + 1];
auto* out_var = body_inter_->local_scope()->GetVar(out_var_name);
VLOG(6) << "share data from " << out_var_name << " -> " << i << " output";

if (out_var->IsType<phi::DenseTensor>()) {
outputs_[i]->GetMutable<phi::DenseTensor>()->ShareDataWith(
out_var->Get<phi::DenseTensor>());
VLOG(6) << "share data from " << out_var_name << "[" << out_var << "]"
<< " -> " << i << " output[" << outputs_[i] << "]";

// NOTE(zhangbo): Delete the input of the yield operator, except for the
// external vars of the block.
if (external_input_names_.count(out_var_name) == 0) {
VLOG(6) << "clear internel input " << out_var_name;
out_var->GetMutable<phi::DenseTensor>()->clear();
}

} else if (out_var->IsType<phi::TensorArray>()) {
const auto& inner_array = out_var->Get<phi::TensorArray>();
auto* output_array = outputs_[i]->GetMutable<phi::TensorArray>();
Expand All @@ -230,6 +221,19 @@ void WhileInstruction::ShareDatasToOutputs() {

VLOG(6) << "done";
}

for (size_t i = 0; i < outputs_.size(); ++i) {
auto& out_var_name = body_outputs_[i + 1];
auto* out_var = body_inter_->local_scope()->GetVar(out_var_name);
if (out_var->IsType<phi::DenseTensor>()) {
// NOTE(zhangbo): Delete the input of the yield operator, except for the
// external vars of the block.
if (external_input_names_.count(out_var_name) == 0) {
VLOG(6) << "clear internel input " << out_var_name;
out_var->GetMutable<phi::DenseTensor>()->clear();
}
}
}
}

void WhileInstruction::Run() {
Expand Down
1 change: 1 addition & 0 deletions test/dygraph_to_static/test_write_python_container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ def test_write_container_sot(self):
self.assertEqual(out_static, out_dygraph)

@test_ast_only
@test_legacy_and_pt_and_pir
def test_write_container(self):
func_static = paddle.jit.to_static(self.func)
input = paddle.to_tensor([1, 2, 3])
Expand Down