b67ca20a9f
Merge branch 'master' of http://vstfpg07:8080/tfs/msrspeech/msrspeech/_git/cntk into DSSM-Internal
...
Conflicts:
Common/ConfigFile.cpp
Common/File.cpp
Common/fileutil.cpp
MachineLearning/cn/cn.cpp
Math/Math/GPUMatrix.cu
Math/Math/GPUMatrixCUDAKernels.cu
Math/Math/GPUSparseMatrix.cu
2015-02-11 17:35:08 -08:00
57d6d94713
Merge branch 'master' of https://git01.codeplex.com/cntk
2015-02-11 16:58:46 -08:00
69ef6f22db
change the way where and how the columns with values are determined so that even if the sparse matrix is generated from another computation the MultiplyAndAdd function still works.
...
Add support of keep existing values when the matrix is resized in the GPUSparseMatrix::Resize function.
Change m_blockId to more meaningful names and change the type to make it consistent with other index types.
2015-02-11 16:58:27 -08:00
c1e94a0ce0
Update LUSequence Parser to suport blank lines as sentence ending
2015-02-11 10:10:15 -08:00
9515c202c3
Use 2048 instead of MAXSTRING as this macro is defined elsewhere but is not accessible in cn.cpp.
2015-02-10 16:20:11 -08:00
0eb104e68b
Add a new command writeWordAndClass. This command writes two output files. One maps word to class. The other maps class index to the left boundary in word index of its class. This command is used for class-based entropy training for language model.
2015-02-10 16:11:02 -08:00
ca4f760c34
Edited the project to treat warnings as errors.
2015-02-10 13:17:57 -08:00
e28f4a6555
Fixed a bug in DSSMReader where the labels matrix wouldn't be resized for partial batches.
2015-02-10 13:13:43 -08:00
a4b05e9d24
Modify HTKMLFReader/fileutil.cpp to support load in MLF file larger than 2 GB.
...
Improve the prebuild.bat. (previous code assume dos shell already allow delay
expansion)
2015-02-10 12:14:42 -08:00
9d7d773fd5
added support for asymmetric context windows to reader for write mode
2015-02-09 22:09:50 -08:00
39b9d2c3e4
updated the book to include LogSoftmax node and pageFilePath in the HTKMLFReader.
2015-02-09 18:00:53 -08:00
756bdb7939
Merge branch 'master' of https://git01.codeplex.com/cntk
2015-02-09 17:40:00 -08:00
4ee235db91
Added LogSoftmaxNode to be used in the class-based LM.
...
Fixed the bug on how the prevLearnRates is handled in SGD.h.
Added warnings when the matrix device or types changes for over 20 times. This is useful to catch performance problems caused by device or matrix type switches.
2015-02-09 17:37:25 -08:00
4ea12b8e75
Add GPU lock function.
...
GPU lock is implemented using named CreateMutex under windows platform. The
name is consistent with DBN tools to avoid conflict with dbn.exe
To control the GPU lock behavior, users can specify
LockGPU = true # default
or
LockGPU = false
in config.
Over-subscription has not been implemented yet.
2015-02-09 15:53:26 -08:00
2d1ec9471d
Fixed the bug by merging
2015-02-08 02:55:40 -05:00
24874c0501
Merge remote-tracking branch 'origin/master' into linux-gcc
...
Conflicts:
.gitignore
Common/TimerUtility.cpp
DataReader/SequenceReader/SequenceParser.h
DataReader/SequenceReader/SequenceReader.cpp
MachineLearning/cn/SGD.h
MachineLearning/cn/cn.cpp
Math/Math/CPUSparseMatrix.cpp
Math/Math/GPUMatrix.cu
Math/Math/GPUSparseMatrix.cu
Math/Math/GPUSparseMatrix.h
2015-02-08 00:31:32 -05:00
705b98a79f
fixed merge errors of previous commit
2015-02-06 16:44:09 -08:00
b4f465b8c4
Merge branch 'master' of https://git01.codeplex.com/cntk
...
Conflicts:
DataReader/HTKMLFReader/HTKMLFReader.cpp
DataReader/HTKMLFReader/HTKMLFReader.h
2015-02-06 16:14:47 -08:00
26d9e66b87
changes hktmlfentry to support numframes as an unsigned int instead of unsigned short for longer utterances
2015-02-06 16:07:56 -08:00
60a93fb9f0
Add linux version of HTKMLFReader to the makefile
2015-02-06 17:52:36 -05:00
019a3e2977
Add linux version of HTKMLFReader, will merge it with the windows version after testing.
2015-02-06 17:47:21 -05:00
f3dfe81034
merge m_blockVals with m_pArray in GPUSparseMatrix
...
Change ClassBasedCrossEntropyNode to use TypeNames instead of literals when determining the node types.
2015-02-06 14:00:05 -08:00
37a1b1b508
The keyword cannot be variable name in g++. So change "default" to "defaultValue".
2015-02-06 16:19:50 -05:00
41dc51ff4f
Disable prebuild.bat in linux temoprarily. Will add this function in linux version soon.
2015-02-06 16:19:08 -05:00
697866a0d7
Merge remote-tracking branch 'origin/master' into linux-gcc
2015-02-06 14:45:31 -05:00
b7fb0ddc87
rewrite all BlockCol and BlockRow format related GPU Kernals. The original versions are all incorrect and slow.
...
Revoke back to redirect stderr even under debug version since users can just comment out the stderr line in the config to stop redirection.
2015-02-06 10:02:07 -08:00
c7085c7e2d
bug fixes in HTKMLFReader: randomizationNone for rollingwindow and context window setting for write
2015-02-05 19:26:36 -08:00
69e88c0cb4
Merge branch 'thhoens' of http://vstfpg07:8080/tfs/msrspeech/msrspeech/_git/cntk
2015-02-05 16:49:55 -08:00
9610e69acd
Fixed some compilation issues. Still trying to determine why _CRT_SECURE_NO_WARNINGS doesn't work for basetypes.h.
2015-02-05 16:49:38 -08:00
ed3dfd796a
DSSM project setting change. remove precompiled headers.
2015-02-05 16:23:15 -08:00
2e1151399b
rewrite all BlockCol and BlockRow format related GPU Kernals. The original versions are all incorrect and slow.
...
Revoke back to redirect stderr even under debug version since users can just comment out the stderr line in the config to stop redirection.
2015-02-05 16:19:55 -08:00
2550040c2d
Change the default learnRateAdjustInterval to 1 instead of 2.
2015-02-05 15:28:37 -05:00
e9b031d6ea
Remove an useless assert
2015-02-05 14:40:02 -05:00
c4ae117311
DSSMReader needed \Yc for precompiled headers. I'm not sure why this version needs that, but other versions I've used do not. TODO: Look into why this dll needs \Yc instead of \Yu.
2015-02-04 14:40:36 -08:00
fb3a2f0313
Forgot stdafx.h/cpp
2015-02-04 14:26:18 -08:00
590172dcc2
Somehow these files were not committed to source control.
2015-02-04 14:25:32 -08:00
539c9968aa
Committing project so the build dependancies are synced.
2015-02-04 14:14:07 -08:00
984b2e46ee
Added DSSM nodes and readers to CNTK. Note that these are not particularly efficient implementations.
2015-02-04 12:51:31 -08:00
b55b7d7d1a
Initial commit of DSSMReader to add the project to source control.
2015-02-04 10:32:59 -08:00
8973de96ee
Merge branch 'master' of https://git01.codeplex.com/cntk
2015-02-03 11:01:40 -08:00
6cf8585666
support using different nbrUttsInEachRecurrentIter for different epochs in HTKMLFReader. PerMB learning rate normalization hasn't modified to support this yet.
2015-02-03 11:01:22 -08:00
9d5ec818ec
Merge branch 'master' of https://git01.codeplex.com/cntk
2015-02-02 20:19:21 -08:00
e469db0ae2
Remove restriction of using one utterance per minibatch in simple evaluator.
2015-02-02 20:19:10 -08:00
97dca787a7
Implement () operator for CPUSparseMatrix in CSC format
2015-02-02 16:57:24 -08:00
6bc7a8b522
small changes to CPUSparseMatrix to remove compiler warning.
...
Put back demos.
2015-02-02 14:45:23 -08:00
c0a3e09a96
CPU Sparse Matrix: Merge m_blockVal, add CPUMatrixDenseTimesSparse* tests and implement SwitchToMatrixType from dense to sparse
2015-02-02 11:25:47 -08:00
fd7af0a949
Eliminate "requiredata:..." message when verbosity == 0
2015-02-02 00:29:24 -08:00
6834fba3cb
Further remove message in HTKMLFReader when verbosity == 0
2015-02-02 00:15:19 -08:00
e7a591dfad
Print learning rate and momentum at the beginning of each epoch
...
This is useful for the user to verify the correct setup is made. (previous
code only print this message after one epoch has finished)
2015-02-02 00:03:00 -08:00
a6effd4d41
Add a done file option
...
When cn.exe finished successfully, it writes to a user-specified done file to signal its completion.
2015-02-02 00:00:45 -08:00
Dong Yu
kaisheny
thhoens
erw
Mike Seltzer
Yu
Javier Luraschi