Fix CI (#569)

k2-fsa · Apr 9, 2024 · 8781b27 · 8781b27
1 parent 100a6e8
commit 8781b27
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 14 deletions.
diff --git a/.github/workflows/run-cpp-websocket-test.yaml b/.github/workflows/run-cpp-websocket-test.yaml
@@ -67,7 +67,8 @@ jobs:
           python3 -m pip install wheel twine typing_extensions
           python3 -m pip install torch==${{ matrix.torch }} numpy -f https://download.pytorch.org/whl/cpu/torch_stable.html
 
-          python3 -m pip install k2==1.23.4.dev20230319+cpu.torch${{ matrix.torch }} -f https://k2-fsa.org/nightly/index.html
+          python3 -m pip install k2==1.24.4.dev20240223+cpu.torch${{ matrix.torch }} -f https://k2-fsa.github.io/k2/cpu.html
+
 
           python3 -m torch.utils.collect_env
 
@@ -78,7 +79,7 @@ jobs:
           python3 -m pip install wheel twine typing_extensions
           python3 -m pip install torch==${{ matrix.torch }} numpy -f https://download.pytorch.org/whl/cpu/torch_stable.html
 
-          python3 -m pip install k2==1.23.4.dev20230319+cpu.torch${{ matrix.torch }} -f https://k2-fsa.org/nightly/index.html
+          python3 -m pip install k2==1.24.4.dev20240223+cpu.torch${{ matrix.torch }} -f https://k2-fsa.github.io/k2/cpu.html
 
           python3 -m torch.utils.collect_env
 

diff --git a/.github/workflows/run-python-test.yaml b/.github/workflows/run-python-test.yaml
@@ -71,7 +71,7 @@ jobs:
           python3 -m pip install wheel twine typing_extensions pytest
           python3 -m pip install torch==${{ matrix.torch }} torchaudio==${{ matrix.torchaudio }} numpy -f https://download.pytorch.org/whl/cpu/torch_stable.html
 
-          python3 -m pip install k2==1.23.4.dev20230319+cpu.torch${{ matrix.torch }} -f https://k2-fsa.org/nightly/index.html
+          python3 -m pip install k2==1.24.4.dev20240223+cpu.torch${{ matrix.torch }} -f https://k2-fsa.github.io/k2/cpu.html
 
           python3 -m torch.utils.collect_env
 

diff --git a/.github/workflows/test-offline-websocket-rtf-wer.yaml b/.github/workflows/test-offline-websocket-rtf-wer.yaml
@@ -82,7 +82,7 @@ jobs:
           python3 -m pip install wheel twine typing_extensions
           python3 -m pip install torch==${{ matrix.torch }} torchaudio==${{ matrix.torchaudio }} numpy -f https://download.pytorch.org/whl/cpu/torch_stable.html
 
-          python3 -m pip install k2==1.23.4.dev20230319+cpu.torch${{ matrix.torch }} -f https://k2-fsa.org/nightly/index.html
+          python3 -m pip install k2==1.24.4.dev20240223+cpu.torch${{ matrix.torch }} -f https://k2-fsa.github.io/k2/cpu.html
 
           python3 -m torch.utils.collect_env
 

diff --git a/.github/workflows/test-online-websocket-rtf-wer.yaml b/.github/workflows/test-online-websocket-rtf-wer.yaml
@@ -82,7 +82,7 @@ jobs:
           python3 -m pip install wheel twine typing_extensions
           python3 -m pip install torch==${{ matrix.torch }} torchaudio==${{ matrix.torchaudio }} numpy -f https://download.pytorch.org/whl/cpu/torch_stable.html
 
-          python3 -m pip install k2==1.23.4.dev20230319+cpu.torch${{ matrix.torch }} -f https://k2-fsa.org/nightly/index.html
+          python3 -m pip install k2==1.24.4.dev20240223+cpu.torch${{ matrix.torch }} -f https://k2-fsa.github.io/k2/cpu.html
           python3 -m torch.utils.collect_env
 
       - name: Cache kaldifeat

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ from nvcr.io/nvidia/pytorch:22.12-py3
 # Please choose previous pytorch:xx.xx if you encounter cuda driver mismatch issue
 RUN pip3 install torchaudio
 RUN pip3 install \
-    k2==1.23.3.dev20230105+cuda11.7.torch1.13.1 -f https://k2-fsa.org/nightly/
+    k2==1.24.4.dev20240223+cuda11.7.torch1.13.1 -f https://k2-fsa.github.io/k2/cuda.html
 # #install k2 from source
 # #"sed -i ..."  line tries to turn off the cuda check
 # RUN git clone https://github.com/k2-fsa/k2.git && \

diff --git a/docs/source/cpp/pretrained_models/offline_transducer.rst b/docs/source/cpp/pretrained_models/offline_transducer.rst
@@ -342,7 +342,7 @@ icefall-asr-gigaspeech-pruned-transducer-stateless2
    #
    # See https://github.com/k2-fsa/icefall/pull/318
    #
-   GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/wgb14/icefall-asr-gigaspeech-pruned-transducer-stateless2
+   GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/icefall-asr-gigaspeech-pruned-transducer-stateless2
    cd icefall-asr-gigaspeech-pruned-transducer-stateless2
    git lfs pull --include "exp/cpu_jit-iter-3488000-avg-15.pt"
    git lfs pull --include "data/lang_bpe_500/bpe.model"
@@ -418,7 +418,7 @@ icefall_asr_wenetspeech_pruned_transducer_stateless2
   #
   # See https://github.com/k2-fsa/icefall/pull/349
   #
-  GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/luomingshuang/icefall_asr_wenetspeech_pruned_transducer_stateless2
+  GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/icefall_asr_wenetspeech_pruned_transducer_stateless2
 
   cd icefall_asr_wenetspeech_pruned_transducer_stateless2
   git lfs pull --include "exp/cpu_jit_epoch_10_avg_2_torch_1.7.1.pt"
@@ -455,7 +455,7 @@ icefall_asr_aidatatang-200zh_pruned_transducer_stateless2
   #
   # See https://github.com/k2-fsa/icefall/pull/355
   #
-  GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/luomingshuang/icefall_asr_aidatatang-200zh_pruned_transducer_stateless2
+  GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/icefall_asr_aidatatang-200zh_pruned_transducer_stateless2
   cd icefall_asr_aidatatang-200zh_pruned_transducer_stateless2
   git lfs pull --include "exp/cpu_jit_torch.1.7.1.pt"
 
@@ -511,7 +511,7 @@ icefall_asr_tal-csasr_pruned_transducer_stateless5
   #
   # See https://github.com/k2-fsa/icefall/pull/428
   #
-  GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/luomingshuang/icefall_asr_tal-csasr_pruned_transducer_stateless5
+  GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/icefall_asr_tal-csasr_pruned_transducer_stateless5
   cd icefall_asr_tal-csasr_pruned_transducer_stateless5
   git lfs pull --include "exp/cpu_jit.pt"
 

diff --git a/docs/source/cpp/pretrained_models/online_transducer.rst b/docs/source/cpp/pretrained_models/online_transducer.rst
@@ -107,7 +107,7 @@ icefall-asr-librispeech-conv-emformer-transducer-stateless2-2022-07-05
   #
   # See https://github.com/k2-fsa/icefall/pull/440
   #
-  GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/Zengwei/icefall-asr-librispeech-conv-emformer-transducer-stateless2-2022-07-05
+  GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/icefall-asr-librispeech-conv-emformer-transducer-stateless2-2022-07-05
   cd icefall-asr-librispeech-conv-emformer-transducer-stateless2-2022-07-05
 
   git lfs pull --include "exp/cpu-jit-epoch-30-avg-10-torch-1.10.0.pt"
@@ -233,7 +233,7 @@ icefall_librispeech_streaming_pruned_transducer_stateless4_20220625
   #
   # See https://github.com/k2-fsa/icefall/pull/440
   #
-  GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/pkufool/icefall_librispeech_streaming_pruned_transducer_stateless4_20220625
+  GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/icefall_librispeech_streaming_pruned_transducer_stateless4_20220625
   cd icefall_librispeech_streaming_pruned_transducer_stateless4_20220625
 
   git lfs pull --include "exp/cpu_jit-epoch-25-avg-3.pt"
@@ -311,7 +311,7 @@ icefall_asr_wenetspeech_pruned_transducer_stateless5_streaming
   #
   # See https://github.com/k2-fsa/icefall/pull/447
   #
-  GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/luomingshuang/icefall_asr_wenetspeech_pruned_transducer_stateless5_streaming
+  GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/icefall_asr_wenetspeech_pruned_transducer_stateless5_streaming
   cd icefall_asr_wenetspeech_pruned_transducer_stateless5_streaming
 
   git lfs pull --include "exp/cpu_jit_epoch_7_avg_1_torch.1.7.1.pt"

diff --git a/docs/source/onnx/faqs/index.rst b/docs/source/onnx/faqs/index.rst
@@ -67,3 +67,22 @@ Please run::
 
   sudo apt-get install libtool
 
+OSError: PortAudio library not found
+------------------------------------
+
+If you have the following error on Linux (Ubuntu),
+
+.. code-block:: bash
+
+  Traceback (most recent call last):
+    File "/mnt/sdb/shared/sherpa-onnx/./python-api-examples/vad-microphone.py", line 8, in <module>
+      import sounddevice as sd
+    File "/mnt/sdb/shared/py311/lib/python3.11/site-packages/sounddevice.py", line 71, in <module>
+      raise OSError('PortAudio library not found')
+  OSError: PortAudio library not found
+
+Then please run::
+
+  sudo apt-get install libportaudio2
+
+and then re-try.
diff --git a/triton/Dockerfile/Dockerfile.server b/triton/Dockerfile/Dockerfile.server
@@ -20,7 +20,7 @@ RUN pip3 install \
     lhotse \
     kaldifeat
 RUN pip3 install \
-    k2==1.24.3.dev20230528+cuda11.7.torch1.13.1 -f https://k2-fsa.org/nightly/
+    k2==1.24.4.dev20240223+cuda11.7.torch1.13.1 -f https://k2-fsa.github.io/k2/cuda.html
 # Dependency for client
 RUN pip3 install soundfile grpcio-tools tritonclient pyyaml
 WORKDIR /workspace