Skip to content

Commit

Permalink
remove jetson, increment versions
Browse files Browse the repository at this point in the history
  • Loading branch information
albho committed Aug 15, 2024
1 parent 5be208b commit b163cd6
Show file tree
Hide file tree
Showing 26 changed files with 54 additions and 57 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ body:
- macOS (x86_64, arm64)
- Windows (x86_64)
- Raspberry Pi
- NVIDIA Jetson
validations:
required: true
- type: input
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/c-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
- '.github/workflows/c-demos.yml'
- 'demo/c/**'
- 'lib/common/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand All @@ -20,7 +19,6 @@ on:
- '.github/workflows/c-demos.yml'
- 'demo/c/**'
- 'lib/common/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/nodejs-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/nodejs-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 11 additions & 1 deletion .github/workflows/python-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand All @@ -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

Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/python-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/**'
Expand All @@ -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/**'
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:
- 'binding/python/**'
- '!binding/python/README.md'
- 'lib/common/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand All @@ -22,7 +21,6 @@ on:
- 'binding/python/**'
- '!binding/python/README.md'
- 'lib/common/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion binding/android/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion binding/ios/Orca-iOS.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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' => '[email protected]' }
Expand Down
2 changes: 1 addition & 1 deletion binding/ios/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions binding/nodejs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion binding/nodejs/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
7 changes: 0 additions & 7 deletions binding/nodejs/src/platforms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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`,
Expand Down Expand Up @@ -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}'`);
}
Expand Down
4 changes: 2 additions & 2 deletions binding/python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions binding/python/_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions binding/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -49,7 +49,7 @@

setuptools.setup(
name="pvorca",
version="0.2.3",
version="0.2.4",
author="Picovoice",
author_email="[email protected]",
description="Orca Streaming Text-to-Speech Engine",
Expand Down
5 changes: 3 additions & 2 deletions binding/web/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions demo/nodejs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion demo/nodejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading

0 comments on commit b163cd6

Please sign in to comment.