fix a typo

k2-fsa · May 6, 2024 · 3bc3f04 · 3bc3f04
1 parent 07d8c9a
commit 3bc3f04
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 31 deletions.
diff --git a/.github/scripts/node-addon/package-optional.json b/.github/scripts/node-addon/package-optional.json
@@ -1,5 +1,5 @@
 {
-  "name": "sherpa-onnx-PLATFORM-ARCH",
+  "name": "sherpa-onnx-PLATFORM2-ARCH",
   "version": "SHERPA_ONNX_VERSION",
   "description": "Speech-to-text and text-to-speech using Next-gen Kaldi without internet connection",
   "main": "index.js",

diff --git a/.github/scripts/node-addon/package.json b/.github/scripts/node-addon/package.json
@@ -47,6 +47,7 @@
   "optionalDependencies": {
     "sherpa-onnx-darwin-arm64": "^SHERPA_ONNX_VERSION",
     "sherpa-onnx-darwin-x64": "^SHERPA_ONNX_VERSION",
-    "sherpa-onnx-linux-x64": "^SHERPA_ONNX_VERSION"
+    "sherpa-onnx-linux-x64": "^SHERPA_ONNX_VERSION",
+    "sherpa-onnx-win-x64": "^SHERPA_ONNX_VERSION"
   }
 }
diff --git a/.github/scripts/node-addon/run.sh b/.github/scripts/node-addon/run.sh
@@ -7,6 +7,11 @@ src_dir=$sherpa_onnx_dir/.github/scripts/node-addon
 
 platform=$(node -p "require('os').platform()")
 arch=$(node -p "require('os').arch()")
+platform2=$platform
+
+if [[ $platform == win32 ]]; then
+  platform2=win
+fi
 
 SHERPA_ONNX_VERSION=$(grep "SHERPA_ONNX_VERSION" ./CMakeLists.txt  | cut -d " " -f 2  | cut -d '"' -f 2)
 echo "SHERPA_ONNX_VERSION $SHERPA_ONNX_VERSION"
@@ -17,6 +22,7 @@ fi
 
 sed -i.bak s/SHERPA_ONNX_VERSION/$SHERPA_ONNX_VERSION/g $src_dir/package-optional.json
 sed -i.bak s/k2-fsa/$owner/g $src_dir/package-optional.json
+sed -i.bak s/PLATFORM2/$platform2/g $src_dir/package-optional.json
 sed -i.bak s/PLATFORM/$platform/g $src_dir/package-optional.json
 sed -i.bak s/ARCH/$arch/g $src_dir/package-optional.json
 

diff --git a/.github/workflows/npm-addon-linux-x64.yaml b/.github/workflows/npm-addon-linux-x64.yaml
@@ -66,30 +66,26 @@ jobs:
       - name: Build sherpa-onnx node-addon
         shell: bash
         run: |
-          export PKG_CONFIG_PATH=$PWD/build/install:$PKG_CONFIG_PATH
+          d=$PWD
+          export SHERPA_ONNX_INSTALL_DIR=$d/build/install
+
           sudo mkdir /shared
           sudo ln -s $PWD/build /shared/
 
           ls -lh /shared/build
 
-          pkg-config --cflags sherpa-onnx
-          pkg-config --libs sherpa-onnx
-
           cd scripts/node-addon-api/
 
           npm i
 
-          ./node_modules/.bin/node-gyp configure build --verbose
+          ./node_modules/.bin/cmake-js compile --log-level verbose
 
       - name: Prepare for publish
         shell: bash
         run: |
-          export PKG_CONFIG_PATH=$PWD/build/install:$PKG_CONFIG_PATH
-
           owner=${{ github.repository_owner }}
           export owner
 
-
           echo "---"
           ls -lh build/install/lib/
           sudo chown -R runner ./build

diff --git a/.github/workflows/npm-addon-macos.yaml b/.github/workflows/npm-addon-macos.yaml
@@ -61,31 +61,24 @@ jobs:
             ..
           make -j install
 
-
-
       - name: Build sherpa-onnx node-addon
         shell: bash
         run: |
-          export PKG_CONFIG_PATH=$PWD/build/install:$PKG_CONFIG_PATH
-
-          pkg-config --cflags sherpa-onnx
-          pkg-config --libs sherpa-onnx
+          d=$PWD
+          export SHERPA_ONNX_INSTALL_DIR=$d/build/install
 
           cd scripts/node-addon-api/
 
           npm i
 
-          ./node_modules/.bin/node-gyp configure build --verbose
+          ./node_modules/.bin/cmake-js compile --log-level verbose
 
       - name: Prepare for publish
         shell: bash
         run: |
-          export PKG_CONFIG_PATH=$PWD/build/install:$PKG_CONFIG_PATH
-
           owner=${{ github.repository_owner }}
           export owner
 
-
           ls -lh build/install/lib/
           echo "---"
 

diff --git a/.github/workflows/npm-addon-win-x64.yaml b/.github/workflows/npm-addon-win-x64.yaml
@@ -0,0 +1,110 @@
+name: npm-addon-win-x64
+
+on:
+  workflow_dispatch:
+
+concurrency:
+  group: npm-addon-win-x64-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  npm-addon-win-x64:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest]
+        python-version: ["3.8"]
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - uses: actions/setup-node@v4
+        with:
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Display node version
+        shell: bash
+        run: |
+          node --version
+
+      - name: Build sherpa-onnx
+        shell: bash
+        run: |
+          mkdir build
+          cd build
+          cmake \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INSTALL_PREFIX=./install \
+            -DBUILD_SHARED_LIBS=ON \
+            -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
+            -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
+            -DSHERPA_ONNX_ENABLE_BINARY=OFF \
+            ..
+
+          ls -lh  _deps/onnxruntime-src/lib/
+
+          cmake --build . --config Release --target install -- -m:6
+
+          ls -lh install/lib
+
+          echo "----------"
+
+          cp -v  _deps/onnxruntime-src/lib/*.lib ./install/lib
+
+          echo "----------"
+
+          ls -lh install/lib
+
+      - name: Build sherpa-onnx node-addon
+        shell: bash
+        run: |
+          d=$PWD
+          export SHERPA_ONNX_INSTALL_DIR=$d/build/install
+
+          cd scripts/node-addon-api/
+
+          npm i
+
+          ./node_modules/.bin/cmake-js compile --log-level verbose
+
+      - name: Prepare for publish
+        shell: bash
+        run: |
+          owner=${{ github.repository_owner }}
+          export owner
+
+          echo "---"
+          ls -lh build/install/lib/
+          echo "---"
+          ls -lh build/install/lib/
+          echo "---"
+
+          .github/scripts/node-addon/run.sh
+
+      - name: Display files to be published
+        shell: bash
+        run: |
+          ls -lh ./sherpa-onnx-node
+
+      - name: Publish
+        shell: bash
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: |
+          cd ./sherpa-onnx-node
+          npm install
+          npm ci
+          # see https://docs.npmjs.com/generating-provenance-statements
+          npm publish --provenance --access public
diff --git a/.github/workflows/test-nodejs-addon-api.yaml b/.github/workflows/test-nodejs-addon-api.yaml
@@ -39,10 +39,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # os: [macos-11, macos-14, ubuntu-20.04, ubuntu-22.04]
-        os: [windows-latest, ubuntu-22.04]
-        # node-version: ["16", "17", "18", "19", "21", "22"]
-        node-version: [ "22"]
+        os: [macos-11, macos-14, ubuntu-20.04, ubuntu-22.04, windows-latest]
+        node-version: ["16", "17", "18", "19", "21", "22"]
         python-version: ["3.8"]
 
     steps:
@@ -157,6 +155,9 @@ jobs:
       - name: Test streaming transducer
         shell: bash
         run: |
+          export PATH=$PWD/build/install/lib:$PATH
+          export LD_LIBRARY_PATH=$PWD/build/install/lib:$LD_LIBRARY_PATH
+
           cd scripts/node-addon-api
           curl -SL -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

diff --git a/.github/workflows/test-nodejs-addon-npm.yaml b/.github/workflows/test-nodejs-addon-npm.yaml
@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, macos-14, ubuntu-20.04, ubuntu-22.04]
+        os: [macos-11, macos-14, ubuntu-20.04, ubuntu-22.04, windows-latest]
         node-version: ["16", "17", "18", "19", "21", "22"]
 
     steps:

diff --git a/python-api-examples/offline-tts.py b/python-api-examples/offline-tts.py
@@ -26,14 +26,14 @@
 
 Example (2/2)
 
-wget https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/vits-zh-aishell3.tar.bz2
-tar xvf vits-zh-aishell3.tar.bz2
+wget https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/vits-icefall-zh-aishell3.tar.bz2
+tar xvf vits-icefall-zh-aishell3.tar.bz2
 
 python3 ./python-api-examples/offline-tts.py \
- --vits-model=./vits-aishell3.onnx \
+ --vits-model=./model.onnx \
  --vits-lexicon=./lexicon.txt \
  --vits-tokens=./tokens.txt \
- --tts-rule-fsts=./rule.fst \
+ --tts-rule-fsts='./phone.fst,./date.fst,./number.fst' \
  --sid=21 \
  --output-filename=./liubei-21.wav \
  "勿以恶小而为之，勿以善小而不为。惟贤惟德，能服于人。122334"

diff --git a/scripts/node-addon-api/lib/addon.js b/scripts/node-addon-api/lib/addon.js
@@ -1,5 +1,9 @@
 const os = require('os');
-const platform_arch = `${os.platform()}-${os.arch()}`;
+
+// Package name triggered spam for sherpa-onnx-win32-x64
+// so we have renamed it to sherpa-onnx-win-x64
+const platform_arch =
+    `${os.platform() == 'win32' ? 'win' : os.platform()}-${os.arch()}`;
 const possible_paths = [
   '../build/Release/sherpa-onnx.node',
   '../build/Debug/sherpa-onnx.node',

diff --git a/scripts/node-addon-api/src/sherpa-onnx-node-addon-api.cc b/scripts/node-addon-api/src/sherpa-onnx-node-addon-api.cc
@@ -3,7 +3,7 @@
 // Copyright (c)  2024  Xiaomi Corporation
 #include "napi.h"  // NOLINT
 
-Napi::Object InitStreamingAsr(Napi::Env env, Napi::Object exports);
+void InitStreamingAsr(Napi::Env env, Napi::Object exports);
 void InitWaveReader(Napi::Env env, Napi::Object exports);
 
 Napi::Object Init(Napi::Env env, Napi::Object exports) {