Skip to content

fix example code for hapi.model.Model #27393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LiuChiachi wants to merge 3 commits into from
Closed

fix example code for hapi.model.Model #27393

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfab8d9
fix example code for Model, test=document_fix, notest
LiuChiachi Sep 18, 2020
a818a6e
fix example code for Model, test=document_fix, notest
LiuChiachi Sep 18, 2020
885f868
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
LiuChiachi Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions python/paddle/hapi/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,6 @@ class Model(object):
nn.Tanh(),
nn.Linear(200, 10))

# inputs and labels are not required for dynamic graph.
input = InputSpec([None, 784], 'float32', 'x')
label = InputSpec([None, 1], 'int64', 'label')

Expand Down Expand Up @@ -970,6 +969,7 @@ def test_batch(self, inputs):
import numpy as np
import paddle
import paddle.nn as nn
from paddle.static import InputSpec

device = paddle.set_device('cpu') # or 'gpu'
paddle.disable_static(device)
Expand All @@ -980,7 +980,9 @@ def test_batch(self, inputs):
nn.Linear(200, 10),
nn.Softmax())

model = paddle.Model(net)
input = InputSpec([None, 784], 'float32', 'x')
label = InputSpec([None, 1], 'int64', 'label')
model = paddle.Model(net, input, label)
model.prepare()
data = np.random.random(size=(4,784)).astype(np.float32)
out = model.test_batch([data])
Expand Down Expand Up @@ -1092,15 +1094,20 @@ def load(self, path, skip_mismatch=False, reset_optimizer=False):

import paddle
import paddle.nn as nn
from paddle.static import InputSpec

device = paddle.set_device('cpu')
paddle.disable_static(device)

input = InputSpec([None, 784], 'float32', 'x')
label = InputSpec([None, 1], 'int64', 'label')
model = paddle.Model(nn.Sequential(
nn.Linear(784, 200),
nn.Tanh(),
nn.Linear(200, 10),
nn.Softmax()))
nn.Softmax()),
input,
label)
model.save('checkpoint/test')
model.load('checkpoint/test')
"""
Expand Down Expand Up @@ -1165,13 +1172,18 @@ def parameters(self, *args, **kwargs):

import paddle
import paddle.nn as nn
from paddle.static import InputSpec

paddle.disable_static()

input = InputSpec([None, 784], 'float32', 'x')
label = InputSpec([None, 1], 'int64', 'label')
model = paddle.Model(nn.Sequential(
nn.Linear(784, 200),
nn.Tanh(),
nn.Linear(200, 10)))
nn.Linear(200, 10)),
input,
label)
params = model.parameters()
"""
return self._adapter.parameters()
Expand Down Expand Up @@ -1483,7 +1495,7 @@ def evaluate(

# imperative mode
paddle.disable_static()
model = paddle.Model(paddle.vision.models.LeNet())
model = paddle.Model(paddle.vision.models.LeNet(), input, label)
model.prepare(metrics=paddle.metric.Accuracy())
result = model.evaluate(val_dataset, batch_size=64)
print(result)
Expand Down Expand Up @@ -1591,7 +1603,7 @@ def __len__(self):
# imperative mode
device = paddle.set_device('cpu')
paddle.disable_static(device)
model = paddle.Model(paddle.vision.models.LeNet())
model = paddle.Model(paddle.vision.models.LeNet(), input)
model.prepare()
result = model.predict(test_dataset, batch_size=64)
print(len(result[0]), result[0][0].shape)
Expand Down