修改 lanms 包安装的判定条件

deploy/py_infer/src/data_process/postprocess/det_east_postprocess.py

@@ -1,5 +1,4 @@
 import os
-import platform
 import sys
 
 import cv2
@@ -14,10 +13,7 @@
 try:
     from lanms import merge_quadrangle_n9
 except ImportError:
-    if platform.system() == "Windows":
-        from mindocr.postprocess.nms_py.lanms_py import merge_quadrangle_n9
-    else:
-        raise ImportError("can not import lanms or lanms_win")
+    from mindocr.postprocess.nms_py.lanms_py import merge_quadrangle_n9
 
 __all__ = ["EASTPostprocess"]
 

deploy/py_infer/src/data_process/postprocess/det_sast_postprocess.py

@@ -1,5 +1,4 @@
 import os
-import platform
 import sys
 from typing import Tuple
 
@@ -14,10 +13,7 @@
 try:
     from lanms import merge_quadrangle_n9
 except ImportError:
-    if platform.system() == "Windows":
-        from mindocr.postprocess.nms_py.lanms_py import merge_quadrangle_n9
-    else:
-        raise ImportError("can not import lanms or lanms_win")
+    from mindocr.postprocess.nms_py.lanms_py import merge_quadrangle_n9
 
 __all__ = ["SASTPostprocess"]
 

mindocr/postprocess/det_east_postprocess.py

@@ -1,5 +1,4 @@
 import math
-import platform
 
 import numpy as np
 
@@ -10,10 +9,7 @@
 try:
     from lanms import merge_quadrangle_n9
 except ImportError:
-    if platform.system() == "Windows":
-        from .nms_py.lanms_py import merge_quadrangle_n9
-    else:
-        raise ImportError("can not import lanms or lanms_win")
+    from .nms_py.lanms_py import merge_quadrangle_n9
 
 __all__ = ["EASTPostprocess"]
 

requirements.txt

@@ -13,7 +13,7 @@ PyYAML>=6.0
 xml-python>=0.4.3
 packaging>=23.1
 Cython
-lanms>=1.0.2; sys_platform == 'linux'
+lanms>=1.0.2; python_version <= '3.10' and sys_platform == 'linux'
 sentencepiece>=0.1.99
 huggingface_hub>=0.16.4
 seqeval>=1.2.2

tests/ut/test_lanms_py.py

@@ -1,3 +1,6 @@
+import json
+import os
+
 import numpy as np
 
 from mindocr.postprocess.nms_py.lanms_py import calculate_iou, merge_quadrangle_n9, standard_nms, weighted_merge
@@ -6,6 +9,15 @@
 box2 = np.array([8, 10, 8, 50, 30, 50, 30, 10, 0.7])
 box3 = np.array([9, 10, 9, 60, 30, 60, 30, 10, 1.1])
 
+origin_boxes_test = []
+expect_processed_boxes_test = []
+lanms_test_jsons_path = os.path.join("tests/ut/lanms_test_jsons")
+for file in os.listdir(lanms_test_jsons_path):
+    with open(os.path.join(lanms_test_jsons_path, file)) as f:
+        data = json.loads(f.readline())
+        origin_boxes_test.append(np.array(data["origin_boxes"]))
+        expect_processed_boxes_test.append(sorted(np.array(data["processed_boxes"]), key=lambda x: x[0]))
+
 
 class TestLanmsPy:
     def test_calculate_iou(self):
@@ -16,8 +28,15 @@ def test_weighted_merge(self):
         assert np.allclose(weighted_merge(box1, box2), expect_result, rtol=1e-2) is True
 
     def test_standard_nms(self):
-        assert np.allclose(standard_nms([box2, box3], 0.5), box3, 1e-5)
+        assert np.allclose(standard_nms([box2, box3], 0.5), box3, 1e-5) is True
 
     def test_lanms(self):
         expect_result = np.array([[8.611, 10, 8.611, 56.11, 30, 56.11, 30, 10, 1.8], [0, 0, 0, 20, 10, 20, 10, 0, 0.8]])
-        assert np.allclose(merge_quadrangle_n9([box1, box2, box3]), expect_result, 1e-2)
+        assert np.allclose(merge_quadrangle_n9([box1, box2, box3]), expect_result, 1e-2) is True
+
+    def test_real_situations(self):
+        real_results = []
+        for origin_box_test in origin_boxes_test:
+            real_results.append(sorted(merge_quadrangle_n9(origin_box_test), key=lambda x: x[0]))
+        for i, real_result in enumerate(real_results):
+            assert np.allclose(real_result, expect_processed_boxes_test[i], 1e-2) is True