From 757ee212f55ca3d5dab88ab7f3e7c4de7663e6e9 Mon Sep 17 00:00:00 2001 From: med Date: Fri, 1 Sep 2023 16:06:07 -0400 Subject: [PATCH 1/3] add validation files into bert generation list --- bert_gen.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bert_gen.py b/bert_gen.py index 3aedb63..d873223 100644 --- a/bert_gen.py +++ b/bert_gen.py @@ -39,8 +39,14 @@ def process_line(line): assert bert.shape[-1] == len(phone) torch.save(bert, bert_path) -with open(hps.data.training_files, encoding='utf-8') as f: - lines = f.readlines() + +lines = [] +with open(hps.data.training_files) as f: + lines.extend(f.readlines()) + +with open(hps.data.validation_files) as f: + lines.extend(f.readlines()) + with Pool(processes=12) as pool: #A100 suitable config,if coom,please decrease the processess number. for _ in tqdm(pool.imap_unordered(process_line, lines)): From fe904b9f5f0c4b5145c170775ec6018608302566 Mon Sep 17 00:00:00 2001 From: med Date: Sat, 2 Sep 2023 01:44:45 -0400 Subject: [PATCH 2/3] add --resume option --- train_ms.py | 10 +++++----- utils.py | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/train_ms.py b/train_ms.py index 81048e3..93846c2 100644 --- a/train_ms.py +++ b/train_ms.py @@ -155,11 +155,11 @@ def run(rank, n_gpus, hps): if pretrain_dir is None: try: if net_dur_disc is not None: - _, _, _, epoch_str = utils.load_checkpoint(utils.latest_checkpoint_path(hps.model_dir, "DUR_*.pth"), net_dur_disc, optim_dur_disc, skip_optimizer=True) - _, _, _, epoch_str = utils.load_checkpoint(utils.latest_checkpoint_path(hps.model_dir, "G_*.pth"), net_g, - optim_g, skip_optimizer=True) - _, _, _, epoch_str = utils.load_checkpoint(utils.latest_checkpoint_path(hps.model_dir, "D_*.pth"), net_d, - optim_d, skip_optimizer=True) + _, optim_dur_disc, _, epoch_str = utils.load_checkpoint(utils.latest_checkpoint_path(hps.model_dir, "DUR_*.pth"), net_dur_disc, optim_dur_disc, skip_optimizer=not hps.resume) + _, optim_g, _, epoch_str = utils.load_checkpoint(utils.latest_checkpoint_path(hps.model_dir, "G_*.pth"), net_g, + optim_g, skip_optimizer=not hps.resume) + _, optim_d, _, epoch_str = utils.load_checkpoint(utils.latest_checkpoint_path(hps.model_dir, "D_*.pth"), net_d, + optim_d, skip_optimizer=not hps.resume) epoch_str = max(epoch_str, 1) global_step = (epoch_str - 1) * len(train_loader) diff --git a/utils.py b/utils.py index 0e00972..f07a682 100644 --- a/utils.py +++ b/utils.py @@ -158,6 +158,7 @@ def get_hparams(init=True): help='JSON file for configuration') parser.add_argument('-m', '--model', type=str, required=True, help='Model name') + parser.add_argument('--resume', dest='resume', action="store_true", default=False, help="resume training from latest checkpoint of the given model") args = parser.parse_args() model_dir = os.path.join("./logs", args.model) @@ -179,6 +180,7 @@ def get_hparams(init=True): hparams = HParams(**config) hparams.model_dir = model_dir + hparams.resume = args.resume return hparams From 30ee9ca2d98948f7610cb03da3ca5343e558fbd3 Mon Sep 17 00:00:00 2001 From: med Date: Sat, 2 Sep 2023 01:45:41 -0400 Subject: [PATCH 3/3] fix resample.py var name inconsistency --- resample.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resample.py b/resample.py index c98b8c4..2ed1685 100644 --- a/resample.py +++ b/resample.py @@ -14,10 +14,10 @@ def process(item): speaker = spkdir.replace("\\", "/").split("/")[-1] wav_path = os.path.join(args.in_dir, speaker, wav_name) if os.path.exists(wav_path) and '.wav' in wav_path: - os.makedirs(os.path.join(args.out_dir2, speaker), exist_ok=True) - wav, sr = librosa.load(wav_path, sr=args.sr2) + os.makedirs(os.path.join(args.out_dir, speaker), exist_ok=True) + wav, sr = librosa.load(wav_path, sr=args.sr) soundfile.write( - os.path.join(args.out_dir2, speaker, wav_name), + os.path.join(args.out_dir, speaker, wav_name), wav, sr )