未验证 提交 ac8208b6 编写于 作者: Q Qiyang Min 提交者: GitHub

Merge pull request #13707 from velconia/fix_ci_random_fail

Fix flowers data read in python3
...@@ -35,16 +35,15 @@ import itertools ...@@ -35,16 +35,15 @@ import itertools
import functools import functools
from .common import download from .common import download
import tarfile import tarfile
import six
import scipy.io as scio import scipy.io as scio
from paddle.dataset.image import * from paddle.dataset.image import *
from paddle.reader import * from paddle.reader import *
from paddle import compat as cpt
import os import os
import numpy as np import numpy as np
from multiprocessing import cpu_count from multiprocessing import cpu_count
import six import six
from six.moves import cPickle as pickle from six.moves import cPickle as pickle
from six.moves import zip
__all__ = ['train', 'test', 'valid'] __all__ = ['train', 'test', 'valid']
DATA_URL = 'http://paddlemodels.cdn.bcebos.com/flowers/102flowers.tgz' DATA_URL = 'http://paddlemodels.cdn.bcebos.com/flowers/102flowers.tgz'
...@@ -126,9 +125,11 @@ def reader_creator(data_file, ...@@ -126,9 +125,11 @@ def reader_creator(data_file,
batch = pickle.load(f) batch = pickle.load(f)
else: else:
batch = pickle.load(f, encoding='bytes') batch = pickle.load(f, encoding='bytes')
if six.PY3:
batch = cpt.to_text(batch)
data = batch['data'] data = batch['data']
labels = batch['label'] labels = batch['label']
for sample, label in zip(data, batch['label']): for sample, label in six.moves.zip(data, batch['label']):
yield sample, int(label) - 1 yield sample, int(label) - 1
if not cycle: if not cycle:
break break
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册