fix install scripts

tools/install/install_gcc.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 set -x
 

tools/install/install_kaldi.sh

@@ -27,8 +27,9 @@ touch "python/.use_default_python"
 
 make -j4
 
-cd ../src
+pushd ../src
-./configure --shared --use-cuda=no --static-math
+./configure --shared --use-cuda=no --static-math --mathlib=OPENBLAS --openblas-root=${KALDI_DIR}/../OpenBLAS/install
 make clean -j && make depend -j && make -j4
+popd
 
 echo "Done installing Kaldi."

tools/install/install_mfa.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 
+# install openblas, kaldi before
+
 test -d Montreal-Forced-Aligner || git clone https://github.com/MontrealCorpusTools/Montreal-Forced-Aligner.git
 
-pushd Montreal-Forced-Aligner && python setup.py install
+pushd Montreal-Forced-Aligner && git checkout v2.0.0a7 &&  python setup.py install
 
 test -d kaldi || { echo "need install kaldi first"; exit 1;}
 

tools/install/install_mkl.sh

@@ -20,31 +20,36 @@ intel_key_url='https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-P
 
 Usage () {
   cat >&2 <<EOF
-    Usage: $0 [-s] [<MKL-package>]
+Usage: $0 [-s] [<MKL-package>]
-    Checks if MKL is present on the system, and/or attempts to install it.
+
-    If <MKL-package> is not provided, ${default_package} will be installed.
+Checks if MKL is present on the system, and/or attempts to install it.
-        Intel packages are installed under the /opt/intel directory. You should be root
+
-        to install MKL into this directory; run this script using the sudo command.
+If <MKL-package> is not provided, ${default_package} will be installed.
-        Options:
+
+Intel packages are installed under the /opt/intel directory. You should be root
+to install MKL into this directory; run this script using the sudo command.
+
+Options:
   -s  - Skip check for MKL being already present.
   -p <suse|redhat|debian|fedora|arch> -- Force type of package management. Use only
                                     if automatic detection fails, as instructed.
   -h  - Show this message.
-            Environment:
+
+Environment:
   CC   The C compiler to use for MKL check. If not set, uses 'cc'.
-            EOF
+EOF
   exit 2
-        }
+}
 
-        Fatal () { echo "$0: $@"; exit 1; }
+Fatal () { echo "$0: $@"; exit 1; }
 
-        Have () { type -t "$1" >/dev/null; }
+Have () { type -t "$1" >/dev/null; }
 
-        # Option values.
+# Option values.
-        skip_cc=
+skip_cc=
-        distro=
+distro=
 
-        while getopts ":hksp:" opt; do
+while getopts ":hksp:" opt; do
   case ${opt} in
     h) Usage ;;
     s) skip_cc=yes ;;
@@ -63,7 +68,8 @@ package=${1:-$default_package}
 
 # Check that we are actually on Linux, otherwise give a helpful reference.
 [[ $(uname) == Linux ]] || Fatal "\
-    This script can be used on Linux only, and your system is $(uname).
+This script can be used on Linux only, and your system is $(uname).
+
 Installer packages for Mac and Windows are available for download from Intel:
 https://software.intel.com/mkl/choose-download"
 
@@ -71,28 +77,33 @@ https://software.intel.com/mkl/choose-download"
 if [[ ! $skip_cc ]]; then
   : ${CC:=cc}
   Have "$CC" || Fatal "\
-        C compiler $CC not found.
+C compiler $CC not found.
-    You can skip the check for MKL presence by invoking this script with the '-s'
+
-    option to this script, but you will need a functional compiler anyway, so we
+You can skip the check for MKL presence by invoking this script with the '-s'
-    recommend that you install it first."
+option to this script, but you will need a functional compiler anyway, so we
+recommend that you install it first."
 
   mkl_version=$($CC -E -I /opt/intel/mkl/include - <<< \
                       '#include <mkl_version.h>
            __INTEL_MKL__.__INTEL_MKL_MINOR__.__INTEL_MKL_UPDATE__' 2>/dev/null |
                   tail -n 1 ) || mkl_version=
   mkl_version=${mkl_version// /}
+
   [[ $mkl_version ]] && Fatal "\
-        MKL version $mkl_version is already installed.
+MKL version $mkl_version is already installed.
-    You can skip the check for MKL presence by invoking this script with the '-s'
+
-    option and proceed with automated installation, but we highly discourage
+You can skip the check for MKL presence by invoking this script with the '-s'
-    this. This script will register Intel repositories with your system, and it
+option and proceed with automated installation, but we highly discourage
-    seems that they have been already registered, or MKL has been installed some
+this. This script will register Intel repositories with your system, and it
-    other way.
+seems that they have been already registered, or MKL has been installed some
-    You should use your package manager to check which MKL package is already
+other way.
-    installed. Note that Intel packages register the latest installed version of
+
-    the library as the default. If your installed version is older than
+You should use your package manager to check which MKL package is already
-    $package, it makes sense to upgrade."
+installed. Note that Intel packages register the latest installed version of
+the library as the default. If your installed version is older than
+$package, it makes sense to upgrade."
 fi
+
 # Try to determine which package manager the distro uses, unless overridden.
 if [[ ! $distro ]]; then
   dist_vars=$(cat /etc/os-release 2>/dev/null)
@@ -104,6 +115,7 @@ if [[ ! $distro ]]; then
       redhat|suse|fedora|debian|arch) distro=$rune; break;;
     esac
   done
+
   # Certain old distributions do not have /etc/os-release. We are unlikely to
   # encounter these in the wild, but just in case.
   # NOTE: Do not try to guess Fedora specifically here! Fedora 20 and below
@@ -112,29 +124,38 @@ if [[ ! $distro ]]; then
   [[ ! $distro && -f /etc/SuSE-release ]]   && distro=suse
   [[ ! $distro && -f /etc/debian_release ]] && distro=debian
   [[ ! $distro && -f /etc/arch-release ]] && distro=arch
+
   [[ ! $distro ]] && Fatal "\
-        Unable to determine package management style.
+Unable to determine package management style.
-    Invoke this script with the option '-p <style>', where <style> can be:
+
+Invoke this script with the option '-p <style>', where <style> can be:
   redhat -- RedHat-like, uses yum and rpm for package management.
   fedora -- Fedora 22+, also RedHat-like, but uses dnf instead of yum.
   suse   -- SUSE-like, uses zypper and rpm.
   debian -- Debian-like, uses apt and dpkg.
   arch   -- Archlinux, uses pacman.
-    We do not currently support other package management systems. Check the Intel's
+
-    documentation at https://software.intel.com/mkl/choose-download for other
+We do not currently support other package management systems. Check the Intel's
-    install options."
+documentation at https://software.intel.com/mkl/choose-download for other
+install options."
+
   echo >&2 "$0: Your system is using ${distro}-style package management."
 fi
+
 # Check for root.
 if [[ "$(id -u)" -ne 0 ]]; then
   echo >&2 "$0: You must be root to install MKL.
-    Restart this script using the 'sudo' command, as:
+
+Restart this script using the 'sudo' command, as:
+
   sudo $0 -sp $distro $package
-    We recommend adding the '-sp $distro' options to skip the MKL and distro
+
-    detection, since this has already been done. This minimizes the number of
+We recommend adding the '-sp $distro' options to skip the MKL and distro
-    programs invoked with the root privileges to keep your system safe from
+detection, since this has already been done. This minimizes the number of
-    unexpected or erroneous changes. Also, if you are setting the CC environment
+programs invoked with the root privileges to keep your system safe from
-    variable, sudo might not allow it to propagate to the command that it invokes."
+unexpected or erroneous changes. Also, if you are setting the CC environment
+variable, sudo might not allow it to propagate to the command that it invokes."
+
   if [ -t 0 ]; then
     echo; read -ep "Run the above sudo command now? [Y/n]:"
     case $REPLY in
@@ -143,6 +164,7 @@ if [[ "$(id -u)" -ne 0 ]]; then
   fi
   exit 0
 fi
+
 # The install variants, each in a function to simplify error reporting.
 # Each one invokes a subshell with a 'set -x' to to show system-modifying
 # commands it runs. The subshells simply limit the scope of this diagnostics
@@ -155,6 +177,7 @@ Install_redhat () {
     yum-config-manager --add-repo "$yum_repo" &&
     yum -y install "$package" )
 }
+
 Install_fedora () {
   ( set -x
     rpm --import $intel_key_url
@@ -162,6 +185,7 @@ Install_fedora () {
     dnf config-manager --add-repo "$yum_repo" &&
     dnf -y install "$package" )
 }
+
 Install_suse () {
   # zypper bug until libzypp-17.6.4: '--gpg-auto-import-keys' is ignored.
   # See https://github.com/openSUSE/zypper/issues/144#issuecomment-418685933
@@ -173,20 +197,24 @@ Install_suse () {
     zypper --gpg-auto-import-keys --no-gpg-checks \
            --non-interactive install "$package" )
 }
+
 Install_debian () {
   local keyring='/usr/share/keyrings/intel-sw-products.gpg' \
         sources_d='/etc/apt/sources.list.d' \
         trusted_d='/etc/apt/trusted.gpg.d' \
         apt_maj= apt_min= apt_ver=
+
   # apt before 1.2 does not understand the signed-by option, and always
   # look for the keyring in their trusted.gpg.d directory. This is not
   # considered a good security practice any more. If apt is old, add a link
   # to the keyring file and remind the user to delete it when apt is upgraded.
   IFS=' .' builtin read _ apt_maj apt_min _ < <(apt-get --version)
   apt_ver=$(builtin printf '%03d%03d' $apt_maj $apt_min)
+
   # Get alternative location of /etc/apt/sources.list.d, if so configured.
   eval $(apt-config shell sources_d Dir::Etc::sourceparts/f \
                           trusted_d Dir::Etc::trustedparts/f)
+
   # apt is much more involved to configure than other package managers, as fas
   # as third-party security keys go.
   ( set -x;
@@ -195,30 +223,37 @@ Install_debian () {
     wget -qO- $intel_key_url | apt-key --keyring $keyring add - &&
     echo "deb [signed-by=${keyring}] $apt_repo all main" \
          > "$sources_d/intel-mkl.list" ) || return 1
+
   if [[ $apt_ver < '001002' ]]; then
     ( set -x; ln -s "$keyring" "${trusted_d}/" ) || return 1
   fi
+
   ( set +x
     apt-get update &&
     apt-get install -y "$package" ) || return 1
+
   # Print the message after the large install, so the user may notice. I hope...
   if [[ $apt_ver < '001002' ]]; then
     echo >&2 "$0: Your apt-get version is earlier than 1.2.
-        This version does not understand individual repositories signing keys, and
+
-        trusts all keys in $trusted_d. We have created a link
+This version does not understand individual repositories signing keys, and
-        $trusted_d/$(basename $keyring) pointing to the file
+trusts all keys in $trusted_d. We have created a link
-        $keyring. If/when you upgrade your system to
+$trusted_d/$(basename $keyring) pointing to the file
-        a higher version of apt, removing this link will help make it more secure.
+$keyring. If/when you upgrade your system to
-        This is not considered a severe security issue, but separating keyrings is the
+a higher version of apt, removing this link will help make it more secure.
-        current recommended security practice."
+
+This is not considered a severe security issue, but separating keyrings is the
+current recommended security practice."
   fi
 }
+
 Install_arch () {
   ( set -x
     echo y | pacman -Syu intel-mkl && # In pacman we don't specify the version
     pacman -Q --info intel-mkl | grep -v None
   )
 }
+
 # Register MKL .so libraries with the ld.so.
 ConfigLdSo() {
   [ -d /etc/ld.so.conf.d ] || return 0
@@ -226,15 +261,17 @@ ConfigLdSo() {
   echo >&2 "$0: Configuring ld runtime bindings"
   ( set -x;
     echo >/etc/ld.so.conf.d/intel-mkl.conf "\
-        /opt/intel/lib/intel64
+/opt/intel/lib/intel64
-    /opt/intel/mkl/lib/intel64"
+/opt/intel/mkl/lib/intel64"
     ldconfig )
 }
+
 # Invoke installation.
 if Install_${distro} && ConfigLdSo; then
   echo >&2 "$0: MKL package $package was successfully installed"
 else
   Fatal "MKL package $package installation FAILED.
-    Please open an issue with us at https://github.com/kaldi-asr/kaldi/ if you
+
-    believe this is a bug."
+Please open an issue with us at https://github.com/kaldi-asr/kaldi/ if you
+believe this is a bug."
 fi

tools/install/install_ngram.sh

@@ -1,11 +1,18 @@
+#!/bin/bash
+
 set -e
 set -x
 
+
 # need support c++17, so need gcc >= 8
 # openfst
 ngram=ngram-1.3.13
+openfst=openfst-1.8.1
 shared=true
 
+export CPLUS_INCLUDE_PATH=$PWD/${openfst}/install/include/:$CPLUS_INCLUDE_PATH
+export LD_LIBRARY_PATH=$PWD/${openfst}/install/lib/:$LD_LIBRARY_PATH
+
 test -e ${ngram}.tar.gz || wget http://www.openfst.org/twiki/pub/GRM/NGramDownload/${ngram}.tar.gz
 test -d ${ngram} || tar -xvf ${ngram}.tar.gz && chown -R root:root ${ngram}
 

tools/install/install_openfst.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 set -e
 set -x
 
@@ -9,13 +11,15 @@ shared=true
 test -e ${openfst}.tar.gz || wget http://www.openfst.org/twiki/pub/FST/FstDownload/${openfst}.tar.gz
 test -d ${openfst} || tar -xvf ${openfst}.tar.gz && chown -R root:root ${openfst}
 
-wfst_so_path=$(python3 -c 'import sysconfig; import os; from pathlib import Path; site = sysconfig.get_paths()["purelib"]; site=Path(site); suffix = ("/usr/local/lib",) + site.parts[-2:]; print(os.path.join(*suffix));')
 
 if [ $shared == true ];then
-    pushd ${openfst} && ./configure --enable-shared --enable-compact-fsts  --enable-compress   --enable-const-fsts   --enable-far    --enable-linear-fsts   --enable-lookahead-fsts  --enable-mpdt  --enable-ngram-fsts   --enable-pdt    --enable-python   --enable-special  --enable-bin  --enable-grm --prefix ${PWD}/output && popd
+    pushd ${openfst} && ./configure --enable-shared --enable-compact-fsts  --enable-compress   --enable-const-fsts   --enable-far    --enable-linear-fsts   --enable-lookahead-fsts  --enable-mpdt  --enable-ngram-fsts   --enable-pdt    --enable-python   --enable-special  --enable-bin  --enable-grm --prefix ${PWD}/install && popd
 else
-    pushd ${openfst} && ./configure --enable-static --enable-compact-fsts  --enable-compress   --enable-const-fsts   --enable-far    --enable-linear-fsts   --enable-lookahead-fsts  --enable-mpdt  --enable-ngram-fsts   --enable-pdt    --enable-python   --enable-special  --enable-bin  --enable-grm --prefix ${PWD}/output && popd
+    pushd ${openfst} && ./configure --enable-static --enable-compact-fsts  --enable-compress   --enable-const-fsts   --enable-far    --enable-linear-fsts   --enable-lookahead-fsts  --enable-mpdt  --enable-ngram-fsts   --enable-pdt    --enable-python   --enable-special  --enable-bin  --enable-grm --prefix ${PWD}/install && popd
 fi
 pushd ${openfst} && make -j &&  make install && popd
 
+
+suffix_path=$(python3 -c 'import sysconfig; import os; from pathlib import Path; site = sysconfig.get_paths()["purelib"]; site=Path(site); pwd = os.getcwd(); suffix = site.parts[-2:]; print(os.path.join(*suffix));')
+wfst_so_path=${PWD}/${openfst}/install/lib/${suffix_path}
 cp ${wfst_so_path}/pywrapfst.* $(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')

tools/install/install_pynini.sh

@@ -1,13 +1,14 @@
+#!/bin/bash
+
 set -e
 set -x
 
 pynini=pynini-2.1.4
+openfst=openfst-1.8.1
+
+LIBRARY_PATH=$PWD/${openfst}/install/lib
 
 test -e ${pynini}.tar.gz || wget http://www.openfst.org/twiki/pub/GRM/PyniniDownload/${pynini}.tar.gz
 test -d ${pynini} || tar -xvf ${pynini}.tar.gz && chown -R root:root ${pynini}
 
-#wfst_so_path=$(python3 -c 'import sysconfig; import os; from pathlib import Path; site = sysconfig.get_paths()["purelib"]; site=Path(site); suffix = ("/usr/local/lib",) + site.parts[-2:]; print(os.path.join(*suffix));')
+pushd ${pynini} &&  LIBRARY_PATH=$LIBRARY_PATH  python setup.py install && popd
-
-pushd ${pynini} &&  python setup.py install && popd
-
-#cp ${wfst_so_path}/pywrapfst.* $(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')