6c5b163999
Removed unecessary extern declaration
2016-03-14 09:55:03 +01:00
0b7733489c
Applied changes from master regarding BrainScript Network Builder
2016-03-14 09:55:02 +01:00
576eeb5f87
Moves SynchronouseExecutionEngine to ActionsLib
2016-03-14 09:55:00 +01:00
79a26db55f
Removes unecessary header (NetworkFactory.h moved into Actions.h)
2016-03-14 09:54:59 +01:00
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
75364c8936
Relocates Network building files from ComputationNetworkLib to ActionsLib.
2016-03-14 09:54:58 +01:00
e2f31ff658
Addresses CR : Rename NetworkCreator to NetworkFactory
2016-03-14 09:54:57 +01:00
7b3b3edabe
Applies CR feedback
2016-03-14 09:54:34 +01:00
f2c6ad01fa
Implements building the network from the network definition and evaluating the network through the "write" command without the need of a model.
2016-03-14 09:54:29 +01:00
a2307ac6cd
Factors out the CreateNetworkFn out of TrainActions into its own file (NetworkCreator.h)
2016-03-14 09:54:27 +01:00
877725d15e
Bugfix: Disable parallelization for commands other than ones for train, test and cv
2016-03-12 00:04:52 -08:00
64a659f632
bug fix: use lowercase for 'CNTK.core.bs' to find it on Linux builds
2016-03-07 13:31:22 -08:00
2ae9eea1a7
added first batch of BS standard operations
2016-03-06 00:25:39 -08:00
ecc8deb5b5
implemented include-path traversal for BrainScript and turned CNTK standard BS into an include file CNTK.core.bs;
...
bug fix for Issue #210 : PreComputeNodeBase must infer layout from input after loading;
ImageReader post-build events now consistently use xcopy
2016-03-05 21:27:04 -08:00
aaf65dce6f
Address CR feedback.
2016-03-03 19:53:50 -08:00
208517e005
Change regex in plot command to std::replace
...
(std::regex only works after gcc 4.9)
2016-03-03 19:53:49 -08:00
b6e5992676
Fix the build error after merge.
2016-03-03 11:26:00 -08:00
b2b669111c
Apply code review feedback
2016-03-03 11:25:58 -08:00
b0c3c5f7cf
Make the cross validation part supports multiple GPUs
2016-03-03 11:25:57 -08:00
7f7fce4c6e
RNN.cntk "write" example now writes out the log sentence probabilities, which is more useful, e.g. for N-best rescoring;
...
bug fix: SimpleOutputWriter must handle no-MBLayout case;
bug fix to LaunchUnaryTensorOp(), must free the CUDA event or else leak memory--thanks to Yu Zhang for tracking it down!
2016-02-29 18:16:55 -08: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
ea8babf571
updated rnn.cntk config
2016-02-28 11:40:38 -08:00
20d5f02e89
implemented make mode in "writeWordAndClass" action
2016-02-28 11:13:02 -08:00
12d79a420e
added "write" command to rnn.cnkt;
...
bug fix in ClassBasedCrossEntropyWithSoftmaxNode, a wrong index if #parseq > 1;
bug fix in TransposeTime dimension inference;
bug fix in simple writer, must call DataEnd()
2016-02-27 23:52:27 -08:00
570b6a8f7b
mini checkin
2016-02-27 22:23:22 -08:00
d55374d199
some clean-up of RNN sample and DoWriteWordAndClassInfo()
2016-02-27 18:15:35 -08:00
26c850322b
bug fix in Transpose();
...
prepared file format for RowStack and RowSlice to store their dimension along which they operate (currently limited to 1);
bug fix in "write" command "format" parsing;
ComputationNetwork::Read() now checks for too new file version
2016-02-23 11:14:36 -08:00
a4e9487e74
merged with master
2016-02-19 16:32:35 -08:00
73520b3160
Adds code for exporting model to DBN (legacy) format.
...
This format is based on a C# snippet provided by Anthony Stark
The code follows the C# flow to make it easier for future changes.
Corrects minor comment typos in Actions.h
Removes unecessary comment and code in SpecialPurposeActions.cpp
Applies minor comment and code cleanup to ComputationNetwork.cpp
2016-02-17 10:18:11 +01:00
d4a251c4fb
made gcc happy
2016-02-15 12:47:08 -08:00
343893e882
"write" command can now apply a labelMappingFile to print classification results as text labels
2016-02-15 11:45:54 -08:00
6ea2892967
"write" command now accepts to say type="category"
2016-02-15 11:03:53 -08:00
27820eb9f0
added formatting options to the "write" command, and allow pipes and "-" as the output name;
...
bug fix in FlattenInPlace()
2016-02-15 10:43:03 -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
9c8022006d
.vcxproj: remove HTKMLFReader IncludePath where not needed
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
2b22008843
.vcxproj: remove empty custom build steps
2016-02-10 09:05:31 +01:00
87ab8f728d
(comments)
2016-02-08 17:36:56 -08:00
a930d1cfb4
Updated EvalActions to fix support for OutputNodeNames in the config.
2016-02-04 13:11:13 -08:00
e34b380407
In the DoWriteWordAndClassInfo command add code to generate intermediate folders for the vocabulary file.
...
Add "," and ";" as delimiters in UCIFastReader.
2016-02-01 11:14:36 -08:00
73faaa7687
Remove <Scc*> tags from .vcxproj files
2016-01-29 11:21:06 +01:00
3224f02626
#5 change hardcode environment to system envrioments
2016-01-28 22:23:18 +08:00
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
af97079a58
removed #if-0'ed out code
2016-01-22 17:34:41 -08:00
a4cf44544a
normalized inconsistent commenting style from "//text" to "// text"
2016-01-22 13:58:47 -08:00
27641d86d0
normalized comment separator from /// to //
2016-01-22 13:47:40 -08:00
a4a20183aa
made everything build again after deleting the unused MultiNetworks functions, incl. deleting related entries in SimpleNetworkBuilder;
...
deleted PairNetworkNode;
renamed EsotericActions.cpp to SpecialPurposeActions.cpp
2016-01-22 09:13:52 -08:00
18b7b36cca
removed MultiNetworksSGD.h and -Evaluator.h, not yet made it compile
2016-01-22 08:28:57 -08:00
f1c3232024
Missing tabs-to-spaces conversion
2016-01-18 09:40:10 +01:00
dcfc0e9679
License change
2016-01-18 09:36:17 +01:00
2f39fe3f01
Re-format code using clang-format (plus some post-processing)
2016-01-18 09:36:14 +01:00
1bcefe770a
.gitattributes: set proper configuration for text files (and normalize files)
2016-01-18 09:35:54 +01:00
08e7d59059
moved all actions (DoXXX()) from CNTK.cpp to ActionsLib (no code change);
...
reenabled tensor lib (undid accidental commit)
2016-01-09 18:13:31 -08:00
33bb02c225
Fixed vcxproj.filters wrt restructuring
2015-12-16 09:42:02 +01:00
c3895bb0b3
Move Source files for directory restructuring and fix project dependencies
2015-12-16 08:35:11 +01:00
Gaizka Navarro
Amit Agarwal
Frank Seide
Yongqiang Wang
Wayne Xiong
Mark Hillebrand
thhoens
Dong Yu
Qiwei ye
Mark Hillebrand
Philipp Kranen