RVC-Project
diff --git a/‎README.md
+31-4 b/‎README.md
+31-4
diff --git a/‎assets/Synthesizer_inputs.pth
120 KB b/‎assets/Synthesizer_inputs.pth
120 KB
diff --git a/‎assets/hubert/.gitignore
+1 b/‎assets/hubert/.gitignore
+1
diff --git a/‎assets/hubert/hubert_inputs.pth
165 KB b/‎assets/hubert/hubert_inputs.pth
165 KB
diff --git a/‎assets/rmvpe/.gitignore
+1 b/‎assets/rmvpe/.gitignore
+1
diff --git a/‎assets/rmvpe/rmvpe_inputs.pth
32.7 KB b/‎assets/rmvpe/rmvpe_inputs.pth
32.7 KB
diff --git a/‎configs/config.json
+1-15 b/‎configs/config.json
+1-15
diff --git a/‎configs/config.py
+12-1 b/‎configs/config.py
+12-1
diff --git a/‎docs/en/README.en.md
+6-1 b/‎docs/en/README.en.md
+6-1
@@ -68,12 +68,16 @@ poetry install
 你也可以通过 pip 来安装依赖：
 ```bash
 N卡：
-
-pip install -r requirements.txt
+  pip install -r requirements.txt
 
 A卡/I卡：
-pip install -r requirements-dml.txt
+  pip install -r requirements-dml.txt
+
+A卡Rocm（Linux）：
+  pip install -r requirements-amd.txt
 
+I卡IPEX（Linux）：
+  pip install -r requirements-ipex.txt
 ```
 
 ------
@@ -122,11 +126,34 @@ https://huggingface.co/lj1995/VoiceConversionWebUI/blob/main/rmvpe.pt
 ```bash
 python infer-web.py
 ```
-
 如果你正在使用Windows 或 macOS，你可以直接下载并解压`RVC-beta.7z`，前者可以运行`go-web.bat`以启动WebUI，后者则运行命令`sh ./run.sh`以启动WebUI。
 
+对于需要使用IPEX技术的I卡用户，请先在终端执行`source /opt/intel/oneapi/setvars.sh`（仅Linux）。
+
 仓库内还有一份`小白简易教程.doc`以供参考。
 
+## AMD显卡Rocm相关（仅Linux）
+如果你想基于AMD的Rocm技术在Linux系统上运行RVC，请先在[这里](https://rocm.docs.amd.com/en/latest/deploy/linux/os-native/install.html)安装所需的驱动。
+
+若你使用的是Arch Linux，可以使用pacman来安装所需驱动：
+````
+pacman -S rocm-hip-sdk rocm-opencl-sdk
+````
+对于某些型号的显卡，你可能需要额外配置如下的环境变量（如：RX6700XT）：
+````
+export ROCM_PATH=/opt/rocm
+export HSA_OVERRIDE_GFX_VERSION=10.3.0
+````
+同时确保你的当前用户处于`render`与`video`用户组内：
+````
+sudo usermod -aG render $USERNAME
+sudo usermod -aG video $USERNAME
+````
+之后运行WebUI：
+```bash
+python infer-web.py
+```
+
 ## 参考项目
 + [ContentVec](https://github.com/auspicious3000/contentvec/)
 + [VITS](https://github.com/jaywalnut310/vits)
 
@@ -1,2 +1,3 @@
 *
 !.gitignore
+!hubert_inputs.pth
@@ -1,2 +1,3 @@
 *
 !.gitignore
+!rmvpe_inputs.pth
@@ -1,15 +1 @@
-{
-  "pth_path": "assets/weights/kikiV1.pth",
-  "index_path": "logs/kikiV1.index",
-  "sg_input_device": "VoiceMeeter Output (VB-Audio Vo (MME)",
-  "sg_output_device": "VoiceMeeter Aux Input (VB-Audio (MME)",
-  "threhold": -45.0,
-  "pitch": 12.0,
-  "index_rate": 0.0,
-  "rms_mix_rate": 0.0,
-  "block_time": 0.25,
-  "crossfade_length": 0.04,
-  "extra_time": 2.0,
-  "n_cpu": 6.0,
-  "f0method": "rmvpe"
-}
+{"pth_path": "assets/weights/kikiV1.pth", "index_path": "logs/kikiV1.index", "sg_input_device": "VoiceMeeter Output (VB-Audio Vo (MME)", "sg_output_device": "VoiceMeeter Input (VB-Audio Voi (MME)", "threhold": -45.0, "pitch": 2.0, "rms_mix_rate": 0.0, "index_rate": 0.0, "block_time": 0.52, "crossfade_length": 0.15, "extra_time": 2.46, "n_cpu": 6.0, "use_jit": false, "f0method": "rmvpe"}
@@ -13,7 +13,7 @@
         from infer.modules.ipex import ipex_init
 
         ipex_init()
-except Exception:
+except Exception:  # pylint: disable=broad-exception-caught
     pass
 import logging
 
@@ -44,6 +44,7 @@ class Config:
     def __init__(self):
         self.device = "cuda:0"
         self.is_half = True
+        self.use_jit = False
         self.n_cpu = 0
         self.gpu_name = None
         self.json_config = self.load_config_json()
@@ -122,6 +123,15 @@ def has_xpu() -> bool:
     def use_fp32_config(self):
         for config_file in version_config_list:
             self.json_config[config_file]["train"]["fp16_run"] = False
+            with open(f"configs/{config_file}", "r") as f:
+                strr = f.read().replace("true", "false")
+            with open(f"configs/{config_file}", "w") as f:
+                f.write(strr)
+        with open("infer/modules/train/preprocess.py", "r") as f:
+            strr = f.read().replace("3.7", "3.0")
+        with open("infer/modules/train/preprocess.py", "w") as f:
+            f.write(strr)
+        print("overwrite preprocess and configs.json")
 
     def device_config(self) -> tuple:
         if torch.cuda.is_available():
@@ -237,4 +247,5 @@ def device_config(self) -> tuple:
                     )
                 except:
                     pass
+        print("is_half:%s, device:%s" % (self.is_half, self.device))
         return x_pad, x_query, x_center, x_max
@@ -97,7 +97,12 @@ sh ./run.sh
 ## Preparation of other Pre-models
 RVC requires other pre-models to infer and train.
 
-You need to download them from our [Huggingface space](https://huggingface.co/lj1995/VoiceConversionWebUI/tree/main/).
+```bash
+#Download all needed models from https://huggingface.co/lj1995/VoiceConversionWebUI/tree/main/
+python tools/download_models.py
+```
+
+Or just download them by yourself from our [Huggingface space](https://huggingface.co/lj1995/VoiceConversionWebUI/tree/main/).
 
 Here's a list of Pre-models and other files that RVC needs:
 ```bash
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`*`
`2`	`2`	`!.gitignore`
	`3`	`+!hubert_inputs.pth`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`*`
`2`	`2`	`!.gitignore`
	`3`	`+!rmvpe_inputs.pth`