d8b03dfdf6
Merge branch 'master' of https://git.codeplex.com/cntk
2015-11-24 16:57:40 -08:00
33cf6a013f
Enable PrintBuildInfo for both Windows and Linux
2015-11-24 16:38:37 -08:00
cf884dc7f7
Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/sequenceTrainingTest
2015-11-24 13:27:56 -08:00
63c9cd8f9c
Removed the temporary hack to create the function values matrix in the times node constructor, for the SVD scenario. This is no longer needed as the Validate process has been fixed to not require the function values matrix to be allocated
2015-11-24 13:04:21 -08:00
fb9f993df4
Temporarily disabled CPU Image BVT tests.
2015-11-24 12:43:50 -08:00
d7247fb505
Updated baselines for Win BVT tests.
2015-11-24 11:24:00 -08:00
74e6e38aac
Set CPU thread count for Image BVT tests.
2015-11-24 10:12:47 -08:00
2043cd189a
Updated baselines for image Win BVT tests.
2015-11-23 12:44:42 -08:00
67176d436d
Added execute permissions for test script.
2015-11-23 12:23:50 -08:00
baa38d73ae
Updated baselines for Image tests, enabled Linux GPU tests.
2015-11-23 12:10:01 -08:00
13d2a756d1
Updated baselines.
2015-11-23 11:26:08 -08:00
ece7fd6f79
Added Win Release baselines for convo tests, fixed tolerances.
2015-11-23 10:42:44 -08:00
97992ae5da
Merge branch 'wolfma/MathTestConclusion' of https://git.codeplex.com/cntk into wolfma/MathTestConclusion
2015-11-23 13:50:02 +01:00
456b8f75ab
Merge branch 'wolfma/MathTestConclusion' of https://git.codeplex.com/cntk into wolfma/MathTestConclusion
2015-11-23 13:47:33 +01:00
59f2f24205
Merge branch 'wolfma/MathTestConclusion' of https://git.codeplex.com/cntk into wolfma/MathTestConclusion
2015-11-23 13:27:26 +01:00
2e4828aa82
Merge branch 'wolfma/MathTestConclusion' of https://git.codeplex.com/cntk into wolfma/MathTestConclusion
2015-11-23 13:26:51 +01:00
82598163ae
Merge branch 'wolfma/MathTestConclusion' of https://git.codeplex.com/cntk into wolfma/MathTestConclusion
2015-11-23 12:58:30 +01:00
af9f747ab7
cleanup boost math tests, remove cntkmathtest
2015-11-23 12:57:37 +01:00
5eba3247ee
cleanup boost math tests
2015-11-23 12:38:57 +01:00
562a4df1a0
Moving CPU Matrix tests and Sparse Dense Interactions tests to boost
2015-11-23 08:48:51 +01:00
dea7df7e2b
Fix bugs when loadBestModel in AdjustAfterEpoch
2015-11-23 15:05:43 +08:00
99b4cae376
DataTensor now serializes arbitrary of dimensions (backwards compatible, i.e. can still load old files, but won't write files that old software can load)
2015-11-22 00:03:03 -08:00
616eca1ae6
#if-0'ed out the SequenceTrain() by Guoguo Chen, because he no longer uses it becase it can be implemented instead using MEL
2015-11-21 23:36:12 -08:00
3908fbe7b1
made gcc happy
2015-11-21 23:30:36 -08:00
dfb2ce1c40
cleaned up SGDParams(): tidied up all those refactoring artifacts where a parameter is first read into a local variable, and later copied into the class member. Now it writes the class members directly;
...
cleaned up SGDParams vs. SGD. Moved 7 members over that are about model loading/saving or state, and thus do not belong into the SGDParams, which are parameters for the SGD algorithm itself;
removed SGD<> constructor from SGDParams. Instead, SGD<> now calls the SGDParams constructor by itself
2015-11-21 23:17:41 -08:00
84d0723a88
moved m_modelPath from SGDParams to SGD<> class. It belongs there only just a little more than into SGDParams, but still not more than e.g. the network or readers
2015-11-21 22:35:42 -08:00
4140505bdb
SGDOptimizer BS constructor implemented;
...
abstracted out from DoTrain() creation of objects, with two versions one for old CNTK config, and one for BS
2015-11-21 22:24:08 -08:00
fefa2acd56
bug fix: three ExistsCurrent() calls in SGDParams() should just be Exists() (per discussion with Amit);
...
SGDParams(ConfigRecordType &, ...) now takes as the second arg not an ElemTyep but just the size of the ElemType, as that is what is needed by it
2015-11-21 21:40:26 -08:00
2e2de8ee75
added another overload to convert ConfigValuePtr to ConfigArray&, which fixes a bug in reading out an array
2015-11-21 21:20:59 -08:00
5ab06be1bf
Merge branch 'master' of https://git.codeplex.com/cntk into fseide/reshaping
2015-11-21 21:00:51 -08:00
be5d913ccc
bug fix in DoTrain(): when reading out a nested config, don't use the default value to denote the type. Instead, I added the correct typecast to IConfigRecord& to the ConfigValuePtr class
2015-11-21 21:00:25 -08:00
5c7c99a0ec
added a specialized version of operator(name, defaultValue) for ConfigParameters
2015-11-21 20:00:28 -08:00
6d827cc1a6
Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/sequenceTrainingTest
2015-11-21 17:48:24 -08:00
9e6a53d49c
wmainWithBS() now prints the hostname, start time, and command-line args twice, once to original stderr, and once to the redirected stderr (if any)
2015-11-21 14:58:55 -08:00
cf9f625991
(undid accidental deletion of a function in previous commit)
2015-11-21 14:46:15 -08:00
21076217ff
deleted method IComputationNetBuilder::LoadNetworkFromFile() as all implementations did the same thing. With the exception of SimpleNetworkBuilder::LoadNetworkFromFile(), which also was able to load old DBN.exe files. Now users must explicitly convert them with the "convertdbn" CNTK command;
...
deleted ExperimentalNetworkBuilder class entirely (only kept the CPP since it has the standard BrainScript library in it, which we should move elsewhere)
2015-11-21 14:44:41 -08:00
a9679b20ff
Merge branch 'master' of https://git.codeplex.com/cntk into fseide/reshaping
2015-11-21 14:24:32 -08:00
04e0621d90
changed most uses of ComputationNetwork * and & to ComputationNetworkPtr, to eliminate ownership bugs and allow integration with BS. Also allowed for some minor code simplifications;
...
made IComputationNetBuilder::LoadNetworkFromFile() 'protected' since it is no longer used. Will be deleted soon
2015-11-21 14:23:59 -08:00
38ca2aa166
made gcc happy
2015-11-21 01:39:36 -08:00
a01d4ecdb0
DoTrain(): removed the network builder for the two BrainScript configs, since passing a straight lambda is simpler
2015-11-21 01:36:50 -08:00
517d409c95
SGD::Train() now takes a lambda to create the virgin network instead of a IComputationNetBuilder. As a consequence, it now loads the model directly without going through a net builder. Why should it? We can now remove the load function from the network builder classes (once all Train()-like functions have been updated to do the same).
2015-11-21 01:09:18 -08:00
6b4edb764c
added MatixQuantizerTests
2015-11-21 09:44:54 +01:00
f32860c400
(small steps towards DoTrain with BS)
2015-11-21 00:34:16 -08:00
ab0dcf3434
simplified DeviceFromConfig() by removing PTasks-specific configuration options. Also added an overload for BrainScript;
...
added a dummy DataReader constructor from BrainScript (currently not implemented);
had to disable DelayLoadNofify() as that suddenly caused link errors (seems because DeviceFromConfig() is now called from a different place?);
further unified DoTrain() w.r.t. old CNTK config and BrainScript. Added a new BrainScriptBuilder (but the builders will go away next and get replaced by a lambda). DoTrain now accessible from BS (but not functional yet, too many pieces missing);
all builders now can be constructed from both old ConfigParameters and BrainScript IConfigRecord;
suddenly gcc got very picky, had to fix several places
2015-11-21 00:16:36 -08:00
1cb078584e
LSTM script changed to use the new more natural a() syntax (macros with 0 arguments)
2015-11-20 21:52:16 -08:00
34c76dac6a
BrainScript:
...
added pretty-printed expression names for infix operators;
the ":" operator (for forming arrays) now flattens the array in the parser rather than the evaluation, allowing evaluation to construct a ConfigArray where the elements are lazily evaluated, as needed for the top-level "actions";
added the parsing and evaluation of the (dict with dict) syntax, although its functionality is not yet implemented (just returns the first dict);
disabled the 'stopAtNewline' flag, since I don't see why it is even necessary, and it prevents us from writing the "with" operator on the next line;
ParseConfigExpression() now checks for junk at end;
wmainWithBS() now parses BS with ParseConfigExpression() rather than ParseConfigDictFromString(), so that we can construct a "with" expression with overrides given on the command line
2015-11-20 21:48:26 -08:00
280f1e8634
changed the interface to parser to pass in include paths (not used yet);
...
new parser interface that parses a single expression rather than a dictionary;
macros can now have an empty argument list (f());
implemented quite a bit of wmainWithBS(), but not working yet
2015-11-20 19:45:52 -08:00
e23a15019d
made gcc happy
2015-11-20 15:57:01 -08:00
75b781b825
streamlined IConfigRecord emulation of old CNTK ConfigParameters by changing all key strings to wide strings. Likewise added two wide-string variants to ConfigParameters;
...
added a temporary fix to ProgressTracing that allows to not set the correct #epochs upfront (since BS can't do that);
added a first BS version of main()
2015-11-20 15:55:35 -08:00
736092fd06
removed the passing-around of fullEpochsOffset, fullTotalMaxEpochs, which is now handled through the ProgressTracing class
2015-11-20 11:08:35 -08:00
Yongqiang Wang
Amit Agarwal
Alexey Kamenev
Wolfgang Manousek
pkranen
Yuchen Fan
Frank Seide