Граф коммитов

320 Коммитов

Автор SHA1 Сообщение Дата
Amit Agarwal 2abaa83c8b Fixed a bug in an assertion in the HTKMLFReader pertaining checking for distributed minibatch reading support 2015-09-11 00:03:12 -07:00
Frank Seide e2d567548c Matrix.h now no longer pulls in the CPU/GPUMatrix headers (this required cleaning up a few incorrect header dependencies as well);
cleaned up <class ElemType> vs. <typename ElemType> (using class since that was used more often, causing less diffs)
2015-09-06 17:17:07 +02:00
Frank Seide 4da56dcce2 another fix related to the previous one 2015-09-03 15:21:26 -07:00
Frank Seide e4259d17d7 fixed wrong type of Matrix<float> in SetSentenceSegBatch();
fixed a missing percentage in testcases.yml
2015-09-03 15:18:17 -07:00
Frank Seide 785429e854 Merge branch 'master' into fseide/bs
Conflicts:
	Math/Math/NoGPU.cpp
2015-09-03 13:50:03 -07:00
Marko Radmilac 596d3287f9 Cleanup warnings in Linux 2015-09-03 09:24:03 -07:00
Frank Seide bf86f4b897 Merge branch 'fseide/framerange' into fseide/bs
Conflicts:
	MachineLearning/CNTK/ComputationNode.h
	Tests/Speech/LSTM/cntk.config
2015-09-02 14:35:41 -07:00
Frank Seide 9704573aca bug fix in FrameRange::IsAllFrames(), got the logic inverted;
README.txt updated to match updated LSTM test case
2015-09-02 14:21:55 -07:00
Amit Agarwal 21f386b89b Fixed a bug in utterance mode reading in HTKMLFReader that existed in the Linux fork and was propagted to the common reader with the merge of the readers 2015-09-02 11:19:44 -07:00
Frank Seide 795972137a Merge remote-tracking branch 'origin' into fseide/bs
Conflicts:
	DataReader/HTKMLFReader/ssematrix.h
	Math/Math/CUDAPageLockedMemAllocator.cpp
	Math/Math/Matrix.cpp
	Math/Math/NoGPU.cpp
	Math/Math/ValueQuantizer.h
2015-09-02 10:12:15 -07:00
Amit 4f6ae820e7 Enable unigram support on Linux 2015-09-01 23:11:13 -07:00
Amit Agarwal 779b810a55 Replace uses of the VC++ non-standard std::hash_map with C++ standard std::unordered_map type in the HTKMLFReader 2015-09-01 22:07:15 -07:00
Amit Agarwal af383e6c0e 1) Switch to using std::mutex for mutual exclusion instead of platform specific facilities 2) A minor bug fix in the linux reader 2015-09-01 18:23:17 -07:00
Amit Agarwal 7b3106e2f3 Fixed a bug introduced during merging of the Linux and Windows readers 2015-09-01 16:01:05 -07:00
Frank Seide f1b85c02b8 defined __declspec_noreturn for __declspec(noreturn) (empty on Linux);
Basics.h now includes Plattform.h for __declspec_noreturn
2015-09-01 14:04:03 -07:00
Amit Agarwal 385fc0bb0a Merge the linux and windows forks of the HTKMLFReader fork into one. 2015-09-01 13:09:57 -07:00
Frank Seide ff32f6a061 Merge branch 'master' of https://git.codeplex.com/cntk into fseide/refactor_nodes
Conflicts:
	MachineLearning/CNTK/CNTK.vcxproj.filters
	MachineLearning/CNTK/ComputationNetwork.h
2015-08-28 14:15:32 -07:00
Amit Agarwal 9b6f3fbe6a Added the new RequireSegBatch function to the Linux fork of the HTKMLFReader too 2015-08-26 13:08:51 -07:00
erw 061e09af20 On top of the most recent 1-bit codebase, implement the model averaging;
remove all the #ifdef MPI_SUPPORT
2015-08-26 02:27:20 -07:00
Frank Seide d9736d90fd added missing file Platform.h to VS Project;
moved those VS-proprietary CRT function emulations that were defined in Basics.h to Platform.h where they seem to belong now;
Platform.h now triggers on _MSC_VER_ not on __UNIX__
Platform.h wtocharpath() changed to use std::string, to avoid memory leaks;
fixed a few printf strings in LUSequenceReader that were flagged by gcc;
fixed a few two-phase name lookup issues in deference to the C++ gods;
moved FrameRange out from ComputationNode to escape two-phase name lookup madness;
2015-08-25 12:02:19 -07:00
Amit Agarwal 613f4750b1 Fixed a bug inadvertently added when addressing code review feedback 2015-08-21 14:53:25 -07:00
Amit Agarwal 47becebfc7 Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/scratch_1
Conflicts:
	MachineLearning/CNTK/CNTK.cpp
	MachineLearning/CNTK/SGD.h
2015-08-21 13:46:03 -07:00
Frank Seide a0dcbd2db4 (VS 2013 insists that this file has changed, so comitting it) 2015-08-18 14:54:27 -07:00
Amit Agarwal cac9fad69c Addressed code review feedback 2015-08-17 14:48:06 -07:00
Amit Agarwal 2670a56551 Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/parallelTraining
Conflicts:
	MachineLearning/CNTK/SGD.h
	Makefile
2015-08-11 10:36:15 -07:00
Scott Cyphers 59fc6a2b2b Merge remote-tracking branch 'origin/linux-gcc' into sls 2015-08-10 14:19:06 -04:00
chenguoguo a7dbb5815f Bug fix in Kaldi2Reader: sequence start was not set for utterances shorter than the minibatch 2015-08-09 15:57:55 -04:00
Scott Cyphers 8bd3eece79 Merge remote-tracking branch 'origin/linux-gcc' into sls
Prepare for merge back to linux-gcc
2015-08-06 09:26:33 -04:00
Scott Cyphers 48ecaf6c34 Fix some format strings. 2015-08-05 18:36:26 -04:00
Amit Agarwal 7583752ccf Implementation of data-parallel SGD with 1bit quantization of gradients for reduced communication costs 2015-08-05 09:23:33 -07:00
chenguoguo 501ee3bc8e Small fix to sequence training 2015-08-04 19:45:16 -04:00
chenguoguo d2fdf84b55 Bug fix: fixing dimensionality mismatch after using MEL for sequence training model 2015-08-03 18:30:51 -04:00
Scott Cyphers 45566e273d Fix g++ compilation warnings
sprintf_s is snprintf, not sprintf
Need to use more symbols from SGD
Add externs for missing file name generators that seem to be not reachable
   and not defined.
2015-08-03 14:36:33 -04:00
chenguoguo 145e7c43ec Fixing mixing LSTM state when buffering minibatches 2015-08-01 01:11:53 +00:00
chenguoguo 27e32a8ee9 Some cosmetic change in Kaldi2Reader 2015-07-30 18:00:05 +00:00
chenguoguo de33865a3a Limit number of overflow warnings in Kaldi2Reader; Add configuration for setting overflow value 2015-07-30 17:16:32 +00:00
Hakan Erdogan 7898ab61f1 comment out unnecessary output check and print in Kaldi2Reader that causes problems with non-probability outputs 2015-07-30 04:31:33 -04:00
Dong Yu a996f300c8 Merge branch 'linux-gcc' of https://git01.codeplex.com/cntk into linux-gcc 2015-07-29 10:40:57 -07:00
Dong Yu 35589fe0ad refine PastValueNode and FutureValueNode. Fixed a bug in FutureValueNode When it's not inside a loop. 2015-07-29 10:40:45 -07:00
chenguoguo 1c5c7532f7 Bug fixing regarding m_uttDerivBuffer is NULL 2015-07-29 16:04:21 +00:00
Dong Yu 02b2f705a5 change the pastValueNode and FutureValueNode to support NO_FEATURE and NO_LABEL cases better. 2015-07-28 23:55:21 -07:00
chenguoguo 85f5777a52 Adding interface for utterance derivative computation in the Kaldi2Reader 2015-07-29 03:30:56 +00:00
chenguoguo be548dcb7c Fixing end-of-epoch issue for sequence training 2015-07-27 08:59:16 +00:00
chenguoguo 06e0b54078 Skipping utterances without lattice or alignment in sequence training 2015-07-26 22:14:24 +00:00
chenguoguo c506ece07d adding verbosity support in DataReader/Kaldi2Reader/HTKMLFWriter.cpp 2015-07-25 09:53:30 +00:00
chenguoguo bb7f808a7b Changing NO_LABEL to NO_INPUT in Kaldi2Reader 2015-07-25 00:14:48 +00:00
chenguoguo 95616b9748 updating sentence boundary mark for Kaldi2Reader, HTKMLFReader and KaldiReader 2015-07-24 23:04:31 +00:00
chenguoguo 186e508a3d Merge branch 'linux-gcc' of https://git.codeplex.com/cntk into linux-gcc 2015-07-24 16:55:29 +00:00
chenguoguo 73c6db513d Adding suppport for parallelized sequence training in Kaldi2Reader 2015-07-24 16:55:21 +00:00
Yu c98cc19cae Merge remote-tracking branch 'origin/master' into linux-gcc 2015-07-23 10:17:26 -04:00