diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index d8d4184c..23a64009 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -53,7 +53,6 @@ body: - macOS (x86_64, arm64) - Windows (x86_64) - Raspberry Pi - - NVIDIA Jetson validations: required: true - type: input diff --git a/.github/workflows/c-demos.yml b/.github/workflows/c-demos.yml index 9b7f54b7..225245f8 100644 --- a/.github/workflows/c-demos.yml +++ b/.github/workflows/c-demos.yml @@ -8,7 +8,6 @@ on: - '.github/workflows/c-demos.yml' - 'demo/c/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -20,7 +19,6 @@ on: - '.github/workflows/c-demos.yml' - 'demo/c/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -37,7 +35,7 @@ jobs: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ ubuntu-latest, windows-latest, macos-latest ] include: - os: ubuntu-latest platform: linux @@ -78,7 +76,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 @@ -95,9 +93,6 @@ jobs: - machine: rpi5-64 platform: raspberry-pi arch: cortex-a76-aarch64 - - machine: jetson - platform: jetson - arch: cortex-a57-aarch64 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nodejs-demos.yml b/.github/workflows/nodejs-demos.yml index f91fdb3d..978f8db8 100644 --- a/.github/workflows/nodejs-demos.yml +++ b/.github/workflows/nodejs-demos.yml @@ -43,6 +43,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: | ${{ matrix.install-dep }} @@ -59,11 +65,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 806a31ea..c188c885 100644 --- a/.github/workflows/nodejs-perf.yml +++ b/.github/workflows/nodejs-perf.yml @@ -58,7 +58,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 proc_performance_threshold_sec: 2.9 @@ -70,8 +70,6 @@ jobs: proc_performance_threshold_sec: 1.3 - machine: rpi5-64 proc_performance_threshold_sec: 0.8 - - machine: jetson - proc_performance_threshold_sec: 1.3 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index a0d5c698..508822c3 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -54,7 +54,7 @@ jobs: strategy: matrix: - machine: [ rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson ] + machine: [ rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64 ] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/python-demo.yml b/.github/workflows/python-demo.yml index 0cf761a9..7577514a 100644 --- a/.github/workflows/python-demo.yml +++ b/.github/workflows/python-demo.yml @@ -44,6 +44,12 @@ jobs: - name: Pre-build dependencies run: python3 -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/pvorca-0.2.4-py3-none-any.whl + - name: Install dependencies run: | ${{matrix.install_dep}} @@ -67,11 +73,15 @@ 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 + # TODO: remove after release + - name: Build dependencies + run: pip install wheel && cd ../../binding/python && python3 setup.py sdist bdist_wheel && pip install dist/pvorca-0.2.4-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 64c8a6cd..e8f149c2 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_orca_perf.py' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -25,7 +24,6 @@ on: - 'binding/python/_util.py' - 'binding/python/test_orca_perf.py' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' @@ -42,7 +40,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ ubuntu-latest, windows-latest, macos-latest ] include: - os: ubuntu-latest proc_performance_threshold_rtf: 5.0 @@ -78,7 +76,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 proc_performance_threshold_rtf: 1.0 @@ -90,8 +88,6 @@ jobs: proc_performance_threshold_rtf: 2.0 - machine: rpi5-64 proc_performance_threshold_rtf: 2.0 - - machine: jetson - proc_performance_threshold_rtf: 2.0 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 83a2fdf7..f7073116 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 9af9cf31..7ab95282 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ voice assistants. Orca is: - Cross-Platform: - Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64) - Android and iOS - - Raspberry Pi (5, 4, 3) and NVIDIA Jetson Nano + - Raspberry Pi (3, 4, 5) - Chrome, Safari, Firefox, and Edge **Please note that Orca is currently in development. While we prioritize stability and compatibility, certain aspects of diff --git a/binding/android/README.md b/binding/android/README.md index 48ceeb51..d8cc0710 100644 --- a/binding/android/README.md +++ b/binding/android/README.md @@ -12,7 +12,7 @@ voice assistants. Orca 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 (3, 4, 5) ## Compatibility diff --git a/binding/ios/Orca-iOS.podspec b/binding/ios/Orca-iOS.podspec index bf00e7ee..ff16a970 100644 --- a/binding/ios/Orca-iOS.podspec +++ b/binding/ios/Orca-iOS.podspec @@ -14,7 +14,7 @@ Pod::Spec.new do |s| - 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 (3, 4, 5) DESC s.homepage = 'https://github.com/Picovoice/orca/tree/main/binding/ios' s.author = { 'Picovoice' => 'hello@picovoice.ai' } diff --git a/binding/ios/README.md b/binding/ios/README.md index a232528f..28ab2ae5 100644 --- a/binding/ios/README.md +++ b/binding/ios/README.md @@ -10,7 +10,7 @@ assistants. Orca 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 (3, 4, 5) ## Compatibility diff --git a/binding/nodejs/README.md b/binding/nodejs/README.md index a0f16266..2d733f58 100644 --- a/binding/nodejs/README.md +++ b/binding/nodejs/README.md @@ -12,12 +12,12 @@ voice assistants. Orca 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 5249f7f6..ad441303 100644 --- a/binding/nodejs/package.json +++ b/binding/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@picovoice/orca-node", - "version": "0.2.0", + "version": "0.2.1", "description": "Picovoice Orca 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 284627ad..7ec0fbec 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'; @@ -80,10 +79,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_orca.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_orca.node`, -); SYSTEM_TO_LIBRARY_PATH.set( `${SYSTEM_WINDOWS}/${X86_64}`, `${PLATFORM_WINDOWS}/amd64/pv_orca.node`, @@ -111,8 +106,6 @@ function getLinuxPlatform(): string { case '0xd08': case '0xd0b': return PLATFORM_RASPBERRY_PI; - case '0xd07': - return PLATFORM_JETSON; default: throw new OrcaRuntimeError(`Unsupported CPU: '${cpuPart}'`); } diff --git a/binding/python/README.md b/binding/python/README.md index 39b598a1..42d6ac5f 100644 --- a/binding/python/README.md +++ b/binding/python/README.md @@ -12,12 +12,12 @@ voice assistants. Orca 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 (3, 4, 5) ## Compatibility - Python 3.8+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (5, 4, 3), 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 c9a605b4..b2186abe 100644 --- a/binding/python/_util.py +++ b/binding/python/_util.py @@ -55,7 +55,6 @@ def _linux_machine() -> str: "cortex-a72-aarch64", "cortex-a76-aarch64", } -_JETSON_MACHINES = {"cortex-a57-aarch64"} def default_library_path(relative: str = "") -> str: @@ -68,8 +67,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_orca.so") - elif linux_machine in _JETSON_MACHINES: - return os.path.join(os.path.dirname(__file__), relative, "lib/jetson/%s/libpv_orca.so" % linux_machine) elif linux_machine in _RASPBERRY_PI_MACHINES: return os.path.join( os.path.dirname(__file__), relative, "lib/raspberry-pi/%s/libpv_orca.so" % linux_machine) diff --git a/binding/python/setup.py b/binding/python/setup.py index 192ff97b..088185ef 100644 --- a/binding/python/setup.py +++ b/binding/python/setup.py @@ -15,7 +15,7 @@ import setuptools INCLUDE_FILES = ('../../LICENSE', '__init__.py', '_factory.py', '_orca.py', '_util.py') -INCLUDE_LIBS = ('jetson', 'linux', 'mac', 'raspberry-pi', 'windows') +INCLUDE_LIBS = ('linux', 'mac', 'raspberry-pi', 'windows') DEFAULT_MODEL_FILE = 'orca_params_female.pv' os.system('git clean -dfx') @@ -49,7 +49,7 @@ setuptools.setup( name="pvorca", - version="0.2.3", + version="0.2.4", author="Picovoice", author_email="hello@picovoice.ai", description="Orca Streaming Text-to-Speech Engine", diff --git a/binding/web/README.md b/binding/web/README.md index ad97cc5f..04ce6a1a 100644 --- a/binding/web/README.md +++ b/binding/web/README.md @@ -12,7 +12,7 @@ voice assistants. Orca 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 @@ -170,7 +170,8 @@ for (const textChunk of textStream()) { } ``` -The `OrcaStream` object buffers input text until there is enough to generate audio. If there is not enough text to generate +The `OrcaStream` object buffers input text until there is enough to generate audio. If there is not enough text to +generate audio, `null` is returned. When done, call `flush` to synthesize any remaining text, and `close` to delete the `orcaStream` object. diff --git a/demo/nodejs/README.md b/demo/nodejs/README.md index 34413d33..5ef3e509 100644 --- a/demo/nodejs/README.md +++ b/demo/nodejs/README.md @@ -12,12 +12,12 @@ voice assistants. Orca 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/demo/nodejs/package.json b/demo/nodejs/package.json index 12b346c9..57df6f1f 100644 --- a/demo/nodejs/package.json +++ b/demo/nodejs/package.json @@ -21,7 +21,7 @@ "author": "Picovoice Inc.", "license": "Apache-2.0", "dependencies": { - "@picovoice/orca-node": "=0.2.0", + "@picovoice/orca-node": "file:../../binding/nodejs", "commander": "^6.1.0", "pcm-convert": "^1.6.5", "prettier": "^2.6.2", diff --git a/demo/nodejs/yarn.lock b/demo/nodejs/yarn.lock index 3f91a022..55efcbd8 100644 --- a/demo/nodejs/yarn.lock +++ b/demo/nodejs/yarn.lock @@ -2,10 +2,8 @@ # yarn lockfile v1 -"@picovoice/orca-node@=0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@picovoice/orca-node/-/orca-node-0.2.0.tgz#928eab700374581acbacfe9b54c368a0a5714b27" - integrity sha512-eOdWXCKUp1YOI7w8ExAfzeqyyr9GheA0x3adzpFw2vb/5xqVExct6wklESOzJ2dQ0EkSSqzWWnXzLqMd02lfRg== +"@picovoice/orca-node@file:../../binding/nodejs": + version "0.2.1" audio-format@^2.3.2: version "2.3.2" diff --git a/demo/python/README.md b/demo/python/README.md index f8d11e8d..268d5bc3 100644 --- a/demo/python/README.md +++ b/demo/python/README.md @@ -12,12 +12,12 @@ voice assistants. Orca 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 (3, 4, 5) ## Compatibility - Python 3.8+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (5, 4, 3), 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 a9a52a0c..0a811c84 100644 --- a/demo/python/requirements.txt +++ b/demo/python/requirements.txt @@ -1,4 +1,4 @@ numpy>=1.24.0 -pvorca==0.2.3 +pvorca==0.2.4 sounddevice==0.4.6 tiktoken==0.6.0 diff --git a/demo/python/setup.py b/demo/python/setup.py index 7ce5120e..bff635fd 100644 --- a/demo/python/setup.py +++ b/demo/python/setup.py @@ -26,7 +26,7 @@ setuptools.setup( name="pvorcademo", - version="0.2.3", + version="0.2.4", author="Picovoice", author_email="hello@picovoice.ai", description="Orca Streaming Text-to-Speech Engine demos", diff --git a/lib/jetson/cortex-a57-aarch64/libpv_orca.so b/lib/jetson/cortex-a57-aarch64/libpv_orca.so deleted file mode 100755 index f4d65481..00000000 Binary files a/lib/jetson/cortex-a57-aarch64/libpv_orca.so and /dev/null differ