From 37f97ba4ae2182db2b040bc0f915d2baf8453e69 Mon Sep 17 00:00:00 2001 From: Pouya Rostam Date: Mon, 5 Feb 2024 16:47:06 -0800 Subject: [PATCH] wip --- .github/workflows/python-demos.yml | 2 +- .github/workflows/python-perf.yml | 5 ++++- .github/workflows/python.yml | 2 +- README.md | 2 +- binding/python/README.md | 6 +++--- binding/python/_util.py | 10 +++++++++- binding/python/setup.py | 4 ++-- demo/python/README.md | 6 +++--- demo/python/requirements.txt | 4 ++-- demo/python/setup.py | 6 +++--- 10 files changed, 29 insertions(+), 18 deletions(-) diff --git a/.github/workflows/python-demos.yml b/.github/workflows/python-demos.yml index 503f123e..75d82fec 100644 --- a/.github/workflows/python-demos.yml +++ b/.github/workflows/python-demos.yml @@ -50,7 +50,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/python-perf.yml b/.github/workflows/python-perf.yml index 154bd74f..52c99120 100644 --- a/.github/workflows/python-perf.yml +++ b/.github/workflows/python-perf.yml @@ -71,7 +71,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, rpi5-64, jetson] include: - machine: rpi3-32 init_performance_threshold_sec: 9.0 @@ -85,6 +85,9 @@ jobs: - machine: rpi4-64 init_performance_threshold_sec: 7.5 proc_performance_threshold_sec: 4.0 + - machine: rpi5-64 + init_performance_threshold_sec: 0.1 + proc_performance_threshold_sec: 0.1 - machine: jetson init_performance_threshold_sec: 7.5 proc_performance_threshold_sec: 4.0 diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index b9742bc2..4102b438 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -62,7 +62,7 @@ jobs: strategy: matrix: - machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, jetson] + machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson] steps: - uses: actions/checkout@v3 diff --git a/README.md b/README.md index 2a0bfc03..690f6afd 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah is: - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (4, 3) and NVIDIA Jetson Nano + - Raspberry Pi (5, 4, 3) and NVIDIA Jetson Nano ## Table of Contents diff --git a/binding/python/README.md b/binding/python/README.md index 9d4b6283..fb67099a 100644 --- a/binding/python/README.md +++ b/binding/python/README.md @@ -13,12 +13,12 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah is: - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (4, 3) and NVIDIA Jetson Nano + - Raspberry Pi (5, 4, 3) and NVIDIA Jetson Nano ## Compatibility -- Python 3 -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (4, 3), and NVIDIA Jetson Nano. +- Python 3.7+ +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (5, 4, 3), and NVIDIA Jetson Nano. ## Installation diff --git a/binding/python/_util.py b/binding/python/_util.py index ff6e9f9a..c4431f93 100644 --- a/binding/python/_util.py +++ b/binding/python/_util.py @@ -41,11 +41,19 @@ def _linux_machine(): return 'cortex-a57' + arch_info elif '0xd08' == cpu_part: return 'cortex-a72' + arch_info + elif "0xd0b" == cpu_part: + return "cortex-a76" + arch_info else: raise NotImplementedError("Unsupported CPU: `%s`." % cpu_part) -_RASPBERRY_PI_MACHINES = {'cortex-a53', 'cortex-a72', 'cortex-a53-aarch64', 'cortex-a72-aarch64'} +_RASPBERRY_PI_MACHINES = { + "cortex-a53", + "cortex-a72", + "cortex-a76", + "cortex-a53-aarch64", + "cortex-a72-aarch64", + "cortex-a76-aarch64"} _JETSON_MACHINES = {'cortex-a57-aarch64'} diff --git a/binding/python/setup.py b/binding/python/setup.py index af254377..85182c93 100644 --- a/binding/python/setup.py +++ b/binding/python/setup.py @@ -48,7 +48,7 @@ setuptools.setup( name="pvcheetah", - version="2.0.0", + version="2.0.1", author="Picovoice", author_email="hello@picovoice.ai", description="Cheetah Speech-to-Text Engine.", @@ -65,6 +65,6 @@ "Programming Language :: Python :: 3", "Topic :: Multimedia :: Sound/Audio :: Speech" ], - python_requires='>=3.5', + python_requires='>=3.7', keywords="Speech-to-Text, Speech Recognition, Voice Recognition, ASR, Automatic Speech Recognition", ) diff --git a/demo/python/README.md b/demo/python/README.md index 854190f8..705ddece 100644 --- a/demo/python/README.md +++ b/demo/python/README.md @@ -13,12 +13,12 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah is: - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64) - Android and iOS - Chrome, Safari, Firefox, and Edge - - Raspberry Pi (4, 3) and NVIDIA Jetson Nano + - Raspberry Pi (5, 4, 3) and NVIDIA Jetson Nano ## Compatibility -- Python 3.5+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (4, 3), and NVIDIA Jetson Nano. +- Python 3.7+ +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (5, 4, 3), and NVIDIA Jetson Nano. ## Installation diff --git a/demo/python/requirements.txt b/demo/python/requirements.txt index 280aec39..c05e78b5 100644 --- a/demo/python/requirements.txt +++ b/demo/python/requirements.txt @@ -1,2 +1,2 @@ -pvcheetah==2.0.0 -pvrecorder==1.2.1 +pvcheetah==2.0.1 +pvrecorder==1.2.2 diff --git a/demo/python/setup.py b/demo/python/setup.py index aa5c1f68..799b4c5c 100644 --- a/demo/python/setup.py +++ b/demo/python/setup.py @@ -28,7 +28,7 @@ setuptools.setup( name="pvcheetahdemo", - version="2.0.0", + version="2.0.1", author="Picovoice", author_email="hello@picovoice.ai", description="Cheetah speech-to-text engine demos", @@ -36,7 +36,7 @@ long_description_content_type="text/markdown", url="https://github.com/Picovoice/cheetah", packages=["pvcheetahdemo"], - install_requires=["pvcheetah==2.0.0", "pvrecorder==1.2.1"], + install_requires=["pvcheetah==2.0.1", "pvrecorder==1.2.2"], include_package_data=True, classifiers=[ "Development Status :: 5 - Production/Stable", @@ -52,6 +52,6 @@ 'cheetah_demo_mic=pvcheetahdemo.cheetah_demo_mic:main', ], ), - python_requires='>=3.5', + python_requires='>=3.7', keywords="Speech-to-Text, ASR, Speech Recognition, Voice Recognition, Automatic Speech Recognition", )