Fix nodejs on Windows (#450)

Fangjun Kuang · GitHub
Commit 8dc08a9b9773ff865d0ff9f8cff38da8ea01200b 8dc08a9b 1 parent 66cad9fa
.github/scripts/test-nodejs-npm.sh
.github/workflows/test-nodejs-npm.yaml
.github/workflows/test-nodejs.yaml
nodejs-examples/package.json
scripts/nodejs/run.sh
--- a/.github/scripts/test-nodejs-npm.sh
查看文件 @8dc08a9
+++ b/.github/scripts/test-nodejs-npm.sh
查看文件 @8dc08a9
@@ -11,51 +11,54 @@ ls -lh node_modules
 # offline asr
-wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-nemo-ctc-en-conformer-small.tar.bz2
+curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-nemo-ctc-en-conformer-small.tar.bz2
+ls -lh
 tar xvf sherpa-onnx-nemo-ctc-en-conformer-small.tar.bz2
 rm sherpa-onnx-nemo-ctc-en-conformer-small.tar.bz2
 node ./test-offline-nemo-ctc.js
 rm -rf sherpa-onnx-nemo-ctc-en-conformer-small
-wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
+curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
+ls -lh
 tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
 rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
 node ./test-offline-paraformer.js
 rm -rf sherpa-onnx-paraformer-zh-2023-03-28
-wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-zipformer-en-2023-06-26.tar.bz2
+curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-zipformer-en-2023-06-26.tar.bz2
+ls -lh
 tar xvf sherpa-onnx-zipformer-en-2023-06-26.tar.bz2
 rm sherpa-onnx-zipformer-en-2023-06-26.tar.bz2
 node ./test-offline-transducer.js
 rm -rf sherpa-onnx-zipformer-en-2023-06-26
-wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-whisper-tiny.en.tar.bz2
+curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-whisper-tiny.en.tar.bz2
 tar xvf sherpa-onnx-whisper-tiny.en.tar.bz2
 rm sherpa-onnx-whisper-tiny.en.tar.bz2
 node ./test-offline-whisper.js
 rm -rf sherpa-onnx-whisper-tiny.en
 # online asr
-wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-streaming-paraformer-bilingual-zh-en.tar.bz2
+curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-streaming-paraformer-bilingual-zh-en.tar.bz2
 tar xvf sherpa-onnx-streaming-paraformer-bilingual-zh-en.tar.bz2
 rm sherpa-onnx-streaming-paraformer-bilingual-zh-en.tar.bz2
 node ./test-online-paraformer.js
 rm -rf sherpa-onnx-streaming-paraformer-bilingual-zh-en
-wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20.tar.bz2
+curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20.tar.bz2
 tar xvf sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20.tar.bz2
 rm sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20.tar.bz2
 node ./test-online-transducer.js
 rm -rf sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20
 # offline tts
-wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/vits-vctk.tar.bz2
+curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/vits-vctk.tar.bz2
 tar xvf vits-vctk.tar.bz2
 rm vits-vctk.tar.bz2
 node ./test-offline-tts-en.js
 rm -rf vits-vctk
-wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/vits-zh-aishell3.tar.bz2
+curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/vits-zh-aishell3.tar.bz2
 tar xvf vits-zh-aishell3.tar.bz2
 rm vits-zh-aishell3.tar.bz2
 node ./test-offline-tts-zh.js
--- a/.github/workflows/test-nodejs-npm.yaml
查看文件 @8dc08a9
+++ b/.github/workflows/test-nodejs-npm.yaml
查看文件 @8dc08a9
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest] #, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-2019]
         python-version: ["3.8"]
     steps:
--- a/.github/workflows/test-nodejs.yaml
查看文件 @8dc08a9
+++ b/.github/workflows/test-nodejs.yaml
查看文件 @8dc08a9
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest] #, windows-latest]
+        os: [ubuntu-latest, macos-latest] #, windows-2019]
         python-version: ["3.8"]
     steps:
@@ -47,8 +47,8 @@ jobs:
           mkdir build
           cd build
           cmake -D CMAKE_BUILD_TYPE=Release -D BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=./install ..
-          make -j2
-          make install
+          cmake --build . --target install --config Release
+
           ls -lh install/lib
       - name: Setup Python ${{ matrix.python-version }}
@@ -66,6 +66,9 @@ jobs:
           elif [[ $os == 'macos-latest' ]]; then
             mkdir -p scripts/nodejs/lib/osx-x64
             dst=scripts/nodejs/lib/osx-x64
+          elif [[ $os == 'windows-2019' ]]; then
+            mkdir -p scripts/nodejs/lib/win-x64
+            dst=scripts/nodejs/lib/win-x64
           fi
           cp -v build/install/lib/* $dst/
--- a/nodejs-examples/package.json
查看文件 @8dc08a9
+++ b/nodejs-examples/package.json
查看文件 @8dc08a9
 {
   "dependencies": {
     "naudiodon2": "^2.4.0",
-    "sherpa-onnx": "^1.8.11",
+    "sherpa-onnx": "^1.8.12",
     "wav": "^1.0.2"
   }
 }
--- a/scripts/nodejs/run.sh
查看文件 @8dc08a9
+++ b/scripts/nodejs/run.sh
查看文件 @8dc08a9
@@ -18,8 +18,8 @@ rm .clang-format
 function windows_x64() {
   echo "Process Windows (x64)"
-  mkdir -p lib/windows-x64
-  dst=$(realpath lib/windows-x64)
+  mkdir -p lib/win-x64
+  dst=$(realpath lib/win-x64)
   mkdir t
   cd t
   wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-win_amd64.whl
@@ -35,8 +35,8 @@ function windows_x64() {
 function windows_x86() {
   echo "Process Windows (x86)"
-  mkdir -p lib/windows-x86
-  dst=$(realpath lib/windows-x86)
+  mkdir -p lib/win-x86
+  dst=$(realpath lib/win-x86)
   mkdir t
   cd t
   wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-win32.whl
@@ -108,10 +108,10 @@ function osx_arm64() {
 }
 windows_x64
-ls -lh lib/windows-x64
+ls -lh lib/win-x64
 windows_x86
-ls -lh lib/windows-x86
+ls -lh lib/win-x86
 linux_x64
 ls -lh lib/linux-x64