fix surrogate loss return in waveform_gen2

This commit is contained in:
James Betker 2022-04-28 10:10:11 -06:00
parent e208d9fb80
commit 8aa6651fc7

View File

@ -376,7 +376,7 @@ class DiffusionTts(nn.Module):
aligned_conditioning = F.pad(aligned_conditioning, (0,int(pc*aligned_conditioning.shape[-1]))) aligned_conditioning = F.pad(aligned_conditioning, (0,int(pc*aligned_conditioning.shape[-1])))
return x, aligned_conditioning return x, aligned_conditioning
def forward(self, x, timesteps, conditioning, conditioning_free=False): def forward(self, x, timesteps, conditioning, return_surrogate=True, conditioning_free=False):
""" """
Apply the model to an input batch. Apply the model to an input batch.
@ -433,7 +433,10 @@ class DiffusionTts(nn.Module):
extraneous_addition = extraneous_addition + p.mean() extraneous_addition = extraneous_addition + p.mean()
out = out + extraneous_addition * 0 out = out + extraneous_addition * 0
if return_surrogate:
return out[:, :, :orig_x_shape], surrogate[:, :, :orig_x_shape] return out[:, :, :orig_x_shape], surrogate[:, :, :orig_x_shape]
else:
return out[:, :, :orig_x_shape]
@register_model @register_model