This reverts commit 86da0495d3.
This commit is contained in:
Qiwei Ye 2016-05-20 13:30:24 +08:00
Родитель 86da0495d3
Коммит fdb82ac79f
1 изменённых файлов: 6 добавлений и 16 удалений

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

@ -1103,20 +1103,13 @@ size_t SGD<ElemType>::TrainOneEpoch(ComputationNetworkPtr net,
commTimer.Start();
// aggregation by model averaging or block momentum
if (m_traceLevel > 2)
fprintf(stderr, "\t\t --trying communicating\n");
if (useModelAggregation)
{
if (nSamplesSinceLastModelSync >= m_nFramesBetweenMASync)
{
if (m_traceLevel > 2)
fprintf(stderr, "\t\t --trying MA\n");
bool synced = m_pMASGDHelper->OnArrivingAtSyncPoint(learnableNodes, smoothedGradients, nSamplesSinceLastModelSync);
if (synced)
{
if (m_traceLevel > 2)
fprintf(stderr, "\t\t --comunicated\n");
nSamplesSinceLastModelSync = 0;
}
}
@ -1130,21 +1123,18 @@ size_t SGD<ElemType>::TrainOneEpoch(ComputationNetworkPtr net,
// using parameter server for parameter update
if (userAsyncGradientAggregation && m_mpi->NumNodesInUse() > 1)
{
if (nSamplesSinceLastModelSync >= m_nFramesBetweenASGDSync[epochNumber])
{
if (m_traceLevel > 2)
fprintf(stderr, "\t\t --trying Sim-MA\n");
m_pMultiversoHelper->PushAndPullModel(learnableNodes, nSamplesSinceLastModelSync);
nSamplesSinceLastModelSync = 0;
if (m_traceLevel > 2)
fprintf(stderr, "\t\t --comunicated\n");
}
// Determine if any samples were processed across any of the ranks
if (useDistributedMBReading)
{
noMoreSamplesToProcess = !wasDataRead;
}
if (nSamplesSinceLastModelSync >= m_nFramesBetweenASGDSync[epochNumber])
{
m_pMultiversoHelper->PushAndPullModel(learnableNodes, nSamplesSinceLastModelSync);
nSamplesSinceLastModelSync = 0;
}
}
commTimer.Stop();