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

161 Коммитов

Автор SHA1 Сообщение Дата
Thilo Will c36b45d2a7 Exposed LopPLus in ComputationNetworkBuilder.
Test for forward path works.
Added untested fix for backward path.
2016-07-07 14:13:57 +02:00
Mark Hillebrand 0cd50e0edf Fix build with active codepage 936 (non-ASCII characters in files without BOM)
This closes #487, closes #47.
2016-06-15 14:24:17 +02:00
Alexey Kamenev dd373969f2 Removed MaxPoolingMaskNode 2016-06-14 09:58:16 -07:00
Alexey Kamenev dd21564eee Added MaxUnpoolingNode. 2016-06-14 09:58:16 -07:00
Alexey Kamenev e251a77fb7 Renamed to MaxPoolingMask and completed CPU/GPU implementation. 2016-06-14 09:58:16 -07:00
Alexey Kamenev 46ef8a121f Added MaxPoolingIndicesNode. 2016-06-14 09:58:16 -07:00
Alexey Kamenev 112dd21785 Deconvolution suport, part 1. 2016-06-14 09:58:16 -07:00
Frank Seide fbf07fb634 (removed debug code) 2016-06-09 17:59:25 -07:00
Frank Seide 40ba15570f rolled back using NetworkFactory for eval command, and rolled back the superfluous NDLNetworkBuilder for 03_ 2016-06-09 14:00:22 -07:00
Frank Seide 3bf23b386a temporarily hiding BrainScript in MNIST 01_ example 2016-06-08 19:10:12 -07:00
Frank Seide f50f6a78e8 changed 01_OneHidden to BrainScript & dealt with fallout 2016-06-06 18:22:10 -07:00
Alexey Reznichenko b42e1967b1 Fix the second SimpleEvaluator ctor call
Close #485.
2016-06-06 10:14:01 +02:00
Project Philly 72f59c4115 Integrate alrezni/scratch into master 2016-06-03 01:18:54 -07:00
Alexey Reznichenko 02216f2621 Fix a bug in DoEvalBase
Add a missing argument to SimpleEvaluator ctor call, so
    that all parameters are aligned with proper values.
2016-06-02 13:46:10 +02:00
Thilo Will 24ce82303c merge with master 2016-06-02 11:36:50 +02:00
Alexey Reznichenko 041b4f0bea Do not overwrite 'traceLevel' in the reader config section 2016-06-01 13:55:02 +02:00
Thilo Will 6f90287f12 Removed the the prefix 'Comparsion' from the comparison node names. 2016-05-27 14:15:11 +02:00
Thilo Will c140a1e264 Adding Compare nodes (Less, Greater, ...) 2016-05-23 16:06:40 +02:00
frankseide 80461f42e1 CNTK error message now comes last, so it can be seen using 'tail';
prettied up BrainScript error messages
2016-05-05 10:57:18 -07:00
Amit Agarwal 0bfe5ff94c Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cudaErrorBugFix 2016-04-27 12:22:27 -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
Amit Agarwal 7a9738af62 Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cudaErrorBugFix 2016-04-26 11:40:50 -07:00
Mark Hillebrand 71d0c194ff .vcxproj: start sharing settings, starting with static libraries 2016-04-26 17:02:01 +02:00
Thilo Will 25eff37ba6 merged with master 2016-04-26 11:05:58 +02:00
Amit Agarwal 08747ebdab Fix distributed reading handling in the Eval code 2016-04-25 19:13:47 -07:00
Thilo Will 7d1cfb77e6 merged with master 2016-04-25 17:41:54 +02:00
William Darling 04ba892adf addressing first set of comments from CR 2016-04-25 12:07:21 +02:00
William Darling 46b96b551a implementing ClipByValue(x, minValue, maxValue) in CN lib, NDL, and BS 2016-04-25 12:02:01 +02:00
Aayush Garg 2d5614618d Floor,ceil,round operators impl. and tests 2016-04-22 08:43:41 -07:00
Thilo Will 18e8f49f80 Implementing IfNode 2016-04-22 10:17:13 +02:00
Yongqiang Wang 800adf0a48 Fixing plot command output issue. Adding one test case for plot command. 2016-04-19 15:27:43 -07:00
U-FAREAST\fseide 731839dc6e Merge branch 'master' of https://github.com/Microsoft/CNTK into fseide/packmatrix 2016-04-19 08:21:10 -07:00
Mark Hillebrand 618d185400 .vcxproj: add more quoting
To allow to build from solution directory with spaces.
2016-04-18 16:17:30 +02:00
Frank Seide 7a969bb528 moved SumColumnElementsNode to new header DeprecatedNodes.h. No code change 2016-04-17 18:30:27 -07:00
Frank Seide 4c9f91868e merged from master and resolved conflicts 2016-04-16 14:29:11 -07:00
Frank Seide 78d10c5c71 merged from master 2016-04-15 15:21:04 -07:00
Alexey Reznichenko 49a1d3bb4c Merge branch 'master' into deepbliscore/vnext 2016-04-14 12:33:53 +02:00
Mark Hillebrand 885f665159 .vcxproj: clean up include and library path settings
Closes #89.
2016-04-14 10:51:56 +02:00
Clemens Marschner ca4afe5c67 Address review comments 2016-04-13 14:30:06 +02:00
Frank Seide 1224dfc9bc refactored criterion reporting in SGD and SimpleEvaluator to carry a per-criterion-node sample count, in preparation for supporting criterion nodes with different sequence lengths for seq-2-seq 2016-04-12 23:09:08 -07:00
Frank Seide ac6afa4812 merged with master 2016-04-12 18:42:12 -07:00
Alexey Reznichenko 4621a3fb2c Merge branch 'clemensm/dynamicaxis' into deepbliscore/vnext_backup
Conflicts:
	Source/Common/Include/Sequences.h
	Source/Readers/ReaderLib/ReaderShim.cpp
	Source/SGDLib/DataReaderHelpers.h
	Tests/UnitTests/ReaderTests/Common/ReaderTestHelper.h
2016-04-11 16:12:43 +02:00
Clemens Marschner 7a02cb2528 Add DynamicAxis, and enable it for Input/SparseInput nodes 2016-04-10 08:28:51 +02:00
Frank Seide c8e2b2eb88 bug fix: DoWriteWordAndClassInfo() should not form classes when nbrCls == 0 2016-04-09 14:20:08 -07:00
Alexey Reznichenko 8a28ec8216 Merge Frank's MBLayout changes 2016-04-08 16:37:08 +02:00
Alexey Reznichenko c4d4934479 Merge branch 'master' into deepbliscore/vnext
Conflicts:
	Source/ComputationNetworkLib/ReshapingNodes.cpp
	Source/Readers/ExperimentalHTKMLFReader/MLFDataDeserializer.cpp
	Source/Readers/ImageReader/ImageDataDeserializer.cpp
	Source/Readers/ReaderLib/FramePacker.h
	Source/Readers/ReaderLib/PackerBase.cpp
	Source/Readers/ReaderLib/PackerBase.h
	Source/Readers/ReaderLib/ReaderShim.cpp
	Source/Readers/ReaderLib/SequencePacker.cpp
	Source/Readers/ReaderLib/SequencePacker.h
2016-04-08 13:39:03 +02:00
thhoens 97de95a9ba Code cleanup and updated error message. 2016-04-07 14:11:17 -07:00
thhoens ba1a05738d Added a more descriptive error message to CheckOutputNodes 2016-04-07 13:54:13 -07:00
William Darling cf101570ec changes to support sin() node 2016-04-07 16:16:11 +02:00