Forráskód Böngészése

rename layout pretrain (#4001)

* rename layout pretrain

* fix rotate det
Sunflower7788 6 hónapja
szülő
commit
09f81fb325

+ 2 - 2
paddlex/configs/modules/layout_detection/PP-DocBlockLayout.yaml

@@ -19,7 +19,7 @@ Train:
   epochs_iters: 100
   batch_size: 1
   learning_rate: 0.0001
-  pretrain_weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocBlockLayout_pretrain.pdparams
+  pretrain_weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocBlockLayout_pretrained.pdparams
   warmup_steps: 100
   resume_path: null
   log_interval: 10
@@ -30,7 +30,7 @@ Evaluate:
   log_interval: 10
 
 Export:
-  weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocBlockLayout_pretrain.pdparams
+  weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocBlockLayout_pretrained.pdparams
 
 Predict:
   batch_size: 1

+ 2 - 2
paddlex/configs/modules/layout_detection/PP-DocLayout-L.yaml

@@ -19,7 +19,7 @@ Train:
   epochs_iters: 100
   batch_size: 1
   learning_rate: 0.0001
-  pretrain_weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout-L_pretrain.pdparams
+  pretrain_weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout-L_pretrained.pdparams
   warmup_steps: 100
   resume_path: null
   log_interval: 10
@@ -30,7 +30,7 @@ Evaluate:
   log_interval: 10
 
 Export:
-  weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout-L_pretrain.pdparams
+  weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout-L_pretrained.pdparams
 
 Predict:
   batch_size: 1

+ 2 - 2
paddlex/configs/modules/layout_detection/PP-DocLayout-M.yaml

@@ -19,7 +19,7 @@ Train:
   epochs_iters: 100
   batch_size: 1
   learning_rate: 0.0001
-  pretrain_weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout-M_pretrain.pdparams
+  pretrain_weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout-M_pretrained.pdparams
   warmup_steps: 100
   resume_path: null
   log_interval: 10
@@ -30,7 +30,7 @@ Evaluate:
   log_interval: 10
 
 Export:
-  weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout-M_pretrain.pdparams
+  weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout-M_pretrained.pdparams
 
 Predict:
   batch_size: 1

+ 2 - 2
paddlex/configs/modules/layout_detection/PP-DocLayout-S.yaml

@@ -19,7 +19,7 @@ Train:
   epochs_iters: 100
   batch_size: 1
   learning_rate: 0.0001
-  pretrain_weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout-S_pretrain.pdparams
+  pretrain_weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout-S_pretrained.pdparams
   warmup_steps: 100
   resume_path: null
   log_interval: 10
@@ -30,7 +30,7 @@ Evaluate:
   log_interval: 10
 
 Export:
-  weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout-S_pretrain.pdparams
+  weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout-S_pretrained.pdparams
 
 Predict:
   batch_size: 1

+ 2 - 2
paddlex/configs/modules/layout_detection/PP-DocLayout_plus-L.yaml

@@ -19,7 +19,7 @@ Train:
   epochs_iters: 100
   batch_size: 1
   learning_rate: 0.0001
-  pretrain_weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout_plus-L_pretrain.pdparams
+  pretrain_weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout_plus-L_pretrained.pdparams
   warmup_steps: 100
   resume_path: null
   log_interval: 10
@@ -30,7 +30,7 @@ Evaluate:
   log_interval: 10
 
 Export:
-  weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout_plus-L_pretrain.pdparams
+  weight_path: https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayout_plus-L_pretrained.pdparams
 
 Predict:
   batch_size: 1

+ 1 - 1
paddlex/inference/models/object_detection/processors.py

@@ -748,7 +748,7 @@ class DetPostProcess:
             boxes = np.array(boxes[selected_indices])
 
         filter_large_image = True
-        if filter_large_image and len(boxes) > 1:
+        if filter_large_image and len(boxes) > 1 and boxes.shape[1] == 6:
             if img_size[0] > img_size[1]:
                 area_thres = 0.82
             else: