This commit is contained in:
Stardust·减
2023-11-08 20:25:17 +08:00
committed by GitHub
parent 242428f9ab
commit 78677dde42

View File

@@ -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()