[Cherry-Pick] #4643 #4645 #4648 (#4649)

* Fix unboundlocalerror (#4641)

* Add PP-DocLayoutV2 to HPI info (#4643)

* [Docs] Add missing param (#4648)

* Add missing param

* Remove unused extra

docs/pipeline_usage/tutorials/ocr_pipelines/PaddleOCR-VL.md

@@ -78,8 +78,8 @@ comments: true
 </thead>
 <tbody>
 <tr>
-<td>PP-DocLayoutV2-L</td>
-<td><a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-DocLayoutV2-L_infer.tar">推理模型</a>/<a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayoutV2-L_pretrained.pdparams">训练模型</a></td>
+<td>PP-DocLayoutV2</td>
+<td><a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/official_inference_model/paddle3.0.0/PP-DocLayoutV2_infer.tar">推理模型</a>/<a href="https://paddle-model-ecology.bj.bcebos.com/paddlex/official_pretrained_model/PP-DocLayoutV2_pretrained.pdparams">训练模型</a></td>
 <td>-</td>
 <td>- / -</td>
 <td>- / -</td>
@@ -932,7 +932,7 @@ python -m venv .venv
 # 激活环境
 source .venv/bin/activate
 # 安装 PaddleX
-python -m pip install "paddlex[ocr]"
+python -m pip install paddlex
 # 安装 vLLM 服务器插件
 paddlex --install genai-vllm-server
 # 安装 SGLang 服务器插件
@@ -1167,6 +1167,12 @@ PaddleX 会将来自单张或多张输入图像中的子图分组并对服务器
 <td>否</td>
 </tr>
 <tr>
+<td><code>useDocOrientationClassify</code></td>
+<td><code>boolean</code> | <code>null</code></td>
+<td>请参阅产线对象中 <code>predict</code> 方法的 <code>use_doc_orientation_classify</code> 参数相关说明。</td>
+<td>否</td>
+</tr>
+<tr>
 <td><code>useDocUnwarping</code></td>
 <td><code>boolean</code> | <code>null</code></td>
 <td>请参阅产线对象中 <code>predict</code> 方法的 <code>use_doc_unwarping</code> 参数相关说明。</td>

paddlex/inference/models/common/vlm/transformers/model_utils.py

@@ -1607,6 +1607,8 @@ class PretrainedModel(
                 except NotImplementedError:
                     if convert_from_hf:
                         raise ValueError("`convert_from_hf=True` is not supported")
+                    else:
+                        transpose_weight_keys = None
                 state_dict = load_state_dict(
                     shard_file,
                     tp_actions if pre_tensor_parallel_split else None,
@@ -1934,6 +1936,8 @@ class PretrainedModel(
                 except NotImplementedError:
                     if convert_from_hf:
                         raise ValueError("`convert_from_hf=True` is not supported")
+                    else:
+                        transpose_weight_keys = None
                 state_dict = load_state_dict(
                     resolved_archive_file,
                     convert_from_hf=convert_from_hf,

paddlex/inference/utils/hpi_model_info_collection.json

@@ -1465,6 +1465,9 @@
       ],
       "YOWO": [
         "paddle"
+      ],
+      "PP-DocLayoutV2": [
+        "paddle"
       ]
     },
     "paddle31": {
@@ -2946,6 +2949,9 @@
       ],
       "YOWO": [
         "paddle"
+      ],
+      "PP-DocLayoutV2": [
+        "paddle"
       ]
     },
     "paddle311": {
@@ -4428,6 +4434,9 @@
       ],
       "YOWO": [
         "paddle"
+      ],
+      "PP-DocLayoutV2": [
+        "paddle"
       ]
     }
   },
@@ -5849,6 +5858,9 @@
       ],
       "YOWO": [
         "paddle"
+      ],
+      "PP-DocLayoutV2": [
+        "paddle"
       ]
     },
     "paddle31": {
@@ -7288,6 +7300,9 @@
       ],
       "YOWO": [
         "paddle"
+      ],
+      "PP-DocLayoutV2": [
+        "paddle"
       ]
     },
     "paddle311": {
@@ -8726,6 +8741,9 @@
       ],
       "YOWO": [
         "paddle"
+      ],
+      "PP-DocLayoutV2": [
+        "paddle"
       ]
     }
   },
@@ -9774,6 +9792,9 @@
       ],
       "YOWO": [
         "paddle"
+      ],
+      "PP-DocLayoutV2": [
+        "paddle"
       ]
     },
     "paddle31": {
@@ -10835,6 +10856,9 @@
       ],
       "YOWO": [
         "paddle"
+      ],
+      "PP-DocLayoutV2": [
+        "paddle"
       ]
     },
     "paddle311": {
@@ -11880,6 +11904,9 @@
       ],
       "YOWO": [
         "paddle"
+      ],
+      "PP-DocLayoutV2": [
+        "paddle"
       ]
     }
   }