Skip to content

Commit 7783982

Browse files
committed
change FLAGS to proto config in PServerUtil
1 parent cfbb4c4 commit 7783982

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

paddle/pserver/PServerUtil.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,36 @@ PServerUtil::PServerUtil(const ParameterServerConfig& config) {
2323
int onlineCpus = rdma::numCpus();
2424
int numPorts = config.ports_num() + config.ports_num_for_sparse();
2525

26-
if (FLAGS_nics.empty()) {
26+
if (config.nics().empty()) {
2727
pservers_.resize(numPorts);
2828
for (int i = 0; i < numPorts; ++i) {
29-
if (FLAGS_rdma_tcp == "rdma") {
29+
if (config.rdma_tcp() == "rdma") {
3030
pservers_[i].reset(
31-
new ParameterServer2(std::string(), FLAGS_port + i, rdmaCpu++));
31+
new ParameterServer2(std::string(), config.port() + i, rdmaCpu++));
3232
rdmaCpu = rdmaCpu % onlineCpus;
3333
} else {
34-
pservers_[i].reset(new ParameterServer2(std::string(), FLAGS_port + i));
34+
pservers_[i].reset(
35+
new ParameterServer2(std::string(), config.port() + i));
3536
}
3637
CHECK(pservers_[i]->init()) << "Fail to initialize parameter server"
37-
<< FLAGS_port + i;
38+
<< config.port() + i;
3839
}
3940
} else {
40-
str::split(FLAGS_nics, ',', &devices);
41+
str::split(config.nics(), ',', &devices);
4142
pservers_.resize(devices.size() * numPorts);
4243
for (int i = 0; i < numPorts; ++i) {
4344
for (size_t j = 0; j < devices.size(); ++j) {
44-
if (FLAGS_rdma_tcp == "rdma") {
45+
if (config.rdma_tcp() == "rdma") {
4546
pservers_[i * devices.size() + j].reset(new ParameterServer2(
46-
getIpAddr(devices[j]), FLAGS_port + i, rdmaCpu++));
47+
getIpAddr(devices[j]), config.port() + i, rdmaCpu++));
4748
rdmaCpu = rdmaCpu % onlineCpus;
4849
} else {
4950
pservers_[i * devices.size() + j].reset(
50-
new ParameterServer2(getIpAddr(devices[j]), FLAGS_port + i));
51+
new ParameterServer2(getIpAddr(devices[j]), config.port() + i));
5152
}
5253
CHECK(pservers_[i * devices.size() + j]->init())
5354
<< "Fail to initialize parameter server" << devices[j]
54-
<< FLAGS_port + i;
55+
<< config.port() + i;
5556
}
5657
}
5758
}

0 commit comments

Comments
 (0)