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

36 Коммитов

Автор SHA1 Сообщение Дата
Frank Seide cb668a9378 moved all tensor ops to a new header TensorOps.h so they can be shared between matrix types;
also moved the float/double-unified math overloads (e.g. exp_()) there, as well as additional typically needed functions such as Sigmoid()
2015-12-18 08:54:19 -08:00
Dong Yu f5fdaad819 replace outdated ICASSP tutorial with more recent NIPS tutorial. 2015-12-15 10:34:10 -08:00
Frank Seide 7d85487897 changed how the network is prepared for computation. The goal is to move away from lazy creation of the various evaluation structures:
new method ComputationNetwork::CompileNetwork() which precomputes everything, and is called after a network was created or loaded (or modified in case of old MEL);
renamed UpdateEvalTimeStamp() to BumpEvalTimeStamp() and ResetEvalTimeStamp() to ResetEvalTimeStamps();
removed lots of ResetEvalTimeStamps() calls from SimpleNetworkBuilder functions, since there is now a global CompileNetwork() call at the end for all network types, which does this;
renamed ClearNet() to ClearNetwork();
Load() and LoadPersistableParameters(), which were 80% identical, now share a common sub-function;
renamed m_recurrentInfo to m_allSEQNodes;
renamed GetOuterLoopNode() to FormNestedNetwork();
bug fix in ErrorPredictionNode: lacked an UpdateFunctionMBSize() overload. This was a reason why we had to allocate matrices early on
2015-12-07 15:09:29 -08:00
Frank Seide 1af0326225 further renaming:
GradientValues -> Gradient;
Output -> Value (Input(i)->Output didn't look good);
2015-12-05 14:14:44 -08:00
Frank Seide ec4df193d2 renamed commandArgUtil.h to Config.h and ConfigFile.cpp to Config.cpp;
bug fix in previous refactoring of sub-minibatching
2015-12-04 22:31:47 -08:00
Frank Seide 1826cb6e68 Merge branch 'master' of https://git.codeplex.com/cntk into fseide/reshaping 2015-12-04 18:39:04 -08:00
Dong Yu 802b2194b5 change CNTK book author list to include additional contributors and sort in alphabetical order.
Change SLU/lstmNDl.txt to use outputs as the output node to be consistent with simple network builder.

Modify README and rename old README to KaldiReaderReadme
2015-12-04 17:54:44 -08:00
Frank Seide cea5819eee renamed GetChildren() to GetInputs(); NumChildren() to GetNumInputs(); m_functionValues to m_output; FunctionValues() to Output() 2015-12-04 16:54:06 -08:00
Frank Seide 011ab6c4b3 renamed ComputationNode::Inputs() to Input() 2015-12-04 16:25:56 -08:00
Frank Seide ff07b49850 renamed several methods/names to more familiar or concise names:
EvaluateThisNode() -> ForwardProp();
ComputeInputPartial() -> BackpropTo();
SaveToFile() -> Save() (where else to save? In the bank?);
LoadFromFile() -> Load();
ImageLayout -> TensorShape;
m_imageLayout -> m_sampleLayout
2015-12-04 16:08:30 -08:00
Dong Yu 63c16f3f3a replace CriteriaNodes to CriterionNodes in NDL parser, model persistence, samples, and book, while keeping it compatible with old NDL and model files. 2015-12-03 14:16:04 -08:00
Dong Yu 819e4b5704 change CNTK book to make examples and descriptions more consistent with Brain Script. 2015-11-30 17:19:40 -08:00
Frank Seide e64aea8b6a renamed ComputationNode::m_children to m_inputs 2015-11-27 23:08:12 -08:00
Frank Seide 2e98fc766e updated 'tag=' expressions in tests (and also sample and book) to be spelled with double quotation marks (e.g. tag="output");
renamed tag="Criteria" to tag="criterion" everywhere
2015-11-27 22:00:53 -08:00
Frank Seide 27323d3512 fixed a typo in SimpleMultiGPU.config 2015-11-27 00:40:32 -08:00
Frank Seide 7af60d252d values of optional args in NDL and MEL can now be in quotes, which is recommended for future BrainScript compatibility for all strings;
updated all sample config/NDL/MEL for Jenkins tests
2015-11-26 23:52:04 -08:00
Dong Yu 6ae4445ace update CNTK book. 2015-08-10 14:59:42 -07:00
Dong Yu 4af6618649 update CNTK book. 2015-08-05 17:43:15 -07:00
kaisheny 982dc6ded2 Updated CNTKbook with encoder/decoder framework (first draft) 2015-07-16 00:03:44 -07:00
Amit Agarwal b5e52bdfd2 Added momentumPerSample config option to specify per sample momentum value
that allows using a fixed momentum setting per sample which automatically
scales as the minibatch size changes.
2015-07-10 22:31:27 -07:00
Yu Zhang 56b9100826 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
Chris Basoglu 1e042b43ed Add dynamic minibatch sizing. 2015-07-06 14:05:17 -07:00
Yu Zhang f7f902107f Merge remote-tracking branch 'origin/master' into linux-gcc
Conflicts:
	Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Adv_Chapter.lyx
	MachineLearning/CNTK/ComputationNetwork.h
	MachineLearning/CNTK/LinearAlgebraNodes.h
	MachineLearning/CNTK/NetworkDescriptionLanguage.cpp
	Makefile_kaldi2.cpu
	Makefile_kaldi2.gpu
2015-07-05 22:28:21 -07:00
Dong Yu 2834f980a0 add TransposeTimes to CNTK book. 2015-07-02 16:00:45 -07:00
Dong Yu 9f49788e65 Merge branch 'master' of https://git01.codeplex.com/cntk into dongyu/dev
Conflicts:
	.gitignore
	Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Adv_Chapter.lyx
	Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Programmer_Chapter.lyx
2015-06-19 13:30:22 -07:00
Dong Yu 8954c5eb58 in the mnistCheckIn.config change
labelMappingFile=$ConfigFolder$\mnistlabels.txt

to

labelMappingFile=$DataFolder$\mnistlabels.txt

so that consistent label file is always used.
----------------------
Changes in the CNTK book:

Add RowStack node to NDL section, and MultSeq related NDL, MEL, and programming changes to appropriate sections.
2015-06-19 13:23:50 -07:00
kaisheny cce8767d73 merge with master branch code 2015-05-28 11:15:03 -07:00
Dong Yu ee9cd1523a change CNTK tech report's listing font to type writer fonts 2015-05-25 11:23:16 +08:00
kaisheny 973d96f683 Merge from master branch 2015-05-20 17:11:52 -07:00
Dong Yu fe38b10826 rename CNTKbook to include date. 2015-05-19 14:19:05 +08:00
Dong Yu d020dea47b change cn.exe to cntk in examples setups, demos, tutorials, and check-in suites.
fix the bug in TimitGetFiles.py
2015-05-19 14:10:45 +08:00
Dong Yu fa7051198f update CNTK-book to reflect the cn->cntk change 2015-05-19 13:53:25 +08:00
Frank Seide 72a776631e changed the Linux and Documentation Visual Studio "Projects" to Solution Folders (which they should have been all along) 2015-05-18 22:04:54 -07:00
Frank Seide 1247b704c7 various cleanups:
renamed cn.exe to CNTK.exe on Windows and "cntk" (no more .exe!) on Linux;
renamed 'cn' folder to 'CNTK';
moved CNTK.sln out from CNTKSolution folder, which now no longer needs to exist;
removed Win32 build target from Visual Studio Solution and all Projects;
added are documentation and Linux makefiles to the Visual Studio Solution for easy access;
removed unused PTasks files
2015-05-18 18:51:20 -07:00
Frank Seide 362884842e moved the tech report and tutorial into Documentation 2015-05-15 16:40:28 -07:00
unknown 6169450955 First Release of CNTK 2014-08-29 16:21:42 -07:00