support pitch control in main.py

Author: yqzhishen

main.py

@@ -8,6 +8,7 @@
 import torch
 
 from crossfade import cross_fade
+from inference.svs.ds_cascade import DiffSingerCascadeInfer
 from inference.svs.ds_e2e import DiffSingerE2EInfer
 from utils.audio import save_wav
 from utils.hparams import set_hparams, hparams
@@ -20,36 +21,39 @@
 parser.add_argument('--exp', type=str, required=False, help='Selection of model')
 parser.add_argument('--out', type=str, required=False, help='Path of the output folder')
 parser.add_argument('--title', type=str, required=False, help='Title of output file')
-parser.add_argument('--num', type=int, default=1, help='Number of runs')
-parser.add_argument('--seed', type=int, help='Random seed of the inference')
-parser.add_argument('--speedup', type=int, default=0, help='PNDM speed-up ratio')
+parser.add_argument('--num', type=int, required=False, default=1, help='Number of runs')
+parser.add_argument('--seed', type=int, required=False, help='Random seed of the inference')
+parser.add_argument('--speedup', type=int, required=False, default=0, help='PNDM speed-up ratio')
+parser.add_argument('--pitch', action='store_true', required=False, default=False, help='Enable manual pitch mode')
 args = parser.parse_args()
 
 name = os.path.basename(args.proj).split('.')[0] if not args.title else args.title
 exp = args.exp
 if not exp:
-    if os.path.exists(os.path.join(root_dir, 'checkpoints/0814_opencpop_ds_rhythm_fix')):
+    if args.pitch:
+        exp = '0909_opencpop_ds100_pitchcontrol'
+    elif os.path.exists(os.path.join(root_dir, 'checkpoints/0814_opencpop_ds_rhythm_fix')):
         exp = '0814_opencpop_ds_rhythm_fix'
     else:
         exp = '0814_opencpop_500k（修复无参音素）'
 out = args.out
 if not out:
     out = os.path.dirname(os.path.abspath(args.proj))
 
-with open(args.proj, 'r', encoding='utf-8') as f:
-    params = json.load(f)
-
 sys.argv = [
-    f'{root_dir}/inference/svs/ds_e2e.py',
+    f'{root_dir}/inference/svs/ds_e2e.py' if not args.pitch else f'{root_dir}/inference/svs/ds_cascade.py',
     '--config',
-    f'{root_dir}/usr/configs/midi/e2e/opencpop/ds100_adj_rel.yaml',
+    f'{root_dir}/usr/configs/midi/e2e/opencpop/ds100_adj_rel.yaml' if not args.pitch else f'{root_dir}/usr/configs/midi/cascade/opencs/ds100_rel.yaml',
     '--exp_name',
     exp
 ]
 
 if args.speedup > 0:
     sys.argv += ['--hparams', f'pndm_speedup={args.speedup}']
 
+with open(args.proj, 'r', encoding='utf-8') as f:
+    params = json.load(f)
+
 if not isinstance(params, list):
     params = [params]
 
@@ -58,7 +62,7 @@
 
 infer_ins = None
 if len(params) > 0:
-    infer_ins = DiffSingerE2EInfer(hparams)
+    infer_ins = DiffSingerE2EInfer(hparams) if not args.pitch else DiffSingerCascadeInfer(hparams)
 
 
 def infer_once(path: str):