035e164039
Merge branch 'master' of https://git.codeplex.com/cntk into dongyu/LSTMTestCase
2015-09-02 13:09:18 -07:00
ceffaeaa0f
Added platform specific baselines for the LSTM speech test
2015-09-02 13:09:07 -07:00
86faad3c3b
Fixed a bug in utterance mode reading in HTKMLFReader that existed in the Linux fork and was propagted to the common reader with the merge of the readers
2015-09-02 11:19:44 -07:00
0bb54192f1
Merge branch 'dongyu/LSTMTestCase' of https://git.codeplex.com/cntk into dongyu/LSTMTestCase
...
Conflicts:
Math/Math/Matrix.cpp
2015-09-02 10:35:32 -07:00
15b941e4e8
Make LSTM/run-test have executable permissions for Linux
2015-09-02 10:32:11 -07:00
5ae107b906
remove last four lines in LSTM test case's run-test so that it only runs once.
2015-09-02 10:32:11 -07:00
e63e215d47
add NDLDir to run-test for the LSTM test case.
2015-09-02 10:32:11 -07:00
55f4f1d0b2
finish LSTM test case
2015-09-02 10:32:05 -07:00
448d7a1e06
Make LSTM/run-test have executable permissions for Linux
2015-09-02 08:12:27 -07:00
d8d55256b4
remove last four lines in LSTM test case's run-test so that it only runs once.
2015-09-02 02:44:35 -07:00
cf0d15a01b
Enable unigram support on Linux
2015-09-01 23:11:13 -07:00
b1ccf91f85
Replace uses of the VC++ non-standard std::hash_map with C++ standard std::unordered_map type in the HTKMLFReader
2015-09-01 22:07:15 -07:00
6f0526ea93
1) Switch to using std::mutex for mutual exclusion instead of platform specific facilities 2) A minor bug fix in the linux reader
2015-09-01 18:23:17 -07:00
2d1030cb09
Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/mergeHTKMLFReaders
2015-09-01 16:01:19 -07:00
48d5968371
Fixed a bug introduced during merging of the Linux and Windows readers
2015-09-01 16:01:05 -07:00
977340897c
Reporting duration of test runs
2015-09-01 15:13:28 -07:00
8e85f07de3
Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/mergeHTKMLFReaders
2015-09-01 13:27:19 -07:00
1df4e8e5e1
Merge the linux and windows forks of the HTKMLFReader fork into one.
2015-09-01 13:09:57 -07:00
7915fef15d
Fixed CPUONLY build
2015-09-01 00:06:38 -07:00
bbc59a5843
add NDLDir to run-test for the LSTM test case.
2015-08-31 17:03:11 -07:00
e3889cc056
finish LSTM test case
2015-08-31 16:18:48 -07:00
885de65553
remove testcases.yml from LSTM test folder before baseline results are provided.
2015-08-31 11:40:19 -07:00
5aea0d4071
bug fix, m_boundaryInfo should not be moved to deviceId like most others, but to CPUDEVICE
2015-08-30 22:28:04 -07:00
658c57d252
bug fix in TransferToDeviceIfNotThere(): forgot to pass first arg (GetDeviceId()), and it accepted it because, due to optional parameters, the signature still matched (a bool was silently cast as an int)
2015-08-30 21:15:02 -07:00
1c65a18da6
added the LSTM test files to the VS Solution (no code change)
2015-08-30 20:43:38 -07:00
ca6bdc6948
Add the speech LSTM test config. test results are not provided yet.
2015-08-30 00:15:32 -07:00
d4776c3484
ensure that run-test has executable permissions
2015-08-28 16:59:03 -07:00
66a4862fac
This merges a larger set of changes to the ComputationNode structure, aimed at allowing to reduce code duplication.
...
The load and copy constructors (and virtual Duplicate()) are gone; instead use LoadFromFile() and CopyTo() directly.
Shared code from Past/FutureValueNode and the non-linearities (Sigmoid etc.) were extracted into shared base classes.
The updated constructors and related functions now have consistent formatting w.r.t. spacing and indentation, to make future meachnical refactorings easier.
Every ComputationNode derivate now has a typedef Base to make it less error-prone to refer to the respective base class.
Merge branch 'fseide/refactor_nodes'
2015-08-28 16:20:20 -07:00
2da4e80edc
fixed a few gcc warnings in the 1-bit SGD code
2015-08-28 15:23:01 -07:00
4e2a28cfe1
fixed a few gcc-side warnings and a spelling error in the name of FormRecurrentLoop() that got fixed but partially undone during the last merge;
...
added clear installation instructions for MS MPI SDK in the source file at the place where it fails if you don't have it
2015-08-28 15:09:51 -07:00
ac235bc21a
Reduced number of Epochs in NoQuantization tests to 4 from older value of 10 to reduce test running time
2015-08-28 14:53:56 -07:00
e904bc868b
Merge branch 'master' of https://git.codeplex.com/cntk into fseide/refactor_nodes
...
Conflicts:
MachineLearning/CNTK/CNTK.vcxproj.filters
MachineLearning/CNTK/ComputationNetwork.h
2015-08-28 14:15:32 -07:00
3f3974942d
Fixes for handling zero sized MBs in parallel training
2015-08-28 13:49:23 -07:00
8b7ff843dd
fixed a missing 'template' keyword gcc really couldn't do without
2015-08-28 11:47:53 -07:00
3fbc3bc7d5
added headline comments to class ComputationNetwork--one day we will sort them in a logical order;
...
replaced a few more throw runtime_error by RuntimeError()
2015-08-28 09:28:54 -07:00
dbbdb70ddb
general gcc happiness (not fully happy yet);
...
fix of a bug that gcc found (wrong typecast)
2015-08-28 01:02:00 -07:00
ded2ae13b6
reverted back all constructor initializers into actual initializer syntax;
...
fixed a few more incorrect Base calls (DumpNodeInfo(), and also a few CopyTo())
2015-08-28 00:38:54 -07:00
a6f2425ecd
fixed base class call for NonlinearityNode;
...
moved CopyTo() and MoveMatricesToDevice() to NonlinearityNode
2015-08-27 23:13:51 -07:00
ef09af89e5
ComputationNode derivates now have a typedef Base to specify their direct base class in the hierarchy, in to reduce risk of bugs from calling the wrong base-class functions;
...
ComputationNode no longer has a public constructor, to enforce that it is ever only constructed using ComputationNode::New() which does part of construction using virtual functions
2015-08-27 23:06:59 -07:00
e4a8ee093e
made m_direction, m_SEQUENCE_BOUNDARY and m_SentenceBoundary template parameters
2015-08-27 22:19:48 -07:00
27138de343
eliminated Duplicate() as a virtual function, now just a base member that calls virtual CopyTo();
...
copy constructors also gone
2015-08-27 21:58:36 -07:00
b6523b22cb
brought back the node constructor--for base, but not for load or copy (copy constructor still there TBD; load constructors all gone);
...
this means that every node has a constructor again--but only one--that must be written, even if it just calls the base constructor :(, but with VS 2015 this will go away;
constructors with extra args now have the standard args (deviceId, name) always in first position, to allow splitting construction and initialization (but it seems we don't even need this);
CreateNodeFromFile() now calls LoadFromFile() explicitly, which gives it access to the virtual version of it
2015-08-27 20:57:03 -07:00
5cc2322ef4
Merge branch 'dongyu/memshare' of https://git01.codeplex.com/cntk into dongyu/memshare
2015-08-27 18:33:00 -07:00
cebb972fb8
Merge branch 'dongyu/memshare' of https://git01.codeplex.com/cntk into dongyu/memshare
2015-08-27 18:08:44 -07:00
9e43a66747
Merge branch 'dongyu/memshare' of https://git01.codeplex.com/cntk into dongyu/memshare
2015-08-27 17:53:27 -07:00
5f4c93317a
Merge branch 'master' of https://git01.codeplex.com/cntk into dongyu/memshare
2015-08-27 17:52:50 -07:00
219409b050
Merge branch 'master' of https://git01.codeplex.com/cntk into dongyu/memshare
2015-08-27 16:40:21 -07:00
61aaaa2f9e
Add plumbing for matrix share in ComputationNetwork.h
2015-08-27 16:06:55 -07:00
2df79c27ea
added comments on further refactoring constructors
2015-08-27 09:20:45 -07:00
070079d4d3
Merge branch 'master' of https://git01.codeplex.com/cntk into erw/MA-latest
2015-08-26 18:42:14 -07:00
Amit
Chris Basoglu
Dong Yu
Vladimir Ivanov
Frank Seide
U-FAREAST\fseide