This commit is contained in:
v-guoql 2015-11-19 10:08:33 +08:00
Родитель e28d0f0210
Коммит 13d3dfae9e
1 изменённых файлов: 16 добавлений и 16 удалений

Просмотреть файл

@ -102,24 +102,24 @@ namespace multiverso
WordEmbedding_->UpdateLearningRate();
total_word_count = sum;
if (!option_->use_adagrad)
{
multiverso::Log::Info("Rank %d Alpha: %lf Progress: %.2lf%% WordCountActual: %lld Words/thread/second %lfk\n",
multiverso::Multiverso::ProcessRank(), WordEmbedding_->learning_rate,
WordEmbedding_->word_count_actual / ((double)option_->total_words * option_->epoch + 1) * 100,
WordEmbedding_->word_count_actual,
total_word_count / ((double)option_->thread_cnt * (clock() - start_) / CLOCKS_PER_SEC * 1000.0));
}
else
{
multiverso::Log::Info("Rank %d Progress: %.2lf%% WordCountActual: %lld Words/thread/second %lfk\n",
multiverso::Multiverso::ProcessRank(),
WordEmbedding_->word_count_actual / ((double)option_->total_words * option_->epoch + 1) * 100,
WordEmbedding_->word_count_actual,
total_word_count / ((double)option_->thread_cnt * (clock() - start_) / CLOCKS_PER_SEC * 1000.0));
}
if (!option_->use_adagrad)
{
multiverso::Log::Info("Rank %d Alpha: %lf Progress: %.2lf%% WordCountActual: %lld Words/thread/second %lfk\n",
multiverso::Multiverso::ProcessRank(), WordEmbedding_->learning_rate,
WordEmbedding_->word_count_actual / ((double)option_->total_words * option_->epoch + 1) * 100,
WordEmbedding_->word_count_actual,
total_word_count / ((double)option_->thread_cnt * (clock() - start_) / CLOCKS_PER_SEC * 1000.0));
}
else
{
multiverso::Log::Info("Rank %d Progress: %.2lf%% WordCountActual: %lld Words/thread/second %lfk\n",
multiverso::Multiverso::ProcessRank(),
WordEmbedding_->word_count_actual / ((double)option_->total_words * option_->epoch + 1) * 100,
WordEmbedding_->word_count_actual,
total_word_count / ((double)option_->thread_cnt * (clock() - start_) / CLOCKS_PER_SEC * 1000.0));
}
}
}
//Add the left word_count to the WordEmbedding
WordEmbedding_->word_count_actual += sum - total_word_count;