Этот коммит содержится в:
Petr Andriushchenko 2023-05-24 13:43:59 +02:00
родитель 0452d6607f
Коммит 3b1f5717d1
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4C4A5DCF634115B6

Просмотреть файл

@ -354,6 +354,7 @@ def test_parsing_images(
tmp_path, tmp_path,
): ):
ms.MultimodalSearch.multimodal_device = pre_multimodal_device ms.MultimodalSearch.multimodal_device = pre_multimodal_device
my_obj = ms.MultimodalSearch(get_testdict)
( (
model, model,
vis_processor, vis_processor,
@ -361,9 +362,7 @@ def test_parsing_images(
image_keys, image_keys,
_, _,
features_image_stacked, features_image_stacked,
) = ms.MultimodalSearch.parsing_images( ) = my_obj.parsing_images(pre_model, path_to_save_tensors=tmp_path)
get_testdict, pre_model, path_to_saved_tensors=tmp_path
)
for i, num in zip(range(10), features_image_stacked[0, 10:12].tolist()): for i, num in zip(range(10), features_image_stacked[0, 10:12].tolist()):
assert ( assert (
@ -371,7 +370,7 @@ def test_parsing_images(
is True is True
) )
test_pic = Image.open(get_testdict["IMG_2746"]["filename"]).convert("RGB") test_pic = Image.open(my_obj.subdict["IMG_2746"]["filename"]).convert("RGB")
test_querry = ( test_querry = (
"The bird sat on a tree located at the intersection of 23rd and 43rd streets." "The bird sat on a tree located at the intersection of 23rd and 43rd streets."
) )
@ -387,10 +386,10 @@ def test_parsing_images(
search_query = [ search_query = [
{"text_input": test_querry}, {"text_input": test_querry},
{"image": get_testdict["IMG_2746"]["filename"]}, {"image": my_obj.subdict["IMG_2746"]["filename"]},
] ]
multi_features_stacked = ms.MultimodalSearch.querys_processing( multi_features_stacked = my_obj.querys_processing(
get_testdict, search_query, model, txt_processor, vis_processor, pre_model search_query, model, txt_processor, vis_processor, pre_model
) )
for i, num in zip(range(10), multi_features_stacked[0, 10:12].tolist()): for i, num in zip(range(10), multi_features_stacked[0, 10:12].tolist()):
@ -410,8 +409,7 @@ def test_parsing_images(
{"image": get_path + "IMG_3758.png"}, {"image": get_path + "IMG_3758.png"},
] ]
similarity, sorted_list = ms.MultimodalSearch.multimodal_search( similarity, sorted_list = my_obj.multimodal_search(
get_testdict,
model, model,
vis_processor, vis_processor,
txt_processor, txt_processor,
@ -440,6 +438,7 @@ def test_parsing_images(
features_image_stacked, features_image_stacked,
processed_pic, processed_pic,
multi_features_stacked, multi_features_stacked,
my_obj,
) )
cuda.empty_cache() cuda.empty_cache()
@ -452,12 +451,12 @@ def test_itm(get_test_my_dict, get_path):
] ]
image_keys = ["IMG_2746", "IMG_2809"] image_keys = ["IMG_2746", "IMG_2809"]
sorted_list = [[1, 0], [1, 0]] sorted_list = [[1, 0], [1, 0]]
my_obj = ms.MultimodalSearch(get_test_my_dict)
for itm_model in ["blip_base", "blip_large"]: for itm_model in ["blip_base", "blip_large"]:
( (
itm_scores, itm_scores,
image_gradcam_with_itm, image_gradcam_with_itm,
) = ms.MultimodalSearch.image_text_match_reordering( ) = my_obj.image_text_match_reordering(
get_test_my_dict,
search_query3, search_query3,
itm_model, itm_model,
image_keys, image_keys,
@ -497,12 +496,12 @@ def test_itm_blip2_coco(get_test_my_dict, get_path):
] ]
image_keys = ["IMG_2746", "IMG_2809"] image_keys = ["IMG_2746", "IMG_2809"]
sorted_list = [[1, 0], [1, 0]] sorted_list = [[1, 0], [1, 0]]
my_obj = ms.MultimodalSearch(get_test_my_dict)
( (
itm_scores, itm_scores,
image_gradcam_with_itm, image_gradcam_with_itm,
) = ms.MultimodalSearch.image_text_match_reordering( ) = my_obj.image_text_match_reordering(
get_test_my_dict,
search_query3, search_query3,
"blip2_coco", "blip2_coco",
image_keys, image_keys,