Merge 0.15.5
#894
Open
Merge 0.15.5
#894
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* remove contour and rename to talk xxx * fix speaker id map * rename functions and variables * add models to model file * add sing style and source filter models to model file set * add new models to status * rename get model index and speaker id * add new models session * change i32 to i64 * add new predictor to inference core * add new predictor to core * add new predictor to compatible engine * rename source filter to sf decode * fix rename miss * rename sing style to sing teacher * fix rename miss * remove vector * add TODO comment (add sing tests) Co-authored-by: Hiroshiba <[email protected]> * fix comment out * lint --------- Co-authored-by: Hiroshiba <[email protected]>
* fix is model loaded bug * Apply suggestions from code review --------- Co-authored-by: Hiroshiba <[email protected]>
* update shape * using f0 * fmt
project-s用のテストの枠組みだけ作った
* add models * remove comment out * fix merge miss * add tests to status * add onnx file to typos exclude files * rename model file * fmt --------- Co-authored-by: Hiroshiba <[email protected]>
* style_typeの名称変更 * いらない変更が入ってた
* release-0.15のmacos-11をmacos-12にアップデートしておく * 空コミット * --locked * 戻した * 要らない変更
qryxip
commented
Dec 14, 2024
Comment on lines
+44
to
+52
| SINGING_TEACHER = "singing_teacher" | ||
| """歌唱音声合成用のクエリの作成が可能。""" | ||
|
|
||
| FRAME_DECODE = "frame_decode" | ||
| """歌唱音声合成が可能。""" | ||
|
|
||
| SING = "sing" | ||
| """歌唱音声合成用のクエリの作成と歌唱音声合成が可能。""" | ||
|
|
There was a problem hiding this comment.
これは入れ忘れだったものなので、別PRを作るべき。
以下のようにしてマージ。
- ソングのモデルもsample.vvmの中に入れて一つにする。それに伴い、
`release-0.15`で増えた一部のテストは削除
- モデルのロードに関しては、現行のVVMを前提にした処理に置き換える。
- 推論の実行に関しては`ndarray`を前提とした処理に置き換える。
- 以下に示す、その他の今の`main`にそぐわないコードは、fixmeを付けて残
す。
- 暫定対応のはずの、cargo-binstallへの`--locked`
- デッドコードである、`UnsupportedModel`と
`VOICEVOX_RESULT_UNSUPPORTED_MODEL_ERROR`
- 嘘コメントと化している、"TODO: sing系のテストを足す"
|
テストはhttps://github.com/VOICEVOX/voicevox_core/tree/release-0.15にあるものしか入れておらず、動作はまだ未確認。 |
qryxip
commented
Dec 15, 2024
| @@ -148,6 +148,7 @@ pub enum ErrorKind { | |||
| StyleNotFound, | |||
| /// 音声モデルIDに対する音声モデルが見つからなかった。 | |||
| ModelNotFound, | |||
| UnsupportedModel, // FIXME: dead code | |||
There was a problem hiding this comment.
もしかしたら、release-0.15にリファクタPRを発射した方が良いかもしれない。
Hiroshiba
approved these changes
Dec 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
内容
詳細はマージコミットのコミットメッセージに書きました。このコミットメッセージもレビュー対象にして頂きたく。
関連 Issue
Resolves: #737
その他
参考: 0.14.6...0.15.5