提交 ad1f94b2 编写于 作者: J jiangjiajun

modify data format

上级 87ddc84a
...@@ -53,4 +53,4 @@ log_level = 2 ...@@ -53,4 +53,4 @@ log_level = 2
from . import interpret from . import interpret
__version__ = '1.0.1.github' __version__ = '1.0.2.github'
...@@ -259,8 +259,8 @@ class ResizeByShort(ClsTransform): ...@@ -259,8 +259,8 @@ class ResizeByShort(ClsTransform):
im_short_size = min(im.shape[0], im.shape[1]) im_short_size = min(im.shape[0], im.shape[1])
im_long_size = max(im.shape[0], im.shape[1]) im_long_size = max(im.shape[0], im.shape[1])
scale = float(self.short_size) / im_short_size scale = float(self.short_size) / im_short_size
if self.max_size > 0 and np.round( if self.max_size > 0 and np.round(scale *
scale * im_long_size) > self.max_size: im_long_size) > self.max_size:
scale = float(self.max_size) / float(im_long_size) scale = float(self.max_size) / float(im_long_size)
resized_width = int(round(im.shape[1] * scale)) resized_width = int(round(im.shape[1] * scale))
resized_height = int(round(im.shape[0] * scale)) resized_height = int(round(im.shape[0] * scale))
...@@ -455,7 +455,7 @@ class ArrangeClassifier(ClsTransform): ...@@ -455,7 +455,7 @@ class ArrangeClassifier(ClsTransform):
tuple: 当mode为'train'或'eval'时,返回(im, label),分别对应图像np.ndarray数据、 tuple: 当mode为'train'或'eval'时,返回(im, label),分别对应图像np.ndarray数据、
图像类别id;当mode为'test'或'quant'时,返回(im, ),对应图像np.ndarray数据。 图像类别id;当mode为'test'或'quant'时,返回(im, ),对应图像np.ndarray数据。
""" """
im = permute(im, False) im = permute(im, False).astype('float32')
if self.mode == 'train' or self.mode == 'eval': if self.mode == 'train' or self.mode == 'eval':
outputs = (im, label) outputs = (im, label)
else: else:
......
...@@ -19,7 +19,7 @@ long_description = "PaddleX. A end-to-end deeplearning model development toolkit ...@@ -19,7 +19,7 @@ long_description = "PaddleX. A end-to-end deeplearning model development toolkit
setuptools.setup( setuptools.setup(
name="paddlex", name="paddlex",
version='1.0.1', version='1.0.2',
author="paddlex", author="paddlex",
author_email="paddlex@baidu.com", author_email="paddlex@baidu.com",
description=long_description, description=long_description,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册