From fd76c1234bbb26db6ff71dd9e55783e899988600 Mon Sep 17 00:00:00 2001
From: lichenxia <lichenxia@yq01-qianmo-com-88-156-28.yq01.baidu.com>
Date: Wed, 16 Sep 2020 17:33:06 +0800
Subject: [PATCH] disable se & add cls params for hub serving

---
 configs/det/det_mv3_db.yml                   | 5 +++--
 deploy/hubserving/ocr_system/params.py       | 9 ++++++++-
 ppocr/modeling/backbones/det_mobilenet_v3.py | 4 +++-
 ppocr/modeling/heads/det_db_head.py          | 7 +++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/configs/det/det_mv3_db.yml b/configs/det/det_mv3_db.yml
index caa7bd4f..5f67ca1d 100755
--- a/configs/det/det_mv3_db.yml
+++ b/configs/det/det_mv3_db.yml
@@ -24,6 +24,7 @@ Backbone:
   function: ppocr.modeling.backbones.det_mobilenet_v3,MobileNetV3
   scale: 0.5
   model_name: large
+  disable_se: true
 
 Head:
   function: ppocr.modeling.heads.det_db_head,DBHead
@@ -49,6 +50,6 @@ Optimizer:
 PostProcess:
   function: ppocr.postprocess.db_postprocess,DBPostProcess
   thresh: 0.3
-  box_thresh: 0.7
+  box_thresh: 0.6
   max_candidates: 1000
-  unclip_ratio: 2.0
+  unclip_ratio: 1.5
diff --git a/deploy/hubserving/ocr_system/params.py b/deploy/hubserving/ocr_system/params.py
index 0ff56d37..c531d742 100644
--- a/deploy/hubserving/ocr_system/params.py
+++ b/deploy/hubserving/ocr_system/params.py
@@ -10,7 +10,7 @@ class Config(object):
 
 def read_params():
     cfg = Config()
-    
+
     #params for text detector
     cfg.det_algorithm = "DB"
     cfg.det_model_dir = "./inference/ch_det_mv3_db/"
@@ -38,6 +38,13 @@ def read_params():
     cfg.rec_char_dict_path = "./ppocr/utils/ppocr_keys_v1.txt"
     cfg.use_space_char = True
 
+    #params for text classifier
+    cfg.use_angle_cls = False
+    cfg.cls_model_dir = "./inference/ch_ppocr_mobile_v1.1_cls_infer/"
+    cfg.cls_image_shape = "3, 48, 192"
+    cfg.label_list = ['0', '180']
+    cfg.cls_batch_num = 30
+
     cfg.use_zero_copy_run = False
 
     return cfg
diff --git a/ppocr/modeling/backbones/det_mobilenet_v3.py b/ppocr/modeling/backbones/det_mobilenet_v3.py
index 87f5dd72..508f2bbf 100755
--- a/ppocr/modeling/backbones/det_mobilenet_v3.py
+++ b/ppocr/modeling/backbones/det_mobilenet_v3.py
@@ -79,6 +79,8 @@ class MobileNetV3():
         assert self.scale in supported_scale, \
             "supported scale are {} but input scale is {}".format(supported_scale, self.scale)
 
+        self.disable_se = params.get('disable_se', False)
+        
     def __call__(self, input):
         scale = self.scale
         inplanes = self.inplanes
@@ -232,7 +234,7 @@ class MobileNetV3():
             num_groups=num_mid_filter,
             use_cudnn=False,
             name=name + '_depthwise')
-        if use_se:
+        if use_se and not self.disable_se:
             conv1 = self.se_block(
                 input=conv1, num_out_filter=num_mid_filter, name=name + '_se')
 
diff --git a/ppocr/modeling/heads/det_db_head.py b/ppocr/modeling/heads/det_db_head.py
index 56998044..59b3a160 100644
--- a/ppocr/modeling/heads/det_db_head.py
+++ b/ppocr/modeling/heads/det_db_head.py
@@ -123,6 +123,13 @@ class DBHead(object):
         return fluid.layers.reciprocal(1 + fluid.layers.exp(-self.k * (x - y)))
 
     def __call__(self, conv_features, mode="train"):
+        """
+        Fuse different levels of feature map from backbone in the FPN manner. 
+        Args:
+            conv_features(list): feature maps from backbone
+            mode(str): runtime mode, can be "train", "eval" or "test"
+        Return: predicts
+        """
         c2, c3, c4, c5 = conv_features
         param_attr = fluid.initializer.MSRAInitializer(uniform=False)
         in5 = fluid.layers.conv2d(
-- 
GitLab