diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 4b59604c..c5e6d350 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -66,8 +66,6 @@ body: - macOS (x86_64, arm64) - Windows (x86_64) - Raspberry Pi - - NVIDIA Jetson - - BeagleBone - ARM Cortex-M validations: required: true diff --git a/.github/workflows/c-demos.yml b/.github/workflows/c-demos.yml index 6d0e0f92..43821d8b 100644 --- a/.github/workflows/c-demos.yml +++ b/.github/workflows/c-demos.yml @@ -8,17 +8,13 @@ on: - '!demo/c/README.md' - '.github/workflows/c-demos.yml' - 'demo/c/**' - - 'lib/beaglebone/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' - 'resources/.test/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -29,17 +25,13 @@ on: - '!demo/c/README.md' - '.github/workflows/c-demos.yml' - 'demo/c/**' - - 'lib/beaglebone/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' - 'resources/.test/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -73,7 +65,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 @@ -101,7 +93,7 @@ jobs: arch: amd64 - os: macos-latest platform: mac - arch: x86_64 + arch: arm64 steps: - uses: actions/checkout@v3 @@ -130,11 +122,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 @@ -150,12 +139,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 diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml index edfee6b5..195658df 100644 --- a/.github/workflows/dotnet-demos.yml +++ b/.github/workflows/dotnet-demos.yml @@ -59,10 +59,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 - machine: rpi3-32 platform: raspberry-pi - machine: rpi3-64 @@ -73,10 +71,6 @@ jobs: platform: raspberry-pi - machine: rpi5-64 platform: raspberry-pi - - machine: jetson - platform: jetson - - machine: beaglebone - platform: beaglebone steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 54434906..72a30a46 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -7,17 +7,13 @@ on: paths: - 'binding/dotnet/**' - '!binding/dotnet/README.md' - - 'lib/beaglebone/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' - 'resources/.test/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -28,17 +24,13 @@ on: paths: - 'binding/dotnet/**' - '!binding/dotnet/README.md' - - 'lib/beaglebone/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' - 'resources/.test/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -57,7 +49,7 @@ jobs: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest, macos-13, windows-latest] dotnet-version: [2.1.x, 3.0.x, 3.1.x, 5.0.x, 6.0.x] include: - dotnet-version: 2.1.x @@ -75,6 +67,17 @@ jobs: - dotnet-version: 6.0.x binding-framework: net6.0 test-framework: net6.0 + exclude: + - os: macos-latest + dotnet-version: 2.1.x + - os: macos-latest + dotnet-version: 3.0.x + - os: macos-latest + dotnet-version: 3.1.x + - os: macos-latest + dotnet-version: 5.0.x + - os: macos-13 + dotnet-version: 6.0.x steps: - uses: actions/checkout@v3 @@ -97,7 +100,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 diff --git a/.github/workflows/go-demos.yml b/.github/workflows/go-demos.yml index 3dd51d7c..85244f78 100644 --- a/.github/workflows/go-demos.yml +++ b/.github/workflows/go-demos.yml @@ -64,10 +64,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 - machine: rpi3-32 platform: raspberry-pi - machine: rpi3-64 @@ -78,10 +76,6 @@ jobs: platform: raspberry-pi - machine: rpi5-64 platform: raspberry-pi - - machine: jetson - platform: jetson - - machine: beaglebone - platform: beaglebone steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 4fadad18..df517311 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -7,17 +7,13 @@ on: paths: - 'binding/go/**' - '!binding/go/README.md' - - 'lib/beaglebone/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' - 'resources/.test/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -28,17 +24,13 @@ on: paths: - 'binding/go/**' - '!binding/go/README.md' - - 'lib/beaglebone/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' - 'resources/.test/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -56,7 +48,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - go: [ '1.16', '1.17', '1.18', '1.19', '1.20', 'stable' ] + go: [ '1.16', '1.17', '1.18', '1.19', '1.20' ] steps: - uses: actions/checkout@v3 @@ -76,7 +68,7 @@ jobs: run: ./copy.sh - name: Install dependencies - run: go get + run: go install - name: Build run: go build @@ -89,7 +81,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 @@ -98,7 +90,7 @@ jobs: run: ./copy.sh - name: Install dependencies - run: go get + run: go install - name: Build run: go build diff --git a/.github/workflows/java-demos.yml b/.github/workflows/java-demos.yml index cd222d65..9db71c87 100644 --- a/.github/workflows/java-demos.yml +++ b/.github/workflows/java-demos.yml @@ -54,10 +54,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 - machine: rpi3-32 platform: raspberry-pi - machine: rpi3-64 @@ -68,10 +66,6 @@ jobs: platform: raspberry-pi - machine: rpi5-64 platform: raspberry-pi - - machine: jetson - platform: jetson - - machine: beaglebone - platform: beaglebone steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/java-perf.yml b/.github/workflows/java-perf.yml index a5e3984a..b4a5b19d 100644 --- a/.github/workflows/java-perf.yml +++ b/.github/workflows/java-perf.yml @@ -9,8 +9,6 @@ on: - 'binding/java/**/RhinoPerformanceTest.java' - 'lib/common/**' - 'lib/java/**' - - 'resources/contexts/beaglebone/**' - - 'resources/contexts/jetson/**' - 'resources/contexts/linux/**' - 'resources/contexts/mac/**' - 'resources/contexts/raspberry-pi/**' @@ -22,8 +20,6 @@ on: - 'binding/java/**/RhinoPerformanceTest.java' - 'lib/common/**' - 'lib/java/**' - - 'resources/contexts/beaglebone/**' - - 'resources/contexts/jetson/**' - 'resources/contexts/linux/**' - 'resources/contexts/mac/**' - 'resources/contexts/raspberry-pi/**' @@ -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: 20 - performance_threshold_sec: 2.1 - machine: rpi3-32 num_test_iterations: 50 performance_threshold_sec: 0.7 @@ -90,12 +83,6 @@ jobs: - machine: rpi5-64 num_test_iterations: 50 performance_threshold_sec: 0.3 - - machine: jetson - num_test_iterations: 50 - performance_threshold_sec: 0.6 - - machine: beaglebone - num_test_iterations: 20 - performance_threshold_sec: 5.0 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 3534861a..728cf643 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -11,8 +11,6 @@ on: - 'lib/common/**' - 'lib/java/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -27,8 +25,6 @@ on: - 'lib/common/**' - 'lib/java/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -67,7 +63,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 diff --git a/.github/workflows/nodejs-demos.yml b/.github/workflows/nodejs-demos.yml index 9a646bc8..243e4b2d 100644 --- a/.github/workflows/nodejs-demos.yml +++ b/.github/workflows/nodejs-demos.yml @@ -57,10 +57,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 - machine: rpi3-32 platform: raspberry-pi - machine: rpi3-64 @@ -71,10 +69,6 @@ jobs: platform: raspberry-pi - machine: rpi5-64 platform: raspberry-pi - - machine: jetson - platform: jetson - - machine: beaglebone - platform: beaglebone steps: - uses: actions/checkout@v3 @@ -83,4 +77,4 @@ jobs: run: yarn install - name: Test - run: yarn file -a ${{secrets.PV_VALID_ACCESS_KEY}} -i ../../resources/audio_samples/multiple_keywords.wav -c ../../resources/contexts/${{ matrix.platform }}/coffee_maker_${{ matrix.platform }}.rhn \ No newline at end of file + run: yarn file -a ${{secrets.PV_VALID_ACCESS_KEY}} -i ../../resources/audio_samples/multiple_keywords.wav -c ../../resources/contexts/${{ matrix.platform }}/coffee_maker_${{ matrix.platform }}.rhn diff --git a/.github/workflows/nodejs-perf.yml b/.github/workflows/nodejs-perf.yml index 77d46857..271c67d9 100644 --- a/.github/workflows/nodejs-perf.yml +++ b/.github/workflows/nodejs-perf.yml @@ -8,8 +8,6 @@ on: - '.github/workflows/nodejs-perf.yml' - 'lib/node/**' - 'lib/common/**' - - 'resources/contexts/beaglebone/**' - - 'resources/contexts/jetson/**' - 'resources/contexts/linux/**' - 'resources/contexts/mac/**' - 'resources/contexts/raspberry-pi/**' @@ -20,8 +18,6 @@ on: - '.github/workflows/nodejs-perf.yml' - 'lib/node/**' - 'lib/common/**' - - 'resources/contexts/beaglebone/**' - - 'resources/contexts/jetson/**' - 'resources/contexts/linux/**' - 'resources/contexts/mac/**' - 'resources/contexts/raspberry-pi/**' @@ -65,11 +61,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 - num_test_iterations: 20 - performance_threshold_sec: 2.3 - machine: rpi3-32 num_test_iterations: 50 performance_threshold_sec: 0.6 @@ -85,12 +78,6 @@ jobs: - machine: rpi5-64 num_test_iterations: 50 performance_threshold_sec: 0.16 - - machine: jetson - num_test_iterations: 50 - performance_threshold_sec: 0.42 - - machine: beaglebone - num_test_iterations: 20 - performance_threshold_sec: 4.0 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index f467c166..96e1ee8f 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -11,8 +11,6 @@ on: - 'lib/common/**' - 'lib/node/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -27,8 +25,6 @@ on: - 'lib/common/**' - 'lib/node/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -67,7 +63,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 diff --git a/.github/workflows/python-demos.yml b/.github/workflows/python-demos.yml index 6aa13265..781bf10d 100644 --- a/.github/workflows/python-demos.yml +++ b/.github/workflows/python-demos.yml @@ -57,10 +57,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 - machine: rpi3-32 platform: raspberry-pi - machine: rpi3-64 @@ -71,10 +69,6 @@ jobs: platform: raspberry-pi - machine: rpi5-64 platform: raspberry-pi - - machine: jetson - platform: jetson - - machine: beaglebone - platform: beaglebone steps: - uses: actions/checkout@v3 @@ -83,4 +77,4 @@ jobs: run: pip3 install -r requirements.txt - name: Test - run: python3 rhino_demo_file.py --access_key ${{secrets.PV_VALID_ACCESS_KEY}} --wav_path ../../resources/audio_samples/test_within_context.wav --context_path ../../resources/contexts/${{ matrix.platform }}/coffee_maker_${{ matrix.platform }}.rhn \ No newline at end of file + run: python3 rhino_demo_file.py --access_key ${{secrets.PV_VALID_ACCESS_KEY}} --wav_path ../../resources/audio_samples/test_within_context.wav --context_path ../../resources/contexts/${{ matrix.platform }}/coffee_maker_${{ matrix.platform }}.rhn diff --git a/.github/workflows/python-perf.yml b/.github/workflows/python-perf.yml index d41e7d95..ea585641 100644 --- a/.github/workflows/python-perf.yml +++ b/.github/workflows/python-perf.yml @@ -5,15 +5,11 @@ on: push: branches: [ master ] paths: - - 'lib/beaglebone/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' - - 'resources/contexts/beaglebone/**' - - 'resources/contexts/jetson/**' - 'resources/contexts/linux/**' - 'resources/contexts/mac/**' - 'resources/contexts/raspberry-pi/**' @@ -23,15 +19,11 @@ on: pull_request: branches: [ master, 'v[0-9]+.[0-9]+' ] paths: - - 'lib/beaglebone/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' - - 'resources/contexts/beaglebone/**' - - 'resources/contexts/jetson/**' - 'resources/contexts/linux/**' - 'resources/contexts/mac/**' - 'resources/contexts/raspberry-pi/**' @@ -76,11 +68,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 - performance_threshold_sec: 2.6 - machine: rpi3-32 num_test_iterations: 50 performance_threshold_sec: 0.72 @@ -96,12 +85,6 @@ jobs: - machine: rpi5-64 num_test_iterations: 50 performance_threshold_sec: 0.1 - - machine: jetson - num_test_iterations: 50 - performance_threshold_sec: 0.6 - - machine: beaglebone - num_test_iterations: 20 - performance_threshold_sec: 3.0 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 9e3b8139..551ae788 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -7,16 +7,12 @@ on: paths: - 'binding/python/**' - '!binding/python/README.md' - - 'lib/beaglebone/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -28,16 +24,12 @@ on: paths: - 'binding/python/**' - '!binding/python/README.md' - - 'lib/beaglebone/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -78,7 +70,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 diff --git a/.github/workflows/rust-demos.yml b/.github/workflows/rust-demos.yml index 57936ed2..a1605979 100644 --- a/.github/workflows/rust-demos.yml +++ b/.github/workflows/rust-demos.yml @@ -21,6 +21,7 @@ env: defaults: run: working-directory: demo/rust + shell: bash jobs: build-github-hosted: @@ -68,7 +69,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 @@ -80,8 +81,6 @@ jobs: platform: raspberry-pi - machine: rpi5-64 platform: raspberry-pi - - machine: jetson - platform: jetson steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 04fa5768..4a56244f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -9,16 +9,12 @@ on: - 'binding/rust/**' - 'binding/rust/**/*.rs' - '!binding/rust/README.md' - - 'lib/beaglebone/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -31,16 +27,12 @@ on: - 'binding/rust/**' - 'binding/rust/**/*.rs' - '!binding/rust/README.md' - - 'lib/beaglebone/**' - 'lib/common/**' - - 'lib/jetson/**' - 'lib/linux/**' - 'lib/mac/**' - 'lib/raspberry-pi/**' - 'lib/windows/**' - 'resources/audio_samples/**' - - 'resources/contexts*/beaglebone/**' - - 'resources/contexts*/jetson/**' - 'resources/contexts*/linux/**' - 'resources/contexts*/mac/**' - 'resources/contexts*/raspberry-pi/**' @@ -91,7 +83,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 diff --git a/README.md b/README.md index c5f6b76d..46ee534c 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Rhino is: - compact and computationally-efficient. It is perfect for IoT. - cross-platform: - Arm Cortex-M, STM32, Arduino, and i.MX RT - - Raspberry Pi, NVIDIA Jetson Nano, and BeagleBone + - Raspberry Pi - Android and iOS - Chrome, Safari, Firefox, and Edge - Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64) @@ -477,7 +477,7 @@ At the root of the repository, build with: cmake -S demo/c/. -B demo/c/build && cmake --build demo/c/build --target rhino_demo_mic ``` -##### Linux (x86_64), macOS (x86_64, arm64), Raspberry Pi, BeagleBone, and Jetson +##### Linux (x86_64), macOS (x86_64, arm64), and Raspberry Pi List input audio devices with: @@ -494,7 +494,7 @@ Run the demo using: ``` Replace `${LIBRARY_PATH}` with path to appropriate library available under [lib](/lib), `${PLATFORM}` with the -name of the platform you are running on (`linux`, `raspberry-pi`, `mac`, `beaglebone`, or `jetson`), `${AUDIO_DEVICE_INDEX}` with +name of the platform you are running on (`linux`, `raspberry-pi`, or `mac`), `${AUDIO_DEVICE_INDEX}` with the index of your audio device and `${ACCESS_KEY}` with your Picovoice AccessKey. ##### Windows @@ -526,7 +526,7 @@ At the root of the repository, build with: cmake -S demo/c/. -B demo/c/build && cmake --build demo/c/build --target rhino_demo_file ``` -##### Linux (x86_64), macOS (x86_64, arm64), Raspberry Pi, BeagleBone, and Jetson +##### Linux (x86_64), macOS (x86_64, arm64), and Raspberry Pi Run the demo using: @@ -537,7 +537,7 @@ Run the demo using: ``` Replace `${LIBRARY_PATH}` with path to appropriate library available under [lib](/lib), `${PLATFORM}` with the -name of the platform you are running on (`linux`, `raspberry-pi`, `mac`, `beaglebone`, or `jetson`) and `${ACCESS_KEY}` +name of the platform you are running on (`linux`, `raspberry-pi`, or `mac`) and `${ACCESS_KEY}` with your Picovoice AccessKey. ##### Windows diff --git a/binding/dotnet/README.md b/binding/dotnet/README.md index da829164..5e5f2f2c 100644 --- a/binding/dotnet/README.md +++ b/binding/dotnet/README.md @@ -40,12 +40,9 @@ Platforms compatible with .NET Core 2.0+: Platforms compatible with .NET Core 3.0+: - Raspberry Pi: - - 2 - 3 (32 and 64 bit) - 4 (32 and 64 bit) - 5 (32 and 64 bit) -- NVIDIA Jetson Nano -- BeagleBone Platform compatible with .NET 6.0+: diff --git a/binding/dotnet/Rhino/Rhino.csproj b/binding/dotnet/Rhino/Rhino.csproj index 7738f111..8dabec86 100644 --- a/binding/dotnet/Rhino/Rhino.csproj +++ b/binding/dotnet/Rhino/Rhino.csproj @@ -2,7 +2,7 @@ net6.0;netcoreapp3.0;netstandard2.0 - 3.0.2 + 3.0.3 Picovoice Rhino Speech-to-Intent Engine @@ -21,10 +21,10 @@ Rhino is: - using deep neural networks trained in real-world environments. - compact and computationally-efficient, making it perfect for IoT. - - cross-platform. It is implemented in fixed-point ANSI C. Raspberry Pi (all variants), - Beagle Bone, Android, iOS, Linux (x86_64), Mac (x86_64), Windows (x86_64), and - web browsers are supported. Furthermore, Support for various ARM Cortex-A - microprocessors and ARM Cortex-M microcontrollers is available for enterprise customers. + - cross-platform. It is implemented in fixed-point ANSI C. Raspberry Pi (Zero, 3, 4, 5), + Android, iOS, Linux (x86_64), Mac (x86_64), Windows (x86_64), and web browsers are supported. + Furthermore, Support for various ARM Cortex-A microprocessors and ARM Cortex-M microcontrollers + is available for enterprise customers. - self-service. Developers and UX designers can train custom models using Picovoice Console. true @@ -93,24 +93,6 @@ lib\raspberry-pi\%(RecursiveDir)%(Filename)%(Extension) false - - - build/netcoreapp3.0/lib/jetson/cortex-a57-aarch64/libpv_rhino.so; - build/net6.0/lib/jetson/cortex-a57-aarch64/libpv_rhino.so; - - PreserveNewest - lib\jetson\cortex-a57-aarch64\libpv_rhino.so - false - - - - build/netcoreapp3.0/lib/beaglebone/libpv_rhino.so; - build/net6.0/lib/beaglebone/libpv_rhino.so; - - PreserveNewest - lib\beaglebone\libpv_rhino.so - false - diff --git a/binding/dotnet/Rhino/Utils.cs b/binding/dotnet/Rhino/Utils.cs index 3412d067..eb3aea33 100644 --- a/binding/dotnet/Rhino/Utils.cs +++ b/binding/dotnet/Rhino/Utils.cs @@ -71,12 +71,9 @@ public static string PvLinuxMachine() string cpuPart = GetCpuPart(); switch (cpuPart) { - case "0xc07": return "cortex-a7" + archInfo; case "0xd03": return "cortex-a53" + archInfo; - case "0xd07": return "cortex-a57" + archInfo; case "0xd08": return "cortex-a72" + archInfo; case "0xd0b": return "cortex-a76" + archInfo; - case "0xc08": return ""; default: throw new PlatformNotSupportedException($"This device (CPU part = {cpuPart}) is not supported by Picovoice."); } @@ -87,12 +84,9 @@ public static string PvLinuxEnv() string cpuPart = GetCpuPart(); switch (cpuPart) { - case "0xc07": case "0xd03": case "0xd08": case "0xd0b": return "raspberry-pi"; - case "0xd07": return "jetson"; - case "0xc08": return "beaglebone"; default: throw new PlatformNotSupportedException($"This device (CPU part = {cpuPart}) is not supported by Picovoice."); } diff --git a/binding/dotnet/RhinoTest/MainTest.cs b/binding/dotnet/RhinoTest/MainTest.cs index f6ed35ee..b3c8323f 100644 --- a/binding/dotnet/RhinoTest/MainTest.cs +++ b/binding/dotnet/RhinoTest/MainTest.cs @@ -373,12 +373,9 @@ public static string PvLinuxEnv() switch (cpuPart) { - case "0xc07": case "0xd03": case "0xd08": case "0xd0b": return "raspberry-pi"; - case "0xd07": return "jetson"; - case "0xc08": return "beaglebone"; default: throw new PlatformNotSupportedException($"This device (CPU part = {cpuPart}) is not supported by Picovoice."); } diff --git a/binding/dotnet/RhinoTest/RhinoTest.csproj b/binding/dotnet/RhinoTest/RhinoTest.csproj index 48852279..50c31040 100644 --- a/binding/dotnet/RhinoTest/RhinoTest.csproj +++ b/binding/dotnet/RhinoTest/RhinoTest.csproj @@ -37,14 +37,6 @@ resources\contexts\raspberry-pi\%(Filename)%(Extension) PreserveNewest - - resources\contexts\beaglebone\%(Filename)%(Extension) - PreserveNewest - - - resources\contexts\jetson\%(Filename)%(Extension) - PreserveNewest - diff --git a/binding/go/README.md b/binding/go/README.md index 29e9e8f9..7524c9ab 100644 --- a/binding/go/README.md +++ b/binding/go/README.md @@ -30,7 +30,7 @@ Rhino is: ## Compatibility - Go 1.16+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi, NVIDIA Jetson (Nano) and BeagleBone +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi - **Windows**: The Go binding requires `cgo`, which means that you need to install a gcc compiler like [Mingw](http://mingw-w64.org/) to build it properly. - Go versions less than `1.20` requires `gcc` version `11` or lower. diff --git a/binding/go/copy.sh b/binding/go/copy.sh index f3614f64..703c79fd 100755 --- a/binding/go/copy.sh +++ b/binding/go/copy.sh @@ -14,10 +14,4 @@ cp ../../lib/windows/amd64/libpv_rhino.dll ./embedded/lib/windows/amd64/libpv_rh echo "Copying RPi libs..." cp -rp ../../lib/raspberry-pi/* ./embedded/lib/raspberry-pi -echo "Copying Jetson lib..." -cp ../../lib/jetson/cortex-a57-aarch64/libpv_rhino.so ./embedded/lib/jetson/cortex-a57-aarch64/libpv_rhino.so - -echo "Copying BeagleBone lib..." -cp ../../lib/beaglebone/libpv_rhino.so ./embedded/lib/beaglebone/libpv_rhino.so - -echo "Copy complete!" \ No newline at end of file +echo "Copy complete!" diff --git a/binding/go/embedded/lib/beaglebone/libpv_rhino.so b/binding/go/embedded/lib/beaglebone/libpv_rhino.so deleted file mode 100755 index 6144f5d4..00000000 Binary files a/binding/go/embedded/lib/beaglebone/libpv_rhino.so and /dev/null differ diff --git a/binding/go/embedded/lib/jetson/cortex-a57-aarch64/libpv_rhino.so b/binding/go/embedded/lib/jetson/cortex-a57-aarch64/libpv_rhino.so deleted file mode 100755 index daf43f04..00000000 Binary files a/binding/go/embedded/lib/jetson/cortex-a57-aarch64/libpv_rhino.so and /dev/null differ diff --git a/binding/go/rhino.go b/binding/go/rhino.go index 9c642d2d..ceb195c4 100644 --- a/binding/go/rhino.go +++ b/binding/go/rhino.go @@ -502,18 +502,12 @@ func getLinuxDetails() (string, string) { switch cpuPart { case "0xb76": return "raspberry-pi", "arm11" - case "0xc07": - return "raspberry-pi", "cortex-a7" case "0xd03": return "raspberry-pi", "cortex-a53" + archInfo - case "0xd07": - return "jetson", "cortex-a57" + archInfo case "0xd08": return "raspberry-pi", "cortex-a72" + archInfo case "0xd0b": return "raspberry-pi", "cortex-a76" + archInfo - case "0xc08": - return "beaglebone", "" default: log.Fatalf("Unsupported CPU:\n%s", cpuPart) return "", "" diff --git a/binding/go/rhino_test.go b/binding/go/rhino_test.go index 499b182f..3bd1f7a1 100644 --- a/binding/go/rhino_test.go +++ b/binding/go/rhino_test.go @@ -317,4 +317,4 @@ func TestProcessMessageStack(t *testing.T) { if delErr != nil { t.Fatalf("%v", delErr) } -} +} \ No newline at end of file diff --git a/binding/java/README.md b/binding/java/README.md index 3a84c64b..63d690c8 100644 --- a/binding/java/README.md +++ b/binding/java/README.md @@ -29,9 +29,7 @@ Rhino is: - Linux (x86_64) - macOS (x86_64, arm64) - Windows (x86_64) -- Raspberry Pi 2, Raspberry Pi 3 (32 and 64 bit), Raspberry Pi 4 (32 and 64 bit), Raspberry Pi 5 (32 and 64 bit) -- Jetson Nano -- BeagleBone +- Raspberry Pi 3 (32 and 64 bit), Raspberry Pi 4 (32 and 64 bit), Raspberry Pi 5 (32 and 64 bit) ## Installation diff --git a/binding/java/build.gradle b/binding/java/build.gradle index d2b135a2..138c2b1b 100644 --- a/binding/java/build.gradle +++ b/binding/java/build.gradle @@ -7,7 +7,7 @@ plugins { ext { PUBLISH_GROUP_ID = 'ai.picovoice' - PUBLISH_VERSION = '3.0.2' + PUBLISH_VERSION = '3.0.3' PUBLISH_ARTIFACT_ID = 'rhino-java' } @@ -54,8 +54,7 @@ task copyWindowsLib(type: Copy) { } task copyRPiLib(type: Copy) { from('../../lib/java/raspberry-pi/') - include('cortex-a7/libpv_rhino_jni.so', - 'cortex-a53/libpv_rhino_jni.so', + include('cortex-a53/libpv_rhino_jni.so', 'cortex-a53-aarch64/libpv_rhino_jni.so', 'cortex-a72/libpv_rhino_jni.so', 'cortex-a72-aarch64/libpv_rhino_jni.so', @@ -63,21 +62,13 @@ task copyRPiLib(type: Copy) { 'cortex-a76-aarch64/libpv_rhino_jni.so') into("${outputDir}/rhino/lib/java/raspberry-pi/") } -task copyJetsonLib(type: Copy) { - from('../../lib/java/jetson/cortex-a57-aarch64/libpv_rhino_jni.so') into "${outputDir}/rhino/lib/java/jetson/cortex-a57-aarch64/" -} -task copyBeagleboneLib(type: Copy) { - from('../../lib/java/beaglebone/libpv_rhino_jni.so') into "${outputDir}/rhino/lib/java/beaglebone/" -} task copyTasks(type: GradleBuild) { tasks = ['copyDefaultModel', 'copyLinuxLib', 'copyMacLib', 'copyWindowsLib', - 'copyRPiLib', - 'copyJetsonLib', - 'copyBeagleboneLib'] + 'copyRPiLib'] } jar { diff --git a/binding/java/src/ai/picovoice/rhino/Utils.java b/binding/java/src/ai/picovoice/rhino/Utils.java index cfe64158..d068e7a4 100644 --- a/binding/java/src/ai/picovoice/rhino/Utils.java +++ b/binding/java/src/ai/picovoice/rhino/Utils.java @@ -130,15 +130,10 @@ public static String getEnvironmentName() throws RuntimeException { if (arch.equals("arm") || arch.equals("aarch64")) { String cpuPart = getCpuPart(); switch (cpuPart) { - case "0xc07": case "0xd03": case "0xd08": case "0xd0b": return "raspberry-pi"; - case "0xd07": - return "jetson"; - case "0xc08": - return "beaglebone"; default: throw new RuntimeException(String.format("Execution environment not supported. " + "Rhino Java does not support CPU Part (%s).", cpuPart)); @@ -170,23 +165,17 @@ private static String getArchitecture() throws RuntimeException { if (isX86_64) { return "x86_64"; } - } else if (isArm) { // RPI, Beaglebone, etc.. + } else if (isArm) { // RPI String cpuPart = getCpuPart(); String archInfo = (arch.equals("aarch64")) ? "-aarch64" : ""; switch (cpuPart) { - case "0xc07": - return "cortex-a7" + archInfo; case "0xd03": return "cortex-a53" + archInfo; - case "0xd07": - return "cortex-a57" + archInfo; case "0xd08": return "cortex-a72" + archInfo; case "0xd0b": return "cortex-a76" + archInfo; - case "0xc08": - return ""; default: throw new RuntimeException( String.format("Environment (%s) with CPU Part (%s) is not supported by Porcupine.", @@ -227,8 +216,6 @@ public static String getPackagedLibraryPath() { return RESOURCE_DIRECTORY.resolve("lib/java/mac") .resolve(ARCHITECTURE) .resolve("libpv_rhino_jni.dylib").toString(); - case "jetson": - case "beaglebone": case "raspberry-pi": case "linux": return RESOURCE_DIRECTORY.resolve("lib/java") diff --git a/binding/nodejs/README.md b/binding/nodejs/README.md index 34657028..b911766b 100644 --- a/binding/nodejs/README.md +++ b/binding/nodejs/README.md @@ -34,9 +34,7 @@ This binding is for running Rhino on **NodeJS 12+** on the following platforms: - Windows (x86_64) - Linux (x86_64) - macOS (x86_64, arm64) -- Raspberry Pi (2, 3, 4, 5) -- NVIDIA Jetson (Nano) -- BeagleBone +- Raspberry Pi (3, 4, 5) ### Web Browsers diff --git a/binding/nodejs/package.json b/binding/nodejs/package.json index d2364d77..e713f5ff 100644 --- a/binding/nodejs/package.json +++ b/binding/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@picovoice/rhino-node", - "version": "3.0.4", + "version": "3.0.5", "description": "Picovoice Rhino Node.js binding", "main": "dist/index.js", "types": "dist/types/index.d.ts", diff --git a/binding/nodejs/src/platforms.ts b/binding/nodejs/src/platforms.ts index 71b8b3b0..c54a9c29 100644 --- a/binding/nodejs/src/platforms.ts +++ b/binding/nodejs/src/platforms.ts @@ -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'; @@ -58,10 +54,6 @@ SYSTEM_TO_LIBRARY_PATH.set( `${SYSTEM_LINUX}/${X86_64}`, `${PLATFORM_LINUX}/x86_64/pv_rhino.node` ); -SYSTEM_TO_LIBRARY_PATH.set( - `${SYSTEM_LINUX}/${ARM_CPU_CORTEX_A7}`, - `${PLATFORM_RASPBERRY_PI}/${ARM_CPU_CORTEX_A7}/pv_rhino.node` -); SYSTEM_TO_LIBRARY_PATH.set( `${SYSTEM_LINUX}/${ARM_CPU_CORTEX_A53}`, `${PLATFORM_RASPBERRY_PI}/${ARM_CPU_CORTEX_A53}/pv_rhino.node` @@ -86,14 +78,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_rhino.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_rhino.node` -); -SYSTEM_TO_LIBRARY_PATH.set( - `${SYSTEM_LINUX}/${PLATFORM_BEAGLEBONE}`, - `${PLATFORM_BEAGLEBONE}/pv_rhino.node` -); SYSTEM_TO_LIBRARY_PATH.set( `${SYSTEM_WINDOWS}/${X86_64}`, `${PLATFORM_WINDOWS}/amd64/pv_rhino.node` @@ -117,15 +101,10 @@ 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 RhinoRuntimeError(`Unsupported CPU: '${cpuPart}'`); } @@ -139,18 +118,12 @@ 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 RhinoRuntimeError(`Unsupported CPU: '${cpuPart}'`); } diff --git a/binding/python/README.md b/binding/python/README.md index e7ab5688..1bcd01fb 100644 --- a/binding/python/README.md +++ b/binding/python/README.md @@ -30,7 +30,7 @@ Rhino is: ## Compatibility - Python 3.8+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (all variants), and BeagleBone. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (Zero, 3, 4, 5). ## Installation diff --git a/binding/python/_util.py b/binding/python/_util.py index acc6a8ce..e987a7df 100644 --- a/binding/python/_util.py +++ b/binding/python/_util.py @@ -40,18 +40,12 @@ def _pv_linux_machine(machine): if '0xb76' == cpu_part: return 'arm11' - elif '0xc07' == cpu_part: - return 'cortex-a7' elif '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: return "cortex-a76" + arch_info - elif '0xc08' == cpu_part: - return 'beaglebone' elif machine == 'armv7l': log.warning( 'WARNING: Please be advised that this device (CPU part = %s) is not officially supported by Picovoice. ' @@ -78,14 +72,12 @@ def _pv_platform(): RASPBERRY_PI_MACHINES = { "arm11", - "cortex-a7", "cortex-a53", "cortex-a72", "cortex-a76", "cortex-a53-aarch64", "cortex-a72-aarch64", "cortex-a76-aarch64"} -JETSON_MACHINES = {'cortex-a57-aarch64'} def pv_library_path(relative_path): @@ -97,18 +89,11 @@ def pv_library_path(relative_path): elif PV_SYSTEM == 'Linux': if PV_MACHINE == 'x86_64': return os.path.join(os.path.dirname(__file__), relative_path, 'lib/linux/x86_64/libpv_rhino.so') - elif PV_MACHINE in JETSON_MACHINES: - return os.path.join( - os.path.dirname(__file__), - relative_path, - 'lib/jetson/%s/libpv_rhino.so' % PV_MACHINE) elif PV_MACHINE in RASPBERRY_PI_MACHINES: return os.path.join( os.path.dirname(__file__), relative_path, 'lib/raspberry-pi/%s/libpv_rhino.so' % PV_MACHINE) - elif PV_MACHINE == 'beaglebone': - return os.path.join(os.path.dirname(__file__), relative_path, 'lib/beaglebone/libpv_rhino.so') elif PV_SYSTEM == 'Windows': return os.path.join(os.path.dirname(__file__), relative_path, 'lib/windows/amd64/libpv_rhino.dll') diff --git a/binding/python/setup.py b/binding/python/setup.py index 8f58d245..a7391b53 100644 --- a/binding/python/setup.py +++ b/binding/python/setup.py @@ -15,7 +15,7 @@ shutil.copy(os.path.join(os.path.dirname(__file__), '_factory.py'), os.path.join(package_folder, '_factory.py')) shutil.copy(os.path.join(os.path.dirname(__file__), '_util.py'), os.path.join(package_folder, '_util.py')) -platforms = ('beaglebone', 'jetson', 'linux', 'mac', 'raspberry-pi', 'windows') +platforms = ('linux', 'mac', 'raspberry-pi', 'windows') os.mkdir(os.path.join(package_folder, 'lib')) for platform in ('common',) + platforms: @@ -30,8 +30,6 @@ include pvrhino/_factory.py include pvrhino/_util.py include pvrhino/lib/common/rhino_params.pv -include pvrhino/lib/beaglebone/libpv_rhino.so -recursive-include pvrhino/lib/jetson * include pvrhino/lib/linux/x86_64/libpv_rhino.so include pvrhino/lib/mac/x86_64/libpv_rhino.dylib include pvrhino/lib/mac/arm64/libpv_rhino.dylib @@ -47,7 +45,7 @@ setuptools.setup( name="pvrhino", - version="3.0.2", + version="3.0.3", author="Picovoice", author_email="hello@picovoice.ai", description="Rhino Speech-to-Intent engine.", diff --git a/binding/python/test_util.py b/binding/python/test_util.py index 983ce949..592410ff 100644 --- a/binding/python/test_util.py +++ b/binding/python/test_util.py @@ -63,12 +63,8 @@ def pv_context_platform(): elif PV_SYSTEM == 'Linux': if PV_MACHINE == 'x86_64': return 'linux' - elif PV_MACHINE in JETSON_MACHINES: - return 'jetson' elif PV_MACHINE in RASPBERRY_PI_MACHINES: return 'raspberry-pi' - elif PV_MACHINE == 'beaglebone': - return 'beaglebone' elif PV_SYSTEM == 'Windows': return 'windows' diff --git a/binding/rust/Cargo.toml b/binding/rust/Cargo.toml index 3d72102f..9ea1015d 100644 --- a/binding/rust/Cargo.toml +++ b/binding/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pv_rhino" -version = "3.0.2" +version = "3.0.3" edition = "2018" description = "The Rust bindings for Picovoice's Rhino library" license = "Apache-2.0" diff --git a/binding/rust/README.md b/binding/rust/README.md index 43983436..0219affa 100644 --- a/binding/rust/README.md +++ b/binding/rust/README.md @@ -30,7 +30,7 @@ Rhino is: ## Compatibility - Rust 1.54+ -- 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 ## Installation First you will need [Rust and Cargo](https://rustup.rs/) installed on your system. diff --git a/binding/rust/copy.sh b/binding/rust/copy.sh index 7528cbfa..917f5439 100755 --- a/binding/rust/copy.sh +++ b/binding/rust/copy.sh @@ -12,7 +12,7 @@ echo "Copying Model File ..." cp -r ../../lib/common/rhino_params.pv ./data/lib/common/ -for platform in beaglebone jetson linux mac raspberry-pi windows +for platform in linux mac raspberry-pi windows do echo "Copying Library Files for $platform ..." cp -r ../../lib/$platform ./data/lib/ diff --git a/binding/rust/src/util.rs b/binding/rust/src/util.rs index aeac5698..b96384d5 100644 --- a/binding/rust/src/util.rs +++ b/binding/rust/src/util.rs @@ -16,9 +16,7 @@ const DEFAULT_RELATIVE_LIBRARY_DIR: &str = "lib/"; const DEFAULT_RELATIVE_MODEL_PATH: &str = "lib/common/rhino_params.pv"; #[allow(dead_code)] -const JETSON_MACHINES: &[&str] = &["cortex-a57"]; -#[allow(dead_code)] -const RPI_MACHINES: &[&str] = &["arm11", "cortex-a7", "cortex-a53", "cortex-a72", "cortex-a76"]; +const RPI_MACHINES: &[&str] = &["arm11", "cortex-a53", "cortex-a72", "cortex-a76"]; #[cfg(all(target_os = "linux", any(target_arch = "arm", target_arch = "aarch64")))] fn find_machine_type() -> String { @@ -47,12 +45,9 @@ fn find_machine_type() -> String { let machine = match cpu_part.as_str() { "0xb76" => "arm11", - "0xc07" => "cortex-a7", "0xd03" => "cortex-a53", - "0xd07" => "cortex-a57", "0xd08" => "cortex-a72", "0xd0b" => "cortex-a76", - "0xc08" => "beaglebone", _ => "unsupported", }; @@ -90,10 +85,6 @@ fn base_library_path() -> PathBuf { PathBuf::from(format!("raspberry-pi/{}/libpv_rhino.so", &machine)) } } - machine if JETSON_MACHINES.contains(&machine) => { - PathBuf::from("jetson/cortex-a57-aarch64/libpv_rhino.so") - } - "beaglebone" => PathBuf::from("beaglebone/libpv_rhino.so"), _ => { eprintln!("WARNING: Please be advised that this device is not officially supported by Picovoice.\nFalling back to the armv6-based (Raspberry Pi Zero) library. This is not tested nor optimal.\nFor the model, use Raspberry Pi's models"); PathBuf::from("raspberry-pi/arm11/libpv_rhino.so") @@ -136,10 +127,19 @@ pub fn pv_platform() -> String { let machine = find_machine_type(); match machine.as_str() { machine if RPI_MACHINES.contains(&machine) => String::from("raspberry-pi"), - machine if JETSON_MACHINES.contains(&machine) => String::from("jetson"), - "beaglebone" => String::from("beaglebone"), _ => { panic!("ERROR: Please be advised that this device is not officially supported by Picovoice"); } } } + +#[cfg(all(target_os = "linux", any(target_arch = "arm", target_arch = "aarch64")))] +pub fn platform() -> String { + let machine = find_machine_type(); + match machine.as_str() { + machine if RPI_MACHINES.contains(&machine) => String::from("raspberry-pi"), + _ => { + panic!("ERROR: Please be advised that this device is not officially supported"); + } + } +} diff --git a/demo/c/CMakeLists.txt b/demo/c/CMakeLists.txt index 1daff754..6d09c310 100644 --- a/demo/c/CMakeLists.txt +++ b/demo/c/CMakeLists.txt @@ -24,7 +24,7 @@ target_include_directories(rhino_demo_file PRIVATE dr_libs) if (NOT WIN32) target_link_libraries(rhino_demo_mic ${COMMON_LIBS} ${MIC_LIBS}) target_link_libraries(rhino_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(rhino_demo_mic atomic) endif() -endif() \ No newline at end of file +endif() diff --git a/demo/c/README.md b/demo/c/README.md index ef7dfacd..4a77a74f 100644 --- a/demo/c/README.md +++ b/demo/c/README.md @@ -32,7 +32,7 @@ cmake -S demo/c/. -B demo/c/build -G "MinGW Makefiles" && cmake --build demo/c/b Running the executable without any commandline arguments prints the usage info to the console. -#### Linux, macOS, Raspberry Pi, BeagleBone, Jetson +#### Linux, macOS, Raspberry Pi ```console ./demo/c/build/rhino_demo_mic @@ -52,7 +52,7 @@ Usage : .\\demo\\c\\build\\rhino_demo_mic.exe -a ACCESS_KEY -l LIBRARY_PATH -m M The following commands shows the available audio input devices to the console. -#### Linux, macOS, Raspberry Pi, BeagleBone, Jetson +#### Linux, macOS, Raspberry Pi ```console ./demo/c/build/rhino_demo_mic --show_audio_devices @@ -93,20 +93,6 @@ Replace `${PROCESSOR}` with one of the Raspberry Pi processors defined [here](.. -c resources/contexts/raspberry-pi/smart_lighting_raspberry-pi.rhn -d ${AUDIO_DEVICE_INDEX} -a ${ACCESS_KEY} ``` -#### BeagleBone - -```console -./demo/c/build/rhino_demo_mic -l lib/beaglebone/libpv_rhino.so -m lib/common/rhino_params.pv \ --c resources/contexts/beaglebone/smart_lighting_beaglebone.rhn -d ${AUDIO_DEVICE_INDEX} -a ${ACCESS_KEY} -``` - -#### Jetson - -```console -./demo/c/build/rhino_demo_mic -l lib/jetson/cortex-a57-aarch64/libpv_rhino.so -m lib/common/rhino_params.pv \ --c resources/contexts/jetson/smart_lighting_jetson.rhn -d ${AUDIO_DEVICE_INDEX} -a ${ACCESS_KEY} -``` - #### Windows ```console @@ -143,7 +129,7 @@ cmake -S demo/c/. -B demo/c/build && cmake --build demo/c/build --target rhino_d Running the executable without any commandline arguments prints the usage info to the console. -#### Linux, macOS, Raspberry Pi, BeagleBone, Jetson +#### Linux, macOS, Raspberry Pi ```console ./demo/c/build/rhino_demo_file @@ -189,20 +175,6 @@ Replace `${PROCESSOR}` with one of the Raspberry Pi processors defined [here](.. -c resources/contexts/raspberry-pi/coffee_maker_raspberry-pi.rhn -w resources/audio_samples/test_within_context.wav -a ${ACCESS_KEY} ``` -#### BeagleBone - -```console -./demo/c/build/rhino_demo_file -l lib/beaglebone/libpv_rhino.so -m lib/common/rhino_params.pv \ --c resources/contexts/beaglebone/coffee_maker_beaglebone.rhn -w resources/audio_samples/test_within_context.wav -a ${ACCESS_KEY} -``` - -#### Jetson - -```console -./demo/c/build/rhino_demo_file -l lib/jetson/cortex-a57-aarch64/libpv_rhino.so -m lib/common/rhino_params.pv \ --c resources/contexts/jetson/coffee_maker_jetson.rhn -w resources/audio_samples/test_within_context.wav -a ${ACCESS_KEY} -``` - #### Windows ```console diff --git a/demo/dotnet/README.md b/demo/dotnet/README.md index 80208cd6..cdf3f948 100644 --- a/demo/dotnet/README.md +++ b/demo/dotnet/README.md @@ -41,12 +41,9 @@ Rhino is: - macOS (x86_64) - Windows (x86_64) - Raspberry Pi: - - 2 - 3 (32 and 64 bit) - 4 (32 and 64 bit) - 5 (32 and 64 bit) -- NVIDIA Jetson Nano -- BeagleBone ## Installation diff --git a/demo/dotnet/RhinoDemo/RhinoDemo.csproj b/demo/dotnet/RhinoDemo/RhinoDemo.csproj index 44e267a0..be478de8 100644 --- a/demo/dotnet/RhinoDemo/RhinoDemo.csproj +++ b/demo/dotnet/RhinoDemo/RhinoDemo.csproj @@ -20,6 +20,6 @@ - + diff --git a/demo/go/README.md b/demo/go/README.md index 2b82fd42..92008c96 100644 --- a/demo/go/README.md +++ b/demo/go/README.md @@ -14,12 +14,9 @@ This Go module contains demos for processing real-time audio (i.e. microphone) a - Windows (x86_64) - Raspberry Pi: - Zero - - 2 - 3 (32 and 64 bit) - 4 (32 and 64 bit) - 5 (32 and 64 bit) -- NVIDIA Jetson Nano -- BeagleBone ## AccessKey diff --git a/demo/go/go.mod b/demo/go/go.mod index 247e6bd7..a5a7babb 100644 --- a/demo/go/go.mod +++ b/demo/go/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/Picovoice/pvrecorder/binding/go v1.2.2 - github.com/Picovoice/rhino/binding/go/v3 v3.0.2 + github.com/Picovoice/rhino/binding/go/v3 v3.0.3 github.com/go-audio/audio v1.0.0 github.com/go-audio/wav v1.0.0 ) diff --git a/demo/go/go.sum b/demo/go/go.sum index b3b41529..3c4a8bd7 100644 --- a/demo/go/go.sum +++ b/demo/go/go.sum @@ -1,7 +1,7 @@ github.com/Picovoice/pvrecorder/binding/go v1.2.2 h1:UN0u60hVR+s8kYmVSITS4UbTihHzeNxlNkJKYoKaVbo= github.com/Picovoice/pvrecorder/binding/go v1.2.2/go.mod h1:gQdvBAjoKmRxMFh8W9cVKWcqHsWvu+d13sCPVFm7dhg= -github.com/Picovoice/rhino/binding/go/v3 v3.0.2 h1:z3YSRDc2zGJNWkOsqo7aEdW039+VmrqZ8axZ4uOWQDA= -github.com/Picovoice/rhino/binding/go/v3 v3.0.2/go.mod h1:CKikI/Tv7hIyj0aOnAKaBIGPzWfx/0SUayYFDnPCmmI= +github.com/Picovoice/rhino/binding/go/v3 v3.0.3 h1:mDg4Pvxl+/jzcfi6M+wDo5/tI0ePURErlcJZr0Pj68k= +github.com/Picovoice/rhino/binding/go/v3 v3.0.3/go.mod h1:CKikI/Tv7hIyj0aOnAKaBIGPzWfx/0SUayYFDnPCmmI= github.com/go-audio/audio v1.0.0 h1:zS9vebldgbQqktK4H0lUqWrG8P0NxCJVqcj7ZpNnwd4= github.com/go-audio/audio v1.0.0/go.mod h1:6uAu0+H2lHkwdGsAY+j2wHPNPpPoeg5AaEFh9FlA+Zs= github.com/go-audio/riff v1.0.0 h1:d8iCGbDvox9BfLagY94fBynxSPHO80LmZCaOsmKxokA= diff --git a/demo/java/README.md b/demo/java/README.md index a268c10b..a9bb556b 100644 --- a/demo/java/README.md +++ b/demo/java/README.md @@ -43,12 +43,9 @@ Rhino is: - macOS (x86_64, arm64) - Windows (x86_64) - Raspberry Pi: - - 2 - 3 (32 and 64 bit) - 4 (32 and 64 bit) - 5 (32 and 64 bit) -- Jetson Nano -- BeagleBone ## Installation diff --git a/demo/java/build.gradle b/demo/java/build.gradle index 4ab33719..4e8f59ed 100644 --- a/demo/java/build.gradle +++ b/demo/java/build.gradle @@ -15,14 +15,14 @@ sourceSets { } dependencies { - implementation 'ai.picovoice:rhino-java:3.0.2' + implementation 'ai.picovoice:rhino-java:3.0.3' implementation 'commons-cli:commons-cli:1.4' } jar { manifest { attributes "Main-Class": "ai.picovoice.rhinodemo.MicDemo", - "Class-Path": "rhino-3.0.2.jar;commons-cli-1.4.jar" + "Class-Path": "rhino-3.0.3.jar;commons-cli-1.4.jar" } from sourceSets.main.output exclude "**/FileDemo.class" @@ -33,7 +33,7 @@ jar { task fileDemoJar(type: Jar) { manifest { attributes "Main-Class": "ai.picovoice.rhinodemo.FileDemo", - "Class-Path": "rhino-3.0.2.jar;commons-cli-1.4.jar" + "Class-Path": "rhino-3.0.3.jar;commons-cli-1.4.jar" } from sourceSets.main.output exclude "**/MicDemo.class" diff --git a/demo/nodejs/README.md b/demo/nodejs/README.md index 7ae379ca..34ee66f1 100644 --- a/demo/nodejs/README.md +++ b/demo/nodejs/README.md @@ -38,9 +38,7 @@ These demos run Rhino on **NodeJS 16+** on the following platforms: - Windows (x86_64) - Linux (x86_64) - macOS (x86_64, arm64) -- Raspberry Pi (2, 3, 4, 5) -- NVIDIA Jetson (Nano) -- BeagleBone +- Raspberry Pi (3, 4, 5) ### Web Browsers diff --git a/demo/nodejs/package.json b/demo/nodejs/package.json index 6dc60465..4f175ae3 100644 --- a/demo/nodejs/package.json +++ b/demo/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@picovoice/rhino-node-demo", - "version": "3.0.3", + "version": "3.0.4", "description": "Picovoice Rhino NodeJS file-based and microphone demos", "scripts": { "file": "node file.js", @@ -17,7 +17,7 @@ "license": "Apache-2.0", "dependencies": { "@picovoice/pvrecorder-node": "~1.2.2", - "@picovoice/rhino-node": "~3.0.4", + "@picovoice/rhino-node": "~3.0.5", "commander": "^6.1.0", "wavefile": "^11.0.0" }, diff --git a/demo/nodejs/yarn.lock b/demo/nodejs/yarn.lock index 84a18eea..3d22b70f 100644 --- a/demo/nodejs/yarn.lock +++ b/demo/nodejs/yarn.lock @@ -7,10 +7,10 @@ resolved "https://registry.yarnpkg.com/@picovoice/pvrecorder-node/-/pvrecorder-node-1.2.2.tgz#41c39719b408e29c581b3094a9ff4c59f282b026" integrity sha512-GuzZhWslbR4TLE3VxTiqjax8Mc8f1nB69bY5jag4ETlCxo7q/KpeUbWRvojhtNVPvpFLbospZAb6vfgxkEqgJQ== -"@picovoice/rhino-node@~3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@picovoice/rhino-node/-/rhino-node-3.0.3.tgz#3faac1088a6de016c38d9535572c34e497c3ba63" - integrity sha512-a9JyvBggbmhsV8Z5iV6dYlLzhy2ZSR9NNNG/whbK8SnSLSUEjWEkHufVNQTRkOg1BRq1D4OIVPz2kvwJfanYQQ== +"@picovoice/rhino-node@~3.0.5": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@picovoice/rhino-node/-/rhino-node-3.0.5.tgz#8ca5990e25c0231faca69dae74fad1691be55894" + integrity sha512-21/j50w5qtFw2IaaN1RawPwR66uGhGg29U7JZBDjdorcSUbPwlpR09B9pxvBTZP51EC40d8MIsQswp7jLH2vTA== commander@^6.1.0: version "6.2.1" diff --git a/demo/python/README.md b/demo/python/README.md index 647eae8e..5b47f444 100644 --- a/demo/python/README.md +++ b/demo/python/README.md @@ -35,7 +35,7 @@ Rhino is: ## Compatibility - Python 3.8+ -- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), Raspberry Pi (all variants), NVIDIA Jetson Nano and BeagleBone. +- Runs on Linux (x86_64), macOS (x86_64, arm64), Windows (x86_64), and Raspberry Pi (Zero, 3, 4, 5). ## Installation diff --git a/demo/python/requirements.txt b/demo/python/requirements.txt index 3ed9dba5..89e5073d 100644 --- a/demo/python/requirements.txt +++ b/demo/python/requirements.txt @@ -1,2 +1,2 @@ -pvrhino==3.0.2 +pvrhino==3.0.3 pvrecorder==1.2.2 diff --git a/demo/python/setup.py b/demo/python/setup.py index 3d0bdb84..1de04b7d 100644 --- a/demo/python/setup.py +++ b/demo/python/setup.py @@ -28,7 +28,7 @@ setuptools.setup( name="pvrhinodemo", - version="3.0.2", + version="3.0.3", author="Picovoice", author_email="hello@picovoice.ai", description="Rhino Speech-to-Intent engine demos.", @@ -36,7 +36,7 @@ long_description_content_type="text/markdown", url="https://github.com/Picovoice/rhino", packages=["pvrhinodemo"], - install_requires=["pvrhino==3.0.2", "pvrecorder==1.2.2"], + install_requires=["pvrhino==3.0.3", "pvrecorder==1.2.2"], include_package_data=True, classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/demo/rust/filedemo/Cargo.lock b/demo/rust/filedemo/Cargo.lock index a02956d6..5f6ad146 100644 --- a/demo/rust/filedemo/Cargo.lock +++ b/demo/rust/filedemo/Cargo.lock @@ -306,9 +306,9 @@ dependencies = [ [[package]] name = "pv_rhino" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b035d446c37012d2836686a0664facee38b7bde7e3a1c43b9f812dce0d32e550" +checksum = "56cba466f05dbc2c5a69cc21904fc3acb9ea4235a0e432b4a68c155c963534c0" dependencies = [ "libc", "libloading", @@ -316,7 +316,7 @@ dependencies = [ [[package]] name = "pv_rhino_filedemo" -version = "3.0.2" +version = "3.0.3" dependencies = [ "chrono", "clap", diff --git a/demo/rust/filedemo/Cargo.toml b/demo/rust/filedemo/Cargo.toml index 597f1a06..ec7d1a13 100644 --- a/demo/rust/filedemo/Cargo.toml +++ b/demo/rust/filedemo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pv_rhino_filedemo" -version = "3.0.2" +version = "3.0.3" edition = "2018" [dependencies] @@ -8,4 +8,4 @@ chrono = "0.4.23" clap = "3.2.3" hound = "3.4.0" itertools = "0.10.3" -pv_rhino = "=3.0.2" +pv_rhino = "=3.0.3" diff --git a/demo/rust/micdemo/Cargo.lock b/demo/rust/micdemo/Cargo.lock index f2cb7402..1103ebd3 100644 --- a/demo/rust/micdemo/Cargo.lock +++ b/demo/rust/micdemo/Cargo.lock @@ -277,9 +277,9 @@ dependencies = [ [[package]] name = "pv_rhino" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b035d446c37012d2836686a0664facee38b7bde7e3a1c43b9f812dce0d32e550" +checksum = "56cba466f05dbc2c5a69cc21904fc3acb9ea4235a0e432b4a68c155c963534c0" dependencies = [ "libc", "libloading 0.7.4", @@ -287,7 +287,7 @@ dependencies = [ [[package]] name = "pv_rhino_micdemo" -version = "3.0.2" +version = "3.0.3" dependencies = [ "chrono", "clap", diff --git a/demo/rust/micdemo/Cargo.toml b/demo/rust/micdemo/Cargo.toml index f2586be7..604dab12 100644 --- a/demo/rust/micdemo/Cargo.toml +++ b/demo/rust/micdemo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pv_rhino_micdemo" -version = "3.0.2" +version = "3.0.3" edition = "2018" [dependencies] @@ -10,4 +10,4 @@ ctrlc = "3.2.2" hound = "3.4.0" itertools = "0.10.3" pv_recorder = "=1.2.2" -pv_rhino = "=3.0.2" +pv_rhino = "=3.0.3" diff --git a/lib/README.md b/lib/README.md index 6a29c605..9007d2bd 100644 --- a/lib/README.md +++ b/lib/README.md @@ -1,7 +1,6 @@ ## Raspberry Pi * arm11 is tuned for A, B, and Zero. -* cortex-a7 is tuned for 2. * cortex-a53 is tuned for 3. * cortex-a72 is tuned for 4. * cortex-a76 is tuned for 5. diff --git a/lib/beaglebone/libpv_rhino.so b/lib/beaglebone/libpv_rhino.so deleted file mode 100755 index 6144f5d4..00000000 Binary files a/lib/beaglebone/libpv_rhino.so and /dev/null differ diff --git a/lib/java/beaglebone/libpv_rhino_jni.so b/lib/java/beaglebone/libpv_rhino_jni.so deleted file mode 100755 index 63230edc..00000000 Binary files a/lib/java/beaglebone/libpv_rhino_jni.so and /dev/null differ diff --git a/lib/java/jetson/cortex-a57-aarch64/libpv_rhino_jni.so b/lib/java/jetson/cortex-a57-aarch64/libpv_rhino_jni.so deleted file mode 100755 index 2385eeb6..00000000 Binary files a/lib/java/jetson/cortex-a57-aarch64/libpv_rhino_jni.so and /dev/null differ diff --git a/lib/java/raspberry-pi/cortex-a7/libpv_rhino_jni.so b/lib/java/raspberry-pi/cortex-a7/libpv_rhino_jni.so deleted file mode 100755 index 83ba0e0a..00000000 Binary files a/lib/java/raspberry-pi/cortex-a7/libpv_rhino_jni.so and /dev/null differ diff --git a/lib/jetson/cortex-a57-aarch64/libpv_rhino.so b/lib/jetson/cortex-a57-aarch64/libpv_rhino.so deleted file mode 100755 index daf43f04..00000000 Binary files a/lib/jetson/cortex-a57-aarch64/libpv_rhino.so and /dev/null differ diff --git a/lib/node/beaglebone/pv_rhino.node b/lib/node/beaglebone/pv_rhino.node deleted file mode 100755 index 459898f1..00000000 Binary files a/lib/node/beaglebone/pv_rhino.node and /dev/null differ diff --git a/lib/node/jetson/cortex-a57-aarch64/pv_rhino.node b/lib/node/jetson/cortex-a57-aarch64/pv_rhino.node deleted file mode 100755 index 0fd00a35..00000000 Binary files a/lib/node/jetson/cortex-a57-aarch64/pv_rhino.node and /dev/null differ diff --git a/lib/node/raspberry-pi/cortex-a7/pv_rhino.node b/lib/node/raspberry-pi/cortex-a7/pv_rhino.node deleted file mode 100755 index 6e4c7746..00000000 Binary files a/lib/node/raspberry-pi/cortex-a7/pv_rhino.node and /dev/null differ diff --git a/lib/raspberry-pi/cortex-a7/libpv_rhino.so b/lib/raspberry-pi/cortex-a7/libpv_rhino.so deleted file mode 100755 index 68d2a05c..00000000 Binary files a/lib/raspberry-pi/cortex-a7/libpv_rhino.so and /dev/null differ diff --git a/resources/.lint/spell-check/dict.txt b/resources/.lint/spell-check/dict.txt index 4931cd80..5462be85 100644 --- a/resources/.lint/spell-check/dict.txt +++ b/resources/.lint/spell-check/dict.txt @@ -6,7 +6,6 @@ armeabi armv armv7l bagno -beaglebone behaviour beleuchtung calcsize @@ -138,4 +137,4 @@ xcodeproj xcscheme xcschemes xcshareddata -xcworkspace \ No newline at end of file +xcworkspace diff --git a/resources/contexts/beaglebone/alarm_beaglebone.rhn b/resources/contexts/beaglebone/alarm_beaglebone.rhn deleted file mode 100644 index 3e99ad3a..00000000 Binary files a/resources/contexts/beaglebone/alarm_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts/beaglebone/clock_beaglebone.rhn b/resources/contexts/beaglebone/clock_beaglebone.rhn deleted file mode 100644 index ee2f3abe..00000000 Binary files a/resources/contexts/beaglebone/clock_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts/beaglebone/coffee_maker_beaglebone.rhn b/resources/contexts/beaglebone/coffee_maker_beaglebone.rhn deleted file mode 100644 index b7742867..00000000 Binary files a/resources/contexts/beaglebone/coffee_maker_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts/beaglebone/smart_lighting_beaglebone.rhn b/resources/contexts/beaglebone/smart_lighting_beaglebone.rhn deleted file mode 100644 index b9887654..00000000 Binary files a/resources/contexts/beaglebone/smart_lighting_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts/beaglebone/video_player_beaglebone.rhn b/resources/contexts/beaglebone/video_player_beaglebone.rhn deleted file mode 100644 index dafd9894..00000000 Binary files a/resources/contexts/beaglebone/video_player_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts/jetson/alarm_jetson.rhn b/resources/contexts/jetson/alarm_jetson.rhn deleted file mode 100644 index 113a9788..00000000 Binary files a/resources/contexts/jetson/alarm_jetson.rhn and /dev/null differ diff --git a/resources/contexts/jetson/clock_jetson.rhn b/resources/contexts/jetson/clock_jetson.rhn deleted file mode 100644 index 6162adf6..00000000 Binary files a/resources/contexts/jetson/clock_jetson.rhn and /dev/null differ diff --git a/resources/contexts/jetson/coffee_maker_jetson.rhn b/resources/contexts/jetson/coffee_maker_jetson.rhn deleted file mode 100644 index fde237df..00000000 Binary files a/resources/contexts/jetson/coffee_maker_jetson.rhn and /dev/null differ diff --git a/resources/contexts/jetson/smart_lighting_jetson.rhn b/resources/contexts/jetson/smart_lighting_jetson.rhn deleted file mode 100644 index a31bacb6..00000000 Binary files a/resources/contexts/jetson/smart_lighting_jetson.rhn and /dev/null differ diff --git a/resources/contexts/jetson/video_player_jetson.rhn b/resources/contexts/jetson/video_player_jetson.rhn deleted file mode 100644 index a432462c..00000000 Binary files a/resources/contexts/jetson/video_player_jetson.rhn and /dev/null differ diff --git a/resources/contexts_ar/beaglebone/simple_context_ar_beaglebone.rhn b/resources/contexts_ar/beaglebone/simple_context_ar_beaglebone.rhn deleted file mode 100644 index d93f52d3..00000000 Binary files a/resources/contexts_ar/beaglebone/simple_context_ar_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts_ar/jetson/simple_context_ar_jetson.rhn b/resources/contexts_ar/jetson/simple_context_ar_jetson.rhn deleted file mode 100644 index 3d94b971..00000000 Binary files a/resources/contexts_ar/jetson/simple_context_ar_jetson.rhn and /dev/null differ diff --git a/resources/contexts_de/beaglebone/beleuchtung_beaglebone.rhn b/resources/contexts_de/beaglebone/beleuchtung_beaglebone.rhn deleted file mode 100644 index 3971f92d..00000000 Binary files a/resources/contexts_de/beaglebone/beleuchtung_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts_de/jetson/beleuchtung_jetson.rhn b/resources/contexts_de/jetson/beleuchtung_jetson.rhn deleted file mode 100644 index d6fc3d8e..00000000 Binary files a/resources/contexts_de/jetson/beleuchtung_jetson.rhn and /dev/null differ diff --git "a/resources/contexts_es/beaglebone/iluminaci\303\263n_inteligente_beaglebone.rhn" "b/resources/contexts_es/beaglebone/iluminaci\303\263n_inteligente_beaglebone.rhn" deleted file mode 100644 index bb67c5d8..00000000 Binary files "a/resources/contexts_es/beaglebone/iluminaci\303\263n_inteligente_beaglebone.rhn" and /dev/null differ diff --git "a/resources/contexts_es/jetson/iluminaci\303\263n_inteligente_jetson.rhn" "b/resources/contexts_es/jetson/iluminaci\303\263n_inteligente_jetson.rhn" deleted file mode 100644 index 6020adec..00000000 Binary files "a/resources/contexts_es/jetson/iluminaci\303\263n_inteligente_jetson.rhn" and /dev/null differ diff --git a/resources/contexts_fa/beaglebone/simple_context_fa_beaglebone.rhn b/resources/contexts_fa/beaglebone/simple_context_fa_beaglebone.rhn deleted file mode 100644 index f5df964d..00000000 Binary files a/resources/contexts_fa/beaglebone/simple_context_fa_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts_fa/jetson/simple_context_fa_jetson.rhn b/resources/contexts_fa/jetson/simple_context_fa_jetson.rhn deleted file mode 100644 index a3fab0a9..00000000 Binary files a/resources/contexts_fa/jetson/simple_context_fa_jetson.rhn and /dev/null differ diff --git "a/resources/contexts_fr/beaglebone/\303\251clairage_intelligent_beaglebone.rhn" "b/resources/contexts_fr/beaglebone/\303\251clairage_intelligent_beaglebone.rhn" deleted file mode 100644 index d638d3cf..00000000 Binary files "a/resources/contexts_fr/beaglebone/\303\251clairage_intelligent_beaglebone.rhn" and /dev/null differ diff --git "a/resources/contexts_fr/jetson/\303\251clairage_intelligent_jetson.rhn" "b/resources/contexts_fr/jetson/\303\251clairage_intelligent_jetson.rhn" deleted file mode 100644 index fa4f3025..00000000 Binary files "a/resources/contexts_fr/jetson/\303\251clairage_intelligent_jetson.rhn" and /dev/null differ diff --git a/resources/contexts_hi/beaglebone/simple_context_hi_beaglebone.rhn b/resources/contexts_hi/beaglebone/simple_context_hi_beaglebone.rhn deleted file mode 100644 index 817ef155..00000000 Binary files a/resources/contexts_hi/beaglebone/simple_context_hi_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts_hi/jetson/simple_context_hi_jetson.rhn b/resources/contexts_hi/jetson/simple_context_hi_jetson.rhn deleted file mode 100644 index db503a8a..00000000 Binary files a/resources/contexts_hi/jetson/simple_context_hi_jetson.rhn and /dev/null differ diff --git a/resources/contexts_it/beaglebone/illuminazione_beaglebone.rhn b/resources/contexts_it/beaglebone/illuminazione_beaglebone.rhn deleted file mode 100644 index 75eb97f8..00000000 Binary files a/resources/contexts_it/beaglebone/illuminazione_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts_it/jetson/illuminazione_jetson.rhn b/resources/contexts_it/jetson/illuminazione_jetson.rhn deleted file mode 100644 index 384122ee..00000000 Binary files a/resources/contexts_it/jetson/illuminazione_jetson.rhn and /dev/null differ diff --git "a/resources/contexts_ja/beaglebone/sum\304\201to_sh\305\215mei_beaglebone.rhn" "b/resources/contexts_ja/beaglebone/sum\304\201to_sh\305\215mei_beaglebone.rhn" deleted file mode 100644 index 0efbe3b0..00000000 Binary files "a/resources/contexts_ja/beaglebone/sum\304\201to_sh\305\215mei_beaglebone.rhn" and /dev/null differ diff --git "a/resources/contexts_ja/jetson/sum\304\201to_sh\305\215mei_jetson.rhn" "b/resources/contexts_ja/jetson/sum\304\201to_sh\305\215mei_jetson.rhn" deleted file mode 100644 index 6b35b7ea..00000000 Binary files "a/resources/contexts_ja/jetson/sum\304\201to_sh\305\215mei_jetson.rhn" and /dev/null differ diff --git a/resources/contexts_ko/beaglebone/seumateu_jomyeong_beaglebone.rhn b/resources/contexts_ko/beaglebone/seumateu_jomyeong_beaglebone.rhn deleted file mode 100644 index db1f13a3..00000000 Binary files a/resources/contexts_ko/beaglebone/seumateu_jomyeong_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts_ko/jetson/seumateu_jomyeong_jetson.rhn b/resources/contexts_ko/jetson/seumateu_jomyeong_jetson.rhn deleted file mode 100644 index 156486d3..00000000 Binary files a/resources/contexts_ko/jetson/seumateu_jomyeong_jetson.rhn and /dev/null differ diff --git a/resources/contexts_nl/beaglebone/simple_context_nl_beaglebone.rhn b/resources/contexts_nl/beaglebone/simple_context_nl_beaglebone.rhn deleted file mode 100644 index 47cef097..00000000 Binary files a/resources/contexts_nl/beaglebone/simple_context_nl_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts_nl/jetson/simple_context_nl_jetson.rhn b/resources/contexts_nl/jetson/simple_context_nl_jetson.rhn deleted file mode 100644 index 616e0535..00000000 Binary files a/resources/contexts_nl/jetson/simple_context_nl_jetson.rhn and /dev/null differ diff --git a/resources/contexts_pl/beaglebone/simple_context_pl_beaglebone.rhn b/resources/contexts_pl/beaglebone/simple_context_pl_beaglebone.rhn deleted file mode 100644 index dcde0706..00000000 Binary files a/resources/contexts_pl/beaglebone/simple_context_pl_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts_pl/jetson/simple_context_pl_jetson.rhn b/resources/contexts_pl/jetson/simple_context_pl_jetson.rhn deleted file mode 100644 index bc41bff5..00000000 Binary files a/resources/contexts_pl/jetson/simple_context_pl_jetson.rhn and /dev/null differ diff --git a/resources/contexts_pt/beaglebone/luz_inteligente_beaglebone.rhn b/resources/contexts_pt/beaglebone/luz_inteligente_beaglebone.rhn deleted file mode 100644 index 3602a503..00000000 Binary files a/resources/contexts_pt/beaglebone/luz_inteligente_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts_pt/jetson/luz_inteligente_jetson.rhn b/resources/contexts_pt/jetson/luz_inteligente_jetson.rhn deleted file mode 100644 index 5962202a..00000000 Binary files a/resources/contexts_pt/jetson/luz_inteligente_jetson.rhn and /dev/null differ diff --git a/resources/contexts_ru/beaglebone/simple_context_ru_beaglebone.rhn b/resources/contexts_ru/beaglebone/simple_context_ru_beaglebone.rhn deleted file mode 100644 index 428eaae1..00000000 Binary files a/resources/contexts_ru/beaglebone/simple_context_ru_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts_ru/jetson/simple_context_ru_jetson.rhn b/resources/contexts_ru/jetson/simple_context_ru_jetson.rhn deleted file mode 100644 index d0d0bb86..00000000 Binary files a/resources/contexts_ru/jetson/simple_context_ru_jetson.rhn and /dev/null differ diff --git a/resources/contexts_sv/beaglebone/simple_context_sv_beaglebone.rhn b/resources/contexts_sv/beaglebone/simple_context_sv_beaglebone.rhn deleted file mode 100644 index f467c59d..00000000 Binary files a/resources/contexts_sv/beaglebone/simple_context_sv_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts_sv/jetson/simple_context_sv_jetson.rhn b/resources/contexts_sv/jetson/simple_context_sv_jetson.rhn deleted file mode 100644 index 2a3cd152..00000000 --- a/resources/contexts_sv/jetson/simple_context_sv_jetson.rhn +++ /dev/null @@ -1,4 +0,0 @@ -WWXm&0 r}AsYO9>Y,'mMK"s 'j7yN6/Mzq==~ Uz*)O 2-2agX 71>AzrWvRxIC%/ngr/JaڨYA'5M }!|zt -'9 #\܂'䣺E&I0 --Y±YNE)9q19U?BSDŽ-h[,[gajĉ6)>(GMa Qɏ ݢia7 - \jt[_m88m& ?N%ޭCi}rղ/۽ম.bpD;K]\V6XCO&5s$,+tG1~?p5SO9o˖X$Y:}ayBBiZY0B6fhxAIc[ }Wd4j̏],=_CR`J36EX&9S(obԨg.λۀ~%D.ggjM!2Nx޾Abd˨cﻑ9MeѠL3UfI(K֑A>B}yhM`# oCO7 f,9l*2vj|*ٳk ^"t \ No newline at end of file diff --git a/resources/contexts_vn/beaglebone/simple_context_vn_beaglebone.rhn b/resources/contexts_vn/beaglebone/simple_context_vn_beaglebone.rhn deleted file mode 100644 index 2821f6d0..00000000 Binary files a/resources/contexts_vn/beaglebone/simple_context_vn_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts_vn/jetson/simple_context_vn_jetson.rhn b/resources/contexts_vn/jetson/simple_context_vn_jetson.rhn deleted file mode 100644 index 6acacbf8..00000000 Binary files a/resources/contexts_vn/jetson/simple_context_vn_jetson.rhn and /dev/null differ diff --git a/resources/contexts_zh/beaglebone/simple_context_zh_beaglebone.rhn b/resources/contexts_zh/beaglebone/simple_context_zh_beaglebone.rhn deleted file mode 100644 index 9e0a2176..00000000 Binary files a/resources/contexts_zh/beaglebone/simple_context_zh_beaglebone.rhn and /dev/null differ diff --git a/resources/contexts_zh/jetson/simple_context_zh_jetson.rhn b/resources/contexts_zh/jetson/simple_context_zh_jetson.rhn deleted file mode 100644 index 1a4f5cff..00000000 Binary files a/resources/contexts_zh/jetson/simple_context_zh_jetson.rhn and /dev/null differ