diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 0e7f1853..3078d203 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -64,8 +64,6 @@ body: - macOS (x86_64, arm64) - Windows (x86_64) - Raspberry Pi - - NVIDIA Jetson - - BeagleBone default: 0 validations: required: true diff --git a/.github/workflows/c-demos.yml b/.github/workflows/c-demos.yml index 5d16bc20..04fcd67a 100644 --- a/.github/workflows/c-demos.yml +++ b/.github/workflows/c-demos.yml @@ -10,7 +10,6 @@ on: - '!demo/c/README.md' - 'include/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -25,7 +24,6 @@ on: - '!demo/c/README.md' - 'include/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -55,7 +53,7 @@ jobs: make_file: "MinGW Makefiles" - os: macos-latest platform: mac - arch: x86_64 + arch: arm64 make_file: "Unix Makefiles" steps: @@ -85,7 +83,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] include: - machine: rpi3-32 platform: raspberry-pi @@ -102,9 +100,6 @@ jobs: - machine: rpi5-64 platform: raspberry-pi arch: cortex-a76-aarch64 - - machine: jetson - platform: jetson - arch: cortex-a57-aarch64 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/dotnet-codestyle.yml b/.github/workflows/dotnet-codestyle.yml index 087e9657..5daad645 100644 --- a/.github/workflows/dotnet-codestyle.yml +++ b/.github/workflows/dotnet-codestyle.yml @@ -20,10 +20,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Setup .NET 6.0 + - name: Setup .NET 8.0 uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Run Binding Codestyle run: dotnet format --verify-no-changes diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml index c9a7e0b8..31289f3b 100644 --- a/.github/workflows/dotnet-demos.yml +++ b/.github/workflows/dotnet-demos.yml @@ -30,10 +30,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Setup .NET 6.0 + - name: Setup .NET 8.0 uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Package restore run: dotnet restore @@ -52,7 +52,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 7a31eed4..3ce504f9 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -9,7 +9,6 @@ on: - '!binding/dotnet/README.md' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -23,7 +22,6 @@ on: - '!binding/dotnet/README.md' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -43,8 +41,8 @@ jobs: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - dotnet-version: [2.1.x, 3.0.x, 3.1.x, 5.0.x, 6.0.x] + 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: - dotnet-version: 2.1.x binding-framework: netstandard2.0 @@ -61,6 +59,22 @@ jobs: - dotnet-version: 6.0.x binding-framework: net6.0 test-framework: net6.0 + - dotnet-version: 8.0.x + binding-framework: net8.0 + test-framework: net8.0 + exclude: + - os: macos-latest + dotnet-version: 2.1.x + - os: macos-latest + dotnet-version: 3.0.x + - os: macos-latest + dotnet-version: 3.1.x + - os: macos-latest + dotnet-version: 5.0.x + - os: macos-latest + dotnet-version: 6.0.x + - os: macos-13 + dotnet-version: 8.0.x steps: - uses: actions/checkout@v3 @@ -83,13 +97,13 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] steps: - uses: actions/checkout@v3 - name: Build binding - run: dotnet build Leopard/Leopard.csproj --framework net6.0 -v n + run: dotnet build Leopard/Leopard.csproj --framework net8.0 -v n - name: Test - run: dotnet test --framework net6.0 -v n + run: dotnet test --framework net8.0 -v n diff --git a/.github/workflows/go-demos.yml b/.github/workflows/go-demos.yml index 47c06bbe..e63a503a 100644 --- a/.github/workflows/go-demos.yml +++ b/.github/workflows/go-demos.yml @@ -56,12 +56,12 @@ jobs: - name: Test filedemo run: ./leopard_file_demo -access_key ${{secrets.PV_VALID_ACCESS_KEY}} -input_audio_path ../../resources/audio_samples/test.wav - build-self-hoster: + build-self-hosted: runs-on: ${{ matrix.machine }} strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index aa04f3c2..7896434d 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -9,7 +9,6 @@ on: - '!binding/go/README.md' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -23,7 +22,6 @@ on: - '!binding/go/README.md' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -75,7 +73,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/java-demos.yml b/.github/workflows/java-demos.yml index 9bb79030..8f22cf01 100644 --- a/.github/workflows/java-demos.yml +++ b/.github/workflows/java-demos.yml @@ -48,7 +48,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/java-perf.yml b/.github/workflows/java-perf.yml index 3e277371..29f935bf 100644 --- a/.github/workflows/java-perf.yml +++ b/.github/workflows/java-perf.yml @@ -61,7 +61,7 @@ jobs: strategy: fail-fast: false matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] include: - machine: rpi3-32 init_performance_threshold_sec: 16.0 @@ -78,9 +78,6 @@ jobs: - machine: rpi5-64 init_performance_threshold_sec: 7.0 proc_performance_threshold_sec: 2.5 - - machine: jetson - init_performance_threshold_sec: 7.0 - proc_performance_threshold_sec: 2.6 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 656f0df7..4bd483ae 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -56,7 +56,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nodejs-demos.yml b/.github/workflows/nodejs-demos.yml index 89fb7802..d46c7c3c 100644 --- a/.github/workflows/nodejs-demos.yml +++ b/.github/workflows/nodejs-demos.yml @@ -54,7 +54,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nodejs-perf.yml b/.github/workflows/nodejs-perf.yml index 2fe1f950..59d8a894 100644 --- a/.github/workflows/nodejs-perf.yml +++ b/.github/workflows/nodejs-perf.yml @@ -62,7 +62,7 @@ jobs: strategy: fail-fast: false matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] include: - machine: rpi3-32 init_performance_threshold_sec: 7.6 @@ -79,9 +79,6 @@ jobs: - machine: rpi5-64 init_performance_threshold_sec: 3.0 proc_performance_threshold_sec: 1.5 - - machine: jetson - init_performance_threshold_sec: 5.1 - proc_performance_threshold_sec: 3.2 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 7ad7931a..022d824d 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -56,7 +56,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/python-demos.yml b/.github/workflows/python-demos.yml index 76be104e..d1fe0bf8 100644 --- a/.github/workflows/python-demos.yml +++ b/.github/workflows/python-demos.yml @@ -50,7 +50,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] steps: - uses: actions/checkout@v3 @@ -62,6 +62,7 @@ jobs: run: python3 leopard_demo_file.py --access_key ${{secrets.PV_VALID_ACCESS_KEY}} --wav_paths ../../resources/audio_samples/test.wav build-subtitle-demo: + if: false # YouTube: "Sign in to confirm you’re not a bot." runs-on: ${{ matrix.os }} defaults: run: @@ -93,6 +94,7 @@ jobs: --subtitle_path test.txt build-youtube-demo: + if: false # YouTube: "Sign in to confirm you’re not a bot." runs-on: ${{ matrix.os }} defaults: run: diff --git a/.github/workflows/python-perf.yml b/.github/workflows/python-perf.yml index 313ddc68..6de0b240 100644 --- a/.github/workflows/python-perf.yml +++ b/.github/workflows/python-perf.yml @@ -9,7 +9,6 @@ on: - 'binding/python/test_leopard_perf.py' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -20,7 +19,6 @@ on: - 'binding/python/test_leopard_perf.py' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -71,7 +69,7 @@ jobs: strategy: fail-fast: false matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] include: - machine: rpi3-32 init_performance_threshold_sec: 8.5 @@ -88,9 +86,6 @@ jobs: - machine: rpi5-64 init_performance_threshold_sec: 2.0 proc_performance_threshold_sec: 1.0 - - machine: jetson - init_performance_threshold_sec: 6.0 - proc_performance_threshold_sec: 2.8 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 43342858..27b76acf 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -10,7 +10,6 @@ on: - '!binding/python/README.md' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -22,7 +21,6 @@ on: - '!binding/python/README.md' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -62,7 +60,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] steps: - uses: actions/checkout@v3 @@ -71,4 +69,4 @@ jobs: run: pip install -r requirements.txt - name: Test - run: python3 test_leopard.py ${{secrets.PV_VALID_ACCESS_KEY}} \ No newline at end of file + run: python3 test_leopard.py ${{secrets.PV_VALID_ACCESS_KEY}} diff --git a/.github/workflows/rust-demos.yml b/.github/workflows/rust-demos.yml index 7d0a9a5c..a760eb50 100644 --- a/.github/workflows/rust-demos.yml +++ b/.github/workflows/rust-demos.yml @@ -18,6 +18,7 @@ on: defaults: run: working-directory: demo/rust + shell: bash jobs: build-github-hosted: @@ -58,7 +59,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 860c1d6c..b61e1081 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -9,7 +9,6 @@ on: - 'binding/rust/**' - '!binding/rust/README.md' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -23,7 +22,6 @@ on: - 'binding/rust/**' - '!binding/rust/README.md' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -76,7 +74,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64] steps: - uses: actions/checkout@v3 diff --git a/README.md b/README.md index 225d7ff1..b83b2fbd 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Table of Contents diff --git a/binding/android/README.md b/binding/android/README.md index b252f2c3..24d341ba 100644 --- a/binding/android/README.md +++ b/binding/android/README.md @@ -13,7 +13,7 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility diff --git a/binding/dotnet/Leopard/Leopard.csproj b/binding/dotnet/Leopard/Leopard.csproj index 284c2dc3..f47f2a83 100644 --- a/binding/dotnet/Leopard/Leopard.csproj +++ b/binding/dotnet/Leopard/Leopard.csproj @@ -1,8 +1,8 @@  - net6.0;netcoreapp3.0;netstandard2.0 - 2.0.2 + net8.0;net6.0;netcoreapp3.0;netstandard2.0 + 2.0.3 Picovoice Leopard Speech-to-Text Engine @@ -19,7 +19,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), NVIDIA Jetson Nano + - Cross-Platform: Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5) true pv_circle_512.png @@ -37,6 +37,7 @@ build/netcoreapp3.0/Leopard.targets; build/net6.0/Leopard.targets; + build/net8.0/Leopard.targets; PreserveNewest @@ -49,6 +50,7 @@ build/netstandard2.0/libpv_leopard.dll; build/netcoreapp3.0/lib/windows/amd64/libpv_leopard.dll; build/net6.0/lib/windows/amd64/libpv_leopard.dll; + build/net8.0/lib/windows/amd64/libpv_leopard.dll; PreserveNewest lib\windows\amd64\libpv_leopard.dll @@ -59,6 +61,7 @@ build/netstandard2.0/libpv_leopard.so; build/netcoreapp3.0/lib/linux/x86_64/libpv_leopard.so; build/net6.0/lib/linux/x86_64/libpv_leopard.so; + build/net8.0/lib/linux/x86_64/libpv_leopard.so; PreserveNewest lib\linux\x86_64\libpv_leopard.so @@ -69,6 +72,7 @@ build/netstandard2.0/libpv_leopard.dylib; build/netcoreapp3.0/lib/mac/x86_64/libpv_leopard.dylib; build/net6.0/lib/mac/x86_64/libpv_leopard.dylib; + build/net8.0/lib/mac/x86_64/libpv_leopard.dylib; PreserveNewest lib\mac\x86_64\libpv_leopard.dylib @@ -82,20 +86,12 @@ build/netcoreapp3.0/lib/raspberry-pi; build/net6.0/lib/raspberry-pi; + build/net8.0/lib/raspberry-pi; PreserveNewest lib\raspberry-pi\%(RecursiveDir)%(Filename)%(Extension) false - - - build/netcoreapp3.0/lib/jetson/cortex-a57-aarch64/libpv_leopard.so; - build/net6.0/lib/jetson/cortex-a57-aarch64/libpv_leopard.so; - - PreserveNewest - lib\jetson\cortex-a57-aarch64\libpv_leopard.so - false - @@ -103,6 +99,7 @@ build/net6.0/lib/mac/arm64/libpv_leopard.dylib; + build/net8.0/lib/mac/arm64/libpv_leopard.dylib; PreserveNewest lib\mac\arm64\libpv_leopard.dylib @@ -117,6 +114,7 @@ build/netstandard2.0/lib/common/leopard_params.pv; build/netcoreapp3.0/lib/common/leopard_params.pv; build/net6.0/lib/common/leopard_params.pv; + build/net8.0/lib/common/leopard_params.pv; lib\common\leopard_params.pv PreserveNewest diff --git a/binding/dotnet/Leopard/Utils.cs b/binding/dotnet/Leopard/Utils.cs index 0dedf425..28fdbdff 100644 --- a/binding/dotnet/Leopard/Utils.cs +++ b/binding/dotnet/Leopard/Utils.cs @@ -71,9 +71,7 @@ public static string PvLinuxMachine() string cpuPart = GetCpuPart(); switch (cpuPart) { - case "0xc07": return "cortex-a7" + archInfo; case "0xd03": return "cortex-a53" + archInfo; - case "0xd07": return "cortex-a57" + archInfo; case "0xd08": return "cortex-a72" + archInfo; case "0xd0b": return "cortex-a76" + archInfo; default: @@ -86,11 +84,9 @@ public static string PvLinuxEnv() string cpuPart = GetCpuPart(); switch (cpuPart) { - case "0xc07": case "0xd03": case "0xd08": case "0xd0b": return "raspberry-pi"; - case "0xd07": return "jetson"; default: throw new PlatformNotSupportedException($"This device (CPU part = {cpuPart}) is not supported by Picovoice."); } diff --git a/binding/dotnet/LeopardTest/LeopardTest.csproj b/binding/dotnet/LeopardTest/LeopardTest.csproj index 18c8a7ed..2c9680fd 100644 --- a/binding/dotnet/LeopardTest/LeopardTest.csproj +++ b/binding/dotnet/LeopardTest/LeopardTest.csproj @@ -1,7 +1,7 @@  - net6.0;net5.0;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1; + net8.0;net6.0;net5.0;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1; false diff --git a/binding/dotnet/README.md b/binding/dotnet/README.md index 0e7c844f..6c2a29be 100644 --- a/binding/dotnet/README.md +++ b/binding/dotnet/README.md @@ -13,11 +13,11 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Requirements -- .NET 6.0 +- .NET 8.0 ## Compatibility @@ -37,7 +37,6 @@ Platforms compatible with .NET Core 3.1+: - 3 (32 and 64 bit) - 4 (32 and 64 bit) - 5 (32 and 64 bit) -- NVIDIA Jetson Nano Platform compatible with .NET 6.0+: diff --git a/binding/flutter/README.md b/binding/flutter/README.md index b3fa2d96..6d5016e3 100644 --- a/binding/flutter/README.md +++ b/binding/flutter/README.md @@ -13,7 +13,7 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility diff --git a/binding/go/README.md b/binding/go/README.md index 2d507482..7f732002 100644 --- a/binding/go/README.md +++ b/binding/go/README.md @@ -13,12 +13,12 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility - go 1.16+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5), and NVIDIA Jetson Nano. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5). - **Windows**: The Go binding requires `cgo`, which means that you need to install a gcc compiler like [Mingw](http://mingw-w64.org/) to build it properly. - Go versions less than `1.20` requires `gcc` version `11` or lower. diff --git a/binding/go/copy.sh b/binding/go/copy.sh index d2b2136a..aec8810f 100755 --- a/binding/go/copy.sh +++ b/binding/go/copy.sh @@ -16,7 +16,4 @@ cp ../../lib/windows/amd64/libpv_leopard.dll ./embedded/lib/windows/amd64/libpv_ echo "Copying RPi libs..." cp -rp ../../lib/raspberry-pi/* ./embedded/lib/raspberry-pi -echo "Copying Jetson lib..." -cp ../../lib/jetson/cortex-a57-aarch64/libpv_leopard.so ./embedded/lib/jetson/cortex-a57-aarch64/libpv_leopard.so - echo "Copy complete!" diff --git a/binding/go/embedded/lib/jetson/cortex-a57-aarch64/libpv_leopard.so b/binding/go/embedded/lib/jetson/cortex-a57-aarch64/libpv_leopard.so deleted file mode 100755 index 52bb40f4..00000000 Binary files a/binding/go/embedded/lib/jetson/cortex-a57-aarch64/libpv_leopard.so and /dev/null differ diff --git a/binding/go/go.mod b/binding/go/go.mod index 50b76338..78e6be63 100644 --- a/binding/go/go.mod +++ b/binding/go/go.mod @@ -1,3 +1,5 @@ module github.com/Picovoice/leopard/binding/go/v2 go 1.16 + +require github.com/agnivade/levenshtein v1.1.1 diff --git a/binding/go/go.sum b/binding/go/go.sum index e69de29b..544fa859 100644 --- a/binding/go/go.sum +++ b/binding/go/go.sum @@ -0,0 +1,6 @@ +github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8= +github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo= +github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q= +github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE= +github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g= +github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA= diff --git a/binding/go/leopard.go b/binding/go/leopard.go index 0bbd4b95..d28d2103 100644 --- a/binding/go/leopard.go +++ b/binding/go/leopard.go @@ -1,4 +1,4 @@ -// Copyright 2022-2023 Picovoice Inc. +// Copyright 2022-2024 Picovoice Inc. // // You may not use this file except in compliance with the license. A copy of the license is // located in the "LICENSE" file accompanying this source. @@ -390,8 +390,6 @@ func getLinuxDetails() (string, string) { switch cpuPart { case "0xd03": return "raspberry-pi", "cortex-a53" + archInfo - case "0xd07": - return "jetson", "cortex-a57" + archInfo case "0xd08": return "raspberry-pi", "cortex-a72" + archInfo case "0xd0b": diff --git a/binding/ios/Leopard-iOS.podspec b/binding/ios/Leopard-iOS.podspec index 9288291f..c9ddb674 100644 --- a/binding/ios/Leopard-iOS.podspec +++ b/binding/ios/Leopard-iOS.podspec @@ -19,7 +19,6 @@ Pod::Spec.new do |s| - Android - iOS - Raspberry Pi (3, 4, 5) - - NVIDIA Jetson Nano DESC s.homepage = 'https://github.com/Picovoice/leopard/tree/master/binding/ios' s.author = { 'Picovoice' => 'hello@picovoice.ai' } diff --git a/binding/ios/README.md b/binding/ios/README.md index c3e3936b..bd582905 100644 --- a/binding/ios/README.md +++ b/binding/ios/README.md @@ -13,7 +13,7 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Installation diff --git a/binding/java/README.md b/binding/java/README.md index 8a1819ae..ab42057c 100644 --- a/binding/java/README.md +++ b/binding/java/README.md @@ -13,12 +13,12 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility - Java 11+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5), and NVIDIA Jetson Nano. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5). ## Installation diff --git a/binding/java/build.gradle b/binding/java/build.gradle index 9fec672c..66f0c29a 100644 --- a/binding/java/build.gradle +++ b/binding/java/build.gradle @@ -7,7 +7,7 @@ plugins { ext { PUBLISH_GROUP_ID = 'ai.picovoice' - PUBLISH_VERSION = '2.0.2' + PUBLISH_VERSION = '2.0.3' PUBLISH_ARTIFACT_ID = 'leopard-java' } @@ -62,20 +62,13 @@ task copyRPiLib(type: Copy) { 'cortex-a76-aarch64/libpv_leopard_jni.so') into("${outputDir}/leopard/lib/java/raspberry-pi/") } -task copyJetsonLib(type: Copy) { - from('../../lib/java/jetson/cortex-a57-aarch64/libpv_leopard_jni.so') into "${outputDir}/leopard/lib/java/jetson/cortex-a57-aarch64/" -} -task copyBeagleboneLib(type: Copy) { - from('../../lib/java/beaglebone/libpv_leopard_jni.so') into "${outputDir}/leopard/lib/java/beaglebone/" -} task copyTasks(type: GradleBuild) { tasks = ['copyDefaultModel', 'copyLinuxLib', 'copyMacLib', 'copyWindowsLib', - 'copyRPiLib', - 'copyJetsonLib'] + 'copyRPiLib'] } jar { diff --git a/binding/java/src/ai/picovoice/leopard/Utils.java b/binding/java/src/ai/picovoice/leopard/Utils.java index 7366690f..e12456b5 100644 --- a/binding/java/src/ai/picovoice/leopard/Utils.java +++ b/binding/java/src/ai/picovoice/leopard/Utils.java @@ -1,5 +1,5 @@ /* - Copyright 2022-2023 Picovoice Inc. + Copyright 2022-2024 Picovoice Inc. You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE" file accompanying this source. @@ -137,8 +137,6 @@ public static String getEnvironmentName() throws RuntimeException { case "0xd08": case "0xd0b": return "raspberry-pi"; - case "0xd07": - return "jetson"; default: throw new RuntimeException(String.format("Execution environment not supported. " + "Leopard Java does not support CPU Part (%s).", cpuPart)); @@ -170,15 +168,13 @@ private static String getArchitecture() throws RuntimeException { if (isX86_64) { return "x86_64"; } - } else if (isArm) { // RPI, Jetson, etc.. + } else if (isArm) { // RPI String cpuPart = getCpuPart(); String archInfo = (arch.equals("aarch64")) ? "-aarch64" : ""; switch (cpuPart) { case "0xd03": return "cortex-a53" + archInfo; - case "0xd07": - return "cortex-a57" + archInfo; case "0xd08": return "cortex-a72" + archInfo; case "0xd0b": @@ -225,7 +221,6 @@ public static String getPackagedLibraryPath() { return RESOURCE_DIRECTORY.resolve("lib/java/mac") .resolve(ARCHITECTURE) .resolve("libpv_leopard_jni.dylib").toString(); - case "jetson": case "raspberry-pi": case "linux": return RESOURCE_DIRECTORY.resolve("lib/java") diff --git a/binding/nodejs/README.md b/binding/nodejs/README.md index 630bfe0b..bc1bea72 100644 --- a/binding/nodejs/README.md +++ b/binding/nodejs/README.md @@ -13,12 +13,12 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility - Node.js 16+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5), and NVIDIA Jetson Nano. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5). ## Installation diff --git a/binding/nodejs/package.json b/binding/nodejs/package.json index c10db6e9..ffae6744 100644 --- a/binding/nodejs/package.json +++ b/binding/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@picovoice/leopard-node", - "version": "2.0.3", + "version": "2.0.4", "description": "Picovoice Leopard 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 index 51bc0e82..e974560c 100644 --- a/binding/nodejs/src/platforms.ts +++ b/binding/nodejs/src/platforms.ts @@ -24,7 +24,6 @@ const X86_64 = 'x64'; const ARM_32 = 'arm'; const ARM_64 = 'arm64'; -const PLATFORM_JETSON = 'jetson'; const PLATFORM_LINUX = 'linux'; const PLATFORM_MAC = 'mac'; const PLATFORM_RASPBERRY_PI = 'raspberry-pi'; @@ -32,7 +31,6 @@ const PLATFORM_WINDOWS = 'windows'; const ARM_CPU_64 = '-aarch64'; const ARM_CPU_CORTEX_A53 = 'cortex-a53'; -const ARM_CPU_CORTEX_A57 = 'cortex-a57'; const ARM_CPU_CORTEX_A72 = 'cortex-a72'; const ARM_CPU_CORTEX_A76 = 'cortex-a76'; @@ -80,10 +78,6 @@ SYSTEM_TO_LIBRARY_PATH.set( `${SYSTEM_LINUX}/${ARM_CPU_CORTEX_A76}${ARM_CPU_64}`, `${PLATFORM_RASPBERRY_PI}/${ARM_CPU_CORTEX_A76}${ARM_CPU_64}/pv_leopard.node` ); -SYSTEM_TO_LIBRARY_PATH.set( - `${SYSTEM_LINUX}/${ARM_CPU_CORTEX_A57}${ARM_CPU_64}`, - `${PLATFORM_JETSON}/${ARM_CPU_CORTEX_A57}${ARM_CPU_64}/pv_leopard.node` -); SYSTEM_TO_LIBRARY_PATH.set( `${SYSTEM_WINDOWS}/${X86_64}`, `${PLATFORM_WINDOWS}/amd64/pv_leopard.node` @@ -111,8 +105,6 @@ function getLinuxPlatform(): string { case '0xd08': case '0xd0b': return PLATFORM_RASPBERRY_PI; - case '0xd07': - return PLATFORM_JETSON; default: throw new LeopardRuntimeError(`Unsupported CPU: '${cpuPart}'`); } @@ -128,8 +120,6 @@ function getLinuxMachine(arch: string): string { switch (cpuPart) { case '0xd03': return ARM_CPU_CORTEX_A53 + archInfo; - case '0xd07': - return ARM_CPU_CORTEX_A57 + archInfo; case '0xd08': return ARM_CPU_CORTEX_A72 + archInfo; case '0xd0b': diff --git a/binding/python/README.md b/binding/python/README.md index 09502618..05577266 100644 --- a/binding/python/README.md +++ b/binding/python/README.md @@ -13,12 +13,12 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility - Python 3.8+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5), and NVIDIA Jetson Nano. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5). ## Installation diff --git a/binding/python/_util.py b/binding/python/_util.py index af5223de..2cc14fed 100644 --- a/binding/python/_util.py +++ b/binding/python/_util.py @@ -1,5 +1,5 @@ # -# Copyright 2022-2023 Picovoice Inc. +# Copyright 2022-2024 Picovoice Inc. # # You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE" # file accompanying this source. @@ -37,8 +37,6 @@ def _linux_machine(): if '0xd03' == cpu_part: return 'cortex-a53' + arch_info - elif '0xd07' == cpu_part: - return 'cortex-a57' + arch_info elif '0xd08' == cpu_part: return 'cortex-a72' + arch_info elif "0xd0b" == cpu_part: @@ -54,7 +52,6 @@ def _linux_machine(): "cortex-a53-aarch64", "cortex-a72-aarch64", "cortex-a76-aarch64"} -_JETSON_MACHINES = {'cortex-a57-aarch64'} def default_library_path(relative): @@ -67,8 +64,6 @@ def default_library_path(relative): linux_machine = _linux_machine() if linux_machine == 'x86_64': return os.path.join(os.path.dirname(__file__), relative, 'lib/linux/x86_64/libpv_leopard.so') - elif linux_machine in _JETSON_MACHINES: - return os.path.join(os.path.dirname(__file__), relative, 'lib/jetson/%s/libpv_leopard.so' % linux_machine) elif linux_machine in _RASPBERRY_PI_MACHINES: return os.path.join( os.path.dirname(__file__), diff --git a/binding/python/setup.py b/binding/python/setup.py index b1f69359..a15e7bce 100644 --- a/binding/python/setup.py +++ b/binding/python/setup.py @@ -1,5 +1,5 @@ # -# Copyright 2022-2023 Picovoice Inc. +# Copyright 2022-2024 Picovoice Inc. # # You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE" # file accompanying this source. @@ -15,7 +15,7 @@ import setuptools INCLUDE_FILES = ('../../LICENSE', '__init__.py', '_factory.py', '_leopard.py', '_util.py') -INCLUDE_LIBS = ('linux', 'mac', 'windows', 'jetson', 'raspberry-pi') +INCLUDE_LIBS = ('linux', 'mac', 'windows', 'raspberry-pi') os.system('git clean -dfx') @@ -48,7 +48,7 @@ setuptools.setup( name="pvleopard", - version="2.0.2", + version="2.0.3", author="Picovoice", author_email="hello@picovoice.ai", description="Leopard Speech-to-Text Engine.", diff --git a/binding/react-native/README.md b/binding/react-native/README.md index be2dca2f..b7aef959 100644 --- a/binding/react-native/README.md +++ b/binding/react-native/README.md @@ -13,7 +13,7 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility diff --git a/binding/react/README.md b/binding/react/README.md index 65e4a1e6..39c27789 100644 --- a/binding/react/README.md +++ b/binding/react/README.md @@ -13,7 +13,7 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility diff --git a/binding/rust/Cargo.toml b/binding/rust/Cargo.toml index 16b69ef1..04b053d6 100644 --- a/binding/rust/Cargo.toml +++ b/binding/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pv_leopard" -version = "2.0.2" +version = "2.0.3" edition = "2018" description = "The Rust bindings for Picovoice's Leopard library" license = "Apache-2.0" diff --git a/binding/rust/README.md b/binding/rust/README.md index 19f55209..e77be18d 100644 --- a/binding/rust/README.md +++ b/binding/rust/README.md @@ -12,12 +12,12 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility - Rust 1.54+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5), and NVIDIA Jetson Nano. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5). ## Installation diff --git a/binding/rust/copy.sh b/binding/rust/copy.sh index 875981c3..397a53e2 100755 --- a/binding/rust/copy.sh +++ b/binding/rust/copy.sh @@ -9,7 +9,7 @@ mkdir -p ./data/lib/common/ echo "Copying Model File ..." cp -r ../../lib/common/leopard_params.pv ./data/lib/common/ -for platform in linux mac raspberry-pi jetson windows +for platform in linux mac raspberry-pi windows do echo "Copying Resource & Library Files for $platform ..." cp -r ../../lib/$platform ./data/lib/ diff --git a/binding/rust/src/util.rs b/binding/rust/src/util.rs index b4aaa788..520720bb 100644 --- a/binding/rust/src/util.rs +++ b/binding/rust/src/util.rs @@ -1,5 +1,5 @@ /* - Copyright 2021 Picovoice Inc. + Copyright 2021-2024 Picovoice Inc. You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE" file accompanying this source. @@ -42,7 +42,6 @@ fn find_machine_type() -> String { let machine = match cpu_part.as_str() { "0xd03" => "cortex-a53", - "0xd07" => "cortex-a57", "0xd08" => "cortex-a72", "0xd0b" => "cortex-a76", _ => "unsupported", @@ -74,7 +73,6 @@ fn base_library_path() -> PathBuf { #[cfg(all(target_os = "linux", any(target_arch = "arm", target_arch = "aarch64")))] fn base_library_path() -> PathBuf { const RPI_MACHINES: [&str; 3] = ["cortex-a53", "cortex-a72", "cortex-a76"]; - const JETSON_MACHINES: [&str; 1] = ["cortex-a57"]; let machine = find_machine_type(); match machine.as_str() { @@ -88,9 +86,6 @@ fn base_library_path() -> PathBuf { PathBuf::from(format!("raspberry-pi/{}/libpv_leopard.so", &machine)) } } - machine if JETSON_MACHINES.contains(&machine) => { - PathBuf::from("jetson/cortex-a57-aarch64/libpv_leopard.so") - } _ => { panic!("This device is not officially supported by Picovoice.\n"); } diff --git a/binding/web/README.md b/binding/web/README.md index ff0a1c08..c4704183 100644 --- a/binding/web/README.md +++ b/binding/web/README.md @@ -13,7 +13,7 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility diff --git a/demo/c/README.md b/demo/c/README.md index 2a71613f..ab30414e 100644 --- a/demo/c/README.md +++ b/demo/c/README.md @@ -153,13 +153,3 @@ ${AUDIO_FILE_PATH} -l lib/raspberry-pi/cortex-a53-aarch64/libpv_leopard.so \ ${AUDIO_FILE_PATH} ``` - -#### NVIDIA Jetson Nano - -```console -./demo/c/build/leopard_demo \ --a ${ACCESS_KEY} \ --m lib/common/leopard_params.pv \ --l lib/jetson/cortex-a57-aarch64/libpv_leopard.so \ -${AUDIO_FILE_PATH} -``` diff --git a/demo/dotnet/LeopardDemo/LeopardDemo.csproj b/demo/dotnet/LeopardDemo/LeopardDemo.csproj index 48124eaa..63645ee7 100644 --- a/demo/dotnet/LeopardDemo/LeopardDemo.csproj +++ b/demo/dotnet/LeopardDemo/LeopardDemo.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 FileDemo.Debug;FileDemo.Release;MicDemo.Debug;MicDemo.Release @@ -19,7 +19,7 @@ - - + + - \ No newline at end of file + diff --git a/demo/dotnet/README.md b/demo/dotnet/README.md index 02a1d43c..35553d33 100644 --- a/demo/dotnet/README.md +++ b/demo/dotnet/README.md @@ -16,11 +16,10 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Android - iOS - Raspberry Pi (3, 4, 5) - - NVIDIA Jetson Nano ## Requirements -- .NET 6.0 +- .NET 8.0 ## Compatibility @@ -31,7 +30,6 @@ Leopard is an on-device speech-to-text engine. Leopard is: - 3 (32 and 64 bit) - 4 (32 and 64 bit) - 5 (32 and 64 bit) -- NVIDIA Jetson Nano ## Installation diff --git a/demo/go-grpc/README.md b/demo/go-grpc/README.md index 01ce1ae1..b3677805 100644 --- a/demo/go-grpc/README.md +++ b/demo/go-grpc/README.md @@ -5,7 +5,7 @@ A demo application that demonstrates how to implement a lightweight transcriptio ## Compatibility - go 1.16+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5), and NVIDIA Jetson Nano. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5). ## AccessKey diff --git a/demo/go-grpc/go.mod b/demo/go-grpc/go.mod index 0aec7b85..61aee094 100644 --- a/demo/go-grpc/go.mod +++ b/demo/go-grpc/go.mod @@ -3,7 +3,7 @@ module leopardgogrpc go 1.18 require ( - github.com/Picovoice/leopard/binding/go/v2 v2.0.2 + github.com/Picovoice/leopard/binding/go/v2 v2.0.3 github.com/golang/protobuf v1.5.2 github.com/google/uuid v1.3.0 google.golang.org/grpc v1.53.0 diff --git a/demo/go-grpc/go.sum b/demo/go-grpc/go.sum index b7bd762f..7ba95444 100644 --- a/demo/go-grpc/go.sum +++ b/demo/go-grpc/go.sum @@ -1,5 +1,7 @@ github.com/Picovoice/leopard/binding/go/v2 v2.0.2 h1:Knk/UV51oRuHTHd7MGtlZXwsFF5jxu6AqttB0jGMHxs= github.com/Picovoice/leopard/binding/go/v2 v2.0.2/go.mod h1:/rYUeRDH4xBgtwBe9D8BwHIauPJ+M7czqLfyeJQJu7c= +github.com/Picovoice/leopard/binding/go/v2 v2.0.3 h1:6JzeL7J+Gx8dXP5do2nFFhIVMCItzLlp0PHKPP1Ll+s= +github.com/Picovoice/leopard/binding/go/v2 v2.0.3/go.mod h1:/rYUeRDH4xBgtwBe9D8BwHIauPJ+M7czqLfyeJQJu7c= github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8= github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo= github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE= diff --git a/demo/go/README.md b/demo/go/README.md index 23ae4f9c..6be74266 100644 --- a/demo/go/README.md +++ b/demo/go/README.md @@ -13,12 +13,12 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility - go 1.16+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5), and NVIDIA Jetson Nano. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5). ## AccessKey diff --git a/demo/go/go.mod b/demo/go/go.mod index 36727968..2f4908b1 100644 --- a/demo/go/go.mod +++ b/demo/go/go.mod @@ -3,7 +3,7 @@ module leoparddemo go 1.16 require ( - github.com/Picovoice/leopard/binding/go/v2 v2.0.2 - github.com/Picovoice/pvrecorder/binding/go v1.2.2 + github.com/Picovoice/leopard/binding/go/v2 v2.0.3 + github.com/Picovoice/pvrecorder/binding/go v1.2.3 github.com/agnivade/levenshtein v1.1.1 // indirect ) diff --git a/demo/go/go.sum b/demo/go/go.sum index 5f2fae67..34cce63f 100644 --- a/demo/go/go.sum +++ b/demo/go/go.sum @@ -1,11 +1,7 @@ -github.com/Picovoice/leopard/binding/go/v2 v2.0.1 h1:XUjSAKS+MSCI5BT54Mkq6sxEIsIwe32Ou7LHWBxfksQ= -github.com/Picovoice/leopard/binding/go/v2 v2.0.1/go.mod h1:/rYUeRDH4xBgtwBe9D8BwHIauPJ+M7czqLfyeJQJu7c= -github.com/Picovoice/leopard/binding/go/v2 v2.0.2 h1:Knk/UV51oRuHTHd7MGtlZXwsFF5jxu6AqttB0jGMHxs= -github.com/Picovoice/leopard/binding/go/v2 v2.0.2/go.mod h1:/rYUeRDH4xBgtwBe9D8BwHIauPJ+M7czqLfyeJQJu7c= -github.com/Picovoice/pvrecorder/binding/go v1.2.1 h1:p99fkYMFbTS4g4WwbhSPkT9PHvlEoVYGaNoqxCITiEo= -github.com/Picovoice/pvrecorder/binding/go v1.2.1/go.mod h1:gQdvBAjoKmRxMFh8W9cVKWcqHsWvu+d13sCPVFm7dhg= -github.com/Picovoice/pvrecorder/binding/go v1.2.2 h1:UN0u60hVR+s8kYmVSITS4UbTihHzeNxlNkJKYoKaVbo= -github.com/Picovoice/pvrecorder/binding/go v1.2.2/go.mod h1:gQdvBAjoKmRxMFh8W9cVKWcqHsWvu+d13sCPVFm7dhg= +github.com/Picovoice/leopard/binding/go/v2 v2.0.3 h1:6JzeL7J+Gx8dXP5do2nFFhIVMCItzLlp0PHKPP1Ll+s= +github.com/Picovoice/leopard/binding/go/v2 v2.0.3/go.mod h1:/rYUeRDH4xBgtwBe9D8BwHIauPJ+M7czqLfyeJQJu7c= +github.com/Picovoice/pvrecorder/binding/go v1.2.3 h1:VU9cf4g3h7pazecoEsPINi21AHWgxIsn7jFWdRDpWZE= +github.com/Picovoice/pvrecorder/binding/go v1.2.3/go.mod h1:gQdvBAjoKmRxMFh8W9cVKWcqHsWvu+d13sCPVFm7dhg= github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8= github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo= github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE= diff --git a/demo/java/README.md b/demo/java/README.md index 630af181..906c9a67 100644 --- a/demo/java/README.md +++ b/demo/java/README.md @@ -13,12 +13,12 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility - Java 11+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5), and NVIDIA Jetson Nano. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5). ## Installation diff --git a/demo/java/build.gradle b/demo/java/build.gradle index f34ff3b9..29006fec 100644 --- a/demo/java/build.gradle +++ b/demo/java/build.gradle @@ -15,14 +15,14 @@ sourceSets { } dependencies { - implementation 'ai.picovoice:leopard-java:2.0.2' + implementation 'ai.picovoice:leopard-java:2.0.3' implementation 'commons-cli:commons-cli:1.4' } jar { manifest { attributes "Main-Class": "ai.picovoice.leoparddemo.MicDemo", - "Class-Path": "leopard-2.0.2.jar;commons-cli-1.4.jar" + "Class-Path": "leopard-2.0.3.jar;commons-cli-1.4.jar" } from sourceSets.main.output exclude "**/FileDemo.class" @@ -33,7 +33,7 @@ jar { task fileDemoJar(type: Jar) { manifest { attributes "Main-Class": "ai.picovoice.leoparddemo.FileDemo", - "Class-Path": "leopard-2.0.2.jar;commons-cli-1.4.jar" + "Class-Path": "leopard-2.0.3.jar;commons-cli-1.4.jar" } from sourceSets.main.output exclude "**/MicDemo.class" diff --git a/demo/nodejs/README.md b/demo/nodejs/README.md index 4d530c64..c41ee4c4 100644 --- a/demo/nodejs/README.md +++ b/demo/nodejs/README.md @@ -13,12 +13,12 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility - Node.js 12+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5), and NVIDIA Jetson Nano. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5). ## Installation diff --git a/demo/nodejs/package.json b/demo/nodejs/package.json index e59c3b0b..d03ba1f0 100644 --- a/demo/nodejs/package.json +++ b/demo/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@picovoice/leopard-node-demo", - "version": "2.0.3", + "version": "2.0.4", "description": "Picovoice Leopard Node.js file-based and microphone demos", "scripts": { "file": "node file.js", @@ -16,8 +16,8 @@ "author": "Picovoice Inc.", "license": "Apache-2.0", "dependencies": { - "@picovoice/leopard-node": "=2.0.3", - "@picovoice/pvrecorder-node": "=1.2.2", + "@picovoice/leopard-node": "=2.0.4", + "@picovoice/pvrecorder-node": "=1.2.4", "commander": "^6.1.0", "readline": "^1.3.0", "wavefile": "^11.0.0", diff --git a/demo/nodejs/yarn.lock b/demo/nodejs/yarn.lock index 49550565..7c3f83aa 100644 --- a/demo/nodejs/yarn.lock +++ b/demo/nodejs/yarn.lock @@ -2,15 +2,15 @@ # yarn lockfile v1 -"@picovoice/leopard-node@=2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@picovoice/leopard-node/-/leopard-node-2.0.2.tgz#537f6a8dbeefc2234e9c4c588c2dafa623ada9cf" - integrity sha512-7MFeDdKKLR+H1gyUQXX8djfKgOIQLTsRlGkxwNoXjbXyfx6lkOfYdU27+Wlyi+6dOKFW3c4DNTbCbzIzCZSyMw== +"@picovoice/leopard-node@=2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@picovoice/leopard-node/-/leopard-node-2.0.4.tgz#dd2adf964d23092c076879be1f1d1aa0c5a9d851" + integrity sha512-xBg/8MfbZLHg/XQ/ycTiVy4wabN7+TR00ZuqpmRlKqzw+a0YwcXv6CyuTIzz6k27rdzWNyDTuE59XbxsShJtHQ== -"@picovoice/pvrecorder-node@=1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@picovoice/pvrecorder-node/-/pvrecorder-node-1.2.2.tgz#41c39719b408e29c581b3094a9ff4c59f282b026" - integrity sha512-GuzZhWslbR4TLE3VxTiqjax8Mc8f1nB69bY5jag4ETlCxo7q/KpeUbWRvojhtNVPvpFLbospZAb6vfgxkEqgJQ== +"@picovoice/pvrecorder-node@=1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@picovoice/pvrecorder-node/-/pvrecorder-node-1.2.4.tgz#1e67a1f82a144ad3c8e3f77c18fdbfe1ab5880cf" + integrity sha512-s8l6LtJnTHZ+FfIgXJZ9d8pKONSWs04v5q83F2zmfRr9IV1m7SQ5RlsmL0FO7NsB0GjIar3qHndryAQCjgSInw== commander@^6.1.0: version "6.2.1" diff --git a/demo/python-subtitle/README.md b/demo/python-subtitle/README.md index caa000ad..d9d9d484 100644 --- a/demo/python-subtitle/README.md +++ b/demo/python-subtitle/README.md @@ -2,7 +2,7 @@ ## Compatibility - Python 3.8+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5), and NVIDIA Jetson Nano. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5). ## AccessKey diff --git a/demo/python-subtitle/requirements.txt b/demo/python-subtitle/requirements.txt index 71dfef7c..57269b7d 100644 --- a/demo/python-subtitle/requirements.txt +++ b/demo/python-subtitle/requirements.txt @@ -1,2 +1,2 @@ -pvleopard==2.0.1 -yt-dlp \ No newline at end of file +pvleopard==2.0.3 +yt-dlp diff --git a/demo/python-youtube/README.md b/demo/python-youtube/README.md index 696158e6..649a3532 100644 --- a/demo/python-youtube/README.md +++ b/demo/python-youtube/README.md @@ -2,7 +2,7 @@ ## Compatibility - Python 3.8+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5), and NVIDIA Jetson Nano. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5). ## AccessKey diff --git a/demo/python-youtube/requirements.txt b/demo/python-youtube/requirements.txt index 71dfef7c..57269b7d 100644 --- a/demo/python-youtube/requirements.txt +++ b/demo/python-youtube/requirements.txt @@ -1,2 +1,2 @@ -pvleopard==2.0.1 -yt-dlp \ No newline at end of file +pvleopard==2.0.3 +yt-dlp diff --git a/demo/python/README.md b/demo/python/README.md index 4fe3bc88..68285434 100644 --- a/demo/python/README.md +++ b/demo/python/README.md @@ -13,12 +13,12 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility - Python 3.8+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5), and NVIDIA Jetson Nano. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5). ## Installation @@ -39,7 +39,7 @@ Signup or Login to [Picovoice Console](https://console.picovoice.ai/) to get you Run the following in the terminal: ```console -leopard_demo_file --access_key ${ACCESS_KEY} --audio_paths ${AUDIO_FILE_PATH} +leopard_demo_file --access_key ${ACCESS_KEY} --wav_paths ${AUDIO_FILE_PATH} ``` Replace `${ACCESS_KEY}` with yours obtained from Picovoice Console and `${AUDIO_FILE_PATH}` with a path to an audio file you diff --git a/demo/python/requirements.txt b/demo/python/requirements.txt index a801fe5a..fe1cac3c 100644 --- a/demo/python/requirements.txt +++ b/demo/python/requirements.txt @@ -1,3 +1,3 @@ -pvleopard==2.0.2 -pvrecorder==1.2.2 +pvleopard==2.0.3 +pvrecorder==1.2.3 tabulate==0.8.10 diff --git a/demo/python/setup.py b/demo/python/setup.py index 28ec804e..6e4fbc40 100644 --- a/demo/python/setup.py +++ b/demo/python/setup.py @@ -28,7 +28,7 @@ setuptools.setup( name="pvleoparddemo", - version="2.0.2", + version="2.0.3", author="Picovoice", author_email="hello@picovoice.ai", description="Leopard speech-to-text engine demos", @@ -36,7 +36,7 @@ long_description_content_type="text/markdown", url="https://github.com/Picovoice/leopard", packages=["pvleoparddemo"], - install_requires=["pvleopard==2.0.2", "pvrecorder==1.2.2", "tabulate==0.8.10"], + install_requires=["pvleopard==2.0.3", "pvrecorder==1.2.3", "tabulate==0.8.10"], include_package_data=True, classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/demo/rust/README.md b/demo/rust/README.md index a3b52c91..ab5ab749 100644 --- a/demo/rust/README.md +++ b/demo/rust/README.md @@ -12,12 +12,12 @@ Leopard is an on-device speech-to-text engine. Leopard is: - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) ## Compatibility - Rust 1.54+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5), and NVIDIA Jetson Nano. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (3, 4, 5). ## Installation diff --git a/demo/rust/filedemo/Cargo.lock b/demo/rust/filedemo/Cargo.lock index 75b6f470..d50f2380 100644 --- a/demo/rust/filedemo/Cargo.lock +++ b/demo/rust/filedemo/Cargo.lock @@ -197,9 +197,9 @@ dependencies = [ [[package]] name = "pv_leopard" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488d685e12f5a72a880503d56f31e21f8df215904f58e774a4620378984fb012" +checksum = "2cd095cea28bbbeb15a98d971a61c310a462f771273847b4afe432cf8d6e648b" dependencies = [ "libc", "libloading", @@ -207,7 +207,7 @@ dependencies = [ [[package]] name = "pv_leopard_filedemo" -version = "2.0.2" +version = "2.0.3" dependencies = [ "chrono", "clap", diff --git a/demo/rust/filedemo/Cargo.toml b/demo/rust/filedemo/Cargo.toml index e68e821f..047b49ef 100644 --- a/demo/rust/filedemo/Cargo.toml +++ b/demo/rust/filedemo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pv_leopard_filedemo" -version = "2.0.2" +version = "2.0.3" edition = "2018" [dependencies] @@ -8,5 +8,5 @@ chrono = "0.4.20" clap = "3.2.16" hound = "3.4.0" itertools = "0.10.3" -pv_leopard = "=2.0.2" +pv_leopard = "=2.0.3" tabwriter = "1.2.1" diff --git a/demo/rust/micdemo/Cargo.lock b/demo/rust/micdemo/Cargo.lock index dc176d9c..ba1a7131 100644 --- a/demo/rust/micdemo/Cargo.lock +++ b/demo/rust/micdemo/Cargo.lock @@ -257,9 +257,9 @@ dependencies = [ [[package]] name = "pv_leopard" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488d685e12f5a72a880503d56f31e21f8df215904f58e774a4620378984fb012" +checksum = "2cd095cea28bbbeb15a98d971a61c310a462f771273847b4afe432cf8d6e648b" dependencies = [ "libc", "libloading", @@ -267,7 +267,7 @@ dependencies = [ [[package]] name = "pv_leopard_micdemo" -version = "2.0.2" +version = "2.0.3" dependencies = [ "chrono", "clap", @@ -281,9 +281,9 @@ dependencies = [ [[package]] name = "pv_recorder" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cb1418c740637db95cb7aea6052d655f5affc8e89a86ab999d1318e3b79a4e" +checksum = "3004c0adbf3826de2ba3aff0a2e594b2f5a761a45a4bbc1c50b16277ef47b165" dependencies = [ "libc", "libloading", diff --git a/demo/rust/micdemo/Cargo.toml b/demo/rust/micdemo/Cargo.toml index efcacc05..0703ac1d 100644 --- a/demo/rust/micdemo/Cargo.toml +++ b/demo/rust/micdemo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pv_leopard_micdemo" -version = "2.0.2" +version = "2.0.3" edition = "2018" [dependencies] @@ -9,6 +9,6 @@ clap = "3.2.16" ctrlc = "3.2.2" hound = "3.4.0" itertools = "0.10.3" -pv_leopard = "=2.0.2" -pv_recorder = "=1.2.2" +pv_leopard = "=2.0.3" +pv_recorder = "=1.2.3" tabwriter = "1.2.1" diff --git a/lib/java/jetson/cortex-a57-aarch64/libpv_leopard_jni.so b/lib/java/jetson/cortex-a57-aarch64/libpv_leopard_jni.so deleted file mode 100755 index 41135a5b..00000000 Binary files a/lib/java/jetson/cortex-a57-aarch64/libpv_leopard_jni.so and /dev/null differ diff --git a/lib/jetson/cortex-a57-aarch64/libpv_leopard.so b/lib/jetson/cortex-a57-aarch64/libpv_leopard.so deleted file mode 100755 index 52bb40f4..00000000 Binary files a/lib/jetson/cortex-a57-aarch64/libpv_leopard.so and /dev/null differ diff --git a/lib/node/jetson/cortex-a57-aarch64/pv_leopard.node b/lib/node/jetson/cortex-a57-aarch64/pv_leopard.node deleted file mode 100755 index 9bb588f2..00000000 Binary files a/lib/node/jetson/cortex-a57-aarch64/pv_leopard.node and /dev/null differ