Merge branch 'dygraph' into dygraph

ppocr/modeling/necks/__init__.py

@@ -23,7 +23,12 @@ def build_neck(config):
     from .pg_fpn import PGFPN
     from .table_fpn import TableFPN
     from .fpn import FPN
-    support_dict = ['FPN','DBFPN', 'EASTFPN', 'SASTFPN', 'SequenceEncoder', 'PGFPN', 'TableFPN']
+    from .fce_fpn import FCEFPN
+    from .pren_fpn import PRENFPN
+    support_dict = [
+        'FPN', 'FCEFPN', 'DBFPN', 'EASTFPN', 'SASTFPN', 'SequenceEncoder',
+        'PGFPN', 'TableFPN', 'PRENFPN'
+    ]
 
     module_name = config.pop('name')
     assert module_name in support_dict, Exception('neck only support {}'.format(

ppstructure/predict_system.py

@@ -58,6 +58,7 @@ class OCRSystem(object):
             self.table_layout = lp.PaddleDetectionLayoutModel(
                 config_path=config_path,
                 model_path=model_path,
+                label_map=args.layout_label_map,
                 threshold=0.5,
                 enable_mkldnn=args.enable_mkldnn,
                 enforce_cpu=not args.use_gpu,