jump to 0.3.1

Author: qiaoliang6

Diff for: davarocr/LICENSE renamed to LICENSE

@@ -57,9 +57,6 @@ def init_model(config, checkpoint=None, device='cuda:0', cfg_options=None):
     elif cfg_types == "SPOTTER":
         from davarocr.davar_spotting.models.builder import build_spotter
         model = build_spotter(config.model, test_cfg=config.get('test_cfg'))
-    elif cfg_types == "NER":
-        from davarocr.davar_ner.models.builder import build_ner
-        model = build_ner(config.model, test_cfg=config.get('test_cfg'))
     else:
         raise NotImplementedError
 

Diff for: davarocr/davarocr/__init__.py renamed to davarocr/__init__.py

@@ -17,6 +17,7 @@
 from davarocr.davar_common.core import POSTPROCESS
 from .post_detector_base import BasePostDetector
 
+
 @POSTPROCESS.register_module()
 class PostEAST(BasePostDetector):
     """ EAST post-processing, using geo map and score map to generate final boxes."""

Diff for: davarocr/davarocr/davar_common/__init__.py renamed to davarocr/davar_common/__init__.py

@@ -52,18 +52,22 @@ class DiceLoss(nn.Module):
     def __init__(self,
                  smooth=1,
                  p=2,
-                 loss_weight=1.0):
+                 loss_weight=1.0,
+                 use_sigmoid=False,
+                 ):
         """ Initialization.
 
         Args:
             smooth(float): a float number to smooth loss, and avoid NaN error, default:1
             p(int): Denominator value, \sum{x^p}+\sum{y^p}, default:2
             loss_weight(float): loss weight
+            use_sigmoid(bool): whether to conduct sigmoid operation on feature map
         """
         super().__init__()
         self.smooth = smooth
         self.p = p
         self.loss_weight = loss_weight
+        self.use_sigmoid = use_sigmoid
 
     def forward(self,
                 pred,
@@ -104,6 +108,9 @@ def _multi_cls_loss(self, predict, target, weight=None, weight_in_channel=None):
         """
         assert predict.shape == target.shape
 
+        if self.use_sigmoid:
+            predict = predict.sigmoid()
+
         if weight is not None:
             assert predict[0, 0].shape == weight[0].shape
         if weight_in_channel is not None:

Diff for: davarocr/davarocr/davar_common/apis/__init__.py renamed to davarocr/davar_common/apis/__init__.py

@@ -9,7 +9,7 @@
 ##################################################################################################
 """
 from .loading_utils import wordmap_loader, shake_crop, shake_point,\
-    scale_box, scale_box_hori_vert, get_perspective_img, crop_and_transform, rotate_and_crop
+    scale_box, scale_box_hori_vert, get_perspective_img, crop_and_transform, rotate_and_crop, get_two_point_dis, check_point
 
 __all__ = ["wordmap_loader",
 
@@ -21,4 +21,8 @@
 
            "get_perspective_img",
            "crop_and_transform",
-           "rotate_and_crop"]
+           "rotate_and_crop",
+           'get_two_point_dis',
+           'check_point'
+
+           ]

Diff for: davarocr/davarocr/davar_common/apis/inference.py renamed to davarocr/davar_common/apis/inference.py

@@ -18,9 +18,3 @@
 from .builder import (TRANSFORMATIONS, RECOGNIZORS)
 from .builder import (build_transformation, build_recognizor)
 
-__all__ = [
-    'RECOGNIZORS',
-
-    'build_transformation',
-    'build_recognizor',
-]

Diff for: davarocr/davarocr/davar_common/apis/test.py renamed to davarocr/davar_common/apis/test.py

@@ -8,10 +8,14 @@
 # Date           :    2021-05-01
 ##################################################################################################
 """
+from .base import BaseRecognizor
 from .general import GeneralRecognizor
 from .rf_learning import RFLRecognizor
 
 __all__ = [
+
+    'BaseRecognizor',
+
     'GeneralRecognizor',
     'RFLRecognizor',
 ]

Diff for: davarocr/davarocr/davar_common/apis/train.py renamed to davarocr/davar_common/apis/train.py

@@ -21,7 +21,7 @@
 from davarocr.davar_common.datasets.davar_custom import DavarCustomDataset
 
 
-@DATASETS.register_module
+@DATASETS.register_module()
 class MultiFrameDataset(DavarCustomDataset):
     """ Implementation of the common video text dataset, which supports tasks of video text detection
 

Diff for: davarocr/davarocr/davar_common/core/__init__.py renamed to davarocr/davar_common/core/__init__.py

@@ -16,7 +16,7 @@
 from davarocr.davar_common.datasets.builder import SAMPLER
 
 
-@SAMPLER.register_module
+@SAMPLER.register_module()
 class MetricSampler(Sampler):
     """ Implementation of metric learning sampler"""
 

Diff for: davarocr/davarocr/davar_common/core/builder.py renamed to davarocr/davar_common/core/builder.py

@@ -4,8 +4,8 @@
 # Filename       :    version.py
 # Abstract       :
 
-# Current Version:    0.3.0
-# Date           :    2021-09-22
+# Current Version:    0.3.1
+# Date           :    2021-12-15
 ##################################################################################################
 """
-__version__ = "0.3.0"
+__version__ = "0.3.1"

Diff for: davarocr/davarocr/davar_common/core/evaluation/__init__.py renamed to davarocr/davar_common/core/evaluation/__init__.py

@@ -3,5 +3,5 @@ export LANG=zh_CN.UTF-8
 export LANGUAGE=zh_CN:zh:en_US:en
 export PATH=/usr/local/miniconda3/bin/:$PATH
 
-DAVAROCR_PATH=/data1/davarocr/
+DAVAROCR_PATH=/path/to/Davar-Lab-OCR/
 python -m torch.distributed.launch --nproc_per_node 8 $DAVAROCR_PATH/tools/train.py  ./config/lgpma_pub.py --no-validate --launcher pytorch

Diff for: davarocr/davarocr/davar_common/core/evaluation/davar_eval_hook.py renamed to davarocr/davar_common/core/evaluation/davar_eval_hook.py

@@ -95,6 +95,7 @@
         ),
     test=dict(
         type=dataset_type,
+        samples_per_gpu=1,
         ann_file='/path/to/datalist/icdar2015_test_datalist.json',
         img_prefix='/path/to/ICDAR2015',
         pipeline=test_pipeline

Diff for: davarocr/davarocr/davar_common/datasets/__init__.py renamed to davarocr/davar_common/datasets/__init__.py

@@ -3,5 +3,5 @@ export LANG=zh_CN.UTF-8
 export LANGUAGE=zh_CN:zh:en_US:en
 export PATH=/usr/local/miniconda3/bin/:$PATH
 
-DAVAROCR_PATH=/data1/davarocr/
+DAVAROCR_PATH=/path/to/Davar-Lab-OCR/
 python -m torch.distributed.launch --nproc_per_node 8 $DAVAROCR_PATH/tools/train.py  ./config/east_r50_rbox.py --launcher pytorch

Diff for: davarocr/davarocr/davar_common/datasets/builder.py renamed to davarocr/davar_common/datasets/builder.py

@@ -3,5 +3,5 @@ export LANG=zh_CN.UTF-8
 export LANGUAGE=zh_CN:zh:en_US:en
 export PATH=/usr/local/miniconda3/bin/:$PATH
 
-DAVAROCR_PATH=/data1/davarocr/
+DAVAROCR_PATH=/path/to/Davar-Lab-OCR/
 python $DAVAROCR_PATH/tools/train.py --no-validate --gpus 1 ./config/east_r50_rbox.py

Diff for: davarocr/davarocr/davar_common/datasets/davar_custom.py renamed to davarocr/davar_common/datasets/davar_custom.py

@@ -3,5 +3,5 @@ export LANG=zh_CN.UTF-8
 export LANGUAGE=zh_CN:zh:en_US:en
 export PATH=/usr/local/miniconda3/bin/:$PATH
 
-DAVAROCR_PATH=/data1/davarocr/
+DAVAROCR_PATH=/path/to/Davar-Lab-OCR/
 python -m torch.distributed.launch --nproc_per_node 8 $DAVAROCR_PATH/tools/train.py  ./config/mask_rcnn_r50_fpn.py --launcher pytorch

Diff for: davarocr/davarocr/davar_common/datasets/davar_dataset_wrappers.py renamed to davarocr/davar_common/datasets/davar_dataset_wrappers.py

@@ -3,5 +3,5 @@ export LANG=zh_CN.UTF-8
 export LANGUAGE=zh_CN:zh:en_US:en
 export PATH=/usr/local/miniconda3/bin/:$PATH
 
-DAVAROCR_PATH=/data1/davarocr/
+DAVAROCR_PATH=/path/to/Davar-Lab-OCR/
 python $DAVAROCR_PATH/tools/train.py --no-validate --gpus 1 ./config/mask_rcnn_r50_fpn.py