Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python release with RPI5 support #674

Merged
merged 3 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/python-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

strategy:
matrix:
machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, jetson, beaglebone]
machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson, beaglebone]
include:
- machine: rpi2
platform: raspberry-pi
Expand All @@ -69,6 +69,8 @@ jobs:
platform: raspberry-pi
- machine: rpi4-64
platform: raspberry-pi
- machine: rpi5-64
platform: raspberry-pi
- machine: jetson
platform: jetson
- machine: beaglebone
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/python-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
strategy:
fail-fast: false
matrix:
machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, jetson, beaglebone]
machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson, beaglebone]
include:
- machine: rpi2
num_test_iterations: 20
Expand All @@ -93,6 +93,9 @@ jobs:
- machine: rpi4-64
num_test_iterations: 50
performance_threshold_sec: 0.4
- machine: rpi5-64
num_test_iterations: 50
performance_threshold_sec: 0.1
- machine: jetson
num_test_iterations: 50
performance_threshold_sec: 0.6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:

strategy:
matrix:
machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, jetson, beaglebone]
machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson, beaglebone]

steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions binding/python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ Rhino is:

## Compatibility

- Python 3.5+
- Runs on Linux (x86_64), Mac (x86_64, arm64), Windows (x86_64), Raspberry Pi (all variants), and BeagleBone.
- Python 3.7+
- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (all variants), and BeagleBone.

## Installation

Expand Down
12 changes: 11 additions & 1 deletion binding/python/_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ def _pv_linux_machine(machine):
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'
elif machine == 'armv7l':
Expand All @@ -74,7 +76,15 @@ def _pv_platform():

PV_SYSTEM, PV_MACHINE = _pv_platform()

RASPBERRY_PI_MACHINES = {'arm11', 'cortex-a7', 'cortex-a53', 'cortex-a72', 'cortex-a53-aarch64', 'cortex-a72-aarch64'}
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'}


Expand Down
4 changes: 2 additions & 2 deletions binding/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

setuptools.setup(
name="pvrhino",
version="3.0.1",
version="3.0.2",
author="Picovoice",
author_email="[email protected]",
description="Rhino Speech-to-Intent engine.",
Expand All @@ -64,6 +64,6 @@
"Programming Language :: Python :: 3",
"Topic :: Multimedia :: Sound/Audio :: Speech"
],
python_requires='>=3.5',
python_requires='>=3.7',
keywords="Speech-to-Intent, voice commands, voice control, speech recognition, natural language understanding"
)
4 changes: 2 additions & 2 deletions demo/python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ Rhino is:

## Compatibility

- Python 3.5+
- Runs on Linux (x86_64), Mac (x86_64, arm64), Windows (x86_64), Raspberry Pi (all variants), NVIDIA Jetson Nano and BeagleBone.
- Python 3.7+
- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (all variants), NVIDIA Jetson Nano and BeagleBone.

## Installation

Expand Down
4 changes: 2 additions & 2 deletions demo/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pvrhino==3.0.1
pvrecorder==1.2.1
pvrhino==3.0.2
pvrecorder==1.2.2
6 changes: 3 additions & 3 deletions demo/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@

setuptools.setup(
name="pvrhinodemo",
version="3.0.1",
version="3.0.2",
author="Picovoice",
author_email="[email protected]",
description="Rhino Speech-to-Intent engine demos.",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/Picovoice/rhino",
packages=["pvrhinodemo"],
install_requires=["pvrhino==3.0.1", "pvrecorder==1.2.1"],
install_requires=["pvrhino==3.0.2", "pvrecorder==1.2.2"],
include_package_data=True,
classifiers=[
"Development Status :: 5 - Production/Stable",
Expand All @@ -52,6 +52,6 @@
'rhino_demo_mic=pvrhinodemo.rhino_demo_mic:main',
],
),
python_requires='>=3.5',
python_requires='>=3.7',
keywords="Speech-to-Intent, voice commands, voice control, speech recognition, natural language understanding"
)
Loading