From 78677dde4243bee368259b3eae27b52bbc225413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stardust=C2=B7=E5=87=8F?= Date: Wed, 8 Nov 2023 20:25:17 +0800 Subject: [PATCH] del emo --- train_ms.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/train_ms.py b/train_ms.py index 37933d1..38d1687 100644 --- a/train_ms.py +++ b/train_ms.py @@ -340,7 +340,6 @@ def train_and_evaluate( bert, ja_bert, en_bert, - emo, ) in tqdm(enumerate(train_loader)): if net_g.module.use_noise_scaled_mas: current_mas_noise_scale = ( @@ -363,7 +362,6 @@ def train_and_evaluate( bert = bert.cuda(rank, non_blocking=True) ja_bert = ja_bert.cuda(rank, non_blocking=True) en_bert = en_bert.cuda(rank, non_blocking=True) - emo = emo.cuda(rank, non_blocking=True) with autocast(enabled=hps.train.fp16_run): ( @@ -375,7 +373,6 @@ def train_and_evaluate( z_mask, (z, z_p, m_p, logs_p, m_q, logs_q), (hidden_x, logw, logw_), - loss_commit, ) = net_g( x, x_lengths, @@ -387,7 +384,6 @@ def train_and_evaluate( bert, ja_bert, en_bert, - emo, ) mel = spec_to_mel_torch( spec, @@ -459,7 +455,7 @@ def train_and_evaluate( loss_fm = feature_loss(fmap_r, fmap_g) loss_gen, losses_gen = generator_loss(y_d_hat_g) loss_gen_all = ( - loss_gen + loss_fm + loss_mel + loss_dur + loss_kl + loss_commit + loss_gen + loss_fm + loss_mel + loss_dur + loss_kl ) if net_dur_disc is not None: loss_dur_gen, losses_dur_gen = generator_loss(y_dur_hat_g) @@ -585,7 +581,6 @@ def evaluate(hps, generator, eval_loader, writer_eval): bert, ja_bert, en_bert, - emo, ) in enumerate(eval_loader): x, x_lengths = x.cuda(), x_lengths.cuda() spec, spec_lengths = spec.cuda(), spec_lengths.cuda()