From 0b1bb11000c9e2449897e119479fedb44195154f Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Tue, 15 Mar 2022 12:47:36 +0800
Subject: [PATCH] Minor fixes.

---
 .../workflows/run-librispeech-2022-03-12.yml  | 47 +++++++++++++++----
 requirements-ci.txt                           |  1 -
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/run-librispeech-2022-03-12.yml b/.github/workflows/run-librispeech-2022-03-12.yml
index 03b69af40..1e58778f2 100644
--- a/.github/workflows/run-librispeech-2022-03-12.yml
+++ b/.github/workflows/run-librispeech-2022-03-12.yml
@@ -57,24 +57,41 @@ jobs:
         run: |
           grep -v '^#' ./requirements-ci.txt  | xargs -n 1 -L 1 pip install
 
+
       - name: Cache pre-trained model
-        id: cache-pretrained-model
+        id: my-cache
         uses: actions/cache@v2
         with:
-          path: ~/tmp/icefall-asr-librispeech-pruned-transducer-stateless-2022-03-12
-          key: run-librispeech-2022-03-12
+          path: ~/tmp/
+          key: cache-tmp
 
-
-      - name: Download pre-trained model
-        if: steps.cache-pretrained-model.outputs.cache-hit != 'true'
+      - name: Install kaldifeat
+        if: steps.my-cache.outputs.cache-hit != 'true'
         shell: bash
         run: |
-          sudo apt-get -qq install git-lfs tree sox
-          mkdir tmp
-          cd tmp
+          mkdir -p ~/tmp
+          cd ~/tmp
+          git clone https://github.com/csukuangfj/kaldifeat
+          cd kaldifeat
+          mkdir build
+          cd build
+          cmake -DCMAKE_BUILD_TYPE=Release ..
+          make -j
+
+      - name: Download pre-trained model
+        if: steps.my-cache.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          sudo apt-get -qq install git-lfs
+          mkdir -p ~/tmp
+          cd ~/tmp
           git lfs install
           git clone https://huggingface.co/csukuangfj/icefall-asr-librispeech-pruned-transducer-stateless-2022-03-12
-          cd ..
+
+      - name: Display test files
+        shell: bash
+        run: |
+          sudo apt-get -qq install tree sox
           tree tmp
           soxi tmp/icefall-asr-librispeech-pruned-transducer-stateless-2022-03-12/test_wavs/*.wav
           ls -lh tmp/icefall-asr-librispeech-pruned-transducer-stateless-2022-03-12/test_wavs/*.wav
@@ -83,6 +100,8 @@ jobs:
         shell: bash
         run: |
           export PYTHONPATH=$PWD:PYTHONPATH
+          export PYTHONPATH=~/tmp/kaldifeat/kaldifeat/python:PYTHONPATH
+          export PYTHONPATH=~/tmp/kaldifeat/build/lib:PYTHONPATH
           dir=~/tmp/icefall-asr-librispeech-pruned-transducer-stateless-2022-03-12
           cd egs/librispeech/ASR
           ./pruned_transducer_stateless/pretrained.py \
@@ -98,6 +117,8 @@ jobs:
         shell: bash
         run: |
           export PYTHONPATH=$PWD:PYTHONPATH
+          export PYTHONPATH=~/tmp/kaldifeat/kaldifeat/python:PYTHONPATH
+          export PYTHONPATH=~/tmp/kaldifeat/build/lib:PYTHONPATH
           dir=~/tmp/icefall-asr-librispeech-pruned-transducer-stateless-2022-03-12
           cd egs/librispeech/ASR
           ./pruned_transducer_stateless/pretrained.py \
@@ -113,6 +134,8 @@ jobs:
         shell: bash
         run: |
           export PYTHONPATH=$PWD:PYTHONPATH
+          export PYTHONPATH=~/tmp/kaldifeat/kaldifeat/python:PYTHONPATH
+          export PYTHONPATH=~/tmp/kaldifeat/build/lib:PYTHONPATH
           dir=~/tmp/icefall-asr-librispeech-pruned-transducer-stateless-2022-03-12
           cd egs/librispeech/ASR
           ./pruned_transducer_stateless/pretrained.py \
@@ -128,6 +151,8 @@ jobs:
         shell: bash
         run: |
           export PYTHONPATH=$PWD:$PYTHONPATH
+          export PYTHONPATH=~/tmp/kaldifeat/kaldifeat/python:PYTHONPATH
+          export PYTHONPATH=~/tmp/kaldifeat/build/lib:PYTHONPATH
           dir=~/tmp/icefall-asr-librispeech-pruned-transducer-stateless-2022-03-12
           cd egs/librispeech/ASR
           ./pruned_transducer_stateless/pretrained.py \
@@ -143,6 +168,8 @@ jobs:
         shell: bash
         run: |
           export PYTHONPATH=$PWD:$PYTHONPATH
+          export PYTHONPATH=~/tmp/kaldifeat/kaldifeat/python:PYTHONPATH
+          export PYTHONPATH=~/tmp/kaldifeat/build/lib:PYTHONPATH
           dir=~/tmp/icefall-asr-librispeech-pruned-transducer-stateless-2022-03-12
           cd egs/librispeech/ASR
           ./pruned_transducer_stateless/pretrained.py \
diff --git a/requirements-ci.txt b/requirements-ci.txt
index 9e8057499..6e39bef83 100644
--- a/requirements-ci.txt
+++ b/requirements-ci.txt
@@ -14,7 +14,6 @@ graphviz==0.19.1
 -f https://k2-fsa.org/nightly/ k2==1.9.dev20211101+cpu.torch1.10.0
 
 lhotse==0.12.0
-kaldifeat==1.12
 kaldilm==1.11
 kaldialign==0.2
 sentencepiece==0.1.96