提交 33ee5cad 编写于 作者: D dongdaxiang

format code style of executor_thread_worker.cc

上级 06930531
...@@ -417,18 +417,20 @@ void AsyncExecutorThreadWorker::PrepareParams() { ...@@ -417,18 +417,20 @@ void AsyncExecutorThreadWorker::PrepareParams() {
} }
void AsyncExecutorThreadWorker::UpdateParams() { void AsyncExecutorThreadWorker::UpdateParams() {
for (auto i: _param_config->sparse_table_id) {//TODO for (auto i : _param_config->sparse_table_id) {
//for (int i = 0; i < 1; ++i) {
PushSparse(i); PushSparse(i);
} }
//for (auto i = 0u; i < GlobalConfig::instance().dense_table_id.size(); ++i) {//TODO for (auto i : _param_config->dense_table_id) {
for (auto i: _param_config->dense_table_id) {
PushDense(i); PushDense(i);
} }
int32_t tmp_push_dense_wait_times = -1;//_param_config->tmp_push_dense_wait_times; //TODO // _param_config->tmp_push_dense_wait_times
int32_t tmp_push_sparse_wait_times = -1;//_param_config->tmp_push_sparse_wait_times; //TODO int32_t tmp_push_dense_wait_times = -1;
static uint32_t push_dense_wait_times = static_cast<uint32_t>(tmp_push_dense_wait_times); // _param_config->tmp_push_sparse_wait_times
static uint32_t push_sparse_wait_times = static_cast<uint32_t>(tmp_push_sparse_wait_times); int32_t tmp_push_sparse_wait_times = -1;
static uint32_t push_dense_wait_times =
static_cast<uint32_t>(tmp_push_dense_wait_times);
static uint32_t push_sparse_wait_times =
static_cast<uint32_t>(tmp_push_sparse_wait_times);
if (_push_dense_status.size() >= push_dense_wait_times) { if (_push_dense_status.size() >= push_dense_wait_times) {
for (auto& t : _push_dense_status) { for (auto& t : _push_dense_status) {
...@@ -448,17 +450,13 @@ void AsyncExecutorThreadWorker::UpdateParams() { ...@@ -448,17 +450,13 @@ void AsyncExecutorThreadWorker::UpdateParams() {
if (tmp_push_sparse_wait_times == -1) { if (tmp_push_sparse_wait_times == -1) {
_push_sparse_status.resize(0); _push_sparse_status.resize(0);
} }
//for (auto dense_table_id : GlobalConfig::instance().dense_table_id) {//TODO for (auto dense_table_id : _param_config->dense_table_id) {
for (auto dense_table_id: _param_config->dense_table_id) {
_pull_dense_thread->increase_thread_version(thread_id_, dense_table_id); _pull_dense_thread->increase_thread_version(thread_id_, dense_table_id);
} }
//}
} }
void AsyncExecutorThreadWorker::PushDense(int table_id) { void AsyncExecutorThreadWorker::PushDense(int table_id) {
std::vector<paddle::ps::Region> regions; std::vector<paddle::ps::Region> regions;
//auto& variables = GlobalConfig::instance().dense_gradient_variable_name[table_id];
//std::vector<std::string> variables;
for (auto& t : _param_config->dense_gradient_variable_name[table_id]) { for (auto& t : _param_config->dense_gradient_variable_name[table_id]) {
Variable* var = thread_scope_->FindVar(t); Variable* var = thread_scope_->FindVar(t);
CHECK(var != nullptr) << "var[" << t << "] not found"; CHECK(var != nullptr) << "var[" << t << "] not found";
...@@ -469,7 +467,8 @@ void AsyncExecutorThreadWorker::PushDense(int table_id) { ...@@ -469,7 +467,8 @@ void AsyncExecutorThreadWorker::PushDense(int table_id) {
regions.emplace_back(std::move(reg)); regions.emplace_back(std::move(reg));
} }
auto status = _pslib_ptr->_worker_ptr->push_dense(regions.data(), regions.size(), table_id); auto status = _pslib_ptr->_worker_ptr->push_dense(
regions.data(), regions.size(), table_id);
_push_dense_status.push_back(std::move(status)); _push_dense_status.push_back(std::move(status));
} }
...@@ -478,7 +477,7 @@ void AsyncExecutorThreadWorker::PullSparse(int table_id) { ...@@ -478,7 +477,7 @@ void AsyncExecutorThreadWorker::PullSparse(int table_id) {
auto& features = _features[table_id]; auto& features = _features[table_id];
auto& feature_value = _feature_value[table_id]; auto& feature_value = _feature_value[table_id];
auto fea_dim = _param_config->fea_dim; //TODO auto fea_dim = _param_config->fea_dim;
// slot id starts from 1 // slot id starts from 1
features.clear(); features.clear();
features.resize(0); features.resize(0);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册