Merge remote-tracking branch 'upstream/main' into clean

This commit is contained in:
Ftps
2023-08-27 12:43:37 +09:00
32 changed files with 1481 additions and 1501 deletions

14
configs/config.json Normal file
View File

@@ -0,0 +1,14 @@
{
"pth_path": "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": 0.0,
"index_rate": 1.0,
"block_time": 0.09,
"crossfade_length": 0.15,
"extra_time": 5.0,
"n_cpu": 8.0,
"f0method": "rmvpe"
}

View File

@@ -93,6 +93,7 @@ class Config:
if (
("16" in self.gpu_name and "V100" not in self.gpu_name.upper())
or "P40" in self.gpu_name.upper()
or "P10" in self.gpu_name.upper()
or "1060" in self.gpu_name
or "1070" in self.gpu_name
or "1080" in self.gpu_name
@@ -168,10 +169,11 @@ class Config:
)
except:
pass
import torch_directml
if self.device != "cpu":
import torch_directml
self.device = torch_directml.device(torch_directml.default_device())
self.is_half = False
self.device = torch_directml.device(torch_directml.default_device())
self.is_half = False
else:
if self.instead:
print(f"use {self.instead} instead")
@@ -196,3 +198,6 @@ class Config:
except:
pass
return x_pad, x_query, x_center, x_max
defaultconfig = Config()