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

15 Коммитов

Автор SHA1 Сообщение Дата
Amit Agarwal a6e2c18062 Some minor changes to the Simple Demo config file to allow specifying the path to input files using the RootDir variable 2015-06-03 11:36:35 -07:00
amitaga 0460e9c8cb Merge branch 'master' of https://git.codeplex.com/cntk into linux-gcc
Conflicts:
	Common/Include/minibatchsourcehelpers.h
	DataReader/DSSMReader/DSSMReader.cpp
	DataReader/HTKMLFReader/HTKMLFReader.cpp
	DataReader/LMSequenceReader/SequenceReader.cpp
	DataReader/LMSequenceReader/minibatchsourcehelpers.h
	DataReader/LUSequenceReader/LUSequenceReader.cpp
	DataReader/LUSequenceReader/minibatchsourcehelpers.h
	DataReader/LibSVMBinaryReader/LibSVMBinaryReader.cpp
	DataReader/UCIFastReader/UCIFastReader.cpp
	MachineLearning/CNTK/ComputationNetwork.h
	MachineLearning/CNTK/SGD.h
	MachineLearning/CNTK/SimpleNetworkBuilder.h
	MachineLearning/CNTK/SynchronousExecutionEngine.h
	MachineLearning/cn/PTaskGraphBuilder.cpp
	Makefile.cpu
	Makefile.gpu
	Math/Math/NoGPU.cpp
2015-05-19 16:04:47 -07: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
Yu 75b33ea895 For all the wprint related stuff, we should avoid use %s because wstring is the internal representation (no conversion needed). Replaced it with %ls. 2015-04-15 21:02:55 -04:00
Dong Yu 922e96c92d Merge branch 'master' of https://git01.codeplex.com/cntk 2015-03-30 19:21:21 -07:00
Dong Yu 8cca1a4048 [nothing expect that strange mode change in the demos and papers folder. 2015-03-30 19:21:10 -07:00
Yu db26227035 Merge remote-tracking branch 'origin/master' into linux-gcc
Conflicts:
	DataReader/LMSequenceReader/SequenceParser.h
	DataReader/LMSequenceReader/SequenceReader.cpp
	MachineLearning/cn/ComputationNetwork.h
	Math/Math/CPUMatrix.cpp
	Math/Math/CPUSparseMatrix.cpp
	Math/Math/GPUMatrix.cu
2015-03-25 22:15:58 -04:00
yzhang87 036ecdd775 Fix the error for deleting node in MEL: 1) clean the mapping function, 2) if there is a null children, print a warning instead of a segmentation fault. Need more test when deleting a node in a recurrent loop. 2015-03-25 12:34:34 -04:00
Yu 5b8fa8d3f8 Merge remote-tracking branch 'origin/master' into linux-gcc
Conflicts:
	Math/Math/NoGPU.cpp
2015-03-04 12:01:55 -05:00
Dong Yu 53db85c8a8 fix the signature mismatches in NoGPU.cpp 2015-03-03 20:20:58 -08:00
Yu b37fc78688 Fixed the bug by merging 2015-02-08 02:55:40 -05:00
wengong_jin 2ecf63b683 Added README. 2015-01-20 14:41:29 +08:00
Malcolm Slaney ffcd8b8825 Cleaning up paper file status 2014-11-23 06:54:20 -08:00
Malcolm Slaney efdf17b573 Adding the speech demo example 2014-11-22 15:37:09 -08:00
Malcolm Slaney 550a6e7718 The Simple Demo Code and Reference Figures 2014-11-21 19:18:09 -08:00