Skip to content

Commit

Permalink
Merge pull request #66 from Picovoice/retire-jetson
Browse files Browse the repository at this point in the history
remove jetson
  • Loading branch information
ErisMik authored Sep 4, 2024
2 parents e9d9908 + db41994 commit 2a82f91
Show file tree
Hide file tree
Showing 18 changed files with 24 additions and 40 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 @@ -55,8 +55,6 @@ body:
- macOS (x86_64, arm64)
- Windows (x86_64)
- Raspberry Pi
- NVIDIA Jetson
- BeagleBone
validations:
required: true
- type: input
Expand Down
13 changes: 4 additions & 9 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 @@ -21,7 +20,6 @@ on:
- '.github/workflows/c-demos.yml'
- 'demo/c/**'
- 'lib/common/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand Down Expand Up @@ -57,7 +55,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 Expand Up @@ -85,7 +83,7 @@ jobs:
arch: amd64
- os: macos-latest
platform: mac
arch: x86_64
arch: arm64

steps:
- uses: actions/checkout@v3
Expand All @@ -111,7 +109,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 @@ -128,9 +126,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 All @@ -144,4 +139,4 @@ jobs:
run: cmake --build ./build --target koala_demo_file

- name: Test
run: python test/test_koala_c.py ${{secrets.PV_VALID_ACCESS_KEY}} ${{ matrix.platform }} ${{ matrix.arch }}
run: python test/test_koala_c.py ${{secrets.PV_VALID_ACCESS_KEY}} ${{ matrix.platform }} ${{ matrix.arch }}
2 changes: 1 addition & 1 deletion .github/workflows/python-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,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 @@ -11,7 +11,6 @@ on:
- 'binding/python/_util.py'
- 'binding/python/test_koala_perf.py'
- 'lib/common/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand All @@ -26,7 +25,6 @@ on:
- 'binding/python/_util.py'
- 'binding/python/test_koala_perf.py'
- 'lib/common/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand Down Expand Up @@ -80,7 +78,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.5
Expand All @@ -92,8 +90,6 @@ jobs:
proc_performance_threshold_sec: 2.5
- machine: rpi5-64
proc_performance_threshold_sec: 0.5
- machine: jetson
proc_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 @@ -20,7 +20,7 @@ Koala is an on-device noise suppression engine. Koala 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)

## Table of Contents

Expand Down
2 changes: 1 addition & 1 deletion binding/android/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Koala is an on-device noise suppression engine. Koala 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

Expand Down
2 changes: 1 addition & 1 deletion binding/ios/Koala-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 (3, 4, 5) and NVIDIA Jetson Nano
- Raspberry Pi (3, 4, 5)
DESC
s.homepage = 'https://github.com/Picovoice/koala/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 @@ -11,7 +11,7 @@ Koala is an on-device noise suppression engine. Koala 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

Expand Down
4 changes: 2 additions & 2 deletions binding/python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ Koala is an on-device noise suppression engine. Koala 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

- Python 3.8 or higher
- 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_koala.so')
elif linux_machine in _JETSON_MACHINES:
return os.path.join(os.path.dirname(__file__), relative, 'lib/jetson/%s/libpv_koala.so' % linux_machine)
elif linux_machine in _RASPBERRY_PI_MACHINES:
return os.path.join(
os.path.dirname(__file__),
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', '_koala.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="pvkoala",
version="2.0.1",
version="2.0.2",
author="Picovoice",
author_email="[email protected]",
description="Koala Noise Suppression 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 @@ -11,7 +11,7 @@ Koala is an on-device noise suppression engine. Koala 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
4 changes: 2 additions & 2 deletions demo/c/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if (NOT WIN32)
pthread
${COMMON_LIBS})
target_link_libraries(koala_demo_file ${COMMON_LIBS})
if ((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") AND (UNIX AND NOT APPLE))
if ((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") AND (UNIX AND NOT APPLE))
target_link_libraries(koala_demo_mic atomic)
endif ()
endif ()
endif ()
4 changes: 2 additions & 2 deletions demo/python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ Koala is an on-device noise suppression engine. Koala 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

- 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
2 changes: 1 addition & 1 deletion demo/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pvkoala==2.0.1
pvkoala==2.0.2
pvrecorder==1.2.2
4 changes: 2 additions & 2 deletions demo/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@

setuptools.setup(
name="pvkoalademo",
version="2.0.1",
version="2.0.2",
author="Picovoice",
author_email="[email protected]",
description="Koala Noise Suppression Engine demos",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/Picovoice/koala",
packages=["pvkoalademo"],
install_requires=["pvkoala==2.0.1", "pvrecorder==1.2.2"],
install_requires=["pvkoala==2.0.2", "pvrecorder==1.2.2"],
include_package_data=True,
classifiers=[
"Development Status :: 5 - Production/Stable",
Expand Down
Binary file removed lib/jetson/cortex-a57-aarch64/libpv_koala.so
Binary file not shown.

0 comments on commit 2a82f91

Please sign in to comment.