Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
DeepSpeech
提交
3fd7a779
D
DeepSpeech
项目概览
PaddlePaddle
/
DeepSpeech
大约 1 年 前同步成功
通知
206
Star
8425
Fork
1598
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
245
列表
看板
标记
里程碑
合并请求
3
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
DeepSpeech
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
245
Issue
245
列表
看板
标记
里程碑
合并请求
3
合并请求
3
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3fd7a779
编写于
1月 18, 2022
作者:
小湉湉
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add typehit for updater and evaluator, test=tts
上级
9c7f0762
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
48 addition
and
34 deletion
+48
-34
paddlespeech/t2s/models/fastspeech2/fastspeech2_updater.py
paddlespeech/t2s/models/fastspeech2/fastspeech2_updater.py
+15
-11
paddlespeech/t2s/models/new_tacotron2/tacotron2_updater.py
paddlespeech/t2s/models/new_tacotron2/tacotron2_updater.py
+4
-5
paddlespeech/t2s/models/speedyspeech/speedyspeech_updater.py
paddlespeech/t2s/models/speedyspeech/speedyspeech_updater.py
+12
-5
paddlespeech/t2s/models/transformer_tts/transformer_tts_updater.py
...ech/t2s/models/transformer_tts/transformer_tts_updater.py
+17
-13
未找到文件。
paddlespeech/t2s/models/fastspeech2/fastspeech2_updater.py
浏览文件 @
3fd7a779
...
...
@@ -12,8 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import
logging
from
pathlib
import
Path
from
paddle
import
distributed
as
dist
from
paddle.io
import
DataLoader
from
paddle.nn
import
Layer
from
paddle.optimizer
import
Optimizer
from
paddlespeech.t2s.models.fastspeech2
import
FastSpeech2Loss
from
paddlespeech.t2s.training.extensions.evaluator
import
StandardEvaluator
...
...
@@ -28,13 +32,13 @@ logger.setLevel(logging.INFO)
class
FastSpeech2Updater
(
StandardUpdater
):
def
__init__
(
self
,
model
,
optimizer
,
dataloader
,
model
:
Layer
,
optimizer
:
Optimizer
,
dataloader
:
DataLoader
,
init_state
=
None
,
use_masking
=
False
,
use_weighted_masking
=
False
,
output_dir
=
None
):
use_masking
:
bool
=
False
,
use_weighted_masking
:
bool
=
False
,
output_dir
:
Path
=
None
):
super
().
__init__
(
model
,
optimizer
,
dataloader
,
init_state
=
None
)
self
.
criterion
=
FastSpeech2Loss
(
...
...
@@ -104,11 +108,11 @@ class FastSpeech2Updater(StandardUpdater):
class
FastSpeech2Evaluator
(
StandardEvaluator
):
def
__init__
(
self
,
model
,
dataloader
,
use_masking
=
False
,
use_weighted_masking
=
False
,
output_dir
=
None
):
model
:
Layer
,
dataloader
:
DataLoader
,
use_masking
:
bool
=
False
,
use_weighted_masking
:
bool
=
False
,
output_dir
:
Path
=
None
):
super
().
__init__
(
model
,
dataloader
)
log_file
=
output_dir
/
'worker_{}.log'
.
format
(
dist
.
get_rank
())
...
...
paddlespeech/t2s/models/new_tacotron2/tacotron2_updater.py
浏览文件 @
3fd7a779
...
...
@@ -13,7 +13,6 @@
# limitations under the License.
import
logging
from
pathlib
import
Path
from
typing
import
Dict
from
paddle
import
distributed
as
dist
from
paddle.io
import
DataLoader
...
...
@@ -34,8 +33,8 @@ logger.setLevel(logging.INFO)
class
Tacotron2Updater
(
StandardUpdater
):
def
__init__
(
self
,
model
:
Dict
[
str
,
Layer
]
,
optimizer
:
Dict
[
str
,
Optimizer
]
,
model
:
Layer
,
optimizer
:
Optimizer
,
dataloader
:
DataLoader
,
init_state
=
None
,
use_masking
:
bool
=
True
,
...
...
@@ -126,8 +125,8 @@ class Tacotron2Updater(StandardUpdater):
class
Tacotron2Evaluator
(
StandardEvaluator
):
def
__init__
(
self
,
model
,
dataloader
,
model
:
Layer
,
dataloader
:
DataLoader
,
use_masking
:
bool
=
True
,
use_weighted_masking
:
bool
=
False
,
bce_pos_weight
:
float
=
5.0
,
...
...
paddlespeech/t2s/models/speedyspeech/speedyspeech_updater.py
浏览文件 @
3fd7a779
...
...
@@ -12,11 +12,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import
logging
from
pathlib
import
Path
import
paddle
from
paddle
import
distributed
as
dist
from
paddle.fluid.layers
import
huber_loss
from
paddle.io
import
DataLoader
from
paddle.nn
import
functional
as
F
from
paddle.nn
import
Layer
from
paddle.optimizer
import
Optimizer
from
paddlespeech.t2s.modules.losses
import
masked_l1_loss
from
paddlespeech.t2s.modules.losses
import
ssim
...
...
@@ -33,11 +37,11 @@ logger.setLevel(logging.INFO)
class
SpeedySpeechUpdater
(
StandardUpdater
):
def
__init__
(
self
,
model
,
optimizer
,
dataloader
,
model
:
Layer
,
optimizer
:
Optimizer
,
dataloader
:
DataLoader
,
init_state
=
None
,
output_dir
=
None
):
output_dir
:
Path
=
None
):
super
().
__init__
(
model
,
optimizer
,
dataloader
,
init_state
=
None
)
log_file
=
output_dir
/
'worker_{}.log'
.
format
(
dist
.
get_rank
())
...
...
@@ -103,7 +107,10 @@ class SpeedySpeechUpdater(StandardUpdater):
class
SpeedySpeechEvaluator
(
StandardEvaluator
):
def
__init__
(
self
,
model
,
dataloader
,
output_dir
=
None
):
def
__init__
(
self
,
model
:
Layer
,
dataloader
:
DataLoader
,
output_dir
:
Path
=
None
):
super
().
__init__
(
model
,
dataloader
)
log_file
=
output_dir
/
'worker_{}.log'
.
format
(
dist
.
get_rank
())
...
...
paddlespeech/t2s/models/transformer_tts/transformer_tts_updater.py
浏览文件 @
3fd7a779
...
...
@@ -12,10 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import
logging
from
pathlib
import
Path
from
typing
import
Sequence
import
paddle
from
paddle
import
distributed
as
dist
from
paddle.io
import
DataLoader
from
paddle.nn
import
Layer
from
paddle.optimizer
import
Optimizer
from
paddlespeech.t2s.modules.losses
import
GuidedMultiHeadAttentionLoss
from
paddlespeech.t2s.modules.losses
import
Tacotron2Loss
as
TransformerTTSLoss
...
...
@@ -32,14 +36,14 @@ logger.setLevel(logging.INFO)
class
TransformerTTSUpdater
(
StandardUpdater
):
def
__init__
(
self
,
model
,
optimizer
,
dataloader
,
model
:
Layer
,
optimizer
:
Optimizer
,
dataloader
:
DataLoader
,
init_state
=
None
,
use_masking
=
False
,
use_weighted_masking
=
False
,
output_dir
=
None
,
bce_pos_weight
=
5.0
,
use_masking
:
bool
=
False
,
use_weighted_masking
:
bool
=
False
,
output_dir
:
Path
=
None
,
bce_pos_weight
:
float
=
5.0
,
loss_type
:
str
=
"L1"
,
use_guided_attn_loss
:
bool
=
True
,
modules_applied_guided_attn
:
Sequence
[
str
]
=
(
"encoder-decoder"
),
...
...
@@ -185,13 +189,13 @@ class TransformerTTSUpdater(StandardUpdater):
class
TransformerTTSEvaluator
(
StandardEvaluator
):
def
__init__
(
self
,
model
,
dataloader
,
model
:
Layer
,
dataloader
:
DataLoader
,
init_state
=
None
,
use_masking
=
False
,
use_weighted_masking
=
False
,
output_dir
=
None
,
bce_pos_weight
=
5.0
,
use_masking
:
bool
=
False
,
use_weighted_masking
:
bool
=
False
,
output_dir
:
Path
=
None
,
bce_pos_weight
:
float
=
5.0
,
loss_type
:
str
=
"L1"
,
use_guided_attn_loss
:
bool
=
True
,
modules_applied_guided_attn
:
Sequence
[
str
]
=
(
"encoder-decoder"
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录