From fe7274bc3592083ace917e93f347f2030627d3d3 Mon Sep 17 00:00:00 2001 From: WuHaobo Date: Tue, 14 Apr 2020 12:25:08 +0800 Subject: [PATCH 1/2] be compatible with py3 --- ppcls/data/reader.py | 7 +++---- ppcls/modeling/utils.py | 3 ++- ppcls/optimizer/__init__.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ppcls/data/reader.py b/ppcls/data/reader.py index 70160a4d6..5749cac13 100755 --- a/ppcls/data/reader.py +++ b/ppcls/data/reader.py @@ -13,16 +13,15 @@ #limitations under the License. import cv2 - import numpy as np import os import signal import paddle -import imaug -from imaug import transform -from imaug import MixupOperator +from . import imaug +from .imaug import transform +from .imaug import MixupOperator from ppcls.utils import logger trainers_num = int(os.environ.get('PADDLE_TRAINERS_NUM', 1)) diff --git a/ppcls/modeling/utils.py b/ppcls/modeling/utils.py index acc4d1948..e7787b812 100644 --- a/ppcls/modeling/utils.py +++ b/ppcls/modeling/utils.py @@ -12,10 +12,11 @@ #See the License for the specific language governing permissions and #limitations under the License. -import architectures import types from difflib import SequenceMatcher +from . import architectures + def get_architectures(): """ diff --git a/ppcls/optimizer/__init__.py b/ppcls/optimizer/__init__.py index 9a192d9a1..199799229 100644 --- a/ppcls/optimizer/__init__.py +++ b/ppcls/optimizer/__init__.py @@ -15,5 +15,5 @@ from . import optimizer from . import learning_rate -from optimizer import OptimizerBuilder -from learning_rate import LearningRateBuilder +from .optimizer import OptimizerBuilder +from .learning_rate import LearningRateBuilder From fa7cb0bc7c65e3c294f0d8b8eb7a74b76bebbf74 Mon Sep 17 00:00:00 2001 From: WuHaobo Date: Tue, 14 Apr 2020 17:08:22 +0800 Subject: [PATCH 2/2] be compatible with py3 --- ppcls/data/reader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ppcls/data/reader.py b/ppcls/data/reader.py index 5749cac13..e68ebd77e 100755 --- a/ppcls/data/reader.py +++ b/ppcls/data/reader.py @@ -189,9 +189,9 @@ def partial_reader(params, full_lines, part_id=0, part_num=1): for line in full_lines: img_path, label = line.split() img_path = os.path.join(params['data_dir'], img_path) - img = open(img_path).read() - img = transform(img, ops) - yield (img, int(label)) + with open(img_path, 'rb') as f: + img = f.read() + yield (transform(img, ops), int(label)) return reader