Fix the boundary setting when framemode = true in HTKMLFReader.

lixiaosi33 · Jul 16, 2015 · 0e65b1f · 0e65b1f
1 parent e639279
commit 0e65b1f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/DataReader/HTKMLFReader/HTKMLFReader.cpp b/DataReader/HTKMLFReader/HTKMLFReader.cpp
@@ -111,7 +111,6 @@ namespace Microsoft { namespace MSR { namespace CNTK {
             size_t iFeat, iLabel;
             iFeat = iLabel = 0;
             vector<wstring> statelistpaths;
-            bool framemode = true;
             vector<size_t> numContextLeft;
             vector<size_t> numContextRight;
 
@@ -253,14 +252,7 @@ namespace Microsoft { namespace MSR { namespace CNTK {
                 }
             }
 
-            if (readerConfig.Exists("frameMode"))
-            {
-                const std::string& framemodeString = readerConfig("frameMode");
-                if (framemodeString == "false")
-                {
-                    framemode = false;
-                }
-            }
+			m_framemode = readerConfig("frameMode", "true");
 
             int verbosity = readerConfig("verbosity","2");
 
@@ -383,9 +375,9 @@ namespace Microsoft { namespace MSR { namespace CNTK {
                 m_lattices = new msra::dbn::latticesource(latticetocs, modelsymmap);
 
                 // now get the frame source. This has better randomization and doesn't create temp files
-                m_frameSource = new msra::dbn::minibatchutterancesourcemulti(infilesmulti, labelsmulti, m_featDims, m_labelDims, numContextLeft, numContextRight, randomize, *m_lattices, m_latticeMap, framemode);
+                m_frameSource = new msra::dbn::minibatchutterancesourcemulti(infilesmulti, labelsmulti, m_featDims, m_labelDims, numContextLeft, numContextRight, randomize, *m_lattices, m_latticeMap, m_framemode);
                 m_frameSource->setverbosity(verbosity);
-                //m_frameSource = new msra::dbn::minibatchutterancesource(infilesmulti[0], labelsmulti[0], m_featDims[0], m_labelDims[0], numContextLeft[0], numContextRight[0], randomize, *m_lattices, m_latticeMap, framemode);
+                //m_frameSource = new msra::dbn::minibatchutterancesource(infilesmulti[0], labelsmulti[0], m_featDims[0], m_labelDims[0], numContextLeft[0], numContextRight[0], randomize, *m_lattices, m_latticeMap, m_framemode);
 
             }
             else if (!_stricmp(readMethod.c_str(),"rollingWindow"))
@@ -1590,8 +1582,11 @@ namespace Microsoft { namespace MSR { namespace CNTK {
     template<class ElemType>
     void HTKMLFReader<ElemType>::SetSentenceSegBatch(Matrix<ElemType> &sentenceBegin, vector<MinibatchPackingFlag>& minibatchPackingFlag)
     {
-        sentenceBegin.SetValue(m_sentenceBegin);
-        minibatchPackingFlag = m_minibatchPackingFlag;
+		if (!m_framemode)
+		{
+			sentenceBegin.SetValue(m_sentenceBegin);
+			minibatchPackingFlag = m_minibatchPackingFlag;
+        }
     }
 
 

diff --git a/DataReader/HTKMLFReader/HTKMLFReader.h b/DataReader/HTKMLFReader/HTKMLFReader.h
@@ -28,6 +28,7 @@ class HTKMLFReader : public IDataReader<ElemType>
     vector<bool> m_sentenceEnd;
     bool m_readAhead;
     bool m_truncated;
+	bool m_framemode;
     vector<size_t> m_processedFrame;
     intargvector m_numberOfuttsPerMinibatchForAllEpochs;
     size_t m_numberOfuttsPerMinibatch;