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

armhfビルド: ONNX Runtimeビルドのリポジトリ切り出しに対応 #56

Merged
merged 6 commits into from
Jan 1, 2022
Merged

armhfビルド: ONNX Runtimeビルドのリポジトリ切り出しに対応 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c322742
add armhf build with VOICEVOX/onnxruntime-builder
aoirint Dec 31, 2021
51b7645
add lib mapping
aoirint Dec 31, 2021
984cf12
remove onnxruntime extraction using onnxruntime_artifact_name
aoirint Dec 31, 2021
0b95433
remove onnxruntime attachment using onnxruntime_artifact_name
aoirint Dec 31, 2021
dc08114
update doc
aoirint Dec 31, 2021
bbf2105
use 1.9.1.1 release
aoirint Dec 31, 2021
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
37 changes: 11 additions & 26 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ jobs:
cc_version: '8'
cxx_version: '8'

- os: ubuntu-18.04
device: cpu-armhf
onnxruntime_url: https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.9.1.1/onnxruntime-linux-armhf-cpu-v1.9.1.tgz
artifact_name: linux-armhf-cpu
cc_version: '8'
cxx_version: '8'
arch: arm-linux-gnueabihf

runs-on: ${{ matrix.os }}

env:
Expand All @@ -96,12 +104,10 @@ jobs:

# ONNX Runtime
- name: Export ONNX Runtime url to calc hash
if: matrix.onnxruntime_artifact_name == ''
shell: bash
run: echo "${{ matrix.onnxruntime_url }}" > download/onnxruntime_url.txt

- name: Cache ONNX Runtime
if: matrix.onnxruntime_artifact_name == ''
uses: actions/cache@v2
id: onnxruntime-cache
with:
Expand All @@ -110,7 +116,7 @@ jobs:

# download/onnxruntime/lib/onnxruntime.dll
- name: Download ONNX Runtime (zip)
if: matrix.onnxruntime_artifact_name == '' && steps.onnxruntime-cache.outputs.cache-hit != 'true' && endsWith(matrix.onnxruntime_url, '.zip')
if: steps.onnxruntime-cache.outputs.cache-hit != 'true' && endsWith(matrix.onnxruntime_url, '.zip')
shell: bash
run: |
curl -L "${{ matrix.onnxruntime_url }}" > download/onnxruntime.zip
Expand All @@ -127,21 +133,14 @@ jobs:
# download/onnxruntime/lib/libonnxruntime.so
# download/onnxruntime/lib/libonnxruntime.dylib
- name: Download ONNX Runtime (tgz)
if: matrix.onnxruntime_artifact_name == '' && steps.onnxruntime-cache.outputs.cache-hit != 'true' && endsWith(matrix.onnxruntime_url, '.tgz')
if: steps.onnxruntime-cache.outputs.cache-hit != 'true' && endsWith(matrix.onnxruntime_url, '.tgz')
shell: bash
run: |
curl -L "${{ matrix.onnxruntime_url }}" > download/onnxruntime.tgz
mkdir -p download/onnxruntime
tar xf download/onnxruntime.tgz -C download/onnxruntime --strip-components 1
rm download/onnxruntime.tgz

- name: Download ONNX Runtime (artifact)
if: matrix.onnxruntime_artifact_name != ''
uses: actions/download-artifact@v2
with:
name: ${{ matrix.onnxruntime_artifact_name }}
path: download/onnxruntime/

# Build
- if: startsWith(matrix.os, 'windows')
uses: ilammy/msvc-dev-cmd@v1
Expand Down Expand Up @@ -205,21 +204,6 @@ jobs:
# copy Linux/macOS shared library if exists
cp -v core/lib/libcore* artifact/ || true

# copy libonnxruntime
if [ "${{ matrix.onnxruntime_artifact_name }}" != "" ]; then
mkdir -p "artifact/onnxruntime-${{ matrix.artifact_name }}/"

# copy docs and license (all files in root dir)
find "download/onnxruntime/" -maxdepth 1 -type f | xargs -I{} cp -v {} "artifact/onnxruntime-${{ matrix.artifact_name }}/"

# copy Windows DLL if exists
cp -v core/lib/onnxruntime* "artifact/onnxruntime-${{ matrix.artifact_name }}/" || true
# copy Linux shared library if exists
cp -v core/lib/libonnxruntime.so.* "artifact/onnxruntime-${{ matrix.artifact_name }}/" || true
# copy macOS shared library if exists
cp -v core/lib/libonnxruntime.dylib "artifact/onnxruntime-${{ matrix.artifact_name }}/" || true
fi

# Upload
- name: Upload artifact
uses: actions/upload-artifact@v2
Expand Down Expand Up @@ -264,6 +248,7 @@ jobs:
osx-x64-cpu libcore.dylib libcore_cpu_x64.dylib
linux-x64-gpu libcore.so libcore_gpu_x64_nvidia.so
linux-x64-cpu libcore.so libcore_cpu_x64.so
linux-armhf-cpu libcore.so libcore_cpu_armhf.so
EOF

for line in "${MAPPINGS[@]}"; do
Expand Down
7 changes: 5 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ CUDA の macOS サポートは現在終了しているため、VOICEVOX CORE の

### Raspberry Pi (armhf)の場合

`core.zip`に Raspberry Pi 用の ONNX Runtime を同梱しています。
利用には、libgomp のインストールが必要です。
Raspberry Pi 用の ONNX Runtime は以下からダウンロードできます。

- <https://github.com/VOICEVOX/onnxruntime-builder/releases>

動作には、libgomp のインストールが必要です。

```shell
sudo apt install libgomp1
Expand Down