Merge pull request #2021 from TingquanGao/dev/dbg

dbg
2022-06-10 20:49:34 +08:00 · 2022-06-10 20:49:34 +08:00 · ab45ca9d17
parent 36abcd622c 9396b5bd89
commit ab45ca9d17
35 changed files with 53 additions and 56 deletions
--- a/deploy/configs/PULC/language_classification/inference_language_classification.yaml
+++ b/deploy/configs/PULC/language_classification/inference_language_classification.yaml
@ -28,6 +28,6 @@ PostProcess:
  main_indicator: Topk
  Topk:
    topk: 2
-    class_id_map_file: "../dataset/language_classification/label_list.txt"
+    class_id_map_file: "../ppcls/utils/PULC_label_list/language_classification_label_list.txt"
  SavePreLabel:
    save_dir: ./pre_label/
--- a/deploy/configs/PULC/text_image_orientation/inference_text_image_orientation.yaml
+++ b/deploy/configs/PULC/text_image_orientation/inference_text_image_orientation.yaml
@ -30,6 +30,6 @@ PostProcess:
  main_indicator: Topk
  Topk:
    topk: 2
-    class_id_map_file: "../dataset/text_image_orientation/label_list.txt"
+    class_id_map_file: "../ppcls/utils/PULC_label_list/text_image_orientation_label_list.txt"
  SavePreLabel:
    save_dir: ./pre_label/
--- a/deploy/configs/PULC/textline_orientation/inference_textline_orientation.yaml
+++ b/deploy/configs/PULC/textline_orientation/inference_textline_orientation.yaml
@ -28,6 +28,6 @@ PostProcess:
  main_indicator: Topk
  Topk:
    topk: 1
-    class_id_map_file: "../ppcls/utils/PULC/textline_orientation_label_list.txt"
+    class_id_map_file: "../ppcls/utils/PULC_label_list/textline_orientation_label_list.txt"
  SavePreLabel:
    save_dir: ./pre_label/
--- a/deploy/configs/PULC/vehicle_exists/inference_vehicle_exists.yaml
+++ b/deploy/configs/PULC/vehicle_exists/inference_vehicle_exists.yaml
@ -1,6 +1,6 @@
 Global:
-  infer_imgs: "./images/PULC/car_exists/objects365_00001507.jpeg"
-  inference_model_dir: "./models/car_exists_infer"
+  infer_imgs: "./images/PULC/vehicle_exists/objects365_00001507.jpeg"
+  inference_model_dir: "./models/vehicle_exists_infer"
  batch_size: 1
  use_gpu: True
  enable_mkldnn: False
@ -30,7 +30,7 @@ PostProcess:
  main_indicator: ThreshOutput
  ThreshOutput:
    threshold: 0.5
-    label_0: nocar
-    label_1: contains_car
+    label_0: no_vehicle
+    label_1: contains_vehicle
  SavePreLabel:
    save_dir: ./pre_label/
--- a/deploy/images/PULC/vehicle_exists/objects365_00001507.jpeg
+++ b/deploy/images/PULC/vehicle_exists/objects365_00001507.jpeg
--- a/deploy/images/PULC/vehicle_exists/objects365_00001521.jpeg
+++ b/deploy/images/PULC/vehicle_exists/objects365_00001521.jpeg
--- a/docs/zh_CN/PULC/PULC_language_classification.md
+++ b/docs/zh_CN/PULC/PULC_language_classification.md
@ -73,14 +73,14 @@ pip3 install paddleclas
 - 使用命令行快速预测

 ```
-paddleclas --model_name=language_classification --infer_imgs=deploy/images/PULC/language_classification/img_rot0_demo.jpg
+paddleclas --model_name=language_classification --infer_imgs=deploy/images/PULC/language_classification/word_35404.png
 ```

 结果如下：

 ```
 >>> result
-class_ids: [4, 9], scores: [0.96809, 0.01001], label_names: ['japan', 'latin'], filename: deploy/images/PULC/language_classification/word_35404.png
+class_ids: [4, 6], scores: [0.88672, 0.01434], label_names: ['japan', 'korean'], filename: deploy/images/PULC/language_classification/word_35404.png
 Predict complete!
 ```

@ -99,7 +99,7 @@ print(next(result))

 ```
 >>> result
-[{'class_ids': [4, 9], 'scores': [0.96809, 0.01001], 'label_names': ['japan', 'latin'], 'filename': 'deploy/images/PULC/language_classification/word_35404.png'}]
+[{'class_ids': [4, 6], 'scores': [0.88672, 0.01434], 'label_names': ['japan', 'korean'], 'filename': '/deploy/images/PULC/language_classification/word_35404.png'}]
 ```

 <a name="3"></a>
--- a/docs/zh_CN/PULC/PULC_text_image_orientation.md
+++ b/docs/zh_CN/PULC/PULC_text_image_orientation.md
@ -6,7 +6,6 @@
 - [2. 模型快速体验](#2)
  - [2.1 安装 paddleclas](#2.1)  
  - [2.2 预测](#2.2)
-
 - [3. 模型训练、评估和预测](#3)
  - [3.1 环境配置](#3.1)  
  - [3.2 数据准备](#3.2)
--- a/docs/zh_CN/PULC/PULC_traffic_sign.md
+++ b/docs/zh_CN/PULC/PULC_traffic_sign.md
@ -78,13 +78,13 @@ pip3 install paddlepaddle paddleclas
 * 使用命令行快速预测

 ```bash
-paddleclas --model_name traffic_sign  --infer_imgs PaddleClas/deploy/images/PULC/traffic_sign/100999_83928.jpg
+paddleclas --model_name traffic_sign  --infer_imgs deploy/images/PULC/traffic_sign/100999_83928.jpg
 ```

 结果如下：
 ```
 >>> result
-class_ids: [182, 179, 162, 128, 24], scores: [0.98623, 0.01255, 0.00022, 0.00021, 0.00012], label_names: ['pl110', 'pl100', 'pl120', 'p26', 'pm10'], filename: PaddleClas/deploy/images/PULC/traffic_sign/100999_83928.jpg
+class_ids: [182, 179, 162, 128, 24], scores: [0.98623, 0.01255, 0.00022, 0.00021, 0.00012], label_names: ['pl110', 'pl100', 'pl120', 'p26', 'pm10'], filename: deploy/images/PULC/traffic_sign/100999_83928.jpg
 ```

 **备注**： 更换其他预测的数据时，只需要改变 `--infer_imgs=xx` 中的字段即可，支持传入整个文件夹。
@ -94,7 +94,7 @@ class_ids: [182, 179, 162, 128, 24], scores: [0.98623, 0.01255, 0.00022, 0.00021
 ```python
 import paddleclas
 model = paddleclas.PaddleClas(model_name="traffic_sign")
-result = model.predict(input_data="PaddleClas/deploy/images/PULC/traffic_sign/100999_83928.jpg")
+result = model.predict(input_data="deploy/images/PULC/traffic_sign/100999_83928.jpg")
 print(next(result))
 ```

@ -102,7 +102,7 @@ print(next(result))

 ```
 result
-[{'class_ids': [182, 179, 162, 128, 24], 'scores': [0.98623, 0.01255, 0.00022, 0.00021, 0.00012], 'label_names': ['pl110', 'pl100', 'pl120', 'p26', 'pm10'], 'filename': 'PaddleClas/deploy/images/PULC/traffic_sign/100999_83928.jpg'}]
+[{'class_ids': [182, 179, 162, 128, 24], 'scores': [0.98623, 0.01255, 0.00022, 0.00021, 0.00012], 'label_names': ['pl110', 'pl100', 'pl120', 'p26', 'pm10'], 'filename': 'deploy/images/PULC/traffic_sign/100999_83928.jpg'}]
 ```

 <a name="3"></a>
--- a/docs/zh_CN/PULC/PULC_vehicle_attribute.md
+++ b/docs/zh_CN/PULC/PULC_vehicle_attribute.md
@ -79,13 +79,13 @@ pip3 install paddlepaddle paddleclas
 * 使用命令行快速预测

 ```bash
-paddleclas --model_name vehicle_attribute --infer_imgs PaddleClas/deploy/images/PULC/vehicle_attribute/0002_c002_00030670_0.jpg
+paddleclas --model_name vehicle_attribute --infer_imgs deploy/images/PULC/vehicle_attribute/0002_c002_00030670_0.jpg
 ```

 结果如下：
 ```
 >>> result
-attributes: Color: (yellow, prob: 0.9893476963043213), Type: (hatchback, prob: 0.9734097719192505), output: [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0], filename: PaddleClas/deploy/images/PULC/vehicle_attribute/0002_c002_00030670_0.jpg
+attributes: Color: (yellow, prob: 0.9893476963043213), Type: (hatchback, prob: 0.9734097719192505), output: [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0], filename: deploy/images/PULC/vehicle_attribute/0002_c002_00030670_0.jpg
 ppcls INFO: Predict complete!
 ```

@ -96,7 +96,7 @@ ppcls INFO: Predict complete!
 ```python
 import paddleclas
 model = paddleclas.PaddleClas(model_name="vehicle_attribute")
-result = model.predict(input_data="PaddleClas/deploy/images/PULC/vehicle_attribute/0002_c002_00030670_0.jpg")
+result = model.predict(input_data="deploy/images/PULC/vehicle_attribute/0002_c002_00030670_0.jpg")
 print(next(result))
 ```

@ -104,7 +104,7 @@ print(next(result))

 ```
 result
-[{'attributes': 'Color: (yellow, prob: 0.9893476963043213), Type: (hatchback, prob: 0.9734097719192505)', 'output': [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0], 'filename': 'PaddleClas/deploy/images/PULC/vehicle_attribute/0002_c002_00030670_0.jpg'}]
+[{'attributes': 'Color: (yellow, prob: 0.9893476963043213), Type: (hatchback, prob: 0.9734097719192505)', 'output': [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0], 'filename': 'deploy/images/PULC/vehicle_attribute/0002_c002_00030670_0.jpg'}]
 ```

 <a name="3"></a>
--- a/paddleclas.py
+++ b/paddleclas.py
@ -178,7 +178,7 @@ IMN_MODEL_SERIES = {
 PULC_MODEL_BASE_DOWNLOAD_URL = "https://paddleclas.bj.bcebos.com/models/PULC/{}_infer.tar"
 PULC_MODELS = [
    "person_exists", "person_attribute", "safety_helmet", "traffic_sign",
-    "vehicle_exists", "vehicle_attr", "textline_orientation",
+    "vehicle_exists", "vehicle_attribute", "textline_orientation",
    "text_image_orientation", "language_classification"
 ]

@ -247,8 +247,10 @@ def init_config(model_type, model_name, inference_model_dir, **kwargs):
            cfg.PostProcess.Topk.class_id_map_file = kwargs[
                "class_id_map_file"]
        else:
-            cfg.PostProcess.Topk.class_id_map_file = os.path.relpath(
+            class_id_map_file_path = os.path.relpath(
                cfg.PostProcess.Topk.class_id_map_file, "../")
+            cfg.PostProcess.Topk.class_id_map_file = os.path.join(
+                __dir__, class_id_map_file_path)
    if "VehicleAttribute" in cfg.PostProcess:
        if "color_threshold" in kwargs and kwargs["color_threshold"]:
            cfg.PostProcess.VehicleAttribute.color_threshold = kwargs[
--- a/ppcls/configs/PULC/language_classification/MobileNetV3_small_x0_35.yaml
+++ b/ppcls/configs/PULC/language_classification/MobileNetV3_small_x0_35.yaml
@ -121,7 +121,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 2
-    class_id_map_file: ppcls/utils/PULC/language_classification_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/language_classification_label_list.txt

 Metric:
  Train:
--- a/ppcls/configs/PULC/language_classification/PPLCNet_x1_0.yaml
+++ b/ppcls/configs/PULC/language_classification/PPLCNet_x1_0.yaml
@ -132,7 +132,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 2
-    class_id_map_file: ppcls/utils/PULC/language_classification_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/language_classification_label_list.txt

 Metric:
  Train:
--- a/ppcls/configs/PULC/language_classification/PPLCNet_x1_0_distillation.yaml
+++ b/ppcls/configs/PULC/language_classification/PPLCNet_x1_0_distillation.yaml
@ -152,7 +152,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 2
-    class_id_map_file: ppcls/utils/PULC/language_classification_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/language_classification_label_list.txt

 Metric:
    Train:
--- a/ppcls/configs/PULC/language_classification/PPLCNet_x1_0_search.yaml
+++ b/ppcls/configs/PULC/language_classification/PPLCNet_x1_0_search.yaml
@ -131,7 +131,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 2
-    class_id_map_file: ppcls/utils/PULC/language_classification_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/language_classification_label_list.txt

 Metric:
  Train:
--- a/ppcls/configs/PULC/language_classification/SwinTransformer_tiny_patch4_window7_224.yaml
+++ b/ppcls/configs/PULC/language_classification/SwinTransformer_tiny_patch4_window7_224.yaml
@ -152,7 +152,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 2
-    class_id_map_file: ppcls/utils/PULC/language_classification_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/language_classification_label_list.txt

 Metric:
  Eval:
--- a/ppcls/configs/PULC/text_image_orientation/MobileNetV3_small_x0_35.yaml
+++ b/ppcls/configs/PULC/text_image_orientation/MobileNetV3_small_x0_35.yaml
@ -121,7 +121,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 2
-    class_id_map_file: ppcls/utils/PULC/text_image_orientation_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/text_image_orientation_label_list.txt

 Metric:
  Train:
--- a/ppcls/configs/PULC/text_image_orientation/PPLCNet_x1_0.yaml
+++ b/ppcls/configs/PULC/text_image_orientation/PPLCNet_x1_0.yaml
@ -132,7 +132,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 2
-    class_id_map_file: ppcls/utils/PULC/text_image_orientation_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/text_image_orientation_label_list.txt

 Metric:
  Train:
--- a/ppcls/configs/PULC/text_image_orientation/PPLCNet_x1_0_distillation.yaml
+++ b/ppcls/configs/PULC/text_image_orientation/PPLCNet_x1_0_distillation.yaml
@ -152,7 +152,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 2
-    class_id_map_file: ppcls/utils/PULC/text_image_orientation_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/text_image_orientation_label_list.txt

 Metric:
    Train:
--- a/ppcls/configs/PULC/text_image_orientation/PPLCNet_x1_0_search.yaml
+++ b/ppcls/configs/PULC/text_image_orientation/PPLCNet_x1_0_search.yaml
@ -135,7 +135,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 2
-    class_id_map_file: ppcls/utils/PULC/text_image_orientation_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/text_image_orientation_label_list.txt

 Metric:
  Train:
--- a/ppcls/configs/PULC/text_image_orientation/SwinTransformer_tiny_patch4_window7_224.yaml
+++ b/ppcls/configs/PULC/text_image_orientation/SwinTransformer_tiny_patch4_window7_224.yaml
@ -149,7 +149,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 2
-    class_id_map_file: ppcls/utils/PULC/text_image_orientation_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/text_image_orientation_label_list.txt

 Metric:
  Eval:
--- a/ppcls/configs/PULC/textline_orientation/MobileNetV3_small_x0_35.yaml
+++ b/ppcls/configs/PULC/textline_orientation/MobileNetV3_small_x0_35.yaml
@ -123,7 +123,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 1
-    class_id_map_file: ppcls/utils/PULC/textline_orientation_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/textline_orientation_label_list.txt

 Metric:
  Train:
--- a/ppcls/configs/PULC/textline_orientation/PPLCNet_x1_0.yaml
+++ b/ppcls/configs/PULC/textline_orientation/PPLCNet_x1_0.yaml
@ -132,7 +132,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 1
-    class_id_map_file: ppcls/utils/PULC/textline_orientation_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/textline_orientation_label_list.txt

 Metric:
  Train:
--- a/ppcls/configs/PULC/textline_orientation/PPLCNet_x1_0_224x224.yaml
+++ b/ppcls/configs/PULC/textline_orientation/PPLCNet_x1_0_224x224.yaml
@ -121,7 +121,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 1
-    class_id_map_file: ppcls/utils/PULC/textline_orientation_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/textline_orientation_label_list.txt

 Metric:
  Train:
--- a/ppcls/configs/PULC/textline_orientation/PPLCNet_x1_0_distillation.yaml
+++ b/ppcls/configs/PULC/textline_orientation/PPLCNet_x1_0_distillation.yaml
@ -150,7 +150,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 1
-    class_id_map_file: ppcls/utils/PULC/textline_orientation_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/textline_orientation_label_list.txt

 Metric:
    Train:
--- a/ppcls/configs/PULC/textline_orientation/PPLCNet_x1_0_search.yaml
+++ b/ppcls/configs/PULC/textline_orientation/PPLCNet_x1_0_search.yaml
@ -133,7 +133,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 1
-    class_id_map_file: ppcls/utils/PULC/textline_orientation_label_list.txt 
+    class_id_map_file: ppcls/utils/PULC_label_list/textline_orientation_label_list.txt 

 Metric:
  Train:
--- a/ppcls/configs/PULC/textline_orientation/SwinTransformer_tiny_patch4_window7_224.yaml
+++ b/ppcls/configs/PULC/textline_orientation/SwinTransformer_tiny_patch4_window7_224.yaml
@ -153,7 +153,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 1
-    class_id_map_file: ppcls/utils/PULC/textline_orientation_label_list.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/textline_orientation_label_list.txt

 Metric:
  Train:
--- a/ppcls/configs/PULC/traffic_sign/MobileNetV3_samll_x0_35.yaml
+++ b/ppcls/configs/PULC/traffic_sign/MobileNetV3_samll_x0_35.yaml
@ -120,7 +120,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 5
-    class_id_map_file: dataset/traffic_sign/label_name_id.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/traffic_sign_label_list.txt

 Metric:
  Train:
--- a/ppcls/configs/PULC/traffic_sign/PPLCNet_x1_0.yaml
+++ b/ppcls/configs/PULC/traffic_sign/PPLCNet_x1_0.yaml
@ -137,7 +137,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 5
-    class_id_map_file: dataset/traffic_sign/label_name_id.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/traffic_sign_label_list.txt

 Metric:
  Train:
--- a/ppcls/configs/PULC/traffic_sign/PPLCNet_x1_0_distillation.yaml
+++ b/ppcls/configs/PULC/traffic_sign/PPLCNet_x1_0_distillation.yaml
@ -160,7 +160,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 5
-    class_id_map_file: dataset/traffic_sign/label_name_id.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/traffic_sign_label_list.txt

 Metric:
    Train:
--- a/ppcls/configs/PULC/traffic_sign/PPLCNet_x1_0_search.yaml
+++ b/ppcls/configs/PULC/traffic_sign/PPLCNet_x1_0_search.yaml
@ -138,7 +138,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 5
-    class_id_map_file: dataset/traffic_sign/label_name_id.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/traffic_sign_label_list.txt

 Metric:
  Train:
--- a/ppcls/configs/PULC/traffic_sign/SwinTransformer_tiny_patch4_window7_224.yaml
+++ b/ppcls/configs/PULC/traffic_sign/SwinTransformer_tiny_patch4_window7_224.yaml
@ -157,7 +157,7 @@ Infer:
  PostProcess:
    name: Topk
    topk: 5
-    class_id_map_file: dataset/traffic_sign/label_name_id.txt
+    class_id_map_file: ppcls/utils/PULC_label_list/traffic_sign_label_list.txt

 Metric:
  Train:
--- a/ppcls/utils/PULC/text_image_orientation_label_list.txt
+++ b/ppcls/utils/PULC/text_image_orientation_label_list.txt
@ -1,4 +0,0 @@
-0 0
-1 90
-2 180
-3 270
--- a/ppcls/utils/PULC_label_list/language_classification_label_list.txt
+++ b/ppcls/utils/PULC_label_list/language_classification_label_list.txt
--- a/ppcls/utils/PULC_label_list/textline_orientation_label_list.txt
+++ b/ppcls/utils/PULC_label_list/textline_orientation_label_list.txt