3c42fdc7ac
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
87dcaf9254
merged with master
2015-08-31 18:37:31 -07:00
c8e91750bf
added the LSTM test files to the VS Solution (no code change)
2015-08-30 20:43:38 -07:00
1f82b2e5b2
merged from master
2015-08-19 19:23:28 -07:00
da444b90c3
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
8b7a4c67af
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
a86cb8f523
Converting NDRM reader to SparsePC reader.
2015-07-23 00:02:39 +10:00
cfa38b1e63
use pointer to refer to networks and nodes.
2015-07-13 09:33:54 -07:00
b73899209b
Merge with the master branch on July 9
2015-07-09 14:00:34 -07:00
80666b2156
Merge with master branch on July 9 2015
2015-07-09 10:26:38 -07:00
f186fe55b1
Revert accidental change of VS version.
2015-07-09 23:41:26 +10:00
860df86da4
First implementation of NDRMReader.
2015-07-09 23:26:00 +10:00
3d7b6b91b1
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
4f31cbb98b
update VS project files
2015-06-29 11:04:38 -07:00
41dd479de7
local changes for alignment node for attension-based mechanism
2015-06-27 08:45:00 -07:00
9bb13ad109
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
43e903515c
Create common makefile, and remove cpu and gpu specific makefiles. Also do some cleanup.
2015-06-24 13:59:05 -07:00
c5bcabc4f0
local change in dev branch before merging it to smt branch.
2015-06-08 22:12:44 -07:00
cce8767d73
merge with master branch code
2015-05-28 11:15:03 -07:00
86349f9289
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
c5c863b2d0
reworked pathnames in CheckInSuites\ASR
2015-05-22 18:55:44 -07:00
2b77cd0b53
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
973d96f683
Merge from master branch
2015-05-20 17:11:52 -07:00
998b864e89
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
29d25e0db8
removed the Setups Solution folder for now, since it cannot be easily populated with VS
2015-05-18 23:51:46 -07:00
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
d282db9baa
fixed (removed) Win32 again
2015-05-18 19:02:34 -07:00
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
UnderdogGeek
kaisheny
Yu Zhang
Alexey Kamenev
Dong Yu
Marko Radmilac