Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleClas
提交
9790cc51
P
PaddleClas
项目概览
PaddlePaddle
/
PaddleClas
接近 2 年 前同步成功
通知
116
Star
4999
Fork
1114
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
19
列表
看板
标记
里程碑
合并请求
6
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleClas
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
19
Issue
19
列表
看板
标记
里程碑
合并请求
6
合并请求
6
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
9790cc51
编写于
8月 08, 2021
作者:
W
weishengyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add return_dict to trainer
上级
bba9e0df
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
9 deletion
+14
-9
ppcls/arch/backbone/base/theseus_layer.py
ppcls/arch/backbone/base/theseus_layer.py
+2
-0
ppcls/arch/backbone/legendary_models/vgg.py
ppcls/arch/backbone/legendary_models/vgg.py
+6
-7
ppcls/engine/trainer.py
ppcls/engine/trainer.py
+6
-2
未找到文件。
ppcls/arch/backbone/base/theseus_layer.py
浏览文件 @
9790cc51
...
...
@@ -44,6 +44,8 @@ class TheseusLayer(nn.Layer):
if
return_layers
is
not
None
and
re
.
match
(
return_pattern
,
layer_name
):
self
.
_sub_layers
[
layer_i
].
register_forward_post_hook
(
self
.
_save_sub_res_hook
)
if
isinstance
(
self
.
_sub_layers
[
layer_i
],
TheseusLayer
):
self
.
_sub_layers
[
layer_i
].
_update_res
(
return_layers
)
def
_save_sub_res_hook
(
self
,
layer
,
input
,
output
):
if
self
.
res_dict
is
not
None
:
...
...
ppcls/arch/backbone/legendary_models/vgg.py
浏览文件 @
9790cc51
...
...
@@ -45,7 +45,7 @@ NET_CONFIG = {
class
ConvBlock
(
TheseusLayer
):
def
__init__
(
self
,
input_channels
,
output_channels
,
groups
,
return_patterns
=
None
):
def
__init__
(
self
,
input_channels
,
output_channels
,
groups
):
super
().
__init__
()
self
.
groups
=
groups
...
...
@@ -83,7 +83,6 @@ class ConvBlock(TheseusLayer):
self
.
max_pool
=
MaxPool2D
(
kernel_size
=
2
,
stride
=
2
,
padding
=
0
)
self
.
relu
=
nn
.
ReLU
()
self
.
_update_res
(
return_patterns
)
def
forward
(
self
,
inputs
):
x
=
self
.
conv1
(
inputs
)
...
...
@@ -117,11 +116,11 @@ class VGGNet(TheseusLayer):
self
.
stop_grad_layers
=
stop_grad_layers
self
.
conv_block_1
=
ConvBlock
(
3
,
64
,
config
[
0
]
,
return_patterns
)
self
.
conv_block_2
=
ConvBlock
(
64
,
128
,
config
[
1
]
,
return_patterns
)
self
.
conv_block_3
=
ConvBlock
(
128
,
256
,
config
[
2
]
,
return_patterns
)
self
.
conv_block_4
=
ConvBlock
(
256
,
512
,
config
[
3
]
,
return_patterns
)
self
.
conv_block_5
=
ConvBlock
(
512
,
512
,
config
[
4
]
,
return_patterns
)
self
.
conv_block_1
=
ConvBlock
(
3
,
64
,
config
[
0
])
self
.
conv_block_2
=
ConvBlock
(
64
,
128
,
config
[
1
])
self
.
conv_block_3
=
ConvBlock
(
128
,
256
,
config
[
2
])
self
.
conv_block_4
=
ConvBlock
(
256
,
512
,
config
[
3
])
self
.
conv_block_5
=
ConvBlock
(
512
,
512
,
config
[
4
])
self
.
relu
=
nn
.
ReLU
()
self
.
flatten
=
nn
.
Flatten
(
start_axis
=
1
,
stop_axis
=-
1
)
...
...
ppcls/engine/trainer.py
浏览文件 @
9790cc51
...
...
@@ -392,10 +392,14 @@ class Trainer(object):
return
eval_result
def
forward
(
self
,
batch
):
if
self
.
return_inter
:
return_dict
=
{}
else
:
return_dict
=
None
if
not
self
.
is_rec
:
out
=
self
.
model
(
batch
[
0
])
out
=
self
.
model
(
batch
[
0
]
,
return_dict
=
return_dict
)
else
:
out
=
self
.
model
(
batch
[
0
],
batch
[
1
])
out
=
self
.
model
(
batch
[
0
],
batch
[
1
]
,
return_dict
=
return_dict
)
return
out
@
paddle
.
no_grad
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录