Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
hapi
提交
b3ec7f39
H
hapi
项目概览
PaddlePaddle
/
hapi
通知
11
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
4
列表
看板
标记
里程碑
合并请求
7
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
H
hapi
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
4
Issue
4
列表
看板
标记
里程碑
合并请求
7
合并请求
7
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
b3ec7f39
编写于
4月 27, 2020
作者:
L
LielinJiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
clean test code
上级
ee496dc6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
85 deletion
+14
-85
hapi/test/dist_mnist.py
hapi/test/dist_mnist.py
+14
-84
hapi/test/test_distributed.py
hapi/test/test_distributed.py
+0
-1
未找到文件。
hapi/test/dist_mnist.py
浏览文件 @
b3ec7f39
...
@@ -29,92 +29,22 @@ from paddle.io import BatchSampler, DataLoader
...
@@ -29,92 +29,22 @@ from paddle.io import BatchSampler, DataLoader
from
hapi.model
import
Model
,
Input
,
set_device
from
hapi.model
import
Model
,
Input
,
set_device
from
hapi.loss
import
Loss
,
CrossEntropy
from
hapi.loss
import
Loss
,
CrossEntropy
from
hapi.vision.models
import
LeNet
from
hapi.metrics
import
Accuracy
from
hapi.metrics
import
Accuracy
from
hapi.callbacks
import
ProgBarLogger
from
hapi.callbacks
import
ProgBarLogger
from
hapi.datasets
import
MNIST
as
MnistDataset
from
hapi.datasets
import
MNIST
class
SimpleImgConvPool
(
fluid
.
dygraph
.
Layer
):
class
MnistDataset
(
MNIST
):
def
__init__
(
self
,
def
__init__
(
self
,
mode
,
return_label
=
True
):
num_channels
,
super
(
MnistDataset
,
self
).
__init__
(
mode
=
mode
)
num_filters
,
self
.
return_label
=
return_label
filter_size
,
pool_size
,
pool_stride
,
pool_padding
=
0
,
pool_type
=
'max'
,
global_pooling
=
False
,
conv_stride
=
1
,
conv_padding
=
0
,
conv_dilation
=
1
,
conv_groups
=
None
,
act
=
None
,
use_cudnn
=
False
,
param_attr
=
None
,
bias_attr
=
None
):
super
(
SimpleImgConvPool
,
self
).
__init__
(
'SimpleConv'
)
self
.
_conv2d
=
Conv2D
(
num_channels
=
num_channels
,
num_filters
=
num_filters
,
filter_size
=
filter_size
,
stride
=
conv_stride
,
padding
=
conv_padding
,
dilation
=
conv_dilation
,
groups
=
conv_groups
,
param_attr
=
None
,
bias_attr
=
None
,
use_cudnn
=
use_cudnn
)
self
.
_pool2d
=
Pool2D
(
pool_size
=
pool_size
,
pool_type
=
pool_type
,
pool_stride
=
pool_stride
,
pool_padding
=
pool_padding
,
global_pooling
=
global_pooling
,
use_cudnn
=
use_cudnn
)
def
forward
(
self
,
inputs
):
x
=
self
.
_conv2d
(
inputs
)
x
=
self
.
_pool2d
(
x
)
return
x
class
MNIST
(
Model
):
def
__init__
(
self
):
super
(
MNIST
,
self
).
__init__
()
self
.
_simple_img_conv_pool_1
=
SimpleImgConvPool
(
1
,
20
,
5
,
2
,
2
,
act
=
"relu"
)
self
.
_simple_img_conv_pool_2
=
SimpleImgConvPool
(
20
,
50
,
5
,
2
,
2
,
act
=
"relu"
)
pool_2_shape
=
50
*
4
*
4
SIZE
=
10
scale
=
(
2.0
/
(
pool_2_shape
**
2
*
SIZE
))
**
0.5
self
.
_fc
=
Linear
(
800
,
10
,
param_attr
=
fluid
.
param_attr
.
ParamAttr
(
initializer
=
fluid
.
initializer
.
NormalInitializer
(
loc
=
0.0
,
scale
=
scale
)),
act
=
"softmax"
)
def
forward
(
self
,
inputs
):
inputs
=
fluid
.
layers
.
reshape
(
inputs
,
[
-
1
,
1
,
28
,
28
])
x
=
self
.
_simple_img_conv_pool_1
(
inputs
)
x
=
self
.
_simple_img_conv_pool_2
(
x
)
x
=
fluid
.
layers
.
flatten
(
x
,
axis
=
1
)
x
=
self
.
_fc
(
x
)
return
x
class
TestMnistDataset
(
MnistDataset
):
def
__init__
(
self
):
super
(
TestMnistDataset
,
self
).
__init__
(
mode
=
'test'
)
def
__getitem__
(
self
,
idx
):
def
__getitem__
(
self
,
idx
):
return
self
.
images
[
idx
],
img
=
np
.
reshape
(
self
.
images
[
idx
],
[
1
,
28
,
28
])
if
self
.
return_label
:
return
img
,
np
.
array
(
self
.
labels
[
idx
]).
astype
(
'int64'
)
return
img
,
def
__len__
(
self
):
def
__len__
(
self
):
return
len
(
self
.
images
)
return
len
(
self
.
images
)
...
@@ -142,9 +72,9 @@ class TestModel(unittest.TestCase):
...
@@ -142,9 +72,9 @@ class TestModel(unittest.TestCase):
train_dataset
=
MnistDataset
(
mode
=
'train'
)
train_dataset
=
MnistDataset
(
mode
=
'train'
)
val_dataset
=
MnistDataset
(
mode
=
'test'
)
val_dataset
=
MnistDataset
(
mode
=
'test'
)
test_dataset
=
TestMnistDataset
(
)
test_dataset
=
MnistDataset
(
mode
=
'test'
,
return_label
=
False
)
model
=
MNIST
()
model
=
LeNet
()
optim
=
fluid
.
optimizer
.
Momentum
(
optim
=
fluid
.
optimizer
.
Momentum
(
learning_rate
=
0.01
,
momentum
=
.
9
,
parameter_list
=
model
.
parameters
())
learning_rate
=
0.01
,
momentum
=
.
9
,
parameter_list
=
model
.
parameters
())
loss
=
CrossEntropy
()
loss
=
CrossEntropy
()
...
...
hapi/test/test_distributed.py
浏览文件 @
b3ec7f39
...
@@ -95,7 +95,6 @@ def start_local_trainers(cluster,
...
@@ -95,7 +95,6 @@ def start_local_trainers(cluster,
print
(
"trainer proc env:{}"
.
format
(
current_env
))
print
(
"trainer proc env:{}"
.
format
(
current_env
))
cmd
=
"python -m coverage run --branch -p "
+
training_script
cmd
=
"python -m coverage run --branch -p "
+
training_script
# cmd = [sys.executable, "-u", training_script] + training_script_args
print
(
"start trainer proc:{} env:{}"
.
format
(
cmd
,
proc_env
))
print
(
"start trainer proc:{} env:{}"
.
format
(
cmd
,
proc_env
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录