Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retire rpi2 bb jetson #719

Merged
merged 83 commits into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
f38647b
rm from main readme, .github
albho Jul 18, 2024
3a525d0
rm from resources
albho Jul 18, 2024
be62d52
rm from lib
albho Jul 18, 2024
72c2e19
rm from demos (READMEs)
albho Jul 18, 2024
4d56bc9
rm from bindings
albho Jul 18, 2024
59e0c85
rm cpuPart 0xc07 & 0xd07
albho Jul 19, 2024
6bb8397
rm 0xc08
albho Jul 19, 2024
80f5b32
rm cortex-a7
albho Jul 19, 2024
a0c4fc1
re-add Jetson to dict
albho Jul 19, 2024
7570f0e
.NET workflow use macos-13
albho Jul 19, 2024
3fabf5c
.NET workflow try conditionally use macos-13
albho Jul 23, 2024
860cc4c
python
albho Jul 23, 2024
31bf6be
nodejs
albho Jul 23, 2024
9a1a7d7
update python & nodejs demo versions
albho Jul 23, 2024
8327c00
.net
albho Jul 23, 2024
5d10d47
rust
albho Jul 23, 2024
684cd17
go
albho Jul 23, 2024
6ff830b
java
albho Jul 23, 2024
f1991af
try fix go
albho Jul 23, 2024
9357bb5
try fix rust
albho Jul 24, 2024
3641f07
try fix c macos-latest
albho Jul 24, 2024
09eb3d0
dotnet try exclude macos-latest for 2.1.x
albho Jul 24, 2024
e37d493
try fix dotnet demos
albho Jul 24, 2024
530718b
try fix go
albho Jul 24, 2024
38b73b8
dotnet demos try just use macos-13
albho Jul 24, 2024
5cbb1e8
try fix rust, c, dotnet, go
albho Aug 2, 2024
5717cf9
rust windows demo specify bash shell, c demo capitalize or
albho Aug 2, 2024
f2d0f83
dotnet conditionally use macos-13
albho Aug 2, 2024
11d1964
update go commit hash
albho Aug 3, 2024
5c1f8b6
c demo link atomic for aarch64
albho Aug 6, 2024
32b7bd8
windows go print errors
albho Aug 7, 2024
1b16e63
try fix
albho Aug 7, 2024
edd289e
fix syntax
albho Aug 7, 2024
af45046
go log error status & message stack
albho Aug 8, 2024
3c9bc35
fix syntax
albho Aug 8, 2024
79321e4
try go install instead of go get
albho Aug 8, 2024
6d688a2
rm go test logs
albho Aug 8, 2024
80568a6
dotnet demos rm binding pack step
albho Aug 8, 2024
27b2344
Merge branch 'retire-rpi2-bb-jetson' of github.com:Picovoice/rhino in…
albho Aug 8, 2024
c7762c2
dotnet demos add build step
albho Aug 8, 2024
ad03326
rm pack step
albho Aug 8, 2024
6a53072
try package restore
albho Aug 8, 2024
293b687
try --ignore-failed-sources
albho Aug 9, 2024
64ba7f4
try --source https://api.nuget.org/v3/index.json
albho Aug 9, 2024
0567917
try dotnet restore -s ../../../binding/dotnet/Rhino/bin/Release Rhino…
albho Aug 9, 2024
d8c5b29
try dotnet add package -s https://api.nuget.org/ -s ../../../binding/…
albho Aug 9, 2024
c480a09
try continue-on-error: true
albho Aug 9, 2024
cce9da0
try fix dotnet-codestyle
albho Aug 9, 2024
50e0da9
fix incorrect path
albho Aug 9, 2024
44c13b9
try init rhino for the second time later
albho Aug 10, 2024
ea3c35e
[IMPORTANT - REVERT THIS LATER] change libs to see what is causing error
albho Aug 10, 2024
5112444
fix
albho Aug 10, 2024
5898978
update temp lib
albho Aug 10, 2024
46d0c20
[FIX] use -k PROD
albho Aug 10, 2024
e3361d8
revert libs, allow job fail, test only windows for now
albho Aug 12, 2024
ccf6ac1
test all minor revisions for go1.20
albho Aug 12, 2024
e808990
fix typo - test go 1.22 minor versions
albho Aug 12, 2024
44888f1
set up mingw
albho Aug 12, 2024
26967e3
try GOEXPERIMENT=nocoverageredesign
albho Aug 12, 2024
b8e44fd
test go 1.22.x
albho Aug 12, 2024
7b1a5cd
revert
albho Aug 12, 2024
f0a6b83
test all go versions
albho Aug 12, 2024
253c735
test go 1.21
albho Aug 12, 2024
7ce0b1c
test go 1.22.0
albho Aug 12, 2024
7685d74
try without for loop
albho Aug 12, 2024
42db889
try building with $env:GOEXPERIMENT = "noallocheaders"; go build
albho Aug 12, 2024
e6d088e
add sleep
albho Aug 12, 2024
9ff374d
try mingw 11.3.0
albho Aug 13, 2024
c156b49
see gcc version
albho Aug 13, 2024
25a5ce3
try mingw 11.2.0 on all go 1.20.x versions
albho Aug 13, 2024
2749e50
Merge branch 'retire-rpi2-bb-jetson' of github.com:Picovoice/rhino in…
albho Aug 12, 2024
81505dc
try test -p 1
albho Aug 13, 2024
d21f657
[IMPORTANT - REVERT LIBS] use debug libs
albho Aug 13, 2024
499b9d9
add sleep
albho Aug 13, 2024
cdff848
try with zoo-dev lock thread_id
albho Aug 14, 2024
47e0710
revert go debugging changes
albho Aug 14, 2024
320550d
rm go stable workflow, update java to point to newly staged repo
albho Aug 14, 2024
e1993d5
dotnet revert to see failures
albho Aug 14, 2024
288a320
try fix dotnet workflow
albho Aug 14, 2024
35c643b
run all workflows
albho Aug 14, 2024
f4085dd
post-release
albho Aug 15, 2024
b1701fb
go mod download
albho Aug 15, 2024
fdaaaa0
remove beaglebone and jetson embedded go libs
albho Aug 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rm from bindings
  • Loading branch information
albho committed Jul 18, 2024
commit 4d56bc9d050cf1f6b0aa2655b904e4f3b2c7ea5b
3 changes: 0 additions & 3 deletions binding/dotnet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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+:

Expand Down
26 changes: 4 additions & 22 deletions binding/dotnet/Rhino/Rhino.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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.
</Description>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
Expand Down Expand Up @@ -93,24 +93,6 @@
<Link>lib\raspberry-pi\%(RecursiveDir)%(Filename)%(Extension)</Link>
<Visible>false</Visible>
</Content>
<Content Include="..\..\..\lib\jetson\cortex-a57-aarch64\libpv_rhino.so">
<PackagePath>
build/netcoreapp3.0/lib/jetson/cortex-a57-aarch64/libpv_rhino.so;
build/net6.0/lib/jetson/cortex-a57-aarch64/libpv_rhino.so;
</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\jetson\cortex-a57-aarch64\libpv_rhino.so</Link>
<Visible>false</Visible>
</Content>
<Content Include="..\..\..\lib\beaglebone\libpv_rhino.so">
<PackagePath>
build/netcoreapp3.0/lib/beaglebone/libpv_rhino.so;
build/net6.0/lib/beaglebone/libpv_rhino.so;
</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\beaglebone\libpv_rhino.so</Link>
<Visible>false</Visible>
</Content>
</ItemGroup>

<!--.NET 6.0+ libs-->
Expand Down
2 changes: 0 additions & 2 deletions binding/dotnet/Rhino/Utils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ public static string PvLinuxEnv()
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.");
}
Expand Down
8 changes: 0 additions & 8 deletions binding/dotnet/RhinoTest/RhinoTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,6 @@
<Link>resources\contexts\raspberry-pi\%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\..\resources\contexts\beaglebone\*">
<Link>resources\contexts\beaglebone\%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\..\resources\contexts\jetson\*">
<Link>resources\contexts\jetson\%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="..\..\..\lib\windows\amd64\libpv_rhino.dll">
Expand Down
2 changes: 1 addition & 1 deletion binding/go/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
8 changes: 1 addition & 7 deletions binding/go/copy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
echo "Copy complete!"
6 changes: 0 additions & 6 deletions binding/go/rhino.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 "", ""
Expand Down
4 changes: 1 addition & 3 deletions binding/java/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 1 addition & 9 deletions binding/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,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 {
Expand Down
10 changes: 1 addition & 9 deletions binding/java/src/ai/picovoice/rhino/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,6 @@ public static String getEnvironmentName() throws RuntimeException {
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));
Expand Down Expand Up @@ -170,7 +166,7 @@ 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" : "";

Expand All @@ -179,8 +175,6 @@ private static String getArchitecture() throws RuntimeException {
return "cortex-a7" + archInfo;
case "0xd03":
return "cortex-a53" + archInfo;
case "0xd07":
return "cortex-a57" + archInfo;
case "0xd08":
return "cortex-a72" + archInfo;
case "0xd0b":
Expand Down Expand Up @@ -227,8 +221,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")
Expand Down
4 changes: 1 addition & 3 deletions binding/nodejs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
26 changes: 0 additions & 26 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 @@ -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`
Expand All @@ -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`
Expand Down Expand Up @@ -122,10 +106,6 @@ function getLinuxPlatform(): string {
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}'`);
}
Expand All @@ -139,18 +119,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}'`);
}
Expand Down
2 changes: 1 addition & 1 deletion binding/python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
15 changes: 0 additions & 15 deletions binding/python/_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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. '
Expand All @@ -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):
Expand All @@ -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')

Expand Down
4 changes: 1 addition & 3 deletions binding/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions binding/python/test_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion binding/rust/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion binding/rust/copy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
Loading