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

181 Коммитов

Автор SHA1 Сообщение Дата
Frank Seide 8ac69d435a updated CNTKEval w.r.t. network lib 2015-09-05 00:44:16 -07:00
Frank Seide f3f0bc1c99 now linking with CNTKComputationNetworkLib, removed one CPP from CNTK proper for testing 2015-09-04 22:39:46 -07:00
Frank Seide 14ae5f386d added a new projec to hold computation-network related stuff as a library, not yet an actual library 2015-09-04 19:42:56 -07:00
Frank Seide 67464d22e0 some fixes to make gcc happy (one still missing);
somehow git lost 'Makefile'--readding, hoping it won't confuse the merge process
2015-09-02 08:43:31 -07:00
Frank Seide 6c16d6f063 merged with master 2015-08-31 18:37:31 -07:00
Frank Seide 1c65a18da6 added the LSTM test files to the VS Solution (no code change) 2015-08-30 20:43:38 -07:00
Frank Seide 2ca2db5af0 merged from master 2015-08-19 19:23:28 -07:00
Frank Seide 00491575f0 added the files of the new Tests\Speech test to the Solution and created a small README.txt 2015-08-18 16:06:07 -07:00
Frank Seide 067d75246b added a new project ParseConfig for developing an extended configuration language;
also added a spec doc for those language extensions
2015-08-03 19:54:52 +08:00
UnderdogGeek 41d9515814 Converting NDRM reader to SparsePC reader. 2015-07-23 00:02:39 +10:00
kaisheny c8dd3f4161 use pointer to refer to networks and nodes. 2015-07-13 09:33:54 -07:00
kaisheny f23bf77394 Merge with the master branch on July 9 2015-07-09 14:00:34 -07:00
kaisheny 94ba0c5594 Merge with master branch on July 9 2015 2015-07-09 10:26:38 -07:00
UnderdogGeek 1d57c0d010 Revert accidental change of VS version. 2015-07-09 23:41:26 +10:00
UnderdogGeek 02b36c822d First implementation of NDRMReader. 2015-07-09 23:26:00 +10: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
Alexey Kamenev 5803796c4e update VS project files 2015-06-29 11:04:38 -07:00
kaisheny 81f9ac56ee local changes for alignment node for attension-based mechanism 2015-06-27 08:45:00 -07:00
Dong Yu e96d80d3e8 Merge branch 'master' of https://git01.codeplex.com/cntk into dongyu/dev
Conflicts:
	CNTK.sln
	MachineLearning/CNTK/CNTK.vcxproj
	MachineLearning/CNTK/CompositeComputationNodes.h
	MachineLearning/CNTK/ComputationNetwork.h
	MachineLearning/CNTK/SGD.h
	Makefile.gpu
2015-06-25 17:49:24 -07:00
Marko Radmilac c20ee5b882 Create common makefile, and remove cpu and gpu specific makefiles. Also do some cleanup. 2015-06-24 13:59:05 -07:00
kaisheny 32dde12e37 local change in dev branch before merging it to smt branch. 2015-06-08 22:12:44 -07:00
kaisheny 4b12277e0a merge with master branch code 2015-05-28 11:15:03 -07:00
Frank Seide 721f6dbb07 added a global test runner BAT file as a Build action, so far it is running, but CNTK output does not appear in the Build window;
fixed missing newline in stderr output when terminating with an exception message
2015-05-22 20:00:40 -07:00
Frank Seide 50fd89e1a6 reworked pathnames in CheckInSuites\ASR 2015-05-22 18:55:44 -07:00
Frank Seide 066c70a9b0 added all CheckInSuites and ExampleSetups to a Project CheckInSuites, to make it easy to get access to the tests, samples, etc. 2015-05-22 18:05:20 -07:00
kaisheny b1f7263326 Merge from master branch 2015-05-20 17:11:52 -07:00
Frank Seide a059635386 moved nocase_compare to Basics.h, and removed unnecessary dependencies caused by this on commandArgUtil.h, hoping for less recompilation;
renamed PreprocessConfigLine() to StripComments();
updated CNTKBook PDF
2015-05-19 14:32:21 -07:00
Frank Seide e069584168 removed the Setups Solution folder for now, since it cannot be easily populated with VS 2015-05-18 23:51:46 -07:00
Frank Seide 8241c5b2ed 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 16a481ac77 fixed (removed) Win32 again 2015-05-18 19:02:34 -07:00
Frank Seide 392d64da08 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