Fix building wheels for windows (#365)

k2-fsa · Oct 14, 2023 · 0df0a73 · 0df0a73
1 parent 655e0fa
commit 0df0a73
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/build-wheels-aarch64.yaml b/.github/workflows/build-wheels-aarch64.yaml
@@ -6,6 +6,7 @@ on:
       - wheel
     tags:
       - '*'
+  workflow_dispatch:
 
 env:
   SHERPA_ONNX_IS_IN_GITHUB_ACTIONS: 1

diff --git a/.github/workflows/build-wheels-macos.yaml b/.github/workflows/build-wheels-macos.yaml
@@ -6,6 +6,7 @@ on:
       - wheel
     tags:
       - '*'
+  workflow_dispatch:
 
 env:
   SHERPA_ONNX_IS_IN_GITHUB_ACTIONS: 1

diff --git a/.github/workflows/build-wheels-win32.yaml b/.github/workflows/build-wheels-win32.yaml
@@ -6,6 +6,7 @@ on:
       - wheel
     tags:
       - '*'
+  workflow_dispatch:
 
 env:
   SHERPA_ONNX_IS_IN_GITHUB_ACTIONS: 1

diff --git a/.github/workflows/build-wheels.yaml b/.github/workflows/build-wheels.yaml
@@ -6,6 +6,7 @@ on:
       - wheel
     tags:
       - '*'
+  workflow_dispatch:
 
 env:
   SHERPA_ONNX_IS_IN_GITHUB_ACTIONS: 1

diff --git a/cmake/cmake_extension.py b/cmake/cmake_extension.py
@@ -146,11 +146,11 @@ def build_extension(self, ext: setuptools.extension.Extension):
             binaries += ["sherpa-onnx-portaudio.dll"]
             binaries += ["onnxruntime.dll"]
             binaries += ["kaldi-decoder-core.dll"]
-            binaries += ["sherpa-onnx-fst.dll"]
-            binaries += ["sherpa-onnx-kaldifst-core.dll"]
+            binaries += ["sherpa-onnx-fst.lib"]
+            binaries += ["sherpa-onnx-kaldifst-core.lib"]
 
         for f in binaries:
-            suffix = "" if "dll" in f else suffix
+            suffix = "" if (".dll" in f or ".lib" in f) else suffix
             src_file = install_dir / "bin" / (f + suffix)
             if not src_file.is_file():
                 src_file = install_dir / "lib" / (f + suffix)

diff --git a/setup.py b/setup.py
@@ -65,12 +65,12 @@ def get_binaries_to_install():
         binaries += ["sherpa-onnx-portaudio.dll"]
         binaries += ["onnxruntime.dll"]
         binaries += ["kaldi-decoder-core.dll"]
-        binaries += ["sherpa-onnx-fst.dll"]
-        binaries += ["sherpa-onnx-kaldifst-core.dll"]
+        binaries += ["sherpa-onnx-fst.lib"]
+        binaries += ["sherpa-onnx-kaldifst-core.lib"]
 
     exe = []
     for f in binaries:
-        suffix = "" if "dll" in f else suffix
+        suffix = "" if (".dll" in f or ".lib" in f) else suffix
         t = bin_dir / (f + suffix)
         exe.append(str(t))
     return exe
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ on: @@
           - wheel
         tags:
           - '*'
+      workflow_dispatch:
     env:
       SHERPA_ONNX_IS_IN_GITHUB_ACTIONS: 1
@@ Expand Down @@