From b587104893654b9c3fc48a489ca15e5300a2a79d Mon Sep 17 00:00:00 2001 From: Teng Xi Date: Tue, 2 Jun 2020 19:42:13 +0800 Subject: [PATCH] change scipy.misc.imread() to imageio.imread() (#324) --- demo/slimfacenet/dataloader/casia.py | 4 ++-- demo/slimfacenet/dataloader/lfw.py | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/demo/slimfacenet/dataloader/casia.py b/demo/slimfacenet/dataloader/casia.py index 4162ef46..cbec2a38 100644 --- a/demo/slimfacenet/dataloader/casia.py +++ b/demo/slimfacenet/dataloader/casia.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import numpy as np -import scipy.misc +import imageio import os import paddle from paddle import fluid @@ -54,7 +54,7 @@ class CASIA_Face(object): target = self.label_list[index] try: - img = scipy.misc.imread(img_path) + img = imageio.imread(img_path) except: continue diff --git a/demo/slimfacenet/dataloader/lfw.py b/demo/slimfacenet/dataloader/lfw.py index 46bb60c9..4812ba1a 100644 --- a/demo/slimfacenet/dataloader/lfw.py +++ b/demo/slimfacenet/dataloader/lfw.py @@ -13,8 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import numpy as np -import scipy.misc - +import imageio import paddle from paddle import fluid @@ -33,10 +32,10 @@ class LFW(object): return index = self.shuffle_idx.pop(0) - imgl = scipy.misc.imread(self.imgl_list[index]) + imgl = imageio.imread(self.imgl_list[index]) if len(imgl.shape) == 2: imgl = np.stack([imgl] * 3, 2) - imgr = scipy.misc.imread(self.imgr_list[index]) + imgr = imageio.imread(self.imgr_list[index]) if len(imgr.shape) == 2: imgr = np.stack([imgr] * 3, 2) -- GitLab