Merge pull request #4204 from naxingyu/sync-pybind11-with-master

Sync pybind11 with master

Author: danpovey

.github/stale.yml

@@ -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.

.gitignore

@@ -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.
@@ -168,3 +169,4 @@ src/xml
 src/api
 html
 
+.vscode

.gitpod.Dockerfile

@@ -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

.gitpod.yml

@@ -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."

CMakeLists.txt

@@ -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")
@@ -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
@@ -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)
@@ -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()
@@ -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)
 

README.md

@@ -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
 ================================