Merge branch 'dygraph' of https://github.com/PaddlePaddle/PaddleOCR into dygraph

PPOCRLabel/PPOCRLabel.py

@@ -1733,7 +1733,7 @@ class MainWindow(QMainWindow):
             width, height = self.image.width(), self.image.height()
             for shape in self.canvas.lockedShapes:
                 box = [[int(p[0] * width), int(p[1] * height)] for p in shape['ratio']]
-                assert len(box) == 4
+                # assert len(box) == 4
                 result = [(shape['transcription'], 1)]
                 result.insert(0, box)
                 self.result_dic_locked.append(result)

applications/多模态表单识别.md

@@ -16,7 +16,7 @@
 <center><img src='https://ai-studio-static-online.cdn.bcebos.com/9bd844b970f94e5ba0bc0c5799bd819ea9b1861bb306471fabc2d628864d418e'></center>
 <center>图1 多模态表单识别流程图</center>
 
-注：欢迎再AIStudio领取免费算力体验线上实训，项目链接: 多模态表单识别](https://aistudio.baidu.com/aistudio/projectdetail/3815918)(配备Tesla V100、A100等高级算力资源)
+注：欢迎再AIStudio领取免费算力体验线上实训，项目链接: [多模态表单识别](https://aistudio.baidu.com/aistudio/projectdetail/3815918)(配备Tesla V100、A100等高级算力资源)
 
 
 

deploy/slim/quantization/export_model.py

@@ -17,9 +17,9 @@ import sys
 
 __dir__ = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(__dir__)
-sys.path.append(os.path.abspath(os.path.join(__dir__, '..', '..', '..')))
-sys.path.append(
-    os.path.abspath(os.path.join(__dir__, '..', '..', '..', 'tools')))
+sys.path.insert(0, os.path.abspath(os.path.join(__dir__, '..', '..', '..')))
+sys.path.insert(
+    0, os.path.abspath(os.path.join(__dir__, '..', '..', '..', 'tools')))
 
 import argparse
 
@@ -129,7 +129,6 @@ def main():
     quanter.quantize(model)
 
     load_model(config, model)
-    model.eval()
 
     # build metric
     eval_class = build_metric(config['Metric'])
@@ -142,6 +141,7 @@ def main():
     # start eval
     metric = program.eval(model, valid_dataloader, post_process_class,
                           eval_class, model_type, use_srn)
+    model.eval()
 
     logger.info('metric eval ***************')
     for k, v in metric.items():
@@ -156,7 +156,6 @@ def main():
     if arch_config["algorithm"] in ["Distillation", ]:  # distillation model
         archs = list(arch_config["Models"].values())
         for idx, name in enumerate(model.model_name_list):
-            model.model_list[idx].eval()
             sub_model_save_path = os.path.join(save_path, name, "inference")
             export_single_model(model.model_list[idx], archs[idx],
                                 sub_model_save_path, logger, quanter)

ppocr/modeling/architectures/base_model.py

@@ -92,6 +92,9 @@ class BaseModel(nn.Layer):
         else:
             y["head_out"] = x
         if self.return_all_feats:
+            if self.training:
                 return y
+            else:
+                return {"head_out": y["head_out"]}
         else:
             return x