Skip to content

Commit

Permalink
Merge pull request #76 from Picovoice/retire-jetson
Browse files Browse the repository at this point in the history
remove jetson, increment versions
  • Loading branch information
ErisMik authored Sep 4, 2024
2 parents a131239 + 479cdd8 commit a01a04d
Show file tree
Hide file tree
Showing 28 changed files with 36 additions and 69 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 @@ -56,8 +56,6 @@ body:
- macOS (x86_64, arm64)
- Windows (x86_64)
- Raspberry Pi
- NVIDIA Jetson
- BeagleBone
validations:
required: true
- type: input
Expand Down
6 changes: 2 additions & 4 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 @@ -57,7 +55,7 @@ jobs:

strategy:
matrix:
machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, jetson]
machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-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 Down
2 changes: 1 addition & 1 deletion .github/workflows/nodejs-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,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/nodejs-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,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
num_test_iterations: 20
Expand All @@ -84,10 +84,6 @@ jobs:
num_test_iterations: 20
enroll_performance_threshold_sec: 0.5
proc_performance_threshold_sec: 0.6
- machine: jetson
num_test_iterations: 20
enroll_performance_threshold_sec: 1.2
proc_performance_threshold_sec: 1.5

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 @@ -53,7 +53,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 .github/workflows/python-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,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
7 changes: 1 addition & 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_eagle_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_eagle_perf.py'
- 'lib/common/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand Down Expand Up @@ -84,7 +82,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]
include:
- machine: rpi3-32
profiler_performance_threshold_sec: 2.5
Expand All @@ -101,9 +99,6 @@ jobs:
- machine: rpi5-64
profiler_performance_threshold_sec: 0.5
recognizer_performance_threshold_sec: 0.6
- machine: jetson
profiler_performance_threshold_sec: 1.2
recognizer_performance_threshold_sec: 1.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 @@ -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 @@ -24,7 +24,7 @@ Eagle is an on-device speaker recognition engine. Eagle 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 @@ Eagle is an on-device speaker recognition engine. Eagle 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/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Eagle is an on-device speaker recognition engine. Eagle 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/nodejs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ Eagle is an on-device speaker recognition engine. Eagle 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 binding/nodejs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

{
"name": "@picovoice/eagle-node",
"version": "1.0.1",
"version": "1.0.2",
"description": "Picovoice Eagle Node.js binding",
"main": "dist/index.js",
"types": "dist/types/index.d.ts",
Expand Down
9 changes: 0 additions & 9 deletions binding/nodejs/src/platforms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@ 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";
const PLATFORM_WINDOWS = "windows";

const ARM_CPU_64 = "-aarch64";
const ARM_CPU_CORTEX_A53 = "cortex-a53";
const ARM_CPU_CORTEX_A57 = "cortex-a57";
const ARM_CPU_CORTEX_A72 = "cortex-a72";
const ARM_CPU_CORTEX_A76 = "cortex-a76";

Expand Down Expand Up @@ -74,10 +72,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_eagle.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_eagle.node`
);
SYSTEM_TO_LIBRARY_PATH.set(
`${SYSTEM_WINDOWS}/${X86_64}`,
`${PLATFORM_WINDOWS}/amd64/pv_eagle.node`
Expand All @@ -101,11 +95,9 @@ function getCpuPart(): string {
function getLinuxPlatform(): string {
const cpuPart = getCpuPart();
switch (cpuPart) {
case "0xc07":
case "0xd03":
case "0xd08":
case "0xd0b": return PLATFORM_RASPBERRY_PI;
case "0xd07": return PLATFORM_JETSON;
default:
throw new EagleRuntimeError(`Unsupported CPU: '${cpuPart}'`);
}
Expand All @@ -120,7 +112,6 @@ function getLinuxMachine(arch: string): string {
const cpuPart = getCpuPart();
switch (cpuPart) {
case "0xd03": return ARM_CPU_CORTEX_A53 + archInfo;
case "0xd07": return ARM_CPU_CORTEX_A57 + archInfo;
case "0xd08": return ARM_CPU_CORTEX_A72 + archInfo;
case "0xd0b": return ARM_CPU_CORTEX_A76 + archInfo;
default:
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 @@ Eagle is an on-device speaker recognition engine. Eagle 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
5 changes: 0 additions & 5 deletions binding/python/_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ def _linux_machine() -> str:

if "0xd03" == cpu_part:
return "cortex-a53" + arch_info
elif "0xd07" == cpu_part:
return "cortex-a57" + arch_info
elif "0xd08" == cpu_part:
return "cortex-a72" + arch_info
elif "0xd0b" == cpu_part:
Expand All @@ -54,7 +52,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 +64,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_eagle.so")
elif linux_machine in _JETSON_MACHINES:
return os.path.join(os.path.dirname(__file__), relative, "lib/jetson/%s/libpv_eagle.so" % linux_machine)
elif linux_machine in _RASPBERRY_PI_MACHINES:
return os.path.join(
os.path.dirname(__file__), relative, "lib/raspberry-pi/%s/libpv_eagle.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", "_eagle.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="pveagle",
version="1.0.1",
version="1.0.2",
author="Picovoice",
author_email="[email protected]",
description="Eagle Speaker Recognition 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 @@ Eagle is an on-device speaker recognition engine. Eagle 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 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(eagle_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(eagle_demo_mic atomic)
endif ()
endif ()
endif ()
4 changes: 2 additions & 2 deletions demo/nodejs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ Eagle is an on-device speaker recognition engine. Eagle 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 (5, 4, 3)

## Compatibility

- Node.js 12+
- 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
4 changes: 2 additions & 2 deletions demo/nodejs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@picovoice/eagle-node-demo",
"version": "1.0.2",
"version": "1.0.3",
"description": "Picovoice Eagle Node.js file-based and microphone demos",
"scripts": {
"file": "node file.js",
Expand All @@ -24,7 +24,7 @@
"author": "Picovoice Inc.",
"license": "Apache-2.0",
"dependencies": {
"@picovoice/eagle-node": "=1.0.1",
"@picovoice/eagle-node": "=1.0.2",
"@picovoice/pvrecorder-node": "^1.2.2",
"commander": "^6.1.0",
"readline": "^1.3.0",
Expand Down
8 changes: 4 additions & 4 deletions demo/nodejs/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@picovoice/eagle-node@=1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@picovoice/eagle-node/-/eagle-node-1.0.0.tgz#bcaceae487ae2183e83f6029f400b591a0999f2b"
integrity sha512-BkP9A1skjTQlRMQmFPghaSArt3kM2vIDNO7jyZOlIJVz2AYeyyVB/3lvmKsNTIUw+lbx/Q5mgcTaJF19JX3/6g==
"@picovoice/eagle-node@=1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@picovoice/eagle-node/-/eagle-node-1.0.2.tgz#cef55d40a9db2ce2a49c4e624b1413cb8460687f"
integrity sha512-nMG8NkRg7gjMVSWF82O1kv9DLd5N3NYIk6c6N6I0A1+7x0wT1cNaOPBWRKxDUDvm1lIVUy2DmEk4AOgEieUtnQ==

"@picovoice/pvrecorder-node@^1.2.2":
version "1.2.2"
Expand Down
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 @@ Eagle is an on-device speaker recognition engine. Eagle 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
Loading

0 comments on commit a01a04d

Please sign in to comment.