Skip to content

Sync pybind11 with master #4204

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.

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

Merged
merged 96 commits into from
Aug 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
1bf7a16
[egs] multi_cn: fix false removal of 1st field of clean text (#4020)
naxingyu Apr 2, 2020
fa95730
[scripts] 'steps/nnet3/make_bottleneck_features.sh', add online-cmvn …
KarelVesely84 Apr 2, 2020
ec83d38
[build] Fix error building biglib without CUDA (#4031)
alex-ht Apr 8, 2020
0185c4a
[build][windows] Add PortAudio to Windows generate_solution.pl (#4026)
Zohan Apr 8, 2020
19afd53
[src] tcp-server: fix bug when tcp server recieves odd number of byte…
nshmyrev Apr 9, 2020
99d1f54
[src,scripts] Fix bug in ivec extract w/silence-weighting; fix to #40…
KarelVesely84 Apr 9, 2020
3b68c30
[scripts] bugfix, location of 'num_jobs' in make_bottleneck_features.…
KarelVesely84 Apr 14, 2020
28e2bed
[build] Fix bugs in CMake build (#4044)
alex-ht Apr 17, 2020
e9326e0
[src,scripts,egs] Add examples for wake-word detection (#3467)
freewym Apr 19, 2020
5968b4c
[egs] fix missing prefix in spk-id while doing data aug for wake word…
freewym Apr 20, 2020
3b4d044
[src] Fix return condition and add resize code in online-audio-source…
KimJeongSun Apr 21, 2020
6ef3fe8
[egs,scripts] fix the cmd issue in some wake word recipes (#4050)
freewym Apr 23, 2020
03ae8c1
[scripts] Fix for how the --fixed-value parameter is applied in adjus…
stansalvador Apr 24, 2020
d4791c0
[egs] wake-word recipes: use python3, add README (#4052)
freewym Apr 27, 2020
7a0bf8a
[egs] Remove unused file, fix link, in gal3fix some problem in the ol…
DongjiGao Apr 29, 2020
0bca93e
[src] CUDA Online/Offline pipelines + light batched nnet3 driver (#3568)
hugovbraun May 1, 2020
ae44dc7
[src] missing include, CUDA_VERSION is defined in cuda.h (#4059)
hugovbraun May 1, 2020
2c7e78f
[src] Update now-deprecated versions of cuSPARSE calls - cuda 10.2 (#…
hugovbraun May 1, 2020
9b4dc93
[egs] add MobvoiHotwords SLR87 recipes (#4060)
freewym May 11, 2020
a794273
[scripts] Actually use scale_opts in cleanup script (#4071)
nshmyrev May 17, 2020
401bb1f
Fix issue with invoking sed, for mac (#4072)
danpovey May 17, 2020
abaf3ac
Revert "Fix issue with invoking sed, for mac (#4072)" (#4073)
danpovey May 17, 2020
da93074
[egs] use bash to run sed instead of the sed shebang (#4075)
jtrmal May 17, 2020
46418af
[egs] Add optional aishell2 for multi_cn (#4077)
naxingyu May 19, 2020
9e01769
[egs] Add recipe for openslr-85 dataset "hi mia" (#4064)
nwpuaslp May 19, 2020
797905b
[src] Fix directory in #include statement (#4079)
tz301 May 20, 2020
b1786aa
[scripts] align_lats.sh: use lattice-scale instead of lattice-copy (#…
kylrth May 26, 2020
8339118
[egs] Fix to multi_cn prepare_dict.sh, RE grep vs egrep (#4086)
saaavsaaa May 28, 2020
9b8c5a2
[build] Update cmakefiles for BLAS/LAPACK from upstream; update cub C…
cloudhan May 30, 2020
c2f0295
[egs] chime6: fix post_output.vec file (#4017)
boeddeker May 31, 2020
338dac1
[egs] chime6: train_stats_sad_1a.sh add missing quotes (#4007)
boeddeker May 31, 2020
69f8509
[src] online decoder: add method to get nonsilence frames from the ut…
nshmyrev Jun 1, 2020
a84f6ec
[src] Use OptionsItf not ParseOptions in interfaces (#4089)
AndrBe Jun 1, 2020
a8fc99d
[src] Template-ize Grammar-FST code (#4067)
all2ham Jun 1, 2020
4f7aa50
[build] relax python requirement in cmake build (#4090)
cloudhan Jun 1, 2020
c9d8b9a
[src] Make OnlineCmvn internals protected, not private (#4091)
AndrBe Jun 1, 2020
fd88b1f
[src] fixed a bug in TraceBackBestPath() (#3936)
mahsa7823 Jun 10, 2020
75872d8
[doc] Fix typos in command line help messages (#4097)
rouseabout Jun 11, 2020
8910533
[src] biglm decoder: fix weight cutoff (#4107)
keli78 Jun 16, 2020
97438b0
[build] fix windows 10 build errors. (#4111)
whaozl Jun 17, 2020
82272f5
[egs] Chime6: fix argument passing to avoid shell expansion (#4110)
SKb10 Jun 17, 2020
31c2bae
[scripts] validate_data_dir.sh: overridable --max-jobs-run and compat…
o-alexandre-felipe Jun 18, 2020
a97cb8d
Create stale.yml
megazone87 Jun 19, 2020
6479298
[egs] Update wer_output_filter for python version compatibility (#4018)
oshindow Jun 19, 2020
57bc88a
[build] modify makefile, and solve libtool issue with openfst for gcc…
megazone87 Jun 19, 2020
6b0938a
[scripts,egs] modify chain2 script (add ivector, diagnosis log, compu…
megazone87 Jun 19, 2020
4ad8d47
[tools] fix check_dependencies for mac (#4119)
tmacwill Jun 20, 2020
22a4fe2
[src] fix timestamp bug in commit fd88b1f in TraceBackBestPath() (#4115)
dophist Jun 21, 2020
812596d
Update Makefile
megazone87 Jun 22, 2020
55ae4c5
[egs] fix paths in egs/swahili wrong path (#4125)
kk-yy Jun 23, 2020
1c3c345
[src] cuda decoder: fix crash due to offset in LDA transform (#4116)
jty016 Jun 23, 2020
d5815d3
[egs] icsi recipe (#2435)
pswietojanski Jun 23, 2020
83a301b
[build] Upgrade tfrnnlm installer (#4127)
kunazure Jun 23, 2020
e672987
[scripts] Fix to validate_data_dir.sh, local issue etc. (#4130)
alex-ht Jun 24, 2020
ff80857
[github] Extend stale timeout and exempt certain labels for the autoc…
kkm000 Jun 25, 2020
bc5c9b9
[egs] Add --am-dir option to make_weighted_den_fst.sh (#4129)
rslish Jun 25, 2020
38c3a8b
[build] Fix RedHat package names (#4134)
kkm000 Jun 25, 2020
e558188
[egs] Remove extra ')' in iam/v2/local/gen_topo.py (#4136)
megazone87 Jun 25, 2020
b5222f5
[src] CUDA decoder: add launch bounds to kernel (prevent launch failu…
luitjens Jun 26, 2020
d8082de
[tools] Update install_mkl.sh (#3989)
BurnhamG Jun 27, 2020
67db30c
[egs] Bug fixes in Babel multilingual setup (#4142)
aarora8 Jun 29, 2020
84a6efb
[src] Small changes to const-arpa code/interface for easier testing i…
KarelVesely84 Jul 4, 2020
794732a
[scripts] Chain2 bug fixes (#4156)
mrsrikanth Jul 6, 2020
7ef2089
[build] Fix install srilm for tar.gz (#4158)
sonal-ssj Jul 7, 2020
2a609d7
[scripts] Add script to replace Tdnn components with Affine/Linear, f…
freewym Jul 10, 2020
0b66cf6
[scripts] Fix couple typos in mkgraph.sh, check L_disambig instead of…
glynpu Jul 10, 2020
27f919d
[build] change to portable usage of `sed, touch` for macos/BSD and GN…
megazone87 Jul 11, 2020
d59f03b
fixing typo (#4163)
aarora8 Jul 12, 2020
083c64d
[src] CudaDecoder endpointing (#4146, #4101)
hugovbraun Jul 15, 2020
b3368ae
[build, tools] Undo OpenFST Makefile patch hack from #4177 (#4133)
kkm000 Jul 15, 2020
c826ac0
[egs][steps] Set cmd to run.pl instead of queue.pl. (#4170)
johnjosephmorgan Jul 16, 2020
3c8f7f8
[egs] Change underscore to dash in aspire/s5 (#4169)
johnjosephmorgan Jul 16, 2020
f58364b
[tools][build] Allow nested make clean to fail when nothing to clean …
kkm000 Jul 16, 2020
bf6e29d
[egs] Invoke steps/data/reverberate_data_dir.py as executable in aspi…
johnjosephmorgan Jul 16, 2020
8df2530
[scripts] add use-gpu option to rnnlm/compute_perplexity.sh (#4172)
viannecc Jul 16, 2020
93f95fe
[src] Fix for gcc 4.8 compilation issue for CUDA decoder (#4173) (#4176)
QIU-Shuo Jul 17, 2020
65ae41e
[egs] fix aishell2 nnet3 finetune script syntax error (#4179)
dophist Jul 18, 2020
841a81e
[egs][steps] Nit: fix comment typo (#4177)
SKb10 Jul 19, 2020
9830423
[github] Do not let Stale bot close issues/PRs
kkm000 Jul 19, 2020
960454c
[src] Correctrly treat subsampling factor != 1 in nnet3-get-egs (#4183)
kkm000 Jul 19, 2020
2989c12
[github] Really do not let Stale bot close issues/PRs
kkm000 Jul 19, 2020
f40dbc2
[egs] Pass order and lambda arguments to ngram in ami_train_lms.sh (#…
qiujiali Jul 20, 2020
2fd4d05
[egs] Add hi_mia/w1 recipe (#4120)
nwpuaslp Jul 20, 2020
8ff2e74
[src][egs] Implement TS-VAD based diarization in CHiME-6 (#4164)
desh2608 Jul 20, 2020
bff2d7e
[src] Remove configure support for threaded math (#4185)
kkm000 Jul 21, 2020
931fbef
[tools] Patch sctk to build under xcode12b2.
jtrmal Jul 21, 2020
daae81c
[egs] Fix sequitur path, multiple egs
jtrmal Jul 21, 2020
ef4b376
[src] Arrange GrammarFst members in construction order (#4180)
kkm000 Jul 21, 2020
bd2521c
[src] Make user parameter check ERROR not ASSERT (#4181)
kkm000 Jul 21, 2020
4d4b2ca
[src] Nit fix, readability, code formatting and style (#4182)
kkm000 Jul 21, 2020
00625e8
[egs] Fix tuning/links in egs/{malach/s5,swbd/s5c} (#4184)
kkm000 Jul 21, 2020
4da7463
[src] Fix potential use-after-free in HasBannedPrefixPlusDigits (#4191)
orivej Jul 25, 2020
3c2d3a2
[src] Support I/O in Numpy .npy format. (#3807)
csukuangfj Jul 27, 2020
f88d5a3
[src] Fix a bug in carpa backoff logprob computation (#4195)
Jul 28, 2020
f01a43d
[build] remove temporary files installing OpenBLAS, ignore .vscode fo…
hailiang-wang Jul 31, 2020
33aa358
sync pybind11 with master
naxingyu Aug 4, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 29 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Number of days of inactivity before an issue becomes stale.
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed.
# TODO(kkm): Re-enable auto-closing when done with the current heap of old PRs.
daysUntilClose: false
# Issues with these labels will never be considered stale.
exemptLabels:
- discussion
- enhancement
- help-wanted
- in progress
- low-priority
- newbie
- stale-exclude
- stopped development
# Label to use when marking an issue as stale.
staleLabel: stale
# Comment to post when marking an issue as stale.
markComment: >
This issue has been automatically marked as stale by a bot solely because it
has not had recent activity. Please add any comment (simply 'ping' is enough)
to prevent the issue from being closed for 60 more days if you believe it
should be kept open.
# Comment to post when closing a stale issue.
closeComment: >
This issue has been automatically closed by a bot strictly because of
inactivity. This does not mean that we think that this issue is not
important! If you believe it has been closed hastily, add a comment
to the issue and mention @kkm000, and I'll gladly reopen it.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ GSYMS
/tools/python/
/tools/ngram-1.3.7.tar.gz
/tools/ngram-1.3.7/
/tools/OpenBLAS*.tar.gz

# These CMakeLists.txt files are all genareted on the fly at the moment.
# They are added here to avoid accidently checkin.
Expand All @@ -168,3 +169,4 @@ src/xml
src/api
html

.vscode
22 changes: 22 additions & 0 deletions .gitpod.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM gitpod/workspace-full

USER songmeixu

# Install custom tools, runtime, etc. using apt-get
# For example, the command below would install "bastet" - a command line tetris clone:
#
# RUN sudo apt-get -q update && # sudo apt-get install -yq bastet && # sudo rm -rf /var/lib/apt/lists/*
#
# More information: https://www.gitpod.io/docs/config-docker/

FROM gitpod/workspace-full

RUN sudo apt-get update \
&& sudo apt-get install -y \
sox gfortran \
&& sudo rm -rf /var/lib/apt/lists/*

RUN cd ~/GitHub/r-with-intel-mkl/ \
&& wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB | sudo apt-key add - \
&& sudo sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list' \
&& sudo apt-get update && sudo apt-get install intel-mkl-64bit
7 changes: 7 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
image:
file: .gitpod.dockerfile

tasks:
- init: echo "Replace me with a build script for the project."
command: echo "Replace me with something that should run on every start, or just
remove me entirely."
23 changes: 12 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ include(GNUInstallDirs)
include(Utils)
include(third_party/get_third_party)

# Should update cmake to a more recent version which supports FindPython3.
find_package(PythonInterp)
if(NOT PYTHON_EXECUTABLE OR PYTHON_VERSION_MAJOR LESS 3)
message(WARNING "Needs python3 to auto-generate most CMake files, but not found. "
"Will try `python3` directly...")
set(PYTHON_EXECUTABLE "python3")
if(NOT PYTHON_EXECUTABLE)
message(FATAL_ERROR "Needs python to auto-generate most CMake files, but not found.")
endif()

message(STATUS "Running gen_cmake_skeleton.py")
Expand Down Expand Up @@ -63,12 +60,16 @@ if(MATHLIB STREQUAL "OpenBLAS")
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tools/CLAPACK)
link_libraries(${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
elseif(MATHLIB STREQUAL "MKL")
set(BLA_VENDOR "Intel10_64lp")
# find_package(BLAS REQUIRED)
if(NOT DEFINED ENV{MKLROOT} OR "$ENV{MKLROOT}" STREQUAL "")
message(FATAL_ERROR "Environment variable MKLROOT is not defined")
else()
message(STATUS "Finding MKL from \"$ENV{MKLROOT}\"")
endif()
normalize_env_path(ENV{MKLROOT})
set(BLA_VENDOR "Intel10_64lp_seq") # use the single threaded MKL by default
find_package(LAPACK REQUIRED)
add_definitions(-DHAVE_MKL=1)
include_directories($ENV{MKLROOT}/include) # TODO: maybe not use env, idk, find_package doesnt handle includes...
include_directories($ENV{MKLROOT}/include)
link_libraries(${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
elseif(MATHLIB STREQUAL "Accelerate")
execute_process(COMMAND sw_vers -productVersion
Expand Down Expand Up @@ -113,8 +114,6 @@ endif()

find_package(CUDA)
if(CUDA_FOUND)
set(CUB_ROOT_DIR "${PROJECT_SOURCE_DIR}/tools/cub")

set(CUDA_PROPAGATE_HOST_FLAGS ON)
set(KALDI_CUDA_NVCC_FLAGS "--default-stream=per-thread;-std=c++${CMAKE_CXX_STANDARD}")
if(MSVC)
Expand Down Expand Up @@ -146,6 +145,8 @@ if(CUDA_FOUND)
include_directories(${NvToolExt_INCLUDE_DIR})
link_libraries(${NvToolExt_LIBRARIES})

get_third_party(cub)
set(CUB_ROOT_DIR "${CMAKE_BINARY_DIR}/cub")
find_package(CUB REQUIRED)
include_directories(${CUB_INCLUDE_DIR})
endif()
Expand All @@ -159,7 +160,7 @@ if(${KALDI_USE_PATCH_NUMBER})
endif()

get_third_party(openfst)
set(OPENFST_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR}/openfst)
set(OPENFST_ROOT_DIR ${CMAKE_BINARY_DIR}/openfst)
include(third_party/openfst_lib_target)
link_libraries(fst)

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[![Build Status](https://travis-ci.com/kaldi-asr/kaldi.svg?branch=master)](https://travis-ci.com/kaldi-asr/kaldi)
[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/kaldi-asr/kaldi)
Kaldi Speech Recognition Toolkit
================================

Expand Down
Loading