rm initConfigByGflags of PServerController, use stack value instead

avx_docs
qiaolongfei 8 years ago
parent 93e74f89c6
commit 3f6c2b3621

@ -60,18 +60,16 @@ PServerController::PServerController(const ParameterServerConfig& config) {
PServerController::~PServerController() { this->join(); } PServerController::~PServerController() { this->join(); }
ParameterServerConfig* PServerController::initConfigByGflags() {
ParameterServerConfig* config = new ParameterServerConfig();
config->set_nics(FLAGS_nics);
config->set_port(FLAGS_port);
config->set_ports_num(FLAGS_ports_num);
config->set_rdma_tcp(FLAGS_rdma_tcp);
return config;
}
PServerController* PServerController::createByGflags() { PServerController* PServerController::createByGflags() {
auto& pServerConfig = *paddle::PServerController::initConfigByGflags(); ParameterServerConfig config;
return create(pServerConfig);
config.set_nics(FLAGS_nics);
config.set_rdma_tcp(FLAGS_rdma_tcp);
config.set_port(FLAGS_port);
config.set_ports_num(FLAGS_ports_num);
config.set_ports_num_for_sparse(FLAGS_ports_num_for_sparse);
return create(config);
} }
PServerController* PServerController::create( PServerController* PServerController::create(

@ -21,7 +21,7 @@ limitations under the License. */
namespace paddle { namespace paddle {
class PServerController { class PServerController final {
public: public:
DISABLE_COPY(PServerController); DISABLE_COPY(PServerController);
@ -58,13 +58,7 @@ public:
void join(); void join();
private: private:
std::vector<std::shared_ptr<ParameterServer2>> pservers_; std::vector<std::unique_ptr<ParameterServer2>> pservers_;
/**
* @brief create ParameterServerConfig from gflags, this is used for
* compatibility with the old usage of configuration by gflags.
*/
static ParameterServerConfig* initConfigByGflags();
}; };
} // namespace paddle } // namespace paddle

Loading…
Cancel
Save