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

17 Коммитов

Автор SHA1 Сообщение Дата
kaisheny b1f7263326 Merge from master branch 2015-05-20 17:11:52 -07:00
erw 0ff74f0405 The commits 32391e1..2a7ab60 should not be pushed to public (since it enables MKL and MPI) revert them in this commit.
Reverted commit:

8404e9c8de        "Enable MKL"
64a37301f9        "Enable MPI_SUPPORT"
61c6d59e04        "add a unit test for CNTKEval"
2015-05-19 14:08:16 -07:00
erw 77e782d9d0 Revise .gitignore so the buildinfo.h and buildinfo.h$$ can be ignored after project dir move 2015-05-19 13:55:45 -07:00
erw 61c6d59e04 add a unit test for CNTKEval
This unit test is used privately by erw.

Conflicts:
	CNTKSolution/EvalUnitTest/CNTKEValTest.cpp
	CNTKSolution/EvalUnitTest/EvalUnitTest.vcxproj
	CNTKSolution/EvalUnitTest/EvalUnitTest.vcxproj.filters
2015-05-19 12:31:46 -07:00
kaisheny 93c895ed0e Merge with master branch 2015-04-22 23:20:34 -07:00
erw 0cba85be2d Fix .gitignore issue. Previous version is a unfinished merged version. 2015-04-08 17:50:16 -07:00
Yu 24874c0501 Merge remote-tracking branch 'origin/master' into linux-gcc
Conflicts:
	.gitignore
	Common/TimerUtility.cpp
	DataReader/SequenceReader/SequenceParser.h
	DataReader/SequenceReader/SequenceReader.cpp
	MachineLearning/cn/SGD.h
	MachineLearning/cn/cn.cpp
	Math/Math/CPUSparseMatrix.cpp
	Math/Math/GPUMatrix.cu
	Math/Math/GPUSparseMatrix.cu
	Math/Math/GPUSparseMatrix.h
2015-02-08 00:31:32 -05:00
Mike Seltzer b4f465b8c4 Merge branch 'master' of https://git01.codeplex.com/cntk
Conflicts:
	DataReader/HTKMLFReader/HTKMLFReader.cpp
	DataReader/HTKMLFReader/HTKMLFReader.h
2015-02-06 16:14:47 -08:00
Yu 697866a0d7 Merge remote-tracking branch 'origin/master' into linux-gcc 2015-02-06 14:45:31 -05:00
erw ebf1ab9f8b Add a function such that cn.exe will print build signature (build path, builder, build time, build branch) on start-up.
(useful when there are a lot of versions)

It assumed environment "%USERNAME% is set and "hostname" is in path, which
should be true on most machines.

If users have not put "git" in their PATH, branch and commit SHA1 will not be
shown.
2015-02-01 23:57:55 -08:00
ascii991218 0443dc818d Merge branch 'master' of https://git.codeplex.com/cntk
Conflicts:
	.gitignore
	Common/Include/fileutil.h
2015-01-17 21:40:37 +08:00
ascii991218 b5c41e6516 A large modification, allowing compilation of CNTK under linux g++
1. Add Common/Include/Platform.h for substitution of windows API and types
2. Fixed compile errors under g++, warning is not handled.
3. Compiles Readers into shared library, added code in *Reader/Export.cpp for dynamic linking and loading
4. Fixed msra::strfun::_strprintf to make it work under linux g++
5. Added makefiles for building (cpu and gpu)
2015-01-17 21:03:40 +08:00
Dong Yu 6bd6dbeb47 Changes in the CNTK book:
1. corrected the parameter list for the Delay command in NDL.
2. added the options for the rmprop gradient update type.
3. added the ConvertDBN command.
2015-01-04 23:54:16 -08:00
Frank Seide bb1385625a added .dep to .gitignore 2014-11-01 00:21:06 -07:00
Dong Yu a6d0f8176d fixed a bug in GPUMatrix::RowElementMultiplyWith and RowElementDivideBy. Changed ComputationNetwork.h to support loading nodes with number of children larger than 3. 2014-10-15 19:00:55 -07:00
Mike Seltzer 849d439bcc added *.bak to gitignore 2014-10-01 13:29:44 -07:00
Dong Yu 66f7a628f8 add .gitignore file 2014-09-04 11:58:04 -07:00