Refactor WebAssembly for nodejs (k2-fsa#626)

csukuangfj · Mar 2, 2024 · ac6825f · ac6825f
1 parent a65643b
commit ac6825f
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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:[email protected]/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
@@ -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
@@ -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
@@ -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
-    "$<TARGET_FILE_DIR:sherpa-onnx-wasm-asr-main>/sherpa-onnx-wasm-asr-main.js"
+    "$<TARGET_FILE_DIR:sherpa-onnx-wasm-main-asr>/sherpa-onnx-wasm-main-asr.js"
     "index.html"
-    "sherpa-onnx.js"
-    "app.js"
-    "$<TARGET_FILE_DIR:sherpa-onnx-wasm-asr-main>/sherpa-onnx-wasm-asr-main.wasm"
-    "$<TARGET_FILE_DIR:sherpa-onnx-wasm-asr-main>/sherpa-onnx-wasm-asr-main.data"
+    "sherpa-onnx-asr.js"
+    "app-asr.js"
+    "$<TARGET_FILE_DIR:sherpa-onnx-wasm-main-asr>/sherpa-onnx-wasm-main-asr.wasm"
+    "$<TARGET_FILE_DIR:sherpa-onnx-wasm-main-asr>/sherpa-onnx-wasm-main-asr.data"
   DESTINATION
     bin/wasm/asr
 )
diff --git a/wasm/asr/app.js → wasm/asr/app-asr.js b/wasm/asr/app.js → wasm/asr/app-asr.js
diff --git a/wasm/asr/index.html b/wasm/asr/index.html
@@ -36,7 +36,7 @@ <h1>
   <section flex="1" overflow="auto" id="sound-clips">
   </section>
 
-  <script src="sherpa-onnx.js"></script>
-  <script src="app.js"></script>
-  <script src="sherpa-onnx-wasm-asr-main.js"></script>
+  <script src="sherpa-onnx-asr.js"></script>
+  <script src="app-asr.js"></script>
+  <script src="sherpa-onnx-wasm-main-asr.js"></script>
 </body>
diff --git a/wasm/asr/sherpa-onnx.js → wasm/asr/sherpa-onnx-asr.js b/wasm/asr/sherpa-onnx.js → wasm/asr/sherpa-onnx-asr.js
diff --git a/wasm/asr/sherpa-onnx-wasm-asr-main.cc → wasm/asr/sherpa-onnx-wasm-main-asr.cc b/wasm/asr/sherpa-onnx-wasm-asr-main.cc → wasm/asr/sherpa-onnx-wasm-main-asr.cc
diff --git 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
-    "$<TARGET_FILE_DIR:sherpa-onnx-wasm-main>/sherpa-onnx-wasm-main.js"
+    "$<TARGET_FILE_DIR:sherpa-onnx-wasm-main-tts>/sherpa-onnx-wasm-main-tts.js"
     "index.html"
-    "sherpa-onnx.js"
-    "app.js"
-    "$<TARGET_FILE_DIR:sherpa-onnx-wasm-main>/sherpa-onnx-wasm-main.wasm"
-    "$<TARGET_FILE_DIR:sherpa-onnx-wasm-main>/sherpa-onnx-wasm-main.data"
-    # "$<TARGET_FILE_DIR:sherpa-onnx-wasm-main>/sherpa-onnx-wasm-main.html"
+    "sherpa-onnx-tts.js"
+    "app-tts.js"
+    "$<TARGET_FILE_DIR:sherpa-onnx-wasm-main-tts>/sherpa-onnx-wasm-main-tts.wasm"
+    "$<TARGET_FILE_DIR:sherpa-onnx-wasm-main-tts>/sherpa-onnx-wasm-main-tts.data"
   DESTINATION
     bin/wasm/tts
 )
diff --git a/wasm/tts/app.js → wasm/tts/app-tts.js b/wasm/tts/app.js → wasm/tts/app-tts.js
diff --git a/wasm/tts/index.html b/wasm/tts/index.html
@@ -40,7 +40,7 @@ <h1>
   <section flex="1" overflow="auto" id="sound-clips">
   </section>
 
-  <script src="app.js"></script>
-  <script src="sherpa-onnx.js"></script>
-  <script src="sherpa-onnx-wasm-main.js"></script>
+  <script src="app-tts.js"></script>
+  <script src="sherpa-onnx-tts.js"></script>
+  <script src="sherpa-onnx-wasm-main-tts.js"></script>
 </body>
diff --git a/wasm/tts/sherpa-onnx.js → wasm/tts/sherpa-onnx-tts.js b/wasm/tts/sherpa-onnx.js → wasm/tts/sherpa-onnx-tts.js
diff --git a/wasm/tts/sherpa-onnx-wasm-main.cc → wasm/tts/sherpa-onnx-wasm-main-tts.cc b/wasm/tts/sherpa-onnx-wasm-main.cc → wasm/tts/sherpa-onnx-wasm-main-tts.cc