517947be3d
License change
2016-01-18 09:36:51 +01:00
2734d6fc8b
minor changes based on code review
2015-07-19 23:42:09 -07:00
d207761842
Merge branch 'master' of https://git01.codeplex.com/cntk
2015-07-19 22:43:29 -07:00
22dce6513a
Added /bigobj option to CNTKEval.vcxproj to address the 'too many sections' compiltation error in that project
2015-07-19 12:02:30 -07:00
24614d87cf
Merge branch 'mseltzer/uttreaderfix' of https://git01.codeplex.com/cntk
2015-07-18 23:37:06 -07:00
222e703826
Merge remote-tracking branch 'origin/chenguoguo/kaldi2reader-multi-utterance'
2015-07-19 00:52:33 +00:00
219ee93501
Merge remote-tracking branch 'origin/linux-gcc' into chenguoguo/kaldi2reader-multi-utterance
2015-07-18 22:34:53 +00:00
8d21003325
Merge remote-tracking branch 'origin/master' into chenguoguo/kaldi2reader-multi-utterance
2015-07-18 20:30:01 +00:00
8830b5a0f9
Merge remote-tracking branch 'origin/master' into linux-gcc
2015-07-18 03:42:51 -04:00
fa3fb05cfc
Fix linux builds.
2015-07-18 00:47:21 -04:00
1726a5944e
Merge branch 'amitaga/prefetcher_packingmask'
2015-07-17 20:40:16 -07:00
9dcc79948d
Fixed the issue of minbatch packing mask not being correctly handled in the minibatch prefetching code
2015-07-17 18:26:38 -07:00
82c7d8cf91
Merge remote-tracking branch 'origin/master' into linux-gcc
2015-07-18 00:32:21 +00:00
967c6babbf
Merge branch 'master' to 'linux-gcc'
2015-07-18 00:30:07 +00:00
bbf49009d1
Merge branch 'master' to 'linux-gcc'
2015-07-17 23:42:22 +00:00
329d3bc6fd
Fix the bug for print correct momentum value.
2015-07-17 19:26:24 -04:00
b5b1c13d68
Fix error when setting perMB momentum.
2015-07-17 17:48:03 -04:00
d54e2d30fe
Adding multi-utterance support in Kalsi2Reader for Truncated == false
2015-07-17 21:25:10 +00:00
3a086b76a5
fix problems in reader when files have duration mismatch
2015-07-17 10:39:50 -07:00
4827a728e9
Keep m_SentenceBoundary always in CPU memory; Make CNTKEval compatible with the current SetenceBoundary setting change.
2015-07-16 21:32:00 -07:00
9bed89797a
Fix boundary setting when frameMode=true (For HTKMLFReader_linux); also format the code.
2015-07-16 19:03:42 -04:00
0e65b1f9fd
Fix the boundary setting when framemode = true in HTKMLFReader.
2015-07-16 15:44:05 -07:00
e63927924f
1) Removed iscriterion from checking in forming recurrent loops, because of using a function to check duplicated loops. 2) Check if pairnodes are existing and save them if they are. This aims at backward support of the previous models and network file format.
2015-07-16 12:13:19 -07:00
6a1976895d
Minor reader changes.
2015-07-17 02:48:42 +10:00
5a98803ca4
Bug: MinibatchPrefetcher is not setting matrix type/size.
2015-07-17 02:47:29 +10:00
34b62d10d9
Simplify sigmoid kernel
2015-07-16 09:18:36 -07:00
fdd07c1be5
Make sure Linux and Windows use the same integer type in CUDA kernels
2015-07-16 09:08:22 -07:00
38db72b6ae
Use a function to merge duplicated recurrent loops according to their source node. Removed unused functions in MultiNetworkSGD
2015-07-16 08:59:23 -07:00
65f38063bc
Merge branch 'master' of https://git01.codeplex.com/cntk
2015-07-16 07:36:46 -07:00
fd11f339cd
update g2p bidirectional setup
2015-07-16 07:36:34 -07:00
a356380ada
Merge branch 'master' of https://git01.codeplex.com/cntk into bmitra/Changes
2015-07-16 18:23:21 +10:00
02bb921723
Updated CNTKbook with encoder/decoder framework (first draft)
2015-07-16 00:03:44 -07:00
717aec01e3
Use digit to repsent different networks.
2015-07-16 00:03:06 -07:00
d59b5f37a9
Forming loop using SCC uses isCriterion to true for backward compatibility. Also with this change can create recurrent networks . Update enumeratenodesforeval in pairnodes to ignore its children when search for nodes to be built for a network.
2015-07-16 00:01:11 -07:00
06f3e2de7b
Merge branch 'master' of https://git01.codeplex.com/cntk into bmitra/Changes
2015-07-16 08:42:39 +10:00
f48425b67c
Minor bug fixes.
2015-07-16 08:41:07 +10:00
58855e8fd9
Add returnDense flag.
2015-07-16 08:37:23 +10:00
7a894210bc
MultiNetworkSGD fix linux build
2015-07-15 13:02:10 -07:00
e298bdd00d
fix linux build error and warnings
2015-07-15 12:47:08 -07:00
1fb5918b13
Implement minibatch prefetching
...
This change implements a read-ahead (prefetch) of one minibatch on a separate thread to ensure that main thread always has enough work. This is done through coarse-level parallelism, where GetMinibatch is called from a separate thread and result is cached for main thread to consume. The synchronization is a simple producer/consumer model with a single mutex and a conditional variable.
This change also modifies how we measure time it takes to read and compute a minibatch worth of data.
2015-07-15 11:57:06 -07:00
cf4dc2aeb3
Fix linux break for lm sequence reader
2015-07-15 11:48:07 -07:00
16b858f181
Comment the part of using m_pairNodes to backward support, until a good solution is found.
2015-07-15 10:46:34 -07:00
7db6b6b384
Updated setup for SMT experiments
2015-07-15 10:33:38 -07:00
2b066a674b
Use CPUDevice for labels in LMSequenceReader
2015-07-15 10:32:31 -07:00
dd553571a3
SimpleNetworkBuilder example of using encoder-decoder framework
2015-07-15 10:31:44 -07:00
5ba8938ae4
Use pointer to refer to networks and nodes. Also updated code for encoder-decoder frameworks. Created a new node called PairNetworkNode as a socket from one network to the other networks.
2015-07-15 10:30:32 -07:00
39f9ded85c
Remove constparameternode.
2015-07-15 09:30:31 -07:00
1fdfcde96d
Beautify the SGD.h after merging
2015-07-15 09:26:16 -07:00
10955a059a
Merge with master branch
2015-07-15 09:07:40 -07:00
b8fe3d591b
Merge branch 'Dev' of https://git01.codeplex.com/cntk into Dev
2015-07-15 08:03:23 -07:00
Mark Hillebrand
Mike Seltzer
Amit Agarwal
chenguoguo
Yu
erw
Yu Zhang
kaisheny
UnderdogGeek
Marko Radmilac