From 8bc3d9c04313410e8bcb5d2b734bb9be1cbccde1 Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Wed, 28 Aug 2024 14:37:55 -0700 Subject: [PATCH] remove from all --- .github/workflows/dotnet-codestyle.yml | 11 +++++++ .github/workflows/dotnet-demos.yml | 20 ++++++++++++ .github/workflows/go-demos.yml | 10 ++++++ .github/workflows/nodejs-demos.yml | 12 +++++++ .github/workflows/python-demos.yml | 10 ++++++ .github/workflows/rust-codestyle.yml | 18 +++++++++++ .github/workflows/rust-demos.yml | 12 +++++++ README.md | 12 +++---- demo/c/CMakeLists.txt | 4 +-- demo/c/README.md | 32 ++----------------- .../dotnet/PicovoiceDemo/PicovoiceDemo.csproj | 2 +- demo/dotnet/README.md | 5 +-- demo/go/README.md | 4 +-- demo/go/go.mod | 3 +- demo/go/go.sum | 4 +-- demo/java-swing/build.gradle | 7 ++-- demo/java/README.md | 6 ++-- demo/java/build.gradle | 9 ++++-- demo/nodejs/README.md | 6 ++-- demo/nodejs/package.json | 2 +- demo/nodejs/yarn.lock | 6 ++-- demo/python/README.md | 2 +- demo/python/requirements.txt | 2 +- demo/python/setup.py | 4 +-- demo/rust/filedemo/Cargo.lock | 14 ++++---- demo/rust/filedemo/Cargo.toml | 5 +-- demo/rust/micdemo/Cargo.lock | 14 ++++---- demo/rust/micdemo/Cargo.toml | 5 +-- sdk/c/README.md | 4 +-- sdk/dotnet/Picovoice/Picovoice.csproj | 6 ++-- sdk/dotnet/PicovoiceTest/MainTest.cs | 3 -- sdk/dotnet/README.md | 5 +-- sdk/java/README.md | 4 +-- sdk/java/build.gradle | 6 ++-- .../ai/picovoice/picovoice/PicovoiceTest.java | 5 --- sdk/nodejs/README.md | 4 +-- sdk/nodejs/package.json | 2 +- sdk/python/README.md | 2 +- sdk/python/requirements.txt | 6 ++-- sdk/python/setup.py | 4 +-- sdk/python/test_util.py | 20 +----------- sdk/rust/Cargo.lock | 10 +++--- sdk/rust/Cargo.toml | 6 ++-- sdk/rust/README.md | 2 +- 44 files changed, 177 insertions(+), 153 deletions(-) diff --git a/.github/workflows/dotnet-codestyle.yml b/.github/workflows/dotnet-codestyle.yml index e60329082..349a7983e 100644 --- a/.github/workflows/dotnet-codestyle.yml +++ b/.github/workflows/dotnet-codestyle.yml @@ -29,6 +29,17 @@ jobs: run: dotnet format --verify-no-changes --no-restore working-directory: sdk/dotnet + # ************** REMOVE AFTER RELEASE ******************** + - name: Pack .NET SDK + run: dotnet pack -c Release + working-directory: sdk/dotnet + + - name: Add local NuGet package file + continue-on-error: true + run: dotnet add package -s ../../../sdk/dotnet/Picovoice/bin/Release Picovoice + working-directory: demo/dotnet/PicovoiceDemo + # ******************************************************** + - name: Run Demo Codestyle run: dotnet format --verify-no-changes --no-restore working-directory: demo/dotnet diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml index 73f1f3c83..044877e42 100644 --- a/.github/workflows/dotnet-demos.yml +++ b/.github/workflows/dotnet-demos.yml @@ -47,6 +47,16 @@ jobs: with: dotnet-version: 6.0.x + # ************** REMOVE AFTER RELEASE ******************** + - name: Pack .NET SDK + run: dotnet pack -c Release + working-directory: sdk/dotnet + + - name: Add local NuGet package file + continue-on-error: true + run: dotnet add package -s ../../../sdk/dotnet/Picovoice/bin/Release Picovoice + # ******************************************************** + - name: Dotnet build micdemo run: dotnet build -c MicDemo.Release -v n @@ -83,6 +93,16 @@ jobs: with: submodules: recursive + # ************** REMOVE AFTER RELEASE ******************** + - name: Pack .NET SDK + run: dotnet pack -c Release + working-directory: sdk/dotnet + + - name: Add local NuGet package file + continue-on-error: true + run: dotnet add package -s ../../../sdk/dotnet/Picovoice/bin/Release Picovoice + # ******************************************************** + - name: Dotnet build micdemo run: dotnet build -c MicDemo.Release -v n diff --git a/.github/workflows/go-demos.yml b/.github/workflows/go-demos.yml index 25fbef3aa..412176bb4 100644 --- a/.github/workflows/go-demos.yml +++ b/.github/workflows/go-demos.yml @@ -42,6 +42,11 @@ jobs: with: go-version: ${{ matrix.go }} + # ************** REMOVE AFTER RELEASE ******************** + - name: Install Go SDK from branch + run: go get github.com/Picovoice/picovoice/sdk/go/v3/@98eed548c1219c0bf9619550434dd5f457b6a090 + # ******************************************************** + - name: Build micdemo run: go build micdemo/picovoice_mic_demo.go @@ -58,6 +63,11 @@ jobs: steps: - uses: actions/checkout@v3 + # ************** REMOVE AFTER RELEASE ******************** + - name: Install Go SDK from branch + run: go get github.com/Picovoice/picovoice/sdk/go/v3/@98eed548c1219c0bf9619550434dd5f457b6a090 + # ******************************************************** + - name: Build micdemo run: go build micdemo/picovoice_mic_demo.go diff --git a/.github/workflows/nodejs-demos.yml b/.github/workflows/nodejs-demos.yml index 85fb42677..aaa0044d2 100644 --- a/.github/workflows/nodejs-demos.yml +++ b/.github/workflows/nodejs-demos.yml @@ -46,6 +46,12 @@ jobs: with: node-version: ${{ matrix.node-version }} + # ************** REMOVE AFTER RELEASE ******************** + - name: Build Node.js SDK + run: yarn && yarn build + working-directory: sdk/nodejs + # ******************************************************** + - name: Install dependencies run: yarn install @@ -80,6 +86,12 @@ jobs: with: submodules: recursive + # ************** REMOVE AFTER RELEASE ******************** + - name: Build Node.js SDK + run: yarn && yarn build + working-directory: sdk/nodejs + # ******************************************************** + - name: Install dependencies run: yarn install diff --git a/.github/workflows/python-demos.yml b/.github/workflows/python-demos.yml index 695800d13..0f16be1b5 100644 --- a/.github/workflows/python-demos.yml +++ b/.github/workflows/python-demos.yml @@ -50,6 +50,12 @@ jobs: python -m pip install --upgrade pip pip install wheel + # TODO: remove after release + - name: Build dependencies + run: | + python -m pip install -U pip setuptools + pip install wheel && cd ../../sdk/python && python3 setup.py sdist bdist_wheel && pip install dist/pvpicovoice-3.0.3-py3-none-any.whl + - name: Install dependencies run: pip install -r requirements.txt @@ -88,6 +94,10 @@ jobs: python3 -m pip install --upgrade pip pip3 install wheel + # TODO: remove after release + - name: Build dependencies + run: pip install wheel && cd ../../sdk/python && python3 setup.py sdist bdist_wheel && pip install dist/pvpicovoice-3.0.3-py3-none-any.whl + - name: Install dependencies run: pip3 install -r requirements.txt diff --git a/.github/workflows/rust-codestyle.yml b/.github/workflows/rust-codestyle.yml index 3b2ab593a..3f91e433d 100644 --- a/.github/workflows/rust-codestyle.yml +++ b/.github/workflows/rust-codestyle.yml @@ -41,6 +41,12 @@ jobs: toolchain: stable override: true + # ************** REMOVE AFTER RELEASE ******************** + - name: Build Rust SDK + run: ./copy.sh + working-directory: sdk/rust + # ******************************************************** + - name: Run clippy run: cargo clippy -- -D warnings working-directory: sdk/rust @@ -63,6 +69,12 @@ jobs: toolchain: stable override: true + # ************** REMOVE AFTER RELEASE ******************** + - name: Build Rust SDK + run: ./copy.sh + working-directory: sdk/rust + # ******************************************************** + - name: Run clippy run: cargo clippy -- -D warnings working-directory: demo/rust/filedemo @@ -89,6 +101,12 @@ jobs: run: cargo build working-directory: sdk/rust + # ************** REMOVE AFTER RELEASE ******************** + - name: Build Rust SDK + run: ./copy.sh + working-directory: sdk/rust + # ******************************************************** + - name: Run clippy run: cargo clippy -- -D warnings working-directory: demo/rust/micdemo diff --git a/.github/workflows/rust-demos.yml b/.github/workflows/rust-demos.yml index 6f7c1975e..e06832314 100644 --- a/.github/workflows/rust-demos.yml +++ b/.github/workflows/rust-demos.yml @@ -53,6 +53,12 @@ jobs: toolchain: stable override: true + # ************** REMOVE AFTER RELEASE ******************** + - name: Build Rust SDK + run: ./copy.sh + working-directory: sdk/rust + # ******************************************************** + - name: Rust build micdemo run: cargo build --verbose working-directory: demo/rust/micdemo @@ -98,6 +104,12 @@ jobs: toolchain: nightly override: true + # ************** REMOVE AFTER RELEASE ******************** + - name: Build Rust SDK + run: ./copy.sh + working-directory: sdk/rust + # ******************************************************** + - name: Rust build micdemo run: cargo build --verbose working-directory: demo/rust/micdemo diff --git a/README.md b/README.md index d9549be51..260960601 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ spoken command: - **Accurate:** Resilient to noise and reverberation. Outperforms cloud-based alternatives by wide margins. - **Cross-Platform:** Design once, deploy anywhere. Build using familiar languages and frameworks. - Arm Cortex-M, STM32, Arduino, and i.MX RT - - Raspberry Pi, NVIDIA Jetson Nano, and BeagleBone + - Raspberry Pi (Zero, 3, 4, 5) - Android and iOS - Chrome, Safari, Firefox, and Edge - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64) @@ -199,7 +199,7 @@ picovoice_demo_mic \ --context_path resources/rhino/resources/contexts/${PLATFORM}/smart_lighting_${PLATFORM}.rhn ``` -Replace `${PLATFORM}` with the platform you are running the demo on (e.g. `raspberry-pi`, `beaglebone`, `linux`, `mac`, +Replace `${PLATFORM}` with the platform you are running the demo on (e.g. `raspberry-pi`, `linux`, `mac`, or `windows`). The microphone demo opens an audio stream from the microphone, detects utterances of a given wake phrase, and infers intent from the follow-on spoken command. Once the demo initializes, it prints `[Listening ...]` to the console. Then say: @@ -586,7 +586,7 @@ At the root of the repository, build with: cmake -S demo/c/. -B demo/c/build && cmake --build demo/c/build --target picovoice_demo_mic ``` -#### Linux (x86_64), macOS (x86_64), Raspberry Pi, and BeagleBone +#### Linux (x86_64), macOS (x86_64, arm64), Raspberry Pi List input audio devices with: @@ -608,7 +608,7 @@ Run the demo using: ``` Replace `${LIBRARY_PATH}` with path to appropriate library available under [/sdk/c/lib](sdk/c/lib), `${PLATFORM}` with the -name of the platform you are running on (`linux`, `raspberry-pi`, `mac`, or `beaglebone`), and `${AUDIO_DEVICE_INDEX}` with +name of the platform you are running on (`linux`, `raspberry-pi`, or `mac`), and `${AUDIO_DEVICE_INDEX}` with the index of your audio device. #### Windows @@ -640,7 +640,7 @@ At the root of the repository, build with: cmake -S demo/c/. -B demo/c/build && cmake --build demo/c/build --target picovoice_demo_file ``` -#### Linux (x86_64), macOS (x86_64), Raspberry Pi, and BeagleBone +#### Linux (x86_64), macOS (x86_64, arm64), Raspberry Pi Run the demo using: @@ -656,7 +656,7 @@ Run the demo using: ``` Replace `${LIBRARY_PATH}` with path to appropriate library available under [sdk/c/lib](sdk/c/lib), `${PLATFORM}` with the -name of the platform you are running on (`linux`, `raspberry-pi`, `mac`, or `beaglebone`). +name of the platform you are running on (`linux`, `raspberry-pi`, or `mac`). #### Windows diff --git a/demo/c/CMakeLists.txt b/demo/c/CMakeLists.txt index 9870d447c..7e66ec6dd 100644 --- a/demo/c/CMakeLists.txt +++ b/demo/c/CMakeLists.txt @@ -24,7 +24,7 @@ target_include_directories(picovoice_demo_file PRIVATE dr_libs) if (NOT WIN32) target_link_libraries(picovoice_demo_mic ${COMMON_LIBS} ${MIC_LIBS}) target_link_libraries(picovoice_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(picovoice_demo_mic atomic) endif() -endif() \ No newline at end of file +endif() diff --git a/demo/c/README.md b/demo/c/README.md index 024d2453b..347df1aed 100644 --- a/demo/c/README.md +++ b/demo/c/README.md @@ -32,7 +32,7 @@ cmake -S demo/c/. -B demo/c/build -G "MinGW Makefiles" && cmake --build demo/c/b Running the executable without any commandline arguments prints the usage info to the console. -#### Linux, macOS, Raspberry Pi, BeagleBone, Jetson +#### Linux, macOS, Raspberry Pi ```console ./demo/c/build/picovoice_demo_mic @@ -58,7 +58,7 @@ usage : .\\demo\\c\\build\\picovoice_demo_mic.exe -l LIBRARY_PATH -a ACCESS_KEY The following commands shows the available audio input devices to the console. -#### Linux, macOS, Raspberry Pi, BeagleBone +#### Linux, macOS, Raspberry Pi ```console ./demo/c/build/picovoice_demo_mic --show_audio_devices @@ -116,19 +116,6 @@ Replace `${PROCESSOR}` with one of the Raspberry Pi processors defined [here](.. -i {AUDIO_DEVICE_INDEX} ``` -#### BeagleBone - -```console -./demo/c/build/picovoice_demo_mic \ --a ${ACCESS_KEY} --l sdk/c/lib/beaglebone/libpicovoice.so \ --p resources/porcupine/lib/common/porcupine_params.pv \ --k resources/porcupine/resources/keyword_files/beaglebone/picovoice_beaglebone.ppn \ --r resources/rhino/lib/common/rhino_params.pv \ --c resources/rhino/resources/contexts/beaglebone/smart_lighting_beaglebone.rhn \ --i {AUDIO_DEVICE_INDEX} -``` - #### Windows ```console @@ -169,7 +156,7 @@ cmake -S demo/c/. -B demo/c/build && cmake --build demo/c/build --target picovoi Running the executable without any commandline arguments prints the usage info to the console. -#### Linux, macOS, Raspberry Pi, BeagleBone +#### Linux, macOS, Raspberry Pi ```console ./demo/c/build/picovoice_demo_file @@ -237,19 +224,6 @@ Replace `${PROCESSOR}` with one of the Raspberry Pi processors defined [here](.. -w resources/audio_samples/picovoice-coffee.wav ``` -#### BeagleBone - -```console -./demo/c/build/picovoice_demo_file \ --a ${ACCESS_KEY} --l sdk/c/lib/beaglebone/libpicovoice.so \ --p resources/porcupine/lib/common/porcupine_params.pv \ --k resources/porcupine/resources/keyword_files/beaglebone/picovoice_beaglebone.ppn \ --r resources/rhino/lib/common/rhino_params.pv \ --c resources/rhino/resources/contexts/beaglebone/coffee_maker_beaglebone.rhn \ --w resources/audio_samples/picovoice-coffee.wav -``` - #### Windows ```console diff --git a/demo/dotnet/PicovoiceDemo/PicovoiceDemo.csproj b/demo/dotnet/PicovoiceDemo/PicovoiceDemo.csproj index 0f59ce49d..0aa07b02d 100644 --- a/demo/dotnet/PicovoiceDemo/PicovoiceDemo.csproj +++ b/demo/dotnet/PicovoiceDemo/PicovoiceDemo.csproj @@ -19,6 +19,6 @@ - + diff --git a/demo/dotnet/README.md b/demo/dotnet/README.md index 8c2569d5f..f3ef89256 100644 --- a/demo/dotnet/README.md +++ b/demo/dotnet/README.md @@ -24,15 +24,12 @@ similar to Alexa and Google. But it entirely runs 100% on-device. Picovoice is ## Compatibility - Linux (x86_64) -- macOS (x86_64) +- macOS (x86_64, arm64) - Windows (x86_64) - Raspberry Pi: - - 2 - 3 (32 and 64 bit) - 4 (32 and 64 bit) - 5 (32 and 64 bit) -- NVIDIA Jetson Nano -- BeagleBone ## Installation diff --git a/demo/go/README.md b/demo/go/README.md index cb9a0e3a7..93161364c 100644 --- a/demo/go/README.md +++ b/demo/go/README.md @@ -15,11 +15,9 @@ This Go module contains demos for processing real-time audio (i.e. microphone) a - Windows (x86_64) - Raspberry Pi: - Zero - - 2 - 3 (32 and 64 bit) - 4 (32 and 64 bit) -- NVIDIA Jetson Nano -- BeagleBone + - 5 (32 and 64 bit) ## AccessKey diff --git a/demo/go/go.mod b/demo/go/go.mod index 02e336c24..27ea47253 100644 --- a/demo/go/go.mod +++ b/demo/go/go.mod @@ -3,9 +3,8 @@ module picovoicedemo go 1.16 require ( - github.com/Picovoice/picovoice/sdk/go/v3 v3.0.2 + github.com/Picovoice/picovoice/sdk/go/v3 v3.0.3-0.20240828213205-98eed548c121 github.com/Picovoice/pvrecorder/binding/go v1.2.2 - github.com/Picovoice/rhino/binding/go/v3 v3.0.2 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 de4404730..22db36d95 100644 --- a/demo/go/go.sum +++ b/demo/go/go.sum @@ -1,5 +1,5 @@ -github.com/Picovoice/picovoice/sdk/go/v3 v3.0.2 h1:pyAfHvqPNJvj6d6sqv2qnSe5yxtkOp0ml3VIuGr/zjM= -github.com/Picovoice/picovoice/sdk/go/v3 v3.0.2/go.mod h1:eZULulF8trfROGO3nnWapKyIfwXhn86LMYG1hWpEIlY= +github.com/Picovoice/picovoice/sdk/go/v3 v3.0.3-0.20240828213205-98eed548c121 h1:zy+xUXHNYDppMaFGW/3aIYYzIUmFCT69xv9qBssuNGo= +github.com/Picovoice/picovoice/sdk/go/v3 v3.0.3-0.20240828213205-98eed548c121/go.mod h1:eZULulF8trfROGO3nnWapKyIfwXhn86LMYG1hWpEIlY= github.com/Picovoice/porcupine/binding/go/v3 v3.0.2 h1:mgvA50lIybYhfCMCwXoPvqjuyAKBppT8ZGSn/7F4ank= github.com/Picovoice/porcupine/binding/go/v3 v3.0.2/go.mod h1:6Pg/746wMh0GDNEWqi56GuTsTk7WLeVgTB0ZhyERs8U= github.com/Picovoice/pvrecorder/binding/go v1.2.2 h1:UN0u60hVR+s8kYmVSITS4UbTihHzeNxlNkJKYoKaVbo= diff --git a/demo/java-swing/build.gradle b/demo/java-swing/build.gradle index d0d289490..1bc7318eb 100644 --- a/demo/java-swing/build.gradle +++ b/demo/java-swing/build.gradle @@ -4,6 +4,9 @@ plugins { repositories { mavenCentral() + maven { + url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1335/' + } } sourceSets { @@ -18,13 +21,13 @@ sourceSets { jar { manifest { attributes 'Main-Class': 'Main', - "Class-Path": "picovoice-3.0.2.jar;commons-cli-1.4.jar" + "Class-Path": "picovoice-3.0.3.jar;commons-cli-1.4.jar" } from {configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } } dependencies { - implementation 'ai.picovoice:picovoice-java:3.0.2' + implementation 'ai.picovoice:picovoice-java:3.0.3' implementation 'commons-cli:commons-cli:1.4' } diff --git a/demo/java/README.md b/demo/java/README.md index 5b2b6c91d..b7d1301a4 100644 --- a/demo/java/README.md +++ b/demo/java/README.md @@ -26,11 +26,9 @@ Picovoice is: ## Compatibility - Linux (x86_64) -- macOS (x86_64) +- macOS (x86_64, arm64) - Windows (x86_64) -- Raspberry Pi 2, Raspberry Pi 3 (32 and 64 bit), Raspberry Pi 4 (32 and 64 bit) -- Jetson Nano -- BeagleBone +- Raspberry Pi 3 (32 and 64 bit), Raspberry Pi 4 (32 and 64 bit), Raspberry Pi 5 (32 and 64 bit) ## Installation diff --git a/demo/java/build.gradle b/demo/java/build.gradle index 5d0739749..9a8b2758e 100644 --- a/demo/java/build.gradle +++ b/demo/java/build.gradle @@ -4,6 +4,9 @@ plugins { repositories { mavenCentral() + maven { + url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1335/' + } } sourceSets { @@ -15,14 +18,14 @@ sourceSets { } dependencies { - implementation 'ai.picovoice:picovoice-java:3.0.2' + implementation 'ai.picovoice:picovoice-java:3.0.3' implementation 'commons-cli:commons-cli:1.4' } jar { manifest { attributes "Main-Class": "ai.picovoice.picovoicedemo.MicDemo", - "Class-Path" : "picovoice-3.0.2.jar;commons-cli-1.4.jar" + "Class-Path" : "picovoice-3.0.3.jar;commons-cli-1.4.jar" } from sourceSets.main.output exclude "**/FileDemo.class" @@ -34,7 +37,7 @@ jar { task fileDemoJar(type: Jar) { manifest { attributes "Main-Class": "ai.picovoice.picovoicedemo.FileDemo", - "Class-Path" : "picovoice-3.0.2.jar;commons-cli-1.4.jar" + "Class-Path" : "picovoice-3.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 91d97c4f9..28cca9641 100644 --- a/demo/nodejs/README.md +++ b/demo/nodejs/README.md @@ -22,9 +22,7 @@ These demos run Rhino on **NodeJS 16+** on the following platforms: - Windows (x86_64) - Linux (x86_64) - macOS (x86_64, arm64) -- Raspberry Pi (2, 3, 4, 5) -- NVIDIA Jetson (Nano) -- BeagleBone +- Raspberry Pi (3, 4, 5) ### Web Browsers @@ -234,7 +232,7 @@ Files generated with the Picovoice Console carry restrictions including (but not If desired, you may override the Porcupine and Rhino model and dynamic libraries by specifying their absolute paths with `--porcupine_model_file_path` and `--porcupine_library_file_path`, respectively and the Rhino model and dynamic libraries with `--rhino_model_file_path` and `--rhino_library_file_path`. As with keyword and context files, the dynamic libraries are specific to the platform. -e.g. for macOS (x86_64): +e.g. for macOS (x86_64, arm64): ```console pv-mic-demo \ diff --git a/demo/nodejs/package.json b/demo/nodejs/package.json index 645cbcdac..65767cec3 100644 --- a/demo/nodejs/package.json +++ b/demo/nodejs/package.json @@ -16,7 +16,7 @@ "author": "Picovoice Inc.", "license": "Apache-2.0", "dependencies": { - "@picovoice/picovoice-node": "~3.0.2", + "@picovoice/picovoice-node": "file:../../sdk/nodejs", "@picovoice/pvrecorder-node": "~1.2.2", "commander": "^6.1.0", "wavefile": "^11.0.0" diff --git a/demo/nodejs/yarn.lock b/demo/nodejs/yarn.lock index 7bf43a531..49ed234e2 100644 --- a/demo/nodejs/yarn.lock +++ b/demo/nodejs/yarn.lock @@ -2,10 +2,8 @@ # yarn lockfile v1 -"@picovoice/picovoice-node@~3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@picovoice/picovoice-node/-/picovoice-node-3.0.2.tgz#6afcec113813094bae05368dfcb43140791e289d" - integrity sha512-WzWjbetg9QbeqecrzLJLZhfVUpSASMPQCFGEbA8Tkdf/BkMyUfb7WJvfyY3MOu12II/k2cfrBOfhX/OOij/KgA== +"@picovoice/picovoice-node@file:../../sdk/nodejs": + version "3.0.3" dependencies: "@picovoice/porcupine-node" "=3.0.2" "@picovoice/rhino-node" "=3.0.3" diff --git a/demo/python/README.md b/demo/python/README.md index 85c6e3696..46bf58c35 100644 --- a/demo/python/README.md +++ b/demo/python/README.md @@ -20,7 +20,7 @@ similar to Alexa and Google. But it entirely runs 100% on-device. Picovoice is ## Compatibility * Python 3.8+ -* Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (all variants), NVIDIA Jetson (Nano), and BeagleBone. +* Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (Zero, 3, 4, 5). ## Installation diff --git a/demo/python/requirements.txt b/demo/python/requirements.txt index 154ad2b2a..3990b3784 100644 --- a/demo/python/requirements.txt +++ b/demo/python/requirements.txt @@ -1,2 +1,2 @@ -picovoice==3.0.2 +picovoice==3.0.3 pvrecorder==1.2.2 diff --git a/demo/python/setup.py b/demo/python/setup.py index c636fac1e..b0b4dde86 100644 --- a/demo/python/setup.py +++ b/demo/python/setup.py @@ -39,7 +39,7 @@ setuptools.setup( name="picovoicedemo", - version="3.0.2", + version="3.0.3", author="Picovoice Inc.", author_email="hello@picovoice.ai", description="Picovoice demos.", @@ -47,7 +47,7 @@ long_description_content_type="text/markdown", url="https://github.com/Picovoice/picovoice", packages=["picovoicedemo"], - install_requires=["picovoice==3.0.2", "pvrecorder==1.2.2"], + install_requires=["picovoice==3.0.3", "pvrecorder==1.2.2"], include_package_data=True, classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/demo/rust/filedemo/Cargo.lock b/demo/rust/filedemo/Cargo.lock index 4370f4e1d..76a76a6a8 100644 --- a/demo/rust/filedemo/Cargo.lock +++ b/demo/rust/filedemo/Cargo.lock @@ -135,9 +135,7 @@ checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "picovoice" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e3590e4dc3134f1f4c8f4995d9a7f583379f6f97dc01ef6ac0161ace2631fc7" +version = "3.0.4" dependencies = [ "pv_porcupine", "pv_rhino", @@ -145,7 +143,7 @@ dependencies = [ [[package]] name = "picovoice_filedemo" -version = "3.0.3" +version = "3.0.4" dependencies = [ "clap", "hound", @@ -155,9 +153,9 @@ dependencies = [ [[package]] name = "pv_porcupine" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6218ff1a325195f04a009398566e9eb343ccbfccce203b31ba3b82eb3cac63" +checksum = "3811779d053f2833938d46f2a6b98aa07e9c184891d1542ade8160baaf9ac03f" dependencies = [ "libc", "libloading 0.8.1", @@ -165,9 +163,9 @@ dependencies = [ [[package]] name = "pv_rhino" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b035d446c37012d2836686a0664facee38b7bde7e3a1c43b9f812dce0d32e550" +checksum = "56cba466f05dbc2c5a69cc21904fc3acb9ea4235a0e432b4a68c155c963534c0" dependencies = [ "libc", "libloading 0.7.4", diff --git a/demo/rust/filedemo/Cargo.toml b/demo/rust/filedemo/Cargo.toml index 6e4f53636..9aad4cb3b 100644 --- a/demo/rust/filedemo/Cargo.toml +++ b/demo/rust/filedemo/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "picovoice_filedemo" -version = "3.0.3" +version = "3.0.4" edition = "2018" [dependencies] clap = "3.2.3" hound = "3.4.0" itertools = "0.10.3" -picovoice = "=3.0.3" +# picovoice = "=3.0.4" +picovoice = { path = "../../../sdk/rust" } diff --git a/demo/rust/micdemo/Cargo.lock b/demo/rust/micdemo/Cargo.lock index cd8571d01..5f29b8eef 100644 --- a/demo/rust/micdemo/Cargo.lock +++ b/demo/rust/micdemo/Cargo.lock @@ -258,9 +258,7 @@ checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" [[package]] name = "picovoice" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e3590e4dc3134f1f4c8f4995d9a7f583379f6f97dc01ef6ac0161ace2631fc7" +version = "3.0.4" dependencies = [ "pv_porcupine", "pv_rhino", @@ -268,7 +266,7 @@ dependencies = [ [[package]] name = "picovoice_micdemo" -version = "3.0.3" +version = "3.0.4" dependencies = [ "chrono", "clap", @@ -290,9 +288,9 @@ dependencies = [ [[package]] name = "pv_porcupine" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6218ff1a325195f04a009398566e9eb343ccbfccce203b31ba3b82eb3cac63" +checksum = "3811779d053f2833938d46f2a6b98aa07e9c184891d1542ade8160baaf9ac03f" dependencies = [ "libc", "libloading 0.8.0", @@ -310,9 +308,9 @@ dependencies = [ [[package]] name = "pv_rhino" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b035d446c37012d2836686a0664facee38b7bde7e3a1c43b9f812dce0d32e550" +checksum = "56cba466f05dbc2c5a69cc21904fc3acb9ea4235a0e432b4a68c155c963534c0" dependencies = [ "libc", "libloading 0.7.4", diff --git a/demo/rust/micdemo/Cargo.toml b/demo/rust/micdemo/Cargo.toml index 9c6961564..38b29ac1d 100644 --- a/demo/rust/micdemo/Cargo.toml +++ b/demo/rust/micdemo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "picovoice_micdemo" -version = "3.0.3" +version = "3.0.4" edition = "2018" [dependencies] @@ -9,5 +9,6 @@ clap = "3.2.3" ctrlc = "3.1.9" hound = "3.4.0" itertools = "0.10.3" -picovoice = "=3.0.3" +# picovoice = "=3.0.4" +picovoice = { path = "../../../sdk/rust" } pv_recorder = "=1.2.2" diff --git a/sdk/c/README.md b/sdk/c/README.md index 52160b04d..ed7da15e7 100644 --- a/sdk/c/README.md +++ b/sdk/c/README.md @@ -25,9 +25,7 @@ Picovoice is: - Linux (x86_64) - macOS (x86_64, arm64) - Windows (x86_64) -- BeagleBone -- NVIDIA Jetson Nano -- Raspberry Pi (Zero, 2, 3, 4) +- Raspberry Pi (Zero, 3, 4, 5) ## AccessKey diff --git a/sdk/dotnet/Picovoice/Picovoice.csproj b/sdk/dotnet/Picovoice/Picovoice.csproj index 7e829aed9..bed138121 100644 --- a/sdk/dotnet/Picovoice/Picovoice.csproj +++ b/sdk/dotnet/Picovoice/Picovoice.csproj @@ -1,7 +1,7 @@  net6.0;netcoreapp3.0;netstandard2.0 - 3.0.2 + 3.0.3 Picovoice Picovoice End-to-End Platform @@ -35,10 +35,10 @@ - + analyzers - + analyzers diff --git a/sdk/dotnet/PicovoiceTest/MainTest.cs b/sdk/dotnet/PicovoiceTest/MainTest.cs index 03c3be81a..6fe3cd960 100644 --- a/sdk/dotnet/PicovoiceTest/MainTest.cs +++ b/sdk/dotnet/PicovoiceTest/MainTest.cs @@ -249,12 +249,9 @@ public static string PvLinuxEnv() switch (cpuPart) { - case "0xc07": case "0xd03": case "0xd08": case "0xd0b": return "raspberry-pi"; - case "0xd07": return "jetson"; - case "0xc08": return "beaglebone"; default: throw new PlatformNotSupportedException($"This device (CPU part = {cpuPart}) is not supported by Picovoice."); } diff --git a/sdk/dotnet/README.md b/sdk/dotnet/README.md index eebdfd0a1..23e8648fd 100644 --- a/sdk/dotnet/README.md +++ b/sdk/dotnet/README.md @@ -33,12 +33,9 @@ Platforms compatible with .NET Core 2.0+: Platforms compatible with .NET Core 3.0+: - Raspberry Pi: - - 2 - 3 (32 and 64 bit) - 4 (32 and 64 bit) - 5 (32 and 64 bit) -- NVIDIA Jetson Nano -- BeagleBone Platform compatible with .NET 6.0+: @@ -126,4 +123,4 @@ In order to detect wake words and run inference in other languages you need to u ## Demos -The [Picovoice dotnet demo](https://github.com/Picovoice/picovoice/tree/master/demo/dotnet) is a .NET Core command line application that allows for processing real-time audio (i.e. microphone) and files using Picovoice. \ No newline at end of file +The [Picovoice dotnet demo](https://github.com/Picovoice/picovoice/tree/master/demo/dotnet) is a .NET Core command line application that allows for processing real-time audio (i.e. microphone) and files using Picovoice. diff --git a/sdk/java/README.md b/sdk/java/README.md index 9a6e75e1a..f676f19ba 100644 --- a/sdk/java/README.md +++ b/sdk/java/README.md @@ -22,9 +22,7 @@ Picovoice is: - Linux (x86_64) - macOS (x86_64, arm64) - Windows (x86_64) -- Raspberry Pi 2, Raspberry Pi 3 (32 and 64 bit), Raspberry Pi 4 (32 and 64 bit), Raspberry Pi 5 (32 and 64 bit) -- Jetson Nano -- BeagleBone +- Raspberry Pi 3 (32 and 64 bit), Raspberry Pi 4 (32 and 64 bit), Raspberry Pi 5 (32 and 64 bit) ## Installation diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle index 6ae1f6989..05f8b9855 100644 --- a/sdk/java/build.gradle +++ b/sdk/java/build.gradle @@ -7,7 +7,7 @@ plugins { ext { PUBLISH_GROUP_ID = 'ai.picovoice' - PUBLISH_VERSION = '3.0.2' + PUBLISH_VERSION = '3.0.3' PUBLISH_ARTIFACT_ID = 'picovoice-java' } @@ -40,8 +40,8 @@ if (file("${rootDir}/publish-mavencentral.gradle").exists()) { } dependencies { - implementation 'ai.picovoice:porcupine-java:3.0.2' - implementation 'ai.picovoice:rhino-java:3.0.2' + implementation 'ai.picovoice:porcupine-java:3.0.3' + implementation 'ai.picovoice:rhino-java:3.0.3' testImplementation 'com.google.code.gson:gson:2.10.1' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2' diff --git a/sdk/java/test/ai/picovoice/picovoice/PicovoiceTest.java b/sdk/java/test/ai/picovoice/picovoice/PicovoiceTest.java index aafccade0..cac0c1b01 100644 --- a/sdk/java/test/ai/picovoice/picovoice/PicovoiceTest.java +++ b/sdk/java/test/ai/picovoice/picovoice/PicovoiceTest.java @@ -284,15 +284,10 @@ private static String getEnvironmentName() throws RuntimeException { if (arch.equals("arm") || arch.equals("aarch64")) { String cpuPart = getCpuPart(); switch (cpuPart) { - case "0xc07": case "0xd03": case "0xd08": case "0xd0b": return "raspberry-pi"; - case "0xd07": - return "jetson"; - case "0xc08": - return "beaglebone"; default: throw new RuntimeException(String.format("Execution environment not supported. " + "Picovoice Java does not support CPU Part (%s).", cpuPart)); diff --git a/sdk/nodejs/README.md b/sdk/nodejs/README.md index c677d5b0a..a83148106 100644 --- a/sdk/nodejs/README.md +++ b/sdk/nodejs/README.md @@ -20,9 +20,7 @@ This binding is for running Picovoice on **NodeJS 16+** on the following platfor - Windows (x86_64) - Linux (x86_64) - macOS (x86_64, arm64) -- Raspberry Pi (2, 3, 4, 5) -- NVIDIA Jetson (Nano) -- BeagleBone +- Raspberry Pi (3, 4, 5) ### Web Browsers diff --git a/sdk/nodejs/package.json b/sdk/nodejs/package.json index aff48ee87..ad3c30bb9 100644 --- a/sdk/nodejs/package.json +++ b/sdk/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@picovoice/picovoice-node", - "version": "3.0.2", + "version": "3.0.3", "description": "Picovoice SDK for NodeJS", "main": "dist/index.js", "types": "dist/index.d.js", diff --git a/sdk/python/README.md b/sdk/python/README.md index 23545a833..5a2f5e191 100644 --- a/sdk/python/README.md +++ b/sdk/python/README.md @@ -15,7 +15,7 @@ similar to Alexa and Google. But it entirely runs 100% on-device. Picovoice is ## Compatibility * Python 3.8+ -* Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (all variants), NVIDIA Jetson (Nano), and BeagleBone. +* Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (Zero, 3, 4, 5). ## Installation diff --git a/sdk/python/requirements.txt b/sdk/python/requirements.txt index e7f976d2a..ee66ecf46 100644 --- a/sdk/python/requirements.txt +++ b/sdk/python/requirements.txt @@ -1,4 +1,4 @@ parameterized -pvporcupine==3.0.2 -pvrhino==3.0.2 -setuptools \ No newline at end of file +pvporcupine==3.0.3 +pvrhino==3.0.3 +setuptools diff --git a/sdk/python/setup.py b/sdk/python/setup.py index f92ebb948..b301dd492 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -33,7 +33,7 @@ setuptools.setup( name="picovoice", - version="3.0.2", + version="3.0.3", author="Picovoice Inc.", author_email="hello@picovoice.ai", description="Picovoice is an end-to-end platform for building voice products on your terms.", @@ -41,7 +41,7 @@ long_description_content_type="text/markdown", url="https://github.com/Picovoice/picovoice", packages=["picovoice"], - install_requires=["pvporcupine==3.0.2", "pvrhino==3.0.2"], + install_requires=["pvporcupine==3.0.3", "pvrhino==3.0.3"], include_package_data=True, classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/sdk/python/test_util.py b/sdk/python/test_util.py index d32468b1c..0ece3e8da 100644 --- a/sdk/python/test_util.py +++ b/sdk/python/test_util.py @@ -42,18 +42,12 @@ def _pv_linux_machine(machine): if '0xb76' == cpu_part: return 'arm11' + arch_info - elif '0xc07' == cpu_part: - return 'cortex-a7' + arch_info elif '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: return "cortex-a76" + arch_info - elif '0xc08' == cpu_part: - return 'beaglebone' + arch_info elif machine == 'armv7l': log.warning( 'WARNING: Please be advised that this device (CPU part = %s) is not officially supported by Picovoice. ' @@ -80,14 +74,12 @@ def _pv_platform(): _RASPBERRY_PI_MACHINES = { "arm11", - "cortex-a7", "cortex-a53", "cortex-a72", "cortex-a76", "cortex-a53-aarch64", "cortex-a72-aarch64", "cortex-a76-aarch64"} -_JETSON_MACHINES = {'cortex-a57-aarch64'} def pv_model_path(relative): @@ -100,12 +92,8 @@ def pv_keyword_files_subdir(): elif _PV_SYSTEM == 'Linux': if _PV_MACHINE == 'x86_64': return 'linux' - elif _PV_MACHINE in _JETSON_MACHINES: - return 'jetson' elif _PV_MACHINE in _RASPBERRY_PI_MACHINES: return 'raspberry-pi' - elif _PV_MACHINE == 'beaglebone': - return 'beaglebone' elif _PV_SYSTEM == 'Windows': return 'windows' @@ -141,15 +129,9 @@ def context_path(context, language): raise RuntimeError( "Failed to identify the CPU with '%s'\nCPU info: %s" % (error, cpu_info)) - if cpu_part in ('0xb76', '0xc07', '0xd03', '0xd08', '0xd0b'): + if cpu_part in ('0xb76', '0xd03', '0xd08', '0xd0b'): return os.path.join(os.path.dirname(__file__), contexts_root, 'raspberry-pi', '%s_raspberry-pi.rhn' % context) - elif '0xd07' == cpu_part: - return os.path.join(os.path.dirname(__file__), - contexts_root, 'jetson', '%s_jetson.rhn' % context) - elif '0xc08' == cpu_part: - return os.path.join(os.path.dirname(__file__), - contexts_root, 'beaglebone', '%s_beaglebone.rhn' % context) else: raise NotImplementedError("Unsupported CPU: '%s'." % cpu_part) elif system == 'Windows': diff --git a/sdk/rust/Cargo.lock b/sdk/rust/Cargo.lock index 7603a8e9c..4513c0df8 100644 --- a/sdk/rust/Cargo.lock +++ b/sdk/rust/Cargo.lock @@ -652,7 +652,7 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "picovoice" -version = "3.0.3" +version = "3.0.4" dependencies = [ "itertools", "pv_porcupine", @@ -688,9 +688,9 @@ dependencies = [ [[package]] name = "pv_porcupine" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6218ff1a325195f04a009398566e9eb343ccbfccce203b31ba3b82eb3cac63" +checksum = "3811779d053f2833938d46f2a6b98aa07e9c184891d1542ade8160baaf9ac03f" dependencies = [ "libc", "libloading 0.8.1", @@ -698,9 +698,9 @@ dependencies = [ [[package]] name = "pv_rhino" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b035d446c37012d2836686a0664facee38b7bde7e3a1c43b9f812dce0d32e550" +checksum = "56cba466f05dbc2c5a69cc21904fc3acb9ea4235a0e432b4a68c155c963534c0" dependencies = [ "libc", "libloading 0.7.4", diff --git a/sdk/rust/Cargo.toml b/sdk/rust/Cargo.toml index 5dc620317..a2a3406b3 100644 --- a/sdk/rust/Cargo.toml +++ b/sdk/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "picovoice" -version = "3.0.3" +version = "3.0.4" edition = "2018" description = "Rust SDK for Picovoice's voice recognition platform" license = "Apache-2.0" @@ -25,8 +25,8 @@ path = "src/lib.rs" crate_type = ["lib"] [dependencies] -pv_porcupine = "=3.0.2" -pv_rhino = "=3.0.2" +pv_porcupine = "=3.0.3" +pv_rhino = "=3.0.3" [dev-dependencies] itertools = "0.10.1" diff --git a/sdk/rust/README.md b/sdk/rust/README.md index ef3c28e31..69eb1d976 100644 --- a/sdk/rust/README.md +++ b/sdk/rust/README.md @@ -16,7 +16,7 @@ similar to Alexa and Google. But it entirely runs 100% on-device. Picovoice is ## Compatibility - Rust 1.54+ -- Runs on Linux (x86_64), macOS (x86_64 and arm64), Windows (x86_64), Raspberry Pi, NVIDIA Jetson (Nano), and BeagleBone +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi ## Installation First you will need [Rust and Cargo](https://rustup.rs/) installed on your system.