b5be3edc7d
getting rid of "variable hides ... " warnings.
...
# Conflicts:
# Source/Common/Include/Platform.h
# Source/Common/Include/ScriptableObjects.h
# Source/ComputationNetworkLib/ComputationNetworkAnalysis.cpp
# Source/ComputationNetworkLib/RNNNodes.cpp
# Source/Readers/HTKMLFReader/msra_mgram.h
# Source/Readers/HTKMLFReader/utterancesourcemulti.h
# Source/Readers/LMSequenceReader/SequenceParser.cpp
# Source/SGDLib/SGD.cpp
2016-11-25 01:04:50 +01:00
e686d1f79e
addressing CR comments.
...
# Conflicts:
# Source/CNTK/BrainScript/BrainScriptEvaluator.cpp
# Source/Common/ExceptionWithCallStack.cpp
# Source/Common/Include/Config.h
# Source/Common/Include/Platform.h
# Source/Common/Include/latticearchive.h
# Source/Common/Include/numahelpers.h
# Source/Math/CPUMatrix.cpp
# Source/Math/Matrix.cpp
# Source/Math/QuantizedMatrix.cpp
2016-11-23 23:12:32 +01:00
c28ac3327e
.vcxproj: remove <BrowseInformation/> and <Bscmake/>
...
This is a partial revert of 18fa8097bf
2016-10-18 10:29:54 +02:00
d7e02247a8
Add Release_NoOpt flavor for python debugging
2016-10-14 14:21:23 -07:00
18fa8097bf
merge
2016-10-12 13:25:17 +02:00
4d7d430359
Adding GetCurrentSamplePosition to the reader interface
2016-10-06 16:18:41 +02:00
e0b62abf4a
Revert "Add NoOpt build flavor"
...
This reverts commit d8a14c9e2a
2016-10-05 14:07:01 -07:00
d8a14c9e2a
Add NoOpt build flavor
2016-10-05 13:53:14 -07:00
d8be484310
Replace UCIFast with CNTKTestFormat as the default reader
2016-05-25 11:11:38 +02:00
bd087c1715
Add deprecation notice
2016-05-24 12:57:03 +01:00
44a1e8756c
Revert "Raise an exception in UCIFast contstructor"
...
This reverts commit 9ad127dacd
2016-05-24 09:42:11 +02:00
9ad127dacd
Raise an exception in UCIFast contstructor
2016-05-24 09:40:42 +02:00
d79e568663
change the roll back logic to the original design to favor reproducibility and restartability.
...
Minor info display fix in UCIFastReader.
2016-05-03 11:43:57 -07:00
4228ed8876
Changin getNumParallelSequences
2016-05-02 09:55:11 +02:00
551de4bffb
Fixing rebase issues
2016-05-02 09:55:11 +02:00
2256785534
Adding dependencies on the composite reader
2016-05-02 09:55:11 +02:00
2488117b46
Source/Common/: also make a static library on Windows
2016-04-26 21:57:43 +02:00
4c9f91868e
merged from master and resolved conflicts
2016-04-16 14:29:11 -07:00
78d10c5c71
merged from master
2016-04-15 15:21:04 -07:00
49a1d3bb4c
Merge branch 'master' into deepbliscore/vnext
2016-04-14 12:33:53 +02:00
885f665159
.vcxproj: clean up include and library path settings
...
Closes #89 .
2016-04-14 10:51:56 +02:00
5fe1bb93c1
Address CR comments
2016-04-13 16:00:24 +02:00
ac6afa4812
merged with master
2016-04-12 18:42:12 -07:00
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
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
7a02cb2528
Add DynamicAxis, and enable it for Input/SparseInput nodes
2016-04-10 08:28:51 +02:00
8a28ec8216
Merge Frank's MBLayout changes
2016-04-08 16:37:08 +02:00
85ce93e37f
.vcxproj: remove non-existing library and include directories
2016-04-06 13:41:58 +02:00
cb4c049a30
fixed resetting of gradients in rare case that loop contains extra nodes at end that need a zero gradient in final time step;
...
log now contains name of time axis
2016-04-05 13:06:57 -07:00
1e8fb643ff
(forgot to include UICFastReader.cpp);
...
added a name field to MBLayout, for now for debugging
2016-04-05 10:05:18 -07:00
e54b352822
removed template parameter ElemType from (I)DataReader and (I)DataWriter
2016-02-28 19:01:07 -08:00
5bdc86e5de
removed <ElemType> parameter from StreamMinibatchInputs
2016-02-28 17:04:45 -08:00
6249935000
StreamMinibatchInputs now stores shared_ptrs, simplifying ownership;
...
UCIFastReader::m_prefetchMatrices changed to be StreamMinibatchInputs as well
2016-02-28 15:05:14 -08:00
f3a720e5ce
replaced StreamMinibatchInputs::operator[] by named searchable accessor functions
2016-02-28 13:34:02 -08:00
24c88c04fd
abstracted the map<wstring, Matrix*> into a class, for future enrichment
2016-02-28 12:25:36 -08:00
09dea188f5
Adds ExceptionWithCallStack class to wrap native exceptions (runtime_error, logic_error, invalid_arguent), so that the call stack can be provided to the managed layer.
...
Moves DebugUtil functions (PrintCallStack, GetCallStack) to ExceptionWithCallStack
Refactors the PrintCallStack and GetCallStack functions in ExceptionWithCallBack to re-use the common functionality.
Make gcc happy
2016-02-23 09:11:12 +01:00
4c8c076130
Merge branch 'master' of https://github.com/Microsoft/CNTK into dongyu/SimpleWriterFix
...
Conflicts:
Source/SGDLib/SimpleOutputWriter.h
2016-02-22 15:54:23 -08:00
a4e9487e74
merged with master
2016-02-19 16:32:35 -08:00
55da016d5a
minor fix in UCIFastReader to support multiple regression labels.
2016-02-18 15:11:02 -08:00
9c63a33965
change arguments in UCIParser's constructor and Init function non-optional.
2016-02-17 17:00:41 -08:00
e4e2081460
DataEnd() no longer takes a parameter since it was always the same
2016-02-15 19:05:13 -08:00
1dce6628dd
BatchSequenceReader now does not drop last token if there is no output label defined;
...
removed unused EndDataType cases
2016-02-15 18:45:12 -08:00
4ff83434c9
support labelType=None (or without the label section at all)
...
support labelType=Regression without having a label mapping file
support labelType=Regression with multiple dimensions
2016-02-11 15:53:08 -08:00
1b29d2fd69
.vcxproj: let intermediate output go into a common directory
...
Fixes #12 .
2016-02-10 09:10:07 +01:00
2c2a721fa8
CNTK.Cpp.props: define properties to distinguish build flavors and use them
2016-02-10 09:05:31 +01:00
ea55623979
Introduce CNTK.Cpp.props and load in every .vcxproj
2016-02-10 09:05:31 +01:00
52aad32084
.vcxproj: drop include path $(VCInstallDir)atlmfc\include
2016-02-10 09:05:31 +01:00
3b979f877a
.vcxproj: coalesce importing for .user.props for Debug / Release
2016-02-10 09:05:31 +01:00
87ab8f728d
(comments)
2016-02-08 17:36:56 -08:00
901f99f5de
further simplified case-insensitive string compares
2016-02-03 09:17:58 -08:00
Friedel van Megen
fmegen@microsoft.com
Mark Hillebrand
KeDengMS
Nikos Karampatziakis
Eldar Akchurin
Alexey Reznichenko
Dong Yu
Frank Seide
Clemens Marschner
Gaizka Navarro