merge master

This commit is contained in:
wenmeng.zwm
2023-12-27 00:08:20 +08:00
parent 1120b76ea4
commit 39562dc555
2 changed files with 10 additions and 16 deletions

View File

@@ -18,6 +18,7 @@ from modelscope.models.cv.anydoor.datasets.data_utils import (
from modelscope.outputs import OutputKeys
from modelscope.pipelines.base import Input, Pipeline
from modelscope.pipelines.builder import PIPELINES
from modelscope.preprocessors.image import load_image
from modelscope.utils.constant import Tasks
from modelscope.utils.logger import get_logger
@@ -77,21 +78,14 @@ class AnydoorPipeline(Pipeline):
return state_dict
def preprocess(self, inputs: Input) -> Dict[str, Any]:
def parse_url(path_or_url: str):
if path_or_url.startswith('http://') or path_or_url.startswith(
'https://'):
return requests.get(path_or_url, stream=True).raw
return path_or_url
ref_image, ref_mask, tar_image, tar_mask = map(parse_url, inputs)
ref_image = np.asarray(Image.open(ref_image).convert('RGB'))
ref_image, ref_mask, tar_image, tar_mask = inputs
ref_image = np.asarray(load_image(ref_image).convert('RGB'))
ref_mask = np.where(
np.asarray(Image.open(ref_mask).convert('L')) > 128, 1,
np.asarray(load_image(ref_mask).convert('L')) > 128, 1,
0).astype(np.uint8)
tar_image = np.asarray(Image.open(tar_image).convert('RGB'))
tar_image = np.asarray(load_image(tar_image).convert('RGB'))
tar_mask = np.where(
np.asarray(Image.open(tar_mask).convert('L')) > 128, 1,
np.asarray(load_image(tar_mask).convert('L')) > 128, 1,
0).astype(np.uint8)
# ========= Reference ===========

View File

@@ -15,10 +15,10 @@ class AnydoorTest(unittest.TestCase):
@unittest.skipUnless(test_level() >= 0, 'skip test in current test level')
def test_run(self):
ref_image = 'data/test/images/image_anydoor_fg.png'
ref_mask = 'data/test/images/image_anydoor_fg_mask.png'
bg_image = 'data/test/images/image_anydoor_bg.png'
bg_mask = 'data/test/images/image_anydoor_bg_mask.png'
ref_image = 'https://modelscope.oss-cn-beijing.aliyuncs.com/test/images/image_anydoor_fg.png'
ref_mask = 'https://modelscope.oss-cn-beijing.aliyuncs.com/test/images/image_anydoor_fg_mask.png'
bg_image = 'https://modelscope.oss-cn-beijing.aliyuncs.com/test/images/image_anydoor_bg.jpg'
bg_mask = 'https://modelscope.oss-cn-beijing.aliyuncs.com/test/images/image_anydoor_bg_mask.png'
save_path = 'data/test/images/image_anydoor_gen.png'
anydoor_pipline: AnydoorPipeline = pipeline(