Skip to content
This repository was archived by the owner on Jan 24, 2024. It is now read-only.

Commit 848efd5

Browse files
helinwanghelinwang
authored
Merge pull request #342 from helinwang/gzip
Make same model examples no longer compress model.
2 parents b894db4 + ab4088e commit 848efd5

File tree

20 files changed

+31
-55
lines changed

20 files changed

+31
-55
lines changed

‎02.recognize_digits/README.cn.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ PaddlePaddle在API中提供了自动加载[MNIST](http://yann.lecun.com/exdb/mni
132132
首先，加载PaddlePaddle的V2 api包。
133133

134134
```python
135-
import gzip
136135
import paddle.v2 as paddle
137136
```
138137
其次，定义三个不同的分类器：
@@ -256,7 +255,7 @@ def event_handler_plot(event):
256255
step += 1
257256
if isinstance(event, paddle.event.EndPass):
258257
# save parameters
259-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
258+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
260259
parameters.to_tar(f)
261260

262261
result = trainer.test(reader=paddle.batch(
@@ -275,7 +274,7 @@ def event_handler(event):
275274
event.pass_id, event.batch_id, event.cost, event.metrics)
276275
if isinstance(event, paddle.event.EndPass):
277276
# save parameters
278-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
277+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
279278
parameters.to_tar(f)
280279

281280
result = trainer.test(reader=paddle.batch(

‎02.recognize_digits/README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ PaddlePaddle provides a Python module, `paddle.dataset.mnist`, which downloads a
131131
A PaddlePaddle program starts from importing the API package:
132132

133133
```python
134-
import gzip
135134
import paddle.v2 as paddle
136135
```
137136

@@ -251,7 +250,7 @@ def event_handler_plot(event):
251250
step += 1
252251
if isinstance(event, paddle.event.EndPass):
253252
# save parameters
254-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
253+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
255254
parameters.to_tar(f)
256255

257256
result = trainer.test(reader=paddle.batch(
@@ -271,7 +270,7 @@ def event_handler(event):
271270
event.pass_id, event.batch_id, event.cost, event.metrics)
272271
if isinstance(event, paddle.event.EndPass):
273272
# save parameters
274-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
273+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
275274
parameters.to_tar(f)
276275

277276
result = trainer.test(reader=paddle.batch(

‎02.recognize_digits/index.cn.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@
174174
首先，加载PaddlePaddle的V2 api包。
175175

176176
```python
177-
import gzip
178177
import paddle.v2 as paddle
179178
```
180179
其次，定义三个不同的分类器：
@@ -298,7 +297,7 @@
298297
step += 1
299298
if isinstance(event, paddle.event.EndPass):
300299
# save parameters
301-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
300+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
302301
parameters.to_tar(f)
303302

304303
result = trainer.test(reader=paddle.batch(
@@ -317,7 +316,7 @@
317316
event.pass_id, event.batch_id, event.cost, event.metrics)
318317
if isinstance(event, paddle.event.EndPass):
319318
# save parameters
320-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
319+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
321320
parameters.to_tar(f)
322321

323322
result = trainer.test(reader=paddle.batch(

‎02.recognize_digits/index.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@
173173
A PaddlePaddle program starts from importing the API package:
174174

175175
```python
176-
import gzip
177176
import paddle.v2 as paddle
178177
```
179178

@@ -293,7 +292,7 @@
293292
step += 1
294293
if isinstance(event, paddle.event.EndPass):
295294
# save parameters
296-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
295+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
297296
parameters.to_tar(f)
298297

299298
result = trainer.test(reader=paddle.batch(
@@ -313,7 +312,7 @@
313312
event.pass_id, event.batch_id, event.cost, event.metrics)
314313
if isinstance(event, paddle.event.EndPass):
315314
# save parameters
316-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
315+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
317316
parameters.to_tar(f)
318317

319318
result = trainer.test(reader=paddle.batch(

‎02.recognize_digits/train.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import gzip
21
import os
32
from PIL import Image
43
import numpy as np
@@ -85,7 +84,7 @@ def event_handler(event):
8584
event.pass_id, event.batch_id, event.cost, event.metrics)
8685
if isinstance(event, paddle.event.EndPass):
8786
# save parameters
88-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
87+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
8988
parameters.to_tar(f)
9089

9190
result = trainer.test(reader=paddle.batch(

‎03.image_classification/README.cn.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ Paddle API提供了自动加载cifar数据集模块 `paddle.dataset.cifar`。
156156

157157
```python
158158
import sys
159-
import gzip
160159
import paddle.v2 as paddle
161160
from vgg import vgg_bn_drop
162161
from resnet import resnet_cifar10
@@ -431,7 +430,7 @@ def event_handler(event):
431430
sys.stdout.flush()
432431
if isinstance(event, paddle.event.EndPass):
433432
# save parameters
434-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
433+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
435434
parameters.to_tar(f)
436435

437436
result = trainer.test(
@@ -498,7 +497,7 @@ test_data = []
498497
cur_dir = os.path.dirname(os.path.realpath(__file__))
499498
test_data.append((load_image(cur_dir + '/image/dog.png'),))
500499

501-
# with gzip.open('params_pass_50.tar.gz', 'r') as f:
500+
# with open('params_pass_50.tar', 'r') as f:
502501
# parameters = paddle.parameters.Parameters.from_tar(f)
503502

504503
probs = paddle.infer(

‎03.image_classification/README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ We must import and initialize PaddlePaddle (enable/disable GPU, set the number o
169169

170170
```python
171171
import sys
172-
import gzip
173172
import paddle.v2 as paddle
174173
from vgg import vgg_bn_drop
175174
from resnet import resnet_cifar10
@@ -438,7 +437,7 @@ def event_handler(event):
438437
sys.stdout.flush()
439438
if isinstance(event, paddle.event.EndPass):
440439
# save parameters
441-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
440+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
442441
parameters.to_tar(f)
443442

444443
result = trainer.test(
@@ -508,7 +507,7 @@ cur_dir = os.path.dirname(os.path.realpath(__file__))
508507
test_data.append((load_image(cur_dir + '/image/dog.png'),))
509508

510509
# users can remove the comments and change the model name
511-
# with gzip.open('params_pass_50.tar.gz', 'r') as f:
510+
# with open('params_pass_50.tar', 'r') as f:
512511
# parameters = paddle.parameters.Parameters.from_tar(f)
513512

514513
probs = paddle.infer(

‎03.image_classification/index.cn.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@
198198

199199
```python
200200
import sys
201-
import gzip
202201
import paddle.v2 as paddle
203202
from vgg import vgg_bn_drop
204203
from resnet import resnet_cifar10
@@ -473,7 +472,7 @@
473472
sys.stdout.flush()
474473
if isinstance(event, paddle.event.EndPass):
475474
# save parameters
476-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
475+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
477476
parameters.to_tar(f)
478477

479478
result = trainer.test(
@@ -540,7 +539,7 @@
540539
cur_dir = os.path.dirname(os.path.realpath(__file__))
541540
test_data.append((load_image(cur_dir + '/image/dog.png'),))
542541

543-
# with gzip.open('params_pass_50.tar.gz', 'r') as f:
542+
# with open('params_pass_50.tar', 'r') as f:
544543
# parameters = paddle.parameters.Parameters.from_tar(f)
545544

546545
probs = paddle.infer(

‎03.image_classification/index.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@
211211

212212
```python
213213
import sys
214-
import gzip
215214
import paddle.v2 as paddle
216215
from vgg import vgg_bn_drop
217216
from resnet import resnet_cifar10
@@ -480,7 +479,7 @@
480479
sys.stdout.flush()
481480
if isinstance(event, paddle.event.EndPass):
482481
# save parameters
483-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
482+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
484483
parameters.to_tar(f)
485484

486485
result = trainer.test(
@@ -550,7 +549,7 @@
550549
test_data.append((load_image(cur_dir + '/image/dog.png'),))
551550

552551
# users can remove the comments and change the model name
553-
# with gzip.open('params_pass_50.tar.gz', 'r') as f:
552+
# with open('params_pass_50.tar', 'r') as f:
554553
# parameters = paddle.parameters.Parameters.from_tar(f)
555554

556555
probs = paddle.infer(

‎03.image_classification/train.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# limitations under the License
1414

1515
import sys
16-
import gzip
1716

1817
import paddle.v2 as paddle
1918

@@ -67,7 +66,7 @@ def event_handler(event):
6766
sys.stdout.flush()
6867
if isinstance(event, paddle.event.EndPass):
6968
# save parameters
70-
with gzip.open('params_pass_%d.tar.gz' % event.pass_id, 'w') as f:
69+
with open('params_pass_%d.tar' % event.pass_id, 'w') as f:
7170
parameters.to_tar(f)
7271

7372
result = trainer.test(
@@ -116,7 +115,7 @@ def load_image(file):
116115
test_data.append((load_image(cur_dir + '/image/dog.png'), ))
117116

118117
# users can remove the comments and change the model name
119-
# with gzip.open('params_pass_50.tar.gz', 'r') as f:
118+
# with open('params_pass_50.tar', 'r') as f:
120119
# parameters = paddle.parameters.Parameters.from_tar(f)
121120

122121
probs = paddle.infer(

0 commit comments

Comments
 (0)