This commit is contained in:
Frank Seide 2016-07-22 08:53:31 -07:00
Родитель 07a6fa25f9
Коммит 27ff6f7177
2 изменённых файлов: 5 добавлений и 5 удалений

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

@ -751,7 +751,7 @@ public:
while (!result.second/*if already there*/ && result.first->second != node) while (!result.second/*if already there*/ && result.first->second != node)
{ {
if (!makeUniqueName || node->NodeName().find_first_of(L".[]") == wstring::npos) if (!makeUniqueName || node->NodeName().find_first_of(L".[]") == wstring::npos)
RuntimeError("AddNodeToNetIfNotYet: Duplicated name for %ls %ls operation (%d vs. %sd).", node->NodeName().c_str(), node->OperationName().c_str(), (int)node->m_uniqueNumericId, (int)result.first->second->m_uniqueNumericId); RuntimeError("AddNodeToNetIfNotYet: Duplicated name for %ls %ls operation (%d vs. %d).", node->NodeName().c_str(), node->OperationName().c_str(), (int)node->m_uniqueNumericId, (int)result.first->second->m_uniqueNumericId);
node->SetName(L"_" + node->NodeName()); node->SetName(L"_" + node->NodeName());
result = m_nameToNodeMap.insert(make_pair(node->NodeName(), node)); result = m_nameToNodeMap.insert(make_pair(node->NodeName(), node));
} }

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

@ -3128,8 +3128,8 @@ void GPUMatrix<ElemType>::BatchNormalizationForward(const GPUMatrix<ElemType>& s
// If expAvgFactor == 0 && blendFactor == 1 then we don't need to compute current minibatch statistics. // If expAvgFactor == 0 && blendFactor == 1 then we don't need to compute current minibatch statistics.
if (expAvgFactor > 0 || blendFactor < 1) if (expAvgFactor > 0 || blendFactor < 1)
{ {
saveMean->RequireSize(runMean); saveMean.RequireSize(runMean);
saveInvStdDev->RequireSize(runMean); saveInvStdDev.RequireSize(runMean);
if (spatial) if (spatial)
{ {
Call<ComputeSpatialBatchMeanAndInvStdDev, ElemType>(spatialSize, vectorSize, spatialSize, batchSize, Data(), Call<ComputeSpatialBatchMeanAndInvStdDev, ElemType>(spatialSize, vectorSize, spatialSize, batchSize, Data(),
@ -3145,8 +3145,8 @@ void GPUMatrix<ElemType>::BatchNormalizationForward(const GPUMatrix<ElemType>& s
} }
else // not computing new statistics else // not computing new statistics
{ {
saveMean->RequireSize(0, 0); saveMean.RequireSize(0, 0);
saveInvStdDev->RequireSize(0, 0); saveInvStdDev.RequireSize(0, 0);
} }
// --- apply MAP estimates of mean/stddev (interpolation of data and running mean/stddev) to data // --- apply MAP estimates of mean/stddev (interpolation of data and running mean/stddev) to data