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

merge upstream 0.21.0 #11

Merged
merged 12 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/actions/prepare_python/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ inputs:
python-version:
description: "インストールされる Python ランタイムのバージョン。デフォルト値はこのリポジトリが想定する Python バージョン。"
required: false
default: "3.11.3"
default: "3.11.9"
outputs:
python-version:
description: "Python version"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-engine-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

env:
IMAGE_NAME: ${{ vars.DOCKERHUB_USERNAME }}/voicevox_nemo_engine
VOICEVOX_RESOURCE_VERSION: "0.20.0"
VOICEVOX_RESOURCE_VERSION: "0.21.0"
VOICEVOX_CORE_VERSION: "0.15.0"

defaults:
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/build-engine-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
default: false

env:
VOICEVOX_RESOURCE_VERSION: "0.20.0"
VOICEVOX_RESOURCE_VERSION: "0.21.0"
VOICEVOX_CORE_VERSION: "0.15.0"

defaults:
Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:
# 一度代入して actionlint のエラー回避 (詳細: NOTE 1)
OS=${{ matrix.os }}
if [[ $OS == windows-* ]]; then
curl -L "${{ matrix.cudnn_url }}" > download/cudnn.zip
curl -L --retry 3 --retry-delay 5 "${{ matrix.cudnn_url }}" > download/cudnn.zip

unzip download/cudnn.zip cudnn-*/bin/*.dll -d download/cudnn_tmp

Expand All @@ -225,7 +225,7 @@ jobs:

rm download/cudnn.zip
else
curl -L "${{ matrix.cudnn_url }}" > download/cudnn.tar.xz
curl -L --retry 3 --retry-delay 5 "${{ matrix.cudnn_url }}" > download/cudnn.tar.xz

tar -Jxf download/cudnn.tar.xz -C download/

Expand Down Expand Up @@ -263,7 +263,7 @@ jobs:
- name: <Setup> Download zlib dynamic Library
if: steps.zlib-cache-restore.outputs.cache-hit != 'true' && matrix.zlib_url != ''
run: |
curl -L "${{ matrix.zlib_url }}" -o download/zlib.zip
curl -L --retry 3 --retry-delay 5 "${{ matrix.zlib_url }}" -o download/zlib.zip
mkdir -p download/zlib

# extract only dlls
Expand Down Expand Up @@ -329,7 +329,7 @@ jobs:
- name: <Setup> Set up DirectML dynamic Library
if: steps.directml-cache-restore.outputs.cache-hit != 'true' && endswith(matrix.target, '-directml')
run: |
curl -L "${{ matrix.directml_url }}" -o download/directml.zip
curl -L --retry 3 --retry-delay 5 "${{ matrix.directml_url }}" -o download/directml.zip
mkdir -p download/directml

# extract only dlls
Expand Down Expand Up @@ -359,7 +359,7 @@ jobs:
- name: <Setup> Download ONNX Runtime (Windows)
if: steps.onnxruntime-cache-restore.outputs.cache-hit != 'true' && startsWith(matrix.os, 'windows-')
run: |
curl -L "${{ matrix.onnxruntime_url }}" > download/onnxruntime.zip
curl -L --retry 3 --retry-delay 5 "${{ matrix.onnxruntime_url }}" > download/onnxruntime.zip

# extract only dlls
# 一度代入して actionlint のエラー回避 (詳細: NOTE 1)
Expand All @@ -379,7 +379,7 @@ jobs:
- name: <Setup> Download ONNX Runtime (Mac/Linux)
if: steps.onnxruntime-cache-restore.outputs.cache-hit != 'true' && startsWith(matrix.os, 'windows-') != true
run: |
curl -L "${{ matrix.onnxruntime_url }}" > download/onnxruntime.tgz
curl -L --retry 3 --retry-delay 5 "${{ 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
Expand Down Expand Up @@ -424,7 +424,8 @@ jobs:
env:
VOICEVOX_CORE_ASSET_NAME: ${{ matrix.voicevox_core_asset_prefix }}-${{ env.VOICEVOX_CORE_VERSION }}
run: |
curl -L "https://github.com/VOICEVOX/voicevox_nemo_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip
curl -L --retry 3 --retry-delay 5 \
"https://github.com/VOICEVOX/voicevox_nemo_core/releases/download/${{ env.VOICEVOX_CORE_VERSION }}/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip" > download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip
# 一度代入して actionlint のエラー回避 (詳細: NOTE 1)
OS=${{ matrix.os }}
if [[ $OS == mac-* ]]; then
Expand Down Expand Up @@ -606,7 +607,7 @@ jobs:
done

# Rename to artifact.vvpp if there are only artifact.001.vvppp
if [ "$(find ${{ steps.vars.outputs.package_name }}.*.vvppp -maxdepth 1 | wc -l)" == 1 ]; then
if [ "$(find ${{ steps.vars.outputs.package_name }}.*.vvppp -maxdepth 1 | wc -l)" -eq 1 ]; then
mv ${{ steps.vars.outputs.package_name }}.001.vvppp ${{ steps.vars.outputs.package_name }}.vvpp
fi

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-engine-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ jobs:
- name: <Setup> Download ENGINE package
run: |
mkdir -p download
curl -L -o "download/list.txt" "${{ steps.vars.outputs.release_url }}/${{ steps.vars.outputs.package_name }}.7z.txt"
<download/list.txt xargs -I '%' curl -L -o "download/%" "${{ steps.vars.outputs.release_url }}/%"
curl -L --retry 3 --retry-delay 5 -o "download/list.txt" "${{ steps.vars.outputs.release_url }}/${{ steps.vars.outputs.package_name }}.7z.txt"
<download/list.txt xargs -I '%' curl -L --retry 3 --retry-delay 5 -o "download/%" "${{ steps.vars.outputs.release_url }}/%"
7z x "download/$(head -n1 download/list.txt)"
mv "${{ matrix.target }}" dist/

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ GitHub Issues を用いて機能向上を一元管理しています。

## 環境構築

`Python 3.11.3` を用いて開発されています。
`Python 3.11.9` を用いて開発されています。
インストールするには、各 OS ごとの C/C++ コンパイラ、CMake が必要になります。

### 依存ライブラリをインストールする
Expand Down Expand Up @@ -247,7 +247,7 @@ poetry update # 全部更新
#### パッケージ情報を pip requirements.txt ファイルへ反映する

```bash
poetry export --without-hashes -o requirements.txt # こちらを更新する場合は下3つも更新する必要があります
poetry export --without-hashes -o requirements.txt # こちらを更新する場合は下2つも更新する必要があります
poetry export --without-hashes --with dev -o requirements-dev.txt
poetry export --without-hashes --with build -o requirements-build.txt
```
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ RUN <<EOF
rm -rf /var/lib/apt/lists/*
EOF

ARG PYTHON_VERSION=3.11.3
ARG PYENV_VERSION=v2.3.17
ARG PYTHON_VERSION=3.11.9
ARG PYENV_VERSION=v2.4.11
ARG PYENV_ROOT=/tmp/.pyenv
ARG PYBUILD_ROOT=/tmp/python-build
RUN <<EOF
Expand Down Expand Up @@ -283,7 +283,7 @@ RUN <<EOF
EOF

# Download Resource
ARG VOICEVOX_RESOURCE_VERSION=0.20.0
ARG VOICEVOX_RESOURCE_VERSION=0.21.0
RUN <<EOF
set -eux

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ curl -s \
> audio.wav
```

スコアの`key`は MIDI 番号です。
楽譜の`key`は MIDI 番号です。
`lyric`は歌詞で、任意の文字列を指定できますが、エンジンによってはひらがな・カタカナ1モーラ以外の文字列はエラーになることがあります。
フレームレートはデフォルトが 93.75Hz で、エンジンマニフェストの`frame_rate`で取得できます。
1つ目のノートは無音である必要があります。
Expand Down Expand Up @@ -497,7 +497,7 @@ VOICEVOX ENGINE は皆さんのコントリビューションをお待ちして

### 環境構築

`Python 3.11.3` を用いて開発されています。
`Python 3.11.9` を用いて開発されています。
インストールするには、各 OS ごとの C/C++ コンパイラ、CMake が必要になります。

```bash
Expand Down
Loading