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.

Sign up for GitHub

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

Jump to bottom

Add: x86_64-linux-android用のバインディングを追加 #21

Merged
merged 11 commits into from
Apr 23, 2023
Merged

Add: x86_64-linux-android用のバインディングを追加 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8b0cfa7
Add: x86_64-linux-android用のバインディングを追加
sevenc-nanashi Apr 20, 2023
ae3891b
Update: bindings.rsを更新
sevenc-nanashi Apr 20, 2023
3989d52
Update: 1.40.0に更新
sevenc-nanashi Apr 20, 2023
62fbcb7
Update: workflowを更新
sevenc-nanashi Apr 20, 2023
0cd79b1
（ビルドテスト）
sevenc-nanashi Apr 20, 2023
40642d3
Fix: 構文修正
sevenc-nanashi Apr 20, 2023
ced2e42
Add: build.rsにAndroid周りの処理を追加
sevenc-nanashi Apr 20, 2023
1024944
Add: 存在確認を追加
sevenc-nanashi Apr 21, 2023
8f358cf
Fix: 名前を修正
sevenc-nanashi Apr 21, 2023
34883aa
Fix: rustup target install忘れ
sevenc-nanashi Apr 22, 2023
e5896fd
Merge: main -> add/android-x86_64
sevenc-nanashi Apr 23, 2023
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
7 changes: 4 additions & 3 deletions .github/actions/auto_gen_bind_pr/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,16 @@ runs:
sudo apt update
sudo apt install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
- uses: nttld/setup-ndk@v1
if: inputs.triple == 'aarch64-linux-android'
if: endsWith(inputs.triple, '-linux-android')
with:
ndk-version: r25b
- name: Set path for android
if: inputs.triple == 'aarch64-linux-android'
if: endsWith(inputs.triple, '-linux-android')
shell: bash
run: |
echo "$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin" >> "$GITHUB_PATH"
echo "AR_aarch64_linux_android=llvm-ar" >> "$GITHUB_ENV"
UNDERSCORED_TRIPLE=$(sed 's/-/_/g' <<< "${{ inputs.triple }}")
echo "AR_$UNDERSCORED_TRIPLE=llvm-ar" >> "$GITHUB_ENV"
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/gen_bind.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,17 @@ jobs:
triple: aarch64-unknown-linux-gnu
- os: ubuntu-latest
triple: aarch64-linux-android
- os: ubuntu-latest
triple: x86_64-linux-android

- os: windows-latest
triple: x86_64-pc-windows-msvc
- os: windows-latest
triple: x86_64-pc-windows-msvc
additional_features: directml
- os: windows-latest
triple: i686-pc-windows-msvc

- os: macos-latest
triple: x86_64-apple-darwin
- os: macos-latest
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/general.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
- run: rustup target install i686-pc-windows-msvc
- run: rustup target install x86_64-pc-windows-msvc
- run: rustup target install aarch64-linux-android
- run: rustup target install x86_64-linux-android
# ******************************************************************
- name: Download prebuilt archive (CPU, x86_64-unknown-linux-gnu)
uses: actions-rs/cargo@v1
Expand All @@ -56,6 +57,14 @@ jobs:
- name: Verify prebuilt archive downloaded (CPU, aarch64-linux-android)
run: ls -lh target/aarch64-linux-android/debug/build/onnxruntime-sys-*/out/onnxruntime*.aar
# ******************************************************************
- name: Download prebuilt archive (CPU, x86_64-linux-android)
uses: actions-rs/cargo@v1
with:
command: build
args: --target x86_64-linux-android
- name: Verify prebuilt archive downloaded (CPU, x86_64-linux-android)
run: ls -lh target/x86_64-linux-android/debug/build/onnxruntime-sys-*/out/onnxruntime*.aar
# ******************************************************************
- name: Download prebuilt archive (CPU, x86_64-apple-darwin)
uses: actions-rs/cargo@v1
with:
Expand Down
1 change: 1 addition & 0 deletions onnxruntime-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,7 @@ impl OnnxPrebuiltArchive for Triplet {
}
(Os::Windows, Architecture::X86, Accelerator::None)
| (Os::MacOs, Architecture::X86_64, Accelerator::None)
| (Os::Android, Architecture::X86_64, Accelerator::None)
| (Os::Android, Architecture::Arm64, Accelerator::None)
| (Os::Linux, Architecture::Arm64, Accelerator::None) => Cow::from(format!(
"{}-{}",
Expand Down
Loading