From 38adf4392457676ae14d94d3e0a16d55ebca9fef Mon Sep 17 00:00:00 2001
From: litagin02 <litagin02@gmail.com>
Date: Mon, 9 Sep 2024 15:31:30 +0900
Subject: [PATCH] Fix: colab torchvision bug, explicit torchaudio version

---
 README.md                     | 3 ++-
 colab.ipynb                   | 2 +-
 configs/config.json           | 2 +-
 configs/config_jp_extra.json  | 2 +-
 docs/CHANGELOG.md             | 4 ++++
 requirements-colab.txt        | 1 +
 requirements.txt              | 2 +-
 style_bert_vits2/constants.py | 2 +-
 8 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ef5b14a..6126c81 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ You can install via `pip install style-bert-vits2` (inference only), see [librar
 - [Zennの解説記事](https://zenn.dev/litagin/articles/034819a5256ff4)
 
 - [**リリースページ**](https://github.com/litagin02/Style-Bert-VITS2/releases/)、[更新履歴](/docs/CHANGELOG.md)
+  - 2024-09-09: Ver 2.6.1: 依存性のcolabバグ等修正のみ
   - 2024-06-16: Ver 2.6.0 (モデルの差分マージ・加重マージ・ヌルモデルマージの追加、使い道については[この記事](https://zenn.dev/litagin/articles/1297b1dc7bdc79)参照)
   - 2024-06-14: Ver 2.5.1 (利用規約をお願いへ変更したのみ)
   - 2024-06-02: Ver 2.5.0 (**[利用規約](/docs/TERMS_OF_USE.md)の追加**、フォルダ分けからのスタイル生成、小春音アミ・あみたろモデルの追加、インストールの高速化等)
@@ -78,7 +79,7 @@ powershell -c "irm https://astral.sh/uv/install.ps1 | iex"
 git clone https://github.com/litagin02/Style-Bert-VITS2.git
 cd Style-Bert-VITS2
 uv venv venv
-uv pip install torch torchaudio --index-url https://download.pytorch.org/whl/cu118
+uv pip install "torch<2.4" "torchaudio<2.4" --index-url https://download.pytorch.org/whl/cu118
 uv pip install -r requirements.txt
 venv\Scripts\activate
 python initialize.py  # 必要なモデルとデフォルトTTSモデルをダウンロード
diff --git a/colab.ipynb b/colab.ipynb
index b617a28..c400e65 100644
--- a/colab.ipynb
+++ b/colab.ipynb
@@ -6,7 +6,7 @@
     "id": "F7aJhsgLAWvO"
    },
    "source": [
-    "# Style-Bert-VITS2 (ver 2.6.0) のGoogle Colabでの学習\n",
+    "# Style-Bert-VITS2 (ver 2.6.1) のGoogle Colabでの学習\n",
     "\n",
     "Google Colab上でStyle-Bert-VITS2の学習を行うことができます。\n",
     "\n",
diff --git a/configs/config.json b/configs/config.json
index abaae81..d1edf16 100644
--- a/configs/config.json
+++ b/configs/config.json
@@ -69,5 +69,5 @@
     "use_spectral_norm": false,
     "gin_channels": 256
   },
-  "version": "2.6.0"
+  "version": "2.6.1"
 }
diff --git a/configs/config_jp_extra.json b/configs/config_jp_extra.json
index b6edffb..fa93293 100644
--- a/configs/config_jp_extra.json
+++ b/configs/config_jp_extra.json
@@ -76,5 +76,5 @@
       "initial_channel": 64
     }
   },
-  "version": "2.6.0-JP-Extra"
+  "version": "2.6.1-JP-Extra"
 }
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index b928be2..ab53682 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.6.1 (2024-09-09)
+
+torchのバージョン由来の不具合修正のみ
+
 ## v2.6.0 (2024-06-16)
 
 ### 新機能
diff --git a/requirements-colab.txt b/requirements-colab.txt
index 87b6784..ccdff15 100644
--- a/requirements-colab.txt
+++ b/requirements-colab.txt
@@ -15,5 +15,6 @@ pypinyin
 pyworld-prebuilt
 torch<2.4
 torchaudio
+torchvision<0.19
 transformers
 umap-learn
diff --git a/requirements.txt b/requirements.txt
index ea5bfe5..1d54159 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,6 +20,6 @@ pyworld-prebuilt
 stable_ts
 tensorboard
 torch<2.4
-torchaudio
+torchaudio<2.4
 transformers
 umap-learn
diff --git a/style_bert_vits2/constants.py b/style_bert_vits2/constants.py
index c0df22b..40bfdba 100644
--- a/style_bert_vits2/constants.py
+++ b/style_bert_vits2/constants.py
@@ -4,7 +4,7 @@ from style_bert_vits2.utils.strenum import StrEnum
 
 
 # Style-Bert-VITS2 のバージョン
-VERSION = "2.6.0"
+VERSION = "2.6.1"
 
 # Style-Bert-VITS2 のベースディレクトリ
 BASE_DIR = Path(__file__).parent.parent