Skip to content

Commit 6422c0e

Browse files
author
yi.wu
committed
update by comment
1 parent b3cf429 commit 6422c0e

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

paddle/fluid/operators/listen_and_serv_op.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,10 @@ void ListenAndServOp::RunImpl(const framework::Scope &scope,
308308
rpc_service_->WaitServerReady();
309309

310310
// Write to a file of server selected port for python use.
311-
SavePort();
311+
std::string file_path =
312+
string::Sprintf("/tmp/paddle.%d.selected_port",
313+
static_cast<int>(::getpid()));
314+
SavePort(file_path);
312315
if (sync_mode) {
313316
RunSyncLoop(&executor, program, &recv_scope, prefetch_block);
314317
} else {

paddle/fluid/operators/send_recv_op_test.cc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,11 @@ TEST(SendRecvOp, CPUSparse) {
198198
std::thread server_thread(StartServerNet, true, &initialized);
199199
while (!initialized) {
200200
}
201-
static_cast<paddle::operators::ListenAndServOp *>(listen_and_serv_op.get())
202-
->WaitServerReady();
201+
auto *listen_and_serv_op_ptr =
202+
static_cast<paddle::operators::ListenAndServOp *>(
203+
listen_and_serv_op.get());
204+
ASSERT_TRUE(listen_and_serv_op_ptr != nullptr);
205+
listen_and_serv_op_ptr->WaitServerReady();
203206

204207
// local net
205208
f::Scope scope;
@@ -208,10 +211,6 @@ TEST(SendRecvOp, CPUSparse) {
208211
InitSelectedRowsInScope(place, &scope);
209212
scope.Var("RPC_CLIENT_VAR");
210213
f::AttributeMap attrs;
211-
auto *listen_and_serv_op_ptr =
212-
static_cast<paddle::operators::ListenAndServOp *>(
213-
listen_and_serv_op.get());
214-
ASSERT_TRUE(listen_and_serv_op_ptr != nullptr);
215214
selected_port = listen_and_serv_op_ptr->GetSelectedPort();
216215
std::string endpoint = paddle::string::Sprintf("127.0.0.1:%d", selected_port);
217216
attrs.insert({"endpoints", std::vector<std::string>({endpoint})});

python/paddle/fluid/tests/unittests/test_dist_train.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def test_send(self):
3434
p.start()
3535

3636
time.sleep(10)
37-
with open("/tmp/paddle.selected_port", "r") as fn:
37+
with open("/tmp/paddle.%d.selected_port" % p.pid, "r") as fn:
3838
selected_port = int(fn.readlines()[0])
3939
self.init_client(place, selected_port)
4040

0 commit comments

Comments
 (0)