From ac6825ff11053284070a311682f33a043ffe1beb Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Sat, 2 Mar 2024 12:31:36 +0800 Subject: [PATCH] Refactor WebAssembly for nodejs (#626) --- .../workflows/wasm-simd-hf-space-de-tts.yaml | 7 ++++++- .../wasm-simd-hf-space-en-asr-zipformer.yaml | 6 +++++- .../workflows/wasm-simd-hf-space-en-tts.yaml | 6 +++++- ...hf-space-zh-cantonese-en-asr-paraformer.yaml | 6 +++++- ...wasm-simd-hf-space-zh-en-asr-paraformer.yaml | 6 +++++- .../wasm-simd-hf-space-zh-en-asr-zipformer.yaml | 6 +++++- wasm/asr/CMakeLists.txt | 16 ++++++++-------- wasm/asr/{app.js => app-asr.js} | 0 wasm/asr/index.html | 6 +++--- wasm/asr/{sherpa-onnx.js => sherpa-onnx-asr.js} | 0 ...asr-main.cc => sherpa-onnx-wasm-main-asr.cc} | 0 wasm/tts/CMakeLists.txt | 17 ++++++++--------- wasm/tts/{app.js => app-tts.js} | 0 wasm/tts/index.html | 6 +++--- wasm/tts/{sherpa-onnx.js => sherpa-onnx-tts.js} | 0 ...asm-main.cc => sherpa-onnx-wasm-main-tts.cc} | 0 16 files changed, 53 insertions(+), 29 deletions(-) rename wasm/asr/{app.js => app-asr.js} (100%) rename wasm/asr/{sherpa-onnx.js => sherpa-onnx-asr.js} (100%) rename wasm/asr/{sherpa-onnx-wasm-asr-main.cc => sherpa-onnx-wasm-main-asr.cc} (100%) rename wasm/tts/{app.js => app-tts.js} (100%) rename wasm/tts/{sherpa-onnx.js => sherpa-onnx-tts.js} (100%) rename wasm/tts/{sherpa-onnx-wasm-main.cc => sherpa-onnx-wasm-main-tts.cc} (100%) diff --git a/.github/workflows/wasm-simd-hf-space-de-tts.yaml b/.github/workflows/wasm-simd-hf-space-de-tts.yaml index 5ca241bb..31943dff 100644 --- a/.github/workflows/wasm-simd-hf-space-de-tts.yaml +++ b/.github/workflows/wasm-simd-hf-space-de-tts.yaml @@ -72,7 +72,7 @@ jobs: path: ./sherpa-onnx-wasm-simd-*.tar.bz2 - name: Publish to ModelScope - if: false + # if: false env: MS_TOKEN: ${{ secrets.MODEL_SCOPE_GIT_TOKEN }} uses: nick-fields/retry@v2 @@ -92,6 +92,9 @@ jobs: git clone http://www.modelscope.cn/studios/k2-fsa/web-assembly-tts-sherpa-onnx-de.git ms cd ms + rm -fv *.js + rm -fv *.data + git fetch git pull git merge -m "merge remote" --ff origin main @@ -126,6 +129,8 @@ jobs: git clone https://huggingface.co/spaces/k2-fsa/web-assembly-tts-sherpa-onnx-de huggingface cd huggingface + rm -fv *.js + rm -fv *.data git fetch git pull git merge -m "merge remote" --ff origin main diff --git a/.github/workflows/wasm-simd-hf-space-en-asr-zipformer.yaml b/.github/workflows/wasm-simd-hf-space-en-asr-zipformer.yaml index deab7f45..cd9ba786 100644 --- a/.github/workflows/wasm-simd-hf-space-en-asr-zipformer.yaml +++ b/.github/workflows/wasm-simd-hf-space-en-asr-zipformer.yaml @@ -74,7 +74,7 @@ jobs: path: ./sherpa-onnx-wasm-simd-*.tar.bz2 - name: Publish to ModelScope - if: false + # if: false env: MS_TOKEN: ${{ secrets.MODEL_SCOPE_GIT_TOKEN }} uses: nick-fields/retry@v2 @@ -93,6 +93,8 @@ jobs: git clone https://www.modelscope.cn/studios/k2-fsa/web-assembly-asr-sherpa-onnx-en.git ms cd ms + rm -fv *.js + rm -fv *.data git fetch git pull git merge -m "merge remote" --ff origin main @@ -127,6 +129,8 @@ jobs: git clone https://huggingface.co/spaces/k2-fsa/web-assembly-asr-sherpa-onnx-en huggingface cd huggingface + rm -fv *.js + rm -fv *.data git fetch git pull git merge -m "merge remote" --ff origin main diff --git a/.github/workflows/wasm-simd-hf-space-en-tts.yaml b/.github/workflows/wasm-simd-hf-space-en-tts.yaml index d6ffd20d..68c06595 100644 --- a/.github/workflows/wasm-simd-hf-space-en-tts.yaml +++ b/.github/workflows/wasm-simd-hf-space-en-tts.yaml @@ -70,7 +70,7 @@ jobs: path: ./sherpa-onnx-wasm-simd-*.tar.bz2 - name: Publish to ModelScope - if: false + # if: false env: MS_TOKEN: ${{ secrets.MODEL_SCOPE_GIT_TOKEN }} uses: nick-fields/retry@v2 @@ -89,6 +89,8 @@ jobs: git clone https://www.modelscope.cn/studios/k2-fsa/web-assembly-tts-sherpa-onnx-en.git ms cd ms + rm -fv *.js + rm -fv *.data git fetch git pull git merge -m "merge remote" --ff origin main @@ -123,6 +125,8 @@ jobs: git clone https://huggingface.co/spaces/k2-fsa/web-assembly-tts-sherpa-onnx-en huggingface cd huggingface + rm -fv *.js + rm -fv *.data git fetch git pull git merge -m "merge remote" --ff origin main diff --git a/.github/workflows/wasm-simd-hf-space-zh-cantonese-en-asr-paraformer.yaml b/.github/workflows/wasm-simd-hf-space-zh-cantonese-en-asr-paraformer.yaml index 1b8194bc..78043c37 100644 --- a/.github/workflows/wasm-simd-hf-space-zh-cantonese-en-asr-paraformer.yaml +++ b/.github/workflows/wasm-simd-hf-space-zh-cantonese-en-asr-paraformer.yaml @@ -99,6 +99,8 @@ jobs: git clone https://huggingface.co/spaces/k2-fsa/web-assembly-asr-sherpa-onnx-zh-cantonese-en-paraformer huggingface cd huggingface + rm -fv *.js + rm -fv *.data git fetch git pull git merge -m "merge remote" --ff origin main @@ -115,7 +117,7 @@ jobs: git push https://csukuangfj:$HF_TOKEN@huggingface.co/spaces/k2-fsa/web-assembly-asr-sherpa-onnx-zh-cantonese-en-paraformer main - name: Publish to ModelScope - if: false + # if: false env: MS_TOKEN: ${{ secrets.MODEL_SCOPE_GIT_TOKEN }} uses: nick-fields/retry@v2 @@ -134,6 +136,8 @@ jobs: git clone https://www.modelscope.cn/studios/k2-fsa/web-assembly-asr-sherpa-onnx-zh-cantonese-en-paraformer.git ms cd ms + rm -fv *.js + rm -fv *.data git config lfs.locksverify true git fetch git pull diff --git a/.github/workflows/wasm-simd-hf-space-zh-en-asr-paraformer.yaml b/.github/workflows/wasm-simd-hf-space-zh-en-asr-paraformer.yaml index af46d2a1..5179b20f 100644 --- a/.github/workflows/wasm-simd-hf-space-zh-en-asr-paraformer.yaml +++ b/.github/workflows/wasm-simd-hf-space-zh-en-asr-paraformer.yaml @@ -81,7 +81,7 @@ jobs: path: ./sherpa-onnx-wasm-simd-*.tar.bz2 - name: Publish to ModelScope - if: false + # if: false env: MS_TOKEN: ${{ secrets.MODEL_SCOPE_GIT_TOKEN }} uses: nick-fields/retry@v2 @@ -100,6 +100,8 @@ jobs: git clone https://www.modelscope.cn/studios/k2-fsa/web-assembly-asr-sherpa-onnx-zh-en-paraformer.git ms cd ms + rm -fv *.js + rm -fv *.data git fetch git pull git merge -m "merge remote" --ff origin main @@ -134,6 +136,8 @@ jobs: git clone https://huggingface.co/spaces/k2-fsa/web-assembly-asr-sherpa-onnx-zh-en-paraformer huggingface cd huggingface + rm -fv *.js + rm -fv *.data git fetch git pull git merge -m "merge remote" --ff origin main diff --git a/.github/workflows/wasm-simd-hf-space-zh-en-asr-zipformer.yaml b/.github/workflows/wasm-simd-hf-space-zh-en-asr-zipformer.yaml index 702865e6..89c2e987 100644 --- a/.github/workflows/wasm-simd-hf-space-zh-en-asr-zipformer.yaml +++ b/.github/workflows/wasm-simd-hf-space-zh-en-asr-zipformer.yaml @@ -72,7 +72,7 @@ jobs: path: ./sherpa-onnx-wasm-simd-*.tar.bz2 - name: Publish to ModelScope - if: false + # if: false env: MS_TOKEN: ${{ secrets.MODEL_SCOPE_GIT_TOKEN }} uses: nick-fields/retry@v2 @@ -91,6 +91,8 @@ jobs: git clone https://www.modelscope.cn/studios/k2-fsa/web-assembly-asr-sherpa-onnx-zh-en.git ms cd ms + rm -fv *.js + rm -fv *.data git fetch git pull git merge -m "merge remote" --ff origin main @@ -125,6 +127,8 @@ jobs: git clone https://huggingface.co/spaces/k2-fsa/web-assembly-asr-sherpa-onnx-zh-en huggingface cd huggingface + rm -fv *.js + rm -fv *.data git fetch git pull git merge -m "merge remote" --ff origin main diff --git a/wasm/asr/CMakeLists.txt b/wasm/asr/CMakeLists.txt index db8a077e..4bc2eb0f 100644 --- a/wasm/asr/CMakeLists.txt +++ b/wasm/asr/CMakeLists.txt @@ -45,18 +45,18 @@ if (NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL ".js") endif() # set(CMAKE_EXECUTABLE_SUFFIX ".html") -add_executable(sherpa-onnx-wasm-asr-main sherpa-onnx-wasm-asr-main.cc) -target_link_libraries(sherpa-onnx-wasm-asr-main sherpa-onnx-c-api) -install(TARGETS sherpa-onnx-wasm-asr-main DESTINATION bin/wasm/asr) +add_executable(sherpa-onnx-wasm-main-asr sherpa-onnx-wasm-main-asr.cc) +target_link_libraries(sherpa-onnx-wasm-main-asr sherpa-onnx-c-api) +install(TARGETS sherpa-onnx-wasm-main-asr DESTINATION bin/wasm/asr) install( FILES - "$/sherpa-onnx-wasm-asr-main.js" + "$/sherpa-onnx-wasm-main-asr.js" "index.html" - "sherpa-onnx.js" - "app.js" - "$/sherpa-onnx-wasm-asr-main.wasm" - "$/sherpa-onnx-wasm-asr-main.data" + "sherpa-onnx-asr.js" + "app-asr.js" + "$/sherpa-onnx-wasm-main-asr.wasm" + "$/sherpa-onnx-wasm-main-asr.data" DESTINATION bin/wasm/asr ) diff --git a/wasm/asr/app.js b/wasm/asr/app-asr.js similarity index 100% rename from wasm/asr/app.js rename to wasm/asr/app-asr.js diff --git a/wasm/asr/index.html b/wasm/asr/index.html index 64661f11..3156321c 100644 --- a/wasm/asr/index.html +++ b/wasm/asr/index.html @@ -36,7 +36,7 @@
- - - + + + diff --git a/wasm/asr/sherpa-onnx.js b/wasm/asr/sherpa-onnx-asr.js similarity index 100% rename from wasm/asr/sherpa-onnx.js rename to wasm/asr/sherpa-onnx-asr.js diff --git a/wasm/asr/sherpa-onnx-wasm-asr-main.cc b/wasm/asr/sherpa-onnx-wasm-main-asr.cc similarity index 100% rename from wasm/asr/sherpa-onnx-wasm-asr-main.cc rename to wasm/asr/sherpa-onnx-wasm-main-asr.cc diff --git a/wasm/tts/CMakeLists.txt b/wasm/tts/CMakeLists.txt index 5ea3c31e..7bca7916 100644 --- a/wasm/tts/CMakeLists.txt +++ b/wasm/tts/CMakeLists.txt @@ -40,19 +40,18 @@ if (NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL ".js") endif() # set(CMAKE_EXECUTABLE_SUFFIX ".html") -add_executable(sherpa-onnx-wasm-main sherpa-onnx-wasm-main.cc) -target_link_libraries(sherpa-onnx-wasm-main sherpa-onnx-c-api) -install(TARGETS sherpa-onnx-wasm-main DESTINATION bin/wasm/tts) +add_executable(sherpa-onnx-wasm-main-tts sherpa-onnx-wasm-main-tts.cc) +target_link_libraries(sherpa-onnx-wasm-main-tts sherpa-onnx-c-api) +install(TARGETS sherpa-onnx-wasm-main-tts DESTINATION bin/wasm/tts) install( FILES - "$/sherpa-onnx-wasm-main.js" + "$/sherpa-onnx-wasm-main-tts.js" "index.html" - "sherpa-onnx.js" - "app.js" - "$/sherpa-onnx-wasm-main.wasm" - "$/sherpa-onnx-wasm-main.data" - # "$/sherpa-onnx-wasm-main.html" + "sherpa-onnx-tts.js" + "app-tts.js" + "$/sherpa-onnx-wasm-main-tts.wasm" + "$/sherpa-onnx-wasm-main-tts.data" DESTINATION bin/wasm/tts ) diff --git a/wasm/tts/app.js b/wasm/tts/app-tts.js similarity index 100% rename from wasm/tts/app.js rename to wasm/tts/app-tts.js diff --git a/wasm/tts/index.html b/wasm/tts/index.html index f71acfeb..2f9decf7 100644 --- a/wasm/tts/index.html +++ b/wasm/tts/index.html @@ -40,7 +40,7 @@
- - - + + + diff --git a/wasm/tts/sherpa-onnx.js b/wasm/tts/sherpa-onnx-tts.js similarity index 100% rename from wasm/tts/sherpa-onnx.js rename to wasm/tts/sherpa-onnx-tts.js diff --git a/wasm/tts/sherpa-onnx-wasm-main.cc b/wasm/tts/sherpa-onnx-wasm-main-tts.cc similarity index 100% rename from wasm/tts/sherpa-onnx-wasm-main.cc rename to wasm/tts/sherpa-onnx-wasm-main-tts.cc