fix encoding & path issue

Author: yqzhishen

inference/svs/gradio/infer.py

@@ -81,7 +81,7 @@ def run(self):
 
 
 if __name__ == '__main__':
-    gradio_config = yaml.safe_load(open('inference/svs/gradio/gradio_settings.yaml'))
+    gradio_config = yaml.safe_load(open('inference/svs/gradio/gradio_settings.yaml', encoding='utf-8'))
     g = GradioInfer(**gradio_config)
     g.run()
 

main.py

@@ -8,7 +8,7 @@
 
 from inference.svs.ds_e2e import DiffSingerE2EInfer
 
-root_dir = os.path.dirname(__file__)
+root_dir = os.path.dirname(os.path.abspath(__file__))
 os.environ['PYTHONPATH'] = f'"{root_dir}"'
 
 parser = argparse.ArgumentParser(description='Run DiffSinger inference')

usr/configs/popcs_ds_beta6.yaml

@@ -23,8 +23,8 @@ datasets: [
   'popcs',
 ]
 test_prefixes: [
-  'popcs-˵ɢ¾ÍÉ¢',
-  'popcs-ÒþÐεijá°ò',
+  'popcs-说散就散',
+  'popcs-隐形的翅膀',
 ]
 
 spec_min: [-6.8276, -7.0270, -6.8142, -7.1429, -7.6669, -7.6000, -7.1148, -6.9640,

utils/hparams.py

@@ -45,7 +45,7 @@ def set_hparams(config='', exp_name='', hparams_str='', print_hparams=True, glob
     loaded_config = set()
 
     def load_config(config_fn):  # deep first
-        with open(config_fn) as f:
+        with open(config_fn, encoding='utf-8') as f:
             hparams_ = yaml.safe_load(f)
         loaded_config.add(config_fn)
         if 'base_config' in hparams_:
@@ -71,7 +71,7 @@ def load_config(config_fn):  # deep first
         ckpt_config_path = f'{args_work_dir}/config.yaml'
         if os.path.exists(ckpt_config_path):
             try:
-                with open(ckpt_config_path) as f:
+                with open(ckpt_config_path, encoding='utf-8') as f:
                     saved_hparams.update(yaml.safe_load(f))
             except:
                 pass

vocoders/pwg.py

@@ -15,7 +15,7 @@
 
 def load_pwg_model(config_path, checkpoint_path, stats_path):
     # load config
-    with open(config_path) as f:
+    with open(config_path, encoding='utf-8') as f:
         config = yaml.load(f, Loader=yaml.Loader)
 
     # setup