Skip to content

Commit 3f6c2b3

Browse files
committed
rm initConfigByGflags of PServerController, use stack value instead
1 parent 93e74f8 commit 3f6c2b3

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

paddle/pserver/PServerController.cpp

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,16 @@ PServerController::PServerController(const ParameterServerConfig& config) {
6060

6161
PServerController::~PServerController() { this->join(); }
6262

63-
ParameterServerConfig* PServerController::initConfigByGflags() {
64-
ParameterServerConfig* config = new ParameterServerConfig();
65-
config->set_nics(FLAGS_nics);
66-
config->set_port(FLAGS_port);
67-
config->set_ports_num(FLAGS_ports_num);
68-
config->set_rdma_tcp(FLAGS_rdma_tcp);
69-
return config;
70-
}
71-
7263
PServerController* PServerController::createByGflags() {
73-
auto& pServerConfig = *paddle::PServerController::initConfigByGflags();
74-
return create(pServerConfig);
64+
ParameterServerConfig config;
65+
66+
config.set_nics(FLAGS_nics);
67+
config.set_rdma_tcp(FLAGS_rdma_tcp);
68+
config.set_port(FLAGS_port);
69+
config.set_ports_num(FLAGS_ports_num);
70+
config.set_ports_num_for_sparse(FLAGS_ports_num_for_sparse);
71+
72+
return create(config);
7573
}
7674

7775
PServerController* PServerController::create(

paddle/pserver/PServerController.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ limitations under the License. */
2121

2222
namespace paddle {
2323

24-
class PServerController {
24+
class PServerController final {
2525
public:
2626
DISABLE_COPY(PServerController);
2727

@@ -58,13 +58,7 @@ class PServerController {
5858
void join();
5959

6060
private:
61-
std::vector<std::shared_ptr<ParameterServer2>> pservers_;
62-
63-
/**
64-
* @brief create ParameterServerConfig from gflags, this is used for
65-
* compatibility with the old usage of configuration by gflags.
66-
*/
67-
static ParameterServerConfig* initConfigByGflags();
61+
std::vector<std::unique_ptr<ParameterServer2>> pservers_;
6862
};
6963

7064
} // namespace paddle

0 commit comments

Comments
 (0)