diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 175e7761..bd226a82 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -63,8 +63,6 @@ body: - macOS (x86_64, arm64) - Windows (x86_64) - Raspberry Pi - - NVIDIA Jetson - - BeagleBone validations: required: true - type: input diff --git a/.github/workflows/c-demos.yml b/.github/workflows/c-demos.yml index 753e4aa3..a065fb16 100644 --- a/.github/workflows/c-demos.yml +++ b/.github/workflows/c-demos.yml @@ -10,7 +10,6 @@ on: - 'demo/c/**' - 'include/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -24,7 +23,6 @@ on: - 'demo/c/**' - 'include/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -59,7 +57,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 @@ -89,7 +87,7 @@ jobs: make_file: "MinGW Makefiles" - os: macos-latest platform: mac - arch: x86_64 + arch: arm64 make_file: "Unix Makefiles" steps: @@ -119,7 +117,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 @@ -136,9 +134,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 @@ -155,4 +150,4 @@ jobs: run: pip install -r test/requirements.txt - name: Test - run: python3 test/test_cheetah_c.py ${{secrets.PV_VALID_ACCESS_KEY}} ${{ matrix.platform }} ${{ matrix.arch }} \ No newline at end of file + run: python3 test/test_cheetah_c.py ${{secrets.PV_VALID_ACCESS_KEY}} ${{ matrix.platform }} ${{ matrix.arch }} diff --git a/.github/workflows/dotnet-codestyle.yml b/.github/workflows/dotnet-codestyle.yml index 44667ba9..eca240af 100644 --- a/.github/workflows/dotnet-codestyle.yml +++ b/.github/workflows/dotnet-codestyle.yml @@ -22,10 +22,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 @@ -34,4 +34,3 @@ jobs: - name: Run Demo Codestyle run: dotnet format --verify-no-changes working-directory: demo/dotnet - \ No newline at end of file diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml index 63475fa0..d5d7078b 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-64] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 74833221..6fc5d6e3 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/**' @@ -21,7 +20,6 @@ on: - '!binding/dotnet/README.md' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -39,8 +37,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 @@ -57,6 +55,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 @@ -79,13 +93,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 Cheetah/Cheetah.csproj --framework net6.0 -v n + run: dotnet build Cheetah/Cheetah.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 55fb9a61..73341ced 100644 --- a/.github/workflows/go-demos.yml +++ b/.github/workflows/go-demos.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/go.yml b/.github/workflows/go.yml index f40ea3ad..631ba5ba 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/**' @@ -21,7 +20,6 @@ on: - '!binding/go/README.md' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -57,9 +55,6 @@ jobs: - name: Pre-build dependencies run: ./copy.sh - - name: Install dependencies - run: go get - - name: Build run: go build @@ -71,7 +66,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 @@ -79,9 +74,6 @@ jobs: - name: Pre-build dependencies run: ./copy.sh - - name: Install dependencies - run: go get - - name: Build run: go build diff --git a/.github/workflows/java-demos.yml b/.github/workflows/java-demos.yml index 5e4ab1ce..bf94a0dd 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 37bfd0dd..05d03477 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: 14.0 @@ -78,9 +78,6 @@ jobs: - machine: rpi5-64 init_performance_threshold_sec: 7.8 proc_performance_threshold_sec: 5.0 - - machine: jetson - init_performance_threshold_sec: 7.8 - proc_performance_threshold_sec: 5.5 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 29b81b22..19168fa2 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -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-64] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nodejs-demos.yml b/.github/workflows/nodejs-demos.yml index 67373e28..919efae4 100644 --- a/.github/workflows/nodejs-demos.yml +++ b/.github/workflows/nodejs-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 diff --git a/.github/workflows/nodejs-perf.yml b/.github/workflows/nodejs-perf.yml index a4316c93..dff36f85 100644 --- a/.github/workflows/nodejs-perf.yml +++ b/.github/workflows/nodejs-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: 9.0 @@ -78,9 +78,6 @@ jobs: - machine: rpi5-64 init_performance_threshold_sec: 3.0 proc_performance_threshold_sec: 2.0 - - machine: jetson - init_performance_threshold_sec: 5.5 - proc_performance_threshold_sec: 4.3 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index bbd5baed..1a866bcd 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.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 diff --git a/.github/workflows/python-demos.yml b/.github/workflows/python-demos.yml index 1c066107..a3eb9394 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 @@ -59,4 +59,4 @@ jobs: run: pip3 install -r requirements.txt - name: Test - run: python3 cheetah_demo_file.py --access_key ${{secrets.PV_VALID_ACCESS_KEY}} --wav_paths ../../resources/audio_samples/test.wav \ No newline at end of file + run: python3 cheetah_demo_file.py --access_key ${{secrets.PV_VALID_ACCESS_KEY}} --wav_paths ../../resources/audio_samples/test.wav diff --git a/.github/workflows/python-perf.yml b/.github/workflows/python-perf.yml index 54331947..33530fec 100644 --- a/.github/workflows/python-perf.yml +++ b/.github/workflows/python-perf.yml @@ -9,7 +9,6 @@ on: - 'binding/python/test_cheetah_perf.py' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -20,7 +19,6 @@ on: - 'binding/python/test_cheetah_perf.py' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -43,7 +41,7 @@ jobs: proc_performance_threshold_sec: 0.8 - os: windows-latest init_performance_threshold_sec: 4.0 - proc_performance_threshold_sec: 0.7 + proc_performance_threshold_sec: 0.7 - os: macos-latest init_performance_threshold_sec: 4.5 proc_performance_threshold_sec: 2.5 @@ -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: 9.0 @@ -88,9 +86,6 @@ jobs: - machine: rpi5-64 init_performance_threshold_sec: 2.5 proc_performance_threshold_sec: 2.0 - - machine: jetson - init_performance_threshold_sec: 7.5 - proc_performance_threshold_sec: 4.0 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 455c22c6..02c6dea4 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_cheetah.py ${{secrets.PV_VALID_ACCESS_KEY}} \ No newline at end of file + run: python3 test_cheetah.py ${{secrets.PV_VALID_ACCESS_KEY}} diff --git a/.github/workflows/rust-demos.yml b/.github/workflows/rust-demos.yml index 5e8b448e..12c5bb6b 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 0cf5154f..7cee798b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -9,7 +9,6 @@ on: - '!binding/rust/README.md' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -21,7 +20,6 @@ on: - '!binding/rust/README.md' - 'lib/common/**' - 'lib/linux/**' - - 'lib/jetson/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' @@ -71,7 +69,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 7bc7f77f..291f3c72 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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) ## Table of Contents diff --git a/binding/android/README.md b/binding/android/README.md index ca2019e4..12d17039 100644 --- a/binding/android/README.md +++ b/binding/android/README.md @@ -13,7 +13,7 @@ Cheetah is an on-device speech-to-text engine. Cheetah 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/Cheetah/Cheetah.csproj b/binding/dotnet/Cheetah/Cheetah.csproj index 466f9c4d..027c5ae3 100644 --- a/binding/dotnet/Cheetah/Cheetah.csproj +++ b/binding/dotnet/Cheetah/Cheetah.csproj @@ -1,7 +1,7 @@  - net6.0;netcoreapp3.0;netstandard2.0 - 2.0.1 + net8.0;net6.0;netcoreapp3.0;netstandard2.0 + 2.0.2 Picovoice Cheetah Speech-to-Text Engine @@ -11,14 +11,14 @@ git Speech-to-Text, Speech Recognition, Voice Recognition, ASR See https://github.com/Picovoice/cheetah/ - Picovoice 2022-2023 + Picovoice 2022-2024 Cheetah is an on-device speech-to-text engine. Cheetah is: - 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 (4, 3), NVIDIA Jetson Nano + - Cross-Platform: Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (3, 4, 5) true pv_circle_512.png @@ -35,6 +35,7 @@ build/netcoreapp3.0; build/net6.0; + build/net8.0; PreserveNewest @@ -43,6 +44,7 @@ build/netstandard2.0/lib/common/cheetah_params.pv; build/netcoreapp3.0/lib/common/cheetah_params.pv; build/net6.0/lib/common/cheetah_params.pv; + build/net8.0/lib/common/cheetah_params.pv; lib\common\cheetah_params.pv PreserveNewest @@ -52,6 +54,7 @@ build/netstandard2.0/libpv_cheetah.dll; build/netcoreapp3.0/lib/windows/amd64/libpv_cheetah.dll; build/net6.0/lib/windows/amd64/libpv_cheetah.dll; + build/net8.0/lib/windows/amd64/libpv_cheetah.dll; PreserveNewest lib\windows\amd64\libpv_cheetah.dll @@ -62,6 +65,7 @@ build/netstandard2.0/libpv_cheetah.so; build/netcoreapp3.0/lib/linux/x86_64/libpv_cheetah.so; build/net6.0/lib/linux/x86_64/libpv_cheetah.so; + build/net8.0/lib/linux/x86_64/libpv_cheetah.so; PreserveNewest lib\linux\x86_64\libpv_cheetah.so @@ -72,6 +76,7 @@ build/netstandard2.0/libpv_cheetah.dylib; build/netcoreapp3.0/lib/mac/x86_64/libpv_cheetah.dylib; build/net6.0/lib/mac/x86_64/libpv_cheetah.dylib; + build/net8.0/lib/mac/x86_64/libpv_cheetah.dylib; PreserveNewest lib\mac\x86_64\libpv_cheetah.dylib @@ -83,25 +88,18 @@ 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_cheetah.so; - build/net6.0/lib/jetson/cortex-a57-aarch64/libpv_cheetah.so; - - PreserveNewest - lib\jetson\cortex-a57-aarch64\libpv_cheetah.so - false - build/net6.0/lib/mac/arm64/libpv_cheetah.dylib; + build/net8.0/lib/mac/arm64/libpv_cheetah.dylib; PreserveNewest lib\mac\arm64\libpv_cheetah.dylib @@ -117,4 +115,4 @@ - \ No newline at end of file + diff --git a/binding/dotnet/Cheetah/Utils.cs b/binding/dotnet/Cheetah/Utils.cs index 77f1e5ef..9ba717bb 100644 --- a/binding/dotnet/Cheetah/Utils.cs +++ b/binding/dotnet/Cheetah/Utils.cs @@ -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. @@ -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/CheetahTest/CheetahTest.csproj b/binding/dotnet/CheetahTest/CheetahTest.csproj index 10b485e1..0fcef2a9 100644 --- a/binding/dotnet/CheetahTest/CheetahTest.csproj +++ b/binding/dotnet/CheetahTest/CheetahTest.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 4bf57b76..a586fdb5 100644 --- a/binding/dotnet/README.md +++ b/binding/dotnet/README.md @@ -13,11 +13,11 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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.0+: - 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 d921371c..0f2d2e93 100644 --- a/binding/flutter/README.md +++ b/binding/flutter/README.md @@ -13,7 +13,7 @@ Cheetah is an on-device speech-to-text engine. Cheetah 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 22cc0164..bf6e63fa 100644 --- a/binding/go/README.md +++ b/binding/go/README.md @@ -13,12 +13,12 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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/cheetah.go b/binding/go/cheetah.go index cd989dc7..4cc0b1c9 100644 --- a/binding/go/cheetah.go +++ b/binding/go/cheetah.go @@ -1,4 +1,4 @@ -// Copyright 2022 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. @@ -345,8 +345,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/go/copy.sh b/binding/go/copy.sh index a932b71f..cc2176d5 100755 --- a/binding/go/copy.sh +++ b/binding/go/copy.sh @@ -16,7 +16,4 @@ cp ../../lib/windows/amd64/libpv_cheetah.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_cheetah.so ./embedded/lib/jetson/cortex-a57-aarch64/libpv_cheetah.so - echo "Copy complete!" diff --git a/binding/go/embedded/lib/jetson/cortex-a57-aarch64/libpv_cheetah.so b/binding/go/embedded/lib/jetson/cortex-a57-aarch64/libpv_cheetah.so deleted file mode 100755 index d2fad30d..00000000 Binary files a/binding/go/embedded/lib/jetson/cortex-a57-aarch64/libpv_cheetah.so and /dev/null differ diff --git a/binding/go/go.mod b/binding/go/go.mod index e45ae646..78edfb1e 100644 --- a/binding/go/go.mod +++ b/binding/go/go.mod @@ -1,3 +1,5 @@ module github.com/Picovoice/cheetah/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/ios/Cheetah-iOS.podspec b/binding/ios/Cheetah-iOS.podspec index b5616768..1357e1e2 100644 --- a/binding/ios/Cheetah-iOS.podspec +++ b/binding/ios/Cheetah-iOS.podspec @@ -18,8 +18,7 @@ Pod::Spec.new do |s| - Windows (x86_64) - Android - iOS - - Raspberry Pi (4, 3) - - NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) DESC s.homepage = 'https://github.com/Picovoice/cheetah/tree/master/binding/ios' s.author = { 'Picovoice' => 'hello@picovoice.ai' } diff --git a/binding/ios/README.md b/binding/ios/README.md index a83d77ba..61a03d8a 100644 --- a/binding/ios/README.md +++ b/binding/ios/README.md @@ -13,7 +13,7 @@ Cheetah is a streaming on-device speech-to-text engine. Cheetah 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 7d7c7060..cc821c07 100644 --- a/binding/java/README.md +++ b/binding/java/README.md @@ -13,7 +13,7 @@ Cheetah is an on-device speech-to-text engine. Cheetah 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/java/build.gradle b/binding/java/build.gradle index 148d8cc3..8476faae 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.1' + PUBLISH_VERSION = '2.0.2' PUBLISH_ARTIFACT_ID = 'cheetah-java' } @@ -62,17 +62,13 @@ task copyRPILib(type: Copy) { 'cortex-a76-aarch64/libpv_cheetah_jni.so') into("${outputDir}/cheetah/lib/java/raspberry-pi/") } -task copyJetsonLib(type: Copy) { - from('../../lib/java/jetson/cortex-a57-aarch64/libpv_cheetah_jni.so') into "${outputDir}/cheetah/lib/java/jetson/cortex-a57-aarch64/" -} task copyTasks(type: GradleBuild) { tasks = ['copyDefaultModel', 'copyLinuxLib', 'copyMacLib', 'copyWindowsLib', - 'copyRPiLib', - 'copyJetsonLib'] + 'copyRPiLib'] } jar { diff --git a/binding/java/src/ai/picovoice/cheetah/Utils.java b/binding/java/src/ai/picovoice/cheetah/Utils.java index 7f190dae..9fb50aee 100644 --- a/binding/java/src/ai/picovoice/cheetah/Utils.java +++ b/binding/java/src/ai/picovoice/cheetah/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. @@ -136,8 +136,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. " + "Cheetah Java does not support CPU Part (%s).", cpuPart)); @@ -169,15 +167,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": @@ -224,7 +220,6 @@ public static String getPackagedLibraryPath() { return RESOURCE_DIRECTORY.resolve("lib/java/mac") .resolve(ARCHITECTURE) .resolve("libpv_cheetah_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 a5920bf3..11332c60 100644 --- a/binding/nodejs/README.md +++ b/binding/nodejs/README.md @@ -13,12 +13,12 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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 3df2981c..32c4949c 100644 --- a/binding/nodejs/package.json +++ b/binding/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@picovoice/cheetah-node", - "version": "2.0.2", + "version": "2.0.3", "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 index 172b4f39..d5ea1ca3 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_cheetah.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_cheetah.node` -); SYSTEM_TO_LIBRARY_PATH.set( `${SYSTEM_WINDOWS}/${X86_64}`, `${PLATFORM_WINDOWS}/amd64/pv_cheetah.node` @@ -111,8 +105,6 @@ function getLinuxPlatform(): string { case '0xd08': case '0xd0b': return PLATFORM_RASPBERRY_PI; - case '0xd07': - return PLATFORM_JETSON; default: throw new CheetahRuntimeError(`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 c7e3085c..aa1e43bd 100644 --- a/binding/python/README.md +++ b/binding/python/README.md @@ -13,12 +13,12 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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 - 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 c4431f93..af9db8a3 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_cheetah.so') - elif linux_machine in _JETSON_MACHINES: - return os.path.join(os.path.dirname(__file__), relative, 'lib/jetson/%s/libpv_cheetah.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 de7070b3..5d27e11c 100644 --- a/binding/python/setup.py +++ b/binding/python/setup.py @@ -15,7 +15,7 @@ import setuptools INCLUDE_FILES = ('../../LICENSE', '__init__.py', '_factory.py', '_cheetah.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="pvcheetah", - version="2.0.1", + version="2.0.2", author="Picovoice", author_email="hello@picovoice.ai", description="Cheetah Speech-to-Text Engine.", diff --git a/binding/react-native/README.md b/binding/react-native/README.md index d50d92c5..aecf1323 100644 --- a/binding/react-native/README.md +++ b/binding/react-native/README.md @@ -13,7 +13,7 @@ Cheetah is an on-device speech-to-text engine. Cheetah 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-native/test-app/CheetahTestApp/ios/Podfile b/binding/react-native/test-app/CheetahTestApp/ios/Podfile index 7d4629d5..0a168aa2 100644 --- a/binding/react-native/test-app/CheetahTestApp/ios/Podfile +++ b/binding/react-native/test-app/CheetahTestApp/ios/Podfile @@ -48,5 +48,27 @@ target 'CheetahTestApp' do :mac_catalyst_enabled => false ) __apply_Xcode_12_5_M1_post_install_workaround(installer) + + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION'] + + if target.to_s === 'React-Codegen' + config.build_settings['SWIFT_VERSION'] = '5.0' + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' + end + end + + if target.name == 'Flipper' + file_path = 'Pods/Flipper/xplat/Flipper/FlipperTransportTypes.h' + contents = File.read(file_path) + unless contents.include?('#include ') + File.open(file_path, 'w') do |file| + file.puts('#include ') + file.puts(contents) + end + end + end + end end end diff --git a/binding/react/README.md b/binding/react/README.md index 6b2b46c5..7541140e 100644 --- a/binding/react/README.md +++ b/binding/react/README.md @@ -13,7 +13,7 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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 diff --git a/binding/rust/Cargo.toml b/binding/rust/Cargo.toml index e7e8856e..935cf002 100644 --- a/binding/rust/Cargo.toml +++ b/binding/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pv_cheetah" -version = "2.0.2" +version = "2.0.3" edition = "2018" description = "The Rust bindings for Picovoice's Cheetah library" license = "Apache-2.0" diff --git a/binding/rust/README.md b/binding/rust/README.md index 413097fe..87b8d2f8 100644 --- a/binding/rust/README.md +++ b/binding/rust/README.md @@ -12,12 +12,12 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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 - 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 bbbead59..ecb68c8d 100755 --- a/binding/rust/copy.sh +++ b/binding/rust/copy.sh @@ -10,7 +10,7 @@ mkdir -p ./data/lib/ echo "Copying Model File ..." cp -r ../../lib/common ./data/lib/ -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 0cc6b15d..dcf1a258 100644 --- a/binding/rust/src/util.rs +++ b/binding/rust/src/util.rs @@ -74,7 +74,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 +87,6 @@ fn base_library_path() -> PathBuf { PathBuf::from(format!("raspberry-pi/{}/libpv_cheetah.so", &machine)) } } - machine if JETSON_MACHINES.contains(&machine) => { - PathBuf::from("jetson/cortex-a57-aarch64/libpv_cheetah.so") - } _ => { panic!("This device is not officially supported by Picovoice.\n"); } diff --git a/binding/web/README.md b/binding/web/README.md index f81ad8eb..15041382 100644 --- a/binding/web/README.md +++ b/binding/web/README.md @@ -13,7 +13,7 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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 diff --git a/demo/c/CMakeLists.txt b/demo/c/CMakeLists.txt index 545be7d5..42c6404d 100644 --- a/demo/c/CMakeLists.txt +++ b/demo/c/CMakeLists.txt @@ -24,7 +24,7 @@ target_include_directories(cheetah_demo_file PRIVATE dr_libs) if (NOT WIN32) target_link_libraries(cheetah_demo_mic ${COMMON_LIBS} ${MIC_LIBS}) target_link_libraries(cheetah_demo_file ${COMMON_LIBS}) - if((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") AND (UNIX AND NOT APPLE)) + if((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") AND (UNIX AND NOT APPLE)) target_link_libraries(cheetah_demo_mic atomic) endif() endif() diff --git a/demo/c/README.md b/demo/c/README.md index 0be15dc8..53c945de 100644 --- a/demo/c/README.md +++ b/demo/c/README.md @@ -152,16 +152,6 @@ demo\\c\\build\\cheetah_demo.exe ^ -i ${MIC_INDEX} ``` -##### NVIDIA Jetson Nano - -```console -./demo/c/build/cheetah_demo \ --a ${ACCESS_KEY} \ --m lib/common/cheetah_params.pv \ --l lib/jetson/cortex-a57-aarch64/libpv_cheetah.so \ --i ${MIC_INDEX} -``` - #### File Demo ```console @@ -255,13 +245,3 @@ ${WAV_PATH} -l lib/raspberry-pi/cortex-a53-aarch64/libpv_cheetah.so \ ${WAV_PATH} ``` - -##### NVIDIA Jetson Nano - -```console -./demo/c/build/cheetah_demo \ --a ${ACCESS_KEY} \ --m lib/common/cheetah_params.pv \ --l lib/jetson/cortex-a57-aarch64/libpv_cheetah.so \ -${WAV_PATH} -``` diff --git a/demo/dotnet/CheetahDemo/CheetahDemo.csproj b/demo/dotnet/CheetahDemo/CheetahDemo.csproj index d555751f..75cc81dc 100644 --- a/demo/dotnet/CheetahDemo/CheetahDemo.csproj +++ b/demo/dotnet/CheetahDemo/CheetahDemo.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 FileDemo.Debug;FileDemo.Release;MicDemo.Debug;MicDemo.Release @@ -19,7 +19,7 @@ - - + + diff --git a/demo/dotnet/README.md b/demo/dotnet/README.md index a0beeab1..8e07a38b 100644 --- a/demo/dotnet/README.md +++ b/demo/dotnet/README.md @@ -13,11 +13,11 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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 @@ -28,7 +28,6 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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/README.md b/demo/go/README.md index 2e8f8625..6815d715 100644 --- a/demo/go/README.md +++ b/demo/go/README.md @@ -16,12 +16,11 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah is: - Android - iOS - Raspberry Pi (3, 4, 5) - - NVIDIA Jetson Nano ## 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 036bdbd7..e0b16adc 100644 --- a/demo/go/go.mod +++ b/demo/go/go.mod @@ -3,9 +3,8 @@ module cheetahdemo go 1.16 require ( - github.com/Picovoice/cheetah/binding/go/v2 v2.0.1 - github.com/Picovoice/pvrecorder/binding/go v1.2.2 - github.com/agnivade/levenshtein v1.1.1 // indirect + github.com/Picovoice/cheetah/binding/go/v2 v2.0.2 + github.com/Picovoice/pvrecorder/binding/go v1.2.3 github.com/go-audio/audio v1.0.0 github.com/go-audio/wav v1.0.0 ) diff --git a/demo/go/go.sum b/demo/go/go.sum index 2a708c70..42fedce4 100644 --- a/demo/go/go.sum +++ b/demo/go/go.sum @@ -1,7 +1,7 @@ -github.com/Picovoice/cheetah/binding/go/v2 v2.0.1 h1:HNykHdTfuwFj8mSfkoVpboeECTI4Uwy9sEe6kSj+G04= -github.com/Picovoice/cheetah/binding/go/v2 v2.0.1/go.mod h1:BKQPVuV+8xxEBLuCdwTxgj4bVsUTiuQg4YJ7oJt9uh4= -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/cheetah/binding/go/v2 v2.0.2 h1:ClgXf3jVR87MiWD8NMX/n+cgymvH8rnqWu8iLkIEAmU= +github.com/Picovoice/cheetah/binding/go/v2 v2.0.2/go.mod h1:rctztGHGzGPelptxism4IBquo7plpZKgSmQ5SNYFhv8= +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 e62d0348..f197c17b 100644 --- a/demo/java/README.md +++ b/demo/java/README.md @@ -13,12 +13,12 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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 - 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 4cfebe92..6b91c8f0 100644 --- a/demo/java/build.gradle +++ b/demo/java/build.gradle @@ -15,14 +15,14 @@ sourceSets { } dependencies { - implementation 'ai.picovoice:cheetah-java:2.0.1' + implementation 'ai.picovoice:cheetah-java:2.0.2' implementation 'commons-cli:commons-cli:1.4' } jar { manifest { attributes "Main-Class": "ai.picovoice.cheetahdemo.MicDemo", - "Class-Path": "cheetah-2.0.1.jar;commons-cli-1.4.jar" + "Class-Path": "cheetah-2.0.2.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.cheetahdemo.FileDemo", - "Class-Path": "cheetah-2.0.1.jar;commons-cli-1.4.jar" + "Class-Path": "cheetah-2.0.2.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 3eb81a59..af422c0f 100644 --- a/demo/nodejs/README.md +++ b/demo/nodejs/README.md @@ -13,12 +13,12 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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. +- Node.js 16+ +- 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 c7cfc2dc..abdba311 100644 --- a/demo/nodejs/package.json +++ b/demo/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@picovoice/cheetah-node-demo", - "version": "2.0.2", + "version": "2.0.3", "description": "Picovoice Cheetah 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/cheetah-node": "=2.0.2", - "@picovoice/pvrecorder-node": "^1.2.2", + "@picovoice/cheetah-node": "=2.0.3", + "@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 3557afb0..03b1ed68 100644 --- a/demo/nodejs/yarn.lock +++ b/demo/nodejs/yarn.lock @@ -2,15 +2,15 @@ # yarn lockfile v1 -"@picovoice/cheetah-node@=2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@picovoice/cheetah-node/-/cheetah-node-2.0.1.tgz#bdefc651d85ca407172c0a488ff88296533378b5" - integrity sha512-aQeCZ1lDzswmE23eWnnUWiaYHCMjjlSI01iWEgpnNnYOQjUrWFrH3I3QhvbDwEcBwDj9sRJxRg0/1V+hYURXIg== +"@picovoice/cheetah-node@=2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@picovoice/cheetah-node/-/cheetah-node-2.0.3.tgz#6b426ded58c2cf21e82a3282582f46698f3ddc32" + integrity sha512-BqcDV72PhjE41GQohlnfu/1xr52QTSMlpo504tTY+JgUHcoHnwT0jEp0AbpZgdXLIexYgH/dzUt8Ls12yXyCgQ== -"@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/README.md b/demo/python/README.md index 68c04662..3b1febc0 100644 --- a/demo/python/README.md +++ b/demo/python/README.md @@ -13,12 +13,12 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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 - 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/demo/python/requirements.txt b/demo/python/requirements.txt index c05e78b5..c9d2486b 100644 --- a/demo/python/requirements.txt +++ b/demo/python/requirements.txt @@ -1,2 +1,2 @@ -pvcheetah==2.0.1 -pvrecorder==1.2.2 +pvcheetah==2.0.2 +pvrecorder==1.2.3 diff --git a/demo/python/setup.py b/demo/python/setup.py index 8cb01688..6bc828ec 100644 --- a/demo/python/setup.py +++ b/demo/python/setup.py @@ -28,7 +28,7 @@ setuptools.setup( name="pvcheetahdemo", - version="2.0.1", + version="2.0.2", author="Picovoice", author_email="hello@picovoice.ai", description="Cheetah speech-to-text engine demos", @@ -36,7 +36,7 @@ long_description_content_type="text/markdown", url="https://github.com/Picovoice/cheetah", packages=["pvcheetahdemo"], - install_requires=["pvcheetah==2.0.1", "pvrecorder==1.2.2"], + install_requires=["pvcheetah==2.0.2", "pvrecorder==1.2.3"], include_package_data=True, classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/demo/rust/README.md b/demo/rust/README.md index 1cedcd72..778a2f44 100644 --- a/demo/rust/README.md +++ b/demo/rust/README.md @@ -12,12 +12,12 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah 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 - 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 7f29385e..1993cf3d 100644 --- a/demo/rust/filedemo/Cargo.lock +++ b/demo/rust/filedemo/Cargo.lock @@ -125,9 +125,9 @@ checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" [[package]] name = "pv_cheetah" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b4655dee19400a3ff0558323de5859055a767abb9c3d4d6773460898e7dc3de" +checksum = "e283da7d704c5b16970fe55cf0443df1ab8fe2aa3765cbf8a83c5e2cdefe8b7d" dependencies = [ "libc", "libloading", @@ -135,7 +135,7 @@ dependencies = [ [[package]] name = "pv_cheetah_filedemo" -version = "2.0.0" +version = "2.0.1" dependencies = [ "clap", "hound", diff --git a/demo/rust/filedemo/Cargo.toml b/demo/rust/filedemo/Cargo.toml index cb7596c5..81793cbd 100644 --- a/demo/rust/filedemo/Cargo.toml +++ b/demo/rust/filedemo/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "pv_cheetah_filedemo" -version = "2.0.0" +version = "2.0.1" edition = "2018" [dependencies] clap = "3.2.16" hound = "3.4.0" itertools = "0.10.3" -pv_cheetah = "=2.0.2" +pv_cheetah = "=2.0.3" diff --git a/demo/rust/micdemo/Cargo.lock b/demo/rust/micdemo/Cargo.lock index b5170fbb..b9d662d2 100644 --- a/demo/rust/micdemo/Cargo.lock +++ b/demo/rust/micdemo/Cargo.lock @@ -267,9 +267,9 @@ dependencies = [ [[package]] name = "pv_cheetah" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b4655dee19400a3ff0558323de5859055a767abb9c3d4d6773460898e7dc3de" +checksum = "e283da7d704c5b16970fe55cf0443df1ab8fe2aa3765cbf8a83c5e2cdefe8b7d" dependencies = [ "libc", "libloading 0.7.4", @@ -277,7 +277,7 @@ dependencies = [ [[package]] name = "pv_cheetah_micdemo" -version = "2.0.0" +version = "2.0.1" dependencies = [ "chrono", "clap", @@ -290,9 +290,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 0.8.0", diff --git a/demo/rust/micdemo/Cargo.toml b/demo/rust/micdemo/Cargo.toml index 79781f67..64538695 100644 --- a/demo/rust/micdemo/Cargo.toml +++ b/demo/rust/micdemo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pv_cheetah_micdemo" -version = "2.0.0" +version = "2.0.1" edition = "2018" [dependencies] @@ -9,5 +9,5 @@ clap = "3.2.16" ctrlc = "3.2.2" hound = "3.4.0" itertools = "0.10.3" -pv_cheetah = "=2.0.2" -pv_recorder = "=1.2.2" +pv_cheetah = "=2.0.3" +pv_recorder = "=1.2.3" diff --git a/lib/java/jetson/cortex-a57-aarch64/libpv_cheetah_jni.so b/lib/java/jetson/cortex-a57-aarch64/libpv_cheetah_jni.so deleted file mode 100755 index 2c9f9335..00000000 Binary files a/lib/java/jetson/cortex-a57-aarch64/libpv_cheetah_jni.so and /dev/null differ diff --git a/lib/jetson/cortex-a57-aarch64/libpv_cheetah.so b/lib/jetson/cortex-a57-aarch64/libpv_cheetah.so deleted file mode 100755 index d2fad30d..00000000 Binary files a/lib/jetson/cortex-a57-aarch64/libpv_cheetah.so and /dev/null differ diff --git a/lib/node/jetson/cortex-a57-aarch64/pv_cheetah.node b/lib/node/jetson/cortex-a57-aarch64/pv_cheetah.node deleted file mode 100755 index 8f9a9a62..00000000 Binary files a/lib/node/jetson/cortex-a57-aarch64/pv_cheetah.node and /dev/null differ