Граф коммитов

420 Коммитов

Автор SHA1 Сообщение Дата
Frank Seide e647197eed fixed error messages in BestGpu::LockDevice(), which used to indicate that it locks more devices than are actually used 2015-11-29 17:18:06 -08:00
Frank Seide ac67149828 bug fix in TableLookupNode::EvaluateThisNode(): missing reshape of functionValues;
still not working with GPU since inputs[1] comes in on the CPU, for unknown reasons;
made latticesource.h compile an accidentally imported "using namespace std"
2015-11-29 16:55:15 -08:00
Amit Agarwal cc1efb6d66 Improvements/fixes to Windows call stack printing code 2015-11-28 00:06:17 -08:00
Frank Seide e1c8f0aba7 Merge branch 'fseide/reshaping' of https://git.codeplex.com/cntk into fseide/reshaping 2015-11-27 22:01:51 -08:00
Frank Seide ace97fd6c7 updated 'tag=' expressions in tests (and also sample and book) to be spelled with double quotation marks (e.g. tag="output");
renamed tag="Criteria" to tag="criterion" everywhere
2015-11-27 22:00:53 -08:00
Frank Seide 438b1d63ea bug fix: LUSequenceReader::EnsureDataAvailable() must reset the MBLayout in case it returns no data;
renamed mis-spelled mBlgSize to mRequestedNumParallelSequences
2015-11-27 21:23:48 -08:00
Frank Seide 70c230a767 DeviceFromConfig() now performs the 'auto' selection only once 2015-11-27 00:36:02 -08:00
Frank Seide 11252415bb fixed an invalid printf format string found by gcc 2015-11-27 00:10:26 -08:00
Frank Seide cdab27a556 conversion operators of ConfigValue now print, in case an error, the offending input string in the error message 2015-11-27 00:07:32 -08:00
Frank Seide 1d92f29a7b values of optional args in NDL and MEL can now be in quotes, which is recommended for future BrainScript compatibility for all strings;
updated all sample config/NDL/MEL for Jenkins tests
2015-11-26 23:52:04 -08:00
Frank Seide d25e83cae9 cleaned up the Jenkins test configs w.r.t. indentation, spacing, casing. Also quoted all strings in config (not yet in NDL) for BS compat 2015-11-26 22:04:17 -08:00
Frank Seide 1a2f3cab88 Merge branch 'master' of https://git.codeplex.com/cntk into fseide/reshaping 2015-11-26 15:48:04 -08:00
Frank Seide 5010609750 further fixed ConfigParser::Parse() to not strip pathnames of leading \\;
SimpleNetworkBuilder.cpp now never uses the LSTMNode (which is not functional at present--we should just remove it);
bug fix: LUBatchSequenceReader now sets the SequenceEnd flag as well. But I get NaNs, so something still not complete
2015-11-25 17:59:48 -08:00
Amit 77da34e8d5 Added call stack printing functionality for Linux 2015-11-25 17:20:56 -08:00
Frank Seide 1c46217f58 enabled gcc __attribute__((format(printf())) for ThrowFormatted(), and fixed 50+ bugs and as many warnings found by it... 2015-11-25 16:16:21 -08:00
Frank Seide a62b74814b renamed that left-over minibatchsourcehelpers.h to RandomOrdering.h, to reflect that it only contains one class named RandomOrdering. Adapted that class' naming to typical CNTK coding conventions 2015-11-25 14:13:57 -08:00
Frank Seide 58ad9d8d24 moved conc_stack back out from GPUMatrix.h to a new header since it is also used in ImageReader.cpp 2015-11-25 12:47:30 -08:00
Frank Seide 973c9dad4d coup de grâce: got rid of that abomination (of mine) called basetypes.h! The few pages of code that are actually used from it has been moved to Basics.h, Platform.h, and fileutil.h. --Yay
...well, it was removed from mainline CNTK code. My old DBN.exe reader code inside still needs it, so it has just been moved under the rug (HTKMLFReader project). Unused code was deleted from the basetypes.h under the rug;
DataReader.h no longer includes lattice-related header files (keeping MS-propietary stuff out from inclusion in mainline CNTK code);
fileutil.h is no longer included by mainline CNTK code. Instead #include "File.h". Some day we will merge the two;
removed a 'using namespace std;' from fileutil.h, and dealt with the fallout
2015-11-25 12:28:28 -08:00
Frank Seide 606f64ff5b fixed BuildNetworkFromDbnFile(), lacked MarkComputed(false) to allocate memory. Thanks to Yongqiang for discovering and testing it;
made gcc happy
2015-11-24 22:48:00 -08:00
Frank Seide d8cb2791be #if-0'ed out stuff in basetypes.h, which will soon removed completely;
fixed the include path of the MathPerformanceTests project (which were incomplete and even inconsistent between Release/Debug);
more attempts at ImageReader.cpp
2015-11-24 22:12:07 -08:00
Frank Seide 38591f37f5 BestGpu.cpp: changed LockGPU option to camel-case 2015-11-24 21:09:38 -08:00
Frank Seide 1a05743a90 SimpleNetworkBuilder and NDLBuilder no longer derive from IComputationNetBuilder;
steps towards making gcc happy (still stuck with a link error)
2015-11-24 20:13:46 -08:00
Frank Seide b76c09cdce HTKMLFReader now runs with BrainScript config! DataReader is now a ScriptableObject;
more template-related updates to LUSequenceReader.cpp;
got CNTKEval to build;
added the first full BS configuration: lstm.bs
2015-11-24 19:44:19 -08:00
Frank Seide ad46292088 got LMSequenceReader and CNTKEval to build with config template 2015-11-24 12:47:53 -08:00
Frank Seide 886f9d801f DataWriter::DataWriter() is now a method template that takes two kinds of config records;
merged DataWriter::GetDataWriter() since it was only called by one site, but its existence required 3 dummy implementations which are now gone
2015-11-24 11:52:13 -08:00
Frank Seide 578675a421 LMSequenceReader now compiles with ConfigRecordType template (although it still has some incorrect code in the Writer, which for some reason compiles) 2015-11-24 00:15:31 -08:00
Frank Seide 12116431c6 changed DataReader interface and HTKMLFReader to support both ConfigParameters and ScriptableObjects::IConfigRecord, as a step towards BS-enabling everything. The other readers currently do not build, coming next;
changed BestGpu,.h to not include "ScriptableObjects.h" and "commandArgUtil.h", since this header is also included by .cu files, which needs it for the CPUONLY flag, but the CUDA compiler gets confused;
new method ConfigParameters::GetMemberIds();
new method ConfigArray::AsVector<>()
2015-11-23 23:11:06 -08:00
Frank Seide 3d171e1881 minor DataReader cleanup:
deleted mDoRandomize flag and SetDoRandomize() method, since they were not used anywhere;
made Datareader::GetDataReader(), Init(), and data members private;
removed DataReader::m_configure since it just passed simple data from GetDataReader() to the only function that calls GetDataReader();
renamed m_dataReader[] to m_dataReaders[] (plural);
fixed rnnlm.gpu.config by moving modelPath out from SGD block
2015-11-23 20:44:42 -08:00
Frank Seide 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
Frank Seide 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
Frank Seide 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
Frank Seide 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
Frank Seide 5ab06be1bf Merge branch 'master' of https://git.codeplex.com/cntk into fseide/reshaping 2015-11-21 21:00:51 -08:00
Frank Seide 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
Frank Seide 5c7c99a0ec added a specialized version of operator(name, defaultValue) for ConfigParameters 2015-11-21 20:00:28 -08:00
Amit Agarwal 6d827cc1a6 Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/sequenceTrainingTest 2015-11-21 17:48:24 -08:00
Frank Seide 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
Frank Seide 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
Frank Seide e23a15019d made gcc happy 2015-11-20 15:57:01 -08:00
Frank Seide 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
Frank Seide 6c092eb0e5 changed (fullEpochsOffset, fullTotalMaxEpochs) from being an init parameter to SGD to a static class ProgressTracing(), which lives in a new Common Include ProgressTracing.h 2015-11-20 11:03:28 -08:00
Amit b85ae1175b Fixed sequence training on Linux by implementing the missing expand_wildcards functionality for Linux 2015-11-19 17:23:04 -08:00
Amit dfabdba7a7 Merge branch 'amitaga/sequenceTrainingTest' of https://git.codeplex.com/cntk into amitaga/sequenceTrainingTest 2015-11-19 13:27:43 -08:00
Amit Agarwal d2c9fb05aa Merged the duplicate copy of fileutil.cpp in HTKMLFReader with the Common/fileutil.cpp version 2015-11-19 13:26:56 -08:00
Frank Seide a9bb980c51 some tidying-up of ScriptableObjects: Moved old CNTK ConfigParameters emulation code to the very end, to get it out of the way 2015-11-19 00:03:45 -08:00
Frank Seide 2a875cff89 made gcc happy 2015-11-18 23:49:57 -08:00
Frank Seide 0cc453ef5d further unified old ConfigParameters and new ConfigRecord. It can now handle records and argvectors, i.e. it handles the SGDParams constructor, but the default value has to be specified as XXX::Record() or XXX:;Array() so that it casts around types correctly;
SGDParams now registered with BS,and SGDParams constructor from config now enabled (and passes to initialize itself from a sample config)
2015-11-18 23:37:32 -08:00
Frank Seide 3da78187a1 IConfigRecord::operator() emulation of old CNTK ConfigParameters now returns a value directly, instead of a ConfigValue 2015-11-18 18:10:32 -08:00
Frank Seide 8a751f8df0 added a new overload to ConfigParameters::operator() which takes as the default value a typed value rather than a string. This is in prep for making the old ConfigParameters compatible with BrainScript;
all ConfigParameters accesses in SGDParams() now use the default values with type, such that as a next step, the same code will hopefully compile for both old config and BrainScript
2015-11-18 18:06:15 -08:00
Frank Seide 075c7cfa58 implemented IConfigRecord::ExistsCurrent() emulation 2015-11-18 11:48:37 -08:00