Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[src,egs,scripts] Merging RNNLM-related changes which were in wrong branch #2092

Merged
merged 123 commits into from
Dec 21, 2017
Merged

[src,egs,scripts] Merging RNNLM-related changes which were in wrong branch #2092

merged 123 commits into from
Dec 21, 2017

Conversation

hainan-xv
Copy link
Contributor

No description provided.

danpovey and others added 30 commits June 17, 2017 14:29
@danpovey
Adding some sampling code
b51a4fc
@danpovey
[src] Adding some RNNLM-related sampling utilities.
aeffb8b
@danpovey
[build] Modify Makefiles w.r.t. RNNLM stuff
0bf3bc6
@danpovey
[src] Fix sampler-test.cc (fixing test failure)
87bc825
@kangshiyin @danpovey
[build] link cusparse lib and handle it with CuDeivce (kaldi-asr#1699)
d3d1351
@keli78 @danpovey
[src] Add arpa-reading code for RNNLM (kaldi-asr#1701)
9e1f742
@wantee @danpovey
[scripts] RNNLM data-preparation (kaldi-asr#1707) (kaldi-asr#1717)
de4faf9
@wantee @danpovey
make </s> case-sensitive in rnnlm (kaldi-asr#1738)
2210e63
@keli78 @danpovey
[rnnlm,scripts] add a --unigram-scale option to rnnlm/choose_features…
59521f4 
….py (kaldi-asr#1739)
@danpovey
[src] Some drafts of RNNLM-related code.
3c07383
@danpovey
Fix small formatting issues.
4fe8118
@danpovey
[src] Adding and refactoring RNNLM related code
63c50a7
@wantee @danpovey
[scripts] add some documentations for rnnlm scripts (kaldi-asr#1743)
dc3449c
add test code for ArpaSampling; fix errors in arpa-sampling.cc and rn…
570d97f 
…nlm-egs.cc
@danpovey
Merge pull request kaldi-asr#1753 from keli78/arpa-testing
614dd45 
add test code for ArpaSampling
@danpovey
[src] remove unused declarations
06eee20
@keli78 @danpovey
[egs] add RNNLM data preparation script for PTB (kaldi-asr#1771)
96daad1
@danpovey
[src] some partial work towards RNNLM training.
f4b9d93
@danpovey
Merge remote-tracking branch 'upstream/master' into rnnlm
e6920de
@danpovey
[src] Fixing various compilation errors, finishing more RNNLM trainin…
f2f43ba 
…g code.
@danpovey
Merge branch 'rnnlm' of https://github.com/kaldi-asr/kaldi into rnnlm
ee461f7
@keli78 @danpovey
[src] add default args for arpa sampling test (kaldi-asr#1768)
fdf87a0
@danpovey
[src] Adding more declarations of needed sparse-matrix functions
9b94c4d
@hhadian @danpovey
[src] Add new CuMatrix::AddToRows() overload; test; minor fixes (kald…
5be79bb 
…i-asr#1775)
@hhadian @danpovey
[src] Some fixes re CuArray + Add CuMatrixBase::AddToElements + test (k…
b66e23a 
…aldi-asr#1776)
@danpovey
[src] change to table-reading code to make Value() non-const.
0b7b691
@danpovey
[src] Further progress on RNNLM
ab68664
@danpovey
[src] Further progress on RNNLM code
e2434c2
@hhadian @danpovey
[src] Add rnnlm::ReadSparseWordFeatures (kaldi-asr#1778)
15553de
@hhadian @danpovey
[src] Add CuVectorBase::CopyElements() and VecMatVec() + tests (kaldi…
4d171cb 
…-asr#1780)
keli78 and others added 23 commits September 26, 2017 18:43
@keli78 @danpovey
[egs] Add example script for RNNLM training on Swbd (kaldi-asr#1907)
0ffc8b5
@danpovey
[src] Make copy constructor of NnetComputer explicit
0c78131
@danpovey
[src] fix bug in pruned composition (thanks: @hainan-xv)
d0f36ca
@danpovey
[scripts] Make sure all rnnlm scripts use encoding=utf-8 with open
27aa514
@danpovey
Merge remote-tracking branch 'upstream/master' into rnnlm
402f531
@danpovey
[src] Add scales and constant values to Descriptors in nnet3 (kaldi-a…
693840b 
…sr#1884)
@keli78 @danpovey
[scripts] Fix a learning rate decay bug in rnnlm setup (kaldi-asr#1944)
e87e303
@mmaciej2 @danpovey
[src] Removed unnecessary kLinearInParameters and kLinearInInput flag…
b51874c 
…s from nnet3 (kaldi-asr#1961)
@danpovey
Merge remote-tracking branch 'upstream/master' into rnnlm
764483b
@danpovey
Merge remote-tracking branch 'upstream/master' into rnnlm
629b885
@keli78 @danpovey
[src,scripts,egs] Add l2 regularization for RNNLMs; fixes RE test-mod…
b858223 
…e; add RNNLM recipes for 5 datasets (kaldi-asr#1999)
@keli78 @danpovey
[egs] Update RNNLM recipes with L2 regularization (kaldi-asr#2005)
6127c32
@danpovey
[src] Workaround for compiler issue (thanks: @francoishernandez)
3348b3e
@hainan-xv @danpovey
[src,scripts,egs] nnet3-rnnlm lattice rescoring draft (kaldi-asr#1906)
652050a
@danpovey
Merge remote-tracking branch 'upstream/master' into rnnlm
8537641
@danpovey
[build] Update version file, first commit of kaldi 5.3.
131cdd4
@danpovey
[build] Update src/doc/get_version_info.sh (for building documentation)
edec255
@danpovey
[doc] Update version-related documentation.
347d181
@danpovey
[src] Some fixes to testing code
dc7bed5
@danpovey
[egs] Minor change to comment
4ac4051
@hainan-xv @danpovey
[src] Fix minor bug in rnnlm-compute-state.cc RE dimension checking (k…
f2d2305 
…aldi-asr#2051)
@hainan-xv @danpovey
[src] Add (faster) pruned composition for RNNLM rescoring (kaldi-asr#…
4a24b4b 
…2059)
@hainan-xv
merge rnnlm with latest master
a4aa18e
@danpovey danpovey changed the title latest changes in rnnlm branch [src,egs,scripts] Merging RNNLM-related changes which were in wrong branch Dec 20, 2017
@danpovey
Copy link
Contributor

This PR is to merge to master, some things which previously, by mistake, had been merged to the 'rnnlm' branch. I'll delete the 'rnnlm' branch so this doesn't happen again.

@danpovey danpovey merged commit 04458f7 into kaldi-asr:master Dec 21, 2017
@hainan-xv hainan-xv deleted the kaldi-rnnlm branch December 21, 2017 01:55
eginhard pushed a commit to eginhard/kaldi that referenced this pull request Jan 11, 2018
@hainan-xv @eginhard
[src,egs,scripts] Merging RNNLM-related changes which were in wrong b…
da9a7fd 
…ranch (kaldi-asr#2092)
mahsa7823 pushed a commit to mahsa7823/kaldi that referenced this pull request Feb 28, 2018
@hainan-xv
[src,egs,scripts] Merging RNNLM-related changes which were in wrong b…
13de245 
…ranch (kaldi-asr#2092)
Skaiste pushed a commit to Skaiste/idlak that referenced this pull request Sep 26, 2018
@hainan-xv @danpovey
[src,egs,scripts] Merging RNNLM-related changes which were in wrong b…
d77e94c 
…ranch (kaldi-asr#2092)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@hainan-xv @danpovey @wantee @keli78 @kangshiyin @hhadian @sas91 @xiaohui-zhang @selaselah @mmaciej2