Kaynağa Gözat

bugfix: the default val of config is not work (#4340)

fix the default val of predict func to None to enable default val in config
Tingquan Gao 4 ay önce
ebeveyn
işleme
f1eb28e23c

+ 3 - 3
docs/pipeline_usage/tutorials/ocr_pipelines/PP-DocTranslation.en.md

@@ -788,7 +788,7 @@ After executing the above code, you will obtain the parsed results of the origin
 <li><b>None</b>: If set to <code>None</code>, the parameter value initialized by the pipeline will be used by default, which is initialized to <code>True</code>;</li>
 </ul>
 </td>
-<td><code>False</code></td>
+<td><code>None</code></td>
 </tr>
 <tr>
 <td><code>use_doc_unwarping</code></td>
@@ -800,7 +800,7 @@ After executing the above code, you will obtain the parsed results of the origin
 <li><b>None</b>: If set to <code>None</code>, the parameter value initialized by the pipeline will be used by default, initialized to<code>True</code>;</li>
 </ul>
 </td>
-<td><code>False</code></td>
+<td><code>None</code></td>
 </tr>
 <tr>
 <td><code>use_textline_orientation</code></td>
@@ -872,7 +872,7 @@ After executing the above code, you will obtain the parsed results of the origin
 <li><b>None</b>: If set to<code>None</code>, the parameter value initialized by the pipeline will be used by default, initialized to<code>True</code>;</li>
 </ul>
 </td>
-<td><code>False</code></td>
+<td><code>None</code></td>
 </tr>
 <tr>
 <td><code>use_region_detection</code></td>

+ 3 - 3
docs/pipeline_usage/tutorials/ocr_pipelines/PP-DocTranslation.md

@@ -826,7 +826,7 @@ for tgt_md_info in tgt_md_info_list:
 <li><b>None</b>:如果设置为<code>None</code>, 将默认使用产线初始化的该参数值,初始化为<code>True</code>;</li>
 </ul>
 </td>
-<td><code>False</code></td>
+<td><code>None</code></td>
 </tr>
 <tr>
 <td><code>use_doc_unwarping</code></td>
@@ -838,7 +838,7 @@ for tgt_md_info in tgt_md_info_list:
 <li><b>None</b>:如果设置为<code>None</code>, 将默认使用产线初始化的该参数值,初始化为<code>True</code>;</li>
 </ul>
 </td>
-<td><code>False</code></td>
+<td><code>None</code></td>
 </tr>
 <tr>
 <td><code>use_textline_orientation</code></td>
@@ -910,7 +910,7 @@ for tgt_md_info in tgt_md_info_list:
 <li><b>None</b>:如果设置为<code>None</code>, 将默认使用产线初始化的该参数值,初始化为<code>True</code>;</li>
 </ul>
 </td>
-<td><code>False</code></td>
+<td><code>None</code></td>
 </tr>
 <tr>
 <td><code>use_region_detection</code></td>

+ 3 - 3
docs/pipeline_usage/tutorials/ocr_pipelines/PP-StructureV3.en.md

@@ -985,7 +985,7 @@ In the above Python script, the following steps are executed:
 <li><b>None</b>: If set to <code>None</code>, the default value initialized in the pipeline will be used, initialized as <code>True</code>;</li>
 </ul>
 </td>
-<td><code>False</code></td>
+<td><code>None</code></td>
 </tr>
 <tr>
 <td><code>use_doc_unwarping</code></td>
@@ -997,7 +997,7 @@ In the above Python script, the following steps are executed:
 <li><b>None</b>: If set to <code>None</code>, the default value initialized in the pipeline will be used, initialized as <code>True</code>;</li>
 </ul>
 </td>
-<td><code>False</code></td>
+<td><code>None</code></td>
 </tr>
 <tr>
 <td><code>use_textline_orientation</code></td>
@@ -1069,7 +1069,7 @@ In the above Python script, the following steps are executed:
 <li><b>None</b>: If set to <code>None</code>, it will default to the initialized parameter value, initialized as <code>True</code>;</li>
 </ul>
 </td>
-<td><code>False</code></td>
+<td><code>None</code></td>
 </tr>
 <tr>
 <td><code>use_region_detection</code></td>

+ 3 - 3
docs/pipeline_usage/tutorials/ocr_pipelines/PP-StructureV3.md

@@ -944,7 +944,7 @@ for item in markdown_images:
 <li><b>None</b>:如果设置为<code>None</code>, 将默认使用产线初始化的该参数值,初始化为<code>True</code>;</li>
 </ul>
 </td>
-<td><code>False</code></td>
+<td><code>None</code></td>
 </tr>
 <tr>
 <td><code>use_doc_unwarping</code></td>
@@ -956,7 +956,7 @@ for item in markdown_images:
 <li><b>None</b>:如果设置为<code>None</code>, 将默认使用产线初始化的该参数值,初始化为<code>True</code>;</li>
 </ul>
 </td>
-<td><code>False</code></td>
+<td><code>None</code></td>
 </tr>
 <tr>
 <td><code>use_textline_orientation</code></td>
@@ -1028,7 +1028,7 @@ for item in markdown_images:
 <li><b>None</b>:如果设置为<code>None</code>, 将默认使用产线初始化的该参数值,初始化为<code>True</code>;</li>
 </ul>
 </td>
-<td><code>False</code></td>
+<td><code>None</code></td>
 </tr>
 <tr>
 <td><code>use_region_detection</code></td>

+ 3 - 3
paddlex/configs/pipelines/PP-DocTranslation.yaml

@@ -38,11 +38,11 @@ SubPipelines:
 
     batch_size: 8
 
-    use_doc_preprocessor: True
-    use_seal_recognition: True
+    use_doc_preprocessor: False
+    use_seal_recognition: False
     use_table_recognition: True
     use_formula_recognition: True
-    use_chart_recognition: True
+    use_chart_recognition: False
     use_region_detection: True
 
     SubModules:

+ 3 - 3
paddlex/configs/pipelines/PP-StructureV3.yaml

@@ -3,11 +3,11 @@ pipeline_name: PP-StructureV3
 
 batch_size: 8
 
-use_doc_preprocessor: True
-use_seal_recognition: True
+use_doc_preprocessor: False
+use_seal_recognition: False
 use_table_recognition: True
 use_formula_recognition: True
-use_chart_recognition: True
+use_chart_recognition: False
 use_region_detection: True
 
 SubModules:

+ 11 - 13
paddlex/inference/pipelines/layout_parsing/pipeline_v2.py

@@ -195,16 +195,14 @@ class _LayoutParsingPipelineV2(BasePipeline):
                 formula_recognition_config,
             )
 
-        if self.use_chart_recognition:
-            chart_recognition_config = config.get("SubModules", {}).get(
-                "ChartRecognition",
-                {
-                    "model_config_error": "config error for block_region_detection_model!"
-                },
-            )
-            self.chart_recognition_model = self.create_model(
-                chart_recognition_config,
-            )
+        # TODO(gaotingquan): init the model at any time
+        chart_recognition_config = config.get("SubModules", {}).get(
+            "ChartRecognition",
+            {"model_config_error": "config error for block_region_detection_model!"},
+        )
+        self.chart_recognition_model = self.create_model(
+            chart_recognition_config,
+        )
 
         return
 
@@ -892,13 +890,13 @@ class _LayoutParsingPipelineV2(BasePipeline):
     def predict(
         self,
         input: Union[str, list[str], np.ndarray, list[np.ndarray]],
-        use_doc_orientation_classify: Union[bool, None] = False,
-        use_doc_unwarping: Union[bool, None] = False,
+        use_doc_orientation_classify: Union[bool, None] = None,
+        use_doc_unwarping: Union[bool, None] = None,
         use_textline_orientation: Optional[bool] = None,
         use_seal_recognition: Union[bool, None] = None,
         use_table_recognition: Union[bool, None] = None,
         use_formula_recognition: Union[bool, None] = None,
-        use_chart_recognition: Union[bool, None] = False,
+        use_chart_recognition: Union[bool, None] = None,
         use_region_detection: Union[bool, None] = None,
         layout_threshold: Optional[Union[float, dict]] = None,
         layout_nms: Optional[bool] = None,

+ 3 - 3
paddlex/inference/pipelines/pp_doctranslation/pipeline.py

@@ -143,13 +143,13 @@ class PP_DocTranslation_Pipeline(BasePipeline):
     def visual_predict(
         self,
         input: Union[str, List[str], np.ndarray, List[np.ndarray]],
-        use_doc_orientation_classify: Optional[bool] = False,
-        use_doc_unwarping: Optional[bool] = False,
+        use_doc_orientation_classify: Optional[bool] = None,
+        use_doc_unwarping: Optional[bool] = None,
         use_textline_orientation: Optional[bool] = None,
         use_seal_recognition: Optional[bool] = None,
         use_table_recognition: Optional[bool] = None,
         use_formula_recognition: Optional[bool] = None,
-        use_chart_recognition: Optional[bool] = False,
+        use_chart_recognition: Optional[bool] = None,
         use_region_detection: Optional[bool] = None,
         layout_threshold: Optional[Union[float, dict]] = None,
         layout_nms: Optional[bool] = None,