Merge d7f728c into 75c06d3

mmocr/models/textdet/heads/drrg_head.py

@@ -6,7 +6,11 @@
 import torch
 import torch.nn as nn
 import torch.nn.functional as F
-from lanms import merge_quadrangle_n9 as la_nms
+
+try:
+    from lanms import merge_quadrangle_n9 as la_nms
+except ImportError:
+    la_nms = None
 from mmcv.ops import RoIAlignRotated
 from mmengine.model import BaseModule
 from numpy import ndarray
@@ -838,6 +842,9 @@ def propose_comps_and_attribs(self, text_region_map: ndarray,
                                             self.comp_shrink_ratio,
                                             self.comp_w_h_ratio)
 
+            if la_nms is None:
+                raise ImportError('lanms-neo is not installed, '
+                                  'please run "pip install lanms-neo==1.0.2".')
             text_comps = la_nms(text_comps, self.nms_thr)
             text_comp_mask = np.zeros(mask_sz)
             text_comp_boxes = text_comps[:, :8].reshape(

mmocr/models/textdet/module_losses/drrg_module_loss.py

@@ -4,7 +4,11 @@
 import cv2
 import numpy as np
 import torch
-from lanms import merge_quadrangle_n9 as la_nms
+
+try:
+    from lanms import merge_quadrangle_n9 as la_nms
+except ImportError:
+    la_nms = None
 from mmcv.image import imrescale
 from mmdet.models.utils import multi_apply
 from numpy import ndarray
@@ -447,6 +451,9 @@ def _generate_comp_attribs(self, center_lines: List[ndarray],
 
         score = np.ones((text_comps.shape[0], 1), dtype=np.float32)
         text_comps = np.hstack([text_comps, score])
+        if la_nms is None:
+            raise ImportError('lanms-neo is not installed, '
+                              'please run "pip install lanms-neo==1.0.2".')
         text_comps = la_nms(text_comps, self.text_comp_nms_thr)
 
         if text_comps.shape[0] >= 1:

requirements/readthedocs.txt

@@ -1,6 +1,5 @@
 imgaug
 kwarray
-lanms-neo==1.0.2
 lmdb
 matplotlib
 mmcv>=2.0.0rc1

requirements/runtime.txt

@@ -1,5 +1,4 @@
 imgaug
-lanms-neo==1.0.2
 lmdb
 matplotlib
 numpy

requirements/tests.txt

@@ -5,6 +5,7 @@ interrogate
 isort
 # Note: used for kwarray.group_items, this may be ported to mmcv in the future.
 kwarray
+lanms-neo==1.0.2
 parameterized
 pytest
 pytest-cov