From 7d87d8213dc5a862583ffee5153569c077c96344 Mon Sep 17 00:00:00 2001 From: "hejunjie.hjj" Date: Tue, 2 Aug 2022 21:12:41 +0800 Subject: [PATCH] fix bug when img-ins-seg pipeline input is Image.Image or numpy.ndarray --- .../datasets/transforms.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/modelscope/models/cv/image_instance_segmentation/datasets/transforms.py b/modelscope/models/cv/image_instance_segmentation/datasets/transforms.py index abc30c77..c2c11286 100644 --- a/modelscope/models/cv/image_instance_segmentation/datasets/transforms.py +++ b/modelscope/models/cv/image_instance_segmentation/datasets/transforms.py @@ -79,15 +79,19 @@ class LoadImageFromFile: dict: The dict contains loaded image and meta information. """ - if results['img_prefix'] is not None: - filename = osp.join(results['img_prefix'], - results['img_info']['filename']) - else: + if 'img' in results and isinstance(results['img'], np.ndarray): + img = results['img'] filename = results['img_info']['filename'] + else: + if results['img_prefix'] is not None: + filename = osp.join(results['img_prefix'], + results['img_info']['filename']) + else: + filename = results['img_info']['filename'] - img_bytes = File.read(filename) + img_bytes = File.read(filename) - img = self.imfrombytes(img_bytes, 'color', 'bgr', backend='pillow') + img = self.imfrombytes(img_bytes, 'color', 'bgr', backend='pillow') if self.to_float32: img = img.astype(np.float32)