Skip to content

fix wait server ready #32889

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
merged 2 commits into from
May 13, 2021
Merged

fix wait server ready #32889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fb3c8e
fix wait server ready
wangxicoding May 13, 2021
c45c884
coverage
wangxicoding May 13, 2021
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
6 changes: 3 additions & 3 deletions python/paddle/distributed/fleet/meta_optimizers/graph_execution_optimizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ def _setup_nccl_op(self, startup_program, main_program, build_strategy):
trainer_endpoints_env = ",".join(trainer_endpoints)
trainers_num = self.role_maker._worker_num()

# FIXME(wangxi): approve this.
#if trainer_id == 0:
# wait_server_ready(other_trainers)
# NOTE(wangxi): npu don't need to wait server ready
if trainer_id == 0 and not paddle.is_compiled_with_npu():
wait_server_ready(other_trainers)

if core.is_compiled_with_cuda():
comm_id_var = startup_program.global_block().create_var(
Expand Down
12 changes: 7 additions & 5 deletions python/paddle/fluid/tests/unittests/test_fleet_graph_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,17 @@ def gen_data():
cost_val = exe.run(feed=gen_data(), fetch_list=[avg_cost.name])
print("cost of step[{}] = {}".format(i, cost_val))

proc_a = launch_func(node_func, node_a)
proc_a.start()
# rank 1
proc_b = launch_func(node_func, node_b)
proc_b.start()

# rank 0, for wait server ready coverage
# just for coverage
for key in node_b:
os.environ[key] = node_b[key]
for key in node_a:
os.environ[key] = node_a[key]
node_func()

proc_a.join()
proc_b.join()


if __name__ == "__main__":
Expand Down