From d78745afa6a052ae004ad358f222ea65eefc7bc6 Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Tue, 31 Jan 2017 13:50:56 -0500
Subject: [PATCH 01/21] Add testing with travis

---
 .travis.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..791b8bd
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,30 @@
+sudo: false
+branches:
+  only:
+    - master
+language: python
+matrix:
+  include:
+    - python: 2.7
+    - python: 3.4
+before_install:
+  - # Setup Python environment with BLAS libraries
+  - |
+      if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then
+         wget -q http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
+      else
+         wget -q http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
+      fi
+  - chmod +x miniconda.sh
+  - ./miniconda.sh -b -p $HOME/miniconda
+  - export PATH=$HOME/miniconda/bin:$PATH
+  - conda update -q --yes conda
+  - export FUEL_DATA_PATH=$TRAVIS_BUILD_DIR/data
+install:
+  # Install all Python dependencies
+  - conda install -q --yes python=$TRAVIS_PYTHON_VERSION numpy
+  - git clone https://github.com/kaldi-asr/kaldi.git
+  - pushd kaldi/tools && extras/check_dependencies.sh && make && popd
+  - pushd kaldi/src && ./configure --shared && make depend && make && popd
+script:
+  - pip install -e . # Tests setup.py

From 46035f3a07be2eb13f84706ba59bcf57c612bc46 Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Tue, 31 Jan 2017 14:13:27 -0500
Subject: [PATCH 02/21] Cache anaconda and kaldi

---
 .travis.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 791b8bd..dfa1f86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,8 @@
 sudo: false
+cache:
+  directories:
+    - $HOME/miniconda
+    - $HOME/kaldi
 branches:
   only:
     - master
@@ -16,15 +20,21 @@ before_install:
          wget -q http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
       fi
   - chmod +x miniconda.sh
-  - ./miniconda.sh -b -p $HOME/miniconda
+  - |
+      if [ "$(ls -A $HOME/miniconda)" ]; then
+        echo "miniconda dir is not empty"
+      else
+        rm -r $HOME/miniconda && ./miniconda.sh -b -p $HOME/miniconda
+      fi
   - export PATH=$HOME/miniconda/bin:$PATH
   - conda update -q --yes conda
   - export FUEL_DATA_PATH=$TRAVIS_BUILD_DIR/data
 install:
   # Install all Python dependencies
   - conda install -q --yes python=$TRAVIS_PYTHON_VERSION numpy
-  - git clone https://github.com/kaldi-asr/kaldi.git
-  - pushd kaldi/tools && extras/check_dependencies.sh && make && popd
-  - pushd kaldi/src && ./configure --shared && make depend && make && popd
+  - git clone https://github.com/kaldi-asr/kaldi.git $HOME/kaldi
+  - pushd $HOME/kaldi/tools && ./extras/check_dependencies.sh && make && popd
+  - pushd $HOME/kaldi/src && ./configure --shared && make depend && make && popd
 script:
   - pip install -e . # Tests setup.py
+  - python -c "import kaldi_io"

From 0e3044a37b4a0a34d30badd9c354934608ccae80 Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Tue, 31 Jan 2017 16:18:35 -0500
Subject: [PATCH 03/21] Install dependencies

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dfa1f86..9ed38b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ language: python
 matrix:
   include:
     - python: 2.7
-    - python: 3.4
 before_install:
   - # Setup Python environment with BLAS libraries
   - |
@@ -31,10 +30,11 @@ before_install:
   - export FUEL_DATA_PATH=$TRAVIS_BUILD_DIR/data
 install:
   # Install all Python dependencies
-  - conda install -q --yes python=$TRAVIS_PYTHON_VERSION numpy
+  - conda install -q --yes python=$TRAVIS_PYTHON_VERSION numpy gcc boost-python
   - git clone https://github.com/kaldi-asr/kaldi.git $HOME/kaldi
   - pushd $HOME/kaldi/tools && ./extras/check_dependencies.sh && make && popd
-  - pushd $HOME/kaldi/src && ./configure --shared && make depend && make && popd
+  - pushd $HOME/kaldi/tools && ./extras/install_openblas.sh && popd
+  - pushd $HOME/kaldi/src && ./configure --static --use-cuda=no --openblas-root=$HOME/kaldi/tools/OpenBLAS/install && make depend && make && popd
 script:
   - pip install -e . # Tests setup.py
   - python -c "import kaldi_io"

From 03de27a1db2f04ad0ad2e2e9530462e4286b92da Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Tue, 31 Jan 2017 19:48:59 -0500
Subject: [PATCH 04/21] Make kaldi incrementally

---
 .travis.yml                   | 33 +++++++++++----------------------
 install/install_conda.sh      | 17 +++++++++++++++++
 install/install_kaldi.sh      | 11 +++++++++++
 install/install_kaldi_deps.sh | 13 +++++++++++++
 4 files changed, 52 insertions(+), 22 deletions(-)
 create mode 100755 install/install_conda.sh
 create mode 100755 install/install_kaldi.sh
 create mode 100755 install/install_kaldi_deps.sh

diff --git a/.travis.yml b/.travis.yml
index 9ed38b8..de43f8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,29 +12,18 @@ matrix:
     - python: 2.7
 before_install:
   - # Setup Python environment with BLAS libraries
-  - |
-      if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then
-         wget -q http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
-      else
-         wget -q http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-      fi
-  - chmod +x miniconda.sh
-  - |
-      if [ "$(ls -A $HOME/miniconda)" ]; then
-        echo "miniconda dir is not empty"
-      else
-        rm -r $HOME/miniconda && ./miniconda.sh -b -p $HOME/miniconda
-      fi
+  - export SKIP=1
+  - function skip_rest { export SKIP=0; }
+  - function skip { return $SKIP; }
+  - ./install/install_conda.sh || skip_rest
   - export PATH=$HOME/miniconda/bin:$PATH
   - conda update -q --yes conda
-  - export FUEL_DATA_PATH=$TRAVIS_BUILD_DIR/data
+  - conda install -q --yes python=$TRAVIS_PYTHON_VERSION gcc pip boost-python
+  - (skip || ./install/install_kaldi_deps.sh) || skip_rest
+  - skip || ./install/install_kaldi.sh || skip_rest
+  - export KALDI_ROOT=$HOME/kaldi/
 install:
-  # Install all Python dependencies
-  - conda install -q --yes python=$TRAVIS_PYTHON_VERSION numpy gcc boost-python
-  - git clone https://github.com/kaldi-asr/kaldi.git $HOME/kaldi
-  - pushd $HOME/kaldi/tools && ./extras/check_dependencies.sh && make && popd
-  - pushd $HOME/kaldi/tools && ./extras/install_openblas.sh && popd
-  - pushd $HOME/kaldi/src && ./configure --static --use-cuda=no --openblas-root=$HOME/kaldi/tools/OpenBLAS/install && make depend && make && popd
+  - skip || conda install --yes numpy
 script:
-  - pip install -e . # Tests setup.py
-  - python -c "import kaldi_io"
+  - skip || pip install . # Tests setup.py
+  - skip || python -c "import kaldi_io"
diff --git a/install/install_conda.sh b/install/install_conda.sh
new file mode 100755
index 0000000..6e51ed5
--- /dev/null
+++ b/install/install_conda.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+if [ -f $HOME/miniconda/CONDA_INSTALLED ]; then
+    echo "miniconda is installed"
+    exit 0
+fi
+
+rm -r $HOME/miniconda
+
+if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then
+    wget -q http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
+else
+    wget -q http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
+fi
+chmod +x miniconda.sh
+./miniconda.sh -b -p $HOME/miniconda
+touch $HOME/miniconda/CONDA_INSTALLED
+exit 1
diff --git a/install/install_kaldi.sh b/install/install_kaldi.sh
new file mode 100755
index 0000000..8c095ce
--- /dev/null
+++ b/install/install_kaldi.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+if [ -f $HOME/kaldi/KALDI_INSTALLED ]; then
+    echo "kaldi dir is not empty"
+    exit 0
+fi
+cd $HOME/kaldi/src
+./configure --static --use-cuda=no --openblas-root=$HOME/kaldi/tools/OpenBLAS/install
+make depend
+make -j 4
+touch $HOME/kaldi/KALDI_INSTALLED
+exit 1
diff --git a/install/install_kaldi_deps.sh b/install/install_kaldi_deps.sh
new file mode 100755
index 0000000..fa53cf4
--- /dev/null
+++ b/install/install_kaldi_deps.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+if [ -f $HOME/kaldi/KALDI_DEPS_INSTALLED ]; then
+    echo "kaldi deps are installed"
+    exit 0
+fi
+git clone https://github.com/kaldi-asr/kaldi.git $HOME/kaldi
+cd $HOME/kaldi/tools
+./extras/check_dependencies.sh
+make
+cd $HOME/kaldi/tools
+./extras/install_openblas.sh
+touch $HOME/kaldi/KALDI_DEPS_INSTALLED
+exit 1

From a530175c5327948aeea98fe1cefc46110329ae2c Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Wed, 1 Feb 2017 18:07:25 -0500
Subject: [PATCH 05/21] Increase cache timeout

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index de43f8a..f49306e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ cache:
   directories:
     - $HOME/miniconda
     - $HOME/kaldi
+  timeout: 1000
 branches:
   only:
     - master

From 29be2d721d674dbad3cbaafb57def9b98ce2eee4 Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Thu, 2 Feb 2017 14:38:33 -0500
Subject: [PATCH 06/21] Reinstall package

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f49306e..89acd9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,5 +26,5 @@ before_install:
 install:
   - skip || conda install --yes numpy
 script:
-  - skip || pip install . # Tests setup.py
+  - skip || pip install --upgrade --force-reinstall -v . # Tests setup.py
   - skip || python -c "import kaldi_io"

From 9813dd8c9736c9ca7b2cef7c683769896e1b5e2e Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Thu, 2 Feb 2017 16:31:10 -0500
Subject: [PATCH 07/21] tst

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 89acd9d..61494bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,8 @@ before_install:
   - ./install/install_conda.sh || skip_rest
   - export PATH=$HOME/miniconda/bin:$PATH
   - conda update -q --yes conda
-  - conda install -q --yes python=$TRAVIS_PYTHON_VERSION gcc pip boost-python
+  - conda install -q --yes python=$TRAVIS_PYTHON_VERSION gcc pip
+  - conda install -q --yesboost
   - (skip || ./install/install_kaldi_deps.sh) || skip_rest
   - skip || ./install/install_kaldi.sh || skip_rest
   - export KALDI_ROOT=$HOME/kaldi/

From 2e3c7301d7151040036efd6d47ae2a14c271565e Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Thu, 2 Feb 2017 16:41:53 -0500
Subject: [PATCH 08/21] tst

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 61494bb..e3a8bba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ before_install:
   - export PATH=$HOME/miniconda/bin:$PATH
   - conda update -q --yes conda
   - conda install -q --yes python=$TRAVIS_PYTHON_VERSION gcc pip
-  - conda install -q --yesboost
+  - conda install -q --yes boost
   - (skip || ./install/install_kaldi_deps.sh) || skip_rest
   - skip || ./install/install_kaldi.sh || skip_rest
   - export KALDI_ROOT=$HOME/kaldi/

From ce0f487b443489b69069ed8f059c569eb2870ff6 Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Thu, 2 Feb 2017 17:04:03 -0500
Subject: [PATCH 09/21] Fix makefile and throw exception when make fails

---
 kaldi_io/Makefile | 2 +-
 setup.py          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kaldi_io/Makefile b/kaldi_io/Makefile
index 2a9e5ee..acded58 100644
--- a/kaldi_io/Makefile
+++ b/kaldi_io/Makefile
@@ -28,7 +28,7 @@ PYLIBS = kaldi_io_internal.so
 #include $(KALDI_SRC)/makefiles/default_rules.mk
 
 %.so: %.cpp
-		g++ -shared -o $@ -Wall -fPIC -I$(KALDI_SRC) $(PYINC) $(NPINC) $(CXXFLAGS) $< $(ADDLIBS) $(LDFLAGS) -L$(PYLIB) $(LOADLIBES) $(LDLIBS) -lpython2.7 -lboost_python -lboost_system 
+		g++ -shared -o $@ -Wall -fPIC -I$(KALDI_SRC) $(PYINC) $(NPINC) $(CXXFLAGS) $< $(ADDLIBS) $(LDFLAGS) $(PYLIB) $(LOADLIBES) $(LDLIBS) -lboost_python -lboost_system 
 
 clean:
 	-rm -f *.o *.a *.so $(TESTFILES) $(BINFILES) $(TESTOUTPUTS) tmp* *.tmp
diff --git a/setup.py b/setup.py
index 5f80faf..16e9719 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,9 @@
 
 class Make(build):
     def run(self):
-        os.system("make")
+        exit_code = os.system("make")
+        if exit_code != 0:
+            raise Exception("error during building")
         build.run(self)
 
 setup(name='kaldi-python',

From 24a493b8351d4f10817524aef5bb3f4963ad2aae Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Thu, 2 Feb 2017 17:47:28 -0500
Subject: [PATCH 10/21] Do not skip testing

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e3a8bba..e95e5c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,5 +27,5 @@ before_install:
 install:
   - skip || conda install --yes numpy
 script:
-  - skip || pip install --upgrade --force-reinstall -v . # Tests setup.py
-  - skip || python -c "import kaldi_io"
+  - pip install --upgrade --force-reinstall -v . # Tests setup.py
+  - python -c "import kaldi_io"

From a1200a58b959c3fbf8e50d62812484a4cd247a61 Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Thu, 2 Feb 2017 18:23:18 -0500
Subject: [PATCH 11/21] better error message

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 16e9719..e0a16b1 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,8 @@ class Make(build):
     def run(self):
         exit_code = os.system("make")
         if exit_code != 0:
-            raise Exception("error during building")
+            raise Exception(
+                "make returned: {}".format(exit_code))
         build.run(self)
 
 setup(name='kaldi-python',

From a269b43cddee8a7879323a0c59ad9d845ff5e23d Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Fri, 3 Feb 2017 13:33:38 -0500
Subject: [PATCH 12/21] tst

---
 install/install_kaldi.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/install_kaldi.sh b/install/install_kaldi.sh
index 8c095ce..30c2dfa 100755
--- a/install/install_kaldi.sh
+++ b/install/install_kaldi.sh
@@ -4,7 +4,7 @@ if [ -f $HOME/kaldi/KALDI_INSTALLED ]; then
     exit 0
 fi
 cd $HOME/kaldi/src
-./configure --static --use-cuda=no --openblas-root=$HOME/kaldi/tools/OpenBLAS/install
+./configure --shared --use-cuda=no --openblas-root=$HOME/kaldi/tools/OpenBLAS/install
 make depend
 make -j 4
 touch $HOME/kaldi/KALDI_INSTALLED

From c2b2115cf7a56adb9d8a767c282c4480de99461a Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Fri, 3 Feb 2017 16:29:53 -0500
Subject: [PATCH 13/21] tst

---
 kaldi_io/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kaldi_io/__init__.py b/kaldi_io/__init__.py
index 744145c..333333d 100644
--- a/kaldi_io/__init__.py
+++ b/kaldi_io/__init__.py
@@ -240,7 +240,7 @@
 
 
 import numpy as np
-from kaldi_io_internal import *
+from .kaldi_io_internal import *
 
 if KALDI_BASE_FLOAT()==np.float64:
     RandomAccessBaseFloatMatrixReader = RandomAccessFloat64MatrixReader

From 0ac9dd0de77ea187690bed1584faaf076a0ff994 Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Fri, 3 Feb 2017 16:46:09 -0500
Subject: [PATCH 14/21] tst

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index e95e5c6..7c4b3cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,4 +28,5 @@ install:
   - skip || conda install --yes numpy
 script:
   - pip install --upgrade --force-reinstall -v . # Tests setup.py
+  - ls /home/travis/miniconda/lib/python2.7/site-packages/kaldi_io/
   - python -c "import kaldi_io"

From 3e65f8b47266e3a7dd4d9b9652cd192a1d66b44d Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Fri, 3 Feb 2017 17:03:18 -0500
Subject: [PATCH 15/21] tst

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 7c4b3cd..c5b0e1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,3 +30,4 @@ script:
   - pip install --upgrade --force-reinstall -v . # Tests setup.py
   - ls /home/travis/miniconda/lib/python2.7/site-packages/kaldi_io/
   - python -c "import kaldi_io"
+  - python -c "import kaldi_io.kaldi_io_internal"

From 95b15d4f945a3579f735fc7f2ea2dabc53a0e363 Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Fri, 3 Feb 2017 17:24:04 -0500
Subject: [PATCH 16/21] tst

---
 kaldi_io/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kaldi_io/__init__.py b/kaldi_io/__init__.py
index 333333d..1cf18aa 100644
--- a/kaldi_io/__init__.py
+++ b/kaldi_io/__init__.py
@@ -240,7 +240,7 @@
 
 
 import numpy as np
-from .kaldi_io_internal import *
+from kaldi_io.kaldi_io_internal import *
 
 if KALDI_BASE_FLOAT()==np.float64:
     RandomAccessBaseFloatMatrixReader = RandomAccessFloat64MatrixReader

From 4c1e8efb07f5113609f6d5e5026f285730e528d8 Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Fri, 3 Feb 2017 17:51:34 -0500
Subject: [PATCH 17/21] tst

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index c5b0e1b..1f2ab2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,5 +29,6 @@ install:
 script:
   - pip install --upgrade --force-reinstall -v . # Tests setup.py
   - ls /home/travis/miniconda/lib/python2.7/site-packages/kaldi_io/
+  - ls $HOME/kaldi/src/decoder
   - python -c "import kaldi_io"
   - python -c "import kaldi_io.kaldi_io_internal"

From 2706e584df4ef377242d4f7d5679ae16cea424d7 Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Fri, 3 Feb 2017 18:06:13 -0500
Subject: [PATCH 18/21] try static

---
 install/install_kaldi.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/install/install_kaldi.sh b/install/install_kaldi.sh
index 30c2dfa..d446140 100755
--- a/install/install_kaldi.sh
+++ b/install/install_kaldi.sh
@@ -4,7 +4,8 @@ if [ -f $HOME/kaldi/KALDI_INSTALLED ]; then
     exit 0
 fi
 cd $HOME/kaldi/src
-./configure --shared --use-cuda=no --openblas-root=$HOME/kaldi/tools/OpenBLAS/install
+export CXXFLAGS=-fPIC:$CXXFLAGS
+./configure --static --use-cuda=no --openblas-root=$HOME/kaldi/tools/OpenBLAS/install
 make depend
 make -j 4
 touch $HOME/kaldi/KALDI_INSTALLED

From 72c8db0a399bed2d283c2d99838e0ff7d5279057 Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Mon, 6 Feb 2017 13:39:51 -0500
Subject: [PATCH 19/21] tst

---
 install/install_kaldi.sh | 3 ++-
 kaldi_io/__init__.py     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/install/install_kaldi.sh b/install/install_kaldi.sh
index d446140..22709d5 100755
--- a/install/install_kaldi.sh
+++ b/install/install_kaldi.sh
@@ -4,7 +4,8 @@ if [ -f $HOME/kaldi/KALDI_INSTALLED ]; then
     exit 0
 fi
 cd $HOME/kaldi/src
-export CXXFLAGS=-fPIC:$CXXFLAGS
+export CXXFLAGS="-fPIC":$CXXFLAGS
+export CFLAGS="-fPIC":$CFLAGS
 ./configure --static --use-cuda=no --openblas-root=$HOME/kaldi/tools/OpenBLAS/install
 make depend
 make -j 4
diff --git a/kaldi_io/__init__.py b/kaldi_io/__init__.py
index 1cf18aa..333333d 100644
--- a/kaldi_io/__init__.py
+++ b/kaldi_io/__init__.py
@@ -240,7 +240,7 @@
 
 
 import numpy as np
-from kaldi_io.kaldi_io_internal import *
+from .kaldi_io_internal import *
 
 if KALDI_BASE_FLOAT()==np.float64:
     RandomAccessBaseFloatMatrixReader = RandomAccessFloat64MatrixReader

From e0221717cbcd85af240a1a29e4d4c72b93258814 Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Mon, 6 Feb 2017 15:36:12 -0500
Subject: [PATCH 20/21] tst

---
 kaldi_io/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kaldi_io/Makefile b/kaldi_io/Makefile
index acded58..782a689 100644
--- a/kaldi_io/Makefile
+++ b/kaldi_io/Makefile
@@ -28,7 +28,7 @@ PYLIBS = kaldi_io_internal.so
 #include $(KALDI_SRC)/makefiles/default_rules.mk
 
 %.so: %.cpp
-		g++ -shared -o $@ -Wall -fPIC -I$(KALDI_SRC) $(PYINC) $(NPINC) $(CXXFLAGS) $< $(ADDLIBS) $(LDFLAGS) $(PYLIB) $(LOADLIBES) $(LDLIBS) -lboost_python -lboost_system 
+		g++ -shared -o $@ -Wall -fPIC -I$(KALDI_SRC) $(PYINC) $(NPINC) $(CXXFLAGS) $< $(ADDLIBS) $(LDFLAGS) $(PYLIB) $(LOADLIBES) $(LDLIBS) -lboost_python -lboost_system -fPIC
 
 clean:
 	-rm -f *.o *.a *.so $(TESTFILES) $(BINFILES) $(TESTOUTPUTS) tmp* *.tmp

From fe344a0900749676c30ef33cd895a4b23509b8e5 Mon Sep 17 00:00:00 2001
From: dmitriy-serdyuk <serdyuk.dmitriy@gmail.com>
Date: Mon, 6 Feb 2017 18:17:41 -0500
Subject: [PATCH 21/21] tst

---
 kaldi_io/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kaldi_io/Makefile b/kaldi_io/Makefile
index 782a689..f3a9aba 100644
--- a/kaldi_io/Makefile
+++ b/kaldi_io/Makefile
@@ -1,6 +1,7 @@
 
 all:
 EXTRA_CXXFLAGS = -Wno-sign-compare
+CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) -shared -fPIC
 
 KALDI_SRC = $(KALDI_ROOT)/src
 
@@ -28,7 +29,7 @@ PYLIBS = kaldi_io_internal.so
 #include $(KALDI_SRC)/makefiles/default_rules.mk
 
 %.so: %.cpp
-		g++ -shared -o $@ -Wall -fPIC -I$(KALDI_SRC) $(PYINC) $(NPINC) $(CXXFLAGS) $< $(ADDLIBS) $(LDFLAGS) $(PYLIB) $(LOADLIBES) $(LDLIBS) -lboost_python -lboost_system -fPIC
+		g++ -o $@ -I$(KALDI_SRC) $(PYINC) $(NPINC)  $< $(ADDLIBS) $(LDFLAGS) $(PYLIB) $(LOADLIBES) $(LDLIBS) -lboost_python -lboost_system 
 
 clean:
 	-rm -f *.o *.a *.so $(TESTFILES) $(BINFILES) $(TESTOUTPUTS) tmp* *.tmp