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

ダウンロードスクリプトの作成とドキュメントの修正 #249

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
8cb4662
ダウンロードスクリプトの作成とドキュメントの修正
qwerty2501 Aug 17, 2022
715d8b5
WIP releasesからartifactをダウンロードして展開するスクリプトを作成した
qwerty2501 Aug 17, 2022
78d84c0
renamed baseurl
qwerty2501 Aug 18, 2022
b99df45
open_jtalkダウンロード機能を実装した
qwerty2501 Aug 18, 2022
57edf71
directory名変更する
qwerty2501 Aug 19, 2022
e2713e7
新しいバージョンを取得する関数を分けた
qwerty2501 Aug 19, 2022
9e195d1
option指定方法を変更
qwerty2501 Aug 20, 2022
aa90248
変数名を短くした
qwerty2501 Aug 20, 2022
5ff5464
cudaはlinuxのみと記載した
qwerty2501 Aug 20, 2022
5d00043
format
qwerty2501 Aug 20, 2022
628f238
説明文を修正
qwerty2501 Aug 20, 2022
7ef7448
script名変更
qwerty2501 Aug 20, 2022
26cd1e6
path変更した
qwerty2501 Aug 20, 2022
7663a13
default値が有効になるようにした
qwerty2501 Aug 20, 2022
05c2cc0
powershellダウンロードスクリプトを作った
qwerty2501 Aug 20, 2022
b607725
full optionをminにして通常はすべてダウンロードするようにした 
qwerty2501 Aug 20, 2022
64c0545
downloaderのドキュメントを作成した
qwerty2501 Aug 20, 2022
2f08cfa
download関連のドキュメントを修正した
qwerty2501 Aug 20, 2022
b2f9a09
pythonのexampleをdownloaderを使用した新しいものに修正した
qwerty2501 Aug 20, 2022
ae77e8e
cmakeでのexampleをdownloaderを使用したものに更新
qwerty2501 Aug 20, 2022
1ef7b60
リポジトリで管理してる全てのexampleの案内をトップのREADMEに記載した
qwerty2501 Aug 20, 2022
540aa99
download testを追加した
qwerty2501 Aug 22, 2022
ffa981e
overwriteを指定しないようにした
qwerty2501 Aug 22, 2022
8ea29a8
mac版に対応した
qwerty2501 Aug 22, 2022
e094c66
curl失敗時にエラーになるようにした
qwerty2501 Aug 22, 2022
ec05b86
exampleのテストが通ってないのを修正
qwerty2501 Aug 22, 2022
7f11db3
cmakeにtarget_include_directoriesを追加した
qwerty2501 Aug 22, 2022
4664140
versionチェックを追加
qwerty2501 Aug 23, 2022
4e2ee08
download directoryを引数化することによりコード量を削減した
qwerty2501 Aug 24, 2022
2ae4978
macのテストを無効化
qwerty2501 Aug 25, 2022
09b7294
Merge branch 'main' of https://github.com/VOICEVOX/voicevox_core into…
qwerty2501 Aug 28, 2022
802afcb
追加ライブラリダウンロード処理を実装した
qwerty2501 Aug 28, 2022
12d5ef4
存在してはいけないファイルチェックを追加
qwerty2501 Aug 28, 2022
a2c6c15
cudaダウンロードテスト実装した
qwerty2501 Aug 28, 2022
10b884f
ワイルドカードを使えるようにした
qwerty2501 Aug 28, 2022
07872bd
linux版cudaを追加
qwerty2501 Aug 28, 2022
a84c682
directmlパターンを追加
qwerty2501 Aug 28, 2022
2d6ac79
DirectML minタイプも追加
qwerty2501 Aug 28, 2022
40bada6
cudaのMinタイプも追加
qwerty2501 Aug 28, 2022
513fc07
linuxのcuda min type追加
qwerty2501 Aug 28, 2022
44ee53e
minの場合はopen_jtalk辞書もダウンロードされないのでファイル非存在に追加
qwerty2501 Aug 28, 2022
2482651
cpuでのminチェック追加
qwerty2501 Aug 28, 2022
6d7eb90
powershellの場合はtrueを指定するようにした
qwerty2501 Aug 28, 2022
56e5d57
output確認を追加
qwerty2501 Aug 28, 2022
3146623
名前をわかりやすくした
qwerty2501 Aug 28, 2022
16c7b08
Update README.md
qwerty2501 Aug 29, 2022
7330f5d
Update README.md
qwerty2501 Aug 29, 2022
316b3b9
Update README.md
qwerty2501 Aug 29, 2022
63ba425
Update README.md
qwerty2501 Aug 29, 2022
c2e294f
Update docs/downloads/Download.md
qwerty2501 Aug 29, 2022
f2ec6c9
Update README.md
qwerty2501 Aug 29, 2022
c98d6c1
Update example/python/README.md
qwerty2501 Aug 29, 2022
196aa24
Update docs/downloads/Download.md
qwerty2501 Aug 29, 2022
0f15bff
Update docs/downloads/Download.md
qwerty2501 Aug 29, 2022
e96a2b6
audio_query 関数の返すクエリの初期値に create_kana の結果を格納 (#254)
PickledChair Aug 28, 2022
ac00913
句読点の長さが適切に設定されていなかった問題を修正 (#255)
PickledChair Aug 28, 2022
eb0be2e
Merge branch 'main' of https://github.com/VOICEVOX/voicevox_core into…
qwerty2501 Aug 29, 2022
f191dc4
消し忘れを削除
qwerty2501 Aug 29, 2022
0303e21
オプションの手順は最後にした
qwerty2501 Aug 29, 2022
2de0fcd
Downloaderに統一
qwerty2501 Aug 29, 2022
0458b6b
PowerShellの表記ゆれを修正
qwerty2501 Aug 29, 2022
6602d0c
downloaderの大文字小文字を修正した
qwerty2501 Aug 29, 2022
84efbf7
powershellの大文字小文字を統一した
qwerty2501 Aug 29, 2022
5ff7a2a
downloaderをダウンロードする旨を削除
qwerty2501 Aug 29, 2022
6d945f0
downloaderのreleaseを追加
qwerty2501 Aug 29, 2022
983408a
main branchかダウンロード関係のファイルに変更が合った場合にダウンロードテストが実行されるようにした 
qwerty2501 Aug 29, 2022
064e302
latestの場合は自動で最新版を設定するようにした
qwerty2501 Aug 29, 2022
305acd2
mainなら常に実行されるように変更
qwerty2501 Aug 29, 2022
1c5a086
EXPECTED_VOICEVOX_CORE_VERSIONに設定されるように変更
qwerty2501 Aug 29, 2022
c35f565
表記ゆれを修正した
qwerty2501 Aug 29, 2022
7a34020
fileの表記ゆれを修正
qwerty2501 Aug 29, 2022
6cf4286
renamed powershell script
qwerty2501 Aug 29, 2022
4c15933
title変更
qwerty2501 Aug 29, 2022
7e09e21
linkをid指定に変更した
qwerty2501 Aug 29, 2022
1b4a413
download scirptファイル名を変更
qwerty2501 Aug 29, 2022
63460ae
download.mdに変更
qwerty2501 Aug 29, 2022
f990686
Update README.md
qwerty2501 Aug 30, 2022
6d42499
Update README.md
qwerty2501 Aug 30, 2022
4173da3
Update example/cpp/unix/README.md
qwerty2501 Aug 30, 2022
f8e8e3c
Update README.md
qwerty2501 Aug 30, 2022
c79f72c
Update README.md
qwerty2501 Aug 31, 2022
51847cb
PyO3を使ってクレートからwhlを作る (#239)
qryxip Sep 2, 2022
20def47
Merge branch 'main' of https://github.com/VOICEVOX/voicevox_core into…
qwerty2501 Sep 3, 2022
d39e399
Merge branch 'main' of https://github.com/VOICEVOX/voicevox_core into…
qwerty2501 Sep 4, 2022
4f654ab
Update docs/downloads/download.md
qwerty2501 Sep 4, 2022
587f5fc
curlからo optionを削除した
qwerty2501 Sep 4, 2022
be706bf
Update scripts/downloads/download.sh
qwerty2501 Sep 4, 2022
f20ddce
Merge branch 'main' of https://github.com/VOICEVOX/voicevox_core into…
qwerty2501 Sep 8, 2022
c12b81b
type argument to accelerator
qwerty2501 Sep 8, 2022
38ba514
type -> Acceleratorに変更
qwerty2501 Sep 8, 2022
e085c45
testを修正
qwerty2501 Sep 8, 2022
bb0446b
Update docs/downloads/download.md
qwerty2501 Sep 10, 2022
b9a62af
Update docs/downloads/download.md
qwerty2501 Sep 10, 2022
3eb5041
Update docs/downloads/download.md
qwerty2501 Sep 10, 2022
11805e4
Invoke-WebRequestだとpipeがうまくいかないのでpowershellの場合は全て一度downloadスクリプトをダウンロ…
qwerty2501 Sep 10, 2022
d7c339a
Outputを絶対パス化するようにした
qwerty2501 Sep 10, 2022
d6f0451
Outputを絶対パス化した
qwerty2501 Sep 10, 2022
428dbec
Update .github/workflows/download_test.yml
qwerty2501 Sep 10, 2022
f55f52b
元のパラメタが正しかったので修正
qwerty2501 Sep 10, 2022
d935baf
includeディレクトリを追加するのをやめてカレントディレクトリからの参照にするようにした
qwerty2501 Sep 10, 2022
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
13 changes: 13 additions & 0 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,16 @@ jobs:
prerelease: true
tag: ${{ env.VERSION }}
file: ${{ steps.build-voicevox-core-python-api.outputs.whl }}
deploy_downloader:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Upload to Release
if: env.VERSION != 'DEBUG' && env.SKIP_UPLOADING_RELEASE_ASSET == '0'
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
prerelease: true
file: scripts/downloads/*
file_glob: true
tag: ${{ env.VERSION }}
270 changes: 270 additions & 0 deletions .github/workflows/download_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,270 @@
name: Download test workflow
on:
push:
branches:
- main
pull_request:
paths:
- "scripts/downloads/*"
- ".github/workflows/download_test.yml"
jobs:
downlaod-releases:
strategy:
fail-fast: false
matrix:
include:
- name: 通常ダウンロード
os: windows-latest
download_command: ./scripts/downloads/Download.ps1
download_dir: voicevox_core
check_items: |
core.dll
open_jtalk_dic_utf_8-1.11
README.txt
check_not_exists_items: |
*directml*
*cuda*
*cudnn*
*onnxruntime*providers*
*eula*
*nvidia*
*cufft*
*curand*
- name: output先指定ダウンロード
os: windows-latest
download_command: ./scripts/downloads/Download.ps1 -Output other_output
qwerty2501 marked this conversation as resolved.
Show resolved Hide resolved
download_dir: other_output
check_items: |
core.dll
open_jtalk_dic_utf_8-1.11
README.txt
check_not_exists_items: |
*directml*
*cuda*
*cudnn*
*onnxruntime*providers*
*eula*
*nvidia*
*cufft*
*curand*
- name: Min option確認
os: windows-latest
download_command: ./scripts/downloads/Download.ps1 -Min $True
download_dir: voicevox_core
check_items: |
core.dll
README.txt
check_not_exists_items: |
*directml*
*cuda*
*cudnn*
*onnxruntime*providers*
*eula*
*nvidia*
*cufft*
*curand*
open_jtalk_dic_utf_8-1.11
- name: DirectML option確認
os: windows-latest
download_command: ./scripts/downloads/Download.ps1 -Accelerator directml
download_dir: voicevox_core
check_items: |
core.dll
open_jtalk_dic_utf_8-1.11
README.txt
DirectML.dll
DirectML_LICENSE.txt
check_not_exists_items: |
*directml*
*cuda*
*cudnn*
*eula*
*nvidia*
*cufft*
*curand*
- name: DirectMLかつMin option確認
os: windows-latest
download_command: ./scripts/downloads/Download.ps1 -Accelerator directml -Min $true
download_dir: voicevox_core
check_items: |
core.dll
README.txt
check_not_exists_items: |
*cuda*
*cudnn*
*eula*
*nvidia*
*cufft*
*curand*
Directml.dll
DirectML_LICENSE.txt
open_jtalk_dic_utf_8-1.11
- name: cuda option確認
os: windows-latest
download_command: ./scripts/downloads/Download.ps1 -Accelerator cuda
download_dir: voicevox_core
check_items: |
core.dll
open_jtalk_dic_utf_8-1.11
README.txt
EULA.txt
NVIDIA_SLA_cuDNN_Support.txt
cublas64_*.dll
cublasLt64_*.dll
cudart64_*.dll
cudnn64_*.dll
cudnn_adv_infer64_*.dll
cudnn_cnn_infer64_*.dll
cudnn_ops_infer64_*.dll
cufft64_*.dll
curand64_*.dll
check_not_exists_items: |
*directml*
- name: cudaかつmin option確認
os: windows-latest
download_command: ./scripts/downloads/Download.ps1 -Accelerator cuda -Min $true
download_dir: voicevox_core
check_items: |
core.dll
README.txt
check_not_exists_items: |
*directml*
EULA.txt
NVIDIA_SLA_cuDNN_Support.txt
cublas64_*.dll
cublasLt64_*.dll
cudart64_*.dll
cudnn64_*.dll
cudnn_adv_infer64_*.dll
cudnn_cnn_infer64_*.dll
cudnn_ops_infer64_*.dll
cufft64_*.dll
curand64_*.dll
open_jtalk_dic_utf_8-1.11
- name: 通常ダウンロード
os: ubuntu-latest
download_command: ./scripts/downloads/download.sh
download_dir: voicevox_core
check_items: |
libcore.so
open_jtalk_dic_utf_8-1.11
README.txt
check_not_exists_items: |
*directml*
*cuda*
*cudnn*
*onnxruntime*providers*
*eula*
*nvidia*
*cufft*
*curand*
- name: output先指定ダウンロード
os: ubuntu-latest
download_command: ./scripts/downloads/download.sh --output other_output
download_dir: other_output
check_items: |
libcore.so
open_jtalk_dic_utf_8-1.11
README.txt
check_not_exists_items: |
*directml*
*cuda*
*cudnn*
*onnxruntime*providers*
*eula*
*nvidia*
*cufft*
*curand*
- name: min option確認
os: ubuntu-latest
download_command: ./scripts/downloads/download.sh --min
download_dir: voicevox_core
check_items: |
libcore.so
README.txt
check_not_exists_items: |
*directml*
*cuda*
*cudnn*
*onnxruntime*providers*
*eula*
*nvidia*
*cufft*
*curand*
open_jtalk_dic_utf_8-1.11
- name: cuda option確認
os: ubuntu-latest
download_command: ./scripts/downloads/download.sh --accelerator cuda
download_dir: voicevox_core
check_items: |
libcore.so
open_jtalk_dic_utf_8-1.11
README.txt
EULA.txt
NVIDIA_SLA_cuDNN_Support.txt
libcublas.so.*
libcublasLt.so.*
libcudnn.so.*
libcudnn_adv_infer.so.*
libcudnn_cnn_infer.so.*
libcudnn_ops_infer.so.*
libcufft.so.*
libcurand.so.*
check_not_exists_items: |
*directml*
- name: cudaかつmin option確認
os: ubuntu-latest
download_command: ./scripts/downloads/download.sh --accelerator cuda --min
download_dir: voicevox_core
check_items: |
libcore.so
README.txt
check_not_exists_items: |
*directml*
EULA.txt
NVIDIA_SLA_cuDNN_Support.txt
libcublas.so.*
libcublasLt.so.*
libcudnn.so.*
libcudnn_adv_infer.so.*
libcudnn_cnn_infer.so.*
libcudnn_ops_infer.so.*
libcufft.so.*
libcurand.so.*
open_jtalk_dic_utf_8-1.11
runs-on: ${{ matrix.os }}
name: ${{ matrix.name }}-${{ matrix.os }}
env:
EXPECTED_VOICEVOX_CORE_VERSION: ${{ matrix.expected_version || 'latest' }}
steps:
- uses: actions/checkout@v2
- name: Execute download command
run: ${{ matrix.download_command }}
- name: Get latest version
if: ${{ env.EXPECTED_VOICEVOX_CORE_VERSION == 'latest' }}
shell: bash
run: |
echo "EXPECTED_VOICEVOX_CORE_VERSION=$(curl -sSfI "https://github.com/VOICEVOX/voicevox_core/releases/latest"| grep "location:" | sed -e "s%location: https://github.com/VOICEVOX/voicevox_core/releases/tag/%%" | sed 's/\r//g')" >> $GITHUB_ENV
- name: Check downloaded version
shell: bash
run: |
[ -e "${{ matrix.download_dir }}/VERSION" ]
[ "$(cat "${{ matrix.download_dir }}/VERSION")" = "${{ env.EXPECTED_VOICEVOX_CORE_VERSION }}" ]
- name: Check downloaded files
shell: bash
run: |
items=($(echo -e "${{ matrix.check_items }}" | xargs))
for item in "${items[@]}"
do
echo "check exists ${{ matrix.download_dir }}/${item}..."
[ -e "${{ matrix.download_dir }}"/${item} ]
done
- name: Check should not exists files
shell: bash
run: |
items=($(echo -e "${{ matrix.check_not_exists_items }}" | xargs))
for item in "${items[@]}"
do
echo "check should not exists ${{ matrix.download_dir }}/${item}..."
[ ! -e "${{ matrix.download_dir }}"/${item} ]
done
Hiroshiba marked this conversation as resolved.
Show resolved Hide resolved
9 changes: 5 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,11 @@ jobs:
run: cargo build -p voicevox_core_c_api --features generate-c-header
- name: 必要なfileをunix用exampleのディレクトリに移動させる
run: |
cp -v target/core.h example/cpp/unix/
cp -v target/debug/libcore.{so,dylib} example/cpp/unix/ || true
cp -v target/debug/build/onnxruntime-sys-*/out/onnxruntime_*/onnxruntime-*/lib/libonnxruntime.so.* example/cpp/unix/ || true
cp -v target/debug/build/onnxruntime-sys-*/out/onnxruntime_*/onnxruntime-*/lib/libonnxruntime.*.dylib example/cpp/unix/ || true
mkdir -p example/cpp/unix/voicevox_core/
cp -v target/core.h example/cpp/unix/voicevox_core/
cp -v target/debug/libcore.{so,dylib} example/cpp/unix/voicevox_core/ || true
cp -v target/debug/build/onnxruntime-sys-*/out/onnxruntime_*/onnxruntime-*/lib/libonnxruntime.so.* example/cpp/unix/voicevox_core/ || true
cp -v target/debug/build/onnxruntime-sys-*/out/onnxruntime_*/onnxruntime-*/lib/libonnxruntime.*.dylib example/cpp/unix/voicevox_core/ || true
qwerty2501 marked this conversation as resolved.
Show resolved Hide resolved

- if: startsWith(matrix.os, 'mac')
uses: jwlawson/[email protected]
Expand Down
Loading