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

283 Коммитов

Автор SHA1 Сообщение Дата
Frank Seide ac381271dc updated ResNet solutions 2016-08-14 11:37:48 -07:00
Frank Seide 83ba229429 fixed up Tutorials in Solution;
modified ImageHandsOn ResNet
2016-08-14 10:33:01 -07:00
Frank Seide b6742c23ff added _Solution versions of SLUHandsOn up to Solution4 2016-08-13 22:11:28 -07:00
Frank Seide 4c61d0c385 SLUHandsOn starting model 2016-08-13 20:14:49 -07:00
Frank Seide f5e77e4efb minor fixes 2016-08-13 12:39:27 -07:00
Frank Seide c7df94d68c creating final version of ImageHandsOn 2016-08-13 11:21:37 -07:00
Frank Seide 5cd5ec8842 converted seqcla to sparse input 2016-08-07 18:34:14 -07:00
Eldar Akchurin 03539cd55b Fixing dependencies 2016-08-03 14:39:11 +02:00
Ivan Rodriguez 8003758fe2 Clean solution 2016-08-03 12:56:19 +02:00
Ivan Rodriguez d9a348f7d2 Start for BrainScriptTests module 2016-08-03 12:56:19 +02:00
Amit Agarwal 4164856b1f CNTK v2 library: Use dynamic loading of CompositeDataReader instead of a static dependency 2016-07-24 18:50:10 -07:00
Amit Agarwal 5b1c217688 CNTK v2 library: Added initial Trainer and MinibatchSource implementations, enabling end-to-end model training with v2 API. A test added to train a feed-forward network on the MNIST dataset using the v2 C++ API 2016-07-22 16:46:09 -07:00
Gaizka Navarro 271476466a Replaces loading EvalDLL dynamically, with import library. 2016-07-12 09:57:35 +02:00
Eldar Akchurin bab5374f46 Cleaning up some references to uci2ctf.py 2016-07-07 10:08:21 +02:00
Gaizka Navarro 3b71563f16 Moves ManagedEvalTests under the UnitTests folder in the solution (file paths were already correct). 2016-06-23 09:04:12 +02:00
Gaizka Navarro 1855bab4d9 Fixes typo in CS example
Adds reference to Wiki for NuGet package

Removes performance setting

Removes unecessary "using"
2016-06-20 17:14:46 +02:00
Gaizka Navarro eefb901214 Moves Evaluate Examples (CPPEvalClient, CSEvalClient) under the Examples/Evaluate path 2016-06-20 17:14:42 +02:00
Gaizka Navarro 009ab5a936 Cleans exception serialization
Adds serialization test
2016-06-20 17:14:42 +02:00
Gaizka Navarro 2a1438b5de Applies Clemens' changes and fixes 2016-06-20 17:14:18 +02:00
Gaizka Navarro 1104a7e134 Adds CNTK Eval Extended interface implementation for EvalExtendedWrapper
Updates C# example method and CLI EvalWrapper to use ValueBuffer instead of VariableBuffer

Merge with master and re-apply Serialization attributes

Updates EvalWrapper for extended interface

Adds Unit tests for Eval extended managed interface classes.
2016-06-20 17:12:31 +02:00
Mark Hillebrand a6b19ad966 CNTK.sln: add missing project dependency V2LibraryTests -> CNTKv2LibraryDll
Closes #598.
2016-06-16 10:42:03 +02:00
Amit Agarwal 0ec5b27404 Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library
Conflicts:
	CNTK.sln
2016-06-14 11:36:37 -07:00
Amit Agarwal a47c3d877f Temporarily add the CNTK v2 library tests as an end-to-end test. This will be switched to the BOOST unit test framework later when the framework is setup for linux too. 2016-06-13 09:45:51 -07:00
Eldar Akchurin 43759a432a Adding test cases 2016-06-13 10:16:23 +02:00
Amit Agarwal e875771784 Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library
Conflicts:
	CNTK.sln
2016-06-12 09:14:03 -07:00
Mark Hillebrand 3fdfc8fc94 Add missing build dependency ReaderTests -> CompositeDataReader 2016-06-07 15:29:48 +02:00
Eldar Akchurin 5d474c4d57 Renaming to HTKDeserializers 2016-06-06 15:23:39 +02:00
Eldar Akchurin 290139c4d7 Renaming ExperimentalHTKMLFReader into HTKMLFDeserializer 2016-06-06 14:02:25 +02:00
Amit Agarwal 933adb275a Add recurrence and variable length sequence support for the 'Function' abstraction 2016-06-05 14:36:16 -07:00
Frank Seide 27c163640a (fixed previous fix) 2016-06-01 14:47:24 -07:00
Frank Seide c3a933cc11 (fixed a SLN merge error) 2016-06-01 14:36:02 -07:00
U-FAREAST\fseide 87326dc883 merged from master 2016-06-01 14:14:03 -07:00
Gaizka Navarro 5d677585c6 Applies CR feedback
- Renames namespace and cpp file for name consistency
- Adds dependency for Common.lib
2016-06-01 17:14:07 +02:00
Gaizka Navarro d00c435a19 Fixes project dependecies for EvalDLL and EvalTests 2016-06-01 16:31:49 +02:00
Gaizka Navarro c81185d260 Renames EvalTest project to CommandEval 2016-06-01 16:15:00 +02:00
Amit Agarwal 76bf193267 First cut of the CNTK v2 C++ library implementation 2016-05-31 06:40:40 -07:00
Alexey Reznichenko 143b959160 Merge branch 'master' into alrezni/replace_uci_tests
Conflicts:
	CNTK.sln
2016-05-30 14:08:56 +02:00
Alexey Reznichenko 402252a9bd Replace e2e tests that use UCIFast with their CNTKTextFormat counterparts 2016-05-30 13:46:20 +02:00
U-FAREAST\fseide a1c72b26d6 merged from master 2016-05-27 11:29:16 -07:00
Project Philly b519e5de40 Integrate gaizna/eval_unittests into master 2016-05-25 07:08:56 -07:00
Alexey Reznichenko d8be484310 Replace UCIFast with CNTKTestFormat as the default reader 2016-05-25 11:11:38 +02:00
Gaizka Navarro feb7ac0826 Adds the EvalTests unit test project to the solution
Adds tests for the EvalTests unittest project covering the new EvalExtended interface

Adds check for mbLayout when creating VariableLayout in CNTKEvalExtended::ToVariableLayout function
2016-05-20 16:09:44 +02:00
Alexey Reznichenko 76c4bd8717 Add examples converted from UCI to the new text format
Add/convert all examples from Examples/Other/Simple2d and several from
    Examples/Image (all that use UCIFastReader).
2016-05-19 17:32:11 +01:00
frankseide 0ba41da07b cleaned up seq-2-seq sample further and added the CMUDict corpus 2016-05-11 18:21:22 -07:00
frankseide 2b60c41f3e updated ExperimentalHtkmlfReader/LSTM test w.r.t. the stabilizer test 2016-05-05 23:57:40 -07:00
Gaizka Navarro f73d14eae7 This commit adds the C++ Evaluation client example. This client shows how to use the EvalDLL.dll from a C++ applicaition for evaluating a model. 2016-05-04 16:49:39 +02:00
frankseide 8141d4e654 moved seq-2-seq config to its own Examples folder 2016-05-03 10:08:42 -07:00
Frank Seide 3143734b77 fixed up BlockMomentum test cases logging format;
added BlockMomentum test to VS Solution (thanks)
2016-05-02 19:06:51 -07:00
Frank Seide 64dd10f1e6 re-added a Project to the SLN file that got lost in previous merge 2016-05-02 17:17:22 -07:00
Frank Seide a503048de0 merged with master 2016-05-02 15:35:52 -07:00
Eldar Akchurin 3caeed2dbd Moving CompositeDataReader outside of common 2016-05-02 09:55:11 +02:00
Eldar Akchurin 6f002c35a1 Fixing dependencies and missing references for release 2016-05-02 09:55:11 +02:00
Eldar Akchurin 9efbd2ec4f Adding a stub for the reader that will compose different deserializers 2016-05-02 09:55:11 +02:00
Frank Seide b0dd54f6ee VS forgot to commit the sln file 2016-04-29 21:51:59 -07:00
Frank Seide 2a4d67395f more fix-ups of baseline files for new logging format;
added even more missing baseline test files to Solution
2016-04-29 11:03:28 -07:00
Frank Seide acaac50584 updated more baseline files w.r.t. logging change 2016-04-29 10:01:43 -07:00
Frank Seide e5ed06d5a4 added missing test-case files to Solution 2016-04-29 08:52:45 -07:00
Project Philly d4d8accf76 Integrate mahilleb/CommonLib into master 2016-04-27 01:27:09 -07:00
Mark Hillebrand 2488117b46 Source/Common/: also make a static library on Windows 2016-04-26 21:57:43 +02:00
Gaizka Navarro 2db7299876 This commit adds the linux baseline file to the solution 2016-04-26 17:14:58 +02:00
Gaizka Navarro c866b3cd54 This commit removes two non-existing baselines for the CIFAR-10 EndToEndTests 01_Convolution 2016-04-26 17:14:08 +02:00
Alexey Reznichenko 22b7f5084e Merge branch 'master' into alrezni/examples_text
Conflicts:
	CNTK.sln
2016-04-18 13:23:47 +02:00
Alexey Reznichenko 95a3888e1d Hook Examples\Text into Jenkins with baselines 2016-04-18 12:15:52 +01:00
Frank Seide 4c9f91868e merged from master and resolved conflicts 2016-04-16 14:29:11 -07:00
Alexey Reznichenko 242be1c4f5 Merge branch 'master' into deepbliscore/vnext
Conflicts:
	CNTK.sln
2016-04-15 17:19:20 +02:00
Gaizka Navarro 4bd64f928c This commit adds the CIFAR-10 Examples as end to end tests
Each test includes its run-test and testcases.yaml file and baselines.

This commit fixes the Example for Image/Miscellaneous/CIFAR-10 to work with data downloaded from the scripts without having to manipulate it first.
This commit also makes EndToEndTests out of the CIFAR-10 Example(s)
The EndToEnd tests copy the network shared data to the local folder for prior to running (if the data doesn't exist locally first)
It also fixes the access to external data for CIFAR-10 when running inside cygwin
It also modifies the CIFAR cofigurations to initialize on CPU.
It also sets the maxEpochs to reasonable values
It also adds the CIFAR README.md file to the solution.
This commit adds a note to the 01_Conv configuration file in CIFAR-10 EndToEndTests examples, indicating why minibatchMode="full" is needed.
It also updates the execution times in the yml files for the CIFAR-10 E2E Tests
2016-04-15 13:42:07 +02:00
Frank Seide b971cc3330 bug fix in SGD: TotalSamplesSeen should be the training aggregate, not the per-epoch value 2016-04-13 11:11:06 -07:00
Clemens Marschner d96f491dad Address review comments, create end-2-end test for dynamicAxis
- revert some changes from a previous merge
- fall back to default name for MBLayout internal to readers
- Fix ReaderShim (it required all matrices to have the same parallel
sequences)
- Add end-2-end test
- More meaningful message for Gather in CPUMatrix
- Rename ReconcileMBLayout to ReconcileDynamicAxis
-
2016-04-12 18:07:02 +02:00
Frank Seide b0bca78b35 updated beam decoder to new structure 2016-04-09 12:56:14 -07:00
Gaizka Navarro 2d462d3d1b Updates project dependencies between EvalDLL and ActionsLib 2016-03-17 17:08:44 +01:00
Gaizka Navarro 2487e48d5f Enables EvalWrapper to evaluate network without model (albeit still requiring input) 2016-03-17 17:08:44 +01:00
Gaizka Navarro 09c1355400 Enables EvalWrapper to evaluate ndl networks without a model
Adds a sample NDL operator for the C# application
Refactors C# Eval Client application to have 3 separate examples
2016-03-17 17:08:34 +01:00
Alexey Reznichenko 1280c606f0 Add reader for the new text format (item # 97) 2016-03-17 12:56:19 +01:00
Gaizka Navarro f92f559492 Fixed ConfigurationManagement build targets 2016-03-14 09:55:01 +01:00
Gaizka Navarro d238daaccd Relocates NetworkFactory header content to inside Actions.h and removes the NetworkFactory.h file
Assigns the correct build configuration to the solution platform for the NetworkTests project
2016-03-14 09:54:59 +01:00
Gaizka Navarro 45d1c160f5 Removes MixedPlatform build configuration 2016-03-14 09:54:32 +01:00
Gaizka Navarro 1e89ecd924 Removes Win32 Build Configuration for NetworkTests project 2016-03-14 09:54:31 +01:00
Gaizka Navarro 0cba4d0077 Adds UnitTest for operator Plus 2016-03-14 09:54:30 +01:00
Gaizka Navarro dc4f53bff1 Removes incompatible model tests 2016-03-11 09:41:22 +01:00
Gaizka Navarro a301b7f687 The function for saving to legacy dbn format is now located in the "specialized operations" section.
Adds test cases for exportdbn command
Modifies export to allow for cyclic dependency and raises a Warning instead of throwing a RuntimeError.
Makes ModelExport tests run only in Linux
Restricts when to test the exports (bvt-e release and gpu, nightly-e all)
Restrict the ModelExport tests to run under Linux only
2016-03-11 09:41:19 +01:00
Frank Seide 8a517d0c6d added an experimental seq-2-seq auto-encoder 2016-03-06 17:40:58 -08:00
Gaizka Navarro 565438b87d Makes ImageReader a project dependency to ReaderTests 2016-03-02 08:59:46 +01:00
Frank Seide 7d3e84e773 merged from master 2016-02-29 19:17:35 -08:00
Mark Hillebrand 4d5566d5ac Experimental HTKMLF Reader (currently only supports frame mode) 2016-02-29 15:54:39 +01:00
Frank Seide b7b4ca860d updated AlexNet E2E test 2016-02-26 23:02:49 -08:00
Philipp Kranen e90f775782 Added comments to MNIST configs 2016-02-02 20:08:31 +01:00
Philipp Kranen 7e424021f5 moving example e2es to E leg, adding all to VS solution 2016-02-02 20:08:31 +01:00
Eldar Akchurin b9d8961378 Fixing compiler issues + renaming 2016-02-02 14:34:21 +01:00
Mark Hillebrand 93fb8d8283 Rename Source/Readers/{{New -> }ImageReader,Reader{ -> Lib}} 2016-02-02 13:24:37 +01:00
Mark Hillebrand 52d6444920 Add new image reader under new reader architecture 2016-02-02 11:30:15 +01:00
Mark Hillebrand b0a6e00b8a Use .cntk as default extension for CNTK configuration files 2016-02-01 10:19:48 +01:00
Frank Seide b1e2753452 All image samples must take an imageLayout parameter 2016-01-30 11:56:57 -08:00
Frank Seide bee394dc0b fixed an incorrect consistency check in TrainOrAdaptModel() 2016-01-30 11:56:54 -08:00
Gaizka Navarro 4fe5fd7251 Modified projects and solution for a new CPUONLY configuration (Debug_CpuOnly and Release_CpuOnly)
Added missing CRT_SECURE_NO_WARNINGS to latticeNoGpu.cpp
Added missing reference to Matrix<double> (causing linking issues in Release_CpuOnly)
2016-01-27 16:16:37 +01:00
Gaizka Navarro c511c8899c Fixed dependency on Eval.DLL for EvalWrapper.DLL 2016-01-27 10:08:37 +01:00
Gaizka Navarro 53de59c1c7 Added CLI Wrapper to native Evaluation Model
Added C# Client for CLI wrapper
2016-01-25 15:08:54 +01:00
Gaizka Navarro e8bda6883b Merge branch 'master' of https://github.com/Microsoft/CNTK 2016-01-25 10:26:16 +01:00
Mark Hillebrand 76aef066cc Fixes to broken / missing paths in *.sln and *.vcxproj*
(Via check check-git-vs-vs.ps1)
2016-01-25 10:12:46 +01:00
Gaizka Navarro 250321031b Added Managed wrapper to Eval interface
Added CS Client for managed wrapper
2016-01-18 14:47:32 +01:00
Mark Hillebrand dcfc0e9679 License change 2016-01-18 09:36:17 +01:00
Mark Hillebrand 1bcefe770a .gitattributes: set proper configuration for text files (and normalize files) 2016-01-18 09:35:54 +01:00
Philipp Kranen 3eeb1872ad reflected deleted files and example updates in VS solution 2016-01-14 09:06:40 +01:00
Philipp Kranen 1527b89439 Adapted Readme files wrt new directory structure 2015-12-21 11:30:43 +01:00
Mark Hillebrand 9d065979c8 CNTK.sln: break out Other folder into top-level items, add Tools
This makes Documentation more visible.
2015-12-16 16:39:01 +01:00
Philipp Kranen c9a343b2a8 Fixed paths for ParallelTraining 2015-12-16 15:55:05 +01:00
pkranen 9ec5b2c522 Moved Examples for directory resturcturing 2015-12-16 15:34:09 +01:00
pkranen 8cb85a5895 Moved EndToEndTests 2015-12-16 12:57:49 +01:00
Philipp Kranen 33bb02c225 Fixed vcxproj.filters wrt restructuring 2015-12-16 09:42:02 +01:00
pkranen f355292fee Moved tests for directory restructuring 2015-12-16 08:35:13 +01:00
pkranen c3895bb0b3 Move Source files for directory restructuring and fix project dependencies 2015-12-16 08:35:11 +01:00
Philipp Kranen 449a84fb0e Removed files from VS solution that are not in Git anymore 2015-12-15 11:04:41 +01:00
Philipp Kranen b7c40c3109 Removed Mixed Platforms and Win32 2015-12-15 09:58:11 +01:00
Gaizka Navarro 565dc493c1 Added ReaderTests project 2015-12-11 13:27:12 +01:00
Philipp Kranen 32ca46db6c Updated baselines for text demo 2015-12-07 11:20:19 +01:00
Philipp Kranen a1947b41f6 Added demos to VS solution
Polished README
2015-12-07 10:14:46 +01:00
Frank Seide 18b6ac0e08 formatted the updated README to fit into 79 columns 2015-12-04 19:10:14 -08:00
Frank Seide 3d10f20953 deleted outdated ParseConfig project;
cleaned up some BrainScript code
2015-12-04 14:10:40 -08:00
Frank Seide cf3b3dd7bc added two missing baseline files to the VS Solution and updated their log messages 2015-12-01 08:09:10 -08:00
Frank Seide ea1471364b added Tests/Speech/Simple to VS Solution 2015-12-01 00:09:06 -08:00
Frank Seide 4932a5c5a8 added the SVD test to the Solution and fixed its baseline files to match the changed log messages 2015-11-30 23:50:41 -08:00
Frank Seide 4031c04f97 added Image Jenkins tests to VS solution and did the same edits as last commit to it 2015-11-26 22:38:07 -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
Wolfgang Manousek af9f747ab7 cleanup boost math tests, remove cntkmathtest 2015-11-23 12:57:37 +01:00
Frank Seide 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
Gaizka Navarro ced3af3ac5 Prepare for CR
Applied CR feedback
2015-11-18 09:40:47 +01:00
Frank Seide 54c4c8f7a4 bug fix: any deserialization of FunctionValues() must also update m_numRows/m_numCols (bug in MeanNode and InvStdDevNode) 2015-11-13 21:34:07 -08:00
Frank Seide e022a2fc17 added new Project CNTKActions where all actions should be moved to (later this will be a library accessible from other languages) 2015-11-12 10:46:07 -08:00
Eldar Akchurin 8177087271 Skeleton of the boost unit test project 2015-11-02 09:00:42 +00:00
Mark Hillebrand c306e333ba CNTK.sln: fix loading of Common/CheckInSuites/CheckInSuites.vcxproj 2015-10-27 11:40:16 +01:00
Amit Agarwal 4777f5f7d3 Rename SequenceTraining project to CNTKSequenceTrainingLib to be consistent with other libs 2015-10-18 12:40:43 -07:00
Frank Seide 146140eee6 merged with fseide/winlstm;
fixed a few error throws to XXXError() calls;
moved one Validate() dimension check under isFinal condition
2015-10-14 15:16:52 -07:00
Frank Seide f829b4edcc added the new test files to the Solution 2015-10-14 13:52:40 -07:00
Alexey Kamenev 9aba3648f0 Add ImageReader 2015-10-14 12:27:29 -07:00
Frank Seide c5cb3ab7d2 pulled all config parameters from SGD into a separate struct SGDParams;
normalization of learning rates and momentum is now done at the latest possible point, using member functions. BUGBUG: This gets me lower LR as before, it seems the old code did not what it pretended to do;
SetSeqParam() now takes smoothing weight and frame-drop threshold as 'double' instead of ElemType;
deleted a completely unnecessary ~HTKMLFReader()
2015-10-02 14:09:14 -07:00
Frank Seide de5bd81919 merged with master 2015-10-02 09:12:59 -07:00
Frank Seide 2f04535237 added a static variant of ComputationNode::DataSlice() that takes a layout, so that it can be applied to matrices other than m_{function,gradient}Values;
conceptually added ability to DataSlices() to pull out one sequence, but not finished since Matrix::RowSlice() does not exist;
deleted Win32 entries from VS Solution--again
2015-10-01 14:36:36 -07:00
Amit Agarwal 86c2836abd Added a LSTM full utterance training E2E test 2015-10-01 14:00:29 -07:00
Amit Agarwal b028b80501 a) Replaced use of DBN cuda matrix with CNTK matrix type b) Merged dbncuda and gammacalculation libs into a single SequenceTrainign lib c) Other code cleanup and refactoring 2015-09-25 00:11:46 -07:00
RuiZhao b9699faa5a SE_merge_09232015 2015-09-24 14:28:33 -07:00
RuiZhao 1424fa4cee SE_v1 2015-09-23 20:14:20 -07:00
Amit Agarwal dc92c384cd Include CNTKMathTest in the VS build to avoid build issues in the project from getting in undetected 2015-09-21 13:59:05 -07:00
Frank Seide 0abac0d4be Merge branch 'master' into fseide/loops
Conflicts:
	CNTK.sln
2015-09-18 17:40:37 -07:00
Amit Agarwal 960e0fe644 Add Kaldi sources to the VS solution 2015-09-18 12:15:19 -07:00
Frank Seide 19f6653a26 (fixed another #include order in MatrixQuantizerGPU.h) 2015-09-18 08:08:23 -07:00
erw fdd93c3492 Merge branch 'master' of https://git.codeplex.com/cntk
Conflicts:
	CNTK.sln
2015-09-18 01:57:18 -07:00
erw 9812602cef 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
Frank Seide 724faf311a temporarily disabled CNTKMathTest 2015-09-17 21:33:33 -07:00
Frank Seide acb03644bc 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
Frank Seide c62c813f82 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
Frank Seide 27d12d21b4 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