Skip to content

Commit

Permalink
Merge pull request #222 from Picovoice/retire-rpi2-bb-jetson
Browse files Browse the repository at this point in the history
remove jetson, beaglebone, rpi2, and increment versions
  • Loading branch information
ErisMik authored Sep 4, 2024
2 parents 61cafb5 + 1de57bb commit ecf7323
Show file tree
Hide file tree
Showing 39 changed files with 59 additions and 149 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 @@ -57,8 +57,6 @@ body:
- macOS (x86_64, arm64)
- Windows (x86_64)
- Raspberry Pi
- NVIDIA Jetson
- BeagleBone
validations:
required: true
- type: input
Expand Down
21 changes: 4 additions & 17 deletions .github/workflows/c-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ on:
paths:
- 'demo/c/**'
- '!demo/c/README.md'
- 'lib/beaglebone/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand All @@ -19,8 +17,6 @@ on:
paths:
- 'demo/c/**'
- '!demo/c/README.md'
- 'lib/beaglebone/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand Down Expand Up @@ -55,7 +51,7 @@ jobs:

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

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -83,7 +79,7 @@ jobs:
arch: amd64
- os: macos-latest
platform: mac
arch: x86_64
arch: arm64

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -112,11 +108,8 @@ jobs:

strategy:
matrix:
machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson, beaglebone]
machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64]
include:
- machine: rpi2
platform: raspberry-pi
arch: cortex-a7
- machine: rpi3-32
platform: raspberry-pi
arch: cortex-a53
Expand All @@ -132,12 +125,6 @@ jobs:
- machine: rpi5-64
platform: raspberry-pi
arch: cortex-a76-aarch64
- machine: jetson
platform: jetson
arch: cortex-a57-aarch64
- machine: beaglebone
platform: beaglebone
arch: ''

steps:
- uses: actions/checkout@v3
Expand All @@ -154,4 +141,4 @@ jobs:
run: pip install -r test/requirements.txt

- name: Test
run: python3 test/test_cobra_c.py ${{secrets.PV_VALID_ACCESS_KEY}} ${{ matrix.platform }} ${{ matrix.arch }}
run: python3 test/test_cobra_c.py ${{secrets.PV_VALID_ACCESS_KEY}} ${{ matrix.platform }} ${{ matrix.arch }}
2 changes: 1 addition & 1 deletion .github/workflows/nodejs-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:

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

steps:
- uses: actions/checkout@v3
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/nodejs-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,8 @@ jobs:
strategy:
fail-fast: false
matrix:
machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson, beaglebone]
machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64]
include:
- machine: rpi2
num_test_iterations: 20
- machine: rpi3-32
num_test_iterations: 50
- machine: rpi3-64
Expand All @@ -73,10 +71,6 @@ jobs:
num_test_iterations: 50
- machine: rpi5-64
num_test_iterations: 50
- machine: jetson
num_test_iterations: 50
- machine: beaglebone
num_test_iterations: 10

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: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson, beaglebone]
machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64]

steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .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 All @@ -59,4 +59,4 @@ jobs:
run: pip3 install -r requirements.txt

- name: Test
run: python3 cobra_demo_file.py --access_key ${{secrets.PV_VALID_ACCESS_KEY}} --input_wav_path ../../res/audio/sample.wav
run: python3 cobra_demo_file.py --access_key ${{secrets.PV_VALID_ACCESS_KEY}} --input_wav_path ../../res/audio/sample.wav
15 changes: 1 addition & 14 deletions .github/workflows/python-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ on:
paths:
- '.github/workflows/python-perf.yml'
- 'binding/python/test_cobra_perf.py'
- 'lib/beaglebone/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand All @@ -19,8 +17,6 @@ on:
paths:
- '.github/workflows/python-perf.yml'
- 'binding/python/test_cobra_perf.py'
- 'lib/beaglebone/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand Down Expand Up @@ -70,11 +66,8 @@ jobs:
strategy:
fail-fast: false
matrix:
machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson, beaglebone]
machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64]
include:
- machine: rpi2
num_test_iterations: 50
performance_threshold_sec: 0.08
- machine: rpi3-32
num_test_iterations: 100
performance_threshold_sec: 0.05
Expand All @@ -90,12 +83,6 @@ jobs:
- machine: rpi5-64
num_test_iterations: 100
performance_threshold_sec: 0.011
- machine: jetson
num_test_iterations: 100
performance_threshold_sec: 0.025
- machine: beaglebone
num_test_iterations: 50
performance_threshold_sec: 0.25

steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ on:
- '.github/workflows/python.yml'
- 'binding/python/**'
- '!binding/python/README.md'
- 'lib/beaglebone/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand All @@ -21,8 +19,6 @@ on:
- '.github/workflows/python.yml'
- 'binding/python/**'
- '!binding/python/README.md'
- 'lib/beaglebone/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand Down Expand Up @@ -65,7 +61,7 @@ jobs:
strategy:
fail-fast: false
matrix:
machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson, beaglebone]
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/rust-codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ jobs:

- name: Run clippy
run: cargo clippy -- -D warnings
working-directory: demo/rust/micdemo
working-directory: demo/rust/micdemo
5 changes: 3 additions & 2 deletions .github/workflows/rust-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
defaults:
run:
working-directory: demo/rust
shell: bash

jobs:
build-github-hosted:
Expand Down Expand Up @@ -58,7 +59,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 All @@ -83,4 +84,4 @@ jobs:

- name: Test
run: cargo run --release -- --access_key ${{secrets.PV_VALID_ACCESS_KEY}} --input_audio_path ../../../res/audio/sample.wav
working-directory: demo/rust/filedemo
working-directory: demo/rust/filedemo
6 changes: 1 addition & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ on:
- 'binding/rust/**'
- 'binding/rust/**/*.rs'
- '!binding/rust/README.md'
- 'lib/beaglebone/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand All @@ -21,8 +19,6 @@ on:
- 'binding/rust/**'
- 'binding/rust/**/*.rs'
- '!binding/rust/README.md'
- 'lib/beaglebone/**'
- 'lib/jetson/**'
- 'lib/linux/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
Expand Down Expand Up @@ -53,4 +49,4 @@ jobs:
run: cargo build --verbose

- name: Rust run tests
run: PV_ACCESS_KEY=${{secrets.PV_VALID_ACCESS_KEY}} cargo test --verbose
run: PV_ACCESS_KEY=${{secrets.PV_VALID_ACCESS_KEY}} cargo test --verbose
4 changes: 2 additions & 2 deletions binding/nodejs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ Cobra is an on-device streaming voice activity detection engine. Cobra is:
- Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64)
- Android and iOS
- Chrome, Safari, Firefox, and Edge
- Raspberry Pi (2, 3, 4, 5) NVIDIA Jetson Nano, and BeagleBone
- Raspberry Pi (3, 4, 5)

## Compatibility

- Node.js 16+
- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (2, 3, 4, 5), NVIDIA Jetson Nano, and BeagleBone.
- 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,6 +1,6 @@
{
"name": "@picovoice/cobra-node",
"version": "2.0.1",
"version": "2.0.2",
"description": "Picovoice Cobra Node.js binding",
"main": "dist/index.js",
"types": "dist/types/index.d.ts",
Expand Down
22 changes: 0 additions & 22 deletions binding/nodejs/src/platforms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,13 @@ const X86_64 = "x64";
const ARM_32 = "arm";
const ARM_64 = "arm64";

const PLATFORM_BEAGLEBONE = "beaglebone";
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_A7 = "cortex-a7";
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 All @@ -52,10 +48,6 @@ SYSTEM_TO_LIBRARY_PATH.set(
`${SYSTEM_LINUX}/${X86_64}`,
`${PLATFORM_LINUX}/x86_64/pv_cobra.node`
);
SYSTEM_TO_LIBRARY_PATH.set(
`${SYSTEM_LINUX}/${ARM_CPU_CORTEX_A7}`,
`${PLATFORM_RASPBERRY_PI}/${ARM_CPU_CORTEX_A7}/pv_cobra.node`
);
SYSTEM_TO_LIBRARY_PATH.set(
`${SYSTEM_LINUX}/${ARM_CPU_CORTEX_A53}`,
`${PLATFORM_RASPBERRY_PI}/${ARM_CPU_CORTEX_A53}/pv_cobra.node`
Expand All @@ -80,14 +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_cobra.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_cobra.node`
);
SYSTEM_TO_LIBRARY_PATH.set(
`${SYSTEM_LINUX}/${PLATFORM_BEAGLEBONE}`,
`${PLATFORM_BEAGLEBONE}/pv_cobra.node`
);
SYSTEM_TO_LIBRARY_PATH.set(
`${SYSTEM_WINDOWS}/${X86_64}`,
`${PLATFORM_WINDOWS}/amd64/pv_cobra.node`
Expand All @@ -111,12 +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;
case "0xc08": return PLATFORM_BEAGLEBONE;
default:
throw new CobraRuntimeError(`Unsupported CPU: '${cpuPart}'`);
}
Expand All @@ -130,12 +111,9 @@ function getLinuxMachine(arch: string): string {

const cpuPart = getCpuPart();
switch (cpuPart) {
case "0xc07": return ARM_CPU_CORTEX_A7 + archInfo;
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;
case "0xc08": return PLATFORM_BEAGLEBONE;
default:
throw new CobraRuntimeError(`Unsupported CPU: '${cpuPart}'`);
}
Expand Down
2 changes: 1 addition & 1 deletion binding/python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Cobra is a highly accurate and lightweight voice activity detection (VAD) engine
## Compatibility

- Python 3.8+
- Runs on Linux (x86_64), macOS (x86_64), Windows (x86_64), Raspberry Pi, NVIDIA Jetson (Nano), and BeagleBone.
- Runs on Linux (x86_64), macOS (x86_64), Windows (x86_64), and Raspberry Pi (3, 4, 5).

## Installation

Expand Down
Loading

0 comments on commit ecf7323

Please sign in to comment.