diff --git a/colab.ipynb b/colab.ipynb index a48affc..97a5b8d 100644 --- a/colab.ipynb +++ b/colab.ipynb @@ -4,7 +4,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "# Style-Bert-VITS2 (ver 2.3.1) のGoogle Colabでの学習\n", + "# Style-Bert-VITS2 (ver 2.4) のGoogle Colabでの学習\n", "\n", "Google Colab上でStyle-Bert-VITS2の学習を行うことができます。\n", "\n", @@ -219,7 +219,7 @@ "batch_size = 4\n", "\n", "# 学習のエポック数(データセットを合計何周するか)。\n", - "# 100ぐらいで十分かもしれませんが、もっと多くやると質が上がるのかもしれません。\n", + "# 100で多すぎるほどかもしれませんが、もっと多くやると質が上がるのかもしれません。\n", "epochs = 100\n", "\n", "# 保存頻度。何ステップごとにモデルを保存するか。分からなければデフォルトのままで。\n", @@ -255,7 +255,7 @@ }, "outputs": [], "source": [ - "from webui_train import preprocess_all\n", + "from webui.train import preprocess_all\n", "\n", "preprocess_all(\n", " model_name=model_name,\n", @@ -307,7 +307,7 @@ "\n", "\n", "import yaml\n", - "from webui_train import get_path\n", + "from webui.train import get_path\n", "\n", "dataset_path, _, _, _, config_path = get_path(model_name)\n", "\n", @@ -350,41 +350,9 @@ }, "outputs": [], "source": [ - "#@title 学習結果を試すならここから\n", + "# 学習結果を試す・マージ・スタイル分けはこちらから\n", "!python app.py --share --dir {assets_root}" ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## 5. スタイル分け" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "!python webui_style_vectors.py --share" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## 6. マージ" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "!python webui_merge.py --share" - ] } ], "metadata": { diff --git a/style_bert_vits2/tts_model.py b/style_bert_vits2/tts_model.py index 4276c97..f7d4f21 100644 --- a/style_bert_vits2/tts_model.py +++ b/style_bert_vits2/tts_model.py @@ -22,14 +22,13 @@ from style_bert_vits2.constants import ( DEFAULT_STYLE_WEIGHT, Languages, ) +from style_bert_vits2.logging import logger from style_bert_vits2.models.hyper_parameters import HyperParameters from style_bert_vits2.models.infer import get_net_g, infer from style_bert_vits2.models.models import SynthesizerTrn from style_bert_vits2.models.models_jp_extra import ( SynthesizerTrn as SynthesizerTrnJPExtra, ) - -from style_bert_vits2.logging import logger from style_bert_vits2.voice import adjust_voice