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

28 Коммитов

Автор SHA1 Сообщение Дата
Frank Seide 973c9dad4d coup de grâce: got rid of that abomination (of mine) called basetypes.h! The few pages of code that are actually used from it has been moved to Basics.h, Platform.h, and fileutil.h. --Yay
...well, it was removed from mainline CNTK code. My old DBN.exe reader code inside still needs it, so it has just been moved under the rug (HTKMLFReader project). Unused code was deleted from the basetypes.h under the rug;
DataReader.h no longer includes lattice-related header files (keeping MS-propietary stuff out from inclusion in mainline CNTK code);
fileutil.h is no longer included by mainline CNTK code. Instead #include "File.h". Some day we will merge the two;
removed a 'using namespace std;' from fileutil.h, and dealt with the fallout
2015-11-25 12:28:28 -08:00
Frank Seide ad46292088 got LMSequenceReader and CNTKEval to build with config template 2015-11-24 12:47:53 -08:00
Amit Agarwal 7fb0b8e166 Fixed a ProcessExit crash due to an unused global STL container instance 2015-09-25 22:36:05 -07:00
Amit Agarwal 7277e1f9ab Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/sequenceTraining
Conflicts:
	Common/Include/DataReader.h
	DataReader/HTKMLFReader/HTKMLFReader.cpp
	MachineLearning/CNTKSGDLib/SGD.cpp
2015-09-25 18:19:48 -07:00
Frank Seide 55c57afcee cleaned up MBLayout:
now separates the question of the MB being sequential or not from the matrix memory allocation. There are now explicit variables for time steps, parallel sequences, and whether it is sequential. Meanwhile, memory allocation of the matrix/vector happen lazily once the first non-zero bit is set;
when an MBLayout is created or reset with Init(), the caller must say whether the minibatch is sequential (requires sentence handling) or not (specifically HTKMLFReader, as it supports both kinds);
MBLayout::GetSize() is gone (it was redundant)
2015-09-25 16:24:02 -07:00
Frank Seide 6878fa4b74 fixed a few small refactorings in EvalReader.h that I had missed 2015-09-25 14:55:23 -07:00
RuiZhao b9699faa5a SE_merge_09232015 2015-09-24 14:28:33 -07:00
RuiZhao 1424fa4cee SE_v1 2015-09-23 20:14:20 -07:00
Frank Seide af316bffb8 changed { SetActualNbrSlicesInEachRecurentIteration(); CopyMBLayoutTo(); } to { CopyMBLayoutTo(); VerifyActualNumParallelSequences(); } and removed m_actualNbrSlicesInEachRecurentIteration;
renamed ...NbrSlicesEachRecurrentIter to ...NumParallelSequences;
also MBLayout::GetNumStreams() to GetNumTimeSteps() and GetNumFrames() to GetNumTimeSteps()
2015-09-18 17:35:07 -07:00
Frank Seide 8bf8577b81 made MBLayout::m_minibatchPackingFlags and m_sentenceBoundaryFlags private, instead adding methods for accessing and setting, including Is(), Set(), and a few needed for inconsistent behavior that is probably not necessary and we should clean up 2015-09-18 01:06:21 -07:00
Frank Seide 191294d822 m_sentenceBegin and m_minibatchPackingFlags removed from HTKMLFReader, replaced by a MBLayoutPtr;
new method MBLayout::Resize()
2015-09-17 22:59:30 -07:00
Frank Seide 60937f2968 got rid of SEQUENCE_xxx macros, code is now much more symmetrical between boundary and packing flags (by find-replace, eventually this matrix will no longer be float) 2015-09-16 13:51:09 -07:00
Frank Seide d114c8bb38 DataReader::SetSentenceSegBatch() renamed to CopyMBLayoutTo(), and it takes a MBLayoutPtr now (towards more flexible timing and layout 2015-09-16 13:24:54 -07:00
Frank Seide b0f036f0d9 renamed MinibatchPackingFlag to MinibatchPackingFlags;
also m_SentenceBoundary to m_sentenceBoundaryFlags
2015-09-16 10:09:37 -07:00
Frank Seide 3e86195524 fixed wrong type of Matrix<float> in SetSentenceSegBatch();
fixed a missing percentage in testcases.yml
2015-09-03 15:18:17 -07:00
Dong Yu d1e14783b6 changed feature packing flag names from utteranceXYZ and sentence_XYZ to SequenceXYZ to make them consistent and be understood for both speech and text people.
Added flag to indicate the condition of no feature (with assumption that there is also no label)  to support efficient bi-directional model training.
Updated the windows version of HTKMLFReader, LM and LU Sequence readers.
Caution: this change will not allow for using past and future label information in the recurrent networks. The ultimate solution is to have a flag for each feature read-in. However, this will require huge change and we will do this after reader refactorization to reduce effort.
2015-07-18 17:28:14 -07:00
chenguoguo bbf49009d1 Merge branch 'master' to 'linux-gcc' 2015-07-17 23:42:22 +00:00
Vladimir Ivanov 2c6c940a8f Build braek fix 2015-07-08 15:49:16 -07:00
Yu f96ac201a6 Fix non-sequence reader. 2015-07-08 16:52:44 -04:00
Yu Zhang 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
erw d68a3de795 Fix a minor bug in EvalReader and EvalWriter.
This bug will be exposed when sentence length > 1024 frames. In that case,
     after 1024 frames, the EvalReader only fetches values in the first 1024
     frames, and the writer will not write to the values after 1024 frames.
2015-06-29 14:09:27 -07:00
kaisheny 14ce7f4f2f Use -1,0,1 to denote no observation, sentence begining and in-the-middle-of-sentence. changed LU sequence reader. But other readers haven't changed accordingly. 2015-04-08 21:20:12 -07:00
Dong Yu b46302c10f replace all tabs to four spaces in all files in the solution. 2014-11-06 19:24:05 -08:00
Frank Seide 8feb23fc79 defined fake memcpy_s() in basetypes.h for GCC;
fixed last bits in CNTKEval.cpp, also compiles now
2014-11-04 20:07:35 -08:00
Frank Seide 16f18fc290 changed XXX::iterator to auto where possible, as some had caused a build problem with GCC 2014-11-04 13:47:58 -08:00
Frank Seide b678e92596 msra_mgram.h no longer uses MESSAGE(_NOLF) macros from message.h;
unified Error() and ERROR() functions to RuntimeError() defined in basetypes.h, and eliminated message.h altogether (it was only used for ERROR);
new method LogicError()--note: some RuntimeError() calls really should be LogicError()s, need to fix as we notice them
2014-10-30 10:33:51 -07:00
Dong Yu 1ce36033a6 clear warnings 2014-10-14 22:39:19 -07:00
unknown 6169450955 First Release of CNTK 2014-08-29 16:21:42 -07:00