diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 2af8fdf..5434ff2 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -56,8 +56,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 fe6bb41..664878e 100644 --- a/.github/workflows/c-demos.yml +++ b/.github/workflows/c-demos.yml @@ -9,7 +9,6 @@ on: - '.github/workflows/c-demos.yml' - 'demo/c/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -22,7 +21,6 @@ on: - '.github/workflows/c-demos.yml' - 'demo/c/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -57,7 +55,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nodejs-demos.yml b/.github/workflows/nodejs-demos.yml index 5159af4..53c0814 100644 --- a/.github/workflows/nodejs-demos.yml +++ b/.github/workflows/nodejs-demos.yml @@ -39,6 +39,12 @@ jobs: with: node-version: ${{ matrix.node-version }} + # ************** REMOVE AFTER RELEASE ******************** + - name: Build Node.js SDK + run: yarn && yarn build + working-directory: binding/nodejs + # ******************************************************** + - name: Install dependencies run: yarn install @@ -53,11 +59,17 @@ 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 + # ************** REMOVE AFTER RELEASE ******************** + - name: Build Node.js SDK + run: yarn && yarn build + working-directory: binding/nodejs + # ******************************************************** + - name: Install dependencies run: yarn install diff --git a/.github/workflows/nodejs-perf.yml b/.github/workflows/nodejs-perf.yml index 7aab656..e9111d0 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 num_test_iterations: 20 @@ -84,10 +84,6 @@ jobs: num_test_iterations: 20 enroll_performance_threshold_sec: 0.5 proc_performance_threshold_sec: 0.6 - - machine: jetson - num_test_iterations: 20 - enroll_performance_threshold_sec: 1.2 - proc_performance_threshold_sec: 1.5 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 1080e68..746acbb 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -53,7 +53,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 3a74b53..92aad93 100644 --- a/.github/workflows/python-demos.yml +++ b/.github/workflows/python-demos.yml @@ -41,6 +41,12 @@ jobs: - name: Pre-build dependencies run: python -m pip install --upgrade pip + # TODO: remove after release + - name: Build dependencies + run: | + python -m pip install -U pip setuptools + pip install wheel && cd ../../binding/python && python3 setup.py sdist bdist_wheel && pip install dist/pveagle-1.0.2-py3-none-any.whl + - name: Install dependencies run: pip install -r requirements.txt @@ -63,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 @@ -71,6 +77,10 @@ jobs: - name: Pre-build dependencies run: python3 -m pip install --upgrade pip + # TODO: remove after release + - name: Build dependencies + run: pip install wheel && cd ../../binding/python && python3 setup.py sdist bdist_wheel && pip install dist/pveagle-1.0.2-py3-none-any.whl + - name: Install dependencies run: pip3 install -r requirements.txt diff --git a/.github/workflows/python-perf.yml b/.github/workflows/python-perf.yml index 8b6fc05..93ef58b 100644 --- a/.github/workflows/python-perf.yml +++ b/.github/workflows/python-perf.yml @@ -11,7 +11,6 @@ on: - 'binding/python/_util.py' - 'binding/python/test_eagle_perf.py' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -26,7 +25,6 @@ on: - 'binding/python/_util.py' - 'binding/python/test_eagle_perf.py' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -84,7 +82,7 @@ jobs: strategy: fail-fast: false matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64] include: - machine: rpi3-32 profiler_performance_threshold_sec: 2.5 @@ -101,9 +99,6 @@ jobs: - machine: rpi5-64 profiler_performance_threshold_sec: 0.5 recognizer_performance_threshold_sec: 0.6 - - machine: jetson - profiler_performance_threshold_sec: 1.2 - recognizer_performance_threshold_sec: 1.5 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index b5f5ee4..a505cd5 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -9,7 +9,6 @@ on: - 'binding/python/**' - '!binding/python/README.md' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -22,7 +21,6 @@ on: - 'binding/python/**' - '!binding/python/README.md' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -64,7 +62,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 58aed5a..a7536ee 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Eagle is an on-device speaker recognition engine. Eagle 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 42ee533..678aea5 100644 --- a/binding/android/README.md +++ b/binding/android/README.md @@ -11,7 +11,7 @@ Eagle is an on-device speaker recognition engine. Eagle 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/ios/README.md b/binding/ios/README.md index 7070d27..aec3586 100644 --- a/binding/ios/README.md +++ b/binding/ios/README.md @@ -11,7 +11,7 @@ Eagle is an on-device speaker recognition engine. Eagle 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/nodejs/README.md b/binding/nodejs/README.md index 51e0fa6..f034e80 100644 --- a/binding/nodejs/README.md +++ b/binding/nodejs/README.md @@ -11,12 +11,12 @@ Eagle is an on-device speaker recognition engine. Eagle 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 - 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 aa1db29..0f16e8a 100644 --- a/binding/nodejs/package.json +++ b/binding/nodejs/package.json @@ -1,7 +1,7 @@ { "name": "@picovoice/eagle-node", - "version": "1.0.1", + "version": "1.0.2", "description": "Picovoice Eagle 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 64d64d0..0abe650 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"; @@ -74,10 +73,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_eagle.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_eagle.node` -); SYSTEM_TO_LIBRARY_PATH.set( `${SYSTEM_WINDOWS}/${X86_64}`, `${PLATFORM_WINDOWS}/amd64/pv_eagle.node` @@ -105,7 +100,6 @@ function getLinuxPlatform(): string { case "0xd03": case "0xd08": case "0xd0b": return PLATFORM_RASPBERRY_PI; - case "0xd07": return PLATFORM_JETSON; default: throw new EagleRuntimeError(`Unsupported CPU: '${cpuPart}'`); } diff --git a/binding/python/README.md b/binding/python/README.md index bf09544..74f44c9 100644 --- a/binding/python/README.md +++ b/binding/python/README.md @@ -12,12 +12,12 @@ Eagle is an on-device speaker recognition engine. Eagle 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 or higher -- 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 d2cf872..751b123 100644 --- a/binding/python/_util.py +++ b/binding/python/_util.py @@ -54,7 +54,6 @@ def _linux_machine() -> str: "cortex-a53-aarch64", "cortex-a72-aarch64", "cortex-a76-aarch64"} -_JETSON_MACHINES = {"cortex-a57-aarch64"} def default_library_path(relative: str = "") -> str: @@ -67,8 +66,6 @@ def default_library_path(relative: str = "") -> str: linux_machine = _linux_machine() if linux_machine == "x86_64": return os.path.join(os.path.dirname(__file__), relative, "lib/linux/x86_64/libpv_eagle.so") - elif linux_machine in _JETSON_MACHINES: - return os.path.join(os.path.dirname(__file__), relative, "lib/jetson/%s/libpv_eagle.so" % linux_machine) elif linux_machine in _RASPBERRY_PI_MACHINES: return os.path.join( os.path.dirname(__file__), relative, "lib/raspberry-pi/%s/libpv_eagle.so" % linux_machine diff --git a/binding/python/setup.py b/binding/python/setup.py index 57cbc72..ed479c7 100644 --- a/binding/python/setup.py +++ b/binding/python/setup.py @@ -1,5 +1,5 @@ # -# Copyright 2023 Picovoice Inc. +# Copyright 2023-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", "_eagle.py", "_util.py") -INCLUDE_LIBS = ("common", "jetson", "linux", "mac", "raspberry-pi", "windows") +INCLUDE_LIBS = ("common", "linux", "mac", "raspberry-pi", "windows") os.system("git clean -dfx") @@ -42,7 +42,7 @@ setuptools.setup( name="pveagle", - version="1.0.1", + version="1.0.2", author="Picovoice", author_email="hello@picovoice.ai", description="Eagle Speaker Recognition Engine", diff --git a/binding/web/README.md b/binding/web/README.md index c107cea..8392cf6 100644 --- a/binding/web/README.md +++ b/binding/web/README.md @@ -11,7 +11,7 @@ Eagle is an on-device speaker recognition engine. Eagle 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/nodejs/README.md b/demo/nodejs/README.md index cf31eef..152e52a 100644 --- a/demo/nodejs/README.md +++ b/demo/nodejs/README.md @@ -11,12 +11,12 @@ Eagle is an on-device speaker recognition engine. Eagle is: - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (5, 4, 3) and NVIDIA Jetson Nano + - Raspberry Pi (5, 4, 3) ## 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 bf68ad4..319782a 100644 --- a/demo/nodejs/package.json +++ b/demo/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@picovoice/eagle-node-demo", - "version": "1.0.2", + "version": "1.0.3", "description": "Picovoice Eagle Node.js file-based and microphone demos", "scripts": { "file": "node file.js", @@ -24,7 +24,7 @@ "author": "Picovoice Inc.", "license": "Apache-2.0", "dependencies": { - "@picovoice/eagle-node": "=1.0.1", + "@picovoice/eagle-node": "file:../../binding/nodejs", "@picovoice/pvrecorder-node": "^1.2.2", "commander": "^6.1.0", "readline": "^1.3.0", diff --git a/demo/python/README.md b/demo/python/README.md index 70b6302..fdf9a8a 100644 --- a/demo/python/README.md +++ b/demo/python/README.md @@ -11,12 +11,12 @@ Eagle is an on-device speaker recognition engine. Eagle 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/demo/python/requirements.txt b/demo/python/requirements.txt index eca5d72..7918c9d 100644 --- a/demo/python/requirements.txt +++ b/demo/python/requirements.txt @@ -1,2 +1,2 @@ -pveagle==1.0.1 -pvrecorder==1.2.2 \ No newline at end of file +pveagle==1.0.2 +pvrecorder==1.2.2 diff --git a/demo/python/setup.py b/demo/python/setup.py index 21a9975..774ed9e 100644 --- a/demo/python/setup.py +++ b/demo/python/setup.py @@ -24,7 +24,7 @@ setuptools.setup( name="pveagledemo", - version="1.0.2", + version="1.0.3", author="Picovoice", author_email="hello@picovoice.ai", description="Eagle Speaker Recognition Engine demos", @@ -32,7 +32,7 @@ long_description_content_type="text/markdown", url="https://github.com/Picovoice/eagle", packages=["pveagledemo"], - install_requires=["pveagle==1.0.1", "pvrecorder==1.2.2"], + install_requires=["pveagle==1.0.2", "pvrecorder==1.2.2"], include_package_data=True, classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/resources/.lint/spell-check/dict.txt b/resources/.lint/spell-check/dict.txt index c0b4f0f..c8e6e07 100644 --- a/resources/.lint/spell-check/dict.txt +++ b/resources/.lint/spell-check/dict.txt @@ -1,7 +1,5 @@ aarch armv -beaglebone -BEAGLEBONE camelcase cocoapods copywasm @@ -12,8 +10,6 @@ iife IIFE jetson Jetson -JETSON -JETSON libpv LPWSTR Makefiles