517947be3d
License change
2016-01-18 09:36:51 +01:00
c8dd3f4161
use pointer to refer to networks and nodes.
2015-07-13 09:33:54 -07:00
f23bf77394
Merge with the master branch on July 9
2015-07-09 14:00:34 -07:00
94ba0c5594
Merge with master branch on July 9 2015
2015-07-09 10:26:38 -07:00
1d57c0d010
Revert accidental change of VS version.
2015-07-09 23:41:26 +10:00
02b36c822d
First implementation of NDRMReader.
2015-07-09 23:26:00 +10:00
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
5803796c4e
update VS project files
2015-06-29 11:04:38 -07:00
81f9ac56ee
local changes for alignment node for attension-based mechanism
2015-06-27 08:45:00 -07:00
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
c20ee5b882
Create common makefile, and remove cpu and gpu specific makefiles. Also do some cleanup.
2015-06-24 13:59:05 -07:00
32dde12e37
local change in dev branch before merging it to smt branch.
2015-06-08 22:12:44 -07:00
4b12277e0a
merge with master branch code
2015-05-28 11:15:03 -07:00
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
50fd89e1a6
reworked pathnames in CheckInSuites\ASR
2015-05-22 18:55:44 -07:00
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
b1f7263326
Merge from master branch
2015-05-20 17:11:52 -07:00
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
e069584168
removed the Setups Solution folder for now, since it cannot be easily populated with VS
2015-05-18 23:51:46 -07:00
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
16a481ac77
fixed (removed) Win32 again
2015-05-18 19:02:34 -07:00
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
Mark Hillebrand
kaisheny
UnderdogGeek
Yu Zhang
Alexey Kamenev
Dong Yu
Marko Radmilac
Frank Seide