rename model name and official model (#2045)

* rename model name and official model

* rename model name and official model

* Update PicoDet-L_layout_3cls.yaml

README.md

@@ -85,7 +85,7 @@ PaddleX 3.0 覆盖了 16 条产业级模型产线，其中 9 条基础产线可
   </tr>
   <tr>
     <td>小目标检测</td>
-    <td>PP-YOLOE+_SOD-L<br/>PP-YOLOE+_SOD-S<br/>PP-YOLOE+_SOD-largesize-L</td>
+    <td>PP-YOLOE_plus_SOD-L<br/>PP-YOLOE_plus_SOD-S<br/>PP-YOLOE_plus_SOD-largesize-L</td>
   </tr>
   <tr>
     <td>主体检测</td>

paddlex/configs/object_detection/CenterNet-DLA-34.yaml

@@ -18,9 +18,9 @@ Train:
   num_classes: 4
   epochs_iters: 50
   batch_size: 2
-  learning_rate: # 0.08
+  learning_rate: 0.08
   pretrain_weight_path: null
-  warmup_steps: # 100
+  warmup_steps: 100
   resume_path: null
   log_interval: 10
   eval_interval: 1

paddlex/configs/object_detection/CenterNet-ResNet50.yaml

@@ -18,9 +18,9 @@ Train:
   num_classes: 4
   epochs_iters: 50
   batch_size: 2
-  learning_rate: # 0.08
+  learning_rate: 0.08
   pretrain_weight_path: null
-  warmup_steps: # 100
+  warmup_steps: 100
   resume_path: null
   log_interval: 10
   eval_interval: 1

paddlex/configs/object_detection/FCOS-ResNet50.yaml

@@ -20,7 +20,7 @@ Train:
   batch_size: 4
   learning_rate: 0.002
   pretrain_weight_path: null
-  warmup_steps: # 100
+  warmup_steps: 100
   resume_path: null
   log_interval: 10
   eval_interval: 1

paddlex/configs/smallobject_detection/PP-YOLOE+_SOD-L.yaml → paddlex/configs/smallobject_detection/PP-YOLOE_plus_SOD-L.yaml

@@ -1,5 +1,5 @@
 Global:
-  model: PP-YOLOE+_SOD-L
+  model: PP-YOLOE_plus_SOD-L
   mode: check_dataset # check_dataset/train/evaluate/predict
   dataset_dir: "/paddle/dataset/paddlex/det/det_coco_examples"
   device: gpu:0,1,2,3

paddlex/configs/smallobject_detection/PP-YOLOE+_SOD-S.yaml → paddlex/configs/smallobject_detection/PP-YOLOE_plus_SOD-S.yaml

@@ -1,5 +1,5 @@
 Global:
-  model: PP-YOLOE+_SOD-S
+  model: PP-YOLOE_plus_SOD-S
   mode: check_dataset # check_dataset/train/evaluate/predict
   dataset_dir: "/paddle/dataset/paddlex/det/det_coco_examples"
   device: gpu:0,1,2,3

paddlex/configs/smallobject_detection/PP-YOLOE+_SOD-largesize-L.yaml → paddlex/configs/smallobject_detection/PP-YOLOE_plus_SOD-largesize-L.yaml

@@ -1,5 +1,5 @@
 Global:
-  model: PP-YOLOE+_SOD-largesize-L
+  model: PP-YOLOE_plus_SOD-largesize-L
   mode: check_dataset # check_dataset/train/evaluate/predict
   dataset_dir: "/paddle/dataset/paddlex/det/det_coco_examples"
   device: gpu:0,1,2,3

paddlex/configs/structure_analysis/PicoDet-L_layout.yaml → paddlex/configs/structure_analysis/PicoDet-L_layout_3cls.yaml

@@ -1,5 +1,5 @@
 Global:
-  model: PicoDet-L_layout
+  model: PicoDet-L_layout_3cls
   mode: check_dataset # check_dataset/train/evaluate/predict
   dataset_dir: "/paddle/dataset/paddlex/layout/det_layout_examples"
   device: gpu:0,1,2,3

paddlex/inference/predictors/official_models.py

@@ -36,6 +36,7 @@ OFFICIAL_MODELS = {
     "PP-LCNet_x0_5": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/PP-LCNet_x0_5_infer.tar",
     "PP-LCNet_x0_75": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/PP-LCNet_x0_75_infer.tar",
     "PP-LCNet_x1_0": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/PP-LCNet_x1_0_infer.tar",
+    "PP-LCNet_x1_0_doc_ori": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-LCNet_x1_0_doc_ori_infer.tar",
     "PP-LCNet_x1_5": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/PP-LCNet_x1_5_infer.tar",
     "PP-LCNet_x2_5": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/PP-LCNet_x2_5_infer.tar",
     "PP-LCNet_x2_0": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/PP-LCNet_x2_0_infer.tar",
@@ -186,10 +187,9 @@ PP-OCRv4_mobile_det_infer.tar",
 openatom_rec_repsvtr_ch_infer.tar",
     "ch_SVTRv2_rec": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/\
 openatom_rec_svtrv2_ch_infer.tar",
-    "PicoDet_layout_1x": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/PicoDet-L_layout_infer.tar",
+    "PicoDet_layout_1x": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PicoDet-L_layout_infer.tar",
     "SLANet": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/SLANet_infer.tar",
     "LaTeX_OCR_rec": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/LaTeX_OCR_rec_infer.tar",
-    "UVDoc": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/UVDoc_infer.tar",
     "FasterRCNN-ResNet34-FPN": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/FasterRCNN-ResNet34-FPN_infer.tar",
     "FasterRCNN-ResNet50": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/FasterRCNN-ResNet50_infer.tar",
     "FasterRCNN-ResNet50-FPN": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/FasterRCNN-ResNet50-FPN_infer.tar",
@@ -215,6 +215,25 @@ openatom_rec_svtrv2_ch_infer.tar",
     "PatchTST_ad": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/PatchTST_ad_infer.tar",
     "TimesNet_ad": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/TimesNet_ad_infer.tar",
     "TimesNet_cls": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1_v2/TimesNet_cls_infer.tar",
+    "STFPM": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/STFPM_infer.tar",
+    "FCOS-ResNet50": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/FCOS-ResNet50_infer.tar",
+    "DETR-R50": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/DETR-R50_infer.tar",
+    "PP-YOLOE-L_vehicle": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE-L_vehicle_infer.tar",
+    "PP-YOLOE-S_vehicle": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE-S_vehicle_infer.tar",
+    "PP-ShiTuV2_det": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-ShiTuV2_det_infer.tar",
+    "PP-YOLOE-S_human": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE-S_human_infer.tar",
+    "PP-YOLOE-L_human": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE-L_human_infer.tar",
+    "PicoDet-M": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PicoDet-M_infer.tar",
+    "PicoDet-XS": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PicoDet-XS_infer.tar",
+    "PP-YOLOE_plus_SOD-L": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE_plus_SOD-L_infer.tar",
+    "PP-YOLOE_plus_SOD-S": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE_plus_SOD-S_infer.tar",
+    "PP-YOLOE_plus_SOD-largesize-L": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE_plus_SOD-largesize-L_infer.tar",
+    "CenterNet-DLA-34": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/CenterNet-DLA-34_infer.tar",
+    "CenterNet-ResNet50": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/CenterNet-ResNet50_infer.tar",
+    "PicoDet-L_layout_3cls": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PicoDet-L_layout_3cls_infer.tar",
+    "RT-DETR-H_layout_3cls": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/RT-DETR-H_layout_3cls_infer.tar",
+    "RT-DETR-H_layout_17cls": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/RT-DETR-H_layout_17cls_infer.tar",
+    "PicoDet_LCNet_x2_5_face": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PicoDet_LCNet_x2_5_face_infer.tar",
 }
 
 
@@ -231,4 +250,4 @@ class OfficialModelsDict(dict):
         return save_dir / f"{key}"
 
 
-official_models = OfficialModelsDict(OFFICIAL_MODELS)
+official_models = OfficialModelsDict(OFFICIAL_MODELS)

paddlex/modules/base/predictor/utils/official_models.py

@@ -185,7 +185,7 @@ PP-OCRv4_mobile_det_infer.tar",
 openatom_rec_repsvtr_ch_infer.tar",
     "ch_SVTRv2_rec": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/\
 openatom_rec_svtrv2_ch_infer.tar",
-    "PicoDet_layout_1x": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PicoDet-L_layout_infer.tar",
+    "PicoDet_layout_1x": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PicoDet_layout_1x_infer.tar",
     "SLANet": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/SLANet_infer.tar",
     "LaTeX_OCR_rec": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/LaTeX_OCR_rec_infer.tar",
     "FasterRCNN-ResNet34-FPN": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/FasterRCNN-ResNet34-FPN_infer.tar",
@@ -223,12 +223,12 @@ openatom_rec_svtrv2_ch_infer.tar",
     "PP-YOLOE-L_human": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE-L_human_infer.tar",
     "PicoDet-M": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PicoDet-M_infer.tar",
     "PicoDet-XS": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PicoDet-XS_infer.tar",
-    "PP-YOLOE+_SOD-L": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE+_SOD-L_infer.tar",
-    "PP-YOLOE+_SOD-S": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE+_SOD-S_infer.tar",
-    "PP-YOLOE+_SOD-largesize-L": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE+_SOD-largesize-L_infer.tar",
+    "PP-YOLOE_plus_SOD-L": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE_plus_SOD-L_infer.tar",
+    "PP-YOLOE_plus_SOD-S": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE_plus_SOD-S_infer.tar",
+    "PP-YOLOE_plus_SOD-largesize-L": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PP-YOLOE_plus_SOD-largesize-L_infer.tar",
     "CenterNet-DLA-34": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/CenterNet-DLA-34_infer.tar",
     "CenterNet-ResNet50": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/CenterNet-ResNet50_infer.tar",
-    "PicoDet-L_layout": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PicoDet-L_layout_infer.tar",
+    "PicoDet-L_layout_3cls": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PicoDet-L_layout_3cls_infer.tar",
     "RT-DETR-H_layout_3cls": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/RT-DETR-H_layout_3cls_infer.tar",
     "RT-DETR-H_layout_17cls": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/RT-DETR-H_layout_17cls_infer.tar",
     "PicoDet_LCNet_x2_5_face": "https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0b1/PicoDet_LCNet_x2_5_face_infer.tar",

paddlex/modules/object_detection/model_list.py

@@ -26,7 +26,7 @@ MODELS = [
     "RT-DETR-R50",
     "RT-DETR-X",
     "PicoDet_layout_1x",
-    "PicoDet-L_layout",
+    "PicoDet-L_layout_3cls",
     "RT-DETR-H_layout_3cls",
     "RT-DETR-H_layout_17cls",
     "YOLOv3-DarkNet53",
@@ -58,9 +58,9 @@ MODELS = [
     "PP-YOLOE-S_human",
     "PP-YOLOE-L_vehicle",
     "PP-YOLOE-S_vehicle",
-    "PP-YOLOE+_SOD-L",
-    "PP-YOLOE+_SOD-S",
-    "PP-YOLOE+_SOD-largesize-L",
+    "PP-YOLOE_plus_SOD-L",
+    "PP-YOLOE_plus_SOD-S",
+    "PP-YOLOE_plus_SOD-largesize-L",
     "CenterNet-DLA-34",
     "CenterNet-ResNet50",
     "PicoDet_LCNet_x2_5_face",

paddlex/repo_apis/PaddleDetection_api/object_det/register.py

@@ -729,9 +729,9 @@ register_model_info(
 
 register_model_info(
     {
-        'model_name': 'PP-YOLOE+_SOD-L',
+        'model_name': 'PP-YOLOE_plus_SOD-L',
         'suite': 'Det',
-        'config_path': osp.join(PDX_CONFIG_DIR, 'PP-YOLOE+_SOD-L.yaml'),
+        'config_path': osp.join(PDX_CONFIG_DIR, 'PP-YOLOE_plus_SOD-L.yaml'),
         'supported_apis': ['train', 'evaluate', 'predict', 'export', 'infer'],
         'supported_dataset_types': ['COCODetDataset'],
         'supported_train_opts': {
@@ -745,9 +745,9 @@ register_model_info(
 
 register_model_info(
     {
-        'model_name': 'PP-YOLOE+_SOD-S',
+        'model_name': 'PP-YOLOE_plus_SOD-S',
         'suite': 'Det',
-        'config_path': osp.join(PDX_CONFIG_DIR, 'PP-YOLOE+_SOD-S.yaml'),
+        'config_path': osp.join(PDX_CONFIG_DIR, 'PP-YOLOE_plus_SOD-S.yaml'),
         'supported_apis': ['train', 'evaluate', 'predict', 'export', 'infer'],
         'supported_dataset_types': ['COCODetDataset'],
         'supported_train_opts': {
@@ -761,9 +761,9 @@ register_model_info(
 
 register_model_info(
     {
-        'model_name': 'PP-YOLOE+_SOD-largesize-L',
+        'model_name': 'PP-YOLOE_plus_SOD-largesize-L',
         'suite': 'Det',
-        'config_path': osp.join(PDX_CONFIG_DIR, 'PP-YOLOE+_SOD-largesize-L.yaml'),
+        'config_path': osp.join(PDX_CONFIG_DIR, 'PP-YOLOE_plus_SOD-largesize-L.yaml'),
         'supported_apis': ['train', 'evaluate', 'predict', 'export', 'infer'],
         'supported_dataset_types': ['COCODetDataset'],
         'supported_train_opts': {
@@ -793,9 +793,9 @@ register_model_info(
 
 register_model_info(
     {
-        "model_name": "PicoDet-L_layout",
+        "model_name": "PicoDet-L_layout_3cls",
         "suite": "Det",
-        "config_path": osp.join(PDX_CONFIG_DIR, "PicoDet-L_layout.yaml"),
+        "config_path": osp.join(PDX_CONFIG_DIR, "PicoDet-L_layout_3cls.yaml"),
         "supported_apis": ["train", "evaluate", "predict", "export", "infer"],
         "supported_dataset_types": ["COCODetDataset"],
         "supported_train_opts": {