From dfbce6cd87413830df90d32cc642a63b7fa76124 Mon Sep 17 00:00:00 2001 From: enkilee Date: Tue, 26 Nov 2024 16:54:20 +0800 Subject: [PATCH 1/6] fix svs1 --- paddlespeech/t2s/modules/diffnet.py | 1 + paddlespeech/t2s/modules/nets_utils.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/paddlespeech/t2s/modules/diffnet.py b/paddlespeech/t2s/modules/diffnet.py index 2f433ad684d..98be9a9a3bf 100644 --- a/paddlespeech/t2s/modules/diffnet.py +++ b/paddlespeech/t2s/modules/diffnet.py @@ -121,6 +121,7 @@ def __init__(self, dim: int=256): def forward(self, x: paddle.Tensor): x = paddle.cast(x, 'float32') + x = x.unsqueeze(0) half_dim = self.dim // 2 emb = math.log(10000) / (half_dim - 1) emb = paddle.exp(paddle.arange(half_dim) * -emb) diff --git a/paddlespeech/t2s/modules/nets_utils.py b/paddlespeech/t2s/modules/nets_utils.py index 57c46e3a859..d34c579b351 100644 --- a/paddlespeech/t2s/modules/nets_utils.py +++ b/paddlespeech/t2s/modules/nets_utils.py @@ -180,7 +180,7 @@ def make_pad_mask(lengths, xs=None, length_dim=-1): """ if length_dim == 0: raise ValueError("length_dim cannot be 0: {}".format(length_dim)) - + lengths = lengths.unsqueeze(0) bs = paddle.shape(lengths) if xs is None: maxlen = paddle.cast(lengths.max(), dtype=bs.dtype) From 8515d6436365c2b7dabf69478fa23926a45f5c88 Mon Sep 17 00:00:00 2001 From: enkilee Date: Mon, 2 Dec 2024 10:31:04 +0800 Subject: [PATCH 2/6] fix --- paddlespeech/t2s/modules/diffnet.py | 3 +-- paddlespeech/t2s/modules/nets_utils.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/paddlespeech/t2s/modules/diffnet.py b/paddlespeech/t2s/modules/diffnet.py index 98be9a9a3bf..30a49ce7ab6 100644 --- a/paddlespeech/t2s/modules/diffnet.py +++ b/paddlespeech/t2s/modules/diffnet.py @@ -120,8 +120,7 @@ def __init__(self, dim: int=256): self.dim = dim def forward(self, x: paddle.Tensor): - x = paddle.cast(x, 'float32') - x = x.unsqueeze(0) + x = paddle.cast(x.unsqueeze(0), 'float32') half_dim = self.dim // 2 emb = math.log(10000) / (half_dim - 1) emb = paddle.exp(paddle.arange(half_dim) * -emb) diff --git a/paddlespeech/t2s/modules/nets_utils.py b/paddlespeech/t2s/modules/nets_utils.py index d34c579b351..767a0b10c32 100644 --- a/paddlespeech/t2s/modules/nets_utils.py +++ b/paddlespeech/t2s/modules/nets_utils.py @@ -180,8 +180,7 @@ def make_pad_mask(lengths, xs=None, length_dim=-1): """ if length_dim == 0: raise ValueError("length_dim cannot be 0: {}".format(length_dim)) - lengths = lengths.unsqueeze(0) - bs = paddle.shape(lengths) + bs = paddle.shape(lengths.unsqueeze(0)) if xs is None: maxlen = paddle.cast(lengths.max(), dtype=bs.dtype) else: From 30af963c450a36019677b83cae9f0feed9194fc9 Mon Sep 17 00:00:00 2001 From: enkilee Date: Mon, 2 Dec 2024 11:52:51 +0800 Subject: [PATCH 3/6] fix --- paddlespeech/t2s/modules/nets_utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/paddlespeech/t2s/modules/nets_utils.py b/paddlespeech/t2s/modules/nets_utils.py index 0a66a1c88fa..755190200e5 100644 --- a/paddlespeech/t2s/modules/nets_utils.py +++ b/paddlespeech/t2s/modules/nets_utils.py @@ -181,11 +181,11 @@ def make_pad_mask(lengths, xs=None, length_dim=-1): if length_dim == 0: raise ValueError("length_dim cannot be 0: {}".format(length_dim)) - # check if ilens is 0-dim tensor, if so, add a dimension if lengths.ndim == 0: - lengths = lengths.unsqueeze(0) + bs = paddle.shape(lengths) + else: + bs = paddle.shape(lengths) - bs = paddle.shape(lengths) if xs is None: maxlen = paddle.cast(lengths.max(), dtype=bs.dtype) else: From ed02bd551c23b8e833d5aa77962a52a5da7c71a7 Mon Sep 17 00:00:00 2001 From: enkilee Date: Mon, 2 Dec 2024 11:53:19 +0800 Subject: [PATCH 4/6] fix --- paddlespeech/t2s/modules/nets_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paddlespeech/t2s/modules/nets_utils.py b/paddlespeech/t2s/modules/nets_utils.py index 755190200e5..e32be07069a 100644 --- a/paddlespeech/t2s/modules/nets_utils.py +++ b/paddlespeech/t2s/modules/nets_utils.py @@ -182,7 +182,7 @@ def make_pad_mask(lengths, xs=None, length_dim=-1): raise ValueError("length_dim cannot be 0: {}".format(length_dim)) if lengths.ndim == 0: - bs = paddle.shape(lengths) + bs = paddle.shape(lengths.unsqueeze(0)) else: bs = paddle.shape(lengths) From 6c2652eb7eca7a7059f397a1c045f9c3d3e23c43 Mon Sep 17 00:00:00 2001 From: enkilee Date: Thu, 5 Dec 2024 09:27:05 +0800 Subject: [PATCH 5/6] fix --- paddlespeech/t2s/modules/diffnet.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/paddlespeech/t2s/modules/diffnet.py b/paddlespeech/t2s/modules/diffnet.py index 30a49ce7ab6..607fbd19dc8 100644 --- a/paddlespeech/t2s/modules/diffnet.py +++ b/paddlespeech/t2s/modules/diffnet.py @@ -120,7 +120,10 @@ def __init__(self, dim: int=256): self.dim = dim def forward(self, x: paddle.Tensor): - x = paddle.cast(x.unsqueeze(0), 'float32') + if x.ndim == 0: + x = paddle.cast(x.unsqueeze(0), 'float32') + else: + x = paddle.cast(x, 'float32') half_dim = self.dim // 2 emb = math.log(10000) / (half_dim - 1) emb = paddle.exp(paddle.arange(half_dim) * -emb) From 95d97255f199b26d285473f70311d8523757e3ba Mon Sep 17 00:00:00 2001 From: enkilee Date: Thu, 5 Dec 2024 16:09:19 +0800 Subject: [PATCH 6/6] add comment --- paddlespeech/t2s/modules/diffnet.py | 1 + paddlespeech/t2s/modules/nets_utils.py | 1 + 2 files changed, 2 insertions(+) diff --git a/paddlespeech/t2s/modules/diffnet.py b/paddlespeech/t2s/modules/diffnet.py index 607fbd19dc8..deae4847fa2 100644 --- a/paddlespeech/t2s/modules/diffnet.py +++ b/paddlespeech/t2s/modules/diffnet.py @@ -120,6 +120,7 @@ def __init__(self, dim: int=256): self.dim = dim def forward(self, x: paddle.Tensor): + # check if x is 0-dim tensor, if so, add a dimension if x.ndim == 0: x = paddle.cast(x.unsqueeze(0), 'float32') else: diff --git a/paddlespeech/t2s/modules/nets_utils.py b/paddlespeech/t2s/modules/nets_utils.py index e32be07069a..a3c6947b87f 100644 --- a/paddlespeech/t2s/modules/nets_utils.py +++ b/paddlespeech/t2s/modules/nets_utils.py @@ -181,6 +181,7 @@ def make_pad_mask(lengths, xs=None, length_dim=-1): if length_dim == 0: raise ValueError("length_dim cannot be 0: {}".format(length_dim)) + # check if lengths is 0-dim tensor, if so, add a dimension if lengths.ndim == 0: bs = paddle.shape(lengths.unsqueeze(0)) else: