diff --git a/dnn/torch/osce/models/lavoce.py b/dnn/torch/osce/models/lavoce.py index 795246b9576185da61499eb8faafe4d122e43a77..47b6d1e9a6ab2c7975f8ccf433b21352f2c8098e 100644 --- a/dnn/torch/osce/models/lavoce.py +++ b/dnn/torch/osce/models/lavoce.py @@ -133,7 +133,7 @@ class LaVoce(nn.Module): self.post_af3 = nn.Conv1d(cond_dim, cond_dim, ftrans_k) - def create_phase_signals(self, periods, pulses=False): + def create_phase_signals(self, periods): batch_size = periods.size(0) progression = torch.arange(1, self.FRAME_SIZE + 1, dtype=periods.dtype, device=periods.device).view((1, -1)) @@ -144,7 +144,7 @@ class LaVoce(nn.Module): for sframe in range(periods.size(1)): f = (2.0 * torch.pi / periods[:, sframe]).unsqueeze(-1) - if pulses: + if self.pulses: alpha = torch.cos(f) chunk_sin = torch.sin(f * progression + phase0).view(batch_size, 1, self.FRAME_SIZE) pulse_a = torch.relu(chunk_sin - alpha) / (1 - alpha) diff --git a/dnn/torch/osce/models/lavoce_400.py b/dnn/torch/osce/models/lavoce_400.py index ab7724dff83a6516da1bf1947ad95c0b35e0a43f..e9a543cff6f4675742f7acc7ec2ae34101cc6273 100644 --- a/dnn/torch/osce/models/lavoce_400.py +++ b/dnn/torch/osce/models/lavoce_400.py @@ -118,7 +118,7 @@ class LaVoce400(nn.Module): self.post_af3 = nn.Conv1d(cond_dim, cond_dim, 2) - def create_phase_signals(self, periods, pulses=False): + def create_phase_signals(self, periods): batch_size = periods.size(0) progression = torch.arange(1, self.FRAME_SIZE + 1, dtype=periods.dtype, device=periods.device).view((1, -1)) @@ -129,7 +129,7 @@ class LaVoce400(nn.Module): for sframe in range(periods.size(1)): f = (2.0 * torch.pi / periods[:, sframe]).unsqueeze(-1) - if pulses: + if self.pulses: alpha = torch.cos(f) chunk_sin = torch.sin(f * progression + phase0).view(batch_size, 1, self.FRAME_SIZE) pulse_a = torch.relu(chunk_sin - alpha) / (1 - alpha)