Skip to content

Commit

Permalink
Retire jetson (#23)
Browse files Browse the repository at this point in the history
* remove jetson

* rm jetson lib

* fix c demos macos-latest

* python release

* fix demo requirements.txt
  • Loading branch information
albho authored Aug 27, 2024
1 parent e8ca9ea commit d4e615f
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 36 deletions.
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ body:
- macOS (x86_64, arm64)
- Windows (x86_64)
- Raspberry Pi
- NVIDIA Jetson
- BeagleBone
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 @@ -9,7 +9,6 @@ on:
- ".github/workflows/c-demos.yml"
- "demo/c/**"
- "lib/common/**"
- "lib/jetson/**"
- "lib/linux/**"
- "lib/mac/**"
- "lib/raspberry-pi/**"
Expand All @@ -22,7 +21,6 @@ on:
- ".github/workflows/c-demos.yml"
- "demo/c/**"
- "lib/common/**"
- "lib/jetson/**"
- "lib/linux/**"
- "lib/mac/**"
- "lib/raspberry-pi/**"
Expand Down Expand Up @@ -51,7 +49,7 @@ jobs:
make_file: "MinGW Makefiles"
- os: macos-latest
platform: mac
arch: x86_64
arch: arm64
make_file: "Unix Makefiles"

steps:
Expand Down Expand Up @@ -81,7 +79,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 @@ -98,9 +96,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
2 changes: 1 addition & 1 deletion .github/workflows/python-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,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
6 changes: 1 addition & 5 deletions .github/workflows/python-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:
- "binding/python/test_falcon_perf.py"
- "lib/common/**"
- "lib/linux/**"
- "lib/jetson/**"
- "lib/mac/**"
- "lib/raspberry-pi/**"
- "lib/windows/**"
Expand All @@ -20,7 +19,6 @@ on:
- "binding/python/test_falcon_perf.py"
- "lib/common/**"
- "lib/linux/**"
- "lib/jetson/**"
- "lib/mac/**"
- "lib/raspberry-pi/**"
- "lib/windows/**"
Expand Down Expand Up @@ -72,7 +70,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
performance_threshold_sec: 5.0
Expand All @@ -84,8 +82,6 @@ jobs:
performance_threshold_sec: 2.5
- machine: rpi5-64
performance_threshold_sec: 1.0
- machine: jetson
performance_threshold_sec: 2.5

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 @@ -23,7 +22,6 @@ on:
- 'binding/python/**'
- '!binding/python/README.md'
- 'lib/common/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand Down Expand Up @@ -66,7 +64,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 @@ -18,7 +18,7 @@ Falcon is an on-device speaker diarization engine. Falcon is:
- Private; All voice processing runs locally.
- Cross-Platform:
- Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64)
- Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano
- Raspberry Pi (3, 4, 5)
- Android and iOS
- Chrome, Safari, Firefox, and Edge

Expand Down
2 changes: 1 addition & 1 deletion binding/android/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Falcon is an on-device speaker diarization engine. Falcon is:
- Private; All voice processing runs locally.
- Cross-Platform:
- Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64)
- Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano
- Raspberry Pi (3, 4, 5)

## Compatibility

Expand Down
2 changes: 1 addition & 1 deletion binding/ios/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Falcon is an on-device speaker diarization engine. Falcon 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)

## Installation

Expand Down
4 changes: 2 additions & 2 deletions binding/python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ Falcon is an on-device speaker diarization engine. Falcon is:
- Private; All voice processing runs locally.
- Cross-Platform:
- Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64)
- 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

Expand Down
3 changes: 0 additions & 3 deletions binding/python/_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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_falcon.so")
elif linux_machine in _JETSON_MACHINES:
return os.path.join(os.path.dirname(__file__), relative, "lib/jetson/%s/libpv_falcon.so" % linux_machine)
elif linux_machine in _RASPBERRY_PI_MACHINES:
return os.path.join(
os.path.dirname(__file__), relative, "lib/raspberry-pi/%s/libpv_falcon.so" % linux_machine
Expand Down
6 changes: 3 additions & 3 deletions binding/python/setup.py
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -15,7 +15,7 @@
import setuptools

INCLUDE_FILES = ("../../LICENSE", "__init__.py", "_factory.py", "_falcon.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")

Expand All @@ -42,7 +42,7 @@

setuptools.setup(
name="pvfalcon",
version="1.0.1",
version="1.0.2",
author="Picovoice",
author_email="[email protected]",
description="Falcon Speaker Diarization Engine",
Expand Down
2 changes: 1 addition & 1 deletion binding/web/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Falcon is an on-device speaker diarization engine. Falcon is:
- Private; All voice processing runs locally.
- Cross-Platform:
- Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64)
- Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano
- Raspberry Pi (3, 4, 5)
- Chrome, Safari, Firefox, and Edge

## Compatibility
Expand Down
6 changes: 3 additions & 3 deletions demo/python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ Falcon is an on-device speaker diarization engine. Falcon is:
- Private; All voice processing runs locally.
- Cross-Platform:
- Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64)
- 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

Expand All @@ -35,7 +35,7 @@ Signup or Login to [Picovoice Console](https://console.picovoice.ai/) to get you
Run the following in the terminal:

```console
falcon_demo_file --access_key ${ACCESS_KEY} --audio_paths ${AUDIO_PATH}
falcon_demo_file --access_key ${ACCESS_KEY} --wav_paths ${AUDIO_PATH}
```

Replace `${ACCESS_KEY}` with yours obtained from Picovoice Console and `${AUDIO_PATH}` with a path to an audio file.
Expand Down
2 changes: 1 addition & 1 deletion demo/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pvfalcon==1.0.1
pvfalcon==1.0.2
pvrecorder==1.2.2
tabulate==0.9.0
4 changes: 2 additions & 2 deletions demo/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@

setuptools.setup(
name="pvfalcondemo",
version="1.0.1",
version="1.0.2",
author="Picovoice",
author_email="[email protected]",
description="Falcon Speaker Diarization engine demos",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/Picovoice/falcon",
packages=["pvfalcondemo"],
install_requires=["pvfalcon==1.0.1", "pvrecorder==1.2.2", "tabulate==0.8.10"],
install_requires=["pvfalcon==1.0.2", "pvrecorder==1.2.2", "tabulate==0.8.10"],
include_package_data=True,
classifiers=[
"Development Status :: 5 - Production/Stable",
Expand Down
Binary file removed lib/jetson/cortex-a57-aarch64/libpv_falcon.so
Binary file not shown.

0 comments on commit d4e615f

Please sign in to comment.