Merge remote-tracking branch 'origin/linux-gcc' into sls

This commit is contained in:
Scott Cyphers 2015-08-10 14:19:06 -04:00
Родитель 95a5b6e39f a7dbb5815f
Коммит 59fc6a2b2b
1 изменённых файлов: 2 добавлений и 8 удалений

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

@ -1161,11 +1161,8 @@ namespace Microsoft { namespace MSR { namespace CNTK {
// Sets the utterance boundary.
if (m_framemode == false)
{
// If <m_truncated> is false, then the whole utterance
// will be loaded into the minibatch.
if (m_truncated == false)
if (startFrame == 0)
{
assert(startFrame == 0);
m_sentenceBegin.SetValue(i, 0, (ElemType)SEQUENCE_START);
m_minibatchPackingFlag[0] |= MinibatchPackingFlag::SequenceStart;
}
@ -1227,11 +1224,8 @@ namespace Microsoft { namespace MSR { namespace CNTK {
// minibatch, and then load it.
if (m_framemode == false)
{
// If <m_truncated> is false, then the whole utterance
// will be loaded into the minibatch.
if (m_truncated == false)
if (startFrame == 0)
{
assert(startFrame == 0);
m_sentenceBegin.SetValue(i, 0, (ElemType)SEQUENCE_START);
m_minibatchPackingFlag[0] |= MinibatchPackingFlag::SequenceStart;
}