5bd7852956
Fix kaldi Reader. 1) Using the new MBLayout interface. 2) Modify the configParameter to configRecordType to consistent with HTKMLFReader. 3) Clean the warning message. Next: refactor to make it consistent with HTKMLFReader.
2015-12-14 11:00:20 -05:00
ec4df193d2
renamed commandArgUtil.h to Config.h and ConfigFile.cpp to Config.cpp;
...
bug fix in previous refactoring of sub-minibatching
2015-12-04 22:31:47 -08:00
ff07b49850
renamed several methods/names to more familiar or concise names:
...
EvaluateThisNode() -> ForwardProp();
ComputeInputPartial() -> BackpropTo();
SaveToFile() -> Save() (where else to save? In the bank?);
LoadFromFile() -> Load();
ImageLayout -> TensorShape;
m_imageLayout -> m_sampleLayout
2015-12-04 16:08:30 -08:00
bccf4b2bd0
bug fix: several readers did not use a case-insensitive string compare for the 'randomize' parameter
2015-11-27 00:22:30 -08:00
63d031a746
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
bab309e7b9
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
cea0043fa1
#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
3751f133a3
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
7415d6b3b2
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
2f06236bb4
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
4e582e9aca
Fix file headers
2015-11-03 14:39:10 +01:00
34d468ecad
Fix KaldiReader for the new interface (SetValue).
2015-10-28 18:36:52 -04:00
8af781a533
Merge remote-tracking branch 'origin/master' into yu/memshare
...
Conflicts:
BrainScript/BrainScriptEvaluator.cpp
BrainScript/BrainScriptParser.cpp
BrainScript/BrainScriptParser.h
BrainScript/BrainScriptTest.cpp
Common/Include/Basics.h
Common/Include/ssematrix.h
DataReader/LMSequenceReader/LMSequenceReader.vcxproj
DataReader/SparsePCReader/SparsePCReader.vcxproj
MachineLearning/CNTK/ExperimentalNetworkBuilder.cpp
MachineLearning/CNTK/SynchronousExecutionEngine.cpp
MachineLearning/CNTKComputationNetworkLib/ComputationNetwork.cpp
MachineLearning/CNTKComputationNetworkLib/ComputationNetwork.h
MachineLearning/CNTKComputationNetworkLib/ComputationNetworkBuilder.cpp
MachineLearning/CNTKComputationNetworkLib/ComputationNode.h
MachineLearning/CNTKComputationNetworkLib/InputAndParamNodes.h
MachineLearning/CNTKComputationNetworkLib/NetworkBuilderFromConfig.cpp
MachineLearning/CNTKComputationNetworkLib/NonlinearityNodes.h
MachineLearning/CNTKComputationNetworkLib/TrainingCriterionNodes.h
MachineLearning/ParseConfig/ParseConfig.vcxproj
Math/Math/ValueQuantizer.h
Tests/Speech/LSTM/cntk.config
2015-10-13 01:34:23 -04:00
dcf567e586
Merge remote-tracking branch 'origin/guoguo/linuxBuildFix' into yu/memshare
...
Conflicts:
MachineLearning/CNTK/SynchronousExecutionEngine.cpp
MachineLearning/CNTKComputationNetworkLib/CompositeComputationNodes.h
MachineLearning/CNTKComputationNetworkLib/ComputationNetwork.cpp
MachineLearning/CNTKComputationNetworkLib/ComputationNetwork.h
MachineLearning/CNTKComputationNetworkLib/ComputationNode.h
MachineLearning/CNTKComputationNetworkLib/ConvolutionalNodes.h
MachineLearning/CNTKComputationNetworkLib/DecoderNode.h
MachineLearning/CNTKComputationNetworkLib/EvaluationCriterionNodes.h
MachineLearning/CNTKComputationNetworkLib/InputAndParamNodes.h
MachineLearning/CNTKComputationNetworkLib/LinearAlgebraNodes.h
MachineLearning/CNTKComputationNetworkLib/NetworkBuilderFromConfig.cpp
MachineLearning/CNTKComputationNetworkLib/NonlinearityNodes.h
MachineLearning/CNTKComputationNetworkLib/RecurrentNodes.h
MachineLearning/CNTKComputationNetworkLib/TrainingCriterionNodes.h
2015-10-13 00:24:52 -04:00
b3e2a4cae6
Merged Common/basetypes.h and HTKMLFReader/basetypes.h and deleted the HTKMLFReader/basetypes.h copy
2015-10-10 02:06:03 -07:00
2cf85dac99
Centralized PrintCallStack calls
2015-10-10 00:22:36 -07:00
42ea476cf0
Remove some unused variables.
2015-10-09 02:08:46 -04:00
e78d4ed38a
Merge remote-tracking branch 'remotes/origin/master' into guoguo/linuxBuildFix
2015-10-09 00:46:08 -04:00
1c93b56ccc
Modified Kaldi2Reader to use MBLayout; fixed the broken sequence training in Kaldi2Reader due to the recent code re-factorization
2015-10-03 16:27:03 -04:00
5fc94625f8
Remove redundant files.
2015-10-01 20:13:28 -04:00
8ae7966876
fixing linux build for master branch; removed duplicated files in KaldiReader and Kaldi2Reader
2015-09-30 18:02:05 -04:00
409ca3b456
Eradicate all possible warnings from g++
...
Replace hash_map with unordered_map
Fix size_t formatting (%zd)
Add some missing sprintf_s args
Some methods defined in base class need the base mentioned in templates
Don't use classname::methodname in class definitions
2015-09-17 16:00:48 -04:00
16d85552e1
Add some missing line breaks.
2015-08-24 11:07:38 -04:00
a7dbb5815f
Bug fix in Kaldi2Reader: sequence start was not set for utterances shorter than the minibatch
2015-08-09 15:57:55 -04:00
501ee3bc8e
Small fix to sequence training
2015-08-04 19:45:16 -04:00
d2fdf84b55
Bug fix: fixing dimensionality mismatch after using MEL for sequence training model
2015-08-03 18:30:51 -04:00
145e7c43ec
Fixing mixing LSTM state when buffering minibatches
2015-08-01 01:11:53 +00:00
27e32a8ee9
Some cosmetic change in Kaldi2Reader
2015-07-30 18:00:05 +00:00
de33865a3a
Limit number of overflow warnings in Kaldi2Reader; Add configuration for setting overflow value
2015-07-30 17:16:32 +00:00
7898ab61f1
comment out unnecessary output check and print in Kaldi2Reader that causes problems with non-probability outputs
2015-07-30 04:31:33 -04:00
a996f300c8
Merge branch 'linux-gcc' of https://git01.codeplex.com/cntk into linux-gcc
2015-07-29 10:40:57 -07:00
35589fe0ad
refine PastValueNode and FutureValueNode. Fixed a bug in FutureValueNode When it's not inside a loop.
2015-07-29 10:40:45 -07:00
1c5c7532f7
Bug fixing regarding m_uttDerivBuffer is NULL
2015-07-29 16:04:21 +00:00
85f5777a52
Adding interface for utterance derivative computation in the Kaldi2Reader
2015-07-29 03:30:56 +00:00
be548dcb7c
Fixing end-of-epoch issue for sequence training
2015-07-27 08:59:16 +00:00
06e0b54078
Skipping utterances without lattice or alignment in sequence training
2015-07-26 22:14:24 +00:00
c506ece07d
adding verbosity support in DataReader/Kaldi2Reader/HTKMLFWriter.cpp
2015-07-25 09:53:30 +00:00
bb7f808a7b
Changing NO_LABEL to NO_INPUT in Kaldi2Reader
2015-07-25 00:14:48 +00:00
95616b9748
updating sentence boundary mark for Kaldi2Reader, HTKMLFReader and KaldiReader
2015-07-24 23:04:31 +00:00
186e508a3d
Merge branch 'linux-gcc' of https://git.codeplex.com/cntk into linux-gcc
2015-07-24 16:55:29 +00:00
73c6db513d
Adding suppport for parallelized sequence training in Kaldi2Reader
2015-07-24 16:55:21 +00:00
c562a5f859
Fix some minor bug in Kaldi2Reader.
2015-07-23 10:07:54 -04:00
7caee9cd40
minor changes based on code review
2015-07-20 12:50:47 -07:00
c426a7138f
fix problems in reader when files have duration mismatch
2015-07-20 12:50:45 -07:00
2e31ea0fa3
Adding multi-utterance support in Kalsi2Reader for Truncated == false
2015-07-17 21:25:10 +00:00
1cfd7a41e1
Merge branch 'master' into linux-gcc
2015-07-14 21:52:08 +00:00
ea42e590b4
Fix multi-io bug for Kaldi2Reader.
2015-07-13 22:09:43 -04:00
36baaa7d5c
Fix bug when m_truncated=false.
2015-07-13 05:49:16 -04:00
6c5f636417
Fix build and fix assertion error when we do multi-io training.
2015-07-12 01:17:31 -04:00
a2f1c31204
fixing sentence boundary issues for sequence training
2015-07-11 08:26:15 +00:00
yzhang87
Frank Seide
Mark Hillebrand
Amit Agarwal
Guoguo Chen
Scott Cyphers
Hakan Erdogan
Dong Yu
Mike Seltzer