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

整理: replace_phoneme_length() の見通し改善 #909

Merged
merged 6 commits into from
Dec 22, 2023

Conversation

tarepan
Copy link
Contributor

@tarepan tarepan commented Dec 20, 2023

内容

replace_phoneme_length() の関数ネスト廃止等によるリファクタリング

昨今のリファクタリングにより、 tts_engine.py の各関数が簡素化した。
その結果、現在の replace_phoneme_length() 内で call されている関数をバラしても(ネストを廃止しても)簡潔なコードが得られるようになった。
またネストの廃止により処理の配置が最適化でき、実行高速化や見通し改善が可能になっている。

よって本 PR では、replace_phoneme_length() の関数ネスト廃止等によるリファクタリングを提案します。

Reviewer 向け情報

変更内容

バラされた(ネストが廃止された)関数は以下の2つ:

  • pre_process()
  • split_mora():(副次効果: 不要コード実行の削減による高速化)

その他、変数名の簡潔化やコード表現簡潔化によるリファクタリングを本 PR は含む。

関連 Issue

part of #792

@tarepan tarepan requested a review from a team as a code owner December 20, 2023 07:30
@tarepan tarepan requested review from y-chan and removed request for a team December 20, 2023 07:30
Copy link

github-actions bot commented Dec 20, 2023

Coverage Result

Resultを開く
Name Stmts Miss Cover
run.py 487 333 coverage-32%
voicevox_engine/init.py 1 0 coverage-100%
voicevox_engine/cancellable_engine.py 91 71 coverage-22%
voicevox_engine/core_wrapper.py 208 150 coverage-28%
voicevox_engine/dev/core/init.py 2 0 coverage-100%
voicevox_engine/dev/core/mock.py 27 12 coverage-56%
voicevox_engine/dev/synthesis_engine/init.py 2 0 coverage-100%
voicevox_engine/dev/synthesis_engine/mock.py 38 2 coverage-95%
voicevox_engine/engine_manifest/EngineManifest.py 34 0 coverage-100%
voicevox_engine/engine_manifest/EngineManifestLoader.py 12 0 coverage-100%
voicevox_engine/engine_manifest/init.py 3 0 coverage-100%
voicevox_engine/library_manager.py 93 5 coverage-95%
voicevox_engine/metas/Metas.py 33 0 coverage-100%
voicevox_engine/metas/MetasStore.py 18 8 coverage-56%
voicevox_engine/metas/init.py 2 0 coverage-100%
voicevox_engine/model.py 162 9 coverage-94%
voicevox_engine/morphing.py 70 46 coverage-34%
voicevox_engine/part_of_speech_data.py 5 0 coverage-100%
voicevox_engine/preset/Preset.py 12 0 coverage-100%
voicevox_engine/preset/PresetError.py 2 0 coverage-100%
voicevox_engine/preset/PresetManager.py 81 2 coverage-98%
voicevox_engine/preset/init.py 4 0 coverage-100%
voicevox_engine/setting/Setting.py 11 0 coverage-100%
voicevox_engine/setting/SettingLoader.py 18 0 coverage-100%
voicevox_engine/setting/init.py 3 0 coverage-100%
voicevox_engine/tts_pipeline/init.py 5 0 coverage-100%
voicevox_engine/tts_pipeline/acoustic_feature_extractor.py 25 1 coverage-96%
voicevox_engine/tts_pipeline/full_context_label.py 148 3 coverage-98%
voicevox_engine/tts_pipeline/kana_parser.py 86 1 coverage-99%
voicevox_engine/tts_pipeline/make_tts_engines.py 59 30 coverage-49%
voicevox_engine/tts_pipeline/mora_list.py 4 0 coverage-100%
voicevox_engine/tts_pipeline/tts_engine.py 215 18 coverage-92%
voicevox_engine/tts_pipeline/tts_engine_base.py 76 11 coverage-86%
voicevox_engine/user_dict.py 144 12 coverage-92%
voicevox_engine/utility/init.py 5 0 coverage-100%
voicevox_engine/utility/connect_base64_waves.py 37 0 coverage-100%
voicevox_engine/utility/core_version_utility.py 8 1 coverage-88%
voicevox_engine/utility/mutex_utility.py 10 0 coverage-100%
voicevox_engine/utility/path_utility.py 35 9 coverage-74%
TOTAL 2276 724 coverage-68%

@Hiroshiba Hiroshiba requested review from Hiroshiba and removed request for y-chan December 22, 2023 01:57
Copy link
Member

@Hiroshiba Hiroshiba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!!!

すみません、「推定する」は統計に馴染みがない人だと「推理する」に勘違いされると思うので、意識して使用するのをやめたほうがいいかなと思いました・・・!
詳しくコメントしてみました #909

voicevox_engine/tts_pipeline/tts_engine.py Outdated Show resolved Hide resolved
voicevox_engine/tts_pipeline/tts_engine.py Outdated Show resolved Hide resolved
@Hiroshiba
Copy link
Member

コンフリクト解消をちょっと間違えてしまいました 🙇
多分解消できたのでマージします!

@Hiroshiba Hiroshiba merged commit 7ab9226 into VOICEVOX:master Dec 22, 2023
3 checks passed
@tarepan tarepan deleted the refactor/p_len branch December 22, 2023 03:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants