merge fix

obss · Apr 28, 2021 · 4df272d · 4df272d
1 parent 9906f1a
commit 4df272d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/sahi/utils/coco.py b/sahi/utils/coco.py
@@ -844,14 +844,10 @@ def from_coco_dict_or_path(cls, coco_dict_or_path, desired_name2id=None, remappi
 
         # arrange image id to annotation id mapping
         coco.add_categories_from_coco_category_list(coco_dict["categories"])
-<<<<<<< HEAD
         if mp:
             imageid2annotationlist = get_imageid2annotationlist_mapping_mp(coco_dict)
         else:
             imageid2annotationlist = get_imageid2annotationlist_mapping(coco_dict)
-=======
-        imageid2annotationlist = get_imageid2annotationlist_mapping_mt(coco_dict)
->>>>>>> 40db5791cf77814b889e5a65a52523f315ef5a2a
         category_mapping = coco.category_mapping
 
         coco_image_list = []

diff --git a/tests/test_cocoutils.py b/tests/test_cocoutils.py
@@ -352,19 +352,11 @@ def check_image_id(image_id):
         check_image_id(image_id=2)
 
     def test_get_imageid2annotationlist_mapping_mt(self):
-<<<<<<< HEAD
         from sahi.utils.coco import get_imageid2annotationlist_mapping_mp
 
         coco_path = "tests/data/coco_utils/combined_coco.json"
         coco_dict = load_json(coco_path)
         imageid2annotationlist_mapping = get_imageid2annotationlist_mapping_mp(coco_dict)
-=======
-        from sahi.utils.coco import get_imageid2annotationlist_mapping_mt
-
-        coco_path = "tests/data/coco_utils/combined_coco.json"
-        coco_dict = load_json(coco_path)
-        imageid2annotationlist_mapping = get_imageid2annotationlist_mapping_mt(coco_dict)
->>>>>>> 40db5791cf77814b889e5a65a52523f315ef5a2a
         self.assertEqual(len(imageid2annotationlist_mapping), 2)
 
         def check_image_id(image_id):