2734d6fc8b
minor changes based on code review
2015-07-19 23:42:09 -07:00
24614d87cf
Merge branch 'mseltzer/uttreaderfix' of https://git01.codeplex.com/cntk
2015-07-18 23:37:06 -07:00
bbf49009d1
Merge branch 'master' to 'linux-gcc'
2015-07-17 23:42:22 +00:00
d54e2d30fe
Adding multi-utterance support in Kalsi2Reader for Truncated == false
2015-07-17 21:25:10 +00:00
3a086b76a5
fix problems in reader when files have duration mismatch
2015-07-17 10:39:50 -07:00
9bed89797a
Fix boundary setting when frameMode=true (For HTKMLFReader_linux); also format the code.
2015-07-16 19:03:42 -04:00
0e65b1f9fd
Fix the boundary setting when framemode = true in HTKMLFReader.
2015-07-16 15:44:05 -07:00
6a1976895d
Minor reader changes.
2015-07-17 02:48:42 +10:00
06f3e2de7b
Merge branch 'master' of https://git01.codeplex.com/cntk into bmitra/Changes
2015-07-16 08:42:39 +10:00
58855e8fd9
Add returnDense flag.
2015-07-16 08:37:23 +10:00
e298bdd00d
fix linux build error and warnings
2015-07-15 12:47:08 -07:00
cf4dc2aeb3
Fix linux break for lm sequence reader
2015-07-15 11:48:07 -07:00
2b066a674b
Use CPUDevice for labels in LMSequenceReader
2015-07-15 10:32:31 -07:00
10955a059a
Merge with master branch
2015-07-15 09:07:40 -07:00
abc106dd2f
Merge branch 'master' into linux-gcc
2015-07-14 21:52:08 +00:00
8515a8d2f9
Merge branch 'master' of https://git.codeplex.com/cntk
2015-07-13 22:10:34 -04:00
fda6fb62ce
Fix multi-io bug for Kaldi2Reader.
2015-07-13 22:09:43 -04:00
016f112b21
Bugfix for linux reader: 'no labels for xxx.mfc'
2015-07-13 15:03:48 -07:00
8edd6a95ed
Merge branch 'master' of https://git01.codeplex.com/cntk
2015-07-13 11:15:11 -07:00
c8dd3f4161
use pointer to refer to networks and nodes.
2015-07-13 09:33:54 -07:00
c944e0da24
Fix bug when m_truncated=false.
2015-07-13 05:49:16 -04:00
d75b3392ca
Fix build and fix assertion error when we do multi-io training.
2015-07-12 01:17:31 -04:00
63c3e4603b
LUSequenceReader to allow multiple ios for a single sentence ending info, as the sentence ending info is shared accorss these ios within a reader.
2015-07-11 15:45:40 -07:00
6ae4115b4d
Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc
...
Conflicts:
MachineLearning/CNTK/ComputationNetwork.h
MachineLearning/CNTK/NetworkDescriptionLanguage.cpp
MachineLearning/CNTK/SynchronousExecutionEngine.h
2015-07-11 14:58:18 -07:00
94e54dac66
fixing sentence boundary issues for sequence training
2015-07-11 08:26:15 +00:00
f23bf77394
Merge with the master branch on July 9
2015-07-09 14:00:34 -07:00
94ba0c5594
Merge with master branch on July 9 2015
2015-07-09 10:26:38 -07:00
d25e2127fb
work in progress for bdatt
2015-07-09 08:24:22 -07:00
02b36c822d
First implementation of NDRMReader.
2015-07-09 23:26:00 +10:00
9be47d5562
Fix potential issue in SequenceReader
2015-07-09 02:12:08 -07:00
2c6c940a8f
Build braek fix
2015-07-08 15:49:16 -07:00
f96ac201a6
Fix non-sequence reader.
2015-07-08 16:52:44 -04:00
631857bb94
Fixing feature and labels names in Kaldi2Reader; also adding some explanation in README of how to compile CNTK with Kaldi
2015-07-08 01:56:50 +00:00
776c20b20a
Merge remote-tracking branch 'origin/master' into linux-gcc
...
Conflicts:
Common/Include/DataReader.h
Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Chapter.lyx
MachineLearning/CNTK/TrainingCriterionNodes.h
Math/Math/Matrix.cpp
2015-07-07 17:00:17 -07:00
e37ddb8787
Fix Windows builds.
2015-07-07 16:33:14 -07:00
ba1a969e8e
Fix multi-IO.
2015-07-07 16:11:23 -04:00
204b879dfe
Finish GPU NCE training
2015-07-06 20:56:16 -07:00
471f710f49
Add sentence end information to the reader.
2015-07-06 04:04:26 -04:00
f9245c2acc
Merge remote-tracking branch 'origin/dongyu/dev' into linux-gcc
...
Conflicts:
DataReader/HTKMLFReader/HTKMLFReader.cpp
DataReader/HTKMLFReader_linux/HTKMLFReader.cpp
DataReader/KaldiReader/HTKMLFReader.cpp
MachineLearning/CNTK/ComputationNetwork.h
MachineLearning/CNTK/TrainingCriterionNodes.h
Makefile_kaldi2.gpu
2015-07-05 22:53:04 -07:00
f0ceb4b395
Merge with master branch.
2015-07-05 22:19:18 -07:00
b86990e638
Merge remote-tracking branch 'origin/master' into dongyu/dev
...
Conflicts:
CNTK.sln
Common/Include/Basics.h
DataReader/HTKMLFReader/HTKMLFReader.cpp
DataReader/HTKMLFReader_linux/HTKMLFReader.cpp
DataReader/KaldiReader/HTKMLFReader.cpp
Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Adv_Chapter.lyx
MachineLearning/CNTK/ComputationNetwork.h
MachineLearning/CNTK/LinearAlgebraNodes.h
MachineLearning/CNTK/NetworkDescriptionLanguage.cpp
MachineLearning/CNTK/NonlinearityNodes.h
MachineLearning/CNTK/SynchronousExecutionEngine.h
MachineLearning/CNTK/TrainingCriterionNodes.h
Makefile_kaldi2.gpu
2015-07-05 22:16:57 -07:00
c2b8eceb4e
change definition of SENTENCE_BEGIN etc.
...
Add operator |= to MinibatchPackingFlag
Add support of UtteranceEnd in MinibatchPackingFlag to support bi-directional model in later
2015-07-05 16:57:34 -07:00
c8dce533b8
Added LMSequenceWriter. Support getsentenceendIdfromoutputlabel in LMSequenceReader.
2015-07-02 09:27:01 -07:00
90be0b8d90
Update NCE GPU Code, forward phase is ready
2015-07-02 05:44:19 -07:00
df1d881b1d
Fix linux build (use popen in linux instead of _wpopen).
2015-07-02 04:21:36 -04:00
04c81b434d
Merge remote-tracking branch 'origin/master' into linux-gcc
...
Conflicts:
CNTK.sln
Common/Include/Basics.h
DataReader/HTKMLFReader/HTKMLFReader.cpp
DataReader/HTKMLFReader_linux/HTKMLFReader.cpp
DataReader/KaldiReader/HTKMLFReader.cpp
MachineLearning/CNTK/ComputationNetwork.h
MachineLearning/CNTK/NetworkDescriptionLanguage.cpp
MachineLearning/CNTK/NonlinearityNodes.h
MachineLearning/CNTK/SynchronousExecutionEngine.h
2015-07-01 23:35:59 -07:00
9db9bb2604
Feed several frame into the minibatch if there is no new utterance. not the best way, just make it consistent with other readers.
2015-07-02 00:46:14 -04:00
3aab1d267f
File now supports pipes ("cmd|", "|cmd") and "-" (stdin/stdout) for input and output;
...
stderr redirection now uses File class instead of auto_file_ptr, allowing e.g. stderr="|tee path.log";
new method File::Flush();
class File implementation now uses RuntimeError() and LogicError() instead of throw std::runtime_error() and logic_error();
moved RuntimeError() and class Plugin from basetypes.h to Basics.h;
new VS++ CRT emulation function _wpopen() (Linux only_
2015-07-01 16:17:29 -07:00
e613a79915
Fix Kaldi2Reader for LSTM -- the previous commit fails after couple of epoch due to a bug
2015-07-01 21:13:22 +00:00
f5ce4c8315
Windows->Linux: finalizing reconciliation of Linux vs. Windows version of HTKMLFReader
2015-07-01 14:02:14 -07:00
Mike Seltzer
chenguoguo
Yu
Yu Zhang
UnderdogGeek
kaisheny
Vladimir Ivanov
Dong Yu
Yinggong ZHAO
Frank Seide