diff options
| author | Jean-Marc Valin <jmvalin@amazon.com> | 2023-10-03 19:04:20 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@amazon.com> | 2023-10-03 19:04:20 +0300 |
| commit | 95c1416d459585bc99cdaacf87cd3cf1d13b247e (patch) | |
| tree | b70274a5321318b3f41c3f86803dd41991d99076 | |
| parent | f983e9a688f2872b17e20f657667e5bc56c48e5e (diff) | |
clipping
| -rw-r--r-- | dnn/torch/fargan/dataset.py | 2 | ||||
| -rw-r--r-- | dnn/torch/fargan/fargan.py | 2 | ||||
| -rw-r--r-- | dnn/torch/fargan/test_fargan.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dnn/torch/fargan/dataset.py b/dnn/torch/fargan/dataset.py index 0f2e4a81..2dfbb0b5 100644 --- a/dnn/torch/fargan/dataset.py +++ b/dnn/torch/fargan/dataset.py @@ -36,7 +36,7 @@ class FARGANDataset(torch.utils.data.Dataset): self.features = np.lib.stride_tricks.as_strided(self.features, shape=(self.nb_sequences, self.sequence_length*2+4, nb_features), strides=(self.sequence_length*self.nb_features*sizeof, self.nb_features*sizeof, sizeof)) #self.periods = np.round(50*self.features[:,:,self.nb_used_features-2]+100).astype('int') - self.periods = np.round(256./2**(self.features[:,:,self.nb_used_features-2]+1.5)).astype('int') + self.periods = np.round(np.clip(256./2**(self.features[:,:,self.nb_used_features-2]+1.5), 32, 255)).astype('int') self.lpc = self.features[:, :, self.nb_used_features:] self.features = self.features[:, :, :self.nb_used_features] diff --git a/dnn/torch/fargan/fargan.py b/dnn/torch/fargan/fargan.py index 84053fd0..39b5ddaf 100644 --- a/dnn/torch/fargan/fargan.py +++ b/dnn/torch/fargan/fargan.py @@ -157,7 +157,7 @@ class FARGANCond(nn.Module): self.feature_dim = feature_dim self.cond_size = cond_size - self.pembed = nn.Embedding(225, pembed_dims) + self.pembed = nn.Embedding(224, pembed_dims) self.fdense1 = nn.Linear(self.feature_dim + pembed_dims, 64, bias=False) self.fconv1 = nn.Conv1d(64, 128, kernel_size=3, padding='valid', bias=False) self.fconv2 = nn.Conv1d(128, 80*4, kernel_size=3, padding='valid', bias=False) diff --git a/dnn/torch/fargan/test_fargan.py b/dnn/torch/fargan/test_fargan.py index eb12aca8..d47400f8 100644 --- a/dnn/torch/fargan/test_fargan.py +++ b/dnn/torch/fargan/test_fargan.py @@ -49,7 +49,7 @@ features = np.reshape(np.memmap(features_file, dtype='float32', mode='r'), (1, - lpc = features[:,4-1:-1,nb_used_features:] features = features[:, :, :nb_used_features] #periods = np.round(50*features[:,:,nb_used_features-2]+100).astype('int') -periods = np.round(256./2**(features[:,:,nb_used_features-2]+1.5)).astype('int') +periods = np.round(np.clip(256./2**(features[:,:,nb_used_features-2]+1.5), 32, 255)).astype('int') nb_frames = features.shape[1] |