Added windows arm64 libs

Picovoice · Jan 9, 2025 · 4bfbc57 · 4bfbc57
1 parent 88c8440
commit 4bfbc57
Show file tree

Hide file tree

Showing 35 changed files with 142 additions and 37 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -61,7 +61,7 @@ body:
         - Web (WASM)
         - Linux (x86_64)
         - macOS (x86_64, arm64)
-        - Windows (x86_64)
+        - Windows (x86_64, arm64)
         - Raspberry Pi
     validations:
       required: true

diff --git a/.github/workflows/c-demos.yml b/.github/workflows/c-demos.yml
@@ -84,6 +84,9 @@ jobs:
           - os: windows-latest
             platform: windows
             arch: amd64
+          - os: windows-latest
+            platform: windows
+            arch: arm64
             make_file: "MinGW Makefiles"
           - os: macos-latest
             platform: mac

diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml
@@ -26,6 +26,13 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+        include:
+          - os: windows-latest
+            platform: windows
+            arch: amd64
+          - os: windows-latest
+            platform: windows
+            arch: arm64
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -40,6 +40,12 @@ jobs:
         os: [ubuntu-latest, macos-latest, macos-13, windows-latest]
         dotnet-version: [2.1.x, 3.0.x, 3.1.x, 5.0.x, 6.0.x, 8.0.x]
         include:
+          - os: windows-latest
+            platform: windows
+            arch: amd64
+          - os: windows-latest
+            platform: windows
+            arch: arm64
           - dotnet-version: 2.1.x
             binding-framework: netstandard2.0
             test-framework: netcoreapp2.1

diff --git a/.github/workflows/java-demos.yml b/.github/workflows/java-demos.yml
@@ -27,6 +27,13 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         java-version: ['11', '17', '19']
+        include:
+          - os: windows-latest
+            platform: windows
+            arch: amd64
+          - os: windows-latest
+            platform: windows
+            arch: arm64
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -31,6 +31,13 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         java-version: ['11', '17', '19']
+        include:
+          - os: windows-latest
+            platform: windows
+            arch: amd64
+          - os: windows-latest
+            platform: windows
+            arch: arm64
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/nodejs-demos.yml b/.github/workflows/nodejs-demos.yml
@@ -30,6 +30,13 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         node-version: [16.x, 18.x, 20.x]
+        include:
+          - os: windows-latest
+            platform: windows
+            arch: amd64
+          - os: windows-latest
+            platform: windows
+            arch: arm64
 
     steps:
     - uses: actions/checkout@v3
@@ -39,6 +46,14 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
 
+    # ************ REMOVE AFTER RELEASE ***************
+    - name: build local binding
+      run: |
+        yarn install
+        yarn build
+      working-directory: binding/nodejs
+    # ************ REMOVE AFTER RELEASE ***************
+
     - name: Install dependencies
       run: yarn install
 
@@ -55,6 +70,14 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    # ************ REMOVE AFTER RELEASE ***************
+    - name: build local binding
+      run: |
+        yarn install
+        yarn build
+      working-directory: binding/nodejs
+    # ************ REMOVE AFTER RELEASE ***************
+
     - name: Install dependencies
       run: yarn install
 

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -30,6 +30,13 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         node-version: [16.x, 18.x, 20.x]
+        include:
+          - os: windows-latest
+            platform: windows
+            arch: amd64
+          - os: windows-latest
+            platform: windows
+            arch: arm64
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/python-demos.yml b/.github/workflows/python-demos.yml
@@ -27,6 +27,13 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        include:
+          - os: windows-latest
+            platform: windows
+            arch: amd64
+          - os: windows-latest
+            platform: windows
+            arch: arm64
 
     steps:
     - uses: actions/checkout@v3
@@ -36,6 +43,14 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
+    # ************ REMOVE AFTER RELEASE ***************
+    - name: build local binding
+      run: |
+        python3 -m pip install setuptools wheel
+        python3 -m setup sdist bdist_wheel
+      working-directory: binding/python
+    # ************ REMOVE AFTER RELEASE ***************
+
     - name: Pre-build dependencies
       run: python -m pip install --upgrade pip
 
@@ -55,6 +70,14 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    # ************ REMOVE AFTER RELEASE ***************
+    - name: build local binding
+      run: |
+        python3 -m pip install setuptools wheel
+        python3 -m setup sdist bdist_wheel
+      working-directory: binding/python
+    # ************ REMOVE AFTER RELEASE ***************
+
     - name: Install dependencies
       run: pip3 install -r requirements.txt
 

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -37,6 +37,13 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        include:
+          - os: windows-latest
+            platform: windows
+            arch: amd64
+          - os: windows-latest
+            platform: windows
+            arch: arm64
 
     steps:
     - uses: actions/checkout@v3

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah is:
 - [Accurate](https://picovoice.ai/docs/benchmark/stt/)
 - [Compact and Computationally-Efficient](https://github.com/Picovoice/speech-to-text-benchmark#rtf)
 - Cross-Platform:
-    - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64)
+    - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64, arm64)
     - Android and iOS
     - Chrome, Safari, Firefox, and Edge
     - Raspberry Pi (3, 4, 5)

diff --git a/binding/dotnet/Cheetah/Cheetah.csproj b/binding/dotnet/Cheetah/Cheetah.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net8.0;net6.0;netcoreapp3.0;netstandard2.0;</TargetFrameworks>
-        <Version>2.1.0</Version>
+        <Version>2.1.1</Version>
         <Authors>Picovoice</Authors>
         <Company />
         <Product>Cheetah Speech-to-Text Engine</Product>
@@ -18,7 +18,7 @@
             - Private; All voice processing runs locally.
             - Accurate
             - Compact and Computationally-Efficient
-            - Cross-Platform: Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5)
+            - Cross-Platform: Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64, arm64), Raspberry Pi (3, 4, 5)
         </Description>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
         <PackageIcon>pv_circle_512.png</PackageIcon>

diff --git a/binding/dotnet/Cheetah/Utils.cs b/binding/dotnet/Cheetah/Utils.cs
@@ -41,6 +41,10 @@ public static string PvLibraryPath(string libName)
             {
                 return Path.Combine(AppContext.BaseDirectory, $"lib/{_env}/amd64/{libName}.dll");
             }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && _arch == Architecture.Arm64)
+            {
+                return Path.Combine(AppContext.BaseDirectory, $"lib/{_env}/arm64/{libName}.dll");
+            }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && _arch == Architecture.X64)
             {
                 return Path.Combine(AppContext.BaseDirectory, $"lib/{_env}/x86_64/{libName}.dylib");

diff --git a/binding/dotnet/README.md b/binding/dotnet/README.md
@@ -10,7 +10,7 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah is:
 - [Accurate](https://picovoice.ai/docs/benchmark/stt/#results)
 - [Compact and Computationally-Efficient](https://github.com/Picovoice/speech-to-text-benchmark#rtf)
 - Cross-Platform:
-  - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64)
+  - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64, arm64)
   - Android and iOS
   - Chrome, Safari, Firefox, and Edge
   - Raspberry Pi (3, 4, 5)
@@ -23,13 +23,13 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah is:
 
 Platform compatible with .NET Framework 4.6.1+:
 
-- Windows (x86_64)
+- Windows (x86_64, arm64)
 
 Platforms compatible with .NET Core 2.0+:
 
 - Linux (x86_64)
 - macOS (x86_64)
-- Windows (x86_64)
+- Windows (x86_64, arm64)
 
 Platforms compatible with .NET Core 3.0+:
 

diff --git a/binding/java/README.md b/binding/java/README.md
@@ -10,7 +10,7 @@ Cheetah is an on-device speech-to-text engine. Cheetah is:
 - [Accurate](https://picovoice.ai/docs/benchmark/stt/)
 - [Compact and Computationally-Efficient](https://github.com/Picovoice/speech-to-text-benchmark#rtf)
 - Cross-Platform:
-  - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64)
+  - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64, arm64)
   - Android and iOS
   - Chrome, Safari, Firefox, and Edge
   - Raspberry Pi (3, 4, 5)

diff --git a/binding/java/build.gradle b/binding/java/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 ext {
     PUBLISH_GROUP_ID = 'ai.picovoice'
-    PUBLISH_VERSION = '2.1.0'
+    PUBLISH_VERSION = '2.1.1'
     PUBLISH_ARTIFACT_ID = 'cheetah-java'
 }
 

diff --git a/binding/java/src/ai/picovoice/cheetah/Utils.java b/binding/java/src/ai/picovoice/cheetah/Utils.java
@@ -162,6 +162,8 @@ private static String getArchitecture() throws RuntimeException {
         } else if (ENVIRONMENT_NAME.equals("windows")) {
             if (isX86_64) {
                 return "amd64";
+            } else if (isArm) {
+                return "arm64";
             }
         } else if (ENVIRONMENT_NAME.equals("linux")) {
             if (isX86_64) {
@@ -215,7 +217,9 @@ public static String getPackagedModelPath() {
     public static String getPackagedLibraryPath() {
         switch (ENVIRONMENT_NAME) {
             case "windows":
-                return RESOURCE_DIRECTORY.resolve("lib/java/windows/amd64/libpv_cheetah_jni.dll").toString();
+                return RESOURCE_DIRECTORY.resolve("lib/java/windows")
+                                         .resolve(ARCHITECTURE)
+                                         .resolve("libpv_cheetah_jni.dll").toString();
             case "mac":
                 return RESOURCE_DIRECTORY.resolve("lib/java/mac")
                                          .resolve(ARCHITECTURE)

diff --git a/binding/nodejs/README.md b/binding/nodejs/README.md
@@ -10,15 +10,15 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah is:
 - Accurate [[1]](https://picovoice.ai/docs/benchmark/stt/#results)
 - Compact and Computationally-Efficient [[2]](https://github.com/Picovoice/speech-to-text-benchmark#rtf)
 - Cross-Platform:
-    - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64)
+    - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64, arm64)
     - Android and iOS
     - Chrome, Safari, Firefox, and Edge
     - Raspberry Pi (3, 4, 5)
 
 ## Compatibility
 
 - Node.js 16+
-- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5).
+- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64, arm64), and Raspberry Pi (3, 4, 5).
 
 ## Installation
 

diff --git a/binding/nodejs/package.json b/binding/nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@picovoice/cheetah-node",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Picovoice Cheetah Node.js binding",
   "main": "dist/index.js",
   "types": "dist/types/index.d.ts",

diff --git a/binding/nodejs/src/platforms.ts b/binding/nodejs/src/platforms.ts
@@ -82,6 +82,10 @@ SYSTEM_TO_LIBRARY_PATH.set(
   `${SYSTEM_WINDOWS}/${X86_64}`,
   `${PLATFORM_WINDOWS}/amd64/pv_cheetah.node`
 );
+SYSTEM_TO_LIBRARY_PATH.set(
+  `${SYSTEM_WINDOWS}/${ARM_64}`,
+  `${PLATFORM_WINDOWS}/arm64/pv_picollm.node`
+);
 
 function absoluteLibraryPath(libraryPath: string): string {
   return path.resolve(__dirname, LIBRARY_PATH_PREFIX, libraryPath);
@@ -137,7 +141,7 @@ export function getPlatform(): string {
     return PLATFORM_MAC;
   }
 
-  if (system === SYSTEM_WINDOWS && arch === X86_64) {
+  if (system === SYSTEM_WINDOWS && (arch === X86_64 || arch === ARM_64)) {
     return PLATFORM_WINDOWS;
   }
 
@@ -188,9 +192,9 @@ export function getSystemLibraryPath(): string {
         break;
       }
       case SYSTEM_WINDOWS: {
-        if (arch === X86_64) {
+        if (arch === X86_64 || arch === ARM_64) {
           return absoluteLibraryPath(
-            SYSTEM_TO_LIBRARY_PATH.get(`${SYSTEM_WINDOWS}/${X86_64}`)
+            SYSTEM_TO_LIBRARY_PATH.get(`${SYSTEM_WINDOWS}/${arch}`)
           );
         }
         break;

diff --git a/binding/python/README.md b/binding/python/README.md
@@ -10,15 +10,15 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah is:
 - [Accurate](https://picovoice.ai/docs/benchmark/stt/)
 - [Compact and Computationally-Efficient](https://github.com/Picovoice/speech-to-text-benchmark#rtf)
 - Cross-Platform:
-    - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64)
+    - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64, arm64)
     - Android and iOS
     - Chrome, Safari, Firefox, and Edge
     - Raspberry Pi (3, 4, 5)
 
 ## Compatibility
 
 - Python 3.8+
-- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5).
+- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64, arm64), and Raspberry Pi (3, 4, 5).
 
 ## Installation
 

diff --git a/binding/python/_util.py b/binding/python/_util.py
@@ -70,7 +70,10 @@ def default_library_path(relative):
                 relative,
                 'lib/raspberry-pi/%s/libpv_cheetah.so' % linux_machine)
     elif platform.system() == 'Windows':
-        return os.path.join(os.path.dirname(__file__), relative, 'lib/windows/amd64/libpv_cheetah.dll')
+        if platform.machine().lower() == 'amd64':
+            return os.path.join(os.path.dirname(__file__), relative, 'lib/windows/amd64/libpv_cheetah.dll')
+        elif platform.machine().lower() == 'arm64':
+            return os.path.join(os.path.dirname(__file__), relative, 'lib/windows/arm64/libpv_cheetah.dll')
 
     raise NotImplementedError('Unsupported platform.')
 

diff --git a/binding/python/setup.py b/binding/python/setup.py
@@ -48,7 +48,7 @@
 
 setuptools.setup(
     name="pvcheetah",
-    version="2.1.0",
+    version="2.1.1",
     author="Picovoice",
     author_email="hello@picovoice.ai",
     description="Cheetah Speech-to-Text Engine.",

diff --git a/demo/dotnet/CheetahDemo/CheetahDemo.csproj b/demo/dotnet/CheetahDemo/CheetahDemo.csproj
@@ -19,7 +19,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Picovoice.Cheetah" Version="2.1.0" />
+        <ProjectReference Include="..\..\..\binding\dotnet\Cheetah\Cheetah.csproj" />
         <PackageReference Include="PvRecorder" Version="1.2.6" />
     </ItemGroup>
 </Project>