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

Merged 'master' branch #3127

Merged
merged 28 commits into from
Mar 17, 2019
Merged

Merged 'master' branch #3127

merged 28 commits into from
Mar 17, 2019

Conversation

desh2608
Copy link
Contributor

No description provided.

desh2608 and others added 28 commits March 10, 2019 14:13
@desh2608 @danpovey
[src] Change warp-synchronous to cub::BlockReduce (safer but slower) (k…
bcfe3f8 
…aldi-asr#3080)
@kkm000 @danpovey
[src] Fix && and || uses where & and | intended, and other weird erro…
1209c07 
…rs (kaldi-asr#3087)
@kkm000 @danpovey
[build] Some fixes to Makefiles (kaldi-asr#3088)
5a5696f 
clang is unhappy with '-rdynamic' in compile-only step, and the
switch is really unnecessary.

Also, the default location for MKL 64-bit libraries is intel64/.
The em64t/ was explained already obsolete by an Intel rep in 2010:
https://software.intel.com/en-us/forums/intel-math-kernel-library/topic/285973
@pzelasko @danpovey
[src] Fixed -Wreordered warnings in feat (kaldi-asr#3090)
abd4869
@entn-at @danpovey
[egs] Replace bc with perl -e (kaldi-asr#3093)
9c8ba0f
@nikhilm16 @danpovey
[scripts] Fix python3 compatibility issue in data-perturbing script (k…
8cbd582 
…aldi-asr#3084)
@csukuangfj @danpovey
[doc] fix some typos in doc. (kaldi-asr#3097)
7435661
@kkm000 @danpovey
[build] Make sure expf() speed probe times sensibly (kaldi-asr#3089)
5bdea69
@XIAOYixuan @danpovey
[scripts] Make sure merge_targets.py works in python3 (kaldi-asr#3094)
b7a4fec
@desh2608 @danpovey
[src] ifdef to fix compilation failure on CUDA 8 and earlier (kaldi-a…
94475d6 
…sr#3103)
@csukuangfj @danpovey
[doc] fix typos and broken links in doc. (kaldi-asr#3102)
fc8c17b
@freewym @danpovey
[scripts] Fix frame_shift bug in egs/swbd/s5c/local/score_sclite_conf…
3f8b6b2 
….sh (kaldi-asr#3104)
@desh2608
resolved conflicts
072e64b
@MartinKocour @danpovey
[src] Fix wrong assertion failure in nnet3-am-compute (kaldi-asr#3106)
633e61c
@danpovey
[src] Cosmetic changes to natural-gradient code (kaldi-asr#3108)
8cafd32
@KarelVesely84 @danpovey
[src,scripts] Python2 compatibility fixes and code cleanup for nnet1 (k…
b1b230c 
…aldi-asr#3113)
@KarelVesely84 @danpovey
[doc] Small documentation fixes; update on Kaldi history (kaldi-asr#3031
9c875ef 
)
@danpovey
[src] Various mostly-cosmetic changes (copying from another branch) (k…
7a1908f 
…aldi-asr#3109)
@desh2608
Merge branch 'kaldi10' of https://github.com/kaldi-asr/kaldi into kal…
7ac2063 
…di10
@desh2608
resolved new merge conflicts
535a619
@desh2608
Merge branch 'kaldi10' of https://github.com/kaldi-asr/kaldi into kal…
fa46b15 
…di10
@saikiranvalluri @danpovey
[scripts] Simplify text encoding in RNNLM scripts (now only support u…
fcd70d3 
…tf-8) (kaldi-asr#3065)
@yfliao @danpovey
[egs] Add "formosa_speech" recipe (Taiwanese Mandarin ASR) (kaldi-asr…
b4c7ab6 
…#2474)
@rickychanhoyin @danpovey
[egs] python3 compatibility in csj example script (kaldi-asr#3123)
461b50c
@danpovey
[egs] python3 compatibility in example scripts (kaldi-asr#3126)
61637e6
@psmit @danpovey
[scripts] Bug-fix for removing deleted words (kaldi-asr#3116)
1f068cd 
The type of --max-deleted-words-kept-when-merging in segment_ctm_edits.py
was a string, which prevented the mechanism from working altogether.
@desh2608
Merge branch 'kaldi10' of https://github.com/kaldi-asr/kaldi into kal…
4ca53e1 
…di10
@desh2608
Merge branch 'master' of https://github.com/kaldi-asr/kaldi into kaldi10
baa06f6
@danpovey danpovey merged commit 2a69516 into kaldi-asr:kaldi10 Mar 17, 2019
danpovey added a commit that referenced this pull request Mar 17, 2019
@danpovey
Revert "Merged 'master' branch (#3127)"
8108bd0 
This reverts commit 2a69516.
@danpovey danpovey mentioned this pull request Mar 17, 2019
Merged
danpovey added a commit that referenced this pull request Mar 17, 2019
@danpovey
Revert "Merged 'master' branch (#3127)" (#3128)
87f881c 
This reverts commit 2a69516.
@danpovey
Copy link
Contributor

@desh2608 could you please make this PR under another name with the same source branch?
To keep the history clean (and ensure we merge only with actual merge) I used git push -f to remove this merge from the history, but it has confused GitHub.

@desh2608 desh2608 deleted the kaldi10 branch March 26, 2019 19:21
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.