From d38076b07211960942318b314b98f5203016036a Mon Sep 17 00:00:00 2001 From: "eniac.xcw" Date: Tue, 6 Sep 2022 22:18:51 +0800 Subject: [PATCH] makes test code clear Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/10041992 --- data/test/images/multimodal_similarity.jpg | 3 +++ .../pipelines/test_multi_modal_similarity.py | 26 ++++++++++++------- 2 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 data/test/images/multimodal_similarity.jpg diff --git a/data/test/images/multimodal_similarity.jpg b/data/test/images/multimodal_similarity.jpg new file mode 100644 index 00000000..70a2b844 --- /dev/null +++ b/data/test/images/multimodal_similarity.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f24abbba43782d733dedbb0b4f416635af50263862e5632963ac9263e430555 +size 88542 diff --git a/tests/pipelines/test_multi_modal_similarity.py b/tests/pipelines/test_multi_modal_similarity.py index d1d6a7a8..192602b4 100644 --- a/tests/pipelines/test_multi_modal_similarity.py +++ b/tests/pipelines/test_multi_modal_similarity.py @@ -10,32 +10,38 @@ from modelscope.utils.test_utils import test_level class MultiModalSimilarityTest(unittest.TestCase): model_id = 'damo/multi-modal_team-vit-large-patch14_multi-modal-similarity' - test_input = { - 'img': 'data/test/images/generative_multimodal.jpg', - 'text': '起居室照片' - } + test_img = 'data/test/images/multimodal_similarity.jpg' + test_str1 = '一个上了年纪的女人在城镇中骑着自行车一个黄色出租车正要从她身边驶过' + test_str2 = '穿着蓝色连衣裙的那个女人正冲着行来的车辆伸出她的手' + + def infer_pipeline(self, multi_modal_similarity_pipeline): + test_input1 = {'img': self.test_img, 'text': self.test_str1} + test_input2 = {'img': self.test_img, 'text': self.test_str2} + output1 = multi_modal_similarity_pipeline(test_input1) + output2 = multi_modal_similarity_pipeline(test_input2) + print('image: {}, text: {}, similarity: {}'.format( + self.test_img, self.test_str1, output1['scores'])) + print('image: {}, text: {}, similarity: {}'.format( + self.test_img, self.test_str2, output2['scores'])) @unittest.skipUnless(test_level() >= 0, 'skip test in current test level') def test_run(self): multi_modal_similarity_pipeline = pipeline( Tasks.multi_modal_similarity, model=self.model_id) - output = multi_modal_similarity_pipeline(self.test_input) - print(output) + self.infer_pipeline(multi_modal_similarity_pipeline) @unittest.skipUnless(test_level() >= 2, 'skip test in current test level') def test_run_with_default_model(self): multi_modal_similarity_pipeline = pipeline( task=Tasks.multi_modal_similarity) - output = multi_modal_similarity_pipeline(self.test_input) - print(output) + self.infer_pipeline(multi_modal_similarity_pipeline) @unittest.skipUnless(test_level() >= 1, 'skip test in current test level') def test_run_with_model_from_modelhub(self): model = Model.from_pretrained(self.model_id) multi_modal_similarity_pipeline = pipeline( task=Tasks.multi_modal_similarity, model=model) - output = multi_modal_similarity_pipeline(self.test_input) - print(output) + self.infer_pipeline(multi_modal_similarity_pipeline) if __name__ == '__main__':