fix default format when readimage (#2226)

paddlex/configs/structure_analysis/PicoDet_layout_1x.yaml

@@ -35,6 +35,6 @@ Export:
 Predict:
   batch_size: 1
   model_dir: "output/best_model/inference"
-  input: "/paddle/dataset/paddlex/layout/det_layout_examples/images/JPEGImages/train_0001.jpg"
+  input: "https://paddle-model-ecology.bj.bcebos.com/paddlex/imgs/demo_image/layout.jpg"
   kernel_option:
     run_mode: paddle

paddlex/inference/models/table_recognition.py

@@ -62,7 +62,7 @@ class TablePredictor(BasicPredictor):
     def build_readimg(self, channel_first=False, img_mode="BGR"):
         assert channel_first is False
         assert img_mode == "BGR"
-        return ReadImage()
+        return ReadImage(format=img_mode)
 
     @register("TableLabelEncode")
     def foo(self, *args, **kwargs):

paddlex/repo_apis/PaddleDetection_api/object_det/official_categories.py

@@ -1,14 +1,79 @@
 official_categories = {
-'PP-YOLOE-L_human': [{"name": "pedestrian", "id": 0}],
-'PP-YOLOE-S_human': [{"name": "pedestrian", "id": 0}],
-'PP-YOLOE-S_vehicle': [{"name": "vehicle", "id": 0}],
-'PP-YOLOE-L_vehicle': [{"name": "vehicle", "id": 0}],
-'PP-ShiTuV2_det': [{"name": "mainbody", "id": 0}],
-'PicoDet_layout_1x': [{"name": "Text", "id": 0}, {"name": "Title", "id": 1}, {"name": "List", "id": 2}, {"name": "Table", "id": 3}, {"name": "Figure", "id": 4}],
-'PicoDet-L_layout_3cls': [{"name": "image", "id": 0}, {"name": "table", "id": 1}, {"name": "seal", "id": 2}],
-'RT-DETR-H_layout_3cls': [{"name": "image", "id": 0}, {"name": "table", "id": 1}, {"name": "seal", "id": 2}],
-'RT-DETR-H_layout_17cls': [{"name": "paragraph_title", "id": 0}, {"name": "image", "id": 1}, {"name": "text", "id": 2}, {"name": "number", "id": 3}, {"name": "abstract", "id": 4}, {"name": "content", "id": 5}, {"name": "figure_title", "id": 6}, {"name": "formula", "id": 7}, {"name": "table", "id": 8}, {"name": "tabke_title", "id": 9}, {"name":"reference", "id": 10}, {"name": "doc_title", "id": 11}, {"name": "footnote", "id": 12}, {"name": "header", "id": 13}, {"name": "algorithm", "id": 14}, {"name": "footer", "id": 15}, {"name": "seal", "id": 16}],
-'PP-YOLOE_plus_SOD-S':  [{"name": "pedestrian", "id": 0}, {"name": "people", "id": 1}, {"name": "bicycle", "id": 2}, {"name": "car", "id": 3}, {"name": "van", "id": 4}, {"name": "truck", "id": 5}, {"name": "tricycle", "id": 6}, {"name": "awning-tricycle", "id": 7}, {"name": "bus", "id": 8}, {"name": "motorcycle", "id": 9}],
-'PP-YOLOE_plus_SOD-L': [{"name": "pedestrian", "id": 0}, {"name": "people", "id": 1}, {"name": "bicycle", "id": 2}, {"name": "car", "id": 3}, {"name": "van", "id": 4}, {"name": "truck", "id": 5}, {"name": "tricycle", "id": 6}, {"name": "awning-tricycle", "id": 7}, {"name": "bus", "id": 8}, {"name": "motorcycle", "id": 9}],
-'PP-YOLOE_plus_SOD-largesize-L': [{"name": "pedestrian", "id": 0}, {"name": "people", "id": 1}, {"name": "bicycle", "id": 2}, {"name": "car", "id": 3}, {"name": "van", "id": 4}, {"name": "truck", "id": 5}, {"name": "tricycle", "id": 6}, {"name": "awning-tricycle", "id": 7}, {"name": "bus", "id": 8}, {"name": "motorcycle", "id": 9}],
-}
+    "PP-YOLOE-L_human": [{"name": "pedestrian", "id": 0}],
+    "PP-YOLOE-S_human": [{"name": "pedestrian", "id": 0}],
+    "PP-YOLOE-S_vehicle": [{"name": "vehicle", "id": 0}],
+    "PP-YOLOE-L_vehicle": [{"name": "vehicle", "id": 0}],
+    "PP-ShiTuV2_det": [{"name": "mainbody", "id": 0}],
+    "PicoDet_layout_1x": [
+        {"name": "Text", "id": 0},
+        {"name": "Title", "id": 1},
+        {"name": "List", "id": 2},
+        {"name": "Table", "id": 3},
+        {"name": "Figure", "id": 4},
+    ],
+    "PicoDet-L_layout_3cls": [
+        {"name": "image", "id": 0},
+        {"name": "table", "id": 1},
+        {"name": "seal", "id": 2},
+    ],
+    "RT-DETR-H_layout_3cls": [
+        {"name": "image", "id": 0},
+        {"name": "table", "id": 1},
+        {"name": "seal", "id": 2},
+    ],
+    "RT-DETR-H_layout_17cls": [
+        {"name": "paragraph_title", "id": 0},
+        {"name": "image", "id": 1},
+        {"name": "text", "id": 2},
+        {"name": "number", "id": 3},
+        {"name": "abstract", "id": 4},
+        {"name": "content", "id": 5},
+        {"name": "figure_title", "id": 6},
+        {"name": "formula", "id": 7},
+        {"name": "table", "id": 8},
+        {"name": "table_title", "id": 9},
+        {"name": "reference", "id": 10},
+        {"name": "doc_title", "id": 11},
+        {"name": "footnote", "id": 12},
+        {"name": "header", "id": 13},
+        {"name": "algorithm", "id": 14},
+        {"name": "footer", "id": 15},
+        {"name": "seal", "id": 16},
+    ],
+    "PP-YOLOE_plus_SOD-S": [
+        {"name": "pedestrian", "id": 0},
+        {"name": "people", "id": 1},
+        {"name": "bicycle", "id": 2},
+        {"name": "car", "id": 3},
+        {"name": "van", "id": 4},
+        {"name": "truck", "id": 5},
+        {"name": "tricycle", "id": 6},
+        {"name": "awning-tricycle", "id": 7},
+        {"name": "bus", "id": 8},
+        {"name": "motorcycle", "id": 9},
+    ],
+    "PP-YOLOE_plus_SOD-L": [
+        {"name": "pedestrian", "id": 0},
+        {"name": "people", "id": 1},
+        {"name": "bicycle", "id": 2},
+        {"name": "car", "id": 3},
+        {"name": "van", "id": 4},
+        {"name": "truck", "id": 5},
+        {"name": "tricycle", "id": 6},
+        {"name": "awning-tricycle", "id": 7},
+        {"name": "bus", "id": 8},
+        {"name": "motorcycle", "id": 9},
+    ],
+    "PP-YOLOE_plus_SOD-largesize-L": [
+        {"name": "pedestrian", "id": 0},
+        {"name": "people", "id": 1},
+        {"name": "bicycle", "id": 2},
+        {"name": "car", "id": 3},
+        {"name": "van", "id": 4},
+        {"name": "truck", "id": 5},
+        {"name": "tricycle", "id": 6},
+        {"name": "awning-tricycle", "id": 7},
+        {"name": "bus", "id": 8},
+        {"name": "motorcycle", "id": 9},
+    ],
+}