78989ce9f4
Merge branch 'master' of https://git.codeplex.com/cntk
...
Conflicts:
CNTK.sln
2015-09-18 01:57:18 -07:00
d9390c023b
Rename the Target Name of CNTKEvalDll and CNTKMathDll back to CNTKEval and CNTKMath respectively to honor the existing receipt.
...
Project name is kept intact.
2015-09-18 01:12:22 -07:00
d9a52de493
temporarily disabled CNTKMathTest
2015-09-17 21:33:33 -07:00
ffb3d1de7a
made BrainScriptEvaluator.h independent of BrainScriptParser.h, in prep of separating out ConfigValue, ConfigRecord, ConfigArray, and ConfigLambda from BrainScript so that they can be used by other language wrappers as well. This required to replace ConfigValuePtr::textLocation by a lambda that prints an error string, annotated with a text location hidden inside the lambda (think Python wrapper--the lambda knows how to pinpoint the location in the Python source). Instead of throwing EvaluationError(msg, val.GetTextLocation()), one now instead says val.Fail(msg);
...
EvaluationError itself is now encapsulated inside BrainScriptEvaluator.cpp;
deleted IConfigRecord::operator(), as it was not really useful. Just use operator[]
2015-09-14 20:19:35 +02:00
4c6037f28a
added ParallelTraining test cases to the VS Solution;
...
relaxed baseline for single precision since now all scalars are double precision, which changes the result (double-precision run should not change)
2015-09-06 21:47:30 +02:00
e2d567548c
Matrix.h now no longer pulls in the CPU/GPUMatrix headers (this required cleaning up a few incorrect header dependencies as well);
...
cleaned up <class ElemType> vs. <typename ElemType> (using class since that was used more often, causing less diffs)
2015-09-06 17:17:07 +02:00
e4507e8700
CNTK now delay-loads msmpi.dll in case it is not installed;
...
moved Profiled.cpp/h;
disabled MultiNetworksSGD--seems not missing, not used
2015-09-05 11:16:55 +02:00
75dd81795f
moved stuff out from CNTK to CNTKSGDLib;
...
created an SGD.cpp that instantiates the exported classes of CNTKSGDLib;
does not build since git mixed up files during move, and it won't let me git-add and git-mv in one go
2015-09-05 11:00:51 +02:00
34beb6fdd7
updated CNTKEval w.r.t. network lib
2015-09-05 00:44:16 -07:00
2b2237e712
now linking with CNTKComputationNetworkLib, removed one CPP from CNTK proper for testing
2015-09-04 22:39:46 -07:00
89aec3fe20
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
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
erw
Frank Seide
UnderdogGeek
kaisheny
Yu Zhang
Alexey Kamenev
Dong Yu
Marko Radmilac