Explorar el Código

Add CI test for a small zipformer model (#113)

Fangjun Kuang hace 2 años
padre
commit
3b1557d267
Se han modificado 2 ficheros con 56 adiciones y 20 borrados
  1. 55 19
      .github/scripts/run-test.sh
  2. 1 1
      CMakeLists.txt

+ 55 - 19
.github/scripts/run-test.sh

@@ -88,9 +88,7 @@ log "Download pretrained model and test-data from $repo_url"
 
 GIT_LFS_SKIP_SMUDGE=1 git clone $repo_url
 pushd $repo
-git lfs pull --include "encoder_jit_trace-v2-epoch-11-avg-2-pnnx.ncnn.bin"
-git lfs pull --include "decoder_jit_trace-v2-epoch-11-avg-2-pnnx.ncnn.bin"
-git lfs pull --include "joiner_jit_trace-v2-epoch-11-avg-2-pnnx.ncnn.bin"
+git lfs pull --include "*.bin"
 popd
 
 waves=(
@@ -105,12 +103,12 @@ for wave in ${waves[@]}; do
 
     time $EXE \
       $repo/tokens.txt \
-      $repo/encoder_jit_trace-v2-epoch-11-avg-2-pnnx.ncnn.param \
-      $repo/encoder_jit_trace-v2-epoch-11-avg-2-pnnx.ncnn.bin \
-      $repo/decoder_jit_trace-v2-epoch-11-avg-2-pnnx.ncnn.param \
-      $repo/decoder_jit_trace-v2-epoch-11-avg-2-pnnx.ncnn.bin \
-      $repo/joiner_jit_trace-v2-epoch-11-avg-2-pnnx.ncnn.param \
-      $repo/joiner_jit_trace-v2-epoch-11-avg-2-pnnx.ncnn.bin \
+      $repo/encoder_jit_trace-pnnx.ncnn.param \
+      $repo/encoder_jit_trace-pnnx.ncnn.bin \
+      $repo/decoder_jit_trace-pnnx.ncnn.param \
+      $repo/decoder_jit_trace-pnnx.ncnn.bin \
+      $repo/joiner_jit_trace-pnnx.ncnn.param \
+      $repo/joiner_jit_trace-pnnx.ncnn.bin \
       $wave \
       4 \
       $m
@@ -130,9 +128,7 @@ log "Download pretrained model and test-data from $repo_url"
 
 GIT_LFS_SKIP_SMUDGE=1 git clone $repo_url
 pushd $repo
-git lfs pull --include "bar/encoder_jit_trace-v2-iter-468000-avg-16-pnnx.ncnn.bin"
-git lfs pull --include "bar/decoder_jit_trace-v2-iter-468000-avg-16-pnnx.ncnn.bin"
-git lfs pull --include "bar/joiner_jit_trace-v2-iter-468000-avg-16-pnnx.ncnn.bin"
+git lfs pull --include "*.bin"
 popd
 
 waves=(
@@ -147,12 +143,12 @@ for wave in ${waves[@]}; do
 
     time $EXE \
       $repo/tokens.txt \
-      $repo/bar/encoder_jit_trace-v2-iter-468000-avg-16-pnnx.ncnn.param \
-      $repo/bar/encoder_jit_trace-v2-iter-468000-avg-16-pnnx.ncnn.bin \
-      $repo/bar/decoder_jit_trace-v2-iter-468000-avg-16-pnnx.ncnn.param \
-      $repo/bar/decoder_jit_trace-v2-iter-468000-avg-16-pnnx.ncnn.bin \
-      $repo/bar/joiner_jit_trace-v2-iter-468000-avg-16-pnnx.ncnn.param \
-      $repo/bar/joiner_jit_trace-v2-iter-468000-avg-16-pnnx.ncnn.bin \
+      $repo/encoder_jit_trace-pnnx.ncnn.param \
+      $repo/encoder_jit_trace-pnnx.ncnn.bin \
+      $repo/decoder_jit_trace-pnnx.ncnn.param \
+      $repo/decoder_jit_trace-pnnx.ncnn.bin \
+      $repo/joiner_jit_trace-pnnx.ncnn.param \
+      $repo/joiner_jit_trace-pnnx.ncnn.bin \
       $wave \
       4 \
       $m
@@ -204,7 +200,6 @@ for wave in ${waves[@]}; do
 done
 
 
-
 log "Test int8 models"
 
 for wave in ${waves[@]}; do
@@ -332,6 +327,47 @@ done
 
 rm -rf $repo
 
+log "------------------------------------------------------------"
+log "Run small Zipformer transducer (English + Chinese, bilingual)"
+log "------------------------------------------------------------"
+repo_url=https://huggingface.co/csukuangfj/sherpa-ncnn-streaming-zipformer-small-bilingual-zh-en-2023-02-16
+log "Start testing ${repo_url}"
+repo=$(basename $repo_url)
+log "Download pretrained model and test-data from $repo_url"
+
+GIT_LFS_SKIP_SMUDGE=1 git clone $repo_url
+pushd $repo
+git lfs pull --include "*.bin"
+popd
+
+waves=(
+$repo/test_wavs/0.wav
+$repo/test_wavs/1.wav
+$repo/test_wavs/2.wav
+$repo/test_wavs/3.wav
+$repo/test_wavs/4.wav
+)
+
+for wave in ${waves[@]}; do
+  for m in greedy_search modified_beam_search; do
+    log "----test $m ---"
+
+    time $EXE \
+      $repo/tokens.txt \
+      $repo/encoder_jit_trace-pnnx.ncnn.param \
+      $repo/encoder_jit_trace-pnnx.ncnn.bin \
+      $repo/decoder_jit_trace-pnnx.ncnn.param \
+      $repo/decoder_jit_trace-pnnx.ncnn.bin \
+      $repo/joiner_jit_trace-pnnx.ncnn.param \
+      $repo/joiner_jit_trace-pnnx.ncnn.bin \
+      $wave \
+      4 \
+      $m
+  done
+done
+
+rm -rf $repo
+
 log "------------------------------------------------------------"
 log "Run Zipformer transducer (English)"
 log "------------------------------------------------------------"

+ 1 - 1
CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 project(sherpa-ncnn)
 
-set(SHERPA_NCNN_VERSION "1.5.0")
+set(SHERPA_NCNN_VERSION "1.5.1")
 
 # Disable warning about
 #