Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
DeepSpeech
提交
c4da9a7f
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,发现更多精彩内容 >>
提交
c4da9a7f
编写于
8月 05, 2021
作者:
H
Hui Zhang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
filter key by class signature, no print tensor
上级
3912c255
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
38 addition
and
11 deletion
+38
-11
deepspeech/training/gradclip.py
deepspeech/training/gradclip.py
+3
-0
deepspeech/training/optimizer.py
deepspeech/training/optimizer.py
+2
-3
deepspeech/utils/dynamic_import.py
deepspeech/utils/dynamic_import.py
+18
-7
deepspeech/utils/tensor_utils.py
deepspeech/utils/tensor_utils.py
+15
-1
未找到文件。
deepspeech/training/gradclip.py
浏览文件 @
c4da9a7f
...
@@ -27,6 +27,9 @@ class ClipGradByGlobalNormWithLog(paddle.nn.ClipGradByGlobalNorm):
...
@@ -27,6 +27,9 @@ class ClipGradByGlobalNormWithLog(paddle.nn.ClipGradByGlobalNorm):
def
__init__
(
self
,
clip_norm
):
def
__init__
(
self
,
clip_norm
):
super
().
__init__
(
clip_norm
)
super
().
__init__
(
clip_norm
)
def
__repr__
(
self
):
return
f
"
{
self
.
__class__
.
__name__
}
(global_clip_norm=
{
self
.
clip_norm
}
)"
@
imperative_base
.
no_grad
@
imperative_base
.
no_grad
def
_dygraph_clip
(
self
,
params_grads
):
def
_dygraph_clip
(
self
,
params_grads
):
params_and_grads
=
[]
params_and_grads
=
[]
...
...
deepspeech/training/optimizer.py
浏览文件 @
c4da9a7f
...
@@ -20,7 +20,7 @@ from paddle.regularizer import L2Decay
...
@@ -20,7 +20,7 @@ from paddle.regularizer import L2Decay
from
deepspeech.training.gradclip
import
ClipGradByGlobalNormWithLog
from
deepspeech.training.gradclip
import
ClipGradByGlobalNormWithLog
from
deepspeech.utils.dynamic_import
import
dynamic_import
from
deepspeech.utils.dynamic_import
import
dynamic_import
from
deepspeech.utils.dynamic_import
import
filter_valid_arg
s
from
deepspeech.utils.dynamic_import
import
instance_clas
s
from
deepspeech.utils.log
import
Log
from
deepspeech.utils.log
import
Log
__all__
=
[
"OptimizerFactory"
]
__all__
=
[
"OptimizerFactory"
]
...
@@ -80,5 +80,4 @@ class OptimizerFactory():
...
@@ -80,5 +80,4 @@ class OptimizerFactory():
args
.
update
({
"grad_clip"
:
grad_clip
,
"weight_decay"
:
weight_decay
})
args
.
update
({
"grad_clip"
:
grad_clip
,
"weight_decay"
:
weight_decay
})
args
=
filter_valid_args
(
args
)
return
instance_class
(
module_class
,
args
)
return
module_class
(
**
args
)
deepspeech/utils/dynamic_import.py
浏览文件 @
c4da9a7f
...
@@ -12,15 +12,18 @@
...
@@ -12,15 +12,18 @@
# See the License for the specific language governing permissions and
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
import
importlib
import
importlib
import
inspect
from
typing
import
Any
from
typing
import
Any
from
typing
import
Dict
from
typing
import
Dict
from
typing
import
List
from
typing
import
Text
from
typing
import
Text
from
deepspeech.utils.log
import
Log
from
deepspeech.utils.log
import
Log
from
deepspeech.utils.tensor_utils
import
has_tensor
logger
=
Log
(
__name__
).
getlog
()
logger
=
Log
(
__name__
).
getlog
()
__all__
=
[
"dynamic_import"
,
"instance_class"
,
"filter_valid_args"
]
__all__
=
[
"dynamic_import"
,
"instance_class"
]
def
dynamic_import
(
import_path
,
alias
=
dict
()):
def
dynamic_import
(
import_path
,
alias
=
dict
()):
...
@@ -43,14 +46,22 @@ def dynamic_import(import_path, alias=dict()):
...
@@ -43,14 +46,22 @@ def dynamic_import(import_path, alias=dict()):
return
getattr
(
m
,
objname
)
return
getattr
(
m
,
objname
)
def
filter_valid_args
(
args
:
Dict
[
Text
,
Any
]):
def
filter_valid_args
(
args
:
Dict
[
Text
,
Any
],
valid_keys
:
List
[
Text
]):
# filter out `val` which is None
# filter by `valid_keys` and filter `val` is not None
new_args
=
{
key
:
val
for
key
,
val
in
args
.
items
()
if
val
is
not
None
}
new_args
=
{
key
:
val
for
key
,
val
in
args
.
items
()
if
(
key
in
valid_keys
and
val
is
not
None
)
}
return
new_args
return
new_args
def
filter_out_tenosr
(
args
:
Dict
[
Text
,
Any
]):
return
{
key
:
val
for
key
,
val
in
args
.
items
()
if
not
has_tensor
(
val
)}
def
instance_class
(
module_class
,
args
:
Dict
[
Text
,
Any
]):
def
instance_class
(
module_class
,
args
:
Dict
[
Text
,
Any
]):
# filter out `val` which is None
valid_keys
=
inspect
.
signature
(
module_class
).
parameters
.
keys
()
new_args
=
filter_valid_args
(
args
)
new_args
=
filter_valid_args
(
args
,
valid_keys
)
logger
.
info
(
f
"Instance:
{
module_class
.
__name__
}
{
new_args
}
."
)
logger
.
info
(
f
"Instance:
{
module_class
.
__name__
}
{
filter_out_tenosr
(
new_args
)
}
."
)
return
module_class
(
**
new_args
)
return
module_class
(
**
new_args
)
deepspeech/utils/tensor_utils.py
浏览文件 @
c4da9a7f
...
@@ -19,11 +19,25 @@ import paddle
...
@@ -19,11 +19,25 @@ import paddle
from
deepspeech.utils.log
import
Log
from
deepspeech.utils.log
import
Log
__all__
=
[
"pad_sequence"
,
"add_sos_eos"
,
"th_accuracy"
]
__all__
=
[
"pad_sequence"
,
"add_sos_eos"
,
"th_accuracy"
,
"has_tensor"
]
logger
=
Log
(
__name__
).
getlog
()
logger
=
Log
(
__name__
).
getlog
()
def
has_tensor
(
val
):
if
isinstance
(
val
,
(
list
,
tuple
)):
for
item
in
val
:
if
has_tensor
(
item
):
return
True
elif
isinstance
(
val
,
dict
):
for
k
,
v
in
val
.
items
():
print
(
k
)
if
has_tensor
(
v
):
return
True
else
:
return
paddle
.
is_tensor
(
val
)
def
pad_sequence
(
sequences
:
List
[
paddle
.
Tensor
],
def
pad_sequence
(
sequences
:
List
[
paddle
.
Tensor
],
batch_first
:
bool
=
False
,
batch_first
:
bool
=
False
,
padding_value
:
float
=
0.0
)
->
paddle
.
Tensor
:
padding_value
:
float
=
0.0
)
->
paddle
.
Tensor
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录