Merge branch 'master' into fix-gan-dur

models.py

@@ -669,8 +669,7 @@ class SynthesizerTrn(nn.Module):
         l_length_sdp = self.sdp(x, x_mask, w, g=g)
         l_length_sdp = l_length_sdp / torch.sum(x_mask)
         
-        #logw_ = torch.log(w + 1e-6) * x_mask
-        logw_ = torch.log((w-torch.rand_like(w)) * x_mask + 1e-6) * x_mask
+        logw_ = torch.log(w + 1e-6) * x_mask
         logw = self.dp(x, x_mask, g=g)
         l_length_dp = torch.sum((logw - logw_) ** 2, [1, 2]) / torch.sum(x_mask)  # for averaging
 

requirements.txt

@@ -1,11 +1,15 @@
-Cython==0.29.21
+Cython
 librosa==0.9.1
 matplotlib==3.3.1
 numpy
-phonemizer==2.2.1
-scipy==1.5.2
-tensorboard==2.3.0
+phonemizer
+scipy
+tensorboard
 torch
 torchvision
-Unidecode==1.1.1
+Unidecode
 amfm_decompy
+jieba
+transformers
+pypinyin
+cn2an

utils.py

@@ -206,7 +206,7 @@ def clean_checkpoints(path_to_models='logs/44k/', n_ckpts_to_keep=2, sort_by_tim
 
 def get_hparams_from_dir(model_dir):
     config_save_path = os.path.join(model_dir, "config.json")
-    with open(config_save_path, "r") as f:
+    with open(config_save_path, "r", encoding='utf-8') as f:
         data = f.read()
     config = json.loads(data)